fb_graph 2.7.15 → 2.7.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 368ca9c527e97ab552c51958ff0614ea86dd0d8b
-  data.tar.gz: 5ff8b37a4ea646ccb4a912848ba0cf7e782fee28
+  metadata.gz: bda72efaff0004ee7daccc5a29e6ad397bacd0d3
+  data.tar.gz: 5b6f5ff706c85f843f3eeb0cc5d0149426e5fac2
 SHA512:
-  metadata.gz: 6ad52e162c283b9e57293a7d351fcd6e5ff8af8896cae381bc3e55674221fda4607d5c7a349b53f61765c2284647e7a8cba091c64c37aea5b72cf0ef7be560e0
-  data.tar.gz: eda16eacf3f3aeac3dc05e038a45e26e6517c6eb5c31bf1fa19f7d313a9f978b641f4eeb391a75fe2f1bcbda56fe672e48de83f1f37c8c1d4795db688ca837bc
+  metadata.gz: 7a9fef74257e349ba146189cff5f28ce97f5c5f3f60bde65da2401e5fbdb264b3d2b1dcb23b913c263c84f50597dacaa5d764d387907896ec4d12d6f8eebec26
+  data.tar.gz: ae68d9b9e64f5b6e08d31b94d30d9f553aaf632bfc74970527f332cf4849236cfb9efaacd3d846d85a2ab58d5d87cd42c61b64eb7bd12bd6ee9f483bedbc63be

data/VERSION

@@ -1 +1 @@
-2.7.15
+2.7.16

data/lib/fb_graph.rb

@@ -106,6 +106,7 @@ require 'fb_graph/node'
 require 'fb_graph/open_graph'
 require 'fb_graph/achievement'
 require 'fb_graph/ad_account'
+require 'fb_graph/ad_campaign_group'
 require 'fb_graph/ad_campaign'
 require 'fb_graph/ad_campaign_stat'
 require 'fb_graph/ad_connection_object'
@@ -113,6 +114,7 @@ require 'fb_graph/ad_creative'
 require 'fb_graph/ad_group'
 require 'fb_graph/ad_group_stat'
 require 'fb_graph/ad_keyword'
+require 'fb_graph/ad_image'
 require 'fb_graph/ad_keyword_suggestion'
 require 'fb_graph/ad_keyword_valid'
 require 'fb_graph/broad_targeting_category'

data/lib/fb_graph/ad_account.rb

@@ -1,5 +1,6 @@
 module FbGraph
   class AdAccount < Node
+    include Connections::AdCampaignGroups
     include Connections::AdCampaigns
     include Connections::AdGroups
     include Connections::AdCampaignStats
@@ -8,6 +9,8 @@ module FbGraph
     include Connections::ReachEstimates
     include Connections::AdConnectionObjects
     include Connections::AdPreviews
