onesky-rails 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d7915661efea085a8c067dbe1e636776cc3a4ed
-  data.tar.gz: 1472df68e788bdd979dea54c21ba92943709de6d
+  metadata.gz: 98c442ba47c28237b26cb4eeff0937fcf0356d1e
+  data.tar.gz: 290c1c4ef1fbc4e11f11c1dab1eb6fa5873f5fd8
 SHA512:
-  metadata.gz: bf3fb008dd2a75cdc91973a074afc7453593472c9f23254b18e7d1f4e12ca6a762d66b61b82f5a9112ad1955ccf6fb436e409f25e1fc15a6faab996ed4e5c2e2
-  data.tar.gz: 40100c3a9ae3878a5c1c2be2a317998c97e1d9a0312f56e96bb1da7a482ea81b7f88b1b6dd23422fa1ce8f26e89199bbe2958db9c4ed93ff0057eb8652d8b0d0
+  metadata.gz: 6560820aa8c5646dfd01deb01cafba66674f9bd5e776b0c8bdc2d4a79ea22f81c2667d6c696bcdf3c6d91b254aad805397c93fd4f371fe8033df0247fc61fff1
+  data.tar.gz: cdbac164fda226f0d1cef2caf7115c79fb7f247116ad6e66ca0d37c4d3ccdfc553f68eedbf1dd1c3a74253f89c151fc40a82ede666ac202331367616f7ab232c

data/lib/generators/templates/onesky.yml.tt

@@ -13,3 +13,9 @@ project_id: <%= config_hash[:project_id] %>
 
 upload:
   is_keeping_all_strings: true
+  # Uncomment one of these to filter files in your locales directory
+  # only:
+  #   - cms/en.yml
+  # except:
+  #   - admin.yml
+  #   - rails.yml

data/lib/onesky/rails/file_client.rb

@@ -87,7 +87,11 @@ NOTICE
       end
 
       def get_default_locale_files(string_path)
+        string_path = Pathname.new(string_path)
+        locale_files_filter = generate_locale_files_filter
         Dir.glob("#{string_path}/**/*.yml").map do |path|
+          relative_path = Pathname.new(path).relative_path_from(string_path).to_s
+          next if locale_files_filter && !locale_files_filter.call(relative_path)
           content_hash = YAML.load_file(path)
           path if content_hash && content_hash.has_key?(@base_locale.to_s)
         end.compact
@@ -104,9 +108,28 @@ NOTICE
       end
 
       def is_keep_strings?
-        return true unless (@config.has_key?('upload') && @config['upload'].has_key?('is_keeping_all_strings'))
+        return true unless upload_config.has_key?('is_keeping_all_strings')
 
-        !!@config['upload']['is_keeping_all_strings']
+        !!upload_config['is_keeping_all_strings']
+      end
+
+      def generate_locale_files_filter
+        only = Array(upload_config['only'])
+        except = Array(upload_config['except'])
+
+        if only.any? && except.any?
+          raise ArgumentError, "Invalid config. Can't use both `only` and `except` options."
+        end
+
+        if only.any?
+          ->(path) { only.include?(path) }
+        elsif except.any?
+          ->(path) { !except.include?(path) }
+        end
+      end
+
+      def upload_config
+        @config['upload'] ||= {}
       end
 
     end

data/lib/onesky/rails/version.rb

@@ -1,5 +1,5 @@
 module Onesky
   module Rails
-    VERSION = "1.3.1"
+    VERSION = "1.4.0"
   end
 end

data/spec/onesky/rails/file_client_spec.rb

@@ -19,13 +19,37 @@ describe Onesky::Rails::FileClient do
     FileUtils.remove_dir(file_path) if File.directory?(file_path)
   end
 
+  def create_config_hash_with_upload_options(upload_options)
+    create_config_hash.tap do |config|
+      config['upload'].merge!(upload_options)
+    end
+  end
+
   context '#upload' do
-    it 'all translation files to onesky' do
+    before(:each) do
       stub_request(:post, full_path_with_auth_hash("/projects/#{config_hash['project_id']}/files", config_hash['api_key'], config_hash['api_secret']))
         .to_return(status: 201)
+    end
 
+    it 'all translation files to onesky' do
       expect(client.upload(file_path)).to match_array(["#{file_path}/en.yml","#{file_path}/menu.yml"])
     end
+
+    context 'with `only` option' do
+      let(:config_hash) { create_config_hash_with_upload_options('only' => 'menu.yml') }
+
+      it 'matching translation files to onesky' do
+        expect(client.upload(file_path)).to match_array(["#{file_path}/menu.yml"])
+      end
+    end
+
+    context 'with `except` option' do
+      let(:config_hash) { create_config_hash_with_upload_options('except' => 'menu.yml') }
+
+      it 'matching translation files to onesky' do
+        expect(client.upload(file_path)).to match_array(["#{file_path}/en.yml"])
+      end
+    end
   end
 
   context 'download' do
@@ -93,6 +117,32 @@ describe Onesky::Rails::FileClient do
       end
     end
 
+    context 'with `only` option' do
+      let(:config_hash) { create_config_hash_with_upload_options('only' => 'menu.yml') }
+      let(:expected_locale_files) { ["#{locale_dir(locale)}/menu.yml"] }
+      let(:locale) { 'ja' }
+
+      it 'downloads matching translation from OneSky and save as YAML files' do
+        prepare_download_requests!(locale)
+        expect(locale_files(locale)).to be_empty
+        client.download(file_path)
+        expect(locale_files(locale)).to match_array(expected_locale_files)
+      end
+    end
+
+    context 'with `except` option' do
+      let(:config_hash) { create_config_hash_with_upload_options('except' => 'menu.yml') }
+      let(:expected_locale_files) { ["#{locale_dir(locale)}/ja.yml"] }
+      let(:locale) { 'ja' }
+
+      it 'downloads matching translation from OneSky and save as YAML files' do
+        prepare_download_requests!(locale)
+        expect(locale_files(locale)).to be_empty
+        client.download(file_path)
+        expect(locale_files(locale)).to match_array(expected_locale_files)
+      end
+    end
+
     def prepare_download_requests!(locale)
       Timecop.freeze
       file_names.keys.each do |file_name|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onesky-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Victor Lam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2016-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rails plugin to sync string files with OneSky