fb_graph 2.5.9 → 2.6.0

data/Gemfile

@@ -4,4 +4,8 @@ platforms :jruby do
   gem 'jruby-openssl', '>= 0.7'
 end
 
+group :test do
+	gem 'oj'
+end
+
 gemspec

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    fb_graph (2.5.8)
+    fb_graph (2.6.0)
       httpclient (>= 2.2.0.2)
-      json
+      multi_json
       rack-oauth2 (>= 0.14.4)
       tzinfo
 
@@ -37,13 +37,17 @@ GEM
     crack (0.3.1)
     diff-lcs (1.1.3)
     erubis (2.7.0)
+    fb_graph-mock (0.0.3)
+      fb_graph
+      rspec
+      webmock
     hashie (1.2.0)
     hike (1.2.1)
     httpclient (2.3.0.1)
     i18n (0.6.1)
     journey (1.0.4)
-    json (1.7.5)
-    multi_json (1.4.0)
+    multi_json (1.5.0)
+    oj (1.4.7)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -56,12 +60,12 @@ GEM
       rack (>= 1.1)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.0.2)
+    rake (10.0.3)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
       rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.0)
+    rspec-core (2.12.2)
     rspec-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.0)
@@ -84,7 +88,8 @@ DEPENDENCIES
   actionpack (>= 3.0.6)
   cover_me (>= 1.2.0)
   fb_graph!
+  fb_graph-mock
   jruby-openssl (>= 0.7)
+  oj
   rake (>= 0.8)
   rspec (>= 2)
-  webmock (>= 1.6.2)

data/VERSION

@@ -1 +1 @@
-2.5.9
+2.6.0

data/fb_graph.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "httpclient", ">= 2.2.0.2"
   s.add_runtime_dependency "rack-oauth2", ">= 0.14.4"
   s.add_runtime_dependency "tzinfo"
-  s.add_runtime_dependency "json"
+  s.add_runtime_dependency "multi_json"
   s.add_development_dependency "rake", ">= 0.8"
   if RUBY_VERSION >= '1.9'
     s.add_development_dependency "cover_me", ">= 1.2.0"
@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
     s.add_development_dependency "rcov", ">= 0.9"
   end
   s.add_development_dependency "rspec", ">= 2"
-  s.add_development_dependency "webmock", ">= 1.6.2"
+  s.add_development_dependency "fb_graph-mock"
   s.add_development_dependency "actionpack", ">= 3.0.6"
 end

data/lib/fb_graph/auth/signed_request.rb

@@ -26,7 +26,7 @@ module FbGraph
       end
 
       def self.decode_json(json)
-        JSON.parse(json).with_indifferent_access
+        MultiJson::load(json).with_indifferent_access
       rescue => e
         raise VerificationFailed.new('Invalid JSON')
       end

data/lib/fb_graph/connections/offers.rb

@@ -0,0 +1,22 @@
+module FbGraph
+  module Connections
+    module Offers
+      def offers(options = {})
+        offers = self.connection :offers, options
+        offers.map! do |offer|
+          Offer.new offer[:id], offer.merge(
+            :access_token => options[:access_token] || self.access_token
+          )
+        end
+      end
+
+      def offer!(options = {})
+        # A page access token is required to change an associated offer
+        offer = post options.merge(:connection => :offers).merge(:access_token => self.page_access_token)
+        Offer.new offer[:id], options.merge(offer).merge(
+          :access_token => options[:access_token] || self.access_token
+        )
+      end
+    end
+  end
+end

data/lib/fb_graph/exception.rb

@@ -81,7 +81,7 @@ module FbGraph
     def initialize(code, message, body = '')
       @code = code
       if body.present?
-        response = JSON.parse(body).with_indifferent_access
+        response = MultiJson::load(body).with_indifferent_access
         message = response[:error][:message]
         @type = response[:error][:type]
       end

data/lib/fb_graph/node.rb

@@ -135,14 +135,14 @@ module FbGraph
       when 'null'
         nil
       else
-        _response_ = JSON.parse(response.body).with_indifferent_access
+        _response_ = MultiJson::load(response.body).with_indifferent_access
         if (200...300).include?(response.status)
           _response_
         else
           Exception.handle_httpclient_error(_response_, response.headers)
         end
       end
-    rescue JSON::ParserError
+    rescue MultiJson::DecodeError
       raise Exception.new(response.status, "Unparsable Response: #{response.body}")
     end
   end

data/lib/fb_graph/offer.rb

@@ -0,0 +1,33 @@
+module FbGraph
+  class Offer < Node
+    extend Searchable
+
+    ATTRS = [ :from,
+              :title,
+              :created_time,
+              :expiration_time,
+              :terms,
+              :image_url,
+              :coupon_type,
+              :claim_limit,
+              :redemption_link,
+              :redemption_code]
+
+    attr_accessor *ATTRS
+
+    def initialize(identifier, attributes = {})
+      super
+
+      @from = Page.new(attributes[:from][:id], attributes[:from]) if attributes[:from]
+      @title = attributes[:title]
+      @created_time = Time.parse(attributes[:created_time]).utc if attributes[:created_time]
+      @expiration_time = Time.parse(attributes[:expiration_time]).utc
+      @terms = attributes[:terms] if attributes[:terms]
+      @image_url = attributes[:image_url] if attributes[:image_url]
+      @coupon_type = attributes[:coupon_type] if attributes[:coupon_type]
+      @claim_limit = attributes[:claim_limit] if attributes[:claim_limit]
+      @redemption_link = attributes[:redemption_link] if attributes[:redemption_link]
+      @redemption_code = attributes[:redemption_code] if attributes[:redemption_code]
+    end
+  end
+end

data/lib/fb_graph/page.rb

@@ -24,6 +24,7 @@ module FbGraph
     include Connections::Tabs
     include Connections::Tagged
     include Connections::Videos
+    include Connections::Offers
     extend Searchable
 
     @@attributes = {
@@ -44,7 +45,13 @@ module FbGraph
         Cover.new cover[:cover_id], cover
       end
     end
+
+    protected
+
+    def page_access_token
+      get({:fields => "access_token"})["access_token"]
+    end
   end
 end
 
-require 'fb_graph/page/category_attributes'
+require 'fb_graph/page/category_attributes'

data/lib/fb_graph.rb

@@ -131,6 +131,7 @@ require 'fb_graph/thread'
 require 'fb_graph/user'
 require 'fb_graph/user_achievement'
 require 'fb_graph/video'
+require 'fb_graph/offer'
 
 # Load after FbGraph::User
 require 'fb_graph/ad_user'
@@ -141,4 +142,4 @@ require 'fb_graph/project'
 
 require 'fb_graph/query'
 
-require 'patch/rack/oauth2/access_token/introspectable'
+require 'patch/rack/oauth2/access_token/introspectable'

data/spec/fb_graph/offer_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe FbGraph::Offer do
+  let(:offer) { mock_graph(:get, '23456/offers', 'offers/private', :access_token => 'access_token') { offer = page.offers[0] }}
+  let(:page) { FbGraph::Page.new('23456', {:name => 'page_name', :category => 'page_cat', :access_token => 'access_token'}) }
+
+  describe '.new' do
+    it 'should setup all supported attributes' do
+      offer.identifier.should == '12345'
+      offer.from.should == FbGraph::Page.new('23456', {:name => 'page_name', :category => 'page_cat'})
+      offer.title.should == 'offer 1'
+      offer.created_time.should == Time.parse('2011-10-14T21:00:00+0000').utc
+      offer.expiration_time.should == Time.parse('2018-03-15T00:30:00+0000').utc
+      offer.terms.should == 'One offer per customer'
+      offer.image_url.should == 'http://example.org/image.png'
+      offer.coupon_type.should == 'online_only'
+      offer.claim_limit.should == 1000
+      offer.redemption_link.should == 'http://example.org/redeem'
+      offer.redemption_code.should == nil
+    end
+  end
+
+  describe '#update' do
+    it 'should update existing offer' do
+      lambda do
+        offer.update(:terms => 'Two offers per customer', :access_token => 'access_token')
+      end.should request_to('12345', :post)
+    end
+  end
+end

data/spec/fb_graph/open_graph/action_spec.rb

@@ -5,7 +5,7 @@ describe FbGraph::OpenGraph::Action do
     FbGraph::OpenGraph::Action.new attributes[:id], attributes
   end
   let :attributes do
-    JSON.parse(json).with_indifferent_access
+    MultiJson::load(json).with_indifferent_access
   end
   shared_examples_for :og_action_initialized do
     its(:from) do

data/spec/fb_graph/open_graph/object_spec.rb

@@ -5,7 +5,7 @@ describe FbGraph::OpenGraph::Object do
     FbGraph::OpenGraph::Object.new attributes[:id], attributes
   end
   let :attributes do
-    JSON.parse(json).with_indifferent_access
+    MultiJson::load(json).with_indifferent_access
   end
 
   context 'with play action' do

data/spec/fb_graph/tagged_object_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe FbGraph::TaggedObject do
   let :attributes do
-    JSON.parse(json).with_indifferent_access
+    MultiJson::load(json).with_indifferent_access
   end
   let :json do
     <<-JSON

data/spec/fb_graph/targeting_spec.rb

@@ -25,7 +25,7 @@ describe FbGraph::Targeting, '.to_json' do
       :region  => 'Tokyo'
     }
     targeting = FbGraph::Targeting.new(attributes)
-    hash = JSON.parse(targeting.to_json).with_indifferent_access
+    hash = MultiJson::load(targeting.to_json).with_indifferent_access
     hash[:country].should == attributes[:country]
     hash[:city].should    == attributes[:city]
     hash[:locale].should  == attributes[:locale]

data/spec/spec_helper.rb

@@ -4,4 +4,6 @@ end
 
 require 'rspec'
 require 'fb_graph'
-require 'helpers/webmock_helper'
+require 'fb_graph/mock'
+include FbGraph::Mock
+WebMock.disable_net_connect!