+    include Connections::AdImages
+    include Connections::AdCreditLine
 
     ATTRS = [
       :account_id,

data/lib/fb_graph/ad_campaign.rb

@@ -2,7 +2,7 @@ module FbGraph
   class AdCampaign < Node
     include Connections::AdGroups
 
-    attr_accessor :campaign_id, :account_id, :name, :start_time, :end_time, :updated_time, :daily_budget, :daily_imps, :campaign_status, :lifetime_budget, :lifetime_imps
+    attr_accessor :campaign_group_id, :account_id, :name, :start_time, :end_time, :updated_time, :daily_budget, :daily_imps, :campaign_status, :lifetime_budget, :lifetime_imps
 
     def initialize(identifier, attributes = {})
       super
@@ -23,7 +23,7 @@ module FbGraph
     protected
 
     def set_attrs(attributes)
-      %w(campaign_id account_id name daily_budget daily_imps campaign_status lifetime_budget lifetime_imps).each do |field|
+      %w(campaign_group_id account_id name daily_budget daily_imps campaign_status lifetime_budget lifetime_imps).each do |field|
         send("#{field}=", attributes[field.to_sym])
       end
 

data/lib/fb_graph/ad_campaign_group.rb

@@ -0,0 +1,23 @@
+module FbGraph
+  class AdCampaignGroup < Node
+    include Connections::AdCampaigns
+    include Connections::AdGroups
+
+    ATTRS = [
+      :account_id,
+      :name,
+      :objective,
+      :campaign_group_status,
+      :buying_type
+    ]
+
+    attr_accessor *ATTRS
+    def initialize(identifier, attributes = {})
+      super
+
+      ATTRS.each do |field|
+        send("#{field}=", attributes[field.to_sym])
+      end
+    end
+  end
+end

data/lib/fb_graph/ad_image.rb

@@ -0,0 +1,23 @@
+module FbGraph
+  class AdImage < Node
+    
+    ATTRS = [
+      :hash,
+      :url
+    ]
+
+    attr_accessor *ATTRS
+    def initialize(identifier, attributes = {})
+      super
+      set_attrs(attributes)
+    end
+
+    protected
+
+    def set_attrs(attributes)
+      ATTRS.each do |field|
+        send("#{field}=", attributes[field.to_sym])
+      end
+    end
+  end
+end

data/lib/fb_graph/collection.rb

@@ -8,6 +8,11 @@ module FbGraph
         {:data => collection, :count => collection.size}
       when Hash
         collection[:data] ||= []
+
+        # Fix for AdImage response data: field not being an array
+        if collection[:data].is_a? Hash
+          collection[:data] = collection[:data].values
+        end
         collection
       when nil
         collection = {:data => [], :count => 0}

data/lib/fb_graph/connections/ad_accounts.rb

@@ -9,6 +9,22 @@ module FbGraph
           )
         end
       end
+      
+      def ad_account!(options = {})
+        ad_account = post options.merge(:connection => :adaccounts)
+
+        ad_account_id = ad_account[:id]
+
+        merged_attrs = options.merge(
+          :access_token => options[:access_token] || self.access_token
+        )
+
+        if options[:redownload]
+          merged_attrs = merged_attrs.merge(ad_account[:data][:adaccounts][ad_account_id]).with_indifferent_access
+        end
+
+        AdAccount.new ad_account_id, merged_attrs
+      end
     end
   end
 end

data/lib/fb_graph/connections/ad_campaign_groups.rb

@@ -0,0 +1,26 @@
+module FbGraph
+  module Connections
+    module AdCampaignGroups
+      def ad_campaign_groups(options = {})
+        ad_campaign_groups = self.connection :adcampaign_groups, options
+        ad_campaign_groups.map! do |ad_campaign_group|
+          AdCampaignGroup.new ad_campaign_group[:id], ad_campaign_group.merge(
+            :access_token => options[:access_token] || self.access_token
+          )
+        end
+      end
+
+      def ad_campaign_group!(options = {})
+        ad_campaign_group = post options.merge(:connection => :adcampaign_groups)
+
+        ad_campaign_group_id = ad_campaign_group[:id]
+
+        merged_attrs = options.merge(
+          :access_token => options[:access_token] || self.access_token
+        )
+
+        AdCampaignGroup.new ad_campaign_group_id, merged_attrs
+      end
+    end
+  end
+end

data/lib/fb_graph/connections/ad_credit_line.rb

@@ -0,0 +1,10 @@
+module FbGraph
+  module Connections
+    module AdCreditLine
+      def ad_credit_line!(options={})
+        response = post options.merge(:connection => :adcreditline)
+        response && response[:success]
+      end
+    end
+  end
+end

data/lib/fb_graph/connections/ad_images.rb

@@ -0,0 +1,36 @@
+module FbGraph
+  module Connections
+    module AdImages
+      def ad_images(options = {})
+        ad_images = self.connection :adimages, options
+        ad_images.map! do |ad_image|
+          AdImage.new ad_image[:id], ad_image.merge(
+            :access_token => options[:access_token] || self.access_token
+          )
+        end
+      end
+
+      def ad_image!(options = {})
+        ad_image = post options.merge(:connection => :adimages)
+
+       # No ID is contained in the response.
+        adimage_id = ad_image[:images].keys.first
+        hash = ad_image[:images].values.first[:hash]
+        url = ad_image[:images].values.first[:url]
+
+        merged_attrs = options.merge(
+          :access_token => options[:access_token] || self.access_token,
+          :hash => hash,
+          :url => url
+        )
+
+        if options[:redownload]
+          merged_attrs = merged_attrs.merge(ad_image[:data][:adimages][adimage_id]).with_indifferent_access
+        end
+	
+	# The first argument is the identifier, which is appended to the endpoint
+        AdImage.new adimage_id, merged_attrs
+      end
+    end
+  end
+end

data/lib/fb_graph/connections/members.rb

@@ -11,11 +11,11 @@ module FbGraph
       end
 
       def member!(user, options = {})
-        post options.merge(:connection => :members, :connection_scope => user.identifier)
+        post options.merge(:connection => :members, :member => user.identifier)
       end
 
       def unmember!(user, options = {})
-        delete options.merge(:connection => :members, :connection_scope => user.identifier)
+        delete options.merge(:connection => :members, :member => user.identifier)
       end
     end
   end

data/spec/fb_graph/connections/members_spec.rb

@@ -40,7 +40,9 @@ describe FbGraph::Connections::Members do
 
     describe '#member!' do
       it 'should return true' do
-        mock_graph :post, 'list_id/members/member_id', 'true', :access_token => 'access_token' do
+        mock_graph :post, 'list_id/members', 'true', :access_token => 'access_token', :params => {
+          :member => 'member_id'
+        } do
           FbGraph::FriendList.new('list_id', :access_token => 'access_token').member!(member).should be_true
         end
       end
@@ -48,7 +50,9 @@ describe FbGraph::Connections::Members do
 
     describe '#unmember!' do
       it 'should return true' do
-        mock_graph :delete, 'list_id/members/member_id', 'true', :access_token => 'access_token' do
+        mock_graph :delete, 'list_id/members', 'true', :access_token => 'access_token', :params => {
+          :member => 'member_id'
+        } do
           FbGraph::FriendList.new('list_id', :access_token => 'access_token').unmember!(member).should be_true
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fb_graph
 version: !ruby/object:Gem::Version
-  version: 2.7.15
+  version: 2.7.16
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -161,11 +161,13 @@ files:
 - lib/fb_graph/action.rb
 - lib/fb_graph/ad_account.rb
 - lib/fb_graph/ad_campaign.rb
+- lib/fb_graph/ad_campaign_group.rb
 - lib/fb_graph/ad_campaign_stat.rb
 - lib/fb_graph/ad_connection_object.rb
 - lib/fb_graph/ad_creative.rb
 - lib/fb_graph/ad_group.rb
 - lib/fb_graph/ad_group_stat.rb
+- lib/fb_graph/ad_image.rb
 - lib/fb_graph/ad_keyword.rb
 - lib/fb_graph/ad_keyword_suggestion.rb
 - lib/fb_graph/ad_keyword_valid.rb
@@ -189,12 +191,15 @@ files:
 - lib/fb_graph/connections/achievements.rb
 - lib/fb_graph/connections/activities.rb
 - lib/fb_graph/connections/ad_accounts.rb
+- lib/fb_graph/connections/ad_campaign_groups.rb
 - lib/fb_graph/connections/ad_campaign_stats.rb
 - lib/fb_graph/connections/ad_campaigns.rb
 - lib/fb_graph/connections/ad_connection_objects.rb
 - lib/fb_graph/connections/ad_creatives.rb
+- lib/fb_graph/connections/ad_credit_line.rb
 - lib/fb_graph/connections/ad_group_stats.rb
 - lib/fb_graph/connections/ad_groups.rb
+- lib/fb_graph/connections/ad_images.rb
 - lib/fb_graph/connections/ad_previews.rb
 - lib/fb_graph/connections/admins.rb
 - lib/fb_graph/connections/albums.rb