rubytter 0.7.0 → 0.8.0

data/README.rdoc

@@ -56,6 +56,7 @@ or
 
  client = OAuthRubytter.new(access_token)
 
+It required a 'oauth' library.
 You must specify valid instance of OAuth::AccessToken as acces_token.
 
 === update status:

data/lib/rubytter.rb

@@ -9,7 +9,7 @@ require 'rubytter/oauth_rubytter'
 
 class Rubytter
 
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 
   class APIError < StandardError
     attr_reader :response
@@ -212,6 +212,25 @@ class Rubytter
         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

data/spec/rubytter_spec.rb

@@ -193,6 +193,52 @@ class Rubytter
       struct.regex.should == nil
     end
 
+    it 'should convert struct to hash' do
+      hash = {
+        :a => 'a',
+        'b' => 1,
+        1 => 'a',
+        /regex/ => 'regex',
+        nil => nil,
+        :c => {:a => 1, :b => 2},
+        :d => {:a => {:a => 1, :b => 2}, :b => 1},
+        :e => [{:a => 1, :b => 2}, {:c => '"<>&'}]
+      }
+      struct = Rubytter.json_to_struct(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
+      hash = {
+        :e => [{:a => 1, :b => 2}, {:c => '&quot;&lt;&gt;&amp;'}]
+      }
+      struct = Rubytter.json_to_struct(hash)
+      struct.to_hash(true).should == {"e"=>[{"a"=>1, "b"=>2}, {"c"=>"&quot;&lt;&gt;&amp;"}]}
+    end
+
+    it 'should convert struct to json' do
+      hash = {
+        :a => 'a',
+        'b' => 1,
+        1 => 'a',
+        /regex/ => 'regex',
+        nil => nil,
+        :c => {:a => 1, :b => 2},
+        :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.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
+      hash = {
+        :e => [{:a => 1, :b => 2}, {:c => '&quot;&lt;&gt;&amp;'}]
+      }
+      struct = Rubytter.json_to_struct(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 == 
@@ -252,21 +298,21 @@ class Rubytter
     it 'should post using access_token' do
       access_token = Object.new
       rubytter = OAuthRubytter.new(access_token)
-      access_token.should_receive(:post).with('/statuses/update.json', {:status => 'test'}, {"User-Agent"=>"Rubytter/0.6.6 (http://github.com/jugyo/rubytter)"})
+      access_token.should_receive(:post).with('/statuses/update.json', {:status => 'test'}, {"User-Agent"=>"Rubytter/#{Rubytter::VERSION} (http://github.com/jugyo/rubytter)"})
       rubytter.update('test')
     end
 
     it 'should get using access_token' do
       access_token = Object.new
       rubytter = OAuthRubytter.new(access_token)
-      access_token.should_receive(:get).with('/statuses/friends_timeline.json', {}, {"User-Agent"=>"Rubytter/0.6.6 (http://github.com/jugyo/rubytter)"})
+      access_token.should_receive(:get).with('/statuses/friends_timeline.json', {}, {"User-Agent"=>"Rubytter/#{Rubytter::VERSION} (http://github.com/jugyo/rubytter)"})
       rubytter.friends_timeline
     end
 
     it 'should get with params using access_token' do
       access_token = Object.new
       rubytter = OAuthRubytter.new(access_token)
-      access_token.should_receive(:get).with('/statuses/friends_timeline.json', {:page => 2}, {"User-Agent"=>"Rubytter/0.6.6 (http://github.com/jugyo/rubytter)"})
+      access_token.should_receive(:get).with('/statuses/friends_timeline.json', {:page => 2}, {"User-Agent"=>"Rubytter/#{Rubytter::VERSION} (http://github.com/jugyo/rubytter)"})
       rubytter.friends_timeline(:page => 2)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubytter
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - jugyo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-06 00:00:00 +09:00
+date: 2009-06-16 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency