onesky-rails 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c39b314d8923cbeb02de9aa079f5a7879b42d1cb
-  data.tar.gz: ca29ec9a0b41898afbc58f0bb361a610e8e1efc0
+  metadata.gz: 8d7915661efea085a8c067dbe1e636776cc3a4ed
+  data.tar.gz: 1472df68e788bdd979dea54c21ba92943709de6d
 SHA512:
-  metadata.gz: 2136ba483f9b8a6455039c8dc0da0a0649b4945ce9fff4434919e92d32d9f17a38f57ec83c075e10a26735035eb08765413336168f0289955105789a899bc352
-  data.tar.gz: 0d66f3beef5005099a61e561fcd4d6a3e90e0cab30f22f21f2402d766456f3099cd287f4ff690a180043dfcb2b9e60202ff390d6a8703580c25a7b40ed6d6f83
+  metadata.gz: bf3fb008dd2a75cdc91973a074afc7453593472c9f23254b18e7d1f4e12ca6a762d66b61b82f5a9112ad1955ccf6fb436e409f25e1fc15a6faab996ed4e5c2e2
+  data.tar.gz: 40100c3a9ae3878a5c1c2be2a317998c97e1d9a0312f56e96bb1da7a482ea81b7f88b1b6dd23422fa1ce8f26e89199bbe2958db9c4ed93ff0057eb8652d8b0d0

data/CHANGELOG.md

@@ -1,13 +1,15 @@
-### 0.0.1 - 4-NOV-2014
+### 1.3.1 - 17-MAY-2016
 
-* Generate config file
-* Upload base locale string files to OneSky
-* Download translations from OneSky
+* fix downloaded file naming
 
-### 1.0.0 - 31-DEC-2014
+### 1.3.0 - 13-MAY-2016
 
-* Add custom header
-* bump version to 1.0.0 as stable version
+* support download base language only translation files
+* support download all translation files
+
+### 1.2.0 - 13-JUL-2015
+
+* support custom locale
 
 ### 1.1.0 - 9-JUN-2015
 
@@ -15,11 +17,13 @@
 * able to parse ERB template
 * able to customize base_locale
 
-### 1.2.0 - 13-JUL-2015
+### 1.0.0 - 31-DEC-2014
 
-* support custom locale
+* Add custom header
+* bump version to 1.0.0 as stable version
 
-### 1.3.0 - 13-MAY-2016
+### 0.0.1 - 4-NOV-2014
 
-* support download base language only translation files
-* support download all translation files
+* Generate config file
+* Upload base locale string files to OneSky
+* Download translations from OneSky

data/lib/onesky/rails/file_client.rb

@@ -79,7 +79,11 @@ NOTICE
       end
 
       def locale_file_name(file, to_locale)
-        file.sub(@base_locale.to_s, to_locale)
+        if File.basename(file, '.*') == @base_locale.to_s
+          file.sub(@base_locale.to_s, to_locale)
+        else
+          file
+        end
       end
 
       def get_default_locale_files(string_path)

data/lib/onesky/rails/version.rb

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

data/spec/onesky/rails/file_client_spec.rb

@@ -24,13 +24,19 @@ describe Onesky::Rails::FileClient 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 match_array(["#{file_path}/en.yml","#{file_path}/special_en.yml"])
+      expect(client.upload(file_path)).to match_array(["#{file_path}/en.yml","#{file_path}/menu.yml"])
     end
   end
 
   context 'download' do
 
-    let(:file_names) {['en.yml', 'special_en.yml']}
+    let(:file_names) do
+      # source filename => downloaded filename
+      {
+        'en.yml' => {'en' => 'en.yml', 'ja' => 'ja.yml'},
+        'menu.yml' => {'en' => 'menu.yml', 'ja' => 'menu.yml'}
+      }
+    end
 
     def locale_dir(locale)
       locale == I18n.default_locale.to_s ? file_path : File.join(file_path, 'onesky_ja')
@@ -41,7 +47,7 @@ describe Onesky::Rails::FileClient do
     end
 
     def expected_locale_files(locale)
-      ["#{locale_dir(locale)}/#{locale}.yml", "#{locale_dir(locale)}/special_#{locale}.yml"]
+      ["#{locale_dir(locale)}/#{locale}.yml", "#{locale_dir(locale)}/menu.yml"]
     end
 
     it 'download translations from OneSky and save as YAML files' do
@@ -65,7 +71,7 @@ describe Onesky::Rails::FileClient do
 
       # test file content
       content = YAML.load_file(expected_files.pop)
-      expected_content = YAML.load_file(File.join(sample_file_path, locale, 'special_en.yml'))
+      expected_content = YAML.load_file(File.join(sample_file_path, locale, 'menu.yml'))
       expect(content).to eq(expected_content)
     end
 
@@ -82,15 +88,15 @@ describe Onesky::Rails::FileClient do
 
         # test file content
         content = YAML.load_file(expected_files.pop)
-        expected_content = YAML.load_file(File.join(sample_file_path, locale, "special_#{locale}.yml"))
+        expected_content = YAML.load_file(File.join(sample_file_path, locale, "menu.yml"))
         expect(content).to eq(expected_content)
       end
     end
 
     def prepare_download_requests!(locale)
       Timecop.freeze
-      file_names.each do |file_name|
-        downloaded_file_name = file_name.sub(/en/, locale)
+      file_names.keys.each do |file_name|
+        downloaded_file_name = file_names[file_name][locale]
         response_headers = {
           'Content-Type'        => 'text/plain',
           'Content-Disposition' => "attachment; filename=#{downloaded_file_name}",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onesky-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Victor Lam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -134,11 +134,11 @@ files:
 - lib/tasks/onesky.rake
 - onesky-rails.gemspec
 - spec/fixtures/sample_files/en/en.yml
-- spec/fixtures/sample_files/en/special_en.yml
+- spec/fixtures/sample_files/en/menu.yml
 - spec/fixtures/sample_files/ja/ja.yml
-- spec/fixtures/sample_files/ja/special_ja.yml
+- spec/fixtures/sample_files/ja/menu.yml
 - spec/fixtures/sample_files/original/en.yml
-- spec/fixtures/sample_files/original/special_en.yml
+- spec/fixtures/sample_files/original/menu.yml
 - spec/onesky/rails/client_spec.rb
 - spec/onesky/rails/file_client_spec.rb
 - spec/spec_helper.rb
@@ -168,11 +168,11 @@ specification_version: 4
 summary: Rails plugin to sync string files with OneSky
 test_files:
 - spec/fixtures/sample_files/en/en.yml
-- spec/fixtures/sample_files/en/special_en.yml
+- spec/fixtures/sample_files/en/menu.yml
 - spec/fixtures/sample_files/ja/ja.yml
-- spec/fixtures/sample_files/ja/special_ja.yml
+- spec/fixtures/sample_files/ja/menu.yml
 - spec/fixtures/sample_files/original/en.yml
-- spec/fixtures/sample_files/original/special_en.yml
+- spec/fixtures/sample_files/original/menu.yml
 - spec/onesky/rails/client_spec.rb
 - spec/onesky/rails/file_client_spec.rb
 - spec/spec_helper.rb