sucker 1.3.0.pre.2 → 1.3.0.pre.3

data/lib/sucker/response.rb

@@ -1,10 +1,10 @@
-# encoding: utf-8
+require 'nokogiri'
+require 'sucker/parameters'
+require 'sucker/response/hash'
 
-require 'active_support/xml_mini/nokogiri'
+module Sucker
 
-module Sucker #:nodoc:
-
-  # A Nokogiri-based wrapper around the response
+  # A wrapper around the response
   class Response
 
     # The response body
@@ -29,21 +29,19 @@ module Sucker #:nodoc:
     #   items = response.find('Item')
     #
     def find(path)
-      xml.xpath("//xmlns:#{path}").map { |e| strip_content(e.to_hash[path]) }
+      xml.xpath("//xmlns:#{path}").map { |element| Hash.from_xml(element) }
     end
 
+    alias_method :[], :find
+
     # Returns true if response contains errors
     def has_errors?
       errors.count > 0
     end
 
     # Parses response into a simple hash
-    #
-    #   response = worker.get
-    #   response.to_hash
-    #
     def to_hash
-      strip_content(xml.to_hash)
+      Hash.from_xml(xml)
     end
 
     # Checks if the HTTP response is OK
@@ -63,26 +61,5 @@ module Sucker #:nodoc:
     def xml
       @xml ||= Nokogiri::XML(body)
     end
-
-    private
-
-    # Massage hash
-    def strip_content(node)
-      case node
-      when Array
-        node.map { |child| strip_content(child) }
-      when Hash
-        if node.keys.size == 1 && node['__content__']
-          node['__content__']
-        else
-          node.inject({}) do |attributes, kv|
-            k, v = kv
-            attributes.merge({ k => strip_content(v) })
-          end
-        end
-      else
-        node
-      end
-    end
   end
 end

data/lib/sucker/response.rbc

