refactor settings

2 files changed, 20 insertions, 21 deletions

diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index f61214a..a044813 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -11,8 +11,8 @@ end
 
 Rails.application.config.middleware.use OmniAuth::Builder do
   provider :twitter,
-           Settings.collector.consumer[Settings.collector.consumer_version].key,
-           Settings.collector.consumer[Settings.collector.consumer_version].secret,
+           Settings.consumer.key,
+           Settings.consumer.secret,
            request_path: "/i/login",
            callback_path: "/i/callback"
 end
diff --git a/config/settings.yml.example b/config/settings.yml.example
index 39a9eda..1d29ee4 100644
--- a/config/settings.yml.example
+++ b/config/settings.yml.example
@@ -1,37 +1,36 @@
 default: &default
   base_url:           "http://example.com/" # base url
-  
+  consumer:
+    key:              "consumer key of collector (register)"
+    secret:           "consumer secret"
+
   collector:
     server_port:      42106
     secret_key:       "secret key to authorize workers"
     count:            1 # workers count
-    consumer_version: 0 # which consumer (0..)
-    consumer:
-      - key:          "consumer key of collector (register)"
-        secret:       "consumer secret"
-      - key:          "if change consumer key"
-        secret:       
-  
+
   notification:
     enabled:          false
     consumer:
       key:            "consumer key of notification account"
       secret:         "consumer secret"
-    token:
+    accounts:
       - token:        "access token of notification account"
         secret:       "access token secret"
     favorites:
       - 50
       - 100
       - 250
-  
+
   tweets:
-    count_default:    10
-    count_max:        100
+    count:
+      default:        10
+      max:            100
     favorites:
-      truncate:       20
-  
-  user_ranking:
+      count:          20
+      max:            null
+
+  users:
     count:            50
 
 development:
@@ -39,14 +38,14 @@ development:
 
 test:
   <<: *default
+  consumer:
+    key:              "JVkX2Uy0Qtigsh0GiG5Lw"
+    secret:           "vfkPvOkzKUGuZ4xKtFAVvlAKoL3u2grxchuQEBvE"
+
   collector:
     server_port:      42106
     secret_key:       "secret"
     count:            1
-    consumer_version: 0
-    consumer:
-      - key:          "JVkX2Uy0Qtigsh0GiG5Lw"
-        secret:       "vfkPvOkzKUGuZ4xKtFAVvlAKoL3u2grxchuQEBvE"
 
 production:
   <<: *default