to_lang 0.3.0 → 0.3.1

data/.gitignore

@@ -5,3 +5,4 @@ Gemfile.lock
 coverage/*
 doc/*
 .yardoc
+.rvmrc

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format nested

data/.travis.yml

@@ -0,0 +1,5 @@
+---
+rvm:
+  - 1.8.7
+  - 1.9.2
+

data/README.textile

@@ -2,6 +2,10 @@ h1. to_lang
 
 *to_lang* is a Ruby library that adds language translation methods to strings and arrays, backed by the Google Translate API.
 
+h2. Build Status
+
+"!https://travis-ci.org/jimmycuadra/to_lang.png!":http://travis-ci.org/jimmycuadra/to_lang
+
 h2. Installation
 
 Simply run @gem install to_lang@.

data/Rakefile

@@ -5,12 +5,3 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
-
-require 'yard'
-YARD::Rake::YardocTask.new do |t|
-  t.options = [
-    '--no-private',
-    '--protected',
-    '--markup', 'textile',
-  ]
-end

data/lib/to_lang/connector.rb

@@ -1,5 +1,6 @@
 require 'httparty'
 require 'cgi'
+require "to_lang/core_ext"
 
 module ToLang
   # Responsible for making the actual HTTP request to the Google Translate API.

data/lib/to_lang/core_ext.rb

@@ -0,0 +1,49 @@
+# Hash extensions taken from John Nunemaker's Crack gem.
+#
+# Crack was previously a dependency for HTTParty, but since it
+# no longer is, the methods being used by {ToLang} are included
+# here directly.
+#
+class Hash
+  # Convert the entire has into a string suitable for HTTP requests.
+  #
+  # @return [String] This hash as a query string.
+  #
+  def to_params
+    params = self.map { |k,v| normalize_param(k,v) }.join
+    params.chop! # trailing &
+    params
+  end
+
+  # Turns a key value pair into a string suitable for HTTP requests.
+  #
+  # @param [Object] key The key for the param.
+  # @param [Object] value The value for the param.
+  #
+  # @return [String] This key value pair as a param
+  #
+  def normalize_param(key, value)
+    param = ''
+    stack = []
+
+    if value.is_a?(Array)
+      param << value.map { |element| normalize_param("#{key}[]", element) }.join
+    elsif value.is_a?(Hash)
+      stack << [key,value]
+    else
+      param << "#{key}=#{URI.encode(value.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}&"
+    end
+
+    stack.each do |parent, hash|
+      hash.each do |key, value|
+        if value.is_a?(Hash)
+          stack << ["#{parent}[#{key}]", value]
+        else
+          param << normalize_param("#{parent}[#{key}]", value)
+        end
+      end
+    end
+
+    param
+  end
+end

data/lib/to_lang/version.rb

@@ -1,5 +1,5 @@
 module ToLang
   # The current version of the Ruby gem.
   #
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/to_lang/connector_spec.rb

@@ -13,7 +13,7 @@ describe ToLang::Connector do
         :target => 'es',
         :q => ["banana", "apple"]
       }
-      ToLang::Connector::UNSORTED_QUERY_STRING_NORMALIZER.call(params).should == "key_with_no_value&key=apikey&target=es&q=banana&q=apple"
+      ToLang::Connector::UNSORTED_QUERY_STRING_NORMALIZER.call(params).should =~ /q=banana&q=apple/
     end
   end
 

data/spec/to_lang/core_ext_spec.rb

@@ -0,0 +1,44 @@
+require "spec_helper"
+
+describe Hash do
+  describe "#to_params" do
+    test_hashes = {
+      { "foo" => "bar", "baz" => "bat" } => "foo=bar&baz=bat",
+      { "foo" => [ "bar", "baz" ] } => "foo[]=bar&foo[]=baz",
+      { "foo" => [ {"bar" => "1"}, {"bar" => 2} ] } => "foo[][bar]=1&foo[][bar]=2",
+      { "foo" => { "bar" => [ {"baz" => 1}, {"baz" => "2"}  ] } } => "foo[bar][][baz]=1&foo[bar][][baz]=2",
+      { "foo" => {"1" => "bar", "2" => "baz"} } => "foo[1]=bar&foo[2]=baz"
+    }
+
+    test_hashes.each do |hash, params|
+      it "converts hash: #{hash.inspect} to params: #{params.inspect}" do
+        hash.to_params.split('&').sort.should == params.split('&').sort
+      end
+    end
+
+    it "doesn't leave a trailing &" do
+      {
+        :name => 'Bob',
+        :address => {
+          :street => '111 Ruby Ave.',
+          :city => 'Ruby Central',
+          :phones => ['111-111-1111', '222-222-2222']
+        }
+      }.to_params.should_not =~ /&$/
+    end
+
+    it "URL encodes unsafe characters" do
+      { :q => "?&\" +" }.to_params.should == "q=%3F%26%22%20%2B"
+    end
+
+    it "converts deeply nested hashes" do
+      {
+        :one => {
+          :two => {
+            :three => true
+          }
+        }
+      }.to_params.should == "one[two][three]=true"
+    end
+  end
+end

data/to_lang.gemspec

@@ -16,14 +16,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "httparty", "~> 0.7.0"
-  s.add_development_dependency "bundler", "~> 1.0.10"
-  s.add_development_dependency "rake", "~> 0.8.7"
-  s.add_development_dependency "rspec", "~> 2.5.0"
-  s.add_development_dependency "simplecov", "~> 0.4.1"
-  s.add_development_dependency "yard", "~> 0.6.5"
-  s.add_development_dependency "RedCloth", "~> 4.2.7"
-  s.add_development_dependency "guard-rspec", "~> 0.2.0"
-  s.add_development_dependency "rb-fsevent", "~> 0.4.0" if RUBY_PLATFORM[/darwin/]
-  s.add_development_dependency "growl", "~> 1.0.3" if RUBY_PLATFORM[/darwin/]
+  s.add_dependency "httparty", "~> 0.8.0"
+  s.add_development_dependency "rake", "~> 0.9.2"
+  s.add_development_dependency "rspec", "~> 2.6.0"
+  s.add_development_dependency "simplecov", "~> 0.5.3"
+  s.add_development_dependency "RedCloth", "~> 4.2.8"
+  s.add_development_dependency "guard-rspec", "~> 0.4.5"
+  s.add_development_dependency "rb-fsevent", "~> 0.4.3" if RUBY_PLATFORM[/darwin/]
+  s.add_development_dependency "growl_notify", "~> 0.0.1" if RUBY_PLATFORM[/darwin/]
 end

metadata

@@ -1,139 +1,116 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: to_lang
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.1
   prerelease: 
-  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Jimmy Cuadra
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-14 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-15 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: httparty
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70175836589280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.7.0
+      - !ruby/object:Gem::Version
+        version: 0.8.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.10
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70175836589280
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70175836588020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.8.7
+      - !ruby/object:Gem::Version
+        version: 0.9.2
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70175836588020
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70175836585300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.5.0
+      - !ruby/object:Gem::Version
+        version: 2.6.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70175836585300
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &70175836583680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.4.1
+      - !ruby/object:Gem::Version
+        version: 0.5.3
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.6.5
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70175836583680
+- !ruby/object:Gem::Dependency
   name: RedCloth
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70175836582060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 4.2.7
+      - !ruby/object:Gem::Version
+        version: 4.2.8
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: guard-rspec
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70175836582060
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &70175836580900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.2.0
+      - !ruby/object:Gem::Version
+        version: 0.4.5
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rb-fsevent
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70175836580900
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: &70175836579720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.4.0
+      - !ruby/object:Gem::Version
+        version: 0.4.3
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: growl
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70175836579720
+- !ruby/object:Gem::Dependency
+  name: growl_notify
+  requirement: &70175836578060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.3
+      - !ruby/object:Gem::Version
+        version: 0.0.1
   type: :development
-  version_requirements: *id010
-description: Adds language translation methods to strings and arrays, backed by the Google Translate API
-email: 
+  prerelease: false
+  version_requirements: *70175836578060
+description: Adds language translation methods to strings and arrays, backed by the
+  Google Translate API
+email:
 - jimmy@jimmycuadra.com
-executables: 
+executables:
 - to_lang
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .rspec
+- .travis.yml
 - .yardopts
 - Gemfile
 - Guardfile
@@ -144,43 +121,48 @@ files:
 - lib/to_lang.rb
 - lib/to_lang/codemap.rb
 - lib/to_lang/connector.rb
+- lib/to_lang/core_ext.rb
 - lib/to_lang/translatable.rb
 - lib/to_lang/version.rb
 - spec/spec_helper.rb
 - spec/to_lang/connector_spec.rb
+- spec/to_lang/core_ext_spec.rb
 - spec/to_lang/translatable_spec.rb
 - spec/to_lang_spec.rb
 - to_lang.gemspec
-has_rdoc: true
 homepage: https://github.com/jimmycuadra/to_lang
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -2363449024598261982
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -2363449024598261982
 requirements: []
-
 rubyforge_project: to_lang
-rubygems_version: 1.6.0
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Translate strings with Google Translate
-test_files: 
+test_files:
 - spec/spec_helper.rb
 - spec/to_lang/connector_spec.rb
+- spec/to_lang/core_ext_spec.rb
 - spec/to_lang/translatable_spec.rb
 - spec/to_lang_spec.rb