copy_tuner_client 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1abd5e463cf1feda1d3bf4edc83766f125960f0a
-  data.tar.gz: 22334e3d43c8cb9d89fd425a9f559247fc9b3b4a
+  metadata.gz: de79b5861cd1aafdf13952a2cfe8ac8a24784646
+  data.tar.gz: 31d8084e19e0e46852360a0e594b6876285ed739
 SHA512:
-  metadata.gz: f3af76757b80aab3a52faf9d13cf0df3f8b2c051de85ee333bb3443f56c212c78c88a1b25b756e5a78a171533f81651dbf66b2d45b69556e1d9f351a1652501b
-  data.tar.gz: fda1d32f14cb117dd187d00a31339c23387c323f67d1700138f80fd85d71077f3549aef5e06bd139c1521216e072dda78cf8485341a3263c3b22630e9be77e07
+  metadata.gz: e971aa783b8e8522b2db81c5d78b369908697d0101d1b2d412c9af52f73063de5b8c26fdaae676efdf5e1f0454e0e0c468129d08e65471571438f8756634c2db
+  data.tar.gz: 1d3a227b8566d7e58d33268f80ce44f91ccf1b5415ea4d3a07d3d77b856261d1707998c4a1e0eca609bb374c1f869f17f1ab7ac51fa5867aeae84f326fb863d1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.3
+- Add config.locales. (#24)
+- Fix initialization order bug. (#25)
+
 ## 0.3.2
 - Support I18n.t :scope option.
 - Update copyray_js_injection_regexp_for_debug. 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    copy_tuner_client (0.3.2)
+    copy_tuner_client (0.3.3)
       i18n (>= 0.5.0)
       json
 
@@ -176,7 +176,7 @@ DEPENDENCIES
   cucumber (~> 1.3.16)
   rails (~> 4.2.6)
   rake
-  rspec (~> 2.3)
+  rspec (~> 2.99)
   sham_rack
   sinatra
   sqlite3
@@ -185,4 +185,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.11.2
+   1.14.3

data/app/assets/stylesheets/copyray.css

@@ -171,7 +171,7 @@ a.copyray-toggle-button:hover {
   background-color: #555;
 }
 
-.copy-tuner-bar__search {
+input[type="text"].copy-tuner-bar__search {
   -webkit-appearance: none;
   -moz-appearance: none;
   appearance: none;
@@ -180,6 +180,8 @@ a.copyray-toggle-button:hover {
   background-image: linear-gradient(rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0));
   box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.2), inset 0 0 2px rgba(0, 0, 0, 0.2);
   padding: 2px 8px;
+  margin: 0;
+  line-height: 20px;
   vertical-align: middle;
   color: black;
 }

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.3'
+  s.add_development_dependency 'rspec', '~> 2.99'
   s.add_development_dependency 'sham_rack'
   s.add_development_dependency 'sinatra'
   s.add_development_dependency 'sqlite3'

data/lib/copy_tuner_client/cache.rb

@@ -21,6 +21,7 @@ module CopyTunerClient
       @queued = {}
       @started = false
       @exclude_key_regexp = options[:exclude_key_regexp]
+      @locales = Array(options[:locales]).map(&:to_s)
     end
 
     # Returns content for the given blurb.
@@ -36,6 +37,7 @@ module CopyTunerClient
     # @param value [String] the new contents of the blurb
     def []=(key, value)
       return if key =~ @exclude_key_regexp
+      return if @locales.present? && !@locales.member?(key.split('.').first)
       lock { @queued[key] = value }
     end
 

data/lib/copy_tuner_client/configuration.rb

@@ -18,7 +18,8 @@ module CopyTunerClient
         :client_version, :port, :protocol, :proxy_host, :proxy_pass,
         :proxy_port, :proxy_user, :secure, :polling_delay, :sync_interval,
         :sync_interval_staging, :sync_ignore_path_regex, :logger,
-        :framework, :middleware, :disable_middleware, :disable_test_translation, :ca_file, :exclude_key_regexp, :s3_host].freeze
+        :framework, :middleware, :disable_middleware, :disable_test_translation,
+        :ca_file, :exclude_key_regexp, :s3_host, :locales].freeze
 
     # @return [String] The API key for your project, found on the project edit form.
     attr_accessor :api_key
@@ -122,6 +123,9 @@ module CopyTunerClient
     # @return [Boolean] To disable Copyray comment injection, set true
     attr_accessor :disable_copyray_comment_injection
 
+    # @return [Array<Symbol>] Restrict blurb locales to upload
+    attr_accessor :locales
+
     alias_method :secure?, :secure
 
     # Instantiated from {CopyTunerClient.configure}. Sets defaults.
@@ -222,6 +226,14 @@ module CopyTunerClient
     #
     # When {#test?} returns +false+, the poller will be started.
     def apply
+      self.locales ||= begin
+        if defined?(::Rails)
+          self.locales = ::Rails.application.config.i18n.available_locales.presence || Array(::Rails.application.config.i18n.default_locale)
+        else
+          self.locales = [:en]
+        end
+      end
+
       self.client ||= Client.new(to_hash)
       self.cache ||= Cache.new(client, to_hash)
       poller = Poller.new(cache, to_hash)
@@ -239,6 +251,7 @@ module CopyTunerClient
       @applied = true
       logger.info "Client #{VERSION} ready (s3_download)"
       logger.info "Environment Info: #{environment_info}"
+      logger.info "Available locales: #{self.locales.join(' ')}"
 
       unless test?
         process_guard.start

data/lib/copy_tuner_client/engine.rb

@@ -6,7 +6,9 @@ module CopyTunerClient
   class Engine < ::Rails::Engine
     initializer :initialize_copy_tuner_rails, :before => :load_config_initializers do |app|
       CopyTunerClient::Rails.initialize
+    end
 
+    initializer :initialize_copy_tuner_hook_methods, :after => :load_config_initializers do |app|
       ActiveSupport.on_load(:action_view) do
         ActionView::Helpers::TranslationHelper.class_eval do
           def translate_with_copyray_comment(key, options = {})
@@ -27,6 +29,8 @@ module CopyTunerClient
       if CopyTunerClient.configuration.enable_middleware?
         CopyTunerClient::TranslationLog.install_hook
       end
+
+      require 'copy_tuner_client/simple_form_extention'
     end
 
     initializer "copy_tuner.assets.precompile", group: :all do |app|

data/lib/copy_tuner_client/rails.rb

@@ -10,7 +10,6 @@ module CopyTunerClient
         config.framework        = "Rails: #{::Rails::VERSION::STRING}"
         config.middleware       = ::Rails.configuration.middleware
       end
-      require 'copy_tuner_client/simple_form_extention'
     end
   end
 end

data/lib/copy_tuner_client/request_sync.rb

@@ -93,7 +93,10 @@ module CopyTunerClient
         body = render_without_layout(view, binding)
       end
       if add_rack_array
-        ::Rack::Response.new(body).finish
+        ::Rack::Response.new(
+          body, 200,
+          ::Rack::CONTENT_TYPE => 'text/html; charset=utf-8'
+        ).finish
       else
         body
       end

data/lib/copy_tuner_client/version.rb

@@ -1,6 +1,6 @@
 module CopyTunerClient
   # Client version
-  VERSION = '0.3.2'.freeze
+  VERSION = '0.3.3'.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,26 @@ describe CopyTunerClient::Cache do
     client.uploaded.should == { 'test.key' => 'test value' }
   end
 
+  it 'upload without locale filter' do
+    cache = build_cache
+    cache['en.test.key'] = 'uploaded en'
+    cache['ja.test.key'] = 'uploaded ja'
+
+    cache.flush
+
+    expect(client.uploaded).to eq({'en.test.key' => 'uploaded en', 'ja.test.key' => 'uploaded ja'})
+  end
+
+  it 'upload with locale filter' do
+    cache = build_cache(locales: %(en))
+    cache['en.test.key'] = 'uploaded'
+    cache['ja.test.key'] = 'not uploaded'
+
+    cache.flush
+
+    expect(client.uploaded).to eq({'en.test.key' => 'uploaded'})
+  end
+
   it "downloads changes" do
     client['test.key'] = 'test value'
     cache = build_cache

data/spec/copy_tuner_client/configuration_spec.rb

@@ -204,7 +204,7 @@ describe CopyTunerClient::Configuration do
   end
 end
 
-shared_examples_for 'applied configuration' do
+shared_context 'stubbed configuration' do
   subject { CopyTunerClient::Configuration.new }
   let(:backend) { stub('i18n-backend') }
   let(:cache) { stub('cache', :download => "download") }
@@ -222,6 +222,10 @@ shared_examples_for 'applied configuration' do
     subject.logger = logger
     apply
   end
+end
+
+shared_examples_for 'applied configuration' do
+  include_context 'stubbed configuration'
 
   it { should be_applied }
 
@@ -315,3 +319,63 @@ describe CopyTunerClient::Configuration, 'applied with middleware when not devel
     middleware.should_not include(CopyTunerClient::RequestSync)
   end
 end
+
+describe CopyTunerClient::Configuration, 'applied without locale filter' do
+  include_context 'stubbed configuration'
+
+  def apply
+    subject.apply
+  end
+
+  it 'should have locales [:en]' do
+    expect(subject.locales).to eq [:en]
+  end
+end
+
+describe CopyTunerClient::Configuration, 'applied with locale filter' do
+  include_context 'stubbed configuration'
+
+  def apply
+    subject.locales = %i(en ja)
+    subject.apply
+  end
+
+  it 'should have locales %i(en ja)' do
+    expect(subject.locales).to eq %i(en ja)
+  end
+end
+
+describe CopyTunerClient::Configuration, 'applied with Rails i18n config' do
+  def self.with_config(i18n_options)
+    around do |ex|
+      rails_defined = Object.const_defined?(:Rails)
+      Object.const_set :Rails, Module.new unless rails_defined
+      i18n = stub(i18n_options)
+      Rails.stubs application: stub(config: stub(i18n: i18n))
+      ex.run
+      Object.send(:remove_const, :Rails) unless rails_defined
+    end
+  end
+
+  def apply
+    subject.apply
+  end
+
+  context 'with available_locales' do
+    with_config(available_locales: %i(en ja))
+    include_context 'stubbed configuration'
+
+    it 'should have locales %i(en ja)' do
+      expect(subject.locales).to eq %i(en ja)
+    end
+  end
+
+  context 'with default_locale' do
+    with_config(available_locales: %i(ja))
+    include_context 'stubbed configuration'
+
+    it 'should have locales %i(ja)' do
+      expect(subject.locales).to eq %i(ja)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,6 +3,8 @@ require 'rspec'
 require 'bourne'
 require 'sham_rack'
 require 'webmock/rspec'
+require 'active_support'
+require 'active_support/core_ext'
 
 PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: copy_tuner_client
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - SonicGarden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   name: sham_rack
   requirement: !ruby/object:Gem::Requirement