lolsoap 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7a361721a3138038d730668311a3e83340df411
-  data.tar.gz: 6332b9fe23d9d46ce280e182ac110ee58134aa95
+  metadata.gz: 361f724919b1f7d84c87e673cd76cd787ed94a6a
+  data.tar.gz: 878031ba2f148961f8d0fce5cf7f6027c9ff091d
 SHA512:
-  metadata.gz: 6681b3c04f898307549a55cf9b2092712c2ffd6733113a96a4dfec127bd60e61dd2dd960dd83f30572e38804ede58dbc6f3b2bc0d3fc4215404422c5e69793bd
-  data.tar.gz: 41b82f801682f7c43468c587f387738d3d333e94e3d68540357df8fd0ad924958b7d3128782dfe7a16c201ebb3f89a7f3c68eec91104e0248e488cb386f32a22
+  metadata.gz: 501f2960c6979b15173833c6a6ad97d97b81a80ecfbf5b66ffe9fa153697be8fb5d1510c08a6a55c0f3294f7ac96ca3eebaafc4e37e1f4eeb3d7226bb1c72afb
+  data.tar.gz: 4b97d15fa2533e42732650eb7fcc8104cb877f7a85638ef689c51cfc13cf056533536f891b03a7f754ce75b2e63d1fcd7c181f1f421b06e7237994a71d99b78b

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.6.0

data/lib/lolsoap/builder.rb

@@ -46,7 +46,7 @@ module LolSoap
 
     def initialize(node, type = WSDL::NullType.new)
       @node = node
-      @type = type
+      @type = type || WSDL::NullType.new
     end
 
     # Add a tag manually, rather than through method_missing. This is so you can still

data/lib/lolsoap/envelope.rb

@@ -26,14 +26,14 @@ module LolSoap
     #     b.some 'data'
     #   end
     def body(klass = Builder)
-      builder = klass.new(content, input_type)
+      builder = klass.new(body_content, input_body_type)
       yield builder if block_given?
       builder
     end
 
     # Build the header of the envelope
     def header(klass = Builder)
-      builder = klass.new(@header)
+      builder = klass.new(header_content, input_header_type)
       yield builder if block_given?
       builder
     end
@@ -50,16 +50,40 @@ module LolSoap
       operation.input
     end
 
-    def input_type
-      input.type
+    def input_header
+      input.header
+    end
+
+    def input_header_type
+      input_header && input_header.type
+    end
+
+    def input_body
+      input.body
+    end
+
+    def input_body_type
+      input_body.type
     end
 
     def output
       operation.output
     end
 
-    def output_type
-      output.type
+    def output_header
+      output.header
+    end
+
+    def output_header_type
+      output_header && output_header.type
+    end
+
+    def output_body
+      output.body
+    end
+
+    def output_body_type
+      output_body.type
     end
 
     def to_xml(options = {})
@@ -81,7 +105,10 @@ module LolSoap
     private
 
     # @private
-    def content; @content; end
+    def header_content; @header_content || @header; end
+
+    # @private
+    def body_content; @body_content; end
 
     # @private
     def initialize_doc
@@ -91,16 +118,23 @@ module LolSoap
       namespaces[soap_prefix] = root.add_namespace(soap_prefix, soap_namespace)
 
       @header = doc.create_element 'Header'
-
-      @body    = doc.create_element 'Body'
-      @content = doc.create_element input.name
-
-      [root, @header, @body].each { |el| el.namespace = namespaces[soap_prefix] }
-      @content.namespace = namespaces[input.prefix]
-
-      @body << @content
-      root  << @header
-      root  << @body
+      if input_header
+        @header_content = doc.create_element input_header.name
+        @header << @header_content
+      else
+        @header_content = nil
+      end
+
+      body = doc.create_element 'Body'
+      @body_content = doc.create_element input_body.name
+
+      [root, @header, body].each { |el| el.namespace = namespaces[soap_prefix] }
+      @header_content.namespace = namespaces[input_header.prefix] if @header_content
+      @body_content.namespace = namespaces[input_body.prefix]
+
+      body << @body_content
+      root << @header
+      root << body
     end
   end
 end

data/lib/lolsoap/request.rb

@@ -36,12 +36,12 @@ module LolSoap
 
     # The type of the element sent in the request body
     def input_type
-      envelope.input_type
+      envelope.input_body_type
     end
 
     # The type of the element that will be received in the response body
     def output_type
-      envelope.output_type
+      envelope.output_body_type
     end
 
     # The MIME type of the request. This is always application/soap+xml,

data/lib/lolsoap/wsdl/operation_io.rb