@@ -0,0 +1,1319 @@
+!RBIX
+0
+x
+M
+1
+n
+n
+x
+10
+__script__
+i
+37
+5
+7
+0
+64
+47
+49
+1
+1
+15
+99
+7
+2
+65
+49
+3
+2
+13
+99
+12
+7
+4
+12
+7
+5
+12
+65
+12
+49
+6
+4
+15
+49
+4
+0
+15
+2
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+7
+s
+32
+active_support/xml_mini/nokogiri
+x
+7
+require
+x
+6
+Sucker
+x
+11
+open_module
+x
+15
+__module_init__
+M
+1
+n
+n
+x
+6
+Sucker
+i
+29
+5
+66
+99
+7
+0
+1
+65
+49
+1
+3
+13
+99
+12
+7
+2
+12
+7
+3
+12
+65
+12
+49
+4
+4
+15
+49
+2
+0
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+5
+x
+8
+Response
+x
+10
+open_class
+x
+14
+__class_init__
+M
+1
+n
+n
+x
+8
+Response
+i
+134
+5
+66
+5
+7
+0
+47
+49
+1
+1
+15
+5
+7
+2
+47
+49
+1
+1
+15
+99
+7
+3
+7
+4
+65
+67
+49
+5
+0
+49
+6
+4
+15
+99
+7
+7
+7
+8
+65
+67
+49
+5
+0
+49
+6
+4
+15
+99
+7
+9
+7
+10
+65
+67
+49
+5
+0
+49
+6
+4
+15
+99
+7
+11
+7
+12
+65
+67
+49
+5
+0
+49
+6
+4
+15
+99
+7
+13
+7
+14
+65
+67
+49
+5
+0
+49
+6
+4
+15
+99
+7
+15
+7
+16
+65
+67
+49
+5
+0
+49
+6
+4
+15
+99
+7
+17
+7
+18
+65
+67
+49
+5
+0
+49
+6
+4
+15
+5
+48
+19
+15
+99
+7
+20
+7
+21
+65
+67
+49
+5
+0
+49
+6
+4
+11
+I
+5
+I
+0
+I
+0
+I
+0
+n
+p
+22
+x
+4
+body
+x
+13
+attr_accessor
+x
+4
+code
+x
+10
+initialize
+M
+1
+n
+n
+x
+10
+initialize
+i
+30
+5
+20
+0
+49
+0
+0
+13
+18
+2
+47
+49
+1
+1
+15
+15
+5
+20
+0
+49
+2
+0
+13
+18
+2
+47
+49
+3
+1
+15
+11
+I
+4
+I
+1
+I
+1
+I
+1
+n
+p
+4
+x
+4
+body
+x
+5
+body=
+x
+4
+code
+x
+5
+code=
+p
+11
+I
+-1
+I
+10
+I
+0
+I
+58
+I
+1
+I
+11
+I
+f
+I
+58
+I
+10
+I
+12
+I
+1e
+x
+53
+/Users/hakanensari/code/sucker/lib/sucker/response.rb
+p
+1
+x
+8
+response
+x
+17
+method_visibility
+x
+15
+add_defn_method
+x
+6
+errors
+M
+1
+n
+n
+x
+6
+errors
+i
+9
+5
+7
+0
+64
+47
+49
+1
+1
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
+p
+2
+s
+5
+Error
+x
+4
+find
+p
+5
+I
+-1
+I
+16
+I
+0
+I
+17
+I
+9
+x
+53
+/Users/hakanensari/code/sucker/lib/sucker/response.rb
+p
+0
+x
+4
+find
+M
+1
+n
+n
+x
+4
+find
+i
+21
+5
+48
+0
+7
+1
+20
+0
+47
+101
+2
+63
+2
+49
+3
+1
+56
+4
+50
+5
+0
+11
+I
+4
+I
+1
+I
+1
+I
+1
+n
+p
+6
+x
+3
+xml
+s
+8
+//xmlns:
+x
+4
+to_s
+x
+5
+xpath
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+4
+find
+i
+21
+57
+19
+0
+15
+5
+20
+0
+49
+0
+0
+21
+1
+0
+49
+1
+1
+47
+49
+2
+1
+11
+I
+5
+I
+1
+I
+1
+I
+1
+n
+p
+3
+x
+7
+to_hash
+x
+2
+[]
+x
+13
+strip_content
+p
+3
+I
+0
+I
+20
+I
+15
+x
+53
+/Users/hakanensari/code/sucker/lib/sucker/response.rb
+p
+1
+x
+1
+e
+x
+3
+map
+p
+5
+I
+-1
+I
+1f
+I
+0
+I
+20
+I
+15
+x
+53
+/Users/hakanensari/code/sucker/lib/sucker/response.rb
+p
+1
+x
+4
+path
+x
+11
+has_errors?
+M
+1
+n
+n
+x
+11
+has_errors?
+i
+10
+5
+48
+0
+49
+1
+0
+78
+85
+2
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
+p
+3
+x
+6
+errors
+x
+5
+count
+x
+1
+>
+p
+5
+I
+-1
+I
+24
+I
+0
+I
+25
+I
+a
+x
+53
+/Users/hakanensari/code/sucker/lib/sucker/response.rb
+p
+0
+x
+7
+to_hash
+M
+1
+n
+n
+x
+7
+to_hash
+i
+12
+5
+5
+48
+0
+49
+1
+0
+47
+49
+2
+1
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
+p
+3
+x
+3
+xml
+x
+7
+to_hash
+x
+13
+strip_content
+p
+5
+I
+-1
+I
+2d
+I
+0
+I
+2e
+I
+c
+x
+53
+/Users/hakanensari/code/sucker/lib/sucker/response.rb
+p
+0
+x
+6
+valid?
+M
+1
+n
+n
+x
+6
+valid?
+i
+9
+5
+48
+0
+7
+1
+64
+83
+2
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
+p
+3
+x
+4
+code
+s
+3
+200
+x
+2
+==
+p
+5
+I
+-1
+I
+37
+I
+0
+I
+38
+I
+9
+x
+53
+/Users/hakanensari/code/sucker/lib/sucker/response.rb
+p
+0
+x
+3
+xml
+M
+1
+n
+n
+x
+3
+xml
+i
+18
+39
+0
+13
+10
+17
+15
+45
+1
+2
+5
+48
+3
+49
+4
+1
+38
+0
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
+p
+5
+x
+4
+@xml
+x
+8
+Nokogiri
+n
+x
+4
+body
+x
+3
+XML
+p
+5
+I
+-1
+I
+3f
+I
+0
+I
+40
+I
+12
+x
+53
+/Users/hakanensari/code/sucker/lib/sucker/response.rb
+p
+0
+x
+7
+private
+x
+13
+strip_content
+M
+1
+n
+n
+x
+13
+strip_content
+i
+88
+20
+0
+13
+45
+0
+1
+12
+49
+2
+1
+9
+22
+15
+20
+0
+56
+3
+50
+4
+0
+8
+87
+13
+45
+5
+6
+12
+49
+2
+1
+9
+84
+15
+20
+0
+49
+7
+0
+49
+8
+0
+79
+83
+9
+13
+9
+56
+15
+20
+0
+7
+10
+64
+49
+11
+1
+9
+68
+20
+0
+7
+10
+64
+49
+11
+1
+8
+82
+20
+0
+44
+43
+5
+78
+49
+12
+1
+56
+13
+50
+14
+1
+8
+87
+15
+20
+0
+11
+I
+4
+I
+1
+I
+1
+I
+1
+n
+p
+15
+x
+5
+Array
+n
+x
+3
+===
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+13
+strip_content
+i
+12
+57
+19
+0
+15
+5
+20
+0
+47
+49
+0
+1
+11
+I
+4
+I
+1
+I
+1
+I
+1
+n
+p
+1
+x
+13
+strip_content
+p
+3
+I
+0
+I
+49
+I
+c
+x
+53
+/Users/hakanensari/code/sucker/lib/sucker/response.rb
+p
+1
+x
+5
+child
+x
+3
+map
+x
+4
+Hash
+n
+x
+4
+keys
+x
+4
+size
+x
+2
+==
+s
+11
+__content__
+x
+2
+[]
+x
+16
+new_from_literal
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+13
+strip_content
+i
+51
+58
+37
+19
+0
+15
+37
+19
+1
+15
+15
+20
+1
+97
+37
+19
+2
+15
+37
+19
+3
+15
+15
+2
+15
+20
+0
+44
+43
+0
+79
+49
+1
+1
+13
+20
+2
+5
+20
+3
+47
+49
+2
+1
+49
+3
+2
+15
+49
+4
+1
+11
+I
+b
+I
+4
+I
+2
+I
+2
+n
+p
+5
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+13
+strip_content
+x
+3
+[]=
+x
+5
+merge
+p
+7
+I
+0
+I
+4e
+I
+a
+I
+4f
+I
+18
+I
+50
+I
+33
+x
+53
+/Users/hakanensari/code/sucker/lib/sucker/response.rb
+p
+4
+x
+10
+attributes
+x
+2
+kv
+x
+1
+k
+x
+1
+v
+x
+6
+inject
+p
+19
+I
+-1
+I
+46
+I
+0
+I
+47
+I
+2
+I
+48
+I
+d
+I
+49
+I
+16
+I
+4a
+I
+21
+I
+4b
+I
+3a
+I
+4c
+I
+44
+I
+4e
+I
+55
+I
+54
+I
+58
+x
+53
+/Users/hakanensari/code/sucker/lib/sucker/response.rb
+p
+1
+x
+4
+node
+p
+23
+I
+2
+I
+b
+I
+a
+I
+e
+I
+12
+I
+10
+I
+20
+I
+16
+I
+2e
+I
+1f
+I
+3c
+I
+24
+I
+4a
+I
+2d
+I
+58
+I
+37
+I
+66
+I
+3f
+I
+74
+I
+43
+I
+78
+I
+46
+I
+86
+x
+53
+/Users/hakanensari/code/sucker/lib/sucker/response.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+2
+I
+8
+I
+1d
+x
+53
+/Users/hakanensari/code/sucker/lib/sucker/response.rb
+p
+0
+x
+13
+attach_method
+p
+5
+I
+0
+I
+3
+I
+9
+I
+5
+I
+25
+x
+53
+/Users/hakanensari/code/sucker/lib/sucker/response.rb
+p
+0