fb_graph 0.5.0 → 0.6.0

data/README.rdoc

@@ -20,6 +20,11 @@ Almost all connections　for each object are also supported. (Private message co
 
 Plus, you can play an Rails sample app here. http://fbgraphsample.heroku.com/
 
+=== Authentication
+
+Both Facebook JavaScript SDK and normal OAuth2 flow is supported.
+See http://github.com/nov/fb_graph_sample
+
 === GET
 
 ==== Basic Objects
@@ -61,14 +66,36 @@ Plus, you can play an Rails sample app here. http://fbgraphsample.heroku.com/
   me.home
   :
 
+==== Search
+
+  # all objects
+  FbGraph::Searchable.search("FbGraph") # => Array of Hash
+
+  # specify type
+  FbGraph::Page.search("FbGraph") # => Array of FbGraph::Page
+  FbGraph::User.search("matake", :access_token => ACCESS_TOKEN) # => Array of FbGraph::User
+
 ==== Pagination
 
+  # collection
   user = FbGraph::User.new('matake', :access_token => ACCESS_TOKEN)
   likes = user.likes # => Array of FbGraph::Like
-  likes.next         # => {:limit => 25, :until => '...'}
-  likes.previous     # => {:limit => 25, :since => '...'}
-  user.likes(likes.next)     # => Array of FbGraph::Like
-  user.likes(likes.previous) # => Array of FbGraph::Like
+  likes.next         # => Array of FbGraph::Like (next page)
+  likes.previous     # => Array of FbGraph::Like (previous page)
+  likes.collection.next     # => Hash for pagination options (ex. {"limit"=>"25", "until"=>"2010-08-08T03:17:21+0000"})
+  likes.collection.previous # => Hash for pagination options (ex. {"limit"=>"25", "since"=>"2010-08-08T06:28:20+0000"})
+  user.likes(likes.collection.next)     # => same with likes.next
+  user.likes(likes.collection.previous) # => same with likes.previous
+
+  # search results
+  results = FbGraph::Page.search("FbGraph") # => Array of FbGraph::Page
+  results.next     # => Array of FbGraph::Page (next page)
+  results.previous # => Array of FbGraph::Page (next page)
+  results.klass    # => FbGraph::Page
+  results.collection.next     # => Hash for pagination options (ex. {"limit"=>"25", "until"=>"2010-08-08T03:17:21+0000"})
+  results.collection.previous # => Hash for pagination options (ex. {"limit"=>"25", "since"=>"2010-08-08T06:28:20+0000"})
+  results.klass.search(results.query, results.collection.next)     # => same with results.next
+  results.klass.search(results.query, results.collection.previous) # => same with results.previous
 
 === POST
 
@@ -147,6 +174,8 @@ Plus, you can play an Rails sample app here. http://fbgraphsample.heroku.com/
     :message => 'Hello, where is photo?'
   )
 
+=== DELETE
+
 ==== Delete an object
 
   post = FbGraph::Page.new(117513961602338).feed.first

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/fb_graph.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fb_graph}
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["nov matake"]
-  s.date = %q{2010-08-07}
+  s.date = %q{2010-08-08}
   s.description = %q{A Ruby wrapper for Facebook Graph API}
   s.email = %q{nov@matake.jp}
   s.extra_rdoc_files = [
@@ -72,6 +72,7 @@ Gem::Specification.new do |s|
      "lib/fb_graph/page.rb",
      "lib/fb_graph/photo.rb",
      "lib/fb_graph/post.rb",
+     "lib/fb_graph/searchable.rb",
      "lib/fb_graph/status.rb",
      "lib/fb_graph/tag.rb",
      "lib/fb_graph/user.rb",

data/lib/fb_graph.rb

@@ -50,6 +50,7 @@ require 'fb_graph/comparison'
 require 'fb_graph/collection'
 require 'fb_graph/connection'
 require 'fb_graph/connections'
+require 'fb_graph/searchable'
 
 require 'fb_graph/node'
 require 'fb_graph/album'

data/lib/fb_graph/connection.rb

@@ -1,25 +1,27 @@
 module FbGraph
   class Connection < Collection
-    attr_accessor :collection, :connection, :owner
+    attr_accessor :collection, :connection, :owner, :options
 
-    def initialize(owner, connection, collection = FbGraph::Collection.new)
+    def initialize(owner, connection, options = {})
       @owner = owner
+      @options = options
       @connection = connection
-      @collection = collection
+      @collection = options.delete(:collection) || FbGraph::Collection.new
       replace collection
     end
 
-    def next(options = {})
+    def next(_options_ = {})
       if self.collection.next.present?
-        self.owner.send(self.connection, options.merge(self.collection.next))
+        self.owner.send(self.connection, self.options.merge(_options_).merge(self.collection.next))
       else
         self.class.new(self.owner, self.connection)
       end
     end
 
-    def previous(options = {})
+    def previous(_options_ = {})
+      puts self.options.inspect
       if self.collection.previous.present?
-        self.owner.send(self.connection, options.merge(self.collection.previous))
+        self.owner.send(self.connection, self.options.merge(_options_).merge(self.collection.previous))
       else
         self.class.new(self.owner, self.connection)
       end

data/lib/fb_graph/event.rb

@@ -7,6 +7,7 @@ module FbGraph
     include Connections::Attending
     include Connections::Declined
     include Connections::Picture
+    extend Searchable
 
     attr_accessor :owner, :name, :description, :start_time, :end_time, :location, :venue, :privacy, :updated_time
 

data/lib/fb_graph/group.rb

@@ -3,6 +3,7 @@ module FbGraph
     include Connections::Feed
     include Connections::Members
     include Connections::Picture
+    include Searchable
 
     attr_accessor :owner, :name, :description, :link, :venue, :privacy, :updated_time
 

data/lib/fb_graph/node.rb

@@ -1,6 +1,6 @@
 module FbGraph
   class Node
-    include FbGraph::Comparison
+    include Comparison
 
     attr_accessor :identifier, :endpoint, :access_token
 
@@ -22,7 +22,7 @@ module FbGraph
 
     def connection(connection, options = {})
       collection = FbGraph::Collection.new(get(options.merge(:connection => connection)))
-      Connection.new(self, connection, collection)
+      Connection.new(self, connection, options.merge(:collection => collection))
     end
 
     def destroy(options = {})
@@ -65,7 +65,7 @@ module FbGraph
       _endpoint_ = if params[:connection]
         File.join(self.endpoint, params.delete(:connection).to_s)
       else
-        self.endpoint
+        params[:endpoint] || self.endpoint
       end
 
       params.delete_if do |k, v|

data/lib/fb_graph/page.rb

@@ -12,6 +12,7 @@ module FbGraph
     include Connections::Notes
     include Connections::Posts
     include Connections::Events
+    extend Searchable
 
     attr_accessor :name, :category
 

data/lib/fb_graph/post.rb

@@ -1,6 +1,7 @@
 module FbGraph
   class Post < Node
     include Connections::Comments
+    extend Searchable
 
     attr_accessor :from, :to, :message, :picture, :link, :name, :caption, :description, :source, :icon, :attribution, :actions, :likes, :created_time, :updated_time
 

data/lib/fb_graph/searchable.rb

@@ -0,0 +1,51 @@
+module FbGraph
+  module Searchable
+    def self.search(query, options = {})
+      klass = options.delete(:class) || FbGraph::Searchable
+      collection = FbGraph::Collection.new(
+        FbGraph::Node.new(:search).send(:get, options.merge(:q => query))
+      )
+      yield collection if block_given?
+      FbGraph::Searchable::Result.new(query, klass, options.merge(:collection => collection))
+    end
+
+    def search(query, options = {})
+      type = self.to_s.underscore.split('/').last
+      FbGraph::Searchable.search(query, options.merge(:type => type, :class => self)) do |collection|
+        collection.map! do |obj|
+          self.new(obj.delete(:id), obj.merge(
+            :access_token => options[:access_token]
+          ))
+        end
+      end
+    end
+
+    class Result < Collection
+      attr_accessor :query, :klass, :collection, :options
+
+      def initialize(query, klass, options = {})
+        @klass = klass
+        @query = query
+        @options = options
+        @collection = options.delete(:collection) || FbGraph::Collection.new
+        replace @collection
+      end
+
+      def next(_options_ = {})
+        if self.collection.next.present?
+          self.klass.search(self.query, self.options.merge(_options_).merge(self.collection.next))
+        else
+          self.class.new(self.query, self.klass)
+        end
+      end
+
+      def previous(_options_ = {})
+        if self.collection.previous.present?
+          self.klassf.search(self.query, self.options.merge(_options_).merge(self.collection.previous))
+        else
+          self.class.new(self.query, self.klass)
+        end
+      end
+    end
+  end
+end

data/lib/fb_graph/user.rb

@@ -21,6 +21,7 @@ module FbGraph
     include Connections::Links
     include Connections::Notes
     include Connections::Events
+    extend Searchable
 
     # TODO:
     # include Connections::Inbox

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - nov matake
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-07 00:00:00 +09:00
+date: 2010-08-08 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -169,6 +169,7 @@ files:
 - lib/fb_graph/page.rb
 - lib/fb_graph/photo.rb
 - lib/fb_graph/post.rb
+- lib/fb_graph/searchable.rb
 - lib/fb_graph/status.rb
 - lib/fb_graph/tag.rb
 - lib/fb_graph/user.rb