fbgraph 1.9.0 → 1.10.0

data/.bundle/config

@@ -1,3 +1,3 @@
---- 
-BUNDLE_DISABLE_SHARED_GEMS: "1"
-BUNDLE_PATH: vendor/
+---
+BUNDLE_DISABLE_SHARED_GEMS: '1'
+BUNDLE_PATH: vendor/bundler/

data/README.textile

@@ -227,6 +227,18 @@ Examples:
 notextile. <code> results = client.realtime.user.delete!</code>
 
 
+h3. FQL
+
+h4. client.fql.query("SELECT name FROM user WHERE uid = me()")
+
+
+h3. Timeline
+
+h4. client.timeline.action('namespace', 'run').param(:location => [location object URL])
+
+h4. client.timeline.reads.param(:article => [article object URL] )
+
+
 h3. Analytics
 
 h4. TODO

data/VERSION

@@ -1 +1 @@
-1.9.0
+1.10.0

data/fbgraph.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{fbgraph}
-  s.version = "1.9.0"
+  s.name = "fbgraph"
+  s.version = "1.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Nicolas Santa}]
-  s.date = %q{2011-10-17}
-  s.description = %q{A Gem for Facebook Open Graph API}
-  s.email = %q{nicolas55ar@gmail.com}
+  s.authors = ["Nicolas Santa"]
+  s.date = "2012-04-27"
+  s.description = "A Gem for Facebook Open Graph API"
+  s.email = "nicolas55ar@gmail.com"
   s.extra_rdoc_files = [
     "README",
     "README.textile"
@@ -32,10 +32,13 @@ Gem::Specification.new do |s|
     "lib/fbgraph/cacert.pem",
     "lib/fbgraph/canvas.rb",
     "lib/fbgraph/client.rb",
+    "lib/fbgraph/fql.rb",
+    "lib/fbgraph/logger.rb",
     "lib/fbgraph/realtime.rb",
     "lib/fbgraph/result.rb",
     "lib/fbgraph/search.rb",
     "lib/fbgraph/selection.rb",
+    "lib/fbgraph/timeline.rb",
     "specs/lib/fbauth/authorization_spec.rb",
     "specs/lib/fbauth/base_spec.rb",
     "specs/lib/fbauth/canvas_spec.rb",
@@ -45,11 +48,11 @@ Gem::Specification.new do |s|
     "specs/lib/fbauth/selection_spec.rb",
     "specs/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/nsanta/fbgraph}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{A Gem for Facebook Open Graph API}
+  s.homepage = "http://github.com/nsanta/fbgraph"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.21"
+  s.summary = "A Gem for Facebook Open Graph API"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/fbgraph.rb

@@ -17,6 +17,9 @@ require 'fbgraph/selection'
 require 'fbgraph/search'
 require 'fbgraph/realtime'
 require 'fbgraph/canvas'
+require 'fbgraph/logger'
+require 'fbgraph/fql'
+require 'fbgraph/timeline'
 
 module FBGraph
   @config = nil

data/lib/fbgraph/base.rb

@@ -47,15 +47,13 @@ module FBGraph
       @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)
       else
         raise "No Facebook objects were recognized as selected; unable to build fb graph path."
       end
-      
-      # puts "FBGRAPH [GET]: #{path}"
-      # puts "ACCESS TOKEN: #{@client.access_token}"
+      show_log('GET' , path, @params) if @debug
       result = @client.consumer[path].get
       @last_result = ::FBGraph::Result.new(result, @params)
     end
@@ -65,22 +63,20 @@ module FBGraph
       @params.merge!(data)
       self.instance_eval(&block) if block_given?
       @params.merge!(:fields => sanitized_fields.join(',')) unless sanitized_fields.blank?
-      params = @params.merge(:access_token => @client.access_token) if (@client.access_token)      
-      path = build_open_graph_path(@objects , @connection_type)
-      # puts "FBGRAPH [POST]: #{path}"
-      # puts "PARAMS: #{params.to_a.map{|p| p.join('=')}.join('&')}"
-      result = @client.consumer[path].post(params)
+      @params.merge!(:access_token => @client.access_token) if (@client.access_token)      
+      @path = build_open_graph_path(@objects , @connection_type)
+      show_log('POST' , @path, @params) if @debug
+      result = @client.consumer[@path].post(@params)
       @last_result = ::FBGraph::Result.new(result, @params)
     end
   
     def delete!(parsed = true, &block)
       self.instance_eval(&block) if block_given?
