web_translate_it 2.0.5 → 2.0.6

data/history.md

@@ -1,3 +1,8 @@
+## Version 2.0.6 / 2012-03-11
+
+* Remove dependency on JSON. We use `multi_json` instead so wti should now be easier to install.
+  (it previously required a C compiler to install).
+
 ## Version 2.0.5 / 2012-02-22
 
 * New: Add ability to pass a file path in `wti push`: `wti push path/to/file`. #90.

data/lib/web_translate_it/string.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module WebTranslateIt
   class String
-    require 'json'
+    require 'multi_json'
     
     attr_accessor :id, :key, :plural, :type, :dev_comment, :word_count, :status, :category, :labels, :file,
                   :created_at, :updated_at, :translations, :new_record
@@ -254,7 +254,7 @@ module WebTranslateIt
           hash["translations"].push(translation.to_hash)
         end
       end
-      hash.to_json
+      MultiJson.dump(hash)
     end
   end
 end

data/lib/web_translate_it/term.rb

@@ -2,7 +2,7 @@
 module WebTranslateIt
   class Term
     require 'net/https'
-    require 'json'
+    require 'multi_json'
     
     attr_accessor :id, :text, :description, :created_at, :updated_at, :translations, :new_record
     
@@ -240,7 +240,7 @@ module WebTranslateIt
           hash["translations"].push(translation.to_hash)
         end
       end
-      hash.to_json
+      MultiJson.dump(hash)
     end
   end
 end

data/lib/web_translate_it/term_translation.rb

@@ -2,7 +2,7 @@
 module WebTranslateIt
   class TermTranslation
     require 'net/https'
-    require 'json'
+    require 'multi_json'
     
     attr_accessor :id, :locale, :text, :description, :status, :new_record, :term_id
     
@@ -49,6 +49,10 @@ module WebTranslateIt
         "status" => status
       }
     end
+
+    def to_json
+      MultiJson.dump(self.to_hash)
+    end
     
     protected
     
@@ -58,7 +62,7 @@ module WebTranslateIt
       request.add_field("X-Client-Version", WebTranslateIt::Util.version)
       request.add_field("Content-Type", "application/json")
         
-      request.body = self.to_hash.to_json
+      request.body = self.to_json
 
       begin
         response = YAML.load(Util.handle_response(Connection.http_connection.request(request), true, true))
@@ -79,7 +83,7 @@ module WebTranslateIt
       request.add_field("X-Client-Version", WebTranslateIt::Util.version)
       request.add_field("Content-Type", "application/json")
         
-      request.body = self.to_hash.to_json
+      request.body = self.to_json
 
       begin
         Util.handle_response(Connection.http_connection.request(request), true, true)        

data/lib/web_translate_it/translation.rb

@@ -2,7 +2,7 @@
 module WebTranslateIt
   class Translation
     require 'net/https'
-    require 'json'
+    require 'multi_json'
     
     attr_accessor :id, :locale, :text, :status, :created_at, :updated_at, :version, :string_id
     
@@ -46,7 +46,7 @@ module WebTranslateIt
       request.add_field("X-Client-Name", "web_translate_it")
       request.add_field("X-Client-Version", WebTranslateIt::Util.version)
       request.add_field("Content-Type", "application/json")
-      request.body = self.to_hash.to_json
+      request.body = self.to_json
 
       begin
         Util.handle_response(Connection.http_connection.request(request), true, true)
@@ -64,5 +64,9 @@ module WebTranslateIt
         "status" => status
       }
     end
+
+    def to_json
+      MultiJson.dump(self.to_hash)
+    end
   end
 end

data/lib/web_translate_it/util.rb

@@ -4,7 +4,7 @@ module WebTranslateIt
   # A few useful functions
   class Util
     
-    require 'json'
+    require 'multi_json'
     
     # Return a string representing the gem version
     # For example "1.8.3"
@@ -20,9 +20,9 @@ module WebTranslateIt
     def self.handle_response(response, return_response = false, raise_exception = false)
       if response.code.to_i >= 400 and response.code.to_i < 500
         if raise_exception
-          raise "Error: #{JSON.parse(response.body)['error']}"
+          raise "Error: #{MultiJson.load(response.body)['error']}"
         else
-          StringUtil.failure(JSON.parse(response.body)['error'])
+          StringUtil.failure(MultiJson.load(response.body)['error'])
         end
       elsif response.code.to_i == 500
         if raise_exception

data/readme.md

@@ -22,8 +22,6 @@ An external library, [web_translate_it_server](https://github.com/AtelierConvivi
 
 ## Installation
 
-`wti` requires `json`, a library that needs gcc, so you will need to have a gcc compile. With Linux, `apt-get install build-essential` or `yum install gcc` should do it. On Mac OS X, install Xcode command line tools.
-
 You will also need ruby to run `wti`. On Linux or a Mac, it’s already installed. Install [RubyInstaller](http://rubyinstaller.org/) if you’re using Windows. [See detailed installation instructions for Windows users](https://github.com/AtelierConvivialite/webtranslateit/wiki/Install-wti-on-Windows).
 
 ``` bash

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web_translate_it
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A CLI to sync locale files with webtranslateit.com.