savon 2.0.0 → 2.0.1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.0.1 (2012-12-19)
+
+* Fix [#342](https://github.com/savonrb/savon/issues/342) fixes an issue where namespaces could
+  not be resolved if the actual operation name to call did not match the operation name passed
+  to the client's `#call` method. For example: `:get_stations` for a `getStations` operation.
+
 ## 2.0.0 (2012-12-18)
 
 * Read about all the changes in the [updated documentation](http://savonrb.com/version2.html).

data/README.md

@@ -1,4 +1,4 @@
-Savon [![Build Status](https://secure.travis-ci.org/savonrb/savon.png?branch=version2)](http://travis-ci.org/savonrb/savon)
+Savon [![Build Status](https://secure.travis-ci.org/savonrb/savon.png)](http://travis-ci.org/savonrb/savon)
 =====
 
 Heavy metal SOAP client
@@ -6,15 +6,16 @@ Heavy metal SOAP client
 [Documentation](http://savonrb.com) | [RDoc](http://rubydoc.info/gems/savon) |
 [Mailing list](https://groups.google.com/forum/#!forum/savonrb) | [Twitter](http://twitter.com/savonrb)
 
-Version 2
----------
 
-Savon 2.0 is almost feature-complete and I would really appreciate your feedback!  
-To get started, add the following line to your Gemfile:
+Installation
+------------
+
+Savon is available through [Rubygems](http://rubygems.org/gems/savon) and can be installed via:
 
-``` ruby
-gem "savon", github: "savonrb/savon", branch: "version2"
 ```
+$ gem install savon
+```
+
 
 Introduction
 ------------
@@ -37,7 +38,8 @@ response.body
 # => { :get_user_response => { :first_name => "The", :last_name => "Hoff" } }
 ```
 
+
 Documentation
 -------------
 
-Continue reading at [savonrb.com](http://savonrb.com/version2.html)
+Continue reading at [savonrb.com](http://savonrb.com)

data/lib/savon/message.rb

@@ -19,7 +19,8 @@ module Savon
       return @message.to_s unless @message.kind_of? Hash
 
       if @element_form_default == :qualified
-        @message = QualifiedMessage.new(@types, @used_namespaces, @request_key_converter).to_hash(@message, [@operation_name.to_s])
+        translated_operation_name = Gyoku.xml_tag(@operation_name, :key_converter => @key_converter).to_s
+        @message = QualifiedMessage.new(@types, @used_namespaces, @request_key_converter).to_hash(@message, [translated_operation_name])
       end
 
       gyoku_options = {

data/lib/savon/qualified_message.rb

@@ -15,12 +15,12 @@ module Savon
       return hash.to_s unless hash.kind_of? Hash
 
       hash.inject({}) do |newhash, (key, value)|
-        camelcased_key = Gyoku.xml_tag(key, :key_converter => @key_converter).to_s
-        newpath = path + [camelcased_key]
+        translated_key = Gyoku.xml_tag(key, :key_converter => @key_converter).to_s
+        newpath = path + [translated_key]
 
         if @used_namespaces[newpath]
           newhash.merge(
-            "#{@used_namespaces[newpath]}:#{camelcased_key}" =>
+            "#{@used_namespaces[newpath]}:#{translated_key}" =>
               add_namespaces_to_body(value, @types[newpath] ? [@types[newpath]] : newpath)
           )
         else

data/lib/savon/version.rb

@@ -1,5 +1,5 @@
 module Savon
 
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 
 end

data/spec/integration/email_example_spec.rb

@@ -0,0 +1,32 @@
+ require "spec_helper"
+
+describe "Email example" do
+
+  it "passes Strings as they are" do
+    client = Savon.client(
+      # The WSDL document provided by the service.
+      :wsdl => "http://ws.cdyne.com/emailverify/Emailvernotestemail.asmx?wsdl",
+
+      # Lower timeouts so these specs don't take forever when the service is not available.
+      :open_timeout => 10,
+      :read_timeout => 10,
+
+      # Disable logging for cleaner spec output.
+      :log => false
+    )
+
+    response = client.call(:verify_email, :message => { :email => "soap@example.com", "LicenseKey" => "?" })
+
+    response_text = response.body[:verify_email_response][:verify_email_result][:response_text]
+
+    if response_text == "Current license key only allows so many checks"
+      # Fallback to not fail the specs when the service's API limit is reached,
+      # but to mark the spec as pending instead.
+      pending "API limit exceeded"
+    else
+      # The expected result. We unfortunately don't have a license key for this service.
+      response_text.should == "Email Domain Not Found"
+    end
+  end
+
+end

data/spec/integration/ratp_example_spec.rb

@@ -0,0 +1,40 @@
+ require "spec_helper"
+
+describe "RATP example" do
+
+  it "retrieves information about a specific station" do
+    client = Savon.client do
+      # The WSDL document provided by the service.
+      wsdl "http://www.ratp.fr/wsiv/services/Wsiv?wsdl"
+
+      # Lower timeouts so these specs don't take forever when the service is not available.
+      open_timeout 10
+      read_timeout 10
+
+      # Disable logging for cleaner spec output.
+      log false
+    end
+
+    response = client.call(:get_stations) do
+      # For the corrent values to pass for :from_unit and :to_unit, I searched the WSDL for
+      # the "FromUnit" type which is a "TemperatureUnit" enumeration that looks like this:
+      #
+      # <s:simpleType name="TemperatureUnit">
+      #   <s:restriction base="s:string">
+      #     <s:enumeration value="degreeCelsius"/>
+      #     <s:enumeration value="degreeFahrenheit"/>
+      #     <s:enumeration value="degreeRankine"/>
+      #     <s:enumeration value="degreeReaumur"/>
+      #     <s:enumeration value="kelvin"/>
+      #   </s:restriction>
+      # </s:simpleType>
+      #
+      # Support for XS schema types needs to be improved.
+      message(:station => { :id => 1975 }, :limit => 1)
+    end
+
+    station_name = response.body[:get_stations_response][:return][:stations][:name]
+    expect(station_name).to eq("Cite")
+  end
+
+end

data/spec/integration/stockquote_example_spec.rb

@@ -0,0 +1,28 @@
+ require "spec_helper"
+
+describe "Stockquote example" do
+
+  it "returns the result in a CDATA tag" do
+    client = Savon.client(
+      # The WSDL document provided by the service.
+      :wsdl => "http://www.webservicex.net/stockquote.asmx?WSDL",
+
+      # Lower timeouts so these specs don't take forever when the service is not available.
+      :open_timeout => 10,
+      :read_timeout => 10,
+
+      # Disable logging for cleaner spec output.
+      :log => false
+    )
+
+    response = client.call(:get_quote, :message => { :symbol => "AAPL" })
+
+    cdata = response.body[:get_quote_response][:get_quote_result]
+
+    nori_options = { :convert_tags_to => lambda { |tag| tag.snakecase.to_sym } }
+    result = Nori.new(nori_options).parse(cdata)
+
+    result[:stock_quotes][:stock][:symbol].should == "AAPL"
+  end
+
+end

data/spec/integration/temperature_example_spec.rb

@@ -0,0 +1,46 @@
+ require "spec_helper"
+
+describe "Temperature example" do
+
+  it "converts 30 degrees celsius to 86 degrees fahrenheit" do
+    client = Savon.client do
+      # The WSDL document provided by the service.
+      wsdl "http://www.webservicex.net/ConvertTemperature.asmx?WSDL"
+
+      # Needed because (up until now), Savon doesn't match XS types to Hash keys,
+      # but defaults to convert Hash message Symbols (like :from_unit) to lowerCamelCase.
+      # The service expects these to be CamelCase instead. Look at Savon's log output
+      # and compare it with an example request generated by soapUI.
+      convert_request_keys_to :camelcase
+
+      # Lower timeouts so these specs don't take forever when the service is not available.
+      open_timeout 10
+      read_timeout 10
+
+      # Disable logging for cleaner spec output.
+      log false
+    end
+
+    response = client.call(:convert_temp) do
+      # For the corrent values to pass for :from_unit and :to_unit, I searched the WSDL for
+      # the "FromUnit" type which is a "TemperatureUnit" enumeration that looks like this:
+      #
+      # <s:simpleType name="TemperatureUnit">
+      #   <s:restriction base="s:string">
+      #     <s:enumeration value="degreeCelsius"/>
+      #     <s:enumeration value="degreeFahrenheit"/>
+      #     <s:enumeration value="degreeRankine"/>
+      #     <s:enumeration value="degreeReaumur"/>
+      #     <s:enumeration value="kelvin"/>
+      #   </s:restriction>
+      # </s:simpleType>
+      #
+      # Support for XS schema types needs to be improved.
+      message(:temperature => 30, :from_unit => "degreeCelsius", :to_unit => "degreeFahrenheit")
+    end
+
+    fahrenheit = response.body[:convert_temp_response][:convert_temp_result]
+    expect(fahrenheit).to eq("86")
+  end
+
+end

data/spec/integration/zipcode_example_spec.rb

@@ -0,0 +1,42 @@
+ require "spec_helper"
+
+describe "ZIP code example" do
+
+  it "supports threads making requests simultaneously" do
+    client = Savon.client(
+      # The WSDL document provided by the service.
+      :wsdl => "http://www.thomas-bayer.com/axis2/services/BLZService?wsdl",
+
+      # Lower timeouts so these specs don't take forever when the service is not available.
+      :open_timeout => 10,
+      :read_timeout => 10,
+
+      # Disable logging for cleaner spec output.
+      :log => false
+    )
+
+    mutex = Mutex.new
+
+    request_data = [70070010, 24050110, 20050550]
+    threads_waiting = request_data.size
+
+    threads = request_data.map do |blz|
+      thread = Thread.new do
+        response = client.call :get_bank, :message => { :blz => blz }
+        Thread.current[:value] = response.body[:get_bank_response][:details]
+        mutex.synchronize { threads_waiting -= 1 }
+      end
+
+      thread.abort_on_exception = true
+      thread
+    end
+
+    sleep(1) until threads_waiting == 0
+
+    threads.each(&:kill)
+    values = threads.map { |thr| thr[:value] }.compact
+
+    values.uniq.size.should == values.size
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: savon
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nori
@@ -253,10 +253,13 @@ files:
 - spec/fixtures/wsdl/multiple_namespaces.xml
 - spec/fixtures/wsdl/multiple_types.xml
 - spec/fixtures/wsdl/taxcloud.xml
-- spec/integration/options_spec.rb
-- spec/integration/request_spec.rb
+- spec/integration/email_example_spec.rb
+- spec/integration/ratp_example_spec.rb
+- spec/integration/stockquote_example_spec.rb
 - spec/integration/support/application.rb
 - spec/integration/support/server.rb
+- spec/integration/temperature_example_spec.rb
+- spec/integration/zipcode_example_spec.rb
 - spec/savon/builder_spec.rb
 - spec/savon/client_spec.rb
 - spec/savon/core_ext/string_spec.rb
@@ -266,6 +269,7 @@ files:
 - spec/savon/model_spec.rb
 - spec/savon/observers_spec.rb
 - spec/savon/operation_spec.rb
+- spec/savon/options_spec.rb
 - spec/savon/request_spec.rb
 - spec/savon/response_spec.rb
 - spec/savon/soap_fault_spec.rb
@@ -286,7 +290,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4031726402379507170
+      hash: 2358911871960345880
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -295,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4031726402379507170
+      hash: 2358911871960345880
 requirements: []
 rubyforge_project: savon
 rubygems_version: 1.8.24

data/spec/integration/request_spec.rb

@@ -1,76 +0,0 @@
- require "spec_helper"
-
-describe "Requests" do
-
-  subject(:client) {
-    Savon.client(:wsdl => service_endpoint, :open_timeout => 10, :read_timeout => 10,
-                 :raise_errors => false, :log => false)
-  }
-
-  context "stockquote" do
-    let(:service_endpoint) { "http://www.webservicex.net/stockquote.asmx?WSDL" }
-
-    it "returns the result in a CDATA tag" do
-      response = client.call(:get_quote, :message => { :symbol => "AAPL" })
-
-      cdata = response.body[:get_quote_response][:get_quote_result]
-
-      nori_options = { :convert_tags_to => lambda { |tag| tag.snakecase.to_sym } }
-      result = Nori.new(nori_options).parse(cdata)
-
-      result[:stock_quotes][:stock][:symbol].should == "AAPL"
-    end
-  end
-
-  context "email" do
-    let(:service_endpoint) { "http://ws.cdyne.com/emailverify/Emailvernotestemail.asmx?wsdl" }
-
-    it "passes Strings as they are" do
-      response = client.call(:verify_email, :message => { :email => "soap@example.com", "LicenseKey" => "?" })
-
-      response_text = response.body[:verify_email_response][:verify_email_result][:response_text]
-
-      if response_text == "Current license key only allows so many checks"
-        pending "API limit exceeded"
-      else
-        response_text.should == "Email Domain Not Found"
-      end
-    end
-  end
-
-  context "zip code" do
-    let(:service_endpoint) { "http://www.thomas-bayer.com/axis2/services/BLZService?wsdl" }
-
-    it "supports threads making requests simultaneously" do
-      mutex = Mutex.new
-
-      request_data = [70070010, 24050110, 20050550]
-      threads_waiting = request_data.size
-
-      threads = request_data.map do |blz|
-        thread = Thread.new do
-          response = client.call :get_bank, :message => { :blz => blz }
-          Thread.current[:value] = response.body[:get_bank_response][:details]
-          mutex.synchronize { threads_waiting -= 1 }
-        end
-
-        thread.abort_on_exception = true
-        thread
-      end
-
-      sleep(1) until threads_waiting == 0
-
-      threads.each(&:kill)
-      values = threads.map { |thr| thr[:value] }.compact
-
-      values.uniq.size.should == values.size
-    end
-  end
-
-  context "redirectes" do
-    it "follows 301 redirects"
-    it "follows 302 redirects"
-    it "follows 307 redirects"
-  end
-
-end