fbgraph 0.1.6.1 → 0.1.6.3

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('fbgraph', '0.1.6.1') do |p|
+Echoe.new('fbgraph', '0.1.6.3') do |p|
   p.description    = "A Gem for Facebook Open Graph API"
   p.url            = "http://github.com/nsanta/fbgraph"
   p.author         = "Nicolas Santa"

data/fbgraph.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fbgraph}
-  s.version = "0.1.6.1"
+  s.version = "0.1.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nicolas Santa"]
   s.cert_chain = ["/home/nicolas/certs/gem-public_cert.pem"]
-  s.date = %q{2010-09-07}
+  s.date = %q{2010-09-15}
   s.description = %q{A Gem for Facebook Open Graph API}
   s.email = %q{nicolas55ar@gmail.com}
   s.extra_rdoc_files = ["README", "README.textile", "TODO.list", "lib/fbgraph.rb", "lib/fbgraph/authorization.rb", "lib/fbgraph/base.rb", "lib/fbgraph/canvas.rb", "lib/fbgraph/client.rb", "lib/fbgraph/realtime.rb", "lib/fbgraph/search.rb", "lib/fbgraph/selection.rb"]

data/lib/fbgraph/authorization.rb

@@ -33,22 +33,5 @@ module FBGraph
       JSON.parse(tokens).map { |hash| hash['access_token'] if hash}
     end
 
-    def upgrade_session(key)
-      token = upgrade_session_keys(key).first
-      @client.access_token = token['access_token']
-      token
-    end
-
-
-    def exchange_sessions(*keys)
-      tokens = @client.oauth_client.request(:get, '/oauth/exchange_sessions', {
-        :client_id     => @client.client_id,
-        :client_secret => @client.secret_id,
-        :type          => 'client_cred',
-        :sessions      => keys.flatten.join(',')
-      })
-      JSON.parse(tokens)
-    end
-
   end  
 end

data/lib/fbgraph/base.rb

@@ -38,9 +38,10 @@ module FBGraph
     end  
 
     def info!(parsed = true)
+      @params.merge!(:access_token => @client.access_token) unless @client.access_token.nil?
       if @objects.is_a? Array
         @params.merge!({:ids => @objects.join(',')})
-        path = build_open_graph_path(nil,nil, @params)
+        path = build_open_graph_path(nil,nil, params)
       elsif @objects.is_a? String
         path = build_open_graph_path(@objects , @connection_type, @params)
       end
@@ -53,16 +54,21 @@ module FBGraph
   
     def publish!(data = {},parsed = true)
       @params.merge!(data)
+      params = @params.merge(:access_token => @client.access_token) if (@client.access_token)      
       path = build_open_graph_path(@objects , @connection_type)
       puts "FBGRAPH [POST]: #{path}"
-      result = @client.consumer[path].post(@params)
+      puts "PARAMS: #{params.to_a.map{|p| p.join('=')}.join('&')}"
+      result = @client.consumer[path].post(params)
       return parse_json(result, parsed)
     end
   
     def delete!(parsed = true)
       path = build_open_graph_path(@objects , nil)
+      params = @params.merge(:access_token => @client.access_token) if (@client.access_token)
+      params.merge!(:method => :delete)
       puts "FBGRAPH [DELETE]: #{path}"
-      result = @client.consumer[path].post(@params.merge(:method => :delete))
+      puts "PARAMS: #{params.to_a.map{|p| p.join('=')}.join('&')}"      
+      result = @client.consumer[path].post(params)
       return parse_json(result, parsed)
     end
 
@@ -80,12 +86,9 @@ module FBGraph
     
     def parse_json(result, parsed)
       return parsed  ? Hashie::Mash.new(JSON.parse(result.body)) : result.body
-    end
-    
-    
+    end        
     
-    def build_open_graph_path(objects,connection_type = nil , params = {})
-      params.merge!(:access_token => @client.access_token)
+    def build_open_graph_path(objects, connection_type = nil , params = {})
       request = [objects , connection_type].compact.join('/')
       request += "?"+params.to_a.map{|p| p.join('=')}.join('&') unless params.empty?
       URI.encode(request)

data/lib/fbgraph/client.rb

@@ -8,6 +8,7 @@ module FBGraph
       @client_id, @secret_id = options[:client_id] || FBGraph.config[:client_id], options[:secret_id] || FBGraph.config[:secret_id]
       @facebook_uri = 'https://graph.facebook.com'
       @consumer = RestClient::Resource.new(@facebook_uri)
+      @access_token = options.fetch :token, nil
       @auth = OAuth2::AccessToken.new(oauth_client , @access_token)
       return true
     end

data/lib/fbgraph/selection.rb

@@ -40,8 +40,9 @@ module FBGraph
 
     def picture
       uri = [@client.facebook_uri , build_open_graph_path(@objects , 'picture')].join('/')
-      return uri unless @client.consumer
+      return uri if @client.access_token.nil?
       uri + '?access_token=' + @client.access_token
+
     end
 
   end

data/specs/lib/fbauth/authorization_spec.rb

@@ -37,7 +37,7 @@ describe FBGraph do
           @token.should == @consumer.token
         end
         it 'should set the consumer' do
-          @client.consumer.should == @consumer
+          @client.auth.should == @consumer
         end
       end
     end

data/specs/lib/fbauth/base_spec.rb

@@ -9,7 +9,8 @@ describe FBGraph do
       @client = FBGraph::Client.new(:client_id => @client_id,
                                     :secret_id => @secret_id,
                                     :token => 'token')
-      @base = FBGraph::Base.new(@client)                              
+      @base = FBGraph::Base.new(@client)
+      
     end
 
     describe 'initialization' do
@@ -59,9 +60,9 @@ describe FBGraph do
       describe 'info!' do
         describe 'when object is an array' do
           it 'should request with the path "/?ids=1,2,3"' do
-            uri = "/?ids=1,2,3"
+            uri = "?access_token=token&ids=1,2,3"
             @base.find([1,2,3])
-            @client.consumer.stub!(:get).with(uri).and_return('')
+            expect_consumer(uri)
             @base.info!(false)
           end
         end
@@ -69,34 +70,34 @@ describe FBGraph do
         describe 'when object is a string' do
 
           it 'should request with the path "/123"' do
-            uri = "/123"
-            @base.find('123')
-            @client.consumer.stub!(:get).with(uri).and_return('')
+            uri = "123?access_token=token"
+            @base.find('123')            
+            expect_consumer(uri)                        
             @base.info!(false)
           end
           
           it "should parse the result by default" do
-            uri = "/123"
+            uri = "123?access_token=token"
             @base.find('123')
-            @client.consumer.stub!(:get).with(uri).and_return('{"me": [1, 2]}')
+            expect_consumer(uri, '{"me": [1, 2]}')
             @base.info!.me.should == [1, 2]
           end
           
           describe 'when a connection is passed' do
             it 'should request with the path "/123/home"' do
-              uri = "/123/home"
+              uri = "123/home?access_token=token"
               @base.find('123').connection('home')
-              @client.consumer.stub!(:get).with(uri).and_return('')
+              expect_consumer(uri)
               @base.info!(false)
             end
           end
 
           describe 'when params are passed' do
             it 'should request with the path "/123?fields=name,picture"' do
-              uri = "/123?fields=name,picture"
+              uri = "123?fields=name,picture&access_token=token"
               @base.find('123')
               @base.params = {:fields => "name,picture"}
-              @client.consumer.stub!(:get).with(uri).and_return('')
+              expect_consumer(uri)
               @base.info!(false)
             end
           end
@@ -106,30 +107,31 @@ describe FBGraph do
       describe 'publish!' do
         describe 'when is passed params before invocation' do
           it 'should request with the path "/123" and params {:extra => "extra" }' do
