fb_graph 2.1.0.alpha → 2.1.0

data/.travis.yml

@@ -1,5 +1,4 @@
 rvm:
-  - 1.8.6
   - 1.8.7
   - 1.9.2
   - 1.9.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fb_graph (2.0.2)
+    fb_graph (2.1.0.alpha)
       httpclient (>= 2.2.0.2)
       rack-oauth2 (>= 0.8.0)
 
@@ -41,7 +41,6 @@ GEM
     jruby-openssl (0.7.4)
       bouncy-castle-java
     json (1.5.4)
-    json (1.5.4-java)
     multi_json (1.0.3)
     rack (1.3.2)
     rack-cache (1.0.3)

data/VERSION

@@ -1 +1 @@
-2.1.0.alpha
+2.1.0

data/lib/fb_graph/ad_account.rb

@@ -1,6 +1,7 @@
 module FbGraph
   class AdAccount < Node
     include Connections::AdCampaigns
+    include Connections::AdGroups
 
     attr_accessor :account_id, :name, :account_status, :daily_spend_limit, :users, :currency, :timezone_id, :timezone_name, :capabilities, :account_groups
 

data/lib/fb_graph/ad_campaign.rb

@@ -1,5 +1,7 @@
 module FbGraph
   class AdCampaign < Node
+    include Connections::AdGroups
+
     attr_accessor :campaign_id, :account_id, :name, :start_time, :end_time, :daily_budget, :campaign_status, :lifetime_budget
 
     def initialize(identifier, attributes = {})

data/lib/fb_graph/ad_group.rb

@@ -0,0 +1,22 @@
+module FbGraph
+  class AdGroup < Node
+    attr_accessor :ad_id, :campaign_id, :name, :adgroup_status, :bid_type, :max_bid, :adgroup_id, :end_time, :start_time, :updated_time
+
+    def initialize(identifier, attributes = {})
+      super
+
+      %w(ad_id campaign_id name adgroup_status bid_type max_bid adgroup_id).each do |field|
+        send("#{field}=", attributes[field.to_sym])
+      end
+
+      %w(start_time end_time updated_time).each do |field|
+        if val = attributes[field.to_sym]
+          # Handles integer timestamps and ISO8601 strings
+          time = Time.parse(val) rescue Time.at(val.to_i)
+          send("#{field}=", time)
+        end
+      end
+    end
+  end
+end
+

data/lib/fb_graph/connections/ad_groups.rb

@@ -0,0 +1,24 @@
+module FbGraph
+  module Connections
+    module AdGroups
+      def ad_groups(options = {})
+        ad_groups = self.connection(:adgroups, options)
+        ad_groups.map! do |ad_group|
+          AdGroup.new(ad_group[:id], ad_group.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
+        end
+      end
+
+      # Note: AdGroups can only be created via the AdAccount connection. Even though it makes sense, they
+      # cannot be created via the AdCampaign connection
+      def ad_group!(options = {})
+        ad_group = post(options.merge(:connection => :adgroups))
+        AdGroup.new(ad_group[:id], options.merge(ad_group).merge(
+          :access_token => options[:access_token] || self.access_token
+        ))
+      end
+    end
+  end
+end
+

data/lib/fb_graph.rb

@@ -56,6 +56,7 @@ require 'fb_graph/work'
 require 'fb_graph/node'
 require 'fb_graph/ad_account'
 require 'fb_graph/ad_campaign'
+require 'fb_graph/ad_group'
 require 'fb_graph/album'
 require 'fb_graph/app_request'
 require 'fb_graph/application'

data/spec/fb_graph/ad_group_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe FbGraph::AdGroup, '.new' do
+    attr_accessor :ad_id, :campaign_id, :name, :adgroup_status, :bid_type, :max_bid, :adgroup_id, :end_time, :start_time, :updated_time
+  it 'should setup all supported attributes' do
+    attributes = {
+      :id => '6003590469668',
+      :ad_id => 6003590469668,
+      :campaign_id => 6003590468467,
+      :name => 'Ad Group 1',
+      :adgroup_status => 1,
+      :bid_type => 1,
+      :max_bid => 1000,
+      :adgroup_id => 6003590469668,
+      :end_time => "2011-09-10T00:00:00+00:00",
+      :start_time => "2011-09-01T12:00:00-07:00",
+      :updated_time => "2011-09-04T16:00:00+00:00"
+    }
+    ad_group = FbGraph::AdGroup.new(attributes.delete(:id), attributes)
+    ad_group.identifier.should == "6003590469668"
+    ad_group.ad_id.should == 6003590469668
+    ad_group.campaign_id.should == 6003590468467
+    ad_group.name.should == "Ad Group 1"
+    ad_group.adgroup_status.should == 1
+    ad_group.bid_type.should == 1
+    ad_group.max_bid.should == 1000
+    ad_group.adgroup_id.should == 6003590469668
+    ad_group.end_time.should == Time.parse("2011-09-10T00:00:00+00:00")
+    ad_group.start_time.should == Time.parse("2011-09-01T12:00:00-07:00")
+    ad_group.updated_time.should == Time.parse("2011-09-04T16:00:00+00:00")
+  end
+end
+
+
+describe FbGraph::AdGroup, '.fetch' do
+  it 'should get the ad group' do
+    mock_graph :get, '6003590469668', 'ad_groups/test_ad_group', :access_token => 'access_token' do
+      ad_group = FbGraph::AdGroup.fetch('6003590469668', :access_token => 'access_token')
+
+      ad_group.identifier.should == "6003590469668"
+      ad_group.ad_id.should == 6003590469668
+      ad_group.campaign_id.should == 6003590468467
+      ad_group.name.should == "Ad Group 1"
+      ad_group.adgroup_status.should == 1
+      ad_group.bid_type.should == 1
+      ad_group.max_bid.should == 1000
+      ad_group.adgroup_id.should == 6003590469668
+      ad_group.end_time.should == Time.parse("2011-09-10T00:00:00+00:00")
+      ad_group.start_time.should == Time.parse("2011-09-01T12:00:00-07:00")
+      ad_group.updated_time.should == Time.parse("2011-09-04T16:00:00+00:00")
+    end
+  end
+end

data/spec/fb_graph/connections/ad_groups_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe FbGraph::Connections::AdGroups, '#ad_groups' do
+  context 'when included by FbGraph::AdCampaign' do
+    context 'when access_token is given' do
+      it 'should return ad_groups as FbGraph::AdGroup' do
+        mock_graph :get, '22334455/adgroups', 'ad_campaigns/ad_groups/22334455_ad_groups', :access_token => 'access_token' do
+          ad_groups = FbGraph::AdCampaign.new('22334455', :access_token => 'access_token').ad_groups
+          ad_groups.first.should == FbGraph::AdGroup.new(
+            44556677,
+            :access_token => 'access_token',
+            :ad_id => 44556677,
+            :campaign_id => 22334455,
+            :name => "Test Ad Group 1",
+            :adgroup_status => 1,
+            :bid_type => 1,
+            :max_bid => 150,
+            :adgroup_id => 44556677,
+            :end_time => Time.parse("2011-09-01T00:00:00+00:00"),
+            :start_time => Time.parse("2011-09-10T00:00:00+00:00"),
+            :updated_time => Time.parse("2011-09-05T00:00:00+00:00")
+          )
+          ad_groups.each { |ad_group| ad_group.should be_instance_of(FbGraph::AdGroup) }
+        end
+      end
+    end
+  end
+end
+
+describe FbGraph::Connections::AdGroups, '#ad_group!' do
+  context 'when included by FbGraph::AdAccount' do
+    it 'should return generated ad_group' do
+      mock_graph :post, 'act_22334455/adgroups', 'ad_accounts/ad_groups/post_with_valid_access_token' do
+        ad_group = FbGraph::AdAccount.new('act_22334455', :access_token => 'valid').ad_group!(
+          :name => "Test Ad 1",
+          :campaign_id => 66778899,
+          :bid_type => 1,
+          :max_bid => 100,
+          :start_time => Time.parse("2011-09-10T12:00:00+00:00"),
+          :end_time => Time.parse("2011-09-20T16:00:00-04:00")
+        )
+
+        ad_group.identifier.should == 112233445566
+        ad_group.campaign_id.should == 66778899
+        ad_group.name.should == "Test Ad 1"
+        ad_group.bid_type.should == 1
+        ad_group.max_bid.should == 100
+        ad_group.start_time.should == Time.parse("2011-09-10T12:00:00+00:00")
+        ad_group.end_time.should == Time.parse("2011-09-20T16:00:00-04:00")
+      end
+    end
+  end
+end
+

data/spec/mock_json/ad_accounts/ad_groups/post_with_valid_access_token.json

@@ -0,0 +1 @@
+{"id":112233445566}

data/spec/mock_json/ad_campaigns/ad_groups/22334455_ad_groups.json

@@ -0,0 +1,23 @@
+{
+  "data":[
+    {
+      "id": 44556677,
+      "adgroup_id": 44556677,
+      "access_token": "access_token",
+      "ad_id": 44556677,
+      "campaign_id": 22334455,
+      "name": "Test Ad Group 1",
+      "adgroup_status": 1,
+      "bid_type": 1,
+      "max_bid": 150,
+      "adgroup_id": 44556677,
+      "end_time": "2011-09-01T00:00:00+0000",
+      "start_time": "2011-09-10T00:00:00+0000",
+      "updated_time": "2011-09-05T00:00:00+0000"
+    }
+  ],
+  "count": 1,
+  "limit": 500,
+  "offset": 0,
+  "include_deleted": null
+}

data/spec/mock_json/ad_groups/test_ad_group.json

@@ -0,0 +1,13 @@
+{
+  "id": "6003590469668",
+  "ad_id": 6003590469668,
+  "campaign_id":6003590468467,
+  "name": "Ad Group 1",
+  "adgroup_status": 1,
+  "bid_type": 1,
+  "max_bid": 1000,
+  "adgroup_id": 6003590469668,
+  "end_time": "2011-09-10T00:00:00+00:00",
+  "start_time": "2011-09-01T12:00:00-07:00",
+  "updated_time": "2011-09-04T16:00:00+00:00"
+}

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fb_graph
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 2.1.0.alpha
+  hash: 11
+  prerelease: 
+  segments: 
+  - 2
+  - 1
+  - 0
+  version: 2.1.0
 platform: ruby
 authors: 
 - nov matake
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-03 00:00:00 Z
+date: 2011-09-07 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
@@ -116,6 +153,7 @@ files:
 - lib/fb_graph/action.rb
 - lib/fb_graph/ad_account.rb
 - lib/fb_graph/ad_campaign.rb
+- lib/fb_graph/ad_group.rb
 - lib/fb_graph/album.rb
 - lib/fb_graph/app_request.rb
 - lib/fb_graph/application.rb
@@ -130,7 +168,8 @@ files:
 - lib/fb_graph/connections.rb
 - lib/fb_graph/connections/accounts.rb
 - lib/fb_graph/connections/activities.rb
-- lib/fb_graph/connections/ad_campaign.rb
+- lib/fb_graph/connections/ad_campaigns.rb
+- lib/fb_graph/connections/ad_groups.rb
 - lib/fb_graph/connections/albums.rb
 - lib/fb_graph/connections/app_requests.rb
 - lib/fb_graph/connections/attending.rb
@@ -225,6 +264,7 @@ files:
 - lib/patch/rack/oauth2/util.rb
 - spec/fb_graph/ad_account_spec.rb
 - spec/fb_graph/ad_campaign_spec.rb
+- spec/fb_graph/ad_group_spec.rb
 - spec/fb_graph/album_spec.rb
 - spec/fb_graph/app_request_spec.rb
 - spec/fb_graph/application_spec.rb
@@ -237,6 +277,7 @@ files:
 - spec/fb_graph/connection_spec.rb
 - spec/fb_graph/connections/accounts_spec.rb
 - spec/fb_graph/connections/activities_spec.rb
+- spec/fb_graph/connections/ad_groups_spec.rb
 - spec/fb_graph/connections/albums_spec.rb
 - spec/fb_graph/connections/app_requests_spec.rb
 - spec/fb_graph/connections/attending_spec.rb
@@ -329,8 +370,11 @@ files:
 - spec/fb_graph/work_spec.rb
 - spec/fb_graph_spec.rb
 - spec/helpers/webmock_helper.rb
+- spec/mock_json/ad_accounts/ad_groups/post_with_valid_access_token.json
 - spec/mock_json/ad_accounts/test_ad_account.json
+- spec/mock_json/ad_campaigns/ad_groups/22334455_ad_groups.json
 - spec/mock_json/ad_campaigns/test_ad_campaign.json
+- spec/mock_json/ad_groups/test_ad_group.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
@@ -485,23 +529,30 @@ 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 
-      version: 1.3.1
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: A full-stack Facebook Graph API wrapper in Ruby.
 test_files: 
 - spec/fb_graph/ad_account_spec.rb
 - spec/fb_graph/ad_campaign_spec.rb
+- spec/fb_graph/ad_group_spec.rb
 - spec/fb_graph/album_spec.rb
 - spec/fb_graph/app_request_spec.rb
 - spec/fb_graph/application_spec.rb
@@ -514,6 +565,7 @@ test_files:
 - spec/fb_graph/connection_spec.rb
 - spec/fb_graph/connections/accounts_spec.rb
 - spec/fb_graph/connections/activities_spec.rb
+- spec/fb_graph/connections/ad_groups_spec.rb
 - spec/fb_graph/connections/albums_spec.rb
 - spec/fb_graph/connections/app_requests_spec.rb
 - spec/fb_graph/connections/attending_spec.rb
@@ -606,8 +658,11 @@ test_files:
 - spec/fb_graph/work_spec.rb
 - spec/fb_graph_spec.rb
 - spec/helpers/webmock_helper.rb
+- spec/mock_json/ad_accounts/ad_groups/post_with_valid_access_token.json
 - spec/mock_json/ad_accounts/test_ad_account.json
+- spec/mock_json/ad_campaigns/ad_groups/22334455_ad_groups.json
 - spec/mock_json/ad_campaigns/test_ad_campaign.json
+- spec/mock_json/ad_groups/test_ad_group.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