fb_graph 2.0.1 → 2.0.2

data/.gitignore

@@ -13,6 +13,10 @@ tmtags
 ## VIM
 *.swp
 
+
+## RVM
+.rvmrc
+
 ## PROJECT::GENERAL
 coverage
 rdoc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fb_graph (2.0.0)
+    fb_graph (2.0.1)
       httpclient (>= 2.2.0.2)
       rack-oauth2 (>= 0.8.0)
 
@@ -37,6 +37,7 @@ GEM
     jruby-openssl (0.7.4)
       bouncy-castle-java
     json (1.5.3)
+    json (1.5.3-java)
     rack (1.2.3)
     rack-mount (0.6.14)
       rack (>= 1.0.0)

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/lib/fb_graph/adaccount.rb

@@ -0,0 +1,13 @@
+module FbGraph
+  class AdAccount < Node
+    attr_accessor :account_id, :name, :account_status, :daily_spend_limit, :users, :currency, :timezone_id, :timezone_name, :capabilities, :account_groups
+
+    def initialize(identifier, attributes = {})
+      super
+
+      %w(account_id name account_status daily_spend_limit currency timezone_id timezone_name).each do |field|
+        send("#{field}=", attributes[field.to_sym])
+      end
+    end
+  end
+end

data/lib/fb_graph/adcampaign.rb

@@ -0,0 +1,17 @@
+module FbGraph
+  class AdCampaign < Node
+    attr_accessor :campaign_id, :account_id, :name, :start_time, :end_time, :daily_budget, :campaign_status, :lifetime_budget
+
+    def initialize(identifier, attributes = {})
+      super
+
+      %w(campaign_id account_id name daily_budget campaign_status lifetime_budget).each do |field|
+        send("#{field}=", attributes[field.to_sym])
+      end
+
+      %w(start_time end_time).each do |field|
+        send("#{field}=", Time.parse(attributes[field.to_sym]).utc) if attributes[field.to_sym]
+      end
+    end
+  end
+end

data/lib/fb_graph/event.rb

@@ -24,7 +24,7 @@ module FbGraph
         @start_time = case start_time
         when String
           Time.parse(start_time)
-        when Fixnum
+        when Integer
           Time.at(start_time)
         end
       end
@@ -32,7 +32,7 @@ module FbGraph
         @end_time = case end_time
         when String
           Time.parse(end_time)
-        when Fixnum
+        when Integer
           Time.at(end_time)
         end
       end

data/lib/fb_graph/order.rb

@@ -13,6 +13,7 @@ module FbGraph
       if to = attributes[:to]
         @to = User.new(to[:id], to)
       end
+      @amount = attributes[:amount]
       @status = attributes[:status]
       @country = attributes[:country]
       if attributes[:created_time]
@@ -23,22 +24,25 @@ module FbGraph
       end
     end
 
-    def settled!(options = {})
+    def settle!(options = {})
       update options.merge(:status => :settled)
     end
+    alias_method :settled!, :settle!
 
-    def refunded!(options = {})
+    def refund!(options = {})
       update options.merge(:status => :refunded)
     end
+    alias_method :refunded!, :refund!
 
-    def canceled!(options = {})
+    def cancel!(options = {})
       update options.merge(:status => :canceled)
     end
+    alias_method :canceled!, :cancel!
 
     def update(attributes = {})
       _attributes_ = attributes.dup
       params = {
-        :access_token => self.access_token,
+        :access_token => _attributes_.delete(:access_token) || self.access_token,
         :status => _attributes_.delete(:status),
         :message => _attributes_.delete(:message),
         :refund_funding_source => _attributes_.delete(:refund_funding_source),

data/lib/fb_graph.rb

@@ -87,6 +87,9 @@ require 'fb_graph/user'
 require 'fb_graph/test_user' # Load after FbGraph::User
 require 'fb_graph/video'
 
+require 'fb_graph/adaccount'
+require 'fb_graph/adcampaign'
+
 require 'fb_graph/klass'
 require 'fb_graph/project'
 

data/spec/fb_graph/adaccount_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe FbGraph::AdAccount, '.new' do
+  it 'should setup all supported attributes' do
+    attributes = {
+      :id => 'act_12345566',
+      :account_id => 12345566,
+      :name => 'Test Ad Account',
+      :account_status => 1,
+      :daily_spend_limit => 20000,
+      :currency => "USD",
+      :timezone_id => 1,
+      :timezone_name => "America/Los_Angeles"
+    }
+    ad_account = FbGraph::AdAccount.new(attributes.delete(:id), attributes)
+    ad_account.identifier.should == "act_12345566"
+    ad_account.account_id.should == 12345566
+    ad_account.name.should == "Test Ad Account"
+    ad_account.account_status.should == 1
+    ad_account.daily_spend_limit.should == 20000
+    ad_account.currency.should == "USD"
+    ad_account.timezone_id.should == 1
+    ad_account.timezone_name.should == "America/Los_Angeles"
+  end
+end
+
+
+describe FbGraph::AdAccount, '.fetch' do
+  it 'should get the ad account' do
+    mock_graph :get, 'act_12345566', 'adaccounts/test_ad_account', :access_token => 'access_token' do
+      ad_account = FbGraph::AdAccount.fetch('act_12345566', :access_token => 'access_token')
+
+      ad_account.identifier.should == "act_12345566"
+      ad_account.account_id.should == 12345566
+      ad_account.name.should == "Test Ad Account"
+      ad_account.account_status.should == 1
+      ad_account.daily_spend_limit.should == 20000
+      ad_account.currency.should == "USD"
+      ad_account.timezone_id.should == 1
+      ad_account.timezone_name.should == "America/Los_Angeles"
+    end
+  end
+end

data/spec/fb_graph/adcampaign_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe FbGraph::AdCampaign, '.new' do
+  it 'should setup all supported attributes' do
+    attributes = {
+      :id => '6003266501234',
+      :campaign_id => 6003266501234,
+      :account_id => 12345566,
+      :name => "Test Ad Campaign",
+      :start_time => "2011-07-01T12:00:00+00:00",
+      :end_time => "2011-07-14T16:00:00+00:00",
+      :daily_budget => 20000,
+      :campaign_status => 1,
+      :lifetime_budget => 100000
+    }
+    ad_campaign = FbGraph::AdCampaign.new(attributes.delete(:id), attributes)
+    ad_campaign.identifier.should == "6003266501234"
+    ad_campaign.account_id.should == 12345566
+    ad_campaign.name.should == "Test Ad Campaign"
+    ad_campaign.start_time.should == Time.parse("2011-07-01T12:00:00Z")
+    ad_campaign.end_time.should == Time.parse("2011-07-14T16:00:00Z")
+    ad_campaign.daily_budget.should == 20000
+    ad_campaign.campaign_status.should == 1
+    ad_campaign.lifetime_budget.should == 100000
+  end
+end
+
+
+describe FbGraph::AdCampaign, '.fetch' do
+  it 'should get the ad campaign' do
+    mock_graph :get, '16003266501234', 'adcampaigns/test_ad_campaign', :access_token => 'access_token' do
+      ad_campaign = FbGraph::AdCampaign.fetch('16003266501234', :access_token => 'access_token')
+
+      ad_campaign.identifier.should == "6003266501234"
+      ad_campaign.account_id.should == 12345566
+      ad_campaign.name.should == "Test Ad Campaign"
+      ad_campaign.start_time.should == Time.parse("2011-07-01T12:00:00Z")
+      ad_campaign.end_time.should == Time.parse("2011-07-14T16:00:00Z")
+      ad_campaign.daily_budget.should == 20000
+      ad_campaign.campaign_status.should == 1
+      ad_campaign.lifetime_budget.should == 100000
+    end
+  end
+end

data/spec/fb_graph/order_spec.rb

@@ -1,19 +1,66 @@
 require 'spec_helper'
 
 describe FbGraph::Order do
-  describe '#new' do
-    it :TODO
+  subject { order }
+  let(:order) { FbGraph::Order.new attributes[:id], attributes }
+  let :attributes do
+    {
+      :id => '9005539514450',
+      :from => {
+        :name => 'Nov Matake',
+        :id => '579612276'
+      },
+      :to => {
+        :name => 'Nov Matake',
+        :id => '579612276'
+      },
+      :amount => 2,
+      :status => 'settled',
+      :application => {
+        :name => 'gem sample',
+        :id => '134145643294322'
+      },
+      :created_time => '2011-09-01T04:34:35+0000',
+      :updated_time => '2011-09-01T04:34:38+0000'
+    }
   end
 
-  describe '#settled!' do
-    it :TODO
+  its(:identifier)   { should == '9005539514450' }
+  its(:from)         { should == FbGraph::User.new('579612276', :name => 'Nov Matake') }
+  its(:to)           { should == FbGraph::User.new('579612276', :name => 'Nov Matake') }
+  its(:application)  { should == FbGraph::Application.new('134145643294322', :name => 'gem sample') }
+  its(:amount)       { should == 2 }
+  its(:status)       { should == 'settled' }
+  its(:created_time) { should == Time.parse('2011-09-01T04:34:35+0000') }
+  its(:updated_time) { should == Time.parse('2011-09-01T04:34:38+0000') }
+
+  describe '#settle!' do
+    it do
+      expect { order.settle! }.should request_to order.identifier, :post
+    end
+
+    it 'I have never succeeded this call yet'
   end
 
-  describe '#refunded!' do
-    it :TODO
+  describe '#refund!' do
+    it do
+      expect { order.refund! }.should request_to order.identifier, :post
+    end
+
+    it 'should return true' do
+      mock_graph :post, order.identifier, 'true', :access_token => 'access_token', :params => {
+        :status => 'refunded'
+      } do
+        order.refunded!(:access_token => 'access_token').should be_true
+      end
+    end
   end
 
-  describe '#canceled' do
-    it :TODO
+  describe '#cancel!' do
+    it do
+      expect { order.cancel! }.should request_to order.identifier, :post
+    end
+
+    it 'I have never succeeded this call yet'
   end
 end

data/spec/mock_json/adaccounts/test_ad_account.json

@@ -0,0 +1,10 @@
+{
+   "id": "act_12345566",
+   "account_id": 12345566,
+   "name": "Test Ad Account",
+   "account_status": 1,
+   "daily_spend_limit": 20000,
+   "currency": "USD",
+   "timezone_id": 1,
+   "timezone_name": "America/Los_Angeles"
+}

data/spec/mock_json/adcampaigns/test_ad_campaign.json

@@ -0,0 +1,11 @@
+{
+  "id": "6003266501234",
+  "campaign_id": 6003266501234,
+  "account_id": 12345566,
+  "name": "Test Ad Campaign",
+  "start_time": "2011-07-01T12:00:00+00:00",
+  "end_time": "2011-07-14T16:00:00+00:00",
+  "daily_budget": 20000,
+  "campaign_status": 1,
+  "lifetime_budget": 100000
+}

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fb_graph
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: 
-  version: 2.0.1
+  segments: 
+  - 2
+  - 0
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - nov matake
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 Z
+date: 2011-09-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httpclient
@@ -20,6 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 123
+        segments: 
+        - 2
+        - 2
+        - 0
+        - 2
         version: 2.2.0.2
   type: :runtime
   version_requirements: *id001
@@ -31,6 +42,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 8
+        - 0
         version: 0.8.0
   type: :runtime
   version_requirements: *id002
@@ -42,6 +58,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 8
         version: "0.8"
   type: :development
   version_requirements: *id003
@@ -53,6 +73,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
         version: "0.9"
   type: :development
   version_requirements: *id004
@@ -64,6 +88,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
         version: "2"
   type: :development
   version_requirements: *id005
@@ -75,6 +102,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 6
+        - 2
         version: 1.6.2
   type: :development
   version_requirements: *id006
@@ -86,6 +118,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 3
+        - 0
+        - 6
         version: 3.0.6
   type: :development
   version_requirements: *id007
@@ -113,6 +150,8 @@ files:
 - fb_graph.gemspec
 - lib/fb_graph.rb
 - lib/fb_graph/action.rb
+- lib/fb_graph/adaccount.rb
+- lib/fb_graph/adcampaign.rb
 - lib/fb_graph/album.rb
 - lib/fb_graph/app_request.rb
 - lib/fb_graph/application.rb
@@ -217,6 +256,8 @@ files:
 - lib/fb_graph/video.rb
 - lib/fb_graph/work.rb
 - lib/patch/rack/oauth2/util.rb
+- spec/fb_graph/adaccount_spec.rb
+- spec/fb_graph/adcampaign_spec.rb
 - spec/fb_graph/album_spec.rb
 - spec/fb_graph/app_request_spec.rb
 - spec/fb_graph/application_spec.rb
@@ -319,6 +360,8 @@ files:
 - spec/fb_graph/video_spec.rb
 - spec/fb_graph/work_spec.rb
 - spec/helpers/webmock_helper.rb
+- spec/mock_json/adaccounts/test_ad_account.json
+- spec/mock_json/adcampaigns/test_ad_campaign.json
 - spec/mock_json/albums/photos/matake_private.json
 - spec/mock_json/albums/photos/post_with_valid_access_token.json
 - spec/mock_json/applications/accounts/private.json
@@ -471,12 +514,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
@@ -486,6 +535,8 @@ signing_key:
 specification_version: 3
 summary: A full-stack Facebook Graph API wrapper in Ruby.
 test_files: 
+- spec/fb_graph/adaccount_spec.rb
+- spec/fb_graph/adcampaign_spec.rb
 - spec/fb_graph/album_spec.rb
 - spec/fb_graph/app_request_spec.rb
 - spec/fb_graph/application_spec.rb
@@ -588,6 +639,8 @@ test_files:
 - spec/fb_graph/video_spec.rb
 - spec/fb_graph/work_spec.rb
 - spec/helpers/webmock_helper.rb
+- spec/mock_json/adaccounts/test_ad_account.json
+- spec/mock_json/adcampaigns/test_ad_campaign.json
 - spec/mock_json/albums/photos/matake_private.json
 - spec/mock_json/albums/photos/post_with_valid_access_token.json
 - spec/mock_json/applications/accounts/private.json