copy_tuner_client 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30f272ff0b61dbe196cda958e667b63c28506e1c
-  data.tar.gz: 98276bb8f63035e5c006e6a67747cd0a6b09eef7
+  metadata.gz: 07fe56c9db1edad412f1af3596b85021fc96d485
+  data.tar.gz: d8cff9d0621acebe92f9179102106cbb1b7ab371
 SHA512:
-  metadata.gz: 803b4c53de785e596477ecc8ebd7384cbe920abd671d6d9205a36366041cdce3d035590c40a617828f58a69828656d494bfa5f129878b3398a3ea943954ab718
-  data.tar.gz: 31367504b3b2af8003f49fd0b1611eb0f213754ea5e310a72391710dece4aab5373568045d44f5eecdcbd8184ffcef0de9bcba7fc9fad73c5f97903addb6b124
+  metadata.gz: c675b1660904b2961660c6f1e18387cc15f663289b3d4cadd3f4a00104c25dd6927a3ecfb11410ebe8bd922a5e08c4dac166a26791363e895c354358014aba6f
+  data.tar.gz: 9eb3a9e05e2b3919c0c8fc86bd65f0b5e75f30515b95388e8f3f296d8a4503ec10cd4ea2c5d7824464db6441819e6e5f4e583828c5b7733c017ec8f4b5acd097

data/.ruby-version

@@ -1 +1 @@
-2.1.6
+2.3.3

data/.travis.yml

@@ -1,13 +1,19 @@
 rvm:
-  - 2.0
-  - 2.1
   - 2.2
   - 2.3
+  - 2.4.1
 
 gemfile:
   - gemfiles/4.0.gemfile
   - gemfiles/4.1.gemfile
   - gemfiles/4.2.gemfile
 
+matrix:
+  exclude:
+    - rvm: 2.4.1
+      gemfile: gemfiles/4.0.gemfile
+    - rvm: 2.4.1
+      gemfile: gemfiles/4.1.gemfile
+
 before_install:
   - gem update bundler

data/Appraisals

@@ -3,9 +3,9 @@ appraise '4.0' do
 end
 
 appraise '4.1' do
-  gem 'rails', '4.1.15'
+  gem 'rails', '4.1.16'
 end
 
 appraise '4.2' do
-  gem 'rails', '4.2.6'
+  gem 'rails', '4.2.8'
 end

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.3.5
+- Support Rails 5.1
+
 ## 0.3.4
 - Use Logger to /dev/null as default when rails console
 

data/Gemfile.lock

@@ -1,64 +1,64 @@
 PATH
   remote: .
   specs:
-    copy_tuner_client (0.3.4)
+    copy_tuner_client (0.3.5)
       i18n (>= 0.5.0)
       json
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.2.6)
-      actionpack (= 4.2.6)
-      actionview (= 4.2.6)
-      activejob (= 4.2.6)
+    actionmailer (4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.6)
-      actionview (= 4.2.6)
-      activesupport (= 4.2.6)
+    actionpack (4.2.8)
+      actionview (= 4.2.8)
+      activesupport (= 4.2.8)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.6)
-      activesupport (= 4.2.6)
+    actionview (4.2.8)
+      activesupport (= 4.2.8)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.6)
-      activesupport (= 4.2.6)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.8)
+      activesupport (= 4.2.8)
       globalid (>= 0.3.0)
-    activemodel (4.2.6)
-      activesupport (= 4.2.6)
+    activemodel (4.2.8)
+      activesupport (= 4.2.8)
       builder (~> 3.1)
-    activerecord (4.2.6)
-      activemodel (= 4.2.6)
-      activesupport (= 4.2.6)
+    activerecord (4.2.8)
+      activemodel (= 4.2.8)
+      activesupport (= 4.2.8)
       arel (~> 6.0)
-    activesupport (4.2.6)
+    activesupport (4.2.8)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
+    addressable (2.5.1)
+      public_suffix (~> 2.0, >= 2.0.2)
     appraisal (2.1.0)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (6.0.3)
+    arel (6.0.4)
     aruba (0.6.2)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
     bourne (1.6.0)
       mocha (~> 1.1)
-    builder (3.2.2)
-    childprocess (0.5.9)
+    builder (3.2.3)
+    childprocess (0.6.3)
       ffi (~> 1.0, >= 1.0.11)
-    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.0.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     cucumber (1.3.20)
@@ -67,18 +67,18 @@ GEM
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
-    daemons (1.2.3)
-    diff-lcs (1.2.5)
+    daemons (1.2.4)
+    diff-lcs (1.3)
     erubis (2.7.0)
-    eventmachine (1.2.0.1)
-    ffi (1.9.10)
+    eventmachine (1.2.3)
+    ffi (1.9.18)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    globalid (0.3.6)
+    globalid (0.3.7)
       activesupport (>= 4.1.0)