-            uri = "/123"
+            uri = "123"
             @base.find('123')
             @base.params = {:extra => "extra" }
-            @client.consumer.stub!(:post).with(uri , @base.params).and_return('')
+            #@client.consumer.stub!(:post).with(uri , @base.params).and_return('')
+            expect_consumer_post(uri, {:extra => "extra", :access_token => 'token'})
             @base.publish!({}, false)
         end
         end
         describe 'when is passed params on invocation' do
           it 'should request with the path "/123" and params {:extra => "extra" }' do
-            uri = "/123"
+            uri = "123"
             @base.find('123')
-            ps = {:extra => "extra" }
-            @client.consumer.stub!(:post).with(uri , ps).and_return('')
-            @base.publish!(ps , false)
+            ps = {:extra => "extra"}
+            expect_consumer_post(uri, {:extra => "extra", :access_token => 'token'})
+            @base.publish!(ps, false)
           end
         end
       end
 
       describe 'delete!' do
         it 'should request with the path "/123" and params {:extra => "extra" }' do
-          uri = "/123"
+          uri = "123"
           @base.find('123')
           @base.params = {:extra => "extra" }
-          @client.consumer.stub!(:delete).with(uri , @base.params).and_return('')
+          expect_consumer_post(uri, {:method => :delete, :extra => "extra", :access_token => 'token'})
           @base.delete!(false)
         end
       end

data/specs/lib/fbauth/client_spec.rb

@@ -37,7 +37,7 @@ describe FBGraph do
           @client.access_token.should == @token
         end
         it 'should set the consumer client' do
-          @client.consumer.class.should == OAuth2::AccessToken
+          @client.consumer.class.should == RestClient::Resource
         end
       end
     end

data/specs/spec_helper.rb

@@ -1,3 +1,15 @@
 $LOAD_PATH << File.expand_path('../../lib', __FILE__)
 require 'rubygems'
 require 'fbgraph'
+
+def expect_consumer(uri, result = '')
+  consumer = @client.consumer[uri]
+  consumer.stub!(:get).and_return(Struct.new(:body).new(result))
+  @client.consumer.stub!(:[]).with(uri).and_return(consumer)  
+end
+
+def expect_consumer_post(uri, params = {}, result = '')
+  rest_client = @client.consumer[uri]
+  rest_client.stub!(:post).with(params).and_return(Struct.new(:body).new(result))
+  @client.consumer.stub!(:[]).with(uri).and_return(rest_client)  
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: fbgraph
 version: !ruby/object:Gem::Version 
-  hash: 93
+  hash: 89
   prerelease: false
   segments: 
   - 0
   - 1
   - 6
-  - 1
-  version: 0.1.6.1
+  - 3
+  version: 0.1.6.3
 platform: ruby
 authors: 
 - Nicolas Santa
@@ -37,7 +37,7 @@ cert_chain:
   urUszHKBS/vEBMuC
   -----END CERTIFICATE-----
 
-date: 2010-09-07 00:00:00 -03:00
+date: 2010-09-15 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 

metadata.gz.sig

@@ -1 +1,2 @@
-HϹ�Ţpݕ�����4Щd<�̶]4��{��r���6��щ��ʠ�y��}�Ȅ	6XK�Q�F�����y� <t�!E7��}����s1���N��RCX*�!����+��I��&2�ј.�G~l��SC�/���=$U=6���b\rb���.�2�g%�o�u|#J��l=u����1(�AW�d>p�<�G�-'X���&ڠ9c,c�����2y���Ev�S/�ܵ"��񻥶��c���
+,n56򏔥!
+(�v����MCC�w�Pm�h�����o�œey�n���e�K	`B�cH�ʻ܇���Q(��6 �;5�*�^�A�3��5%��%�yVYsr[zo���X�k{_��:�:�Gg-!J���R*s�܃�]�4��#�S��ݷ���1 �mɾ�LԾ�И������1�,��M_���(