fb_graph 2.5.8 → 2.5.9

data/Gemfile.lock

@@ -10,20 +10,20 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    actionpack (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
-    activesupport (3.2.8)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.3.2)
@@ -43,7 +43,7 @@ GEM
     i18n (0.6.1)
     journey (1.0.4)
     json (1.7.5)
-    multi_json (1.3.6)
+    multi_json (1.4.0)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -56,22 +56,23 @@ GEM
       rack (>= 1.1)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
+    rake (10.0.2)
+    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-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    sprockets (2.1.3)
+    rspec-mocks (2.12.0)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     tilt (1.3.3)
     tzinfo (0.3.35)
-    webmock (1.8.11)
+    webmock (1.9.0)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
     yamler (0.1.0)

data/README.rdoc

@@ -73,6 +73,16 @@ https://github.com/nov/fb_graph/wiki
   me.home
   :
 
+By default, FbGraph will only return the default fields. In order to
+get a non-default field, you have to supply the connect with an options hash
+specifying the field. An example for events:
+
+  user.events({:fields => "owner,name,description,picture"}) # { and } optional
+
+An overview of which fields you can include in the graph API can be found at 
+https://developers.facebook.com/docs/reference/api/, which has a description 
+of the specific objects fields in the sidebar under "Objects".
+
 ==== Search
 
   # all objects

data/VERSION

@@ -1 +1 @@
-2.5.8
+2.5.9

data/lib/fb_graph/connections/picture.rb

@@ -28,6 +28,12 @@ module FbGraph
           _endpoint_
         end
       end
+
+      module Updatable
+        def picture!(options = {})
+          post options.merge(:connection => :picture)
+        end
+      end
     end
   end
 end

data/lib/fb_graph/cover.rb

@@ -0,0 +1,10 @@
+module FbGraph
+  class Cover < Photo
+    attr_accessor :offset_y
+
+    def initialize(identifier, attributes = {})
+      super
+      @offset_y = attributes[:offset_y]
+    end
+  end
+end

data/lib/fb_graph/page/category_attributes.rb

@@ -1,8 +1,8 @@
 module FbGraph
   class Page
     module CategoryAttributes
-      @@attributes = {}
-      @@attributes[:raw] = [
+      @@category_attributes = {}
+      @@category_attributes[:raw] = [
         :affiliation,
         :artists_we_like,
         :attire,
@@ -11,7 +11,6 @@ module FbGraph
         :band_members,
         :bio,
         :booking_agent,
-        :can_post,
         :company_overview,
         :culinary_team,
         :current_location,
@@ -23,7 +22,6 @@ module FbGraph
         :hometown,
         :influences,
         :is_community_page,
-        :link,
         :location,
         :mission,
         :mpg,
@@ -43,24 +41,24 @@ module FbGraph
         :website,
         :written_by
       ]
-      @@attributes[:symbols] = [
+      @@category_attributes[:symbols] = [
         :parking,
         :payment_options,
         :restaurant_services,
         :restaurant_specialties
       ]
-      @@attributes[:date] = [
+      @@category_attributes[:date] = [
         :birthday,
         :built,
         :founded,
         :release_date
       ]
-      @@attributes[:others] = [
+      @@category_attributes[:others] = [
         :checkin_count,
         :hours,
         :location
       ]
-      attr_accessor *@@attributes.values.flatten
+      attr_accessor *@@category_attributes.values.flatten
 
       def self.included(klass)
         klass.alias_method_chain :initialize, :category_specific_attributes
@@ -68,19 +66,17 @@ module FbGraph
 
       def initialize_with_category_specific_attributes(identifier, attributes = {})
         initialize_without_category_specific_attributes identifier, attributes
-        @@attributes[:raw].each do |key|
+        @@category_attributes[:raw].each do |key|
           self.send :"#{key}=", attributes[key]
         end
 
-        self.link ||= "https://www.facebook.com/#{username || identifier}"
-
-        @@attributes[:symbols].each do |key|
+        @@category_attributes[:symbols].each do |key|
           self.send :"#{key}=", []
           if attributes[key]
             self.send :"#{key}=", attributes[key].keys.collect(&:to_sym)
           end
         end
-        @@attributes[:date].each do |key|
+        @@category_attributes[:date].each do |key|
           date = if attributes[key]
             begin
               Date.parse attributes[key]

data/lib/fb_graph/page.rb

@@ -15,6 +15,7 @@ module FbGraph
     include Connections::Notes
     include Connections::Photos
     include Connections::Picture
+    include Connections::Picture::Updatable
     include Connections::Posts
     include Connections::PromotablePosts
     include Connections::Questions
@@ -25,15 +26,23 @@ module FbGraph
     include Connections::Videos
     extend Searchable
 
-    attr_accessor :name, :username, :category, :like_count, :talking_about_count, :perms
+    @@attributes = {
+      :raw => [:name, :username, :category, :link, :talking_about_count, :perms, :is_published, :can_post],
+      :custom => [:cover, :like_count]
+    }
+
+    attr_accessor *@@attributes.values.flatten
 
     def initialize(identifier, attributes = {})
       super
-      [:name, :username, :category, :talking_about_count].each do |key|
+      @@attributes[:raw].each do |key|
         self.send :"#{key}=", attributes[key]
       end
+      @link ||= "https://www.facebook.com/#{username || identifier}"
       @like_count = attributes[:likes] || attributes[:fan_count]
-      @perms = attributes[:perms]
+      @cover = if (cover = attributes[:cover])
+        Cover.new cover[:cover_id], cover
+      end
     end
   end
 end

data/lib/fb_graph.rb

@@ -115,6 +115,7 @@ require 'fb_graph/notification'
 require 'fb_graph/order'
 require 'fb_graph/page'
 require 'fb_graph/photo'
+require 'fb_graph/cover'
 require 'fb_graph/place'
 require 'fb_graph/post'
 require 'fb_graph/promotable_post'

data/spec/fb_graph/connections/picture_spec.rb

@@ -1,75 +1,92 @@
 require 'spec_helper'
 
-describe FbGraph::Connections::Picture, '#picture' do
-  context 'when included by FbGraph::User' do
-    it 'should return image url' do
-      FbGraph::User.new('matake').picture.should == File.join(FbGraph::ROOT_URL, 'matake/picture')
-    end
+describe FbGraph::Connections::Picture do
+  describe '#picture' do
+    context 'when included by FbGraph::User' do
+      it 'should return image url' do
+        FbGraph::User.new('matake').picture.should == File.join(FbGraph::ROOT_URL, 'matake/picture')
+      end
 
-    it 'should support size option' do
-      [:square, :small, :normal, :large].each do |size|
-        FbGraph::User.new('matake').picture(size).should == File.join(FbGraph::ROOT_URL, "matake/picture?type=#{size}")
-        FbGraph::User.new('matake').picture(:type => size).should == File.join(FbGraph::ROOT_URL, "matake/picture?type=#{size}")
+      it 'should support size option' do
+        [:square, :small, :normal, :large].each do |size|
+          FbGraph::User.new('matake').picture(size).should == File.join(FbGraph::ROOT_URL, "matake/picture?type=#{size}")
+          FbGraph::User.new('matake').picture(:type => size).should == File.join(FbGraph::ROOT_URL, "matake/picture?type=#{size}")
+        end
       end
-    end
 
-    it 'should support width option' do
-      FbGraph::User.new('matake').picture(:width => 13).should == File.join(FbGraph::ROOT_URL, "matake/picture?width=13")
-    end
+      it 'should support width option' do
+        FbGraph::User.new('matake').picture(:width => 13).should == File.join(FbGraph::ROOT_URL, "matake/picture?width=13")
+      end
 
-    it 'should support height option' do
-      FbGraph::User.new('matake').picture(:height => 37).should == File.join(FbGraph::ROOT_URL, "matake/picture?height=37")
-    end
+      it 'should support height option' do
+        FbGraph::User.new('matake').picture(:height => 37).should == File.join(FbGraph::ROOT_URL, "matake/picture?height=37")
+      end
 
-    it 'should support width and height options at the same time' do
-      # Because we can't be sure of order of arguments and order by itself doesn't matter
-      FbGraph::User.new('matake').picture(:width => 13, :height => 37).should satisfy { |uri| 
-        [
-          File.join(FbGraph::ROOT_URL, "matake/picture?width=13&height=37"),
-          File.join(FbGraph::ROOT_URL, "matake/picture?height=37&width=13")
-        ].include? uri
-      }
-    end
+      it 'should support width and height options at the same time' do
+        # Because we can't be sure of order of arguments and order by itself doesn't matter
+        FbGraph::User.new('matake').picture(:width => 13, :height => 37).should satisfy { |uri| 
+          [
+            File.join(FbGraph::ROOT_URL, "matake/picture?width=13&height=37"),
+            File.join(FbGraph::ROOT_URL, "matake/picture?height=37&width=13")
+          ].include? uri
+        }
+      end
 
-    context 'when no-redirect' do
-      it 'should return Picture object' do
-        mock_graph :get, 'matake/picture', 'users/picture/success', :params => {
-          :redirect => 'false'
-        } do
-          picture = FbGraph::User.new('matake').picture(:redirect => false)
-          picture.should be_instance_of FbGraph::Picture
+      context 'when no-redirect' do
+        it 'should return Picture object' do
+          mock_graph :get, 'matake/picture', 'users/picture/success', :params => {
+            :redirect => 'false'
+          } do
+            picture = FbGraph::User.new('matake').picture(:redirect => false)
+            picture.should be_instance_of FbGraph::Picture
+          end
         end
       end
     end
-  end
 
-  context 'when included by FbGraph::Page' do
-    it 'should return image url' do
-      FbGraph::Page.new('platform').picture.should == File.join(FbGraph::ROOT_URL, 'platform/picture')
-    end
+    context 'when included by FbGraph::Page' do
+      it 'should return image url' do
+        FbGraph::Page.new('platform').picture.should == File.join(FbGraph::ROOT_URL, 'platform/picture')
+      end
 
-    it 'should support size option' do
-      [:square, :small, :normal, :large].each do |size|
-        FbGraph::Page.new('platform').picture(size).should == File.join(FbGraph::ROOT_URL, "platform/picture?type=#{size}")
-        FbGraph::Page.new('platform').picture(:type => size).should == File.join(FbGraph::ROOT_URL, "platform/picture?type=#{size}")
+      it 'should support size option' do
+        [:square, :small, :normal, :large].each do |size|
+          FbGraph::Page.new('platform').picture(size).should == File.join(FbGraph::ROOT_URL, "platform/picture?type=#{size}")
+          FbGraph::Page.new('platform').picture(:type => size).should == File.join(FbGraph::ROOT_URL, "platform/picture?type=#{size}")
+        end
       end
-    end
 
-    it 'should support width option' do
-      FbGraph::Page.new('platform').picture(:width => 13).should == File.join(FbGraph::ROOT_URL, "platform/picture?width=13")
-    end
+      it 'should support width option' do
+        FbGraph::Page.new('platform').picture(:width => 13).should == File.join(FbGraph::ROOT_URL, "platform/picture?width=13")
+      end
 
-    it 'should support height option' do
-      FbGraph::Page.new('platform').picture(:height => 37).should == File.join(FbGraph::ROOT_URL, "platform/picture?height=37")
+      it 'should support height option' do
+        FbGraph::Page.new('platform').picture(:height => 37).should == File.join(FbGraph::ROOT_URL, "platform/picture?height=37")
+      end
+
+      it 'should support width and height options at the same time' do
+        FbGraph::Page.new('platform').picture(:width => 13, :height => 37).should satisfy { |uri| 
+          [
+            File.join(FbGraph::ROOT_URL, "platform/picture?width=13&height=37"),
+            File.join(FbGraph::ROOT_URL, "platform/picture?height=37&width=13")
+          ].include? uri
+        }
+      end    
     end
+  end
+end
 
-    it 'should support width and height options at the same time' do
-      FbGraph::Page.new('platform').picture(:width => 13, :height => 37).should satisfy { |uri| 
-        [
-          File.join(FbGraph::ROOT_URL, "platform/picture?width=13&height=37"),
-          File.join(FbGraph::ROOT_URL, "platform/picture?height=37&width=13")
-        ].include? uri
-      }
-    end    
+describe FbGraph::Connections::Picture::Updatable do
+  describe '#picture!' do
+    it 'should update profile picture' do
+      mock_graph :post, 'FbGraph/picture', 'true', :access_token => 'page_token', :params => {
+        :picture => 'http://example.com/images/FbGraph.png'
+      } do
+        page = FbGraph::Page.new('FbGraph', :access_token => 'page_token')
+        page.picture!(
+          :picture => 'http://example.com/images/FbGraph.png'
+        ).should be_true
+      end
+    end
   end
 end

data/spec/fb_graph/page_spec.rb

@@ -41,10 +41,12 @@ describe FbGraph::Page do
       end
     end
     its(:identifier) { should == '19292868552' }
-    its(:name)       { should == 'Facebook Platform' }
-    its(:category)   { should == 'Technology' }
-    its(:like_count) { should == 578214 }
-    its(:talking_about_count) { should == 40945 }
+    its(:name)       { should == 'Facebook Developers' }
+    its(:category)   { should == 'Product/service' }
+    its(:like_count) { should == 237499 }
+    its(:talking_about_count) { should == 17811 }
+    its(:cover)      { should be_instance_of FbGraph::Cover }
+    its(:is_published) { should be_true }
 
     context 'when access_token field fetched' do
       subject do

data/spec/mock_json/pages/platform_public.json

@@ -1,14 +1,18 @@
 {
-   "id": "19292868552",
-   "name": "Facebook Platform",
-   "picture": "http://profile.ak.fbcdn.net/profile-ak-snc1/object3/1566/8/s19292868552_1660.jpg",
-   "link": "http://www.facebook.com/platform",
-   "category": "Technology",
-   "username": "platform",
-   "founded": "May 2007",
-   "company_overview": "Facebook Platform enables anyone to build social applications on Facebook and the web.",
-   "mission": "To make the web more open and social.",
-   "products": "Facebook Application Programming Interface (API)\nFacebook Query Language (FQL)\nFacebook Markup Language (FBML)\nFacebook JavaScript (FBJS)\nFacebook Connect\n",
-   "likes": 578214,
-   "talking_about_count": 40945
+  "name": "Facebook Developers", 
+  "is_published": true, 
+  "website": "http://developers.facebook.com", 
+  "username": "FacebookDevelopers", 
+  "company_overview": "Facebook Platform enables anyone to build social apps on Facebook, mobile, and the web.\n\n", 
+  "about": "Build and distribute amazing social apps on Facebook. https://developers.facebook.com/ ", 
+  "talking_about_count": 17811, 
+  "category": "Product/service", 
+  "id": "19292868552", 
+  "link": "https://www.facebook.com/FacebookDevelopers", 
+  "likes": 237499, 
+  "cover": {
+    "cover_id": "10151124971508553", 
+    "source": "https://fbcdn-sphotos-f-a.akamaihd.net/hphotos-ak-ash4/s720x720/418043_10151124971508553_1379621833_n.png", 
+    "offset_y": 0
+  }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fb_graph
 version: !ruby/object:Gem::Version
-  version: 2.5.8
+  version: 2.5.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2012-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -285,6 +285,7 @@ files:
 - lib/fb_graph/connections/user_likes.rb
 - lib/fb_graph/connections/videos.rb
 - lib/fb_graph/connections/votes.rb
+- lib/fb_graph/cover.rb
 - lib/fb_graph/debugger.rb
 - lib/fb_graph/doc.rb
 - lib/fb_graph/domain.rb
@@ -728,18 +729,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -910629927856901231
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -910629927856901231
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24