fb_graph 1.6.0 → 1.6.1

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.6.1

data/fb_graph.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fb_graph}
-  s.version = "1.6.0"
+  s.version = "1.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["nov matake"]
-  s.date = %q{2011-03-19}
+  s.date = %q{2011-03-20}
   s.description = %q{A full-stack Facebook Graph API wrapper in Ruby.}
   s.email = %q{nov@matake.jp}
   s.extra_rdoc_files = [
@@ -130,6 +130,7 @@ Gem::Specification.new do |s|
     "spec/fake_json/events/maybe/smartday_private.json",
     "spec/fake_json/events/noreply/smartday_private.json",
     "spec/fake_json/groups/members/emacs_private.json",
+    "spec/fake_json/pages/categories/local_business.json",
     "spec/fake_json/pages/checkins/gowalla_private.json",
     "spec/fake_json/pages/checkins/gowalla_public.json",
     "spec/fake_json/pages/insights/FbGraph_private.json",
@@ -281,6 +282,7 @@ Gem::Specification.new do |s|
     "spec/fb_graph/message_spec.rb",
     "spec/fb_graph/node_spec.rb",
     "spec/fb_graph/note_spec.rb",
+    "spec/fb_graph/page/categories/local_business_spec.rb",
     "spec/fb_graph/page_spec.rb",
     "spec/fb_graph/photo_spec.rb",
     "spec/fb_graph/place_spec.rb",
@@ -372,6 +374,7 @@ Gem::Specification.new do |s|
     "spec/fb_graph/message_spec.rb",
     "spec/fb_graph/node_spec.rb",
     "spec/fb_graph/note_spec.rb",
+    "spec/fb_graph/page/categories/local_business_spec.rb",
     "spec/fb_graph/page_spec.rb",
     "spec/fb_graph/photo_spec.rb",
     "spec/fb_graph/place_spec.rb",

data/lib/fb_graph/auth.rb

@@ -34,12 +34,14 @@ module FbGraph
       self.access_token.present?
     end
 
-    def authorize_uri(canvas_uri)
+    def authorize_uri(canvas_uri, options = {})
       endpoint = URI.parse SignedRequest::OAUTH_DIALOG_ENDPOINT
-      endpoint.query = {
+      params = options.merge(
         :client_id => self.client.id,
         :redirect_uri => canvas_uri
-      }.to_query
+      )
+      params[:scope] = Array(params[:scope]).join(',') if params[:scope].present?
+      endpoint.query = params.to_query
       endpoint.to_s
     end
 

data/lib/fb_graph/page/categories/local_business.rb

@@ -2,7 +2,7 @@ module FbGraph
   class Page
     module Categories
       module LocalBusiness
-        attr_accessor :attire, :general_manager, :hours, :parking, :payment_options, :phone, :price_range, :public_transit, :restaurant_services, :restaurant_specialties
+        attr_accessor :attire, :culinary_team, :general_manager, :hours, :parking, :payment_options, :phone, :price_range, :public_transit, :restaurant_services, :restaurant_specialties
 
         def self.included(klass)
           klass.alias_method_chain :initialize, :category_specific_attributes
@@ -10,7 +10,7 @@ module FbGraph
 
         def initialize_with_category_specific_attributes(identifier, attributes = {})
           initialize_without_category_specific_attributes identifier, attributes
-          [:attire, :general_manager, :phone, :price_range, :public_transit].each do |key|
+          [:attire, :culinary_team, :general_manager, :phone, :price_range, :public_transit].each do |key|
             self.send :"#{key}=", attributes[key]
           end
           [:parking, :payment_options, :restaurant_services, :restaurant_specialties].each do |key|

data/lib/fb_graph/user.rb

@@ -29,7 +29,7 @@ module FbGraph
     include Connections::Videos
     extend Searchable
 
-    attr_accessor :first_name, :last_name, :name, :link, :about, :birthday, :work, :education, :email, :website, :websites, :hometown, :location, :bio, :quotes, :gender, :interested_in, :meeting_for, :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 :first_name, :last_name, :name, :link, :about, :birthday, :work, :education, :email, :website, :hometown, :location, :bio, :quotes, :gender, :interested_in, :meeting_for, :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
 
     def initialize(identifier, attributes = {})
       super

data/spec/fake_json/pages/categories/local_business.json

@@ -0,0 +1,72 @@
+{
+    "attire":
+    "Casual",
+    "category":
+    "Bar",
+    "culinary_team":
+    "Team FbGraph!",
+    "general_manager":
+    "Nov Matake",
+    "hours":
+    {
+        "mon_1_open":
+        378000,
+        "mon_2_close":
+        406800
+    },
+    "id":
+    "196723247025808",
+    "link":
+    "http://www.facebook.com/pages/Local-Business-Sample/196723247025808",
+    "location":
+    {
+        "city":
+        "Kyoto",
+        "country":
+        "Japan",
+        "street":
+        "\u65b0\u7530\u8fba",
+        "zip":
+        "513001"
+    },
+    "name":
+    "Local Business Sample",
+    "parking":
+    {
+        "street":
+        1,
+        "valet":
+        1
+    },
+    "payment_options":
+    {
+        "amex":
+        1,
+        "mastercard":
+        1,
+        "visa":
+        1
+    },
+    "phone":
+    "1234567890",
+    "picture":
+    "http://b.static.ak.fbcdn.net/rsrc.php/v1/y0/r/XsEg9L6Ie5_.jpg",
+    "price_range":
+    "$ (0-10)",
+    "public_transit":
+    "30 min from Kyoto St.",
+    "restaurant_services":
+    {
+        "groups":
+        1,
+        "reserve":
+        1
+    },
+    "restaurant_specialties":
+    {
+        "dinner":
+        1,
+        "drinks":
+        1
+    }
+}

data/spec/fb_graph/auth_spec.rb

@@ -25,7 +25,7 @@ describe FbGraph::Auth, '.new' do
   end
 end
 
-describe FbGraph::Auth, '.from_cookie' do
+describe FbGraph::Auth, '#from_cookie' do
   before do
     @auth = FbGraph::Auth.new('client_id', 'client_secret')
     @expires_at = Time.parse('2020-12-31 12:00:00')
@@ -54,7 +54,7 @@ describe FbGraph::Auth, '.from_cookie' do
   end
 end
 
-describe FbGraph::Auth, '.from_signed_request' do
+describe FbGraph::Auth, '#from_signed_request' do
   before do
     @signed_request = "LqsgnfcsRdfjOgyW6ZuSLpGBVsxUBegEqai4EcrWS0A=.eyJhbGdvcml0aG0iOiJITUFDLVNIQTI1NiIsImV4cGlyZXMiOjAsImlzc3VlZF9hdCI6MTI5ODc4MzczOSwib2F1dGhfdG9rZW4iOiIxMzQxNDU2NDMyOTQzMjJ8MmI4YTZmOTc1NTJjNmRjZWQyMDU4MTBiLTU3OTYxMjI3NnxGS1o0akdKZ0JwN2k3bFlrOVhhUk1QZ3lhNnMiLCJ1c2VyIjp7ImNvdW50cnkiOiJqcCIsImxvY2FsZSI6ImVuX1VTIiwiYWdlIjp7Im1pbiI6MjF9fSwidXNlcl9pZCI6IjU3OTYxMjI3NiJ9"
     @auth = FbGraph::Auth.new('client_id', 'client_secret')
@@ -86,4 +86,35 @@ describe FbGraph::Auth, '.from_signed_request' do
       end.should raise_exception(FbGraph::Auth::VerificationFailed)
     end
   end
-end
+end
+
+describe FbGraph::Auth do
+  let(:auth) { FbGraph::Auth.new('client_id', 'client_secret') }
+
+  describe '#authorized?' do
+    subject { auth.authorized? }
+
+    context 'when access_token is given' do
+      before do
+        auth.access_token = 'access_token'
+      end
+      it { should be_true }
+    end
+
+    context 'otherwise' do
+      it { should be_false }
+    end
+  end
+
+  describe '#authorize_uri' do
+    let(:canvas_uri) { 'http://client.example.com/canvas' }
+    subject { auth.authorize_uri(canvas_uri) }
+    it { should == "https://www.facebook.com/dialog/oauth?client_id=client_id&redirect_uri=#{CGI.escape canvas_uri}" }
+
+    context 'when params are given' do
+      subject { auth.authorize_uri(canvas_uri, :scope => [:scope1, :scope2], :state => 'state1') }
+      it { should == "https://www.facebook.com/dialog/oauth?client_id=client_id&redirect_uri=#{CGI.escape canvas_uri}&scope=#{CGI.escape "scope1,scope2"}&state=state1" }
+    end
+  end
+end
+

data/spec/fb_graph/page/categories/local_business_spec.rb

@@ -0,0 +1,34 @@
+require File.join(File.dirname(__FILE__), '../../../spec_helper')
+
+describe FbGraph::Page::Categories::LocalBusiness do
+  before do
+    fake_json(:get, 'local_business', 'pages/categories/local_business')
+  end
+  let(:page) { FbGraph::Page.new('local_business').fetch }
+  subject { page }
+
+  [:attire, :culinary_team, :general_manager, :phone, :price_range, :public_transit].each do |key|
+    its(key) { should be_instance_of String }
+  end
+
+  [:parking, :payment_options, :restaurant_services, :restaurant_specialties].each do |key|
+    its(key) { should be_instance_of Array }
+    describe key do
+      it 'should be an Array of Symbol' do
+        page.send(key).all? do |value|
+          value.should be_instance_of Symbol
+        end
+      end
+    end
+  end
+
+  its(:hours) { should be_instance_of Hash }
+  its(:hours) do
+    should == {
+      :mon => [
+        {:open  => Time.parse('Wed Mar 23 09:00:00 UTC 2011')},
+        {:close => Time.parse('Wed Mar 23 17:00:00 UTC 2011')}
+      ]
+    }
+  end
+end

data/spec/fb_graph/page_spec.rb

@@ -23,13 +23,7 @@ describe FbGraph::Page, '.new' do
     page.category.should   == 'Technology'
     page.username.should   == 'platform'
     page.mission.should    == 'To make the web more open and social.'
-    page.products.should   == [
-      'Facebook Application Programming Interface (API)',
-      'Facebook Query Language (FQL)',
-      'Facebook Markup Language (FBML)',
-      'Facebook JavaScript (FBJS)',
-      'Facebook Connect'
-    ]
+    page.products.should   == "Facebook Application Programming Interface (API)\nFacebook Query Language (FQL)\nFacebook Markup Language (FBML)\nFacebook JavaScript (FBJS)\nFacebook Connect\n"
     page.like_count.should == 578246
     page.company_overview.should == 'Facebook Platform enables anyone to build social applications on Facebook and the web.'
     page.link.should     == 'http://www.facebook.com/platform'

data/spec/fb_graph/user_spec.rb

@@ -56,7 +56,6 @@ describe FbGraph::User, '.fetch' do
         user.meeting_for.should         == ['Friendship', 'Networking']
         user.relationship_status.should == 'Married'
         user.website.should             == 'http://matake.jp'
-        user.websites.should            == ['http://matake.jp']
         user.religion.should            be_nil
         user.political.should           be_nil
         user.timezone.should            == 9
@@ -136,7 +135,6 @@ describe FbGraph::User, '.fetch' do
       ]
       user.email.should               == nil
       user.website.should             == nil
-      user.websites.should            == []
       user.hometown.should            == FbGraph::Page.new(109533479072558, :name => 'Minnetonka, Minnesota')
       user.interested_in.should       == ['female']
       user.meeting_for.should         == ['Friendship']

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fb_graph
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 1
   - 6
-  - 0
-  version: 1.6.0
+  - 1
+  version: 1.6.1
 platform: ruby
 authors: 
 - nov matake
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-19 00:00:00 +09:00
+date: 2011-03-20 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -248,6 +248,7 @@ files:
 - spec/fake_json/events/maybe/smartday_private.json
 - spec/fake_json/events/noreply/smartday_private.json
 - spec/fake_json/groups/members/emacs_private.json
+- spec/fake_json/pages/categories/local_business.json
 - spec/fake_json/pages/checkins/gowalla_private.json
 - spec/fake_json/pages/checkins/gowalla_public.json
 - spec/fake_json/pages/insights/FbGraph_private.json
@@ -399,6 +400,7 @@ files:
 - spec/fb_graph/message_spec.rb
 - spec/fb_graph/node_spec.rb
 - spec/fb_graph/note_spec.rb
+- spec/fb_graph/page/categories/local_business_spec.rb
 - spec/fb_graph/page_spec.rb
 - spec/fb_graph/photo_spec.rb
 - spec/fb_graph/place_spec.rb
@@ -519,6 +521,7 @@ test_files:
 - spec/fb_graph/message_spec.rb
 - spec/fb_graph/node_spec.rb
 - spec/fb_graph/note_spec.rb
+- spec/fb_graph/page/categories/local_business_spec.rb
 - spec/fb_graph/page_spec.rb
 - spec/fb_graph/photo_spec.rb
 - spec/fb_graph/place_spec.rb