fb_graph 2.6.7 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d66e94bc49609d2e10e39465a627ea9fa9a61f6
-  data.tar.gz: 60cdc06d8082429e3bbaa3496eeee43c3878fe8f
+  metadata.gz: 6bb0cff0747ba82525632c181554093904607ba0
+  data.tar.gz: c9edf38574b3bb297f2fa4c3e4f23c8a306f0af6
 SHA512:
-  metadata.gz: 11166460e8328cb51da1f8dfdf4b8c66390bde7e92272924d4567e7eebbfb5cd8ed3a9a124004ab13f9cda99f4dc3790416dfa6a2bc820760d279d539273ff08
-  data.tar.gz: 51628c26304a0132d387f6692ee570ecc88f6a14c3647ce493bc3bfe5211757ae58b77dac2f195cc56bd15354c36f890a61c70d1cf847c541146a2ff86f42a59
+  metadata.gz: e112a82bc1b7dfb771be8b3b1df73d33a69832e54dd5511ae9b0ed21493cca937b75018b01847c25945629d73c03f9055e2837af6c7ecded01fce56618706764
+  data.tar.gz: 846321308f913f609d4a6702d9f56e01610e771f5858033639580fba99b89c1cca2d5b7d87338cead6949f1a1b4423ab2f217adf8a4b49c17b28b7f271187a00

data/README.rdoc

@@ -288,4 +288,4 @@ https://github.com/nov/fb_graph/wiki
 
 == Copyright
 
-Copyright (c) 2010 nov matake. See LICENSE for details.
+Copyright (c) 2010 nov matake. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-2.6.7
+2.7.0

data/fb_graph.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
     s.add_development_dependency "rcov", ">= 0.9"
   end
   s.add_development_dependency "rspec", ">= 2"
-  s.add_development_dependency "fb_graph-mock", ">= 0.1.3"
+  s.add_development_dependency "fb_graph-mock", ">= 0.1.4"
   s.add_development_dependency "actionpack", ">= 3.0.6"
 end

data/lib/fb_graph/query.rb

@@ -7,24 +7,22 @@ module FbGraph
       @query = query
     end
 
-    def fetch(access_token = nil)
+    def fetch(params = {})
       handle_response do
-        http_client.get endpoint, :query => build_params(access_token)
+        http_client.get endpoint, build_params(params)
       end
     end
 
     private
 
-    def build_params(access_token)
+    def build_params(params)
       _query_ = if query.is_a?(Hash)
         query.to_json
       else
         query
       end
-      super(
-        :q => _query_,
-        :access_token => access_token || self.access_token
-      )
+      params[:access_token] ||= self.access_token
+      super params.merge(:q => _query_)
     end
 
     def handle_response

data/spec/fb_graph/query_spec.rb

@@ -28,7 +28,7 @@ describe FbGraph::Query do
       it 'should raise exception' do
         mock_fql raw_query, 'query/user/with_invalid_token', :access_token => 'invalid', :status => [400, 'Bad Request'] do
           lambda do
-            query.fetch('invalid')
+            query.fetch(:access_token => 'invalid')
           end.should raise_error FbGraph::Exception
         end
       end
@@ -37,13 +37,23 @@ describe FbGraph::Query do
     context 'when valid access token given' do
       it 'should return an Collection of Hash' do
         mock_fql raw_query, 'query/user/with_valid_token', :access_token => 'valid' do
-          response = query.fetch('valid')
+          response = query.fetch(:access_token => 'valid')
           response.should be_instance_of FbGraph::Collection
           response.should == [{'name' => 'Nov Matake'}]
         end
       end
     end
 
+    context 'with locale option' do
+      it 'should support it' do
+        mock_fql raw_query, 'query/user/with_valid_token', :access_token => 'valid', :params => {
+          :locale => 'ja'
+        } do
+          query.fetch(:access_token => 'valid', :locale => 'ja')
+        end
+      end
+    end
+
     context 'when multiquery given' do
       let(:raw_query) do
         {
@@ -54,7 +64,7 @@ describe FbGraph::Query do
 
       it 'should return an Hash of Array of Hash' do
         mock_fql raw_query.to_json, 'query/user/multi_query', :access_token => 'valid' do
-          response = query.fetch('valid')
+          response = query.fetch(:access_token => 'valid')
           response.should be_instance_of ActiveSupport::HashWithIndifferentAccess
           response.each do |key, value|
             value.should be_instance_of Array

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fb_graph
 version: !ruby/object:Gem::Version
-  version: 2.6.7
+  version: 2.7.0
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement