fb_graph 2.5.6 → 2.5.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fb_graph (2.5.6)
+    fb_graph (2.5.7)
       httpclient (>= 2.2.0.2)
       json
       rack-oauth2 (>= 0.14.4)

data/VERSION

@@ -1 +1 @@
-2.5.6
+2.5.7

data/lib/fb_graph/ad_account.rb

@@ -9,12 +9,37 @@ module FbGraph
     include Connections::AdConnectionObjects
     include Connections::AdPreviews
 
-    attr_accessor :account_id, :name, :account_status, :daily_spend_limit, :users, :currency, :timezone_id, :timezone_name, :capabilities, :account_groups
+    ATTRS = [
+      :account_id,
+      :name,
+      :account_status,
+      :daily_spend_limit,
+      :users,
+      :currency,
+      :timezone_id,
+      :timezone_name,
+      :capabilities,
+      :account_groups,
+      :is_personal,
+      :business_name,
+      :business_street,
+      :business_street2,
+      :business_city,
+      :business_state,
+      :business_zip,
+      :business_country_code,
+      :vat_status,
+      :agency_client_declaration,
+      :spend_cap,
+      :amount_spent
+    ]
+
+    attr_accessor *ATTRS
 
     def initialize(identifier, attributes = {})
       super
 
-      %w(account_id name account_status daily_spend_limit users currency timezone_id timezone_name).each do |field|
+      ATTRS.each do |field|
         send("#{field}=", attributes[field.to_sym])
       end
 

data/lib/fb_graph/connections/feed.rb

@@ -5,7 +5,6 @@ module FbGraph
         posts = self.connection :feed, options
         posts.map! do |post|
           Post.new post[:id], post.merge(
-            :context => self.class,
             :access_token => options[:access_token] || self.access_token
           )
         end

data/lib/fb_graph/node.rb

@@ -135,16 +135,11 @@ module FbGraph
       when 'null'
         nil
       else
-        if response.body.gsub('"', '').to_i.to_s == response.body.gsub('"', '')
-          # NOTE: User#app_request! returns ID as a JSON string not as a JSON object..
-          response.body.gsub('"', '')
+        _response_ = JSON.parse(response.body).with_indifferent_access
+        if (200...300).include?(response.status)
+          _response_
         else
-          _response_ = JSON.parse(response.body).with_indifferent_access
-          if (200...300).include?(response.status)
-            _response_
-          else
-            Exception.handle_httpclient_error(_response_, response.headers)
-          end
+          Exception.handle_httpclient_error(_response_, response.headers)
         end
       end
     rescue JSON::ParserError

data/lib/fb_graph/picture.rb

@@ -2,11 +2,13 @@ module FbGraph
   class Picture
     include Comparison
 
-    attr_accessor :is_silhouette, :url
+    @@attributes = [:is_silhouette, :url, :height, :width]
+    attr_accessor *@@attributes
 
     def initialize(attributes = {})
-      @is_silhouette = attributes[:is_silhouette]
-      @url = attributes[:url]
+      @@attributes.each do |key|
+        self.send :"#{key}=", attributes[key]
+      end
     end
   end
 end

data/lib/fb_graph/post.rb

@@ -27,11 +27,7 @@ module FbGraph
           elsif to[:version]
             Group.new(to[:id], to)
           else
-            if attributes[:context] == Application
-              Application.new(to[:id], to)
-            else
-              User.new(to[:id], to)
-            end
+            User.new(to[:id], to)
           end
         end
       end

data/spec/fb_graph/ad_account_spec.rb

@@ -10,7 +10,34 @@ describe FbGraph::AdAccount, '.new' do
       :daily_spend_limit => 20000,
       :currency => "USD",
       :timezone_id => 1,
-      :timezone_name => "America/Los_Angeles"
+      :timezone_name => "America/Los_Angeles",
+      :capabilities => [1,2,3],
+      :account_groups =>[{"account_group_id"=>12344321, "name"=>"Account Group", "status"=>1}],
+      :is_personal => 1,
+      :business_name => "Business Inc.",
+      :business_street => "123 Fake St.",
+      :business_street2 => "Apt. 2B",
+      :business_city => "New York",
+      :business_state => "Alabama",
+      :business_zip => "33333",
+      :business_country_code => "US",
+      :vat_status => 1,
+      :agency_client_declaration => {
+        "agency_representing_client"=>1,
+        "client_based_in_france"=>0,
+        "has_written_mandate_from_advertiser"=>1,
+        "is_client_paying_invoices"=>1,
+        "client_name"=>"Client Smith",
+        "client_email_address"=>"fake@example.com",
+        "client_street" => "321 Real St.",
+        "client_street2" => "Suite 123",
+        "client_city" => "Los Angeles",
+        "client_province" => "AB",
+        "client_postal_code" => "33433",
+        "client_country_code" => "CA"
+      },
+      :spend_cap => 1500,
+      :amount_spent => 1499
     }
     ad_account = FbGraph::AdAccount.new(attributes.delete(:id), attributes)
     ad_account.identifier.should == "act_12345566"