@@ -0,0 +1,16 @@
+class LolSoap::WSDL
+  class OperationIO
+    attr_reader :header, :body
+
+    def initialize(header, body)
+      @header = header
+      @body   = body
+    end
+
+    def inspect
+      "<#{self.class} " \
+      "header=#{header.inspect} " \
+      "body=#{body.inspect}>"
+    end
+  end
+end

data/lib/lolsoap/wsdl.rb

@@ -3,6 +3,7 @@ require 'lolsoap/wsdl_parser'
 module LolSoap
   class WSDL
     require 'lolsoap/wsdl/operation'
+    require 'lolsoap/wsdl/operation_io'
     require 'lolsoap/wsdl/type'
     require 'lolsoap/wsdl/named_type_reference'
     require 'lolsoap/wsdl/immediate_type_reference'
@@ -83,7 +84,13 @@ module LolSoap
     def load_operations(parser)
       Hash[
         parser.operations.map do |k, op|
-          [k, Operation.new(self, k, op[:action], message_format(op[:input], parser), message_format(op[:output], parser))]
+          [k, Operation.new(
+            self,
+            k,
+            op[:action],
+            build_io(op[:input], parser),
+            build_io(op[:output], parser)
+          )]
         end
       ]
     end
@@ -143,8 +150,11 @@ module LolSoap
     end
 
     # @private
-    def message_format(element, parser)
-      build_element(parser.elements.fetch(element))
+    def build_io(io, parser)
+      OperationIO.new(
+        io[:header] && build_element(parser.elements[io[:header]]),
+        build_element(parser.elements[io[:body]])
+      )
     end
   end
 end

data/lib/lolsoap/wsdl_parser.rb

@@ -98,6 +98,52 @@ module LolSoap
       end
     end
 
+    class Operation
+      attr_reader :parser, :node
+
+      def initialize(parser, node)
+        @parser = parser
+        @node   = node
+      end
+
+      def name
+        node.attribute('name').to_s
+      end
+
+      def action
+        node.at_xpath('./s:operation/@soapAction', parser.ns).to_s
+      end
+
+      def input
+        @input ||= OperationIO.new(
+          header(:input),
+          port_type_operation[:input]
+        )
+      end
+
+      def output
+        @output ||= OperationIO.new(
+          header(:output),
+          port_type_operation[:output]
+        )
+      end
+
+      private
+
+      def port_type_operation
+        parser.port_type_operations.fetch(name)
+      end
+
+      def header(direction)
+        if msg = node.at_xpath("./d:#{direction}/s:header/@message", parser.ns)
+          parser.messages.fetch(msg.to_s.split(':').last)
+        end
+      end
+    end
+
+    class OperationIO < Struct.new(:header, :body)
+    end
+
     SOAP_1_1 = 'http://schemas.xmlsoap.org/wsdl/soap/'
     SOAP_1_2 = 'http://schemas.xmlsoap.org/wsdl/soap12/'
 
@@ -184,16 +230,21 @@ module LolSoap
         binding = doc.at_xpath('/d:definitions/d:service/d:port/s:address/../@binding', ns).to_s.split(':').last
 
         Hash[
-          doc.xpath("/d:definitions/d:binding[@name='#{binding}']/d:operation", ns).map do |op|
-            name   = op.attribute('name').to_s
-            action = op.at_xpath('./s:operation/@soapAction', ns).to_s
+          doc.xpath("/d:definitions/d:binding[@name='#{binding}']/d:operation", ns).map do |node|
+            operation = Operation.new(self, node)
 
             [
-              name,
+              operation.name,
               {
-                :action => action,
-                :input  => port_type_operations.fetch(name)[:input],
-                :output => port_type_operations.fetch(name)[:output]
+                :action => operation.action,
+                :input  => {
+                  :header => operation.input.header,
+                  :body   => operation.input.body
+                },
+                :output => {
+                  :header => operation.output.header,
+                  :body   => operation.output.body
+                }
               }
             ]
           end

data/lolsoap.gemspec

@@ -2,15 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: lolsoap 0.5.1 ruby lib
+# stub: lolsoap 0.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "lolsoap"
-  s.version = "0.5.1"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Jon Leighton"]
-  s.date = "2013-12-10"
+  s.date = "2014-09-23"
   s.description = "A library for dealing with SOAP requests and responses. We tear our hair out so you don't have to."
   s.email = "j@jonathanleighton.com"
   s.extra_rdoc_files = [
@@ -42,6 +43,7 @@ Gem::Specification.new do |s|
     "lib/lolsoap/wsdl/null_element.rb",
     "lib/lolsoap/wsdl/null_type.rb",
     "lib/lolsoap/wsdl/operation.rb",
+    "lib/lolsoap/wsdl/operation_io.rb",
     "lib/lolsoap/wsdl/type.rb",
     "lib/lolsoap/wsdl_parser.rb",
     "lolsoap.gemspec",
@@ -69,8 +71,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/loco2/lolsoap"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.9"
+  s.rubygems_version = "2.2.2"
   s.summary = "A library for dealing with SOAP requests and responses."
 
   if s.respond_to? :specification_version then

data/test/fixtures/stock_quote.wsdl

@@ -27,6 +27,12 @@
            </all>
          </complexType>
       </element>
+      <element name="tradePriceRequestHeader">
+        <sequence>
+          <element name="username" type="xs:string"/>
+          <element name="password" type="xs:string"/>
+        </sequence>
+      </element>
       <element name="tradePriceRequest" type="xsd1:TradePriceRequest" />
       <complexType name="xsd1:TradePriceRequest" abstract="false">
         <complexContent>
@@ -82,6 +88,10 @@
     </schema>
   </types>
 
+  <message name="GetLastTradePriceInputHeader">
+    <part name="header" element="xsd1:tradePriceRequestHeader"/>
+  </message>
+
   <message name="GetLastTradePriceInput">
     <part name="body" xmlns:foo="http://example.com/stockquote.xsd" element="foo:tradePriceRequest"/>
   </message>
@@ -114,6 +124,7 @@
     <operation name="GetLastTradePrice">
       <soap:operation soapAction="http://example.com/GetLastTradePrice"/>
       <input>
+        <soap:header use="literal" message="GetLastTradePriceInputHeader" />
         <soap:body use="literal"/>
       </input>
       <output>
@@ -123,9 +134,11 @@
     <operation name="GetHistoricalPrice">
       <soap:operation soapAction="http://example.com/GetHistoricalPrice"/>
       <input>
+        <soap:header use="literal"/>
         <soap:body use="literal"/>
       </input>
       <output>
+        <soap:header use="literal"/>
         <soap:body use="literal"/>
       </output>
     </operation>

data/test/integration/test_envelope.rb

@@ -38,12 +38,12 @@ module LolSoap
 
     it 'creates some header' do
       subject.header do |h|
-        h['ns0'].verySpecialBoolean true
+        h['ns0'].username 'LOCO2'
       end
 
-      el = doc.at_xpath('/soap:Envelope/soap:Header/ns0:verySpecialBoolean', doc.namespaces)
+      el = doc.at_xpath('/soap:Envelope/soap:Header/ns0:tradePriceRequestHeader/ns0:username', doc.namespaces)
       el.wont_equal nil
-      el.text.to_s.must_equal 'true'
+      el.text.to_s.must_equal 'LOCO2'
     end
   end
 end

data/test/integration/test_wsdl.rb

@@ -8,8 +8,14 @@ module LolSoap
     it 'should successfully parse a WSDL document' do
       subject.operations.length.must_equal 2
       subject.operations.fetch('GetLastTradePrice').tap do |o|
-        o.input.name.must_equal 'tradePriceRequest'
-        o.action.must_equal     'http://example.com/GetLastTradePrice'
+        o.input.header.name.must_equal 'tradePriceRequestHeader'
+        o.input.body.name.must_equal 'tradePriceRequest'
+        o.action.must_equal 'http://example.com/GetLastTradePrice'
+      end
+
+      subject.operations.fetch('GetHistoricalPrice').tap do |o|
+        o.input.header.must_equal nil
+        o.input.body.name.must_equal 'historicalPriceRequest'
       end
 
       subject.types.length.must_equal 4

data/test/unit/test_envelope.rb

@@ -11,7 +11,7 @@ module LolSoap
     end
 
     let(:operation) do
-      OpenStruct.new(:input => OpenStruct.new(:prefix => 'ns0', :name => 'WashHandsRequest'))
+      OpenStruct.new(:input => OpenStruct.new(:body => OpenStruct.new(:prefix => 'ns0', :name => 'WashHandsRequest')))
     end
 
     subject { Envelope.new(wsdl, operation) }
@@ -62,7 +62,7 @@ module LolSoap
         builder = Object.new
 
         builder_klass = MiniTest::Mock.new
-        builder_klass.expect(:new, builder, [header])
+        builder_klass.expect(:new, builder, [header, nil])
 
         block = nil
         ret = subject.header(builder_klass) { |b| block = b }
@@ -75,7 +75,7 @@ module LolSoap
         builder = Object.new
 
         builder_klass = MiniTest::Mock.new
-        builder_klass.expect(:new, builder, [header])
+        builder_klass.expect(:new, builder, [header, nil])
 
         subject.header(builder_klass).must_equal builder
       end

data/test/unit/test_wsdl.rb

@@ -13,8 +13,8 @@ module LolSoap
           :operations => {
             'washHands' => {
               :action => 'urn:washHands',
-              :input  => [namespace, 'brush'],
-              :output => [namespace, 'Color']
+              :input  => { :body => [namespace, 'brush'] },
+              :output => { :body => [namespace, 'Color'] }
             }
           },
           :types => {
@@ -92,12 +92,12 @@ module LolSoap
         it 'returns a hash of operations' do
           subject.operations.length.must_equal 1
           subject.operations['washHands'].tap do |op|
-            op.wsdl.must_equal       subject
-            op.action.must_equal     'urn:washHands'
-            op.input.name.must_equal 'brush'
+            op.wsdl.must_equal subject
+            op.action.must_equal 'urn:washHands'
+            op.input.body.name.must_equal 'brush'
             op.output.tap do |output|
-              output.is_a?(WSDL::Element).must_equal(true)
-              output.type.elements.keys.sort.must_equal %w(hex name)
+              output.body.is_a?(WSDL::Element).must_equal(true)
+              output.body.type.elements.keys.sort.must_equal %w(hex name)
             end
           end
         end

data/test/unit/test_wsdl_parser.rb

@@ -110,6 +110,11 @@ module LolSoap
     describe '#elements' do
       it 'returns the elements with inline types' do
         subject.elements.must_equal({
+          [namespace, "tradePriceRequestHeader"] => {
+            :name      => "tradePriceRequestHeader",
+            :namespace => namespace,
+            :type      => nil
+          },
           [namespace, "tradePriceRequest"] => {
             :name      => "tradePriceRequest",
             :namespace => namespace,
@@ -165,10 +170,11 @@ module LolSoap
     describe '#messages' do
       it 'maps message names to types' do
         subject.messages.must_equal({
-          'GetLastTradePriceInput'   => [namespace, 'tradePriceRequest'],
-          'GetLastTradePriceOutput'  => [namespace, 'TradePrice'],
-          'GetHistoricalPriceInput'  => [namespace, 'historicalPriceRequest'],
-          'GetHistoricalPriceOutput' => [namespace, 'HistoricalPrice']
+          'GetLastTradePriceInputHeader' => [namespace, 'tradePriceRequestHeader'],
+          'GetLastTradePriceInput'       => [namespace, 'tradePriceRequest'],
+          'GetLastTradePriceOutput'      => [namespace, 'TradePrice'],
+          'GetHistoricalPriceInput'      => [namespace, 'historicalPriceRequest'],
+          'GetHistoricalPriceOutput'     => [namespace, 'HistoricalPrice']
         })
       end
     end
@@ -193,13 +199,16 @@ module LolSoap
         subject.operations.must_equal({
           'GetLastTradePrice' => {
             :action => 'http://example.com/GetLastTradePrice',
-            :input  => [namespace, 'tradePriceRequest'],
-            :output => [namespace, 'TradePrice']
+            :input  => {
+              header: [namespace, 'tradePriceRequestHeader'],
+              body:   [namespace, 'tradePriceRequest']
+            },
+            :output => { header: nil, body: [namespace, 'TradePrice'] }
           },
           'GetHistoricalPrice' => {
             :action => 'http://example.com/GetHistoricalPrice',
-            :input  => [namespace, 'historicalPriceRequest'],
-            :output => [namespace, 'HistoricalPrice']
+            :input  => { header: nil, body: [namespace, 'historicalPriceRequest'] },
+            :output => { header: nil, body: [namespace, 'HistoricalPrice'] }
           }
         })
       end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: lolsoap
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A library for dealing with SOAP requests and responses. We tear our hair
@@ -89,9 +89,9 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
-- .travis.yml
-- .yardopts
+- ".document"
+- ".travis.yml"
+- ".yardopts"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -113,6 +113,7 @@ files:
 - lib/lolsoap/wsdl/null_element.rb
 - lib/lolsoap/wsdl/null_type.rb
 - lib/lolsoap/wsdl/operation.rb
+- lib/lolsoap/wsdl/operation_io.rb
 - lib/lolsoap/wsdl/type.rb
 - lib/lolsoap/wsdl_parser.rb
 - lolsoap.gemspec
@@ -147,19 +148,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A library for dealing with SOAP requests and responses.
 test_files: []
-has_rdoc: