copy_tuner_client 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3cc0c109c21c0ab75746e4e1c589aba3858137c
-  data.tar.gz: 9ef00204b7dd815fbf10578c53c78940820304b7
+  metadata.gz: c72f170af0093637a763c2e02771cfd584d2c522
+  data.tar.gz: c4ef0334c658f6c16798467505f7dc73ce0447ea
 SHA512:
-  metadata.gz: eea5da6db9d62a3aad0fb45d75d6f0cfb8ae8b7d8b0a8bc03cd4b381ce36a5d5118ca6c54d0c5bd873337b1e8fb4af3d6da5099beb3d5466b9faad7a26803011
-  data.tar.gz: 52365f67f27781abde7842b9748f294a5f2a224968d564dcdc366ff1f8a05634d531354ae08bb6519e0e2d9455ce34b85c73b67e6a79e35c37c55849876d507c
+  metadata.gz: 04645e2ca212fba15311d766e203770e915aeadd19b44d47ddf1828928c94d5a5d4eed5ebf50c40ed1c0590774ff521154ff4b2f55e2e22dd3ea825208ea750a
+  data.tar.gz: 8fc97dc1dea41024746490e8bd6e07edd6ec876ee89c79d732c5aa74fa5a99ec0c2c25d011487a9cf10aec1830a91dc5b0c9624c2744c37f039189dc67eed3f8

data/.rubocop.yml

@@ -0,0 +1,2 @@
+inherit_gem:
+  sgcop: ruby/rubocop.yml

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.5.2
+
+- Do not upload invalid keys
+
 ## 0.5.1
 
 - Do not upload downloaded keys

data/Gemfile

@@ -1,3 +1,5 @@
 source 'http://rubygems.org'
 
 gemspec
+
+gem 'sgcop', github: 'SonicGarden/sgcop'

data/Gemfile.lock

@@ -1,7 +1,20 @@
+GIT
+  remote: git://github.com/SonicGarden/sgcop.git
+  revision: 7ba086cff0068d231f55f5be788b757383d3ccba
+  specs:
+    sgcop (0.0.29)
+      brakeman
+      brakeman_translate_checkstyle_format
+      haml_lint (~> 0.32.0)
+      rubocop (~> 0.71.0)
+      rubocop-performance (~> 1.4.0)
+      rubocop-rails (~> 2.0.1)
+      rubocop-rspec (~> 1.33.0)
+
 PATH
   remote: .
   specs:
-    copy_tuner_client (0.5.1)
+    copy_tuner_client (0.5.2)
       i18n (>= 0.5.0)
       json
 
@@ -53,6 +66,10 @@ GEM
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
+    ast (2.4.0)
+    brakeman (4.5.1)
+    brakeman_translate_checkstyle_format (0.0.1)
+      thor
     builder (3.2.3)
     childprocess (0.6.3)
       ffi (~> 1.0, >= 1.0.11)
@@ -74,8 +91,18 @@ GEM
       multi_json (~> 1.3)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
+    haml (5.1.1)
+      temple (>= 0.8.0)
+      tilt
+    haml_lint (0.32.0)
+      haml (>= 4.0, < 5.2)
+      rainbow
+      rake (>= 10, < 13)
+      rubocop (>= 0.50.0)
+      sysexits (~> 1.1)
     hashdiff (0.3.2)
     i18n (0.8.1)
+    jaro_winkler (1.5.3)
     json (2.2.0)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
@@ -90,6 +117,9 @@ GEM
     multi_test (0.1.2)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
+    parallel (1.17.0)
+    parser (2.6.3.0)
+      ast (~> 2.4.0)
     public_suffix (2.0.5)
     rack (1.6.5)
     rack-protection (1.5.3)
@@ -120,6 +150,7 @@ GEM
       activesupport (= 4.2.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
+    rainbow (3.0.0)
     rake (12.0.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
@@ -134,6 +165,21 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
+    rubocop (0.71.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.6)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    rubocop-performance (1.4.0)
+      rubocop (>= 0.71.0)
+    rubocop-rails (2.0.1)
+      rack (>= 1.1)
+      rubocop (>= 0.70.0)
+    rubocop-rspec (1.33.0)
+      rubocop (>= 0.60.0)
+    ruby-progressbar (1.10.1)
     safe_yaml (1.0.4)
     sham_rack (1.4.0)
       rack
@@ -149,6 +195,8 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
+    sysexits (1.2.0)
+    temple (0.8.1)
     thin (1.7.0)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
@@ -158,6 +206,7 @@ GEM
     tilt (2.0.7)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
+    unicode-display_width (1.6.0)
     webmock (2.3.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -175,6 +224,7 @@ DEPENDENCIES
   rails (~> 4.2.6)
   rake
   rspec
+  sgcop!
   sham_rack
   sinatra
   sqlite3

data/Rakefile

@@ -4,16 +4,16 @@ require 'cucumber/rake/task'
 require 'rspec/core/rake_task'
 require 'yard'
 
-desc 'Default: run the specs and features.'
-task :default => [:spec, :cucumber]
+desc 'Default: run the specs.'
+task default: [:spec]
 
 desc 'Test the copy_tuner_client plugin.'
 RSpec::Core::RakeTask.new do |t|
-  t.rspec_opts = ['--color', "--format progress"]
+  t.rspec_opts = ['--color', '--format progress']
   t.pattern = 'spec/copy_tuner_client/**/*_spec.rb'
 end
 
-desc "Run cucumber features"
+desc 'Run cucumber features'
 Cucumber::Rake::Task.new do |t|
   t.cucumber_opts = [
     '--tags', '~@wip',
@@ -22,5 +22,5 @@ Cucumber::Rake::Task.new do |t|
 end
 
 YARD::Rake::YardocTask.new do |t|
-  t.files   = ['lib/**/*.rb']
+  t.files = ['lib/**/*.rb']
 end

data/lib/copy_tuner_client/cache.rb

@@ -1,4 +1,3 @@
-require 'thread'
 require 'copy_tuner_client/client'
 require 'copy_tuner_client/dotted_hash'
 
@@ -40,9 +39,12 @@ module CopyTunerClient
     # @param value [String] the new contents of the blurb
     def []=(key, value)
       return if @exclude_key_regexp && key.match?(@exclude_key_regexp)
+      return unless key.include?('.')
       return if @locales.present? && !@locales.member?(key.split('.').first)
+
       lock do
         return if @blank_keys.member?(key) || @blurbs.key?(key)
+
         @queued[key] = value
       end
     end
@@ -61,17 +63,15 @@ module CopyTunerClient
 
     # Waits until the first download has finished.
     def wait_for_download
-      if pending?
-        logger.info 'Waiting for first download'
+      return unless pending?
 
-        if logger.respond_to? :flush
-          logger.flush
-        end
+      logger.info 'Waiting for first download'
 
-        while pending?
-          sleep 0.1
-        end
+      if logger.respond_to? :flush
+        logger.flush
       end
+
+      sleep 0.1 while pending?
     end
 
     def flush
@@ -82,8 +82,8 @@ module CopyTunerClient
       @last_uploaded_at = Time.now.utc
 
       res
-    rescue ConnectionError => error
-      logger.error error.message
+    rescue ConnectionError => e
+      logger.error e.message
     end
 
     def download
@@ -100,8 +100,8 @@ module CopyTunerClient
       @last_downloaded_at = Time.now.utc
 
       res
-    rescue ConnectionError => error
-      logger.error error.message
+    rescue ConnectionError => e
+      logger.error e.message
     ensure
       @downloaded = true
     end

data/lib/copy_tuner_client/version.rb

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

data/spec/copy_tuner_client/cache_spec.rb

@@ -9,7 +9,7 @@ describe CopyTunerClient::Cache do
     CopyTunerClient::Cache.new(client, default_config.update(config))
   end
 
-  it "provides access to downloaded data" do
+  it 'provides access to downloaded data' do
     client['en.test.key']       = 'expected'
     client['en.test.other_key'] = 'expected'
 
@@ -18,17 +18,17 @@ describe CopyTunerClient::Cache do
     cache.download
 
     expect(cache['en.test.key']).to eq('expected')
-    expect(cache.keys).to match_array(%w(en.test.key en.test.other_key))
+    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
+  it 'exclude data if exclude_key_regexp is set' do
     cache = build_cache(exclude_key_regexp: /^en\.test\.other_key$/)
     cache['en.test.key']       = 'expected'
     cache['en.test.other_key'] = 'expected'
 
     cache.download
 
-    expect(cache.queued.keys).to 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
@@ -37,7 +37,15 @@ describe CopyTunerClient::Cache do
     expect(client).not_to be_uploaded
   end
 
-  it "uploads changes when flushed" do
+  it "Don't upload incorrect key" do
+    cache = build_cache
+    cache['ja'] = 'incorrect key'
+
+    cache.flush
+    expect(client).not_to be_uploaded
+  end
+
+  it 'uploads changes when flushed' do
     cache = build_cache
     cache['test.key'] = 'test value'
 
@@ -46,7 +54,7 @@ describe CopyTunerClient::Cache do
     expect(client.uploaded).to eq({ 'test.key' => 'test value' })
   end
 
-  it "uploads empties when nil is assigned" do
+  it 'uploads empties when nil is assigned' do
     cache = build_cache
     cache['test.key'] = nil
 
@@ -62,7 +70,7 @@ describe CopyTunerClient::Cache do
 
     cache.flush
 
-    expect(client.uploaded).to eq({'en.test.key' => 'uploaded en', 'ja.test.key' => 'uploaded ja'})
+    expect(client.uploaded).to eq({ 'en.test.key' => 'uploaded en', 'ja.test.key' => 'uploaded ja' })
   end
 
   it 'upload with locale filter' do
@@ -72,10 +80,10 @@ describe CopyTunerClient::Cache do
 
     cache.flush
 
-    expect(client.uploaded).to eq({'en.test.key' => 'uploaded'})
+    expect(client.uploaded).to eq({ 'en.test.key' => 'uploaded' })
   end
 
-  it "downloads changes" do
+  it 'downloads changes' do
     client['test.key'] = 'test value'
     cache = build_cache
 
@@ -84,7 +92,7 @@ describe CopyTunerClient::Cache do
     expect(cache['test.key']).to eq('test value')
   end
 
-  it "downloads and uploads when synced" do
+  it 'downloads and uploads when synced' do
     cache = build_cache
     client['test.key'] = 'test value'
     cache['other.key'] = 'other value'
@@ -95,7 +103,7 @@ describe CopyTunerClient::Cache do
     expect(cache['test.key']).to eq('test value')
   end
 
-  it "download included empty keys" do
+  it 'download included empty keys' do
     client['en.test.key'] = 'test value'
     client['en.test.empty'] = ''
     cache = build_cache
@@ -109,7 +117,7 @@ describe CopyTunerClient::Cache do
     expect(cache.queued).to be_empty
   end
 
-  it "Do not upload downloaded keys" do
+  it 'Do not upload downloaded keys' do
     client['en.test.key'] = 'test value'
     cache = build_cache
 
@@ -119,11 +127,11 @@ describe CopyTunerClient::Cache do
     expect(cache.queued).to be_empty
   end
 
-  it "handles connection errors when flushing" do
-    failure = "server is napping"
+  it 'handles connection errors when flushing' do
+    failure = 'server is napping'
     logger = FakeLogger.new
     expect(client).to receive(:upload).and_raise(CopyTunerClient::ConnectionError.new(failure))
-    cache = build_cache(:logger => logger)
+    cache = build_cache(logger: logger)
     cache['upload.key'] = 'upload'
 
     cache.flush
@@ -131,22 +139,22 @@ describe CopyTunerClient::Cache do
     expect(logger).to have_entry(:error, failure)
   end
 
-  it "handles connection errors when downloading" do
-    failure = "server is napping"
+  it 'handles connection errors when downloading' do
+    failure = 'server is napping'
     logger = FakeLogger.new
     expect(client).to receive(:download).and_raise(CopyTunerClient::ConnectionError.new(failure))
-    cache = build_cache(:logger => logger)
+    cache = build_cache(logger: logger)
 
     cache.download
 
     expect(logger).to have_entry(:error, failure)
   end
 
-  it "blocks until the first download is complete" do
+  it 'blocks until the first download is complete' do
     logger = FakeLogger.new
     expect(logger).to receive(:flush)
     client.delay = true
-    cache = build_cache(:logger => logger)
+    cache = build_cache(logger: logger)
 
     t_download = Thread.new { cache.download }
     sleep 0.1 until cache.pending?
@@ -154,7 +162,7 @@ describe CopyTunerClient::Cache do
     t_wait = Thread.new do
       cache.wait_for_download
     end
-    sleep 0.1 until logger.has_entry?(:info, "Waiting for first download")
+    sleep 0.1 until logger.has_entry?(:info, 'Waiting for first download')
     client.go
     expect(t_download.join(1)).not_to be_nil
     expect(cache.pending?).to be_falsey
@@ -163,7 +171,7 @@ describe CopyTunerClient::Cache do
 
   it "doesn't block if the first download fails" do
     client.delay = true
-    client.error = StandardError.new("Failure")
+    client.error = StandardError.new('Failure')
     cache = build_cache
 
     error = nil
@@ -183,12 +191,12 @@ describe CopyTunerClient::Cache do
     expect(t_download.join(1)).not_to be_nil
     expect(error).to be_kind_of(StandardError)
     expect(t_wait.join(1)).not_to be_nil
-    expect { cache.download }.to raise_error(StandardError, "Failure")
+    expect { cache.download }.to raise_error(StandardError, 'Failure')
   end
 
   it "doesn't block before downloading" do
     logger = FakeLogger.new
-    cache = build_cache(:logger => logger)
+    cache = build_cache(logger: logger)
 
     finished = false
     Thread.new do
@@ -199,7 +207,7 @@ describe CopyTunerClient::Cache do
     sleep(1)
 
     expect(finished).to eq(true)
-    expect(logger).not_to have_entry(:info, "Waiting for first download")
+    expect(logger).not_to have_entry(:info, 'Waiting for first download')
   end
 
   it "doesn't return blank copy" do
@@ -211,13 +219,13 @@ describe CopyTunerClient::Cache do
     expect(cache['en.test.key']).to be_nil
   end
 
-  describe "given locked mutex" do
+  describe 'given locked mutex' do
     RSpec::Matchers.define :finish_after_unlocking do |mutex|
       match do |thread|
         sleep(0.1)
 
         if thread.status === false
-          violated("finished before unlocking")
+          violated('finished before unlocking')
         else
           mutex.unlock
           sleep(0.1)
@@ -225,7 +233,7 @@ describe CopyTunerClient::Cache do
           if thread.status === false
             true
           else
-            violated("still running after unlocking")
+            violated('still running after unlocking')
           end
         end
       end
@@ -248,20 +256,20 @@ describe CopyTunerClient::Cache do
       allow(Mutex).to receive(:new).and_return(mutex)
     end
 
-    it "synchronizes read access to keys between threads" do
+    it 'synchronizes read access to keys between threads' do
       expect(Thread.new { cache['test.key'] }).to finish_after_unlocking(mutex)
     end
 
-    it "synchronizes read access to the key list between threads" do
+    it 'synchronizes read access to the key list between threads' do
       expect(Thread.new { cache.keys }).to finish_after_unlocking(mutex)
     end
 
-    it "synchronizes write access to keys between threads" do
+    it 'synchronizes write access to keys between threads' do
       expect(Thread.new { cache['test.key'] = 'value' }).to finish_after_unlocking(mutex)
     end
   end
 
-  it "flushes from the top level" do
+  it 'flushes from the top level' do
     cache = build_cache
     CopyTunerClient.configure do |config|
       config.cache = cache
@@ -271,7 +279,7 @@ describe CopyTunerClient::Cache do
     CopyTunerClient.flush
   end
 
-  describe "#export" do
+  describe '#export' do
     subject { cache.export }
 
     let(:cache) do
@@ -280,7 +288,7 @@ describe CopyTunerClient::Cache do
       cache
     end
 
-    it "can be invoked from the top-level constant" do
+    it 'can be invoked from the top-level constant' do
       CopyTunerClient.configure do |config|
         config.cache = cache
       end
@@ -292,7 +300,7 @@ describe CopyTunerClient::Cache do
       is_expected.to eq nil
     end
 
-    context "with single-level blurb keys" do
+    context 'with single-level blurb keys' do
       before do
         client['key']       = 'test value'
         client['other_key'] = 'other test value'

data/spec/copy_tuner_client/client_spec.rb

@@ -5,7 +5,8 @@ describe CopyTunerClient do
     config[:logger] ||= FakeLogger.new
     default_config = CopyTunerClient::Configuration.new.to_hash
     default_config[:s3_host] = 'copy-tuner.com'
-    CopyTunerClient::Client.new(default_config.update(config))
+    client = CopyTunerClient::Client.new(default_config.update(config))
+    client
   end
 
   def add_project
@@ -197,6 +198,7 @@ describe CopyTunerClient do
 
   it "deploys from the top-level constant" do
     client = build_client
+    allow(client).to receive(:download)
     CopyTunerClient.configure do |config|
       config.client = client
     end

data/spec/copy_tuner_client/copyray_spec.rb

@@ -16,6 +16,7 @@ describe CopyTunerClient::Copyray do
       before do
         CopyTunerClient.configure do |configuration|
           configuration.html_escape = false
+          configuration.client = FakeClient.new
         end
       end
 
@@ -36,6 +37,7 @@ describe CopyTunerClient::Copyray do
       before do
         CopyTunerClient.configure do |configuration|
           configuration.html_escape = true
+          configuration.client = FakeClient.new
         end
       end
 

data/spec/copy_tuner_client/i18n_backend_spec.rb

@@ -128,6 +128,7 @@ describe CopyTunerClient::I18nBackend do
     before do
       CopyTunerClient.configure do |configuration|
         configuration.html_escape = true
+        configuration.client = FakeClient.new
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: copy_tuner_client
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - SonicGarden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-24 00:00:00.000000000 Z
+date: 2019-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -216,6 +216,7 @@ files:
 - ".eslintrc"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
 - Appraisals