fb_graph 1.9.1 → 1.9.2

data/Gemfile.lock

@@ -1,29 +1,51 @@
 PATH
   remote: .
   specs:
-    fb_graph (1.9.0)
+    fb_graph (1.9.1)
       httpclient (>= 2.2.0.2)
       rack-oauth2 (>= 0.8.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    abstract (1.0.0)
+    actionpack (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.9)
+      activesupport (= 3.0.9)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
     activesupport (3.0.9)
     addressable (2.2.6)
     attr_required (0.0.3)
+    builder (2.1.2)
     crack (0.1.8)
     diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
     httpclient (2.2.1)
-    i18n (0.6.0)
+    i18n (0.5.0)
     json (1.5.3)
-    rack (1.3.0)
-    rack-oauth2 (0.8.2)
+    rack (1.2.3)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-oauth2 (0.8.3)
       activesupport (>= 2.3)
       attr_required (>= 0.0.3)
       httpclient (>= 2.2.0.2)
       i18n
       json (>= 1.4.3)
       rack (>= 1.1)
+    rack-test (0.5.7)
+      rack (>= 1.0)
     rake (0.9.2)
     rcov (0.9.9)
     rspec (2.6.0)
@@ -34,6 +56,7 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    tzinfo (0.3.29)
     webmock (1.6.4)
       addressable (> 2.2.5, ~> 2.2)
       crack (>= 0.1.7)
@@ -42,6 +65,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  actionpack (>= 3.0.6)
   fb_graph!
   rake (>= 0.8)
   rcov (>= 0.9)

data/VERSION

@@ -1 +1 @@
-1.9.1
+1.9.2

data/fb_graph.gemspec

@@ -18,4 +18,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rcov", ">= 0.9"
   s.add_development_dependency "rspec", ">= 2"
   s.add_development_dependency "webmock", ">= 1.6.2"
+  s.add_development_dependency "actionpack", ">= 3.0.6"
 end

data/lib/fb_graph/node.rb

@@ -70,10 +70,18 @@ module FbGraph
         v != false
       end
       _params_.each do |key, value|
-        if value.present? && ![Symbol, String, Numeric, Rack::OAuth2::AccessToken::Legacy, IO].any? { |klass| value.is_a? klass }
-          _params_[key] = value.to_json
-        elsif [Symbol, Numeric, Rack::OAuth2::AccessToken::Legacy].any? { |klass| value.is_a? klass }
-          _params_[key] = value.to_s
+        next if value.blank?
+        _params_[key] = case value
+        when Symbol, Numeric, Rack::OAuth2::AccessToken::Legacy
+          value.to_s
+        when String, IO
+          value
+        when defined?(ActionDispatch::Http::UploadedFile) && ActionDispatch::Http::UploadedFile
+          # NOTE: for Rails 3.0.6+
+          # ref) http://blog.livedoor.jp/idea_and_players/archives/5184702.html
+          value.tempfile
+        else
+          value.to_json
         end
       end
       _params_.blank? ? nil : _params_

data/spec/fb_graph/node_spec.rb

@@ -13,9 +13,10 @@ describe FbGraph::Node do
   end
 
   describe '#build_params' do
+    let(:node) { node = FbGraph::Node.new('identifier') }
+
     it 'should make all values to JSON or String' do
       client = Rack::OAuth2::Client.new(:identifier => 'client_id', :secret => 'client_secret')
-      node = FbGraph::Node.new('identifier')
       params = node.send :build_params, {:hash => {:a => :b}, :array => [:a, :b], :integer => 123}
       params[:hash].should == '{"a":"b"}'
       params[:array].should == '["a","b"]'
@@ -31,28 +32,36 @@ describe FbGraph::Node do
 
     it 'should support OAuth2::AccessToken as options[:access_token]' do
       client = Rack::OAuth2::Client.new(:identifier => 'client_id', :secret => 'client_secret')
-      node = FbGraph::Node.new('identifier')
       params = node.send :build_params, {:access_token => Rack::OAuth2::AccessToken::Legacy.new(:access_token => 'token')}
       params[:access_token].should == 'token'
     end
-  end
-
-end
 
-describe FbGraph::Node, '#handle_response' do
-  it 'should handle null/false response' do
-    node = FbGraph::Node.new('identifier')
-    null_response = node.send :handle_response do
-      HTTP::Message.new_response 'null'
+    require 'action_dispatch/http/upload'
+    it 'should support ActionDispatch::Http::UploadedFile' do
+      upload = ActionDispatch::Http::UploadedFile.new(
+        :tempfile => Tempfile.new('tmp')
+      )
+      params = node.send :build_params, :upload => upload
+      params[:upload].should be_a Tempfile
     end
-    null_response.should be_nil
-    lambda do
-      node.send :handle_response do
-        HTTP::Message.new_response 'false'
+  end
+
+  describe '#handle_response' do
+    it 'should handle null/false response' do
+      node = FbGraph::Node.new('identifier')
+      null_response = node.send :handle_response do
+        HTTP::Message.new_response 'null'
       end
-    end.should raise_error(
-      FbGraph::NotFound,
-      'Graph API returned false, so probably it means your requested object is not found.'
-    )
+      null_response.should be_nil
+      lambda do
+        node.send :handle_response do
+          HTTP::Message.new_response 'false'
+        end
+      end.should raise_error(
+        FbGraph::NotFound,
+        'Graph API returned false, so probably it means your requested object is not found.'
+      )
+    end
   end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fb_graph
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 1
   - 9
-  - 1
-  version: 1.9.1
+  - 2
+  version: 1.9.2
 platform: ruby
 authors: 
 - nov matake
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-24 00:00:00 Z
+date: 2011-07-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httpclient
@@ -110,6 +110,22 @@ dependencies:
         version: 1.6.2
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: actionpack
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 3
+        - 0
+        - 6
+        version: 3.0.6
+  type: :development
+  version_requirements: *id007
 description: A full-stack Facebook Graph API wrapper in Ruby.
 email: nov@matake.jp
 executables: []