fb_graph 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bb0cff0747ba82525632c181554093904607ba0
-  data.tar.gz: c9edf38574b3bb297f2fa4c3e4f23c8a306f0af6
+  metadata.gz: 7655ead97fca704002f5dac9ef943dbd61e8dde6
+  data.tar.gz: 3166cea76ebd6bc8f439f0ecfe1080f294aa8f14
 SHA512:
-  metadata.gz: e112a82bc1b7dfb771be8b3b1df73d33a69832e54dd5511ae9b0ed21493cca937b75018b01847c25945629d73c03f9055e2837af6c7ecded01fce56618706764
-  data.tar.gz: 846321308f913f609d4a6702d9f56e01610e771f5858033639580fba99b89c1cca2d5b7d87338cead6949f1a1b4423ab2f217adf8a4b49c17b28b7f271187a00
+  metadata.gz: e42d8137dd19236c601b4a6cd1c85d185228b5c6cb90712c8dce246da36968410359e357f752aa8702de546197a65f0636e10b6bf059ba730a9834abf5fed926
+  data.tar.gz: 600d5eab48fae82d012047d911374ac8928a343b65777b8f22cabcd09d6749e1131672b6be4c59f9d4e632b39c92151f1af68d38781c08a1da5109ca39f54497

data/.travis.yml

@@ -1,3 +1,4 @@
 rvm:
   - 1.9.2
   - 1.9.3
+  - 2.0.0

data/VERSION

@@ -1 +1 @@
-2.7.0
+2.7.1

data/lib/fb_graph/collection.rb

@@ -1,6 +1,6 @@
 module FbGraph
   class Collection < Array
-    attr_reader :previous, :next, :total_count, :unread_count, :updated_time
+    attr_reader :previous, :next, :total_count, :unread_count, :updated_time, :cursors
 
     def initialize(collection = nil)
       collection = case collection
@@ -27,7 +27,7 @@ module FbGraph
       else
         @total_count = collection[:count]
       end
-      @previous, @next = {}, {}
+      @previous, @next, @cursors = {}, {}, {}
       if (paging = collection[:paging])
         if paging[:previous]
           @previous = fetch_params(paging[:previous])
@@ -35,21 +35,24 @@ module FbGraph
         if paging[:next]
           @next = fetch_params(paging[:next])
         end
+        if paging[:cursors]
+          @cursors[:after] = paging[:cursors].try(:[], :after)
+          @cursors[:before] = paging[:cursors].try(:[], :before)
+        end
       end
     end
 
     private
 
     def fetch_params(url)
-      query = URI.parse(URI.encode(url)).query
+      query = Rack::Utils.parse_nested_query(
+        URI.unescape(URI.parse(URI.encode(url)).query)
+      )
       params = {}
-      query.split('&').each do |q|
-        key, value = q.split('=')
-        if ['limit', 'offset', 'until', 'since', '__after_id', '__before_id'].include?(key)
-          params[key.to_sym] = URI.unescape(value)
-        end
+      query.each do |key, value|
+        params[key.to_sym] = value
       end
       params
     end
   end
-end
+end

data/lib/fb_graph/connection.rb

@@ -20,7 +20,14 @@ module FbGraph
             method.to_s.gsub('_', '') == self.connection.to_s
           end
         end
-        self.owner.send(connection_method, self.options.merge(_options_).merge(self.collection.next))
+        self.owner.send(
+          connection_method,
+          self.options.merge(
+            self.collection.next.merge(
+              _options_
+            )
+          )
+        )
       else
         self.class.new(self.owner, self.connection)
       end

data/lib/fb_graph/exception.rb

@@ -3,6 +3,7 @@ module FbGraph
     attr_accessor :code, :type
 
     ERROR_HEADER_MATCHERS = {
+      /not_found/ => "NotFound",
       /invalid_token/ => "InvalidToken",
       /invalid_request/ => "InvalidRequest"
     }

data/spec/fb_graph/collection_spec.rb

@@ -54,7 +54,35 @@ describe FbGraph::Collection, '.new' do
       comments.should be_a FbGraph::Collection
       comments.collection.next.should include :limit, :offset, :__after_id
       comments.collection.previous.should include :limit, :offset, :__before_id
+      comments.collection.cursors.should be_empty
     end
   end
 
-end
+  it 'should handle paging params when array of ids is passed' do
+    params = {:campaign_ids => "[6001111111467]", :include_deleted => "true"}
+    mock_graph :get, '100111111111121/adgroups', 'ad_groups/test_ad_group_with_paging', :params => params do
+      ad_groups = FbGraph::AdAccount.new(100111111111121).ad_groups(params)
+      ad_groups.should be_instance_of FbGraph::Connection
+      ad_groups.should be_a FbGraph::Collection
+
+      ad_groups.collection.next.should include :offset, :campaign_ids
+      ad_groups.collection.next[:offset].should == "100"
+      ad_groups.collection.next[:campaign_ids].should == '["6001111111467"]'
+
+      ad_groups.collection.previous.should include :offset, :campaign_ids
+      ad_groups.collection.previous[:offset].should == "0"
+      ad_groups.collection.previous[:campaign_ids].should == '["6001111111467"]'
+    end
+  end
+
+  it 'should handle cursor paging params' do
+    mock_graph :get, 'post_id/comments', 'posts/comments/with_cursor_paging_params' do
+      comments = FbGraph::Post.new('post_id').comments
+      comments.should be_instance_of FbGraph::Connection
+      comments.should be_a FbGraph::Collection
+      comments.collection.next.should include :limit, :after
+      comments.collection.previous.should include :limit, :before
+      comments.collection.cursors.should include :before, :after
+    end
+  end
+end

