fbgraph 0.1.1 → 0.1.4

data/README.textile

@@ -1,4 +1,4 @@
-h2. FBGRaph (0.0.8)
+h2. FBGRaph (0.1.1)
 
 p. Facebook Open Graph API Gem.
 
@@ -230,4 +230,5 @@ h2. Contributors
 
 "Mark Bates":http://github.com/markbates
 
+"Florent Guilleux":http://github.com/Florent2
 

data/Rakefile

@@ -2,14 +2,14 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('fbgraph', '0.1.1') do |p|
+Echoe.new('fbgraph', '0.1.4') do |p|
   p.description    = "A Gem for Facebook Open Graph API"
   p.url            = "http://github.com/nsanta/fbgraph"
   p.author         = "Nicolas Santa"
   p.email          = "nicolas55ar@gmail.com"
   p.ignore_pattern = ["tmp/*", "script/*"]
   p.development_dependencies = ['echoe', 'rspec']
-  p.runtime_dependencies = ['oauth2' , 'json', 'hashie']
+  p.runtime_dependencies = ['oauth2' , 'json', 'hashie' , 'rest-client']
 end
 
 Spec::Rake::SpecTask.new(:rspec) do |t|

data/fbgraph.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fbgraph}
-  s.version = "0.1.1"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nicolas Santa"]
@@ -28,12 +28,14 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<oauth2>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<hashie>, [">= 0"])
+      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
       s.add_development_dependency(%q<echoe>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
       s.add_dependency(%q<oauth2>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<hashie>, [">= 0"])
+      s.add_dependency(%q<rest-client>, [">= 0"])
       s.add_dependency(%q<echoe>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
     end
@@ -41,6 +43,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<oauth2>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<hashie>, [">= 0"])
+    s.add_dependency(%q<rest-client>, [">= 0"])
     s.add_dependency(%q<echoe>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
   end

data/lib/fbgraph.rb

@@ -1,6 +1,8 @@
 require 'oauth2'
 require 'json'
 require 'hashie'
+require 'rest_client'
+require 'uri'
 
 
 require 'fbgraph/client'

data/lib/fbgraph/authorization.rb

@@ -12,8 +12,8 @@ module FBGraph
     
 
     def process_callback(code, options = {})
-      @client.consumer = @client.oauth_client.web_server.get_access_token(code, options)
-      @client.access_token = @client.consumer.token
+      @client.auth = @client.oauth_client.web_server.get_access_token(code, options)
+      @client.access_token = @client.auth.token
     end
 
   end  

data/lib/fbgraph/base.rb

@@ -2,7 +2,7 @@ module FBGraph
   
   class Base
     
-    attr_reader :objects , :connection_type 
+    attr_reader :objects , :connection_type , :logger
     
     def initialize(client)
       @client = client
@@ -39,28 +39,29 @@ module FBGraph
     def info!(parsed = true)
       if @objects.is_a? Array
         @params.merge!({:ids => @objects.join(',')})
-        uri = build_open_graph_path(nil,nil, @params)
+        path = build_open_graph_path(nil,nil, @params)
       elsif @objects.is_a? String
-        uri = build_open_graph_path(@objects , @connection_type, @params)
+        path = build_open_graph_path(@objects , @connection_type, @params)
       end
-      puts "FBGRAPH [GET]: #{uri}"
-      result = @client.consumer.get(uri)
+      puts "FBGRAPH [GET]: #{path}"
+      puts "ACCESS TOKEN: #{@client.access_token}"
+      result = @client.consumer[path].get
       return parse_json(result, parsed)
     end
   
   
     def publish!(data = {},parsed = true)
       @params.merge!(data)
-      uri = build_open_graph_path(@objects , @connection_type)
-      puts "FBGRAPH [POST]: #{uri}"
-      result = @client.consumer.post(uri ,  @params , multipart_header)
+      path = build_open_graph_path(@objects , @connection_type)
+      puts "FBGRAPH [POST]: #{path}"
+      result = @client.consumer[path].post(@params)
       return parse_json(result, parsed)
     end
   
     def delete!(parsed = true)
-      uri = build_open_graph_path(@objects , nil)
-      puts "FBGRAPH [DELETE]: #{uri}"
-      result = @client.consumer.delete(uri ,  @params)
+      path = build_open_graph_path(@objects , nil)
+      puts "FBGRAPH [DELETE]: #{path}"
+      result = @client.consumer[path].post(@params.merge(:method => :delete))
       return parse_json(result, parsed)
     end
 
@@ -77,24 +78,16 @@ module FBGraph
     private
     
     def parse_json(result, parsed)
-      return parsed  ? Hashie::Mash.new(JSON.parse(result)) : result
+      return parsed  ? Hashie::Mash.new(JSON.parse(result.body)) : result.body
     end
     
+    
+    
     def build_open_graph_path(objects,connection_type = nil , params = {})
-      request = "/" + [objects , connection_type].compact.join('/')
+      params.merge!(:access_token => @client.access_token)
+      request = [objects , connection_type].compact.join('/')
       request += "?"+params.to_a.map{|p| p.join('=')}.join('&') unless params.empty?
-      request
-    end
-
-    def multipart_header
-      if multipart?
-        header = {"Content-Disposition" => "form-data", "name" => "control-name"}
-      end  
-      header || {}
-    end
-    
-    def multipart?
-      %w(photos).include?(@connection_type) || %w(photo post).include?(@objects)
+      URI.encode(request)
     end
 
   end  

data/lib/fbgraph/client.rb

@@ -1,15 +1,15 @@
 module FBGraph
   
   class Client
-      attr_accessor :client_id , :secret_id , :facebook_uri , :access_token , :consumer 
+      attr_accessor :client_id , :secret_id , :facebook_uri , :access_token , :consumer , :auth
       
     
       def initialize(options)
-        self.client_id , self.secret_id = options[:client_id] , options[:secret_id]
+        @client_id , @secret_id = options[:client_id] , options[:secret_id]
         @facebook_uri = 'https://graph.facebook.com'
-        if self.access_token = options[:token]
-          self.consumer = OAuth2::AccessToken.new(oauth_client , self.access_token)
-        end
+        @access_token = options[:token]
+        @consumer = RestClient::Resource.new(@facebook_uri)
+        @auth = OAuth2::AccessToken.new(oauth_client , @access_token)
         return true
       end
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Nicolas Santa
@@ -75,7 +75,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: echoe
+  name: rest-client
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
@@ -84,10 +84,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: echoe
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
@@ -98,6 +98,18 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: A Gem for Facebook Open Graph API
 email: nicolas55ar@gmail.com
 executables: []