fb_graph 1.7.5 → 1.8.0.alpha

data/spec/helpers/webmock_helper.rb

@@ -21,17 +21,20 @@ module WebMockHelper
     }
   end
 
-  def mock_fql(query, file_path, options = {})
-    params = {
+  def mock_fql(query, response_file, options = {})
+    options.merge!(:params => {
       :query => query,
       :format => :json
-    }
-    params[:access_token] = options[:access_token] if options[:access_token]
-    stub_request(:get, FbGraph::Query::ENDPOINT).with(:query => params).to_return(
-      :body => File.read(File.join(File.dirname(__FILE__), '../mock_json', "#{file_path}.json"))
+    })
+    stub_request(:get, FbGraph::Query::ENDPOINT).with(
+      request_for(:get, options)
+    ).to_return(
+      response_for(response_file)
     )
     res = yield
-    a_request(:get, FbGraph::Query::ENDPOINT).with(:query => params).should have_been_made.once
+    a_request(:get, FbGraph::Query::ENDPOINT).with(
+      request_for(:get, options)
+    ).should have_been_made.once
     res
   end
 
@@ -43,6 +46,10 @@ module WebMockHelper
 
   def request_for(method, options = {})
     request = {}
+    if options[:access_token]
+      options[:params] ||= {}
+      options[:params][:oauth_token] = options[:access_token].to_s
+    end
     if options[:params]
       case method
       when :post, :put
@@ -51,9 +58,6 @@ module WebMockHelper
         request[:query] = options[:params]
       end
     end
-    if options[:headers]
-      request[:headers] = options[:headers]
-    end
     request
   end
 

data/spec/mock_json/users/home/me_private.json

@@ -454,7 +454,7 @@
       }
    ],
    "paging": {
-      "previous": "https://graph.facebook.com/579612276/home?access_token=2227470867%7C2.WUnvvW0Q_ksjjVOCIEkEiQ__.3600.1272380400-579612276%7CSkfo-M8-vpId32OYv6xLZFlsToY.&limit=25&since=2010-04-27T13%3A06%3A14%2B0000",
-      "next": "https://graph.facebook.com/579612276/home?access_token=2227470867%7C2.WUnvvW0Q_ksjjVOCIEkEiQ__.3600.1272380400-579612276%7CSkfo-M8-vpId32OYv6xLZFlsToY.&limit=25&until=2010-04-27T11%3A07%3A48%2B0000"
+      "previous": "https://graph.facebook.com/579612276/home?access_token=2227470867%7C2.WUnvvW0Q_ksjjVOCIEkEiQ__.3600.1272380400-579612276%7CSkfo-M8-vpId32OYv6xLZFlsToY.&limit=25&since=123456789",
+      "next": "https://graph.facebook.com/579612276/home?access_token=2227470867%7C2.WUnvvW0Q_ksjjVOCIEkEiQ__.3600.1272380400-579612276%7CSkfo-M8-vpId32OYv6xLZFlsToY.&limit=25&until=123456789"
    }
 }

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: fb_graph
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.7.5
+  prerelease: 6
+  version: 1.8.0.alpha
 platform: ruby
 authors: 
 - nov matake
@@ -10,63 +10,74 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 Z
+date: 2011-05-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rack-oauth2
+  name: httpclient
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.5
+        version: 2.2.0.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: rack-oauth2
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.6.9
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0.8"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0.9"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "2"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 1.6.2
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 description: A full-stack Facebook Graph API wrapper in Ruby.
 email: nov@matake.jp
 executables: []
@@ -404,9 +415,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: