fb_graph 1.8.6 → 1.9.0

data/Gemfile.lock

@@ -15,7 +15,7 @@ GEM
     diff-lcs (1.1.2)
     httpclient (2.2.1)
     i18n (0.6.0)
-    json (1.5.2)
+    json (1.5.3)
     rack (1.3.0)
     rack-oauth2 (0.8.1)
       activesupport (>= 2.3)

data/VERSION

@@ -1 +1 @@
-1.8.6
+1.9.0

data/lib/fb_graph/album.rb

@@ -5,7 +5,7 @@ module FbGraph
     include Connections::Likes
     include Connections::Picture
 
-    attr_accessor :from, :name, :description, :location, :link, :privacy, :count, :created_time, :updated_time, :type
+    attr_accessor :from, :name, :description, :location, :link, :cover_photo, :privacy, :count, :type, :created_time, :updated_time
 
     def initialize(identifier, attributes = {})
       super
@@ -20,15 +20,16 @@ module FbGraph
       # NOTE:
       # for some reason, facebook uses different parameter names.
       # "description" in GET & "message" in POST
-      # TODO:
-      # check whether this issue is solved or not
       @description = attributes[:description] || attributes[:message]
       @location    = attributes[:location]
       @link        = attributes[:link]
       @privacy     = attributes[:privacy]
       @count       = attributes[:count]
       @type        = attributes[:type]
-      
+
+      @cover_photo = if attributes[:cover_photo]
+        Photo.new(attributes[:cover_photo])
+      end
       @created_time = if attributes[:created_time]
         Time.parse(attributes[:created_time]).utc
       end

data/lib/fb_graph/application.rb

@@ -1,5 +1,6 @@
 module FbGraph
   class Application < Node
+    include Connections::Accounts
     include Connections::Albums
     include Connections::Events
     include Connections::Feed
@@ -10,6 +11,7 @@ module FbGraph
     include Connections::Photos
     include Connections::Picture
     include Connections::Posts
+    include Connections::Reviews
     include Connections::Statuses
     include Connections::Subscriptions
     include Connections::Tagged

data/lib/fb_graph/auth/cookie.rb

@@ -6,10 +6,11 @@ module FbGraph
     # If you want access token, use FbGraph::Auth.new(APP_ID, APP_SECRET, :cookie => {..}) instead
     class Cookie
       def self.parse(client, cookie)
-        fb_cookie_string = if cookie.respond_to?(:[])
-          cookie["fbs_#{client.identifier}"]
-        else
+        fb_cookie_string = case cookie
+        when String
           cookie
+        else
+          cookie["fbs_#{client.identifier}"]
         end
 
         raise VerificationFailed.new(401, 'Facebook cookie not found') if fb_cookie_string.blank?

data/lib/fb_graph/connections/accounts.rb

@@ -5,7 +5,12 @@ module FbGraph
         accounts = self.connection(:accounts, options)
         accounts.map! do |account|
           account[:access_token] ||= options[:access_token] || self.access_token
-          Page.new(account[:id], account)
+          case self
+          when User
+            Page.new(account[:id], account)
+          when Application
+            TestUser.new(account[:id], account)
+          end
         end
       end
     end

data/lib/fb_graph/connections/docs.rb

@@ -0,0 +1,14 @@
+module FbGraph
+  module Connections
+    module Docs
+      def docs(options = {})
+        docs = self.connection(:docs, options)
+        docs.map! do |doc|
+          Doc.new(doc[:id], doc.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
+        end
+      end
+    end
+  end
+end

data/lib/fb_graph/connections/inbox.rb

@@ -2,9 +2,12 @@ module FbGraph
   module Connections
     module Inbox
       def inbox(options = {})
-        threads = self.connection(:threads, options)
+        threads = self.connection(:inbox, options)
         threads.map! do |thread|
-          Thread.new(thread[:id], thread.merge(
+          # NOTE:
+          #  Inbox API doesn't return thread object until their message platform becomes broadly available.
+          #  Use Post instead of Thread for now.
+          Post.new(thread[:id], thread.merge(
             :access_token => options[:access_token] || self.access_token
           ))
         end

data/lib/fb_graph/connections/outbox.rb

@@ -0,0 +1,17 @@
+module FbGraph
+  module Connections
+    module Outbox
+      def outbox(options = {})
+        threads = self.connection(:outbox, options)
+        threads.map! do |thread|
+          # NOTE:
+          #  Inbox API doesn't return thread object until their message platform becomes broadly available.
+          #  Use Post instead of Thread for now.
+          Post.new(thread[:id], thread.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
+        end
+      end
+    end
+  end
+end

data/lib/fb_graph/connections/reviews.rb

@@ -0,0 +1,14 @@
+module FbGraph
+  module Connections
+    module Reviews
+      def reviews(options = {})
+        reviews = self.connection(:reviews, options)
+        reviews.map! do |review|
+          Review.new(review[:id], review.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
+        end
+      end
+    end
+  end
+end

data/lib/fb_graph/connections/threads.rb

@@ -0,0 +1,14 @@
+module FbGraph
+  module Connections
+    module Threads
+      def threads(options = {})
+        threads = self.connection(:threads, options)
+        threads.map! do |thread|
+          Thread.new(thread[:id], thread.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
+        end
+      end
+    end
+  end
+end

data/lib/fb_graph/doc.rb

@@ -0,0 +1,18 @@
+module FbGraph
+  class Doc < Node
+    attr_accessor :from, :subject, :icon, :updated_time, :revision
+
+    def initialize(identifier, attributes = {})
+      super
+      @from = if attributes[:from]
+        User.new(attributes[:from][:id], attributes[:from])
+      end
+      @subject = attributes[:subject]
+      @icon = attributes[:icon]
+      @revision = attributes[:revision]
+      @updated_time = if attributes[:updated_time]
+        Time.parse(attributes[:updated_time]).utc
+      end
+    end
+  end
+end

data/lib/fb_graph/domain.rb

@@ -0,0 +1,32 @@
+module FbGraph
+  class Domain < Node
+    include Connections::Insights
+
+    attr_accessor :name
+
+    def initialize(identifier, attributes = {})
+      super
+      @name = attributes[:name]
+    end
+
+    # NOTE:
+    #  Don't use Searchable here.
+    #  Domain search doesn't return paginatable array.
+    def self.search(domains)
+      fake_domain = 'fake.com'
+      domains = Array(domains)
+      unless domains.include?(fake_domain)
+        @using_fake = true
+        domains << fake_domain
+      end
+      results = Node.new(nil).send(:get, :domains => domains.join(','))
+      results = results.map do |identifier, attributes|
+        if @using_fake && attributes[:name] == fake_domain
+          next
+        end
+        new(identifier, attributes)
+      end
+      results.compact
+    end
+  end
+end

data/lib/fb_graph/group.rb

@@ -1,12 +1,13 @@
 module FbGraph
   class Group < Node
+    include Connections::Docs
     include Connections::Feed
     include Connections::Members
     include Connections::Picture
     include Connections::Videos
     extend Searchable
 
-    attr_accessor :owner, :name, :description, :link, :icon, :venue, :privacy, :version, :updated_time
+    attr_accessor :owner, :name, :email, :description, :link, :icon, :privacy, :version, :updated_time
 
     def initialize(identifier, attributes = {})
       super
@@ -14,14 +15,12 @@ module FbGraph
         @owner = User.new(owner[:id], owner)
       end
       @name         = attributes[:name]
+      @email        = attributes[:email]
       @description  = attributes[:description]
       @link         = attributes[:link]
       @icon         = attributes[:icon]
       @privacy      = attributes[:privacy]
       @version      = attributes[:version]
-      if attributes[:venue]
-        @venue = Venue.new(attributes[:venue])
-      end
       if attributes[:updated_time]
         @updated_time = Time.parse(attributes[:updated_time]).utc
       end

data/lib/fb_graph/insight.rb

@@ -1,7 +1,5 @@
 module FbGraph
   class Insight < Node
-    include Comparison
-
     attr_accessor :name, :period, :values, :description
 
     def initialize(identifier, attributes = {})

data/lib/fb_graph/link.rb

@@ -3,7 +3,7 @@ module FbGraph
     include Connections::Comments
     include Connections::Likes
 
-    attr_accessor :from, :link, :name, :caption, :description, :icon, :picture, :message, :created_time
+    attr_accessor :from, :link, :name, :description, :icon, :picture, :message, :created_time
 
     def initialize(identifier, attributes = {})
       super
@@ -16,7 +16,6 @@ module FbGraph
       end
       @name        = attributes[:name]
       @link        = attributes[:link]
-      @caption     = attributes[:caption]
       @description = attributes[:description]
       @icon        = attributes[:icon]
       @picture     = attributes[:picture] # NOTE: this is external image, so isn't connection.

data/lib/fb_graph/message.rb

@@ -5,11 +5,10 @@ module FbGraph
     # include Connections::Shares
     include Connections::Tags
 
-    attr_accessor :subject, :message, :from, :to, :tags, :created_time
+    attr_accessor :message, :from, :to, :created_time
 
     def initialize(identifier, attributes = {})
       super
-      @subject = attributes[:subject]
       @message = attributes[:message]
       if (from = attributes[:from])
         @from = User.new(from[:id], from)
@@ -20,12 +19,6 @@ module FbGraph
           @to << User.new(to[:id], to)
         end
       end
-      @tags = []
-      if attributes[:tags]
-        Collection.new(attributes[:tags]).each do |tag|
-          @tags << Tag.new(tag)
-        end
-      end
       if attributes[:created_time]
         @created_time = Time.parse(attributes[:created_time]).utc
       end

data/lib/fb_graph/node.rb

@@ -63,14 +63,14 @@ module FbGraph
 
     def build_params(params)
       _params_ = params.dup
-      _params_[:oauth_token] = (_params_.delete(:access_token) || self.access_token).to_s
+      _params_[:access_token] ||= self.access_token
       _params_.delete_if do |k, v|
         v.blank?
       end
       _params_.each do |key, value|
-        if value.present? && ![Symbol, String, Numeric, IO].any? { |klass| value.is_a? klass }
+        if value.present? && ![Symbol, String, Numeric, Rack::OAuth2::AccessToken::Legacy, IO].any? { |klass| value.is_a? klass }
           _params_[key] = value.to_json
-        elsif [Symbol, Numeric].any? { |klass| value.is_a? klass }
+        elsif [Symbol, Numeric, Rack::OAuth2::AccessToken::Legacy].any? { |klass| value.is_a? klass }
           _params_[key] = value.to_s
         end
       end

data/lib/fb_graph/post.rb

@@ -4,7 +4,7 @@ module FbGraph
     include Connections::Likes
     extend Searchable
 
-    attr_accessor :from, :to, :message, :picture, :link, :name, :caption, :description, :source, :icon, :attribution, :actions, :type, :privacy, :targeting, :created_time, :updated_time
+    attr_accessor :from, :to, :message, :picture, :link, :name, :caption, :description, :source, :properties, :icon, :actions, :privacy, :type, :graph_object_id, :application, :targeting, :created_time, :updated_time
 
     def initialize(identifier, attributes = {})
       super
@@ -40,15 +40,19 @@ module FbGraph
       @caption     = attributes[:caption]
       @description = attributes[:description]
       @source      = attributes[:source]
-      @icon        = attributes[:icon]
-      @attribution = attributes[:attribution]
-      @actions     = []
+      @properties = []
+      if attributes[:properties]
+        attributes[:properties].each do |property|
+          @properties << Property.new(property)
+        end
+      end
+      @icon = attributes[:icon]
+      @actions = []
       if attributes[:actions]
         attributes[:actions].each do |action|
           @actions << Action.new(action)
         end
       end
-      @type        = attributes[:type]
       if attributes[:privacy]
         @privacy = if attributes[:privacy].is_a?(Privacy)
           attributes[:privacy]
@@ -56,6 +60,11 @@ module FbGraph
           Privacy.new(attributes[:privacy])
         end
       end
+      @type = attributes[:type]
+      @graph_object_id = attributes[:object_id]
+      if attributes[:application]
+        @application = Application.new(attributes[:application][:id], attributes[:application])
+      end
       if attributes[:targeting]
         @targeting = if attributes[:targeting].is_a?(Targeting)
           attributes[:targeting]

data/lib/fb_graph/property.rb

@@ -0,0 +1,13 @@
+module FbGraph
+  class Property
+    include Comparison
+
+    attr_accessor :name, :text, :href
+
+    def initialize(attriutes = {})
+      @name = attriutes[:name]
+      @text = attriutes[:text]
+      @href = attriutes[:href]
+    end
+  end
+end

data/lib/fb_graph/review.rb

@@ -0,0 +1,20 @@
+module FbGraph
+  class Review < Node
+    attr_accessor :from, :to, :message, :rating, :created_time
+
+    def initialize(identifier, attributes = {})
+      super
+      @from = if attributes[:from]
+        User.new(attributes[:from][:id], attributes[:from])
+      end
+      @to = if attributes[:to]
+        Application.new(attributes[:to][:id], attributes[:to])
+      end
+      @message = attributes[:message]
+      @rating = attributes[:rating]
+      @created_time = if attributes[:created_time]
+        Time.parse(attributes[:created_time]).utc
+      end
+    end
+  end
+end

data/lib/fb_graph/thread.rb

@@ -6,11 +6,10 @@ module FbGraph
     include Connections::Senders
     include Connections::Tags
 
-    attr_accessor :subject, :snippet, :message_count, :unread_count, :updated_time
+    attr_accessor :snippet, :message_count, :unread_count, :updated_time
 
     def initialize(identifier, attributes = {})
       super
-      @subject = attributes[:subject] # NOTE: New Facebook Message platform will make this field blank.
       @snippet = attributes[:snippet]
       @message_count = attributes[:message_count]
       @unread_count = attributes[:unread_count].to_i

data/lib/fb_graph/user.rb

@@ -21,6 +21,7 @@ module FbGraph
     include Connections::Movies
     include Connections::Music
     include Connections::Notes
+    include Connections::Outbox
     include Connections::Payments
     include Connections::Permissions
     include Connections::Photos
@@ -29,29 +30,44 @@ module FbGraph
     include Connections::Statuses
     include Connections::Tagged
     include Connections::Television
+    include Connections::Threads
     include Connections::Videos
     extend Searchable
 
-    attr_accessor :first_name, :last_name, :name, :link, :about, :birthday, :work, :education, :email, :website, :hometown, :location, :bio, :quotes, :gender, :interested_in, :meeting_for, :relationship, :relationship_status, :religion, :political, :verified, :significant_other, :timezone, :updated_time, :sports, :favorite_teams, :favorite_athletes, :inspirational_people, :locale, :languages, :third_party_id, :address, :mobile_phone
+    attr_accessor :name, :first_name, :middle_name, :last_name, :gender, :locale, :languages, :link, :username, :third_party_id, :timezone, :updated_time, :verified, :about, :bio, :birthday, :education, :email, :hometown, :interested_in, :location, :political, :favorite_teams, :quotes, :relationship_status, :religion, :significant_other, :video_upload_limits, :website, :work
+
+    # NOTE: below are non-documented
+    attr_accessor :sports,  :favorite_athletes, :inspirational_people, :address, :mobile_phone
 
     def initialize(identifier, attributes = {})
       super
-      @first_name = attributes[:first_name]
-      @last_name  = attributes[:last_name]
-      @name       = attributes[:name]
-      @link       = attributes[:link]
-      @about      = attributes[:about]
+      @name        = attributes[:name]
+      @first_name  = attributes[:first_name]
+      @middle_name = attributes[:middle_name]
+      @last_name   = attributes[:last_name]
+      @gender      = attributes[:gender]
+      @locale      = attributes[:locale]
+      @languages = []
+      if attributes[:languages]
+        attributes[:languages].each do |language|
+          @languages << Page.new(language[:id], language)
+        end
+      end
+      @link           = attributes[:link]
+      @username       = attributes[:username]
+      @third_party_id = attributes[:third_party_id]
+      @timezone       = attributes[:timezone]
+      if attributes[:updated_time]
+        @updated_time = Time.parse(attributes[:updated_time]).utc
+      end
+      @verified = attributes[:verified]
+      @about    = attributes[:about]
+      @bio      = attributes[:bio]
       if attributes[:birthday]
         month, day, year = attributes[:birthday].split('/').collect(&:to_i)
         year ||= 0
         @birthday = Date.new(year, month, day)
       end
-      @work = []
-      if attributes[:work]
-        attributes[:work].each do |work|
-          @work << Work.new(work)
-        end
-      end
       @education = []
       if attributes[:education]
         attributes[:education].each do |education|
@@ -59,25 +75,43 @@ module FbGraph
         end
       end
       @email = attributes[:email]
-      @website = attributes[:website]
       if (hometown = attributes[:hometown])
         @hometown = Page.new(hometown[:id], hometown)
       end
+      @interested_in = Array(attributes[:interested_in])
       if (location = attributes[:location])
         @location = Page.new(location[:id], location)
       end
-      @sports = []
-      if (sports = attributes[:sports])
-        sports.each do |sport|
-          @sports << Page.new(sport[:id], sport)
-        end
-      end
+      @political = attributes[:political]
       @favorite_teams = []
       if attributes[:favorite_teams]
         attributes[:favorite_teams].each do |favorite_team|
           @favorite_teams << Page.new(favorite_team[:id], favorite_team)
         end
       end
+      @quotes = attributes[:quotes]
+      @relationship_status = attributes[:relationship_status]
+      @religion            = attributes[:religion]
+      if (significant_other = attributes[:significant_other])
+        @significant_other = User.new(significant_other[:id], significant_other)
+      end
+      # NOTE: couldn't find "video_upload_limits" in the response..
+      #  @video_upload_limits = ??
+      @website = attributes[:website]
+      @work = []
+      if attributes[:work]
+        attributes[:work].each do |work|
+          @work << Work.new(work)
+        end
+      end
+
+      # NOTE: below are non-documented
+      @sports = []
+      if (sports = attributes[:sports])
+        sports.each do |sport|
+          @sports << Page.new(sport[:id], sport)
+        end
+      end
       @favorite_athletes = []
       if attributes[:favorite_athletes]
         attributes[:favorite_athletes].each do |favorite_athlete|
@@ -90,31 +124,6 @@ module FbGraph
           @inspirational_people << Page.new(inspirational_person[:id], inspirational_person)
         end
       end
-      @bio                 = attributes[:bio]
-      @quotes              = attributes[:quotes]
-      @gender              = attributes[:gender]
-      @interested_in       = Array(attributes[:interested_in])
-      @meeting_for         = Array(attributes[:meeting_for])
-      @relationship        = attributes[:relationship]
-      @relationship_status = attributes[:relationship_status]
-      @religion            = attributes[:religion]
-      @political           = attributes[:political]
-      @verified            = attributes[:verified]
-      if (significant_other = attributes[:significant_other])
-        @significant_other = User.new(significant_other[:id], significant_other)
-      end
-      @timezone            = attributes[:timezone]
-      @locale              = attributes[:locale]
-      @third_party_id      = attributes[:third_party_id]
-      @languages = []
-      if attributes[:languages]
-        attributes[:languages].each do |language|
-          @languages << Page.new(language[:id], language)
-        end
-      end
-      if attributes[:updated_time]
-        @updated_time = Time.parse(attributes[:updated_time]).utc
-      end
       if attributes[:address]
         @address = Venue.new(attributes[:address])
       end

data/lib/fb_graph/video.rb

@@ -2,8 +2,9 @@ module FbGraph
   class Video < Node
     include Connections::Comments
     include Connections::Likes
+    include Connections::Picture
 
-    attr_accessor :from, :message, :description, :length, :created_time, :updated_time
+    attr_accessor :from, :tags, :name, :description, :embed_html, :icon, :source, :created_time, :updated_time
 
     def initialize(identifier, attributes = {})
       super
@@ -14,9 +15,17 @@ module FbGraph
           User.new(from[:id], from)
         end
       end
-      @message     = attributes[:message]
+      @tags = []
+      if attributes[:tags]
+        Collection.new(attributes[:tags]).each do |tag|
+          @tags << Tag.new(tag)
+        end
+      end
+      @name        = attributes[:name]
       @description = attributes[:description]
-      @length      = attributes[:length]
+      @embed_html  = attributes[:embed_html]
+      @icon        = attributes[:icon]
+      @source      = attributes[:source]
       if attributes[:created_time]
         @created_time = Time.parse(attributes[:created_time]).utc
       end

data/lib/fb_graph.rb

@@ -61,6 +61,8 @@ require 'fb_graph/app_request'
 require 'fb_graph/application'
 require 'fb_graph/checkin'
 require 'fb_graph/comment'
+require 'fb_graph/doc'
+require 'fb_graph/domain'
 require 'fb_graph/event'
 require 'fb_graph/friend_list'
 require 'fb_graph/group'
@@ -74,6 +76,8 @@ require 'fb_graph/page'
 require 'fb_graph/photo'
 require 'fb_graph/place'
 require 'fb_graph/post'
+require 'fb_graph/property'
+require 'fb_graph/review'
 require 'fb_graph/status'
 require 'fb_graph/tag'
 require 'fb_graph/thread'

data/spec/fb_graph/album_spec.rb

@@ -15,6 +15,7 @@ describe FbGraph::Album do
         :location => 'Tokyo, Japan',
         :link => 'http://www.facebook.com/album/12345',
         :count => 10,
+        :cover_photo => '10150146072661729',
         :type => 'normal',
         :created_time => '2009-12-29T15:24:50+0000',
         :updated_time => '2010-01-02T15:37:41+0000',
@@ -37,6 +38,7 @@ describe FbGraph::Album do
       album.description.should    == 'an album for fb_graph test'
       album.location.should       == 'Tokyo, Japan'
       album.link.should           == 'http://www.facebook.com/album/12345'
+      album.cover_photo.should    == FbGraph::Photo.new('10150146072661729')
       album.count.should          == 10
       album.type.should           == 'normal'
       album.created_time.should   == Time.parse('2009-12-29T15:24:50+0000')

data/spec/fb_graph/auth/cookie_spec.rb

@@ -8,12 +8,23 @@ describe FbGraph::Auth::Cookie, '.parse' do
     }
   end
 
-  it 'should parse fbs_APP_ID cookie' do
-    cookie = FbGraph::Auth::Cookie.parse(@client, @cookie)
-    cookie[:access_token].should == 't'
-    cookie[:expires].should      == 0
-    cookie[:secret].should       == 's'
-    cookie[:session_key].should  == 'k'
-    cookie[:uid].should          == '12345'
+  shared_examples_for :parsable_cookie do
+    it 'should be parsable' do
+      cookie[:access_token].should == 't'
+      cookie[:expires].should      == 0
+      cookie[:secret].should       == 's'
+      cookie[:session_key].should  == 'k'
+      cookie[:uid].should          == '12345'
+    end
+  end
+
+  context 'when whole cookie is given' do
+    let(:cookie) { FbGraph::Auth::Cookie.parse(@client, @cookie) }
+    it_behaves_like :parsable_cookie
+  end
+
+  context 'when actual cookie string is given' do
+    let(:cookie) { FbGraph::Auth::Cookie.parse(@client, @cookie['fbs_client_id']) }
+    it_behaves_like :parsable_cookie
   end
 end