malcolm 0.0.2 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ce48a7b3712eb2d682e308b30b5e3ac8153ce6c6
+  data.tar.gz: 040a16adb500ea31bb00486a95011b343f1b54c8
+SHA512:
+  metadata.gz: a86a1a211487167fb7d3a8c8b5e6894e1ea8ebd0a41474c4eaf58130b902406adf133748a6e86c75bb7e9c7fd5141740a6eddea67c9970f8414c4de1018630b1
+  data.tar.gz: d8deaf6c14307d53cc89fd877cfb87d43722adfdcef4255c33d1ea73211e929f4fb4b9be5d4e9b7e15f9c786277c7b4e1ba16f118568fc6079ed207ee553bf68

data/lib/malcolm.rb

@@ -1,13 +1,13 @@
 require 'faraday'
+require 'nori'
+require 'gyoku'
+require 'malcolm/exceptions'
 
 module Malcolm
   autoload :SOAPBuilder, 'malcolm/request/soap_builder'
   autoload :SOAPParser,  'malcolm/response/soap_parser'
 
-  Faraday.register_middleware :request,
-    :soap => SOAPBuilder
-    
-  Faraday.register_middleware :response,
-    :soap => SOAPParser
+  Faraday::Request.register_middleware soap: SOAPBuilder
 
-end
+  Faraday::Response.register_middleware soap: SOAPParser
+end

data/lib/malcolm/exceptions.rb

@@ -0,0 +1,3 @@
+module Malcolm
+  class SOAPError < Exception; end
+end

data/lib/malcolm/request/soap_builder.rb

@@ -2,23 +2,22 @@ module Malcolm
   # Request middleware that converts params to XML and wraps them in a SOAP envelope.
   #See http://www.w3.org/TR/2007/REC-soap12-part0-20070427/
   class SOAPBuilder < Faraday::Middleware
-    dependency 'xmlsimple'
-    
-    # Assumes request body is a hash of key-value pairs    
+    # Assumes request body is a hash of key-value pairs
     def call(env)
       env[:body] = wrap(env[:body])
       @app.call env
     end
-    
+
   private
-    
+
     # Builds an XML document around request data
     def wrap(data)
-      raise "Request body already serialized.  Please make sure it is a hash before applying SOAP Builder." unless data.is_a?(Hash)
       "<?xml version=\"1.0\" encoding=\"UTF-8\"?><env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\"><env:Body>".tap do |soap_envelope|
-        soap_envelope << XmlSimple.xml_out(data, :keep_root => true) if data
+        unless data.blank?
+          soap_envelope << (data.is_a?(Hash) ? Gyoku.xml(data) : data)
+        end
         soap_envelope << "</env:Body></env:Envelope>"
       end
     end
   end
-end
+end

data/lib/malcolm/response/soap_parser.rb

@@ -1,25 +1,24 @@
 module Malcolm
   # Response middleware that unwraps a SOAP envelope for you
   class SOAPParser < Faraday::Response::Middleware
-    dependency 'nori'
-    
-    Nori.configure do |config|
-      config.strip_namespaces = true
-      config.convert_tags_to { |tag| tag.snakecase.to_sym }
-    end
-    
     def initialize(env, *args)
       key = args[0]
       super(env)
     end
-  
+
     # Expects response XML to already be parsed
     def on_complete(env)
-      env[:body] = Nori.parse(env[:body])
+      env[:body] = Nori.new(
+        strip_namespaces: true,
+        convert_tags_to: ->(tag) { tag.snakecase.to_sym }
+      ).parse(env[:body])
+
+      raise SOAPError, "Invalid SOAP response" if env[:body].empty?
+
       env[:body] = env[:body][:envelope][:body]
       env[:body] = find_key_in_hash(env[:body], @key)
     end
-    
+
   private
 
     # Finds +index+ in +hash+ by searching recursively
@@ -42,6 +41,6 @@ module Malcolm
         end
       end
     end
-    
+
   end
 end

data/lib/malcolm/version.rb

@@ -0,0 +1,3 @@
+module Malcolm
+  VERSION = Version = '0.1.0'
+end

data/spec/malcolm/request/soap_builder_spec.rb

@@ -18,11 +18,20 @@ describe Malcolm::SOAPBuilder do
     xml.should include %{<test>data}
   end
   
-  it "raises if body isn't a hash" do
+  it "directly inserts string data into hash" do
     middleware = described_class.new(lambda{|env| env})
-    env = {:body => "test=data", :request_headers => Faraday::Utils::Headers.new}
-    expect { middleware.call(env) }.to raise_error
+    env = {:body => "<test>data</test>", :request_headers => Faraday::Utils::Headers.new}
+    result = middleware.call(env)
+    xml = result[:body]
+    xml.should include %{<test>data</test>}
   end
   
+  it "ignores empty data" do
+    middleware = described_class.new(lambda{|env| env})
+    env = {:body => {}, :request_headers => Faraday::Utils::Headers.new}
+    result = middleware.call(env)
+    xml = result[:body]
+    xml.should include %{<env:Body></env:Body>}    
+  end
 
 end

data/spec/malcolm/response/soap_parser_spec.rb

@@ -8,14 +8,14 @@ describe Malcolm::SOAPParser do
     res = middleware.on_complete(env)
     res.should be_a Hash
   end
-  
+
   it "drills down to body" do
     env = { :body => load_fixture("soap.xml") }
     middleware = described_class.new(lambda{|env| env})
     res = middleware.on_complete(env)
     res.keys.should_not include(:envelope)
   end
-  
+
   it "fetches given key" do
     env = { :body => load_fixture("soap.xml") }
     middleware = described_class.new(lambda{|env| env}, :item)
@@ -23,4 +23,9 @@ describe Malcolm::SOAPParser do
     res.keys.should_not include(:envelope)
   end
 
+  it "raises on invalid response" do
+    env = { :body => "" }
+    middleware = described_class.new(lambda{|env| env}, :item)
+    expect { middleware.on_complete(env) }.to raise_error(Malcolm::SOAPError)
+  end
 end

metadata

@@ -1,113 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: malcolm
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Floyd Wright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &2151891200 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0rc2
+        version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151891200
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
-  name: xml-simple
-  requirement: &2151890420 !ruby/object:Gem::Requirement
-    none: false
+  name: gyoku
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *2151890420
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: nori
-  requirement: &2151889120 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151889120
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.2.1
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151888160 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *2151888160
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151886900 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *2151886900
-description: ! '    A collection of Faraday middleware
-
-'
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.10.0
+description: |2
+      A collection of Faraday middleware
 email: fwright@site5.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.markdown
 files:
+- README.markdown
 - Rakefile
-- README.md
+- lib/malcolm.rb
+- lib/malcolm/exceptions.rb
 - lib/malcolm/request/soap_builder.rb
 - lib/malcolm/response/soap_parser.rb
-- lib/malcolm.rb
+- lib/malcolm/version.rb
 - spec/fixtures/soap.xml
 - spec/malcolm/request/soap_builder_spec.rb
 - spec/malcolm/response/soap_parser_spec.rb
 - spec/spec_helper.rb
-- README.markdown
 homepage: https://github.com/site5/malcolm
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A collection of Faraday middleware
 test_files: []
+has_rdoc: 

data/README.md

@@ -1,22 +0,0 @@
-# Malcolm [![Malcolm Build Status][Build Icon]][Build Status]
-
-Malcolm is a collection of middleware for [Faraday](https://github.com/technoweenie/faraday),
-the excellent HTTP client interface based on [Rack](http://rack.github.com/).
-
-[Build Icon]: https://secure.travis-ci.org/site5/malcolm.png?branch=master
-[Build Status]: https://travis-ci.org/site5/malcolm
-
-## Note on Patches/Pull Requests
-
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a
-  commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-## Copyright
-
-Copyright (c) 2012 Site5.com. See LICENSE for details.