data/spec/fb_graph/connection_spec.rb

@@ -22,7 +22,7 @@ describe FbGraph::Connection do
       posts.first.created_time.should == Time.parse('2010-04-27T13:06:14+0000')
       posts.last.created_time.should  == Time.parse('2010-04-27T11:07:48+0000')
     end
-    mock_graph :get, 'me/home', 'users/home/me_private_previous', :access_token => 'access_token', :params => {
+    mock_graph :get, 'me/home', 'users/home/me_private_previous', :access_token => '2227470867|2.WUnvvW0Q_ksjjVOCIEkEiQ__.3600.1272380400-579612276|Skfo-M8-vpId32OYv6xLZFlsToY.', :params => {
       :limit => '25',
       :since => '123456789'
     } do
@@ -30,7 +30,7 @@ describe FbGraph::Connection do
       previous_posts.first.created_time.should == Time.parse('2010-04-27T13:23:08+0000')
       previous_posts.last.created_time.should  == Time.parse('2010-04-27T13:10:56+0000')
     end
-    mock_graph :get, 'me/home', 'users/home/me_private_next', :access_token => 'access_token', :params => {
+    mock_graph :get, 'me/home', 'users/home/me_private_next', :access_token => '2227470867|2.WUnvvW0Q_ksjjVOCIEkEiQ__.3600.1272380400-579612276|Skfo-M8-vpId32OYv6xLZFlsToY.', :params => {
       :limit => '25',
       :until => '123456789'
     } do
@@ -38,5 +38,13 @@ describe FbGraph::Connection do
       next_posts.first.created_time.should == Time.parse('2010-04-27T11:06:29+0000')
       next_posts.last.created_time.should  == Time.parse('2010-04-27T09:44:28+0000')
     end
+    mock_graph :get, 'me/home', 'users/home/me_private_next', :access_token => 'access_token', :params => {
+      :limit => '25',
+      :until => '123456789'
+    } do
+      next_posts = posts.next(:access_token => 'access_token')
+      next_posts.first.created_time.should == Time.parse('2010-04-27T11:06:29+0000')
+      next_posts.last.created_time.should  == Time.parse('2010-04-27T09:44:28+0000')
+    end
   end
 end

data/spec/fb_graph/connections/insights_spec.rb

@@ -94,8 +94,8 @@ describe FbGraph::Connections::Insights do
         it 'should used for pagination' do
           mock_graph :get, 'FbGraph/insights/page_like_adds/day', 'pages/insights/page_like_adds/day/FbGraph_private', :access_token => 'access_token' do
             insights = FbGraph::Page.new('FbGraph').insights(:access_token => 'access_token', :metrics => :page_like_adds, :period => :day)
-            expect { insights.next }.to request_to 'FbGraph/insights/page_like_adds/day?access_token=access_token&since=1292065709&until=1292324909'
-            expect { insights.previous }.to request_to 'FbGraph/insights/page_like_adds/day?access_token=access_token&since=1291547309&until=1291806509'
+            expect { insights.next }.to request_to 'FbGraph/insights/page_like_adds/day?access_token=134145643294322%7C9b95ab3141be69aff9766c90-579612276%7C9UA_-V98QdZDfoX4MSS-DdwTFFk&since=1292065709&until=1292324909'
+            expect { insights.previous }.to request_to 'FbGraph/insights/page_like_adds/day?access_token=134145643294322%7C9b95ab3141be69aff9766c90-579612276%7C9UA_-V98QdZDfoX4MSS-DdwTFFk&since=1291547309&until=1291806509'
           end
         end
       end

data/spec/fb_graph/exception_spec.rb

@@ -124,6 +124,26 @@ describe FbGraph::Exception, ".handle_httpclient_error" do
         lambda {FbGraph::Exception.handle_httpclient_error(parsed_response, headers)}.should raise_exception(FbGraph::InvalidRequest)
       end
     end
+
+    context "to an an alias that does not exist" do
+      let(:parsed_response) do
+        {
+          :error => {
+            :message => '(#803) Some of the aliases you requested do not exist: test',
+            :type => "OAuthException"
+          }
+        }
+      end
+      let(:headers) do
+        {
+          "WWW-Authenticate" =>'OAuth "Facebook Platform" "not_found" "(#803) Some of the aliases you requested do not exist: test"'
+        }
+      end
+
+      it "should raise a NotFound exception" do
+        lambda {FbGraph::Exception.handle_httpclient_error(parsed_response, headers)}.should raise_exception(FbGraph::NotFound)
+      end
+    end
   end
 
   context "without the WWW-Authenticate header" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fb_graph
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient