prooflink_connect 0.0.22 → 0.0.23

data/lib/prooflink_connect/activity.rb

@@ -25,11 +25,11 @@ module ProoflinkConnect
 
       begin
         response = access_token.post 'api/v2/activities', :body => {:activity => params}
-        return JSON.parse(response.body)
+        return MultiJson.decode(response.body)
 
       rescue OAuth2::Error => error
-        return JSON.parse(error.response.body)
+        return MultiJson.decode(error.response.body)
       end
     end
   end
-end
+end

data/lib/prooflink_connect/assertion.rb

@@ -36,8 +36,8 @@ module ProoflinkConnect
       resp = http.post(url.path, data)
       if resp.code == '200'
         begin
-          data = JSON.parse(resp.body)
-        rescue JSON::ParserError => err
+          data = MultiJson.decode(resp.body)
+        rescue MultiJson::DecodeError => err
           raise AuthinfoException.new(resp), "Unable to parse JSON response: #{resp.body.inspect}"
         end
       else
@@ -48,4 +48,4 @@ module ProoflinkConnect
     class AuthinfoException < ::StandardError
     end
   end
-end
+end

data/lib/prooflink_connect/invite.rb

@@ -1,7 +1,7 @@
 require 'httparty'
-require "active_support/core_ext/hash/keys"
-require "active_support/core_ext/hash/reverse_merge"
-require "json"
+require 'active_support/core_ext/hash/keys'
+require 'active_support/core_ext/hash/reverse_merge'
+require 'multi_json'
 
 class ProoflinkConnect::Invite
   attr_reader :configuration, :attributes
@@ -21,7 +21,7 @@ class ProoflinkConnect::Invite
     response = HTTParty.post(uri, :body => params)
 
     if response.code == 200
-      self.attributes.merge! JSON.parse(response.body)["entry"].stringify_keys
+      self.attributes.merge! MultiJson.load(response.body)["entry"].stringify_keys
     end
 
     return created?

data/lib/prooflink_connect/version.rb

@@ -1,3 +1,3 @@
 module ProoflinkConnect
-  VERSION = "0.0.22"
+  VERSION = "0.0.23"
 end

data/prooflink_connect.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "prooflink_connect"
 
-  s.add_dependency 'json'
+  s.add_dependency 'multi_json'
   s.add_dependency 'httparty'
   s.add_dependency 'activesupport'
 

data/spec/prooflink_connect/activity_spec.rb

@@ -8,11 +8,11 @@ describe ProoflinkConnect::Activity do
   before do
     stub_request(:post, "https://example.prooflink.com/api/v2/activities").
       with(:body => {"activity"=>{"activity_type"=>{"name"=>"My name", "value"=>"1", "identifier"=>"my_identifier"}, "user"=>{"identity_provider"=>"prooflink", "email"=>"jon@doe.com"}}}, :headers => {'Accept'=>'*/*', 'Authorization'=>'OAuth 4321', 'Content-Type'=>'application/x-www-form-urlencoded'}).
-      to_return(:status => 200, :body => {"status"=>"SUCCESS", "message"=>"activity succesfully created"}.to_json, :headers => {})
+      to_return(:status => 200, :body => MultiJson.encode({"status"=>"SUCCESS", "message"=>"activity succesfully created"}), :headers => {})
 
     stub_request(:post, "https://example.prooflink.com/api/v2/activities").
       with(:body => "", :headers => {'Accept'=>'*/*', 'Authorization'=>'OAuth 4321', 'Content-Type'=>'application/x-www-form-urlencoded'}).
-      to_return(:status => 406, :body => {"status"=>"ERROR", "message"=>"no activity specified"}.to_json, :headers => {})
+      to_return(:status => 406, :body => MultiJson.encode({"status"=>"ERROR", "message"=>"no activity specified"}), :headers => {})
   end
 
   it "should log activity as expected" do
@@ -26,4 +26,4 @@ describe ProoflinkConnect::Activity do
   it "should not log activity when no params are passed" do
     ProoflinkConnect::Activity.log({}).should eq({"status"=>"ERROR", "message"=>"no activity specified"})
   end
-end
+end

data/spec/prooflink_connect/invite_spec.rb

@@ -11,14 +11,14 @@ describe ProoflinkConnect::Invite do
 
     stub_request(:post, "https://example.prooflink.com/invites").
       with{|request| expected_parameters == CGI.parse(request.body)}.
-      to_return(:status => 200, :body => {
+      to_return(:status => 200, :body => MultiJson.encode({
         "entry" => {
           "name" => {},
           "displayName" => "Prooflink",
           "id" => "cg6a1Turx70NWzkkwrbGRDRvImY=\n",
           "invite_url" => "url"
         }
-      }.to_json, :headers => {})
+      }), :headers => {})
 
     invite = ProoflinkConnect::Invite.new(attributes)
     invite.save.should == true
@@ -32,14 +32,14 @@ describe ProoflinkConnect::Invite do
 
     stub_request(:post, "https://example.prooflink.com/invites").
       with{|request| expected_parameters == CGI.parse(request.body)}.
-      to_return(:status => 200, :body => {
+      to_return(:status => 200, :body => MultiJson.encode({
         "entry" => {
           "name" => {},
           "displayName" => "Prooflink",
           "id" => "cg6a1Turx70NWzkkwrbGRDRvImY=\n",
           "invite_url" => "url"
         }
-      }.to_json, :headers => {})
+      }), :headers => {})
 
     invite = ProoflinkConnect::Invite.new(attributes)
     invite.save({"api_key" => "4567"}).should == true

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: prooflink_connect
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 0
-  - 22
-  version: 0.0.22
+  - 23
+  version: 0.0.23
 platform: ruby
 authors: 
 - Chiel Wester
@@ -21,7 +21,7 @@ cert_chain: []
 date: 2012-09-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: multi_json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false