savon 0.9.1 → 0.9.2

data/.travis.yml

@@ -0,0 +1,7 @@
+script: "rake"
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ree
+  - rbx
+  - jruby

data/CHANGELOG.md

@@ -1,8 +1,31 @@
+## 0.9.2 (2011-04-30)
+
+* Fix: [issue](https://github.com/rubiii/savon/pull/154) -
+  Timezone format used by Savon now matches the XML schema spec.
+
+* Improvement: WSSE basic, digest and timestamp authentication are no longer mutually exclusive.
+  Thanks to [mleon](https://github.com/mleon) for solving [issue #142](https://github.com/rubiii/savon/issues/142).
+
+* Improvement: Switched from using Crack to translate the SOAP response to a Hash to using
+  [Nori](http://rubygems.org/gems/nori). It's based on Crack and comes with pluggable parsers.
+  It defaults to REXML, but you can switch to Nokogiri via:
+
+      Nori.parser = :nokogiri
+
+* Improvement: WSDL parsing now uses Nokogiri instead of REXML.
+
 ## 0.9.1 (2011-04-06)
 
 * Improvement: if you're only setting the local or remote address of your wsdl document, you can
   now pass an (optional) String to `Savon::Client.new` to set `wsdl.document`.
 
+      Savon::Client.new "http://example.com/UserService?wsdl"
+
+* Improvement: instead of calling the `to_hash` method of your response again and again and again,
+  there is now a ' #[]` shortcut for you.
+
+      response[:authenticate_response][:return]
+
 ## 0.9.0 (2011-04-05)
 
 * Feature: issues [#158](https://github.com/rubiii/savon/issues/158),

data/README.md

@@ -10,26 +10,28 @@ Installation
 
 Savon is available through [Rubygems](http://rubygems.org/gems/savon) and can be installed via:
 
-    $ gem install savon
+```
+$ gem install savon
+```
 
 Basic workflow
 --------------
 
-    # Setting up a Savon::Client representing a SOAP service.
-    client = Savon::Client.new do
-      wsdl.document = "http://service.example.com?wsdl"
-    end
+``` ruby
+# Setting up a Savon::Client representing a SOAP service.
+client = Savon::Client.new "http://service.example.com?wsdl"
 
-    client.wsdl.soap_actions
-    # => [:create_user, :get_user, :get_all_users]
+client.wsdl.soap_actions
+# => [:create_user, :get_user, :get_all_users]
 
-    # Executing a SOAP request to call a "getUser" action.
-    response = client.request :get_user do
-      soap.body = { :id => 1 }
-    end
+# Executing a SOAP request to call a "getUser" action.
+response = client.request :get_user do
+  soap.body = { :id => 1 }
+end
 
-    response.to_hash
-    # => { :get_user_response => { :first_name => "The", :last_name => "Hoff" } }
+response.to_hash
+# => { :get_user_response => { :first_name => "The", :last_name => "Hoff" } }
+```
 
 Excited to learn more?
 ----------------------

data/Rakefile

@@ -7,7 +7,7 @@ begin
     t.files = ["README.md", "lib/**/*.rb"]
   end
 rescue LoadError
-  desc message = %{"gem install yard" to generate documentation}
+  desc message = %{run "bundle install" to generate documentation}
   task("yard") { abort message }
 end
 
@@ -21,7 +21,7 @@ begin
     c.rcov[:rcov_opts] << "-Ilib -Ispec"
   end
 rescue LoadError
-  desc message = %{"gem install metric_fu" to generate metrics}
+  desc message = %{run "bundle install" to generate metrics}
   task("metrics:all") { abort message }
 end
 
@@ -29,10 +29,10 @@ begin
   require "rspec/core/rake_task"
 
   RSpec::Core::RakeTask.new do |t|
-    t.rspec_opts = %w(-fd -c)
+    t.rspec_opts = %w(-c)
   end
 rescue LoadError
-  desc message = %{"gem install rspec --pre" to run the specs}
+  desc message = %{run "bundle install" to run the specs}
   task(:spec) { abort message }
 end
 

data/lib/savon/core_ext/time.rb

@@ -4,7 +4,15 @@ module Savon
 
       # Returns an xs:dateTime formatted String.
       def xs_datetime
-        strftime "%Y-%m-%dT%H:%M:%S%Z"
+        zone = if utc_offset < 0
+          "-#{"%02d" % (- utc_offset / 3600)}:#{"%02d" % ((- utc_offset % 3600) / 60)}"
+        elsif utc_offset > 0
+          "+#{"%02d" % (utc_offset / 3600)}:#{"%02d" % ((utc_offset % 3600) / 60)}"
+        else
+          "Z"
+        end
+
+        strftime "%Y-%m-%dT%H:%M:%S#{zone}"
       end
 
     end

data/lib/savon/soap/xml.rb

@@ -1,5 +1,5 @@
 require "builder"
-require "crack/xml"
+require "nori"
 require "gyoku"
 
 require "savon/soap"
@@ -28,7 +28,7 @@ module Savon
 
       # Converts a given SOAP response +xml+ to a Hash.
       def self.parse(xml)
-        Crack::XML.parse(xml)
+        Nori.parse(xml)
       end
 
       # Expects a SOAP response XML or Hash, traverses it for a given +path+ of Hash keys

data/lib/savon/version.rb

@@ -1,5 +1,5 @@
 module Savon
 
-  Version = "0.9.1"
+  Version = "0.9.2"
 
 end

data/lib/savon/wsdl/document.rb

@@ -1,4 +1,4 @@
-require "rexml/document"
+require "nokogiri"
 
 require "savon/wsdl/request"
 require "savon/wsdl/parser"
@@ -101,8 +101,8 @@ module Savon
       # Parses the WSDL document and returns the <tt>Savon::WSDL::Parser</tt>.
       def parser
         @parser ||= begin
-          parser = Parser.new
-          REXML::Document.parse_stream document, parser
+          parser = Parser.new(Nokogiri::XML(document))
+          parser.parse
           parser
         end
       end

data/lib/savon/wsdl/parser.rb

@@ -6,13 +6,14 @@ module Savon
 
     # = Savon::WSDL::Parser
     #
-    # Serves as a stream listener for parsing WSDL documents.
+    # Parses WSDL documents and remembers the parts of them we care about.
     class Parser
 
       # The main sections of a WSDL document.
       Sections = %w(definitions types message portType binding service)
 
-      def initialize
+      def initialize(nokogiri_document)
+        @document = nokogiri_document
         @path = []
         @operations = {}
         @namespaces = {}
@@ -31,72 +32,65 @@ module Savon
       # Returns the elementFormDefault value.
       attr_reader :element_form_default
 
-      # Hook method called when the stream parser encounters a starting tag.
-      def tag_start(tag, attrs)
-        # read xml namespaces if root element
-        read_namespaces(attrs) if @path.empty?
-
-        tag, namespace = tag.split(":").reverse
-        @path << tag
-
-        if @section == :types && tag == "schema"
-          @element_form_default = attrs["elementFormDefault"].to_sym if attrs["elementFormDefault"]
-        end
-
-        if @section == :binding && tag == "binding"
-          # ensure that we are in an wsdl/soap namespace
-          @section = nil unless @namespaces[namespace].starts_with? "http://schemas.xmlsoap.org/wsdl/soap"
-        end
-
-        @section = tag.to_sym if Sections.include?(tag) && depth <= 2
-
-        @namespace ||= attrs["targetNamespace"] if @section == :definitions
-        @endpoint ||= URI(URI.escape(attrs["location"])) if @section == :service && tag == "address"
-
-        operation_from tag, attrs if @section == :binding && tag == "operation"
-      end
-
-      # Returns our current depth in the WSDL document.
-      def depth
-        @path.size
+      def parse
+        parse_namespaces
+        parse_endpoint
+        parse_operations
       end
 
-      # Reads namespace definitions from a given +attrs+ Hash.
-      def read_namespaces(attrs)
-        attrs.each do |key, value|
-          @namespaces[key.strip_namespace] = value if key.starts_with? "xmlns:"
-        end
+      def parse_namespaces
+        element_form_default = @document.at_xpath(
+          "s0:definitions/s0:types/xs:schema/@elementFormDefault",
+          "s0" => "http://schemas.xmlsoap.org/wsdl/",
+          "xs" => "http://www.w3.org/2001/XMLSchema")
+        @element_form_default = element_form_default.to_s.to_sym if element_form_default
+
+        namespace = @document.at_xpath(
+          "s0:definitions/@targetNamespace",
+          "s0" => "http://schemas.xmlsoap.org/wsdl/")
+        @namespace = namespace.to_s if namespace
       end
 
-      # Hook method called when the stream parser encounters a closing tag.
-      def tag_end(tag)
-        @path.pop
-
-        if @section == :binding && @input && tag.strip_namespace == "operation"
-          # no soapAction attribute found till now
-          operation_from tag, "soapAction" => @input
-        end
-
-        @section = :definitions if Sections.include?(tag) && depth <= 1
+      def parse_endpoint
+        endpoint = @document.at_xpath(
+          "s0:definitions/s0:service//soap11:address/@location",
+          "s0" => "http://schemas.xmlsoap.org/wsdl/",
+          "soap11" => "http://schemas.xmlsoap.org/wsdl/soap/")
+        endpoint ||= @document.at_xpath(
+          "s0:definitions/s0:service//soap12:address/@location",
+          "s0" => "http://schemas.xmlsoap.org/wsdl/",
+          "soap12" => "http://schemas.xmlsoap.org/wsdl/soap12/")
+        @endpoint = URI(URI.escape(endpoint.to_s)) if endpoint
       end
 
-      # Stores available operations from a given tag +name+ and +attrs+.
-      def operation_from(tag, attrs)
-        @input = attrs["name"] if attrs["name"]
-
-        if attrs["soapAction"]
-          @action = !attrs["soapAction"].blank? ? attrs["soapAction"] : @input
-          @input = @action.split("/").last if !@input || @input.empty?
-
-          @operations[@input.snakecase.to_sym] = { :action => @action, :input => @input }
-          @input, @action = nil, nil
+      def parse_operations
+        operations = @document.xpath(
+          "s0:definitions/s0:binding/s0:operation",
+          "s0" => "http://schemas.xmlsoap.org/wsdl/")
+        operations.each do |operation|
+          name = operation.attribute("name").to_s
+
+          soap_action = operation.at_xpath(".//soap11:operation/@soapAction",
+            "soap11" => "http://schemas.xmlsoap.org/wsdl/soap/"
+          )
+          soap_action ||= operation.at_xpath(".//soap12:operation/@soapAction",
+            "soap12" => "http://schemas.xmlsoap.org/wsdl/soap12/"
+          )
+          if soap_action
+            soap_action = soap_action.to_s
+
+            action = !soap_action.blank? ? soap_action : name
+            input = (!name || name.empty?) ? action.split("/").last : name
+
+            @operations[input.snakecase.to_sym] =
+              { :action => action, :input => input }
+          elsif !@operations[name.snakecase.to_sym]
+            @operations[name.snakecase.to_sym] =
+              { :action => name, :input => name }
+          end
         end
       end
 
-      # Catches calls to unimplemented hook methods.
-      def method_missing(method, *args)
-      end
-
     end
   end
 end

data/lib/savon/wsse.rb

@@ -68,7 +68,13 @@ module Savon
 
     # Returns the XML for a WSSE header.
     def to_xml
-      if username_token?
+      if username_token? && timestamp?
+        Gyoku.xml wsse_username_token.merge!(wsse_timestamp) {
+          |key, v1, v2| v1.merge!(v2) {
+            |key, v1, v2| v1.merge!(v2)
+          }
+        }
+      elsif username_token?
         Gyoku.xml wsse_username_token.merge!(hash)
       elsif timestamp?
         Gyoku.xml wsse_timestamp.merge!(hash)

data/savon.gemspec

@@ -4,24 +4,25 @@ $:.unshift lib unless $:.include? lib
 require "savon/version"
 
 Gem::Specification.new do |s|
-  s.name = "savon"
-  s.version = Savon::Version
-  s.authors = "Daniel Harrington"
-  s.email = "me@rubiii.com"
-  s.homepage = "http://savonrb.com"
-  s.summary = "Heavy metal Ruby SOAP client"
-  s.description = "Savon is the heavy metal Ruby SOAP client."
+  s.name        = "savon"
+  s.version     = Savon::Version
+  s.authors     = "Daniel Harrington"
+  s.email       = "me@rubiii.com"
+  s.homepage    = "http://savonrb.com"
+  s.summary     = "Heavy metal Ruby SOAP client"
+  s.description = "Savon is the heavy metal Ruby SOAP client"
 
   s.rubyforge_project = s.name
 
-  s.add_dependency "builder", ">= 2.1.2"
-  s.add_dependency "crack", "~> 0.1.8"
-  s.add_dependency "httpi", ">= 0.7.8"
-  s.add_dependency "gyoku", ">= 0.4.0"
+  s.add_dependency "builder",  ">= 2.1.2"
+  s.add_dependency "nori",     ">= 0.2.0"
+  s.add_dependency "httpi",    ">= 0.7.8"
+  s.add_dependency "gyoku",    ">= 0.4.0"
+  s.add_dependency "nokogiri", ">= 1.4.0"
 
-  s.add_development_dependency "rspec", "~> 2.4.0"
+  s.add_development_dependency "rspec",   "~> 2.4.0"
   s.add_development_dependency "autotest"
-  s.add_development_dependency "mocha", "~> 0.9.8"
+  s.add_development_dependency "mocha",   "~> 0.9.8"
   s.add_development_dependency "timecop", "~> 0.3.5"
 
   s.files = `git ls-files`.split("\n")

data/spec/fixtures/wsdl/soap12.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Example of a WSDL with SOAP 1.2 and no SOAP 1.1 endpoint.
+     Don't know whether this is widespread, but we should allow it. -->
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <service name="Blog">
+        <port name="BlogSoap12">
+            <soap12:address location="http://blogsite.example.com/endpoint12"/>
+        </port>
+    </service>
+</definitions>
+

data/spec/savon/core_ext/time_spec.rb

@@ -6,7 +6,7 @@ describe Time do
     let(:time) { Time.utc(2011, 01, 04, 13, 45, 55) }
 
     it "should return an xs:dateTime formatted String" do
-      time.xs_datetime.should == "2011-01-04T13:45:55UTC"
+      time.xs_datetime.should == "2011-01-04T13:45:55Z"
     end
   end
 

data/spec/savon/wsdl/parser_spec.rb

@@ -82,6 +82,14 @@ describe Savon::WSDL::Parser do
     end
   end
 
+  context "with soap12.xml" do
+    let(:parser) { new_parser :soap12 }
+
+    it "should return the endpoint" do
+      parser.endpoint.should == URI("http://blogsite.example.com/endpoint12")
+    end
+  end
+
   RSpec::Matchers.define :match_operations do |expected|
     match do |actual|
       actual.should have(expected.keys.size).items
@@ -91,8 +99,8 @@ describe Savon::WSDL::Parser do
   end
 
   def new_parser(fixture)
-    parser = Savon::WSDL::Parser.new
-    REXML::Document.parse_stream Fixture[:wsdl, fixture], parser
+    parser = Savon::WSDL::Parser.new(Nokogiri::XML(Fixture[:wsdl, fixture]))
+    parser.parse
     parser
   end
 

data/spec/savon/wsse_spec.rb

@@ -208,6 +208,25 @@ describe Savon::WSSE do
         wsse.to_xml.should include("<wsu:Expires>#{wsse.expires_at.xs_datetime}</wsu:Expires>")
       end
     end
+
+    context "whith credentials and timestamp" do
+      before do
+        wsse.credentials "username", "password"
+        wsse.timestamp = true
+      end
+
+      it "should contain a wsu:Created node" do
+        wsse.to_xml.should include("<wsu:Created>")
+      end
+
+      it "should contain a wsu:Expires node" do
+        wsse.to_xml.should include("<wsu:Expires>")
+      end
+
+      it "should contain the username and password" do
+        wsse.to_xml.should include("username", "password")
+      end
+    end
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: savon
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-05 00:00:00 +02:00
+date: 2011-04-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,19 +35,19 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: crack
+  name: nori
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 23
         segments: 
         - 0
-        - 1
-        - 8
-        version: 0.1.8
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -83,9 +83,25 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: nokogiri
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -97,11 +113,11 @@ dependencies:
         - 0
         version: 2.4.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: autotest
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -111,11 +127,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -127,11 +143,11 @@ dependencies:
         - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: timecop
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -143,8 +159,8 @@ dependencies:
         - 5
         version: 0.3.5
   type: :development
-  version_requirements: *id008
-description: Savon is the heavy metal Ruby SOAP client.
+  version_requirements: *id009
+description: Savon is the heavy metal Ruby SOAP client
 email: me@rubiii.com
 executables: []
 
@@ -155,6 +171,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .rspec
+- .travis.yml
 - .yardopts
 - CHANGELOG.md
 - Gemfile
@@ -193,6 +210,7 @@ files:
 - spec/fixtures/wsdl/geotrust.xml
 - spec/fixtures/wsdl/namespaced_actions.xml
 - spec/fixtures/wsdl/no_namespace.xml
+- spec/fixtures/wsdl/soap12.xml
 - spec/fixtures/wsdl/two_bindings.xml
 - spec/savon/client_spec.rb
 - spec/savon/core_ext/hash_spec.rb