-      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}"
-      # puts "PARAMS: #{params.to_a.map{|p| p.join('=')}.join('&')}"      
-      result = @client.consumer[path].post(params)
+      @path = build_open_graph_path(@objects , nil)
+      @params.merge!(:access_token => @client.access_token) if (@client.access_token)
+      @params.merge!(:method => :delete)
+      show_log('DELETE' , @path, @params) if @debug
+      result = @client.consumer[@path].post(@params)
       @last_result = ::FBGraph::Result.new(result, @params)
     end
 
@@ -93,7 +89,10 @@ module FBGraph
         PAGING
     end
 
-    
+    def debug=(att)
+      @debug= att
+    end
+
     private
     
     def sanitized_fields
@@ -106,5 +105,10 @@ module FBGraph
       URI.encode(request)
     end
 
+    def show_log(ver, path, params)
+       client.logger.info "FBGRAPH [#{verb}]: #{path}"
+       client.logger.info "PARAMS: #{params.to_a.map{|p| p.join('=')}.join('&')}"      
+    end
+
   end  
 end

data/lib/fbgraph/client.rb

@@ -2,7 +2,7 @@ module FBGraph
   
   class Client
 
-    attr_accessor :client_id , :secret_id , :facebook_uri , :access_token , :consumer , :auth
+    attr_accessor :client_id , :secret_id , :facebook_uri , :access_token , :consumer , :auth , :logger
       
     def initialize(options = {})
       @client_id = options[:client_id] || FBGraph.config[:client_id]
@@ -12,6 +12,7 @@ module FBGraph
       @consumer = RestClient::Resource.new(@facebook_uri, rest_client_ssl_options)
       @access_token = options.fetch :token, nil
       @auth = OAuth2::AccessToken.new(oauth_client, @access_token)
+      @logger = options[:logger] || FBGraph::Logger
       return true
     end
     
@@ -37,6 +38,14 @@ module FBGraph
       FBGraph::Realtime.new(self)
     end
     
+    def fql
+      FBGraph::FQL.new(self)
+    end
+    
+    def timeline
+      FBGraph::Timeline.new(self)
+    end
+    
     def oauth_client
       OAuth2::Client.new(client_id, secret_id,
           :site => { :url => facebook_uri },

data/lib/fbgraph/fql.rb

@@ -0,0 +1,9 @@
+module FBGraph
+  class FQL < Base
+    
+    
+    def query(q)
+      find('fql').param(:q => q).info!
+    end
+  end
+end

data/lib/fbgraph/logger.rb

@@ -0,0 +1,16 @@
+module FBGraph
+  class Logger
+    def self.info(msg)
+      puts msg
+    end
+
+    def self.warn(msg)
+      puts msg
+    end
+
+    def self.error(msg)
+      puts msg
+    end
+
+  end
+end

data/lib/fbgraph/selection.rb

@@ -26,8 +26,8 @@ module FBGraph
 
     CONNECTION_TYPES.each do |object|
       class_eval  <<-METHOD
-        def #{object}
-          connection('#{object}')
+        def #{object}(connection_id = nil)
+          connection(['#{object}', connection_id])
           self
         end
       METHOD
@@ -38,12 +38,6 @@ module FBGraph
       find('me')
     end
 
-
-    def action(namespace,action)
-      connection([namespace,action].join(':'))
-      self
-    end
-
     def metadata
       @params.merge!({:metadata => '1'})
       self

data/lib/fbgraph/timeline.rb

@@ -0,0 +1,28 @@
+module FBGraph
+  class Timeline < Base
+    
+    BUILT_IN_ACTIONS = {
+      :listens => :music,
+      :reads => :news,
+      :watches => :movie,
+    }
+    
+    
+    def action(namespace,action)
+      connection([namespace,action].join(':'))
+      self
+    end
+    
+    BUILT_IN_ACTIONS.each do |action,obj|
+      class_eval  <<-METHOD
+        def #{action}
+          find('me').connection("#{[obj,action].join('.')}")
+          self
+        end
+      METHOD
+    end
+    
+    
+    
+  end
+end

data/specs/lib/fbauth/authorization_spec.rb

@@ -21,7 +21,7 @@ describe FBGraph do
       describe '.authorize_url' do
         it 'should return the authorization url' do
           @authorization.authorize_url(:redirect_uri => 'redirect/to/path' , 
-                                       :scope => 'email,user_photos,friends_photos').should == "https://graph.facebook.com/oauth/authorize?response_type=code&client_id=client_id&redirect_uri=redirect%2Fto%2Fpath&scope=email%2Cuser_photos%2Cfriends_photos"
+                                       :scope => 'email,user_photos,friends_photos').should =~ /redirect_uri=redirect%2Fto%2Fpath/
         end
       end
       describe "process_callback" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fbgraph
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 63
   prerelease: 
   segments: 
   - 1
-  - 9
+  - 10
   - 0
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors: 
 - Nicolas Santa
@@ -15,9 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-17 00:00:00 Z
+date: 2012-04-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,9 +31,9 @@ dependencies:
         version: "0"
   type: :runtime
   requirement: *id001
-  prerelease: false
-  name: activesupport
 - !ruby/object:Gem::Dependency 
+  name: hashie
+  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,9 +47,9 @@ dependencies:
         version: 1.0.0
   type: :runtime
   requirement: *id002
-  prerelease: false
-  name: hashie
 - !ruby/object:Gem::Dependency 
+  name: oauth2
+  prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -61,9 +63,9 @@ dependencies:
         version: 0.5.0
   type: :runtime
   requirement: *id003
-  prerelease: false
-  name: oauth2
 - !ruby/object:Gem::Dependency 
+  name: faraday
+  prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -77,9 +79,9 @@ dependencies:
         version: 0.7.5
   type: :runtime
   requirement: *id004
-  prerelease: false
-  name: faraday
 - !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -93,9 +95,9 @@ dependencies:
         version: 1.0.0
   type: :runtime
   requirement: *id005
-  prerelease: false
-  name: json
 - !ruby/object:Gem::Dependency 
+  name: rest-client
+  prerelease: false
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -107,9 +109,9 @@ dependencies:
         version: "0"
   type: :runtime
   requirement: *id006
-  prerelease: false
-  name: rest-client
 - !ruby/object:Gem::Dependency 
+  name: i18n
+  prerelease: false
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -121,9 +123,9 @@ dependencies:
         version: "0"
   type: :runtime
   requirement: *id007
-  prerelease: false
-  name: i18n
 - !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -137,9 +139,9 @@ dependencies:
         version: 1.6.0
   type: :development
   requirement: *id008
-  prerelease: false
-  name: jeweler
 - !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -153,9 +155,9 @@ dependencies:
         version: 0.9.2
   type: :development
   requirement: *id009
-  prerelease: false
-  name: rake
 - !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -169,9 +171,9 @@ dependencies:
         version: 1.0.0
   type: :development
   requirement: *id010
-  prerelease: false
-  name: bundler
 - !ruby/object:Gem::Dependency 
+  name: fakeweb
+  prerelease: false
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -185,9 +187,9 @@ dependencies:
         version: 1.3.0
   type: :development
   requirement: *id011
-  prerelease: false
-  name: fakeweb
 - !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -201,9 +203,9 @@ dependencies:
         version: 2.6.0
   type: :development
   requirement: *id012
-  prerelease: false
-  name: rspec
 - !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -215,9 +217,9 @@ dependencies:
         version: "0"
   type: :development
   requirement: *id013
-  prerelease: false
-  name: rcov
 - !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
   version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -231,9 +233,9 @@ dependencies:
         version: 3.9.0
   type: :development
   requirement: *id014
-  prerelease: false
-  name: rdoc
 - !ruby/object:Gem::Dependency 
+  name: redgreen
+  prerelease: false
   version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -247,8 +249,6 @@ dependencies:
         version: 1.2.2
   type: :development
   requirement: *id015
-  prerelease: false
-  name: redgreen
 description: A Gem for Facebook Open Graph API
 email: nicolas55ar@gmail.com
 executables: []
@@ -274,10 +274,13 @@ files:
 - lib/fbgraph/cacert.pem
 - lib/fbgraph/canvas.rb
 - lib/fbgraph/client.rb
+- lib/fbgraph/fql.rb
+- lib/fbgraph/logger.rb
 - lib/fbgraph/realtime.rb
 - lib/fbgraph/result.rb
 - lib/fbgraph/search.rb
 - lib/fbgraph/selection.rb
+- lib/fbgraph/timeline.rb
 - specs/lib/fbauth/authorization_spec.rb
 - specs/lib/fbauth/base_spec.rb
 - specs/lib/fbauth/canvas_spec.rb
@@ -315,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: A Gem for Facebook Open Graph API