@@ -21,6 +48,33 @@ describe FbGraph::AdAccount, '.new' do
     ad_account.currency.should == "USD"
     ad_account.timezone_id.should == 1
     ad_account.timezone_name.should == "America/Los_Angeles"
+    ad_account.capabilities.should == [1,2,3]
+    ad_account.account_groups.should == [{"account_group_id"=>12344321, "name"=>"Account Group", "status"=>1}]
+    ad_account.is_personal.should == 1
+    ad_account.business_name.should == "Business Inc."
+    ad_account.business_street.should == "123 Fake St."
+    ad_account.business_street2.should == "Apt. 2B"
+    ad_account.business_city.should == "New York"
+    ad_account.business_state.should == "Alabama"
+    ad_account.business_zip.should == "33333"
+    ad_account.business_country_code.should == "US"
+    ad_account.vat_status.should == 1
+    ad_account.agency_client_declaration.should == {
+        "agency_representing_client"=>1,
+        "client_based_in_france"=>0,
+        "has_written_mandate_from_advertiser"=>1,
+        "is_client_paying_invoices"=>1,
+        "client_name"=>"Client Smith",
+        "client_email_address"=>"fake@example.com",
+        "client_street" => "321 Real St.",
+        "client_street2" => "Suite 123",
+        "client_city" => "Los Angeles",
+        "client_province" => "AB",
+        "client_postal_code" => "33433",
+        "client_country_code" => "CA"
+      }
+    ad_account.spend_cap.should == 1500
+    ad_account.amount_spent.should == 1499
   end
 end
 
@@ -38,6 +92,33 @@ describe FbGraph::AdAccount, '.fetch' do
       ad_account.currency.should == "USD"
       ad_account.timezone_id.should == 1
       ad_account.timezone_name.should == "America/Los_Angeles"
+      ad_account.capabilities.should == [1,2,3]
+      ad_account.account_groups.should == [{"account_group_id"=>12344321, "name"=>"Account Group", "status"=>1}]
+      ad_account.is_personal.should == 1
+      ad_account.business_name.should == "Business Inc."
+      ad_account.business_street.should == "123 Fake St."
+      ad_account.business_street2.should == "Apt. 2B"
+      ad_account.business_city.should == "New York"
+      ad_account.business_state.should == "Alabama"
+      ad_account.business_zip.should == "33333"
+      ad_account.business_country_code.should == "US"
+      ad_account.vat_status.should == 1
+      ad_account.agency_client_declaration.should == {
+        "agency_representing_client"=>1,
+        "client_based_in_france"=>0,
+        "has_written_mandate_from_advertiser"=>1,
+        "is_client_paying_invoices"=>1,
+        "client_name"=>"Client Smith",
+        "client_email_address"=>"fake@example.com",
+        "client_street" => "321 Real St.",
+        "client_street2" => "Suite 123",
+        "client_city" => "Los Angeles",
+        "client_province" => "AB",
+        "client_postal_code" => "33433",
+        "client_country_code" => "CA"
+      }
+      ad_account.spend_cap.should == 1500
+      ad_account.amount_spent.should == 1499
     end
   end
 end

data/spec/mock_json/ad_accounts/test_ad_account.json

@@ -6,5 +6,32 @@
    "daily_spend_limit": 20000,
    "currency": "USD",
    "timezone_id": 1,
-   "timezone_name": "America/Los_Angeles"
+   "timezone_name": "America/Los_Angeles",
+   "capabilities": [1,2,3],
+   "account_groups": [{"account_group_id":12344321, "name":"Account Group", "status":1}],
+   "is_personal": 1,
+   "business_name": "Business Inc.",
+   "business_street": "123 Fake St.",
+   "business_street2": "Apt. 2B",
+   "business_city": "New York",
+   "business_state": "Alabama",
+   "business_zip": "33333",
+   "business_country_code": "US",
+   "vat_status": 1,
+   "agency_client_declaration": {
+     "agency_representing_client":1,
+     "client_based_in_france":0,
+     "has_written_mandate_from_advertiser":1,
+     "is_client_paying_invoices":1,
+     "client_name":"Client Smith",
+     "client_email_address":"fake@example.com",
+     "client_street": "321 Real St.",
+     "client_street2": "Suite 123",
+     "client_city": "Los Angeles",
+     "client_province": "AB",
+     "client_postal_code": "33433",
+     "client_country_code": "CA"
+   },
+   "spend_cap": 1500,
+   "amount_spent": 1499
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fb_graph
 version: !ruby/object:Gem::Version
-  version: 2.5.6
+  version: 2.5.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -725,7 +725,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 77075375696592851
+      hash: 3936393471201572148
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -734,7 +734,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 77075375696592851
+      hash: 3936393471201572148
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24