-    hashdiff (0.3.0)
-    i18n (0.7.0)
-    json (1.8.3)
+    hashdiff (0.3.2)
+    i18n (0.8.1)
+    json (2.0.4)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
@@ -88,82 +88,86 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.9.0)
-    mocha (1.1.0)
+    minitest (5.10.1)
+    mocha (1.2.1)
       metaclass (~> 0.0.1)
     multi_json (1.12.1)
     multi_test (0.1.2)
-    nokogiri (1.6.8)
+    nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
-    pkg-config (1.1.7)
-    rack (1.6.4)
+    public_suffix (2.0.5)
+    rack (1.6.5)
     rack-protection (1.5.3)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.6)
-      actionmailer (= 4.2.6)
-      actionpack (= 4.2.6)
-      actionview (= 4.2.6)
-      activejob (= 4.2.6)
-      activemodel (= 4.2.6)
-      activerecord (= 4.2.6)
-      activesupport (= 4.2.6)
+    rails (4.2.8)
+      actionmailer (= 4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
+      activemodel (= 4.2.8)
+      activerecord (= 4.2.8)
+      activesupport (= 4.2.8)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.6)
+      railties (= 4.2.8)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.6)
-      actionpack (= 4.2.6)
-      activesupport (= 4.2.6)
+    railties (4.2.8)
+      actionpack (= 4.2.8)
+      activesupport (= 4.2.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.2.2)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.4)
+    rake (12.0.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     safe_yaml (1.0.4)
-    sham_rack (1.3.6)
+    sham_rack (1.4.0)
       rack
-    sinatra (1.3.3)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    sprockets (3.6.3)
+    sinatra (1.4.8)
+      rack (~> 1.5)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.1.1)
+    sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.11)
+    sqlite3 (1.3.13)
     thin (1.7.0)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (1.4.1)
-    tzinfo (1.2.2)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tilt (2.0.7)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    webmock (2.0.0)
+    webmock (2.3.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    yard (0.8.7.6)
+    yard (0.9.8)
 
 PLATFORMS
   ruby
@@ -176,7 +180,7 @@ DEPENDENCIES
   cucumber (~> 1.3.16)
   rails (~> 4.2.6)
   rake
-  rspec (~> 2.99)
+  rspec
   sham_rack
   sinatra
   sqlite3
@@ -185,4 +189,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.14.3
+   1.14.6

data/README.md

@@ -3,6 +3,36 @@ CopyTuner Client
 
 [![Build Status](https://travis-ci.org/SonicGarden/copy-tuner-ruby-client.svg?branch=master)](https://travis-ci.org/SonicGarden/copy-tuner-ruby-client)
 
+## Getting started
+
+Add it to your Gemfile
+
+```
+gem 'copy_tuner_client'
+```
+
+Create config/initializers/copy_tuner.rb
+
+```
+CopyTunerClient.configure do |config|
+  config.api_key = 'YOUR-API-KEY'
+  config.host = 'COPY-TUNER-HOST-NAME'
+  
+  # I18n keys and messages will be sent to server if the locale matches
+  config.locales = [:ja, :en]
+end
+```
+
+## CopyTunerの翻訳ファイルをymlとして出力する
+
+該当のRailsプロジェクトで下記のrakeを実行する
+
+```
+bundle exec rake copy_tuner:export
+```
+
+これで、`config/locales/copy_tuner.yml` に翻訳ファイルが作成されます。
+
 Development
 =================
 
@@ -23,12 +53,3 @@ Development
     $ bundle exec rake install    # install to local gem
     $ bundle exec rake release    # release gem to rubygems.org
 
-## CopyTunerの翻訳ファイルをymlとして出力する
-
-該当のRailsプロジェクトで下記のrakeを実行する
-
-```
-bundle exec rake copy_tuner:export
-```
-
-これで、`config/locales/copy_tuner.yml` に翻訳ファイルが作成されます。

data/copy_tuner_client.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'cucumber', '~> 1.3.16'
   s.add_development_dependency 'rails', '~> 4.2.6'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec', '~> 2.99'
+  s.add_development_dependency 'rspec'
   s.add_development_dependency 'sham_rack'
   s.add_development_dependency 'sinatra'
   s.add_development_dependency 'sqlite3'

data/features/step_definitions/copycopter_server_steps.rb

@@ -53,7 +53,7 @@ end
 
 Then /^the "([^"]*)" project should not have the "([^"]*)" blurb$/ do |api_key, blurb_key|
   project = FakeCopyTunerApp.project(api_key)
-  project.draft[blurb_key].should be_nil
+  expect(project.draft[blurb_key]).to be_nil
 end
 
 When /^I wait for changes to be synchronized$/ do

data/features/step_definitions/rails_steps.rb

@@ -111,7 +111,7 @@ end
 Then /^the log should contain "([^"]*)"$/ do |line|
   prefix = "** [CopyTuner] "
   pattern = Regexp.compile([Regexp.escape(prefix), Regexp.escape(line)].join(".*"))
-  log_path = "log/development.log"
+  log_path = "log/copy_tuner.log"
   in_current_dir do
     File.open(log_path) do |file|
       unless file.readlines.any? { |file_line| file_line =~ pattern }
@@ -122,7 +122,7 @@ Then /^the log should contain "([^"]*)"$/ do |line|
 end
 
 Then /^the log should not contain "([^"]*)"$/ do |line|
