oa_test 0.0.3 → 0.0.4

data/bin/oa_test

@@ -5,7 +5,7 @@ puts <<END
 How to oa_test:
 ~~~~~~~~~~~~~~~~~~~~~~~
 syntax:
-oa_test [--consumer:token/secret] --yauth:login/passwd [--return:body|boolean|object] [--host:host] [--api:path]
+oa_test [--consumer:token/secret] --yauth:login/passwd [--return:body|body_hash|boolean|object] [--host:host] [--api:path]
 
 Enjoy... 
 
@@ -30,7 +30,7 @@ if arg.size>0
   OA = oa = OAuthTest.new(
    :key    => cons[0].strip,
    :secret => cons[1].strip,
-   :return => (retrn ? retrn.to_sym : :body)
+   :return => (retrn ? retrn.split(':')[1].to_sym : :body)
   ).yauth(
    :login  => yths[0].strip,
    :passwd => yths[1].strip

data/lib/oa_test/from_jsonxml.rb

@@ -0,0 +1,55 @@
+require 'xml/libxml'
+# adapted from 
+# http://movesonrails.com/articles/2008/02/25/libxml-for-active-resource-2-0
+
+class Hash 
+  class << self
+        def from_json(str)
+          JSON.parse(str)
+        end
+        
+        def from_xml(xml, strict=true) 
+          begin
+            XML.default_load_external_dtd = false
+            XML.default_pedantic_parser = strict
+            result = XML::Parser.string(xml).parse 
+            return { result.root.name.to_s => xml_node_to_hash(result.root)} 
+          rescue Exception => e
+                # raise your custom exception here
+          end
+        end 
+
+        def xml_node_to_hash(node) 
+          # If we are at the root of the document, start the hash 
+          if node.element? 
+           if node.children? 
+              result_hash = {} 
+
+              node.each_child do |child| 
+                result = xml_node_to_hash(child) 
+
+                if child.name == "text"
+                  if !child.next? and !child.prev?
+                    return result
+                  end
+                elsif result_hash[child.name]
+                    if result_hash[child.name].is_a?(Object::Array)
+                      result_hash[child.name] << result
+                    else
+                      result_hash[child.name] = [result_hash[child.name]] << result
+                    end
+                  else 
+                    result_hash[child.name] = result
+                  end
+                end
+
+              return result_hash 
+            else 
+              return nil 
+           end 
+           else 
+            return node.content.to_s 
+          end 
+        end          
+    end
+end

data/lib/oa_test/oa_test.rb

@@ -8,9 +8,9 @@ class OAuthTest
  def initialize(ks)
    @key    = ks[:key]
    @secret = ks[:secret]
-   @return = ks[:return]
-   @host   = ks[:host] ? ks[:host] : 'http://www.koprol.com'
-   @api    = ks[:api]  ? ks[:api]  : '/api/v2'
+   @return = ks[:return] 
+   @host   = ks[:host]   ? ks[:host] : 'http://www.koprol.com'
+   @api    = ks[:api]    ? ks[:api]  : '/api/v2'
    @typ    = {
      :json => {"Accept" => "application/json", "Content-Type" => "application/json"},
      :xml  => {"Accept" => "application/xml", "Content-Type" => "application/xml"},
@@ -55,17 +55,24 @@ class OAuthTest
  end
  
  def typ(path)
-   ext = path[/.(json|xml)($|\?)/,1]
-   ext = 'json' if !ext
-   @typ[ext.to_sym]
+   @ext = path[/.(json|xml)($|\?)/,1]
+   @ext = 'json' if !@ext
+   @typ[@ext.to_sym]
  end
  
  def rtn(resp)
-   if @return==nil || @return==:body
+   puts resp.class
+   if @return==nil || resp.class!=Net::HTTPOK || @return==:body
      resp.body
+   elsif @return==:body_hash && resp.class==Net::HTTPOK 
+     if @ext=='json'
+       Hash.from_json(resp.body)
+     elsif @ext=='xml'
+       Hash.from_xml(resp.body)
+     end
    elsif @return==:boolean
      resp.class==Net::HTTPOK 
-   elsif @return==:object
+   else
      resp
    end
  end

data/lib/oa_test/version.rb

@@ -1,3 +1,3 @@
 module Capykit
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oa_test
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Watchmen
@@ -19,9 +19,25 @@ date: 2011-07-22 00:00:00 +07:00
 default_executable: oa_test
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: oauth
+  name: libxml-ruby
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 1
+        - 4
+        version: 1.1.4
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: oauth
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -33,11 +49,11 @@ dependencies:
         - 1
         version: 0.4.1
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -49,11 +65,11 @@ dependencies:
         - 1
         version: 0.5.1
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: httparty
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -65,7 +81,7 @@ dependencies:
         - 1
         version: 0.6.1
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: OAuth mini test for yahoo property
 email: 
 - watchmencore@yahoo.com
@@ -76,6 +92,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/oa_test/from_jsonxml.rb
 - lib/oa_test/oa_test.rb
 - lib/oa_test/version.rb
 - lib/oa_test.rb