hyper-graph 0.3.1 → 0.3.2

data/README.md

@@ -54,7 +54,7 @@ You can make connection requests, too:
 	=> true
 	irb > graph.object('514569082_115714061789461').delete(:likes)
 	=> true
-    
+
 Or, you can request from the graph directly:
     irb > graph.get('me')
     => {:updated_time=>Wed Mar 17 16:19:03 -0400 2010, :first_name=>"Chris", :last_name=>"Dinn", ...
@@ -68,7 +68,13 @@ Similarly, make a post or delete request directly from the graph:
     => true
     irb > graph.delete('514569082_115714061789461/likes')
     => true
-	    
+
+You can search, using the search function:
+	irb > graph.search('big band')
+	=> [{ :id => '113412341299949562_134212343177', :from => { :name => "Big Band Ballroom"...
+	irb > HyperGraph.search('big band')
+	=> [{ :id => '113412341299949562_134212343177', :from => { :name => "Big Band Ballroom"...
+	
 As well, you can make requests directly from HyperGraph, with or without an access token (though you'll need an access token for most requests):
     irb > HyperGraph.get('518018845')
     => {:first_name=>"Chris", :last_name=>"Dinn", :name=>"Chris Dinn", ...

data/lib/hyper_graph.rb

@@ -20,7 +20,7 @@ class HyperGraph
       request_path = "/#{requested_object_id}"
       
       query = build_query(options)   
-      request_path << "?#{query}" unless query==""
+      request_path << "?#{URI.escape(query)}" unless query==""
       
       http_response = http.get(request_path)
       data = extract_data(JSON.parse(http_response.body))
@@ -55,7 +55,11 @@ class HyperGraph
       request_path = "/oauth/access_token"
       request_path << "?#{build_query(:client_id => client_id, :client_secret => client_secret, :redirect_uri => redirect_uri, :code => code)}"
       http_response = http.get(request_path)
-      http_response.body.split('=')[1]
+      http_response.body.split(/\=|&/)[1]
+    end
+    
+    def search(query, options = {})
+      get('search', options.merge(:q => query))
     end
     
     protected
@@ -93,7 +97,7 @@ class HyperGraph
         when "error"
           raise FacebookError.new("#{v['type']} - #{v['message']}")
         when "id"
-          if (v.to_i == v.to_s.to_i)
+          if (v == v.to_i.to_s)
             normalized_hash[k.to_sym] = v.to_i 
           else
             normalized_hash[k.to_sym] = v 
@@ -149,4 +153,8 @@ class HyperGraph
   def delete(requested_object_id, options = {})
     self.class.delete(requested_object_id, options.merge(:access_token => @access_token))
   end
+  
+  def search(query, options = {})
+    self.class.get('search', options.merge(:access_token => @access_token, :q => query))
+  end
 end

data/test/hyper_graph_test.rb

@@ -162,6 +162,32 @@ class HyperGraphTest < Test::Unit::TestCase
     graph = HyperGraph.new(access_token)
     assert_equal true, graph.delete('514569082_115714061789461/likes')
   end
+  
+  def test_graph_search
+    json_api_response = %'{"data": [ 
+                            {"id": "113412341299949562_134212343177", "from": {"name": "Big Band Ballroom", "category": "Local_business", "id": "1334523899949562"}, "message": "Big band at our ballroom", "link": "http://www.facebook.com/", "type": "link" },
+                            {"id": "100123706392497_142067305819279", "from": {"name": "Big Band Guy", "id": "100000706392497"},"message": "What a band", "type": "status" }
+                        ]}'    
+    expected_parsed_response = [ { :id => '113412341299949562_134212343177', 
+                                   :from => { :name => "Big Band Ballroom", :category=> "Local_business", :id => 1334523899949562 }, 
+                                   :message => "Big band at our ballroom", 
+                                   :link => "http://www.facebook.com/", 
+                                   :type => "link"},
+                                 { :id => "100123706392497_142067305819279",
+                                   :from => { :name => "Big Band Guy", :id => 100000706392497 },
+                                   :message => "What a band",
+                                   :type => "status" }
+                                ] 
+    access_token = "test-access-token"
+    mock_response = stub(:body => json_api_response)
+    @mock_connection.stubs(:use_ssl=).with(true)
+    @mock_connection.stubs(:get).with("/search?access_token=#{access_token}&q=big%20band").returns(mock_response)
+    
+    assert_equal expected_parsed_response, HyperGraph.search('big band', :access_token => access_token)
+    
+    graph = HyperGraph.new('test-access-token')
+    assert_equal expected_parsed_response, graph.search('big band', :access_token => access_token)
+  end
 
   def test_authorize_url
     client_id = "your-client-id"
@@ -187,7 +213,7 @@ class HyperGraphTest < Test::Unit::TestCase
     client_secret = "your-client-secret"
     code = "facebook-oauth-code"
     callback_url = "http://yoursite.com/callback"
-    api_response = "access_token=#{access_token}"
+    api_response = "access_token=#{access_token}&expires=5008"
     
     mock_response = stub(:body => api_response)
     @mock_connection.expects(:use_ssl=).with(true)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Chris Dinn
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-04 00:00:00 -04:00
+date: 2010-07-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency