fb_graph 1.6.1 → 1.6.2

data/lib/fb_graph/work.rb

@@ -2,9 +2,10 @@ module FbGraph
   class Work
     include Comparison
 
-    attr_accessor :employer, :location, :position, :projects, :start_date, :end_date
+    attr_accessor :description, :employer, :location, :position, :projects, :with, :start_date, :end_date
 
     def initialize(attributes = {})
+      @description = attributes[:description]
       if (employer = attributes[:employer])
         @employer = Page.new(employer.delete(:id), employer)
       end
@@ -20,6 +21,12 @@ module FbGraph
           @projects << Project.new(project.delete(:id), project)
         end
       end
+      @with = []
+      if attributes[:with]
+        attributes[:with].each do |user|
+          @with << User.new(user.delete(:id), user)
+        end
+      end
       if attributes[:start_date] && attributes[:start_date] != '0000-00'
         year, month = attributes[:start_date].split('-').collect(&:to_i)
         @start_date = if month.blank? || month == 0

data/lib/fb_graph.rb

@@ -75,7 +75,6 @@ require 'fb_graph/page'
 require 'fb_graph/photo'
 require 'fb_graph/place'
 require 'fb_graph/post'
-require 'fb_graph/project'
 require 'fb_graph/status'
 require 'fb_graph/tag'
 require 'fb_graph/thread'
@@ -83,4 +82,7 @@ require 'fb_graph/user'
 require 'fb_graph/test_user' # Load after FbGraph::User
 require 'fb_graph/video'
 
+require 'fb_graph/klass'
+require 'fb_graph/project'
+
 require 'fb_graph/query'

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

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

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

@@ -0,0 +1,15 @@
+{
+    "id": "100473570038576",
+    "name": "Movie",
+    "picture": "http:\/\/b.static.ak.fbcdn.net\/rsrc.php\/v1\/y0\/r\/XsEg9L6Ie5_.jpg",
+    "link": "http:\/\/www.facebook.com\/pages\/Movie\/100473570038576",
+    "category": "Movie",
+    "genre": "Fiction",
+    "starring": "5 star",
+    "screenplay_by": "Nov Matake",
+    "directed_by": "Nov Matake",
+    "produced_by": "Nov Matake",
+    "studio": "Pikusaa",
+    "plot_outline": "Outline",
+    "written_by": "Nov Matake"
+}

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

@@ -0,0 +1,16 @@
+{
+    "id": "100473570038576",
+    "name": "Movie",
+    "picture": "http:\/\/static.ak.fbcdn.net\/rsrc.php\/v1\/y0\/r\/XsEg9L6Ie5_.jpg",
+    "link": "http:\/\/www.facebook.com\/pages\/Movie\/100473570038576",
+    "category": "Musician\/band",
+    "genre": "Rock",
+    "band_members": "Nov Matake",
+    "current_location": "Tokyo",
+    "record_label": "Sony",
+    "booking_agent": "Agent",
+    "press_contact": "Press contact",
+    "artists_we_like": "Also likes",
+    "influences": "Influences",
+    "band_interests": "Band interests"
+}

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

@@ -0,0 +1,12 @@
+{
+    "id": "100473570038576",
+    "name": "Actor",
+    "picture": "http:\/\/b.static.ak.fbcdn.net\/rsrc.php\/v1\/y0\/r\/XsEg9L6Ie5_.jpg",
+    "link": "http:\/\/www.facebook.com\/pages\/Actor\/100473570038576",
+    "category": "Actor\/director",
+    "bio": "bio",
+    "birthday": "01/01/1980",
+    "affiliation": "affiliation",
+    "personal_info": "personal info",
+    "personal_interests": "personal interest"
+}

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

@@ -0,0 +1,15 @@
+{
+    "id": "100473570038576",
+    "name": "Software Sample",
+    "picture": "http:\/\/static.ak.fbcdn.net\/rsrc.php\/v1\/y0\/r\/XsEg9L6Ie5_.jpg",
+    "link": "http:\/\/www.facebook.com\/pages\/Organization-Sample\/100473570038576",
+    "category": "Software",
+    "founded": "1980",
+    "mission": "mission",
+    "products": "Super Car",
+    "release_date": "1980-10-1",
+    "awards": "award1\naward2",
+    "built": "Since 1980",
+    "features": "feature1\nfeature2",
+    "mpg": "MPG"
+}

data/spec/fb_graph/page/local_business_spec.rb

@@ -0,0 +1,60 @@
+require File.join(File.dirname(__FILE__), '../../spec_helper')
+
+describe FbGraph::Page do
+  context 'for local_business category' 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,
+      :link,
+      :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).should_not be_blank
+          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('Thu Jan 01 09:00:00 UTC 1970')},
+          {:close => Time.parse('Thu Jan 01 17:00:00 UTC 1970')}
+        ]
+      }
+    end
+
+    its(:location) do
+      should == FbGraph::Venue.new(
+        :street => '新田辺',
+        :city => 'Kyoto',
+        :country => 'Japan',
+        :zip => '513001'
+      )
+    end
+  end
+end

data/spec/fb_graph/page/movie_spec.rb

@@ -0,0 +1,25 @@
+require File.join(File.dirname(__FILE__), '../../spec_helper')
+
+describe FbGraph::Page do
+  context 'for people category' do
+    before do
+      fake_json(:get, 'movie', 'pages/categories/movie')
+    end
+
+    let(:page) { FbGraph::Page.new('movie').fetch }
+    subject { page }
+
+    [
+      :directed_by,
+      :genre,
+      :plot_outline,
+      :produced_by,
+      :screenplay_by,
+      :starring,
+      :studio,
+      :written_by
+    ].each do |key|
+      its(key) { should be_instance_of String }
+    end
+  end
+end

data/spec/fb_graph/page/music_spec.rb

@@ -0,0 +1,25 @@
+require File.join(File.dirname(__FILE__), '../../spec_helper')
+
+describe FbGraph::Page do
+  context 'for music category' do
+    before do
+      fake_json(:get, 'music', 'pages/categories/music')
+    end
+
+    let(:page) { FbGraph::Page.new('music').fetch }
+    subject { page }
+
+    [
+      :artists_we_like,
+      :band_interests,
+      :band_members,
+      :booking_agent,
+      :current_location,
+      :influences,
+      :press_contact,
+      :record_label
+    ].each do |key|
+      its(key) { should be_instance_of String }
+    end
+  end
+end

data/spec/fb_graph/page/person_spec.rb

@@ -0,0 +1,23 @@
+require File.join(File.dirname(__FILE__), '../../spec_helper')
+
+describe FbGraph::Page do
+  context 'for person category' do
+    before do
+      fake_json(:get, 'person', 'pages/categories/person')
+    end
+
+    let(:page) { FbGraph::Page.new('person').fetch }
+    subject { page }
+
+    [
+      :affiliation,
+      :bio,
+      :personal_info,
+      :personal_interests
+    ].each do |key|
+      its(key) { should be_instance_of String }
+    end
+
+    its(:birthday) { should == Date.new(1980, 1, 1) }
+  end
+end

data/spec/fb_graph/page/product_spec.rb

@@ -0,0 +1,36 @@
+require File.join(File.dirname(__FILE__), '../../spec_helper')
+
+describe FbGraph::Page do
+  context 'for product category' do
+    before do
+      fake_json(:get, 'product', 'pages/categories/product')
+    end
+
+    let(:page) { FbGraph::Page.new('product').fetch }
+    subject { page }
+
+    [
+      :awards,
+      :features,
+      :link,
+      :mission,
+      :mpg,
+      :picture,
+      :products
+    ].each do |key|
+      its(key) { should be_instance_of String }
+    end
+
+    its(:built)        { should == 'Since 1980' }
+    its(:founded)      { should == '1980' }
+    its(:release_date) { should == Date.parse('Wed, 01 Oct 1980') }
+
+    context 'when valid date format' do
+      subject do
+        FbGraph::Page.new('12345', :built => 'May 1980', :founded => 'Oct 1980')
+      end
+      its(:built)   { should == Date.parse('Thu, 01 May 1980') }
+      its(:founded) { should == Date.parse('Wed, 01 Oct 1980') }
+    end
+  end
+end

data/spec/fb_graph/page_spec.rb

@@ -1,60 +1,42 @@
 require File.join(File.dirname(__FILE__), '../spec_helper')
 
-describe FbGraph::Page, '.new' do
-  it 'should setup all supported attributes' do
-    attributes = {
-      :id => '19292868552',
-      :name => 'Facebook Platform',
-      :founded => 'May 2007',
+describe FbGraph::Page do
+  let(:attributes) do
+    {
+      :id       => '19292868552',
       :category => 'Technology',
-      :username => 'platform',
-      :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 => 578246,
-      :company_overview => 'Facebook Platform enables anyone to build social applications on Facebook and the web.',
-      :link => 'http://www.facebook.com/platform',
-      :picture => 'http://profile.ak.fbcdn.net/profile-ak-snc1/object3/1566/8/s19292868552_1660.jpg',
-      :website => 'http://developers.facebook.com'
+      :likes    => 578246,
+      :name     => 'Facebook Platform',
+      :username => 'platform'
     }
-    page = FbGraph::Page.new(attributes.delete(:id), attributes)
-    page.identifier.should == '19292868552'
-    page.name.should       == 'Facebook Platform'
-    page.founded.should    == Date.new(2007, 5)
-    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)\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'
-    page.picture.should  == 'https://graph.facebook.com/19292868552/picture' # use connection
-    page.website.should  == 'http://developers.facebook.com'
-    page.websites.should == ['http://developers.facebook.com']
   end
-
-  it 'should allow invalid date as founded' do
-    page = FbGraph::Page.new(12345, :founded => "2004")
-    page.founded.should == Date.new(2004, 1, 1)
+  subject do
+    FbGraph::Page.new(attributes[:id], attributes)
   end
 
-  it 'should allow invalid date as release_date' do
-    page1 = FbGraph::Page.new(12345, :release_date => "2010-04-23")
-    page1.release_date.should == Date.new(2010, 4, 23)
-    page2 = FbGraph::Page.new(12345, :release_date => "someday")
-    page2.release_date.should == 'someday'
-  end
-end
+  its(:identifier) { should == attributes[:id]       }
+  its(:category)   { should == attributes[:category] }
+  its(:like_count) { should == attributes[:likes]    }
+  its(:name)       { should == attributes[:name]     }
+  its(:username)   { should == attributes[:username] }
 
-describe FbGraph::Page, '.fetch' do
-  before do
-    fake_json(:get, 'platform', 'pages/platform_public')
-    fake_json(:get, 'platform?access_token=access_token', 'pages/platform_private')
-  end
+  describe '.fetch' do
+    before do
+      fake_json(:get, 'platform', 'pages/platform_public')
+      fake_json(:get, 'platform?access_token=access_token', 'pages/platform_private')
+    end
+
+    context 'when access_token is given' do
+      subject { FbGraph::Page.fetch('platform') }
+      its(:identifier) { should == '19292868552' }
+      its(:name)       { should == 'Facebook Platform' }
+      its(:category)   { should == 'Technology' }
+      its(:like_count) { should == 578214 }
+    end
 
-  it 'should get page attributes' do
-    page = FbGraph::Page.fetch('platform')
-    page.identifier.should == '19292868552'
-    page.name.should       == 'Facebook Platform'
-    page.category.should   == 'Technology'
+    context 'otherwise' do
+      subject { FbGraph::Page.fetch('platform', :access_token => 'access_token') }
+      its(:like_count) { should == 578214 }
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fb_graph
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 1
   - 6
-  - 1
-  version: 1.6.1
+  - 2
+  version: 1.6.2
 platform: ruby
 authors: 
 - nov matake
@@ -204,14 +204,14 @@ files:
 - lib/fb_graph/friend_list.rb
 - lib/fb_graph/group.rb
 - lib/fb_graph/insight.rb
+- lib/fb_graph/klass.rb
 - lib/fb_graph/link.rb
 - lib/fb_graph/location.rb
 - lib/fb_graph/message.rb
 - lib/fb_graph/node.rb
 - lib/fb_graph/note.rb
 - lib/fb_graph/page.rb
-- lib/fb_graph/page/categories.rb
-- lib/fb_graph/page/categories/local_business.rb
+- lib/fb_graph/page/category_attributes.rb
 - lib/fb_graph/photo.rb
 - lib/fb_graph/place.rb
 - lib/fb_graph/post.rb
@@ -249,6 +249,10 @@ files:
 - 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/categories/movie.json
+- spec/fake_json/pages/categories/music.json
+- spec/fake_json/pages/categories/person.json
+- spec/fake_json/pages/categories/product.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
@@ -400,7 +404,11 @@ 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/local_business_spec.rb
+- spec/fb_graph/page/movie_spec.rb
+- spec/fb_graph/page/music_spec.rb
+- spec/fb_graph/page/person_spec.rb
+- spec/fb_graph/page/product_spec.rb
 - spec/fb_graph/page_spec.rb
 - spec/fb_graph/photo_spec.rb
 - spec/fb_graph/place_spec.rb
@@ -521,7 +529,11 @@ 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/local_business_spec.rb
+- spec/fb_graph/page/movie_spec.rb
+- spec/fb_graph/page/music_spec.rb
+- spec/fb_graph/page/person_spec.rb
+- spec/fb_graph/page/product_spec.rb
 - spec/fb_graph/page_spec.rb
 - spec/fb_graph/photo_spec.rb
 - spec/fb_graph/place_spec.rb

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

@@ -1,38 +0,0 @@
-module FbGraph
-  class Page
-    module Categories
-      module LocalBusiness
-        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
-        end
-
-        def initialize_with_category_specific_attributes(identifier, attributes = {})
-          initialize_without_category_specific_attributes identifier, attributes
-          [: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|
-            self.send :"#{key}=", []
-            if attributes[key]
-              self.send :"#{key}=", attributes[key].keys.collect(&:to_sym)
-            end
-          end
-          @hours = {}
-          if attributes[:hours]
-            utc_beginning_of_day = Time.now.utc.beginning_of_day
-            attributes[:hours].each do |key, value|
-              date, index, mode = key.split('_')
-              index = index.to_i - 1
-              date, mode = date.to_sym, mode.to_sym
-              @hours[date] ||= []
-              @hours[date][index] ||= {}
-              @hours[date][index][mode] = value.since(utc_beginning_of_day)
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/fb_graph/page/categories.rb

@@ -1,9 +0,0 @@
-Dir[File.dirname(__FILE__) + '/categories/*.rb'].each do |file| 
-  require file
-end
-
-module FbGraph
-  class Page
-    include Categories::LocalBusiness
-  end
-end

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

@@ -1,34 +0,0 @@
-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