-  log_path = "log/development.log"
+  log_path = "log/copy_tuner.log"
   in_current_dir do
     File.open(log_path) do |file|
       if bad_line = file.readlines.detect { |file_line| file_line.include?(line) }
@@ -137,11 +137,11 @@ When /^I successfully rake "([^"]*)"$/ do |task|
 end
 
 Then /^the response should contain "([^"]+)"$/ do |text|
-  @last_response.body.should include(text)
+  expect(@last_response.body).to include(text)
 end
 
 When /^show me the page$/ do
-  @last_response.body.should == nil
+  expect(@last_response.body).to be_nil
 end
 
 When /^I route the "([^"]+)" resource$/ do |resource|

data/gemfiles/4.1.gemfile

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "rails", "4.1.15"
+gem "rails", "4.1.16"
 
 gemspec :path => "../"

data/gemfiles/4.2.gemfile

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "rails", "4.2.6"
+gem "rails", "4.2.8"
 
 gemspec :path => "../"

data/lib/copy_tuner_client/engine.rb

@@ -20,7 +20,8 @@ module CopyTunerClient
             end
           end
           if CopyTunerClient.configuration.enable_middleware?
-            alias_method_chain :translate, :copyray_comment
+            alias_method :translate_without_copyray_comment, :translate
+            alias_method :translate, :translate_with_copyray_comment
             alias :t :translate
           end
         end

data/lib/copy_tuner_client/simple_form_extention.rb

@@ -22,7 +22,8 @@ if defined?(SimpleForm)
       end
     end
     if CopyTunerClient.configuration.enable_middleware?
-      alias_method_chain :label_translation, :copyray_comment
+      alias_method :label_translation_without_copyray_comment, :label_translation
+      alias_method :label_translation, :label_translation_with_copyray_comment
     end
   end
 end

data/lib/copy_tuner_client/translation_log.rb

@@ -34,7 +34,8 @@ module CopyTunerClient
             result
           end
           if CopyTunerClient.configuration.enable_middleware?
-            alias_method_chain :translate, :copy_tuner_hook
+            alias_method :translate_without_copy_tuner_hook, :translate
+            alias_method :translate, :translate_with_copy_tuner_hook
             alias :t :translate
           end
         end

data/lib/copy_tuner_client/version.rb

@@ -1,6 +1,6 @@
 module CopyTunerClient
   # Client version
-  VERSION = '0.3.4'.freeze
+  VERSION = '0.3.5'.freeze
 
   # API version being used to communicate with the server
   API_VERSION = '2.0'.freeze

data/spec/copy_tuner_client/cache_spec.rb

@@ -17,8 +17,8 @@ describe CopyTunerClient::Cache do
 
     cache.download
 
-    cache['en.test.key'].should == 'expected'
-    cache.keys.should match_array(%w(en.test.key en.test.other_key))
+    expect(cache['en.test.key']).to eq('expected')
+    expect(cache.keys).to match_array(%w(en.test.key en.test.other_key))
   end
 
   it "exclude data if exclude_key_regexp is set" do
@@ -28,13 +28,13 @@ describe CopyTunerClient::Cache do
 
     cache.download
 
-    cache.queued.keys.should match_array(%w(en.test.key))
+    expect(cache.queued.keys).to match_array(%w(en.test.key))
   end
 
   it "doesn't upload without changes" do
     cache = build_cache
     cache.flush
-    client.should_not be_uploaded
+    expect(client).not_to be_uploaded
   end
 
   it "uploads changes when flushed" do
@@ -43,7 +43,7 @@ describe CopyTunerClient::Cache do
 
     cache.flush
 
-    client.uploaded.should == { 'test.key' => 'test value' }
+    expect(client.uploaded).to eq({ 'test.key' => 'test value' })
   end
 
   it 'upload without locale filter' do
@@ -72,7 +72,7 @@ describe CopyTunerClient::Cache do
 
     cache.download
 
-    cache['test.key'].should == 'test value'
+    expect(cache['test.key']).to eq('test value')
   end
 
   it "downloads and uploads when synced" do
@@ -82,8 +82,8 @@ describe CopyTunerClient::Cache do
 
     cache.sync
 
