active_rest_client 0.9.72 → 0.9.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 979311b6e72a88f984bed1b34c1c3fd07dde2a9d
-  data.tar.gz: 327b472ac5851bff68e3d74dbc7b0e127a2b85ca
+  metadata.gz: 460632a3d6da332f38436d8c4d578253dc3a0f2e
+  data.tar.gz: a44d3ca33dcca47286b5fc69f420d72028062616
 SHA512:
-  metadata.gz: 9e9fa00e1d9530c2da3b2783fdb6c02db11c10ad251dc0e6d242d4f11a4d95418583a0e1e2d24784f9487a85e0f12b381fc04f492976b6e5f9fccb6b4445c70b
-  data.tar.gz: 1f0d887ec3337ee7fb414f8788e36faa96eaf05fb9a9b9cc17991e3fdd8b1cebdfb7cee808d63dcd6ab63f35cc633dd6c1e6c7f83f9491a00dc88d1ac35de5ca
+  metadata.gz: 4ccb4c9ad92d157a9996be9d79824f03d143156707b2526761df89dbc08666c173ae0fda3865ab471c5355f107d8b08ceaf981942b560ea0babbd0fd1994c0c5
+  data.tar.gz: d42484ef26ea1c377db1bee2dd6977c6e9bf82d9b4618e646765a1a8f8b417f2dd28aa09390734a4e4bd275fa0e00a219d20283528c56756bc1fd60a004c8f82

data/active_rest_client.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'terminal-notifier-guard'
   spec.add_development_dependency 'coveralls'
 
-  spec.add_runtime_dependency "oj", "=2.1.4" # 2.1.7 breaks under linux
+  spec.add_runtime_dependency "multi_json"
   spec.add_runtime_dependency "activesupport"
   spec.add_runtime_dependency "faraday", "~> 0.9"
   spec.add_runtime_dependency "patron", ">= 0.4.9" # 0.4.18 breaks against Curl v0.7.15 but works with webmock

data/lib/active_rest_client/lazy_association_loader.rb

@@ -80,7 +80,7 @@ module ActiveRestClient
 
     def ensure_lazy_loaded
       if @object.nil?
-        method = Oj.load(Oj.dump(@request.method))
+        method = MultiJson.load(MultiJson.dump(@request.method),:symbolize_keys => true)
         method[:method] = :get
         method[:options][:url] = @url
         method[:options][:overriden_name] = @options[:overriden_name]

data/lib/active_rest_client/proxy_base.rb

@@ -69,7 +69,7 @@ module ActiveRestClient
       def translate(result, options = {})
         result.headers["content-type"] = "application/hal+json"
         result = OpenStruct.new(status:result.status, headers:result.headers, body:result.body)
-        obj = Oj.load(result.body)
+        obj = MultiJson.load(result.body)
         result.body = yield obj
         result
       end

data/lib/active_rest_client/request.rb

@@ -1,5 +1,5 @@
 require "cgi"
-require "oj"
+require "multi_json"
 
 module ActiveRestClient
 
@@ -267,7 +267,7 @@ module ActiveRestClient
       if response.body.is_a?(Array) || response.body.is_a?(Hash)
         body = response.body
       else
-        body = Oj.load(response.body) || {}
+        body = MultiJson.load(response.body) || {}
       end
       body = begin
         @method[:name].nil? ? body : translator.send(@method[:name], body)
@@ -302,7 +302,7 @@ module ActiveRestClient
       end
 
       result
-    rescue Oj::ParseError
+    rescue MultiJson::ParseError
       raise ResponseParseException.new(status:response.status, body:response.body)
     end
 

data/lib/active_rest_client/version.rb

@@ -1,3 +1,3 @@
 module ActiveRestClient
-  VERSION = "0.9.72"
+  VERSION = "0.9.73"
 end

data/spec/lib/base_spec.rb

@@ -276,11 +276,11 @@ describe ActiveRestClient::Base do
     let(:location) { EmptyExample.new(place:"Room 1408") }
     let(:lazy) { Laz }
     let(:object) { EmptyExample.new(name:"Programming 101", location:location, students:[student1, student2]) }
-    let(:json_parsed_object) { Oj.load(object.to_json) }
+    let(:json_parsed_object) { MultiJson.load(object.to_json) }
 
     it "should be able to export to valid json" do
       expect(object.to_json).to_not be_blank
-      expect{Oj.load(object.to_json)}.to_not raise_error
+      expect{MultiJson.load(object.to_json)}.to_not raise_error
     end
 
     it "should not be using Object's #to_json method" do

data/spec/lib/request_spec.rb

@@ -39,7 +39,7 @@ describe ActiveRestClient::Request do
     class FilteredBodyExampleClient < ExampleClient
       base_url "http://www.example.com"
       before_request do |name, request|
-        request.body = Oj.dump(request.post_params)
+        request.body = MultiJson.dump(request.post_params)
       end
 
       post :save, "/save"
@@ -472,7 +472,7 @@ describe ActiveRestClient::Request do
   end
 
   it "replaces the body completely in a filter" do
-    ActiveRestClient::Connection.any_instance.should_receive(:post).with("/save", "{\":id\":1234,\":name\":\"john\"}", an_instance_of(Hash)).and_return(OpenStruct.new(body:"{}", headers:{}))
+    ActiveRestClient::Connection.any_instance.should_receive(:post).with("/save", "{\"id\":1234,\"name\":\"john\"}", an_instance_of(Hash)).and_return(OpenStruct.new(body:"{}", headers:{}))
     FilteredBodyExampleClient.save id:1234, name:'john'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_rest_client
 version: !ruby/object:Gem::Version
-  version: 0.9.72
+  version: 0.9.73
 platform: ruby
 authors:
 - Which Ltd
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,19 +152,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement