one_sky 2.0.1 → 2.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a26f82a2889f17e52b7eb2e29e5b14044636dbd2
+  data.tar.gz: 102ac67ec03058c57c8e3d7b1a4dd85daa34f284
+SHA512:
+  metadata.gz: 0da077a007c4aac66d1ab9ddec40e5d44ac88cf3fa4e1426797f25cf1d79a69979d936ab5a6b388675b8d792a07751fbb2171c8cc535d3f32a50a0628efa6842
+  data.tar.gz: 462f54493da9fcd9137aad7dbaf80ed0ef3825e89ea7f833717ab3576cf5a9bdfe757dd3fda989d76841a06d6d0d10abe43bff63799221438dbc8e199cd4676d

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - 2.0.0
+  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-18mode
+  - rbx-19mode

data/CHANGELOG

@@ -3,3 +3,5 @@
 == 0.0.1 (03 Jan 2010)
 * Initial release.
 
+== 2.1.0 (03 Jul 2014)
+* Support YAML array

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    one_sky (2.0.0)
+    one_sky (2.0.1)
       json (>= 1.4.0)
       rest-client (>= 1.4.0)
 
@@ -9,8 +9,8 @@ GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
-    json (1.6.3)
-    mime-types (1.17.2)
+    json (1.8.1)
+    mime-types (2.3)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.2.0)

data/lib/one_sky/client.rb

@@ -73,7 +73,7 @@ module OneSky
       return response.body unless response.headers[:content_type] =~ /json/
       response_hash = JSON.parse(response.body)
 
-      raise ApiError, response.body if response_hash.has_key?("response") and response_hash["response"] != "ok"
+      raise ApiError, response.body if response_hash.has_key?("response") and (response_hash["response"] != "ok" && response_hash["response"] != 'upload-in-progress')
       response_hash
     end
   end

data/lib/one_sky/translation.rb

@@ -30,10 +30,18 @@ module OneSky
     # Add new strings to be translated.
     #   expects a hash of {"string_key1" => "String 1", "string_key2" => "String 2"}
     def input_phrases(phrases, options={})
-      strings = phrases.map do |string_key, string|
-        {:string_key => string_key, :string => string}
+      strings = phrases.map do |string_key, value|
+        if value.is_a? Array
+          output = []
+          value.each_with_index do |string, index|
+            output << {:string_key => string_key.to_s, :string => string, :context => index}
+          end
+          output
+        else
+          {:string_key => string_key.to_s, :string => value}
+        end
       end
-      input_strings(strings, options)
+      input_strings(strings.flatten(1), options)
     end
 
     # Add translation to a string.
@@ -67,13 +75,13 @@ module OneSky
       end
 
     # Download strings and translations as string file. In RUBY_YAML format.
-    def download_yaml(locale)
-      download_file(locale, YAML_FORMAT)
+    def download_yaml(locale, options={})
+      download_file(options.merge(:locale => locale, :format => YAML_FORMAT))
     end
 
     # Download strings and translations as string file. In GNU_PO format.
-    def download_po(locale)
-      download_file(locale, PO_FORMAT)
+    def download_po(locale, options ={})
+      download_file(options.merge(:locale => locale, :format => PO_FORMAT))
     end
 
     protected
@@ -92,8 +100,8 @@ module OneSky
     end
 
     # Download strings and translations as string file.
-    def download_file(locale, format)
-      get("string/download", :locale => locale, :format => format)
+    def download_file(options)
+      get("string/download", options)
     end
 
     def get(path, params={})

data/lib/one_sky/version.rb

@@ -1,3 +1,3 @@
 module OneSky
-  VERSION = "2.0.1"
+  VERSION = "2.1.0"
 end

data/spec/live_spec.rb

@@ -43,7 +43,7 @@ describe OneSky, :live => true do
       locales.should be_an_instance_of Array
       locales.should_not be_empty
       en_us = locales.detect{|l| l["locale"] == english_locale }
-      en_us["name"]["eng"].should == "English (US)"
+      en_us["name"]["eng"].should == "English"
     end
     
     it "platform_types" do
@@ -51,7 +51,7 @@ describe OneSky, :live => true do
       types.should be_an_instance_of Array
       types.should_not be_empty
       website = types.detect{|t| t["code"] == platform_code }
-      website.should == {"name" => "Website", "code" => platform_code}
+      website.should == {"name" => "Regular Website", "code" => platform_code}
     end
     
     it "get_sso_link" do
@@ -100,7 +100,7 @@ describe OneSky, :live => true do
       locales.should be_an_instance_of Array
       locales.should_not be_empty
       en_us = locales.detect{|l| l["locale"] == english_locale }
-      en_us["name"]["eng"].should == "English (US)"
+      en_us["name"]["eng"].should == "English"
     end
   end
   
@@ -146,7 +146,7 @@ describe OneSky, :live => true do
     it "output_for_locale" do
       output = translation.output_for_locale(chinese_locale)
       output.should be_an_instance_of Hash
-      
+
       output["Default"].keys.should == [chinese_locale]
       output["Default"][chinese_locale].should have_key("test1")
     end
@@ -165,9 +165,11 @@ describe OneSky, :live => true do
     end
     
     it "download_yaml" do
+      chinese_locale = "zh-CN"
+
       yaml = translation.download_yaml(chinese_locale)
       yaml.should be_an_instance_of String
-      
+
       hash = YAML.load(yaml)
       hash.should be_an_instance_of Hash
       

data/spec/translation_spec.rb

@@ -21,7 +21,6 @@ describe OneSky::Translation do
       [{:string => "test1"}, {:string => "test2"}]
     }
 
-
     context "with an array of strings" do
       it "calls /string/input" do
         client.should_receive(:post).with("string/input", :input => JSON.dump(hash_array), :"platform-id" => platform_id)
@@ -72,6 +71,19 @@ describe OneSky::Translation do
   end
 
   describe "input_phrases" do
+    let(:hash_string) {
+      {:test1 => "string1", :test2 => "string2", :array1 => ["first", "second"]}
+    }
+
+    let(:hash_output) {
+      [
+        {:string_key => "test1", :string => "string1"},
+        {:string_key => "test2", :string => "string2"},
+        {:string_key => "array1", :string => "first", :context => 0},
+        {:string_key => "array1", :string => "second", :context => 1},
+      ]
+    }
+
     it "defers to input_strings" do
       translation.should_receive(:input_strings).with([{:string_key => "test1", :string => "Test 1"}], {})
       translation.input_phrases("test1" => "Test 1")
@@ -82,6 +94,11 @@ describe OneSky::Translation do
       translation.input_phrases({"test1" => "Test 1"}, :tag => "tagged")
     end
 
+    it "transform an hash of strings" do
+      translation.should_receive(:input_strings).with(hash_output, {})
+      translation.input_phrases(hash_string)
+    end
+
   end
 
   describe "translate" do

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: one_sky
 version: !ruby/object:Gem::Version
-  version: 2.0.1
-  prerelease: 
+  version: 2.1.0
 platform: ruby
 authors:
 - Junjun Olympia
@@ -11,63 +10,78 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70150153158340 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70150153158340
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70150153157440 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70150153157440
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70150153156480 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *70150153156480
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70150153156020 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70150153156020
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: time_freeze
-  requirement: &70150153155640 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70150153155640
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: OneSky is a community-powered translation service for web and mobile
   apps. This gem is the core interface to the REST API and is used by other specialty
   gems such the OneSky extension for I18n, i18n-one_sky.
@@ -79,8 +93,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG
 - CREDITS
 - Gemfile
@@ -107,27 +122,26 @@ files:
 - spec/utility_spec.rb
 homepage: http://developer.oneskyapp.com/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: one_sky
-rubygems_version: 1.8.10
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby interface to the OneSky REST API
 test_files:
 - spec/client_spec.rb
@@ -139,4 +153,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/translation_spec.rb
 - spec/utility_spec.rb
-has_rdoc: