Change env keys.

Author: JunichiIto

.powenv.sample

@@ -1,4 +1,4 @@
-twitter.consumer_key.jp=(please set)
-twitter.consumer_secret.jp=(please set)
-twitter.oauth_token.jp=(please set)
-twitter.oauth_token_secret.jp=(please set)
+export twitter_consumer_key_jp=(please set)
+export twitter_consumer_secret_jp=(please set)
+export twitter_oauth_token_jp=(please set)
+export twitter_oauth_token_secret_jp=(please set)

app/models/vim_command.rb

@@ -58,11 +58,15 @@ def self.post(tweet, lang)
   end
 
   def self.twitter_client(lang)
-    Twitter::Client.new(
-        consumer_key:       ENV["twitter.consumer_key.#{lang}"],
-        consumer_secret:    ENV["twitter.consumer_secret.#{lang}"],
-        oauth_token:        ENV["twitter.oauth_token.#{lang}"],
-        oauth_token_secret: ENV["twitter.oauth_token_secret.#{lang}"]
-    )
+    params = {
+        consumer_key:       ENV["twitter_consumer_key_#{lang}"],
+        consumer_secret:    ENV["twitter_consumer_secret_#{lang}"],
+        oauth_token:        ENV["twitter_oauth_token_#{lang}"],
+        oauth_token_secret: ENV["twitter_oauth_token_secret_#{lang}"]
+    }
+
+    raise "Please check env values!" if params.values.any?(&:nil?)
+
+    Twitter::Client.new(params)
   end
 end

config/heroku.yml.sample

@@ -3,33 +3,33 @@ production:
   stack: cedar
   config:
     BUNDLE_WITHOUT: "development:test"
-    twitter.consumer_key.cn:       (please set)
-    twitter.consumer_key.en:       (please set)
-    twitter.consumer_key.jp:       (please set)
-    twitter.consumer_secret.cn:    (please set)
-    twitter.consumer_secret.en:    (please set)
-    twitter.consumer_secret.jp:    (please set)
-    twitter.oauth_token.cn:        (please set)
-    twitter.oauth_token.en:        (please set)
-    twitter.oauth_token.jp:        (please set)
-    twitter.oauth_token_secret.cn: (please set)
-    twitter.oauth_token_secret.en: (please set)
-    twitter.oauth_token_secret.jp: (please set)
+    twitter_consumer_key_cn:       (please set)
+    twitter_consumer_key_en:       (please set)
+    twitter_consumer_key_jp:       (please set)
+    twitter_consumer_secret_cn:    (please set)
+    twitter_consumer_secret_en:    (please set)
+    twitter_consumer_secret_jp:    (please set)
+    twitter_oauth_token_cn:        (please set)
+    twitter_oauth_token_en:        (please set)
+    twitter_oauth_token_jp:        (please set)
+    twitter_oauth_token_secret_cn: (please set)
+    twitter_oauth_token_secret_en: (please set)
+    twitter_oauth_token_secret_jp: (please set)
 
 staging:
   stack: cedar
   app: bevimmer-staging
   config: &default
     BUNDLE_WITHOUT: "development:test"
-    twitter.consumer_key.cn:       (please set)
-    twitter.consumer_key.en:       (please set)
-    twitter.consumer_key.jp:       (please set)
-    twitter.consumer_secret.cn:    (please set)
-    twitter.consumer_secret.en:    (please set)
-    twitter.consumer_secret.jp:    (please set)
-    twitter.oauth_token.cn:        (please set)
-    twitter.oauth_token.en:        (please set)
-    twitter.oauth_token.jp:        (please set)
-    twitter.oauth_token_secret.cn: (please set)
-    twitter.oauth_token_secret.en: (please set)
-    twitter.oauth_token_secret.jp: (please set)
+    twitter_consumer_key_cn:       (please set)
+    twitter_consumer_key_en:       (please set)
+    twitter_consumer_key_jp:       (please set)
+    twitter_consumer_secret_cn:    (please set)
+    twitter_consumer_secret_en:    (please set)
+    twitter_consumer_secret_jp:    (please set)
+    twitter_oauth_token_cn:        (please set)
+    twitter_oauth_token_en:        (please set)
+    twitter_oauth_token_jp:        (please set)
+    twitter_oauth_token_secret_cn: (please set)
+    twitter_oauth_token_secret_en: (please set)
+    twitter_oauth_token_secret_jp: (please set)

spec/models/vim_command_spec.rb

@@ -4,10 +4,10 @@
   describe "::twitter_client" do
     let(:env_hash) {
       {
-          "twitter.consumer_key.jp" => "123",
-          "twitter.consumer_secret.jp" => "456",
-          "twitter.oauth_token.jp" => "789",
-          "twitter.oauth_token_secret.jp" => "abc",
+          "twitter_consumer_key_jp" => "123",
+          "twitter_consumer_secret_jp" => "456",
+          "twitter_oauth_token_jp" => "789",
+          "twitter_oauth_token_secret_jp" => "abc",
       }
     }
     let(:twitter_client) { VimCommand.twitter_client("jp") }