copy_tuner_client 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03ba0b085f868890879331c827dc5b536dd7ab60
-  data.tar.gz: 87fde9370a787494eee210acef172e308d3bd712
+  metadata.gz: 0cb55c2bd2d4429781a893a3aab0ad71c0655701
+  data.tar.gz: 498fa6bcaad92bd1145f530aa5f2ce9820bd63ef
 SHA512:
-  metadata.gz: b7224992276e3886e74346a54b9de1facf6dbf5140b0da2c29ded50534f61e820525cd1dce5ef865213a496bad59f34a17bf71a797f6010620557c3613fda02b
-  data.tar.gz: 5bc71e6e6643e52038c4065e2dd5357b605875720b141f7dde522caa1dd335f6934bf612840abf805217a7da5584fb1a326d5a5f64c5ffe5339c2a6307015b4c
+  metadata.gz: 0bc675e3c354496f98ebd709e2abe80f85681a3eab511a4e2645127c46f112991aac078f62ff0681a484e3a3d1f68f1f54ad606315e527c7db61af8020cb1160
+  data.tar.gz: a9a276d4fd2e1c520a0293014648b70d8025ff0b72092a60cd768abcc3b71de98162399c76baeeff3d57a525896cde52720ce07e5f692a18871069259de072df

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.4
+- bug fix
+  - Don't upload resolved default values.
+
 ## 0.4.3
 - bug fix
   - Start poller thread regardless of puma mode. #39

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    copy_tuner_client (0.4.3)
+    copy_tuner_client (0.4.4)
       i18n (>= 0.5.0)
       json
 
@@ -78,7 +78,7 @@ GEM
       activesupport (>= 4.1.0)
     hashdiff (0.3.2)
     i18n (0.8.1)
-    json (2.0.3)
+    json (2.1.0)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.4)

data/features/rails.feature

@@ -245,7 +245,7 @@ Feature: Using copy_tuner in a rails app
     When I wait for changes to be synchronized
     Then the "abc123" project should have the following error blurbs:
       | key                        | draft content  |
-      | user.attributes.name.blank | can't be blank |
+      | user.attributes.name.blank |                |
 
   Scenario: ensure keys are synced with short lived processes
     When I configure the copy_tuner client to have a polling delay of 86400 seconds

data/lib/copy_tuner_client/cache.rb

@@ -147,10 +147,21 @@ module CopyTunerClient
       end
 
       if changes_to_push
-        yield changes_to_push
+        yield nil_value_to_empty(changes_to_push)
       end
     end
 
+    def nil_value_to_empty(hash)
+      hash.each do |k, v|
+        if v.nil?
+          hash[k] = ''.freeze
+        elsif v.is_a?(Hash)
+          nil_value_to_empty(v)
+        end
+      end
+      hash
+    end
+
     def lock(&block)
       @mutex.synchronize &block
     end

data/lib/copy_tuner_client/i18n_backend.rb

@@ -62,7 +62,7 @@ module CopyTunerClient
       parts = I18n.normalize_keys(locale, key, scope, options[:separator])
       key_with_locale = parts.join('.')
       content = cache[key_with_locale] || super
-      cache[key_with_locale] = "" if content.nil?
+      cache[key_with_locale] = nil if content.nil?
       content
     end
 
@@ -86,8 +86,11 @@ module CopyTunerClient
       content = super(locale, object, subject, options)
       if content.respond_to?(:to_str)
         parts = I18n.normalize_keys(locale, object, options[:scope], options[:separator])
-        key = parts.join('.')
-        cache[key] = content.to_str
+        # NOTE: ActionView::Helpers::TranslationHelper#translate wraps default String in an Array
+        if subject.is_a?(String) || (subject.is_a?(Array) && subject.size == 1 && subject.first.is_a?(String))
+          key = parts.join('.')
+          cache[key] = content.to_str
+        end
       end
       content
     end

data/lib/copy_tuner_client/version.rb

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

data/spec/copy_tuner_client/cache_spec.rb

@@ -46,6 +46,15 @@ describe CopyTunerClient::Cache do
     expect(client.uploaded).to eq({ 'test.key' => 'test value' })
   end
 
+  it "uploads empties when nil is assigned" do
+    cache = build_cache
+    cache['test.key'] = nil
+
+    cache.flush
+
+    expect(client.uploaded).to eq({ 'test.key' => '' })
+  end
+
   it 'upload without locale filter' do
     cache = build_cache
     cache['en.test.key'] = 'uploaded en'

data/spec/copy_tuner_client/i18n_backend_spec.rb

@@ -58,11 +58,20 @@ describe CopyTunerClient::I18nBackend do
     expect(cache['en.test.key']).to eq(default)
   end
 
+  it "queues missing keys with default string in an array" do
+    default = 'default value'
+
+    expect(subject.translate('en', 'test.key', :default => [default])).to eq(default)
+
+    expect(cache['en.test.key']).to eq(default)
+  end
+
   it "queues missing keys without default" do
     expect { subject.translate('en', 'test.key') }.
       to throw_symbol(:exception)
 
-    expect(cache['en.test.key']).to eq("")
+    expect(cache).to have_key 'en.test.key'
+    expect(cache['en.test.key']).to be_nil
   end
 
   it "queues missing keys with scope" do
@@ -74,6 +83,36 @@ describe CopyTunerClient::I18nBackend do
     expect(cache['en.test.key']).to eq(default)
   end
 
+  it "does not queues missing keys with a symbol of default" do
+    cache['en.key.one'] = "Expected"
+
+    expect(subject.translate('en', 'key.three', :default => :"key.one")).to eq 'Expected'
+
+    expect(cache).to have_key 'en.key.three'
+    expect(cache['en.key.three']).to be_nil
+
+    expect(subject.translate('en', 'key.three', :default => :"key.one")).to eq 'Expected'
+  end
+
+  it "does not queues missing keys with an array of default" do
+    cache['en.key.one'] = "Expected"
+
+    expect(subject.translate('en', 'key.three', :default => [:"key.two", :"key.one"])).to eq 'Expected'
+
+    expect(cache).to have_key 'en.key.three'
+    expect(cache['en.key.three']).to be_nil
+
+    expect(subject.translate('en', 'key.three', :default => [:"key.two", :"key.one"])).to eq 'Expected'
+  end
+
+  it "queues missing keys with interpolation" do
+    default = 'default %{interpolate}'
+
+    expect(subject.translate('en', 'test.key', :default => default, :interpolate => 'interpolated')).to eq 'default interpolated'
+
+    expect(cache['en.test.key']).to eq 'default %{interpolate}'
+  end
+
   it "marks strings as html safe" do
     cache['en.test.key'] = FakeHtmlSafeString.new("Hello")
     backend = build_backend
@@ -152,7 +191,8 @@ describe CopyTunerClient::I18nBackend do
 
       # default と Fallbacks を併用した場合、キャッシュにデフォルト値は入らない仕様に変えた
       # その仕様にしないと、うまく Fallbacks の処理が動かないため
-      expect(cache['en.test.key']).to eq('')
+      expect(cache).to have_key 'en.test.key'
+      expect(cache['en.test.key']).to be_nil
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: copy_tuner_client
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - SonicGarden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-25 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -319,7 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Client for the CopyTuner copy management service