rubytter 0.5.0 → 0.6.0

data/lib/rubytter.rb

@@ -16,7 +16,7 @@ class Rubytter
     end
   end
 
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 
   attr_reader :login
   attr_accessor :host, :header
@@ -101,31 +101,51 @@ class Rubytter
     send_direct_message(params.merge({:user => user, :text => text}))
   end
 
-  def search(query, params = {})
-    path = '/search.json'
-    param_str = '?' + to_param_str(params.merge({:q => query}))
-    path = path + param_str unless param_str.empty?
-    req = create_request(Net::HTTP::Get.new(path), false)
-    http_request("search.#{@host}", req)
-  end
-
   def get(path, params = {})
     path += '.json'
     param_str = '?' + to_param_str(params)
     path = path + param_str unless param_str.empty?
     req = create_request(Net::HTTP::Get.new(path))
-    http_request(@host, req)
+    json_to_struct(http_request(@host, req))
   end
 
   def post(path, params = {})
     path += '.json'
     param_str = to_param_str(params)
     req = create_request(Net::HTTP::Post.new(path))
-    http_request(@host, req, param_str)
+    json_to_struct(http_request(@host, req, param_str))
   end
-
   alias delete post
 
+  def search(query, params = {})
+    path = '/search.json'
+    param_str = '?' + to_param_str(params.merge({:q => query}))
+    path = path + param_str unless param_str.empty?
+    req = create_request(Net::HTTP::Get.new(path), false)
+    json_data = http_request("search.#{@host}", req)
+    json_to_struct(
+      json_data['results'].map do |result|
+        search_result_to_struct(result)
+      end
+    )
+  end
+
+  def search_result_to_struct(json)
+    {
+      'id' => json['id'],
+      'text' => json['text'],
+      'source' => CGI.unescapeHTML(json['source']),
+      'in_reply_to_user_id' => json['to_usre_id'],
+      'in_reply_to_screen_name' => json['to_usre'],
+      'in_reply_to_status_id' => nil,
+      'user' => {
+        'id' => json['from_user_id'],
+        'screen_name' => json['from_user'],
+        'profile_image_url' => json['profile_image_url']
+      }
+    }
+  end
+
   def http_request(host, req, param_str = nil)
     res = @connection.start(host) do |http|
       if param_str
@@ -134,12 +154,12 @@ class Rubytter
         http.request(req)
       end
     end
-    struct = json_to_struct(JSON.parse(res.body))
+    json_data = JSON.parse(res.body)
     case res.code
     when "200"
-      struct
+      json_data
     else
-      raise APIError.new(struct.error, res)
+      raise APIError.new(json_data['error'], res)
     end
   end
 

data/spec/rubytter_spec.rb

@@ -113,6 +113,7 @@ class Rubytter
       @rubytter.should_receive(:http_request) do |host, req, param_str|
         req.path.should == '/search.json?q=test'
         host.should == 'search.twitter.com'
+        {'results' => []}
       end
       @rubytter.search('test')
     end
@@ -122,13 +123,13 @@ class Rubytter
         req.path.should =~ /\/search.json\?/
         req.path.should =~ /q=test/
         req.path.should =~ /lang=ja/
+        {'results' => []}
       end
       @rubytter.search('test', :lang => 'ja')
     end
 
     it 'should respond to to_param_str' do
       param_str = @rubytter.to_param_str(:page => 2, :foo => 'bar')
-      p param_str
       param_str.should =~ /^.+?=.+?&.+?=.+?$/
       param_str.should =~ /page=2/
       param_str.should =~ /foo=bar/
@@ -197,5 +198,46 @@ class Rubytter
       rubytter.should_receive(:__update_status).with({:status => 'test', :source => "Foo"})
       rubytter.update('test')
     end
+
+    it 'should convert search results to struct' do
+      json_data = {
+        'id' => '123',
+        'text' => 'foo foo bar bar',
+        'source' => '<a href="http:\/\/twitter.com\/">web<\/a>',
+        'to_usre_id' => '20660692',
+        'to_usre' => 'jugyo_test',
+        'from_user_id' => '3748631',
+        'from_user' => 'jugyo',
+        'profile_image_url' => 'http://s3.amazonaws.com/twitter_production/profile_images/63467667/megane2_normal.png'
+      }
+      rubytter = Rubytter.new('test', 'teat')
+      result = rubytter.search_result_to_struct(json_data)
+      result['id'].should == '123'
+      result['text'].should == 'foo foo bar bar'
+      result['source'].should == "<a href=\"http:\\/\\/twitter.com\\/\">web<\\/a>"
+      result['in_reply_to_user_id'].should == '20660692'
+      result['in_reply_to_screen_name'].should == 'jugyo_test'
+      result['user']['id'].should == '3748631'
+      result['user']['screen_name'].should == 'jugyo'
+      result['user']['profile_image_url'].should == 'http://s3.amazonaws.com/twitter_production/profile_images/63467667/megane2_normal.png'
+    end
+
+    it 'should work search' do
+      json_data = JSON.parse open(File.dirname(__FILE__) + '/search.json').read
+
+      @rubytter.stub!(:http_request).and_return(json_data)
+      statuses = @rubytter.search('termtter')
+      status = statuses[0]
+
+      status.id.should == 1365281728
+      status.source.should == "<a href=\"http://twitter.com/\">web</a>"
+      status.text.should == "よし、add_hook 呼んでるところが無くなった #termtter"
+      status.in_reply_to_user_id.should == nil
+      status.in_reply_to_screen_name.should == nil
+      status.in_reply_to_status_id.should == nil
+      status.user.id.should == 74941
+      status.user.screen_name.should == "jugyo"
+      status.user.profile_image_url.should == "http://s3.amazonaws.com/twitter_production/profile_images/63467667/megane2_normal.png"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubytter
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - jugyo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-19 00:00:00 +09:00
+date: 2009-03-21 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency