jugyo-rubytter 0.5.0 → 0.6.3

data/Rakefile

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.description = "Rubytter is a simple twitter client."
   s.files = %w( #{Dir['lib/**/*.rb'].join(' ')}
                 #{Dir['spec/**/*.rb'].join(' ')}
+                #{Dir['spec/**/*.json'].join(' ')}
                 #{Dir['examples/**/*.rb'].join(' ')}
                 README.rdoc
                 History.txt

data/examples/search.rb

@@ -4,6 +4,6 @@ require 'rubygems'
 require 'rubytter'
 
 client = Rubytter.new
-client.search(ARGV[0] || 'rubytter').results.each do |status|
-  puts "#{status.from_user}: #{status.text}"
+client.search(ARGV[0] || 'rubytter').each do |status|
+  puts "#{status.user.screen_name}: #{status.text}"
 end

data/lib/rubytter.rb

@@ -16,7 +16,7 @@ class Rubytter
     end
   end
 
-  VERSION = '0.5.0'
+  VERSION = '0.6.3'
 
   attr_reader :login
   attr_accessor :host, :header
@@ -101,31 +101,53 @@ 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)
+    param_str = '?' + self.class.to_param_str(params)
     path = path + param_str unless param_str.empty?
     req = create_request(Net::HTTP::Get.new(path))
-    http_request(@host, req)
+    self.class.json_to_struct(http_request(@host, req))
   end
 
   def post(path, params = {})
     path += '.json'
-    param_str = to_param_str(params)
+    param_str = self.class.to_param_str(params)
     req = create_request(Net::HTTP::Post.new(path))
-    http_request(@host, req, param_str)
+    self.class.json_to_struct(http_request(@host, req, param_str))
   end
-
   alias delete post
 
+  def search(query, params = {})
+    path = '/search.json'
+    param_str = '?' + self.class.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)
+    self.class.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']),
+      'created_at' => json['created_at'],
+      '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'],
+        'name' => nil,
+        '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 +156,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
 
@@ -149,7 +171,7 @@ class Rubytter
     req
   end
 
-  def json_to_struct(json)
+  def self.json_to_struct(json)
     case json
     when Array
       json.map{|i| json_to_struct(i)}
@@ -171,7 +193,7 @@ class Rubytter
     end
   end
 
-  def to_param_str(hash)
+  def self.to_param_str(hash)
     raise ArgumentError, 'Argument must be a Hash object' unless hash.is_a?(Hash)
     hash.to_a.map{|i| i[0].to_s + '=' + CGI.escape(i[1].to_s) }.join('&')
   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,22 +123,22 @@ 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 = Rubytter.to_param_str(:page => 2, :foo => 'bar')
       param_str.should =~ /^.+?=.+?&.+?=.+?$/
       param_str.should =~ /page=2/
       param_str.should =~ /foo=bar/
     end
 
     it 'should raise when call to_param_str with invalid arg' do
-      lambda { @rubytter.to_param_str(nil) }.should raise_error(ArgumentError)
-      lambda { @rubytter.to_param_str('foo') }.should raise_error(ArgumentError)
-      lambda { @rubytter.to_param_str(:bar) }.should raise_error(ArgumentError)
+      lambda { Rubytter.to_param_str(nil) }.should raise_error(ArgumentError)
+      lambda { Rubytter.to_param_str('foo') }.should raise_error(ArgumentError)
+      lambda { Rubytter.to_param_str(:bar) }.should raise_error(ArgumentError)
     end
 
     it 'should set default header' do
@@ -179,7 +180,7 @@ class Rubytter
         :d => {:a => {:a => 1, :b => 2}, :b => 1},
         :e => [{:a => 1, :b => 2}, {:c => 3}]
       }
-      struct = @rubytter.json_to_struct(hash)
+      struct = Rubytter.json_to_struct(hash)
       struct.a.should == 'a'
       struct.b.should == 1
       struct.c.a.should == 1
@@ -197,5 +198,49 @@ 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',
+        'created_at' => 'Sat, 21 Mar 2009 09:48:20 +0000',
+        '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['created_at'].should == 'Sat, 21 Mar 2009 09:48:20 +0000'
+      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.text.should == "よし、add_hook 呼んでるところが無くなった #termtter"
+      status.created_at.should == "Sat, 21 Mar 2009 09:48:20 +0000"
+      status.source.should == "<a href=\"http://twitter.com/\">web</a>"
+      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

data/spec/search.json

@@ -0,0 +1 @@
+{"results":[{"text":"\u3088\u3057\u3001add_hook \u547c\u3093\u3067\u308b\u3068\u3053\u308d\u304c\u7121\u304f\u306a\u3063\u305f #termtter","to_user_id":null,"from_user":"jugyo","id":1365281728,"from_user_id":74941,"iso_language_code":"ja","source":"<a href="http:\/\/twitter.com\/">web<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/63467667\/megane2_normal.png","created_at":"Sat, 21 Mar 2009 09:48:20 +0000"},{"text":"[termtter] http:\/\/bit.ly\/9sOWQ jugyo - Changed to use register_hook.","to_user_id":null,"from_user":"termtter","id":1365279197,"from_user_id":3422637,"iso_language_code":"en","source":"<a href="http:\/\/github.com">GitHub<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/69965634\/termtter_normal.jpg","created_at":"Sat, 21 Mar 2009 09:46:51 +0000"},{"text":"test for msagent plugin of termtter","to_user_id":null,"from_user":"jugyo","id":1365258802,"from_user_id":74941,"iso_language_code":"no","source":"<a href="http:\/\/github.com\/jugyo\/termtter">Termtter<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/63467667\/megane2_normal.png","created_at":"Sat, 21 Mar 2009 09:35:24 +0000"},{"text":"termtter -e 'update \u5bdd\u308b' \u307f\u305f\u3044\u306a\u611f\u3058\u3067\u30b3\u30de\u30f3\u30c9\u5b9f\u884c\u3067\u304d\u305f\u3089\u4fbf\u5229\u304b\u306a\u3041","to_user_id":null,"from_user":"jugyo","id":1365097088,"from_user_id":74941,"iso_language_code":"ja","source":"<a href="http:\/\/twitterfon.net\/">TwitterFon<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/63467667\/megane2_normal.png","created_at":"Sat, 21 Mar 2009 08:05:57 +0000"},{"text":"Web \u4e0a\u306e\u3069\u3063\u304b\u3057\u3089\u306b\u30b0\u30eb\u30fc\u30d7\u60c5\u5831\u3092\u7f6e\u3044\u3066\u304a\u3051\u308c\u3070 #termtter","to_user_id":null,"from_user":"jugyo","id":1364954500,"from_user_id":74941,"iso_language_code":"ja","source":"<a href="http:\/\/twitterfon.net\/">TwitterFon<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/63467667\/megane2_normal.png","created_at":"Sat, 21 Mar 2009 06:54:59 +0000"},{"text":"notify-send \u30d7\u30e9\u30b0\u30a4\u30f3\u3092\u4fee\u6b63 #termtter","to_user_id":null,"from_user":"jugyo","id":1364802582,"from_user_id":74941,"iso_language_code":"en","source":"<a href="http:\/\/github.com\/jugyo\/termtter">Termtter<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/63467667\/megane2_normal.png","created_at":"Sat, 21 Mar 2009 05:51:35 +0000"},{"text":"[termtter] http:\/\/bit.ly\/1e3ExY jugyo - Changed to use register_hook.","to_user_id":null,"from_user":"termtter","id":1364800822,"from_user_id":3422637,"iso_language_code":"en","source":"<a href="http:\/\/github.com">GitHub<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/69965634\/termtter_normal.jpg","created_at":"Sat, 21 Mar 2009 05:50:52 +0000"},{"text":"@beatinaniwa termtter!\u30b0\u30eb\u30fc\u30d7\u5316\u30d7\u30e9\u30b0\u30a4\u30f3\u304c\u3042\u308a\u307e\u3059\u3088\uff0e  http:\/\/d.hatena.ne.jp\/hakobe932\/20090107\/1231327037","to_user_id":8021,"to_user":"beatinaniwa","from_user":"yaotti","id":1364768285,"from_user_id":31813,"iso_language_code":"ja","source":"<a href="http:\/\/twitter.com\/">web<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/81045219\/cat_normal.jpg","created_at":"Sat, 21 Mar 2009 05:38:29 +0000"},{"text":"termtter","to_user_id":null,"from_user":"keisuke_n","id":1364718890,"from_user_id":60906,"source":"<a href="http:\/\/twitter.com\/">web<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/103481443\/ke-s_normal.png","created_at":"Sat, 21 Mar 2009 05:20:17 +0000"},{"text":"[termtter] http:\/\/bit.ly\/HqTT hitode909 - made load command(this command loads history)","to_user_id":null,"from_user":"termtter","id":1364347378,"from_user_id":3422637,"iso_language_code":"en","source":"<a href="http:\/\/github.com">GitHub<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/69965634\/termtter_normal.jpg","created_at":"Sat, 21 Mar 2009 03:31:32 +0000"},{"text":"[termtter] http:\/\/bit.ly\/1px3BJ hitode909 - group\u306e\u51e6\u7406\u3092\u9ad8\u901f\u5316(\u30e6\u30fc\u30b6\u30fc\u3054\u3068\u306e\u30ed\u30b0\u3092\u30de\u30fc\u30b8\u3059\u308b\u5f62\u306b\u3057\u305f)","to_user_id":null,"from_user":"termtter","id":1364173363,"from_user_id":3422637,"iso_language_code":"ja","source":"<a href="http:\/\/github.com">GitHub<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/69965634\/termtter_normal.jpg","created_at":"Sat, 21 Mar 2009 02:47:09 +0000"},{"text":"[termtter] http:\/\/bit.ly\/l2bs6 hitode909 - limit\u3067ERB\u3092\u4f7f\u3046\u3088\u3046\u306b","to_user_id":null,"from_user":"termtter","id":1363634232,"from_user_id":3422637,"iso_language_code":"pt","source":"<a href="http:\/\/github.com">GitHub<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/69965634\/termtter_normal.jpg","created_at":"Sat, 21 Mar 2009 00:36:12 +0000"},{"text":"[termtter] http:\/\/bit.ly\/Myzz hitode909 - made "get_group_of" method.","to_user_id":null,"from_user":"termtter","id":1363634196,"from_user_id":3422637,"iso_language_code":"en","source":"<a href="http:\/\/github.com">GitHub<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/69965634\/termtter_normal.jpg","created_at":"Sat, 21 Mar 2009 00:36:12 +0000"},{"text":"[termtter] http:\/\/bit.ly\/4QDvO hitode909 - update_editor\u306eid\u88dc\u5b8c\u3092\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u6709\u52b9\u306b","to_user_id":null,"from_user":"termtter","id":1362078582,"from_user_id":3422637,"iso_language_code":"nl","source":"<a href="http:\/\/github.com">GitHub<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/69965634\/termtter_normal.jpg","created_at":"Fri, 20 Mar 2009 19:18:26 +0000"},{"text":"[termtter] http:\/\/bit.ly\/e0J2 hitode909 - url_addspace\u304c\u52d5\u304b\u306a\u304b\u3063\u305f\u306e\u3092\u4fee\u6b63","to_user_id":null,"from_user":"termtter","id":1362078539,"from_user_id":3422637,"iso_language_code":"es","source":"<a href="http:\/\/github.com">GitHub<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/69965634\/termtter_normal.jpg","created_at":"Fri, 20 Mar 2009 19:18:25 +0000"}],"since_id":0,"max_id":1365281728,"refresh_url":"?since_id=1365281728&q=termtter","results_per_page":15,"next_page":"?page=2&max_id=1365281728&q=termtter","completed_in":0.017248,"page":1,"query":"termtter"}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jugyo-rubytter
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.3
 platform: ruby
 authors: 
 - jugyo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-25 00:00:00 -08:00
+date: 2009-03-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,6 +36,7 @@ files:
 - lib/rubytter.rb
 - spec/rubytter_spec.rb
 - spec/spec_helper.rb
+- spec/search.json
 - examples/direct_message.rb
 - examples/favorite.rb
 - examples/follow.rb