-    client.uploaded.should == { 'other.key' => 'other value' }
-    cache['test.key'].should == 'test value'
+    expect(client.uploaded).to eq({ 'other.key' => 'other value' })
+    expect(cache['test.key']).to eq('test value')
   end
 
   it "handles connection errors when flushing" do
@@ -95,7 +95,7 @@ describe CopyTunerClient::Cache do
 
     cache.flush
 
-    logger.should have_entry(:error, failure)
+    expect(logger).to have_entry(:error, failure)
   end
 
   it "handles connection errors when downloading" do
@@ -106,7 +106,7 @@ describe CopyTunerClient::Cache do
 
     cache.download
 
-    logger.should have_entry(:error, failure)
+    expect(logger).to have_entry(:error, failure)
   end
 
   it "blocks until the first download is complete" do
@@ -125,7 +125,7 @@ describe CopyTunerClient::Cache do
 
     sleep(1)
 
-    finished.should == true
+    expect(finished).to eq(true)
     # FIXME 成功したり、失敗していたりするので、一旦コメントアウト。後で直します。
     # logger.should have_entry(:info, "Waiting for first download")
     # logger.should have_received(:flush)
@@ -147,7 +147,7 @@ describe CopyTunerClient::Cache do
     sleep(1)
 
     expect { cache.download }.to raise_error(StandardError, "Failure")
-    finished.should == true
+    expect(finished).to eq(true)
   end
 
   it "doesn't block before downloading" do
@@ -162,8 +162,8 @@ describe CopyTunerClient::Cache do
 
     sleep(1)
 
-    finished.should == true
-    logger.should_not have_entry(:info, "Waiting for first download")
+    expect(finished).to eq(true)
+    expect(logger).not_to have_entry(:info, "Waiting for first download")
   end
 
   it "doesn't return blank copy" do
@@ -172,7 +172,7 @@ describe CopyTunerClient::Cache do
 
     cache.download
 
-    cache['en.test.key'].should be_nil
+    expect(cache['en.test.key']).to be_nil
   end
 
   describe "given locked mutex" do
@@ -199,7 +199,7 @@ describe CopyTunerClient::Cache do
         false
       end
 
-      failure_message_for_should do
+      failure_message do
         @failure_message
       end
     end
@@ -213,15 +213,15 @@ describe CopyTunerClient::Cache do
     end
 
     it "synchronizes read access to keys between threads" do
-      Thread.new { cache['test.key'] }.should finish_after_unlocking(mutex)
+      expect(Thread.new { cache['test.key'] }).to finish_after_unlocking(mutex)
     end
 
     it "synchronizes read access to the key list between threads" do
-      Thread.new { cache.keys }.should finish_after_unlocking(mutex)
+      expect(Thread.new { cache.keys }).to finish_after_unlocking(mutex)
     end
 
     it "synchronizes write access to keys between threads" do
-      Thread.new { cache['test.key'] = 'value' }.should finish_after_unlocking(mutex)
+      expect(Thread.new { cache['test.key'] = 'value' }).to finish_after_unlocking(mutex)
     end
   end
 
@@ -255,11 +255,11 @@ describe CopyTunerClient::Cache do
 
       CopyTunerClient.export
 
-      @cache.should have_received(:export)
+      expect(@cache).to have_received(:export)
     end
 
     it "returns no yaml with no blurb keys" do
-      @cache.export.should == nil
+      expect(@cache.export).to eq(nil)
     end
 
     context "with single-level blurb keys" do
@@ -270,8 +270,8 @@ describe CopyTunerClient::Cache do
 
       it "returns blurbs as yaml" do
         exported = YAML.load(@cache.export)
-        exported['key'].should == 'test value'
-        exported['other_key'].should == 'other test value'
+        expect(exported['key']).to eq('test value')
+        expect(exported['other_key']).to eq('other test value')
       end
     end
 
@@ -284,9 +284,9 @@ describe CopyTunerClient::Cache do
 
       it "returns blurbs as yaml" do
         exported = YAML.load(@cache.export)
-        exported['en']['test']['key'].should == 'en test value'
-        exported['en']['test']['other_key'].should == 'en other test value'
-        exported['fr']['test']['key'].should == 'fr test value'
+        expect(exported['en']['test']['key']).to eq('en test value')
+        expect(exported['en']['test']['other_key']).to eq('en other test value')
+        expect(exported['fr']['test']['key']).to eq('fr test value')
       end
     end
 
@@ -298,7 +298,7 @@ describe CopyTunerClient::Cache do
 
       it "retains the new key" do
         exported = YAML.load(@cache.export)
-        exported['en']['test']['key'].should == 'other test value'
+        expect(exported['en']['test']['key']).to eq('other test value')
       end
     end
   end