jugyo-rubytter 0.8.0 → 0.9.0

data/lib/rubytter.rb

@@ -9,7 +9,7 @@ require 'rubytter/oauth_rubytter'
 
 class Rubytter
 
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 
   class APIError < StandardError
     attr_reader :response
@@ -107,14 +107,14 @@ class Rubytter
     param_str = '?' + self.class.to_param_str(params)
     path = path + param_str unless param_str.empty?
     req = create_request(Net::HTTP::Get.new(path))
-    self.class.json_to_struct(http_request(@host, req))
+    self.class.structize(http_request(@host, req))
   end
 
   def post(path, params = {})
     path += '.json'
     param_str = self.class.to_param_str(params)
     req = create_request(Net::HTTP::Post.new(path))
-    self.class.json_to_struct(http_request(@host, req, param_str))
+    self.class.structize(http_request(@host, req, param_str))
   end
   alias delete post
 
@@ -124,7 +124,7 @@ class Rubytter
     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(
+    self.class.structize(
       json_data['results'].map do |result|
         self.class.search_result_to_hash(result)
       end
@@ -172,29 +172,45 @@ class Rubytter
     req
   end
 
-  def self.json_to_struct(json)
-    case json
+  def self.structize(data)
+    case data
     when Array
-      json.map{|i| json_to_struct(i)}
+      data.map{|i| structize(i)}
     when Hash
-      struct_values = {}
-      json.each do |k, v|
-        case k
-        when String, Symbol
-          struct_values[k.to_sym] = json_to_struct(v)
+      class << data
+        def id
+          self[:id]
+        end
+
+        def method_missing(name, *args)
+          self[name]
+        end
+
+        def symbolize_keys!
+          each do |key, value|
+            self[(key.to_sym rescue key) || key] = value
+          end
+
+          self
         end
       end
-      unless struct_values.empty?
-        get_struct(struct_values.keys).new(*struct_values.values)
-      else
-        nil
+
+      data.keys.each do |k|
+        case k
+        when String, Symbol # String しかまず来ないだろうからこの判定はいらない気もするなぁ
+          data[k] = structize(data[k])
+        else
+          data.delete(k)
+        end
       end
+
+      data.symbolize_keys!
     else
-      case json
+      case data
       when String
-        CGI.unescapeHTML(json)
+        CGI.unescapeHTML(data) # ここで unescapeHTML すべきか悩むところではある
       else
-        json
+        data
       end
     end
   end
@@ -203,37 +219,4 @@ 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)
-      struct = Struct.new(*keys)
-      struct.class_eval do
-        def method_missing(*args, &block)
-          nil
-        end
-
-        def to_hash(escape = false)
-          hash = {}
-          self.members.each do |member|
-            value = self[member]
-            if value.respond_to?(:to_hash)
-              hash[member] = value.to_hash(escape)
-            elsif value.is_a?(Array)
-              hash[member] = value.map{ |i| i.to_hash(escape) }
-            else
-              hash[member] = escape && value.is_a?(String) ? CGI.escapeHTML(value) : value
-            end
-          end
-          hash
-        end
-
-        def to_json(escape = false)
-          to_hash(escape).to_json
-        end
-      end
-      @@structs[keys] = struct
-    end
-    @@structs[keys]
-  end
 end

data/spec/rubytter_spec.rb

@@ -169,7 +169,7 @@ class Rubytter
       rubytter.header.should == {'User-Agent' => 'foo'}
     end
 
-    it 'should create struct from json' do
+    it 'should create struct from json(Hash)' do
       hash = {
         :a => 'a',
         'b' => 1,
@@ -180,7 +180,7 @@ class Rubytter
         :d => {:a => {:a => 1, :b => 2}, :b => 1},
         :e => [{:a => 1, :b => 2}, {:c => '"<>&'}]
       }
-      struct = Rubytter.json_to_struct(hash)
+      struct = Rubytter.structize(hash)
       struct.a.should == 'a'
       struct.b.should == 1
       struct.c.a.should == 1
@@ -193,7 +193,20 @@ class Rubytter
       struct.regex.should == nil
     end
 
+    it 'should create struct from json(Array)' do
+      data = [
+        {"status" => {"text" => "foo", "user" => {"screen_name" => "jugyo_foo"}}},
+        {"status" => {"text" => "bar", "user" => {"screen_name" => "jugyo_bar"}}},
+      ]
+      struct = Rubytter.structize(data)
+      struct[0].status.text.should == 'foo'
+      struct[0].status.user.screen_name.should == 'jugyo_foo'
+      struct[1].status.text.should == 'bar'
+      struct[1].status.user.screen_name.should == 'jugyo_bar'
+    end
+
     it 'should convert struct to hash' do
+      pending
       hash = {
         :a => 'a',
         'b' => 1,
@@ -204,19 +217,21 @@ class Rubytter
         :d => {:a => {:a => 1, :b => 2}, :b => 1},
         :e => [{:a => 1, :b => 2}, {:c => '"<>&'}]
       }
-      struct = Rubytter.json_to_struct(hash)
+      struct = Rubytter.structize(hash)
       struct.to_hash.should == {"a"=>"a", "b"=>1, "c"=>{"a"=>1, "b"=>2}, "d"=>{"a"=>{"a"=>1, "b"=>2}, "b"=>1}, "e"=>[{"a"=>1, "b"=>2}, {"c"=>"\"<>&"}]}
     end
 
     it 'should convert struct to hash with escape as HTML' do
+      pending
       hash = {
         :e => [{:a => 1, :b => 2}, {:c => '&quot;&lt;&gt;&amp;'}]
       }
-      struct = Rubytter.json_to_struct(hash)
+      struct = Rubytter.structize(hash)
       struct.to_hash(true).should == {"e"=>[{"a"=>1, "b"=>2}, {"c"=>"&quot;&lt;&gt;&amp;"}]}
     end
 
     it 'should convert struct to json' do
+      pending
       hash = {
         :a => 'a',
         'b' => 1,
@@ -227,22 +242,23 @@ class Rubytter
         :d => {:a => {:a => 1, :b => 2}, :b => 1},
         :e => [{:a => 1, :b => 2}, {:c => '&quot;&lt;&gt;&amp;'}]
       }
-      struct = Rubytter.json_to_struct(hash)
+      struct = Rubytter.structize(hash)
       struct.to_json.should == '{"a":"a","b":1,"c":{"a":1,"b":2},"d":{"a":{"a":1,"b":2},"b":1},"e":[{"a":1,"b":2},{"c":"\"<>&"}]}'
     end
 
     it 'should convert struct to json with escape as HTML' do
+      pending
       hash = {
         :e => [{:a => 1, :b => 2}, {:c => '&quot;&lt;&gt;&amp;'}]
       }
-      struct = Rubytter.json_to_struct(hash)
+      struct = Rubytter.structize(hash)
       struct.to_json(true).should == '{"e":[{"a":1,"b":2},{"c":"&quot;&lt;&gt;&amp;"}]}'
     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'}})
+      Rubytter.structize({:a => 'a'}).should == Rubytter.structize({:a => 'a'})
+      Rubytter.structize({:a => 'a', :b => {:c => 'c'}}).should == 
+        Rubytter.structize({:a => 'a', :b => {:c => 'c'}})
     end
 
     it 'should be set app_name' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jugyo-rubytter
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - jugyo
@@ -52,6 +52,7 @@ files:
 - Rakefile
 has_rdoc: true
 homepage: http://github.com/jugyo/rubytter
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -75,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubytter
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Simple twitter client.