jugyo-rubytter 0.6.4 → 0.6.5

data/lib/rubytter.rb

@@ -16,7 +16,7 @@ class Rubytter
     end
   end
 
-  VERSION = '0.6.3'
+  VERSION = '0.6.5'
 
   attr_reader :login
   attr_accessor :host, :header
@@ -125,16 +125,16 @@ class Rubytter
     json_data = http_request("search.#{@host}", req)
     self.class.json_to_struct(
       json_data['results'].map do |result|
-        search_result_to_struct(result)
+        self.class.search_result_to_hash(result)
       end
     )
   end
 
-  def search_result_to_struct(json)
+  def self.search_result_to_hash(json)
     {
       'id' => json['id'],
       'text' => json['text'],
-      'source' => CGI.unescapeHTML(json['source']),
+      'source' => json['source'],
       'created_at' => json['created_at'],
       'in_reply_to_user_id' => json['to_usre_id'],
       'in_reply_to_screen_name' => json['to_usre'],
@@ -184,12 +184,17 @@ class Rubytter
         end
       end
       unless struct_values.empty?
-        Struct.new(*struct_values.keys).new(*struct_values.values)
+        get_struct(struct_values.keys).new(*struct_values.values)
       else
         nil
       end
     else
-      json
+      case json
+      when String
+        CGI.unescapeHTML(json)
+      else
+        json
+      end
     end
   end
 
@@ -197,4 +202,12 @@ class Rubytter
     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
+
+  def self.get_struct(keys)
+    @@structs ||= {}
+    unless @@structs.has_key?(keys)
+      @@structs[keys] = Struct.new(*keys)
+    end
+    @@structs[keys]
+  end
 end

data/spec/rubytter_spec.rb

@@ -178,7 +178,7 @@ class Rubytter
         nil => nil,
         :c => {:a => 1, :b => 2},
         :d => {:a => {:a => 1, :b => 2}, :b => 1},
-        :e => [{:a => 1, :b => 2}, {:c => 3}]
+        :e => [{:a => 1, :b => 2}, {:c => '"<>&'}]
       }
       struct = Rubytter.json_to_struct(hash)
       struct.a.should == 'a'
@@ -188,11 +188,17 @@ class Rubytter
       struct.d.a.a.should == 1
       struct.e[0].a.should == 1
       struct.e[0].b.should == 2
-      struct.e[1].c.should == 3
+      struct.e[1].c.should == '"<>&'
       lambda {struct.x}.should raise_error(NoMethodError)
       lambda {struct.regex}.should raise_error(NoMethodError)
     end
 
+    it 'should create same structs from same datas' do
+      Rubytter.json_to_struct({:a => 'a'}).should == Rubytter.json_to_struct({:a => 'a'})
+      Rubytter.json_to_struct({:a => 'a', :b => {:c => 'c'}}).should == 
+        Rubytter.json_to_struct({:a => 'a', :b => {:c => 'c'}})
+    end
+
     it 'should be set app_name' do
       rubytter = Rubytter.new('test', 'teat', :app_name => "Foo")
       rubytter.should_receive(:__update_status).with({:status => 'test', :source => "Foo"})
@@ -212,11 +218,11 @@ class Rubytter
         '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 = Rubytter.search_result_to_hash(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['source'].should == '&lt;a href=&quot;http:\/\/twitter.com\/&quot;&gt;web&lt;\/a&gt;'
       result['in_reply_to_user_id'].should == '20660692'
       result['in_reply_to_screen_name'].should == 'jugyo_test'
       result['user']['id'].should == '3748631'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jugyo-rubytter
 version: !ruby/object:Gem::Version 
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors: 
 - jugyo