phrase 0.3.3 → 0.3.4

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 1.9.3

data/README.md

@@ -1,7 +1,8 @@
 # phrase [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/phrase/phrase)
+[![Build Status](https://secure.travis-ci.org/phrase/phrase.png)](http://travis-ci.org/phrase/phrase)
 
 Powerful in-place translation management for your web applications.
 
 ## More Information
 
-https://phraseapp.com
+https://phraseapp.com

data/Rakefile

@@ -1,2 +1,7 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/phrase/api.rb

@@ -2,5 +2,6 @@ module Phrase::Api
 end
 
 require 'phrase/api/client'
+require 'phrase/api/query_params'
 require 'phrase/api/config'
-require 'phrase/api/exceptions'
+require 'phrase/api/exceptions'

data/lib/phrase/api/client.rb

@@ -1,6 +1,5 @@
 # -*- encoding : utf-8 -*-
 
-require 'addressable/uri'
 require 'cgi'
 require 'net/http'
 require 'net/https'
@@ -162,9 +161,7 @@ private
   
   def get_request(endpoint, params={})
     params.merge!('auth_token' => @auth_token)
-    uri = Addressable::URI.new
-    uri.query_values = params
-    request = Net::HTTP::Get.new("#{api_path_for(endpoint)}?#{uri.query}")
+    request = Net::HTTP::Get.new("#{api_path_for(endpoint)}?#{query_for_params(params)}")
     request
   end
   
@@ -218,4 +215,8 @@ private
   def escaped(value) 
     CGI::escape(value)
   end
+
+  def query_for_params(params)
+    Phrase::Api::QueryParams.encode(params)
+  end
 end

data/lib/phrase/api/query_params.rb

@@ -0,0 +1,22 @@
+require "cgi"
+
+class Phrase::Api::QueryParams
+  def self.encode(value, key=nil)
+    case value
+      when Array then value.map { |v| encode(v, "#{key}[]") }.join("&")
+      when Hash then value.map { |k,v| encode(v, append_key(key,k)) }.join("&")
+      when nil then ""
+      else
+        "#{key}=#{CGI.escape(value.to_s)}" 
+      end
+  end
+
+  def self.append_key(root_key, key)
+    if root_key.nil?
+      key
+    else 
+      "#{root_key}[#{key.to_s}]"
+    end
+  end
+  private_class_method :append_key
+end

data/lib/phrase/tool/commands/pull.rb

@@ -43,7 +43,7 @@ private
     begin
       FileUtils.mkpath(path)
       File.open(target, "w") do |file|
-        file.write(content)
+        file.write(content.force_encoding("UTF-8"))
       end
       print_message "Saved to #{clean_path target}".green
     rescue

data/lib/phrase/version.rb

@@ -1,3 +1,3 @@
 module Phrase
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/phrase.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |s|
   s.executables = %w(phrase)
   s.require_paths = ["lib"]  
   s.add_dependency('activesupport', '~> 3.0')
-  s.add_dependency('addressable', '~> 2.2.8')
   s.add_dependency('colorize')
   s.add_dependency('json')
+  s.add_development_dependency('rake')
   s.add_development_dependency('rspec')
   s.add_development_dependency('i18n')
   s.add_development_dependency('webmock')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70288255847780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,31 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: addressable
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.8
+  version_requirements: *70288255847780
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70288255847400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70288255847400
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70288255846940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +43,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *70288255846940
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70288255846520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70288255846520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70288255846100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70288255846100
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70288255845680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,15 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70288255845680
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70288255845260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,15 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70288255845260
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70288255844840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,15 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70288255844840
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70288255844420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -149,12 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70288255844420
 description: phrase allows you to edit translations in-place on the page itself. More
   information at phraseapp.com
 email:
@@ -165,6 +120,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -180,6 +136,7 @@ files:
 - lib/phrase/api/client.rb
 - lib/phrase/api/config.rb
 - lib/phrase/api/exceptions.rb
+- lib/phrase/api/query_params.rb
 - lib/phrase/backend.rb
 - lib/phrase/backend/base.rb
 - lib/phrase/backend/phrase_service.rb
@@ -243,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: phrase
-rubygems_version: 1.8.24
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: The best way to manage i18n.