localeapp 0.5.0 → 0.5.1

data/.travis.yml

@@ -2,6 +2,8 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - jruby-18mode
+  - jruby-19mode
 gemfile:
   - Gemfile.i18n_037
   - Gemfile.i18n_050

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# Version 0.5.1
+
+* Fix bug with encoding of response from http_client
+* Test on Jruby
+* Compatibility with gli 2.0.0
+
 # Version 0.5.0
 
 * Post translations with default values

data/Gemfile

@@ -1,2 +1,6 @@
 source :rubyforge
 gemspec
+
+platform :jruby do
+  gem 'jruby-openssl'
+end

data/Gemfile.i18n_037

@@ -3,3 +3,7 @@ gemspec
 
 gem 'i18n', '0.3.7'
 gem 'activesupport', '2.3.14'
+
+platform :jruby do
+  gem 'jruby-openssl'
+end

data/Gemfile.i18n_050

@@ -2,3 +2,7 @@ source :rubyforge
 gemspec
 
 gem 'i18n', '0.5.0'
+
+platform :jruby do
+  gem 'jruby-openssl'
+end

data/Gemfile.i18n_060

@@ -2,3 +2,7 @@ source :rubyforge
 gemspec
 
 gem 'i18n', '~> 0.6.0'
+
+platform :jruby do
+  gem 'jruby-openssl'
+end

data/README.md

@@ -191,4 +191,4 @@ See [this article on Ruby Inside][1] for some more details.
 ### Support and feedback
 
 You can contact us via the support link at the bottom of the page or emailing
-info@localeapp.com
+support@localeapp.com

data/bin/localeapp

@@ -22,7 +22,13 @@ def initialize_config
 end
 
 require 'gli'
-include GLI
+gli2 = GLI::VERSION >= '2.0.0'
+
+if gli2
+  include GLI::App
+else
+  include GLI
+end
 
 version Localeapp::VERSION
 
@@ -142,4 +148,8 @@ command :daemon do |c|
   end
 end
 
-exit GLI.run(ARGV)
+if gli2
+  exit run(ARGV)
+else
+  exit GLI.run(ARGV)
+end

data/features/localeapp_binary.feature

@@ -5,7 +5,7 @@ Feature: localeapp executable
     When I run `localeapp help`
     Then the output should contain:
     """
-    usage: localeapp [global options] command [command options]
+    localeapp [global options] command [command options]
     """
 
   Scenario: Running a command that doesn't exist
@@ -13,7 +13,7 @@ Feature: localeapp executable
     When I run `localeapp foo`
     Then the output should contain:
     """
-    error: Unknown command 'foo'. Use 'localeapp help' for a list of commands
+    error: Unknown command 'foo'
     """
 
   Scenario: Running Rails install

data/features/support/hooks.rb

@@ -1,4 +1,4 @@
 Before do
   ENV['FAKE_WEB_DURING_CUCUMBER_RUN'] = '1'
-  @aruba_timeout_seconds = 5
+  @aruba_timeout_seconds = 15
 end

data/lib/localeapp.rb

@@ -125,8 +125,16 @@ module Localeapp
 
     private
 
+    def private_null_type(results)
+      return true if results.is_a?(YAML::PrivateType) && results.type_id == 'null'
+      if RUBY_PLATFORM == 'java'
+        return true if results.is_a?(YAML::Yecht::PrivateType) && results.type_id == 'null'
+      end
+      false
+    end
+
     def normalize_results(results)
-      if results.is_a?(YAML::PrivateType) && results.type_id == 'null'
+      if private_null_type(results)
         nil
       elsif results.is_a?(Array)
         results.each_with_index do |value, i|

data/lib/localeapp/api_caller.rb

@@ -24,8 +24,12 @@ module Localeapp
       success = false
       while connection_attempts < max_connection_attempts
         sleep_if_retrying
+
         response = make_call(method, url)
         Localeapp.debug("RESPONSE: #{response.code}")
+
+        fix_encoding(response)
+
         valid_response_codes = (200..207).to_a
         if valid_response_codes.include?(response.code.to_i)
           if options[:success]
@@ -83,5 +87,13 @@ module Localeapp
         sleep time
       end
     end
+
+    def fix_encoding(response)
+      if response.respond_to?(:force_encoding)
+        if (charset = response.net_http_res.type_params['charset'])
+          response.force_encoding(charset)
+        end
+      end
+    end
   end
 end

data/lib/localeapp/updater.rb

@@ -35,7 +35,7 @@ module Localeapp
 
     def generate_yaml(translations)
       if defined? Psych
-        Psych.dump(translations, :line_width => -1)[4..-1]
+        Psych.dump(translations, :line_width => -1)[4..-1].sub(/\.\.\.\n$/, '')
       else
         translations.ya2yaml[5..-1]
       end

data/lib/localeapp/version.rb

@@ -1,3 +1,3 @@
 module Localeapp
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/localeapp.gemspec

@@ -26,9 +26,9 @@ Gem::Specification.new do |s|
   s.add_dependency('gli')
 
   s.add_development_dependency('rake')
-  s.add_development_dependency('rspec', '2.5.0')
+  s.add_development_dependency('rspec', '2.11.0')
   s.add_development_dependency('yard', '0.6.7')
-  s.add_development_dependency('RedCloth', '4.2.8')
-  s.add_development_dependency('aruba', '0.3.6')
+  s.add_development_dependency('RedCloth', '4.2.9')
+  s.add_development_dependency('aruba', '0.4.11')
   s.add_development_dependency('fakeweb', '1.3.0')
 end

data/spec/localeapp/api_caller_spec.rb

@@ -36,6 +36,22 @@ describe Localeapp::ApiCaller, "#call(object)" do
     @api_caller.call(self)
   end
 
+  if "".respond_to?(:force_encoding)
+    def success_check(response)
+      response.encoding.should == Encoding.find('UTF-8')
+    end
+
+    it "sets the response encoding based on the response charset" do
+      response = "string"
+      response.stub!(:code).and_return(200)
+      response.force_encoding('US-ASCII')
+      response.stub_chain(:net_http_res, :type_params).and_return('charset' => 'utf-8')
+      RestClient::Request.stub(:execute).and_return(response)
+      @api_caller.options[:success] = :success_check
+      @api_caller.call(self)
+    end
+  end
+
   context "Proxy" do
     before do
       RestClient::Request.stub!(:execute).and_return(double('response', :code => 200))

data/spec/localeapp/updater_spec.rb

@@ -37,7 +37,20 @@ describe Localeapp::Updater, ".update(data)" do
 
     if defined? Psych
       if Psych::VERSION == '1.0.0'
-        File.read(File.join(@yml_dir, 'en.yml')).should == <<-EN
+        if RUBY_ENGINE == 'jruby'
+          File.read(File.join(@yml_dir, 'en.yml')).should == <<-EN
+en:
+  foo:
+    monkey: hello
+    night: the night
+  space:
+  blank: ''
+  tilde:
+  scalar1:
+  scalar2:
+EN
+        else
+          File.read(File.join(@yml_dir, 'en.yml')).should == <<-EN
 en:
   foo:
     monkey: hello
@@ -48,6 +61,7 @@ en:
   scalar1: !!null 
   scalar2: !!null 
 EN
+        end
       else
         File.read(File.join(@yml_dir, 'en.yml')).should == <<-EN
 en:

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: localeapp
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Christopher Dell
@@ -16,13 +16,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-04 00:00:00 Z
+date: 2012-08-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: i18n
-  type: :runtime
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,12 +30,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,12 +44,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rest-client
-  type: :runtime
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,12 +58,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: ya2yaml
-  type: :runtime
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -73,12 +72,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: gli
-  type: :runtime
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -87,12 +86,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :development
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -101,28 +100,28 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
+  type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 35
         segments: 
         - 2
-        - 5
+        - 11
         - 0
-        version: 2.5.0
-  requirement: *id007
+        version: 2.11.0
+  type: :development
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: yard
-  type: :development
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -133,44 +132,44 @@ dependencies:
         - 6
         - 7
         version: 0.6.7
-  requirement: *id008
+  type: :development
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: RedCloth
-  type: :development
   prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 39
+        hash: 37
         segments: 
         - 4
         - 2
-        - 8
-        version: 4.2.8
-  requirement: *id009
+        - 9
+        version: 4.2.9
+  type: :development
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: aruba
-  type: :development
   prerelease: false
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 25
         segments: 
         - 0
-        - 3
-        - 6
-        version: 0.3.6
-  requirement: *id010
+        - 4
+        - 11
+        version: 0.4.11
+  type: :development
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: fakeweb
-  type: :development
   prerelease: false
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -181,7 +180,8 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  requirement: *id011
+  type: :development
+  version_requirements: *id011
 description: Synchronizes i18n translation keys and content with localeapp.com so you don't have to manage translations by hand.
 email: 
 - chris@tigrish.com
@@ -291,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: localeapp
-rubygems_version: 1.8.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Easy i18n translation management with localeapp.com