onesky-rails 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fc313f6b4a8ec077a60721fa8054d69204e7105
-  data.tar.gz: 02cc4184452f2ba4b3f4e1963b43b4bb382bee62
+  metadata.gz: efdecfa76c426d6b3c7ba6f9312f98c914f2d2e5
+  data.tar.gz: 16d9375f705ad4266a060273adf35c724cde0ae9
 SHA512:
-  metadata.gz: b75a07545691a62209caa27f0d3b0b3735f7b654cdd9e2b23a85a685e8ba32035e13cb9036fa7e6c3078a5d1dcc11fe55aae72ac84aa1456d3a4755836b9705c
-  data.tar.gz: 236dddc3a116d1bfca1d514130e8ff19dc485a61a2615429782e666690220c7f3e3ff5a13816e4f7a0571f0a92044f8ef6dc630b339ac26a33ff2deee4152316
+  metadata.gz: 4cad9660e157d30d332a0a24b9a934696ef771c4e6a7d15698b37986a458876d4f7d2f22c7c5f93dd10736a201ace9097c4cdaa2c686cc8d0d73e450c6f25765
+  data.tar.gz: d423d3944b8ddef1b687f9bd7de0ec06e8bdea16ffd445a24c42f7fd237a9e004c474b063a278b9e7a72585aca993e064b00aefd0e17d70b17856cb9b6de27c0

data/CHANGELOG.md

@@ -8,3 +8,9 @@
 
 * Add custom header
 * bump version to 1.0.0 as stable version
+
+### 1.1.0 - 9-JUN-2015
+
+* fix download multiple files
+* able to parse ERB template
+* able to customize base_locale

data/lib/onesky/rails/client.rb

@@ -15,7 +15,7 @@ module Onesky
         @client = ::Onesky::Client.new(@config['api_key'], @config['api_secret'])
         @client.plugin_code = 'rails-string'
         @project = @client.project(@config['project_id'].to_i)
-        @base_locale = ::I18n.default_locale
+        @base_locale = config_hash.fetch('base_locale', ::I18n.default_locale)
         @onesky_locales = []
       end
 

data/lib/onesky/rails/file_client.rb

@@ -52,21 +52,16 @@ NOTICE
         DIR_PREFIX + locale
       end
 
-      def extract_file_name(header_hash)
-        search_text = 'filename='
-        if disposition = header_hash[:content_disposition]
-          if idx = disposition.index(search_text)
-            disposition[(idx + search_text.length)..-1]
-          end
-        end
-      end
-
       def make_translation_dir(dir_path, locale)
         target_path = File.join(dir_path, locale_dir(locale))
         Dir.mkdir(target_path) unless File.directory?(target_path)
         target_path
       end
 
+      def locale_file_name(file, to_locale)
+        file.sub(@base_locale.to_s, to_locale)
+      end
+
       def get_default_locale_files(string_path)
         Dir.glob("#{string_path}/**/*.yml").map do |path|
           content_hash = YAML.load_file(path)
@@ -76,7 +71,8 @@ NOTICE
 
       def save_translation(response, string_path, locale, file)
         locale_path = make_translation_dir(string_path, locale)
-        target_file = extract_file_name(response.headers) || file
+        target_file = locale_file_name(file, locale)
+
         File.open(File.join(locale_path, target_file), 'w') do |f|
           f.write(TRANSLATION_NOTICE + response.body.force_encoding(ENCODING))
         end

data/lib/onesky/rails/version.rb

@@ -1,5 +1,5 @@
 module Onesky
   module Rails
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/lib/tasks/onesky.rake

@@ -13,7 +13,9 @@ namespace :onesky do
   end
 
   def file_client
-    Onesky::Rails::FileClient.new YAML.load_file(Rails.root.join('config', 'onesky.yml'))
+    require 'erb'
+    data = YAML::load(ERB.new(File.read(Rails.root.join('config', 'onesky.yml'))).result)
+    Onesky::Rails::FileClient.new data
   end
 
   def locale_path

data/onesky-rails.gemspec

@@ -24,5 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", "~> 10.3"
   spec.add_development_dependency "rspec", "~> 3.1.0"
+  spec.add_development_dependency "timecop", "~> 0.7.0"
   spec.add_development_dependency "webmock", "~> 1.19.0"
 end

data/spec/fixtures/locales/special_en.yml

@@ -0,0 +1,2 @@
+en:
+  some: thing

data/spec/onesky/rails/client_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Onesky::Rails::Client do
+  let(:config_hash) { create_config_hash }
 
   describe '#new' do
 
@@ -31,6 +32,17 @@ describe Onesky::Rails::Client do
         expect{client.verify_languages!}.to_not raise_error
         expect(client.onesky_locales).to eq(['ja'])
       end
+
+      context 'with explicit base locale and different default locale' do
+        let(:config_hash) { create_config_hash.merge({'base_locale' => 'en'}) }
+
+        it 'to retrieve languages activated at OneSky' do
+          I18n.default_locale = :ja
+
+          expect{client.verify_languages!}.to_not raise_error
+          expect(client.onesky_locales).to eq(['ja'])
+        end
+      end
     end
 
     context 'fail' do

data/spec/onesky/rails/file_client_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe Onesky::Rails::FileClient do
 
+  let(:config_hash) { create_config_hash }
   let(:client) {Onesky::Rails::FileClient.new(config_hash)}
   let(:file_path) { File.expand_path("../../../fixtures/locales", __FILE__) }
 
@@ -10,24 +11,21 @@ describe Onesky::Rails::FileClient do
   end
 
   context '#upload' do
-    it 'strings to onesky' do
+    it 'all translation files to onesky' 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)
 
-      expect(client.upload(file_path)).to eq(["#{file_path}/en.yml"])
+      expect(client.upload(file_path)).to match_array(["#{file_path}/en.yml","#{file_path}/special_en.yml"])
     end
   end
 
   context 'download' do
 
-    let(:file_name) {'ja.yml'}
-    let(:response_headers) do
-      {
-        'Content-Type'        => 'text/plain',
-        'Content-Disposition' => "attachment; filename=#{file_name}",
-      }
+    let(:expected_locale_files) do
+      ["#{locale_dir}/ja.yml", "#{locale_dir}/special_ja.yml"]
     end
-    let(:query_string) {'&source_file_name=en.yml&locale=ja'}
+
+    let(:file_names) {['en.yml', 'special_en.yml']}
 
     def locale_dir
       File.join(file_path, 'onesky_ja')
@@ -53,16 +51,29 @@ describe Onesky::Rails::FileClient do
     end
 
     it 'download translations from OneSky and save as YAML files' do
-      stub_request(:get, full_path_with_auth_hash("/projects/#{config_hash['project_id']}/translations", config_hash['api_key'], config_hash['api_secret']) + query_string)
-        .to_return(
-          status: 200,
-          body: File.read(File.join(file_path, file_name)),
-          headers: response_headers)
+      prepare_download_requests!
 
       expect(locale_files).to be_empty
       client.download(file_path)
-      expect(locale_files).to eq(["#{locale_dir}/#{file_name}"])
+      expect(locale_files).to match_array(expected_locale_files)
     end
+
+    def prepare_download_requests!
+      Timecop.freeze
+      file_names.each do |file_name|
+        response_headers = {
+          'Content-Type'        => 'text/plain',
+          'Content-Disposition' => "attachment; filename=#{file_name}",
+        }
+        query_string = "&source_file_name=#{file_name}&locale=ja"
+        stub_request(:get, full_path_with_auth_hash("/projects/#{config_hash['project_id']}/translations", config_hash['api_key'], config_hash['api_secret']) + query_string)
+          .to_return(
+            status: 200,
+            body: File.read(File.join(file_path, file_name)),
+            headers: response_headers)
+      end
+    end
+
   end
 
 end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ require 'webmock/rspec'
 require 'i18n'
 require 'onesky/rails'
 require 'onesky'
+require 'timecop'
 
 WebMock.disable_net_connect!(allow_localhost: true)
 
@@ -46,7 +47,7 @@ def languages_response
   }
 end
 
-def config_hash
+def create_config_hash
   {
     "api_key" => 'fakeapi',
     "api_secret" => 'fakesecret',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onesky-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Victor Lam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,7 @@ files:
 - spec/fixtures/locales/en.json
 - spec/fixtures/locales/en.yml
 - spec/fixtures/locales/ja.yml
+- spec/fixtures/locales/special_en.yml
 - spec/onesky/rails/client_spec.rb
 - spec/onesky/rails/file_client_spec.rb
 - spec/spec_helper.rb
@@ -153,7 +168,7 @@ test_files:
 - spec/fixtures/locales/en.json
 - spec/fixtures/locales/en.yml
 - spec/fixtures/locales/ja.yml
+- spec/fixtures/locales/special_en.yml
 - spec/onesky/rails/client_spec.rb
 - spec/onesky/rails/file_client_spec.rb
 - spec/spec_helper.rb
-has_rdoc: