agent_cooper 0.0.7 → 0.0.8

data/agent_cooper.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "agent_cooper"
 
   runtime_dependencies = {
+    "eggnog"     => "~> 0.0.2",
     "httpclient" => "~> 2.2.3",
     "nokogiri"   => "~> 1.5.5",
     "virtus"     => "~> 0.5.1"

data/lib/agent_cooper.rb

@@ -1,4 +1,5 @@
 require 'nokogiri'
+require 'eggnog'
 require 'httpclient'
 require 'virtus'
 require 'cgi'
@@ -11,7 +12,6 @@ end
 
 require 'agent_cooper/config'
 require 'agent_cooper/response'
-require 'agent_cooper/utils/hash'
 
 require 'agent_cooper/request'
 require 'agent_cooper/requests/finder'

data/lib/agent_cooper/response.rb

@@ -11,13 +11,13 @@ module AgentCooper
     end
 
     # @api public
-    def to_hash(options = {})
-      AgentCooper::Utils::Hash.from_xml(xml, options)
+    def code
+      response.code
     end
 
     # @api public
-    def code
-      response.code
+    def to_hash(options = {})
+      xml.to_hash(options)
     end
 
     # @api public

data/lib/agent_cooper/version.rb

@@ -1,3 +1,3 @@
 module AgentCooper
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/agent_cooper/response_spec.rb

@@ -4,22 +4,14 @@ describe AgentCooper::Response do
 
   subject { described_class.new(:response => response) }
 
-  let(:body) { "<root><foo>bar</foo></root>" }
+  let(:body) { "<root><foo baz="">Some Text</foo></root>" }
   let(:code) { 200 }
 
   let(:response) { mock(:response, :body => body, :code => code) }
 
   its(:body)    { should eql(body) }
   its(:code)    { should eql(code) }
-
-  its(:to_hash) { should eql({"root" => {"foo" => "bar"}}) }
-
-  context "when options are passed" do
-    specify "preserve_attributes" do
-      subject.to_hash(:preserve_attributes => true).should eql({"root" => {"foo" => {"__content__" => "bar"}}})
-    end
-  end
-
+  its(:to_hash) { should be_a(Hash)}
   its(:xml)     { should be_a(Nokogiri::XML::Document) }
   its(:valid?)  { should be_true }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: agent_cooper
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-01 00:00:00.000000000 Z
+date: 2012-07-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: eggnog
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -171,7 +187,6 @@ files:
 - lib/agent_cooper/requests/shopper.rb
 - lib/agent_cooper/response.rb
 - lib/agent_cooper/synchrony.rb
-- lib/agent_cooper/utils/hash.rb
 - lib/agent_cooper/version.rb
 - spec/agent_cooper/config_spec.rb
 - spec/agent_cooper/request_spec.rb

data/lib/agent_cooper/utils/hash.rb

@@ -1,94 +0,0 @@
-module AgentCooper
-  module Utils
-    class Hash
-      def self.from_xml(xml, options)
-        unless xml.is_a?(Nokogiri::XML::Node)
-          raise ArgumentError, "`xml` must be an instance of Nokogiri::XML::Node"
-        end
-
-        doc = XMLDocumentDecorator.new(xml, options)
-
-        doc.to_hash
-      end
-
-      class XMLDocumentDecorator
-        def initialize(document, options)
-          @document, @options = document, options
-        end
-
-        def to_hash
-          root.to_hash
-        end
-
-        def root
-          XMLNodeDecorator.new(document.root, options)
-        end
-
-        def method_missing(m, *args)
-          document.send(m, *args)
-        end
-
-        private
-
-        attr_reader :document, :options
-      end
-
-      class XMLNodeDecorator
-        CONTENT_ROOT = '__content__'.freeze
-
-        def initialize(node, options)
-          @node, @options = node, options
-        end
-
-        def to_hash(hash = {})
-          node_hash = {}
-
-          # Insert node hash into parent hash correctly
-          case hash[name]
-            when Array then hash[name] << node_hash
-            when Hash  then hash[name] = [hash[name], node_hash]
-            when nil   then hash[name] = node_hash
-          end
-
-          # Handle child elements
-          children.each do |c|
-            child = XMLNodeDecorator.new(c, options)
-
-            if child.element?
-              child.to_hash(node_hash)
-            elsif child.text? || child.cdata?
-              unless preserve_attributes?
-                hash[name] = child.content
-              else
-                node_hash[CONTENT_ROOT] ||= ''
-                node_hash[CONTENT_ROOT] << child.content
-              end
-            end
-          end
-
-          # Remove content node if it is blank and there are child tags
-          if node_hash.length > 1 && node_hash[CONTENT_ROOT].empty?
-            node_hash.delete(CONTENT_ROOT)
-          end
-
-          # Handle attributes
-          attribute_nodes.each {|a| node_hash[a.node_name] = a.value }
-
-          hash
-        end
-
-        def method_missing(m, *args)
-          node.send(m, *args)
-        end
-
-        private
-
-        def preserve_attributes?
-          options.fetch(:preserve_attributes) { false }
-        end
-
-        attr_reader :node, :options
-      end
-    end
-  end
-end