fb_graph 1.9.3 → 1.9.4

data/Gemfile

@@ -1,2 +1,7 @@
 source 'http://rubygems.org'
+
+platforms :jruby do
+  gem 'jruby-openssl', '>= 0.7'
+end
+
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fb_graph (1.9.2)
+    fb_graph (1.9.3)
       httpclient (>= 2.2.0.2)
       rack-oauth2 (>= 0.8.0)
 
@@ -26,6 +26,7 @@ GEM
     activesupport (3.0.9)
     addressable (2.2.6)
     attr_required (0.0.3)
+    bouncy-castle-java (1.5.0146.1)
     builder (2.1.2)
     crack (0.1.8)
     diff-lcs (1.1.2)
@@ -33,11 +34,14 @@ GEM
       abstract (>= 1.0.0)
     httpclient (2.2.1)
     i18n (0.5.0)
+    jruby-openssl (0.7.4)
+      bouncy-castle-java
     json (1.5.3)
+    json (1.5.3-java)
     rack (1.2.3)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
-    rack-oauth2 (0.8.3)
+    rack-oauth2 (0.8.4)
       activesupport (>= 2.3)
       attr_required (>= 0.0.3)
       httpclient (>= 2.2.0.2)
@@ -48,6 +52,7 @@ GEM
       rack (>= 1.0)
     rake (0.9.2)
     rcov (0.9.9)
+    rcov (0.9.9-java)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -62,11 +67,13 @@ GEM
       crack (>= 0.1.7)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   actionpack (>= 3.0.6)
   fb_graph!
+  jruby-openssl (>= 0.7)
   rake (>= 0.8)
   rcov (>= 0.9)
   rspec (>= 2)

data/README.rdoc

@@ -21,6 +21,9 @@ Almost all connections　for each object are also supported. ("attachments" and
 
 You can also play with a Rails sample app here. http://fbgraphsample.heroku.com/
 
+See GitHub wiki for more examples.
+https://github.com/nov/fb_graph/wiki
+
 === GET
 
 ==== Basic Objects
@@ -175,7 +178,7 @@ You can also play with a Rails sample app here. http://fbgraphsample.heroku.com/
   album = me.albums.first
   album.photo!(
     :access_token => ACCESS_TOKEN,
-    :image => File.new('/Users/nov/Desktop/nov.gif', 'rb'), # 'rb' is needed only on windows
+    :source => File.new('/Users/nov/Desktop/nov.gif', 'rb'), # 'rb' is needed only on windows
     :message => 'Hello, where is photo?'
   )
 

data/VERSION

@@ -1 +1 @@
-1.9.3
+1.9.4

data/lib/fb_graph/application.rb

@@ -16,6 +16,8 @@ module FbGraph
     include Connections::Subscriptions
     include Connections::Tagged
     include Connections::TestUsers
+    # TODO
+    # include Connections::Translations
     include Connections::Videos
 
     attr_accessor :name, :description, :category, :link, :secret

data/lib/fb_graph/connection.rb

@@ -1,6 +1,7 @@
 module FbGraph
   class Connection < Collection
     attr_accessor :collection, :connection, :owner, :options
+    delegate :total_count, :to => :collection
 
     def initialize(owner, connection, options = {})
       @owner = owner

data/lib/fb_graph/connections/payments.rb

@@ -2,11 +2,11 @@ module FbGraph
   module Connections
     module Payments
       def payments(options = {})
-        options[:access_token] ||= self.access_token
         orders = self.connection(:payments, options)
         orders.map! do |order|
-          orders[:access_token] ||= options[:access_token] || self.access_token
-          Order.new(order[:id], order)
+          Order.new(order[:id], order.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
     end

data/lib/fb_graph/order.rb

@@ -28,12 +28,7 @@ module FbGraph
     end
 
     def refunded!(options = {})
-      defaults = {
-        :status => :refunded,
-        :message => "Refunded", # message is currently required by facebook in a refund
-        :refund_funding_source => true
-      }
-      update defaults.merge(options)
+      update options.merge(:status => :refunded)
     end
 
     def canceled!(options = {})
@@ -48,9 +43,9 @@ module FbGraph
         :message => _attributes_.delete(:message),
         :refund_funding_source => _attributes_.delete(:refund_funding_source),
         :refund_reason => _attributes_.delete(:refund_reason),
-        :params => _attributes_.to_json
+        :params => _attributes_
       }
-      post params
+      super params
     end
   end
 end

data/spec/fb_graph/connections/payments_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe FbGraph::Connections::Payments do
+  describe '#payments' do
+    let(:app) { FbGraph::Application.new('app_id', :secret => 'sec sec') }
+
+    it 'should return payments as FbGraph::Order' do
+      mock_graph :post, 'oauth/access_token', 'token_response' do
+        mock_graph :get, 'app_id/payments', 'applications/payments/sample', :access_token => 'token' do
+          app.payments.each do |payment|
+            payment.should be_a FbGraph::Order
+          end
+        end
+      end
+    end
+  end
+end

data/spec/fb_graph/connections/photos_spec.rb

@@ -17,7 +17,7 @@ describe FbGraph::Connections::Photos, '#photo!' do
   it 'should return generated photo' do
     mock_graph :post, '12345/photos', 'albums/photos/post_with_valid_access_token' do
       photo = FbGraph::Album.new('12345', :access_token => 'valid').photo!(
-        :image => Tempfile.new('image_file'),
+        :source => Tempfile.new('image_file'),
         :message => 'Hello, where is photo?'
       )
       photo.identifier.should == 401111132276
@@ -29,7 +29,7 @@ describe FbGraph::Connections::Photos, '#photo!' do
   it 'should support Tag' do
     mock_graph :post, '12345/photos', 'albums/photos/post_with_valid_access_token' do
       photo = FbGraph::Album.new('12345', :access_token => 'valid').photo!(
-        :image => Tempfile.new('image_file'),
+        :source => Tempfile.new('image_file'),
         :message => 'Hello, where is photo?',
         :tags => [FbGraph::Tag.new(:id => 12345, :name => 'me', :x => 0, :y => 10)]
       )

data/spec/fb_graph/order_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe FbGraph::Order do
+  describe '#new' do
+    it :TODO
+  end
+
+  describe '#settled!' do
+    it :TODO
+  end
+
+  describe '#refunded!' do
+    it :TODO
+  end
+
+  describe '#canceled' do
+    it :TODO
+  end
+end

data/spec/mock_json/applications/payments/sample.json

@@ -0,0 +1,25 @@
+{
+    "data": [{
+        "id": "9005218752778",
+        "from": {
+            "name": "Nov Matake",
+            "id": "579612276"
+        },
+        "to": {
+            "name": "Nov Matake",
+            "id": "579612276"
+        },
+        "amount": 2,
+        "status": "settled",
+        "application": {
+            "name": "gem sample",
+            "id": "134145643294322"
+        },
+        "created_time": "2011-07-22T09:42:12+0000",
+        "updated_time": "2011-07-22T09:42:15+0000"
+    }],
+    "paging": {
+        "previous": "https://graph.facebook.com/134145643294322/payments?access_token=access_token&limit=1000&since=1311327735",
+        "next": "https://graph.facebook.com/134145643294322/payments?access_token=access_token&limit=1000&until=1311327735"
+    }
+}

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: fb_graph
 version: !ruby/object:Gem::Version 
-  hash: 53
   prerelease: 
-  segments: 
-  - 1
-  - 9
-  - 3
-  version: 1.9.3
+  version: 1.9.4
 platform: ruby
 authors: 
 - nov matake
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 Z
+date: 2011-07-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httpclient
@@ -25,12 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 123
-        segments: 
-        - 2
-        - 2
-        - 0
-        - 2
         version: 2.2.0.2
   type: :runtime
   version_requirements: *id001
@@ -42,11 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 8
-        - 0
         version: 0.8.0
   type: :runtime
   version_requirements: *id002
@@ -58,10 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
         version: "0.8"
   type: :development
   version_requirements: *id003
@@ -73,10 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
         version: "0.9"
   type: :development
   version_requirements: *id004
@@ -88,9 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
         version: "2"
   type: :development
   version_requirements: *id005
@@ -102,11 +75,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 6
-        - 2
         version: 1.6.2
   type: :development
   version_requirements: *id006
@@ -118,11 +86,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 3
-        - 0
-        - 6
         version: 3.0.6
   type: :development
   version_requirements: *id007
@@ -296,6 +259,7 @@ files:
 - spec/fb_graph/connections/notes_spec.rb
 - spec/fb_graph/connections/outbox_spec.rb
 - spec/fb_graph/connections/participants_spec.rb
+- spec/fb_graph/connections/payments_spec.rb
 - spec/fb_graph/connections/permissions_spec.rb
 - spec/fb_graph/connections/photos_spec.rb
 - spec/fb_graph/connections/picture_spec.rb
@@ -326,6 +290,7 @@ files:
 - spec/fb_graph/message_spec.rb
 - spec/fb_graph/node_spec.rb
 - spec/fb_graph/note_spec.rb
+- spec/fb_graph/order_spec.rb
 - spec/fb_graph/page/local_business_spec.rb
 - spec/fb_graph/page/movie_spec.rb
 - spec/fb_graph/page/music_spec.rb
@@ -355,6 +320,7 @@ files:
 - spec/mock_json/albums/photos/post_with_valid_access_token.json
 - spec/mock_json/applications/accounts/private.json
 - spec/mock_json/applications/feed/public.json
+- spec/mock_json/applications/payments/sample.json
 - spec/mock_json/applications/reviews/public.json
 - spec/mock_json/applications/subscriptions/fb_graph_private.json
 - spec/mock_json/applications/test_users/created.json
@@ -496,18 +462,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
@@ -561,6 +521,7 @@ test_files:
 - spec/fb_graph/connections/notes_spec.rb
 - spec/fb_graph/connections/outbox_spec.rb
 - spec/fb_graph/connections/participants_spec.rb
+- spec/fb_graph/connections/payments_spec.rb
 - spec/fb_graph/connections/permissions_spec.rb
 - spec/fb_graph/connections/photos_spec.rb
 - spec/fb_graph/connections/picture_spec.rb
@@ -591,6 +552,7 @@ test_files:
 - spec/fb_graph/message_spec.rb
 - spec/fb_graph/node_spec.rb
 - spec/fb_graph/note_spec.rb
+- spec/fb_graph/order_spec.rb
 - spec/fb_graph/page/local_business_spec.rb
 - spec/fb_graph/page/movie_spec.rb
 - spec/fb_graph/page/music_spec.rb
@@ -620,6 +582,7 @@ test_files:
 - spec/mock_json/albums/photos/post_with_valid_access_token.json
 - spec/mock_json/applications/accounts/private.json
 - spec/mock_json/applications/feed/public.json
+- spec/mock_json/applications/payments/sample.json
 - spec/mock_json/applications/reviews/public.json
 - spec/mock_json/applications/subscriptions/fb_graph_private.json
 - spec/mock_json/applications/test_users/created.json