rubiii-apricoteatsgorilla 0.5.5 → 0.5.6

data/Rakefile

@@ -23,9 +23,9 @@ begin
   Jeweler::Tasks.new do |spec|
     spec.name = "apricoteatsgorilla"
     spec.author = "Daniel Harrington"
-    spec.email = "me@d-harrington.com"
+    spec.email = "me@rubiii.com"
     spec.homepage = "http://github.com/rubiii/apricoteatsgorilla"
-    spec.summary = "SOAP communication helper."
+    spec.summary = "SOAP communication helper"
     spec.description = spec.summary
 
     spec.rdoc_options += [

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.6

data/apricoteatsgorilla.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{apricoteatsgorilla}
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Harrington"]
   s.date = %q{2009-09-02}
   s.description = %q{SOAP communication helper.}
-  s.email = %q{me@d-harrington.com}
+  s.email = %q{me@rubiii.com}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
@@ -30,22 +30,23 @@ Gem::Specification.new do |s|
      "spec/apricoteatsgorilla/xml_node_spec.rb",
      "spec/spec_helper.rb"
   ]
+  s.has_rdoc = true
   s.homepage = %q{http://github.com/rubiii/apricoteatsgorilla}
   s.rdoc_options = ["--charset=UTF-8", "--title", "Apricot eats Gorilla", "--main", "README.rdoc", "--line-numbers", "--inline-source"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.1}
   s.summary = %q{SOAP communication helper.}
   s.test_files = [
-    "spec/spec_helper.rb",
+    "spec/apricoteatsgorilla/apricoteatsgorilla_hash_to_xml_spec.rb",
+     "spec/apricoteatsgorilla/apricoteatsgorilla_spec.rb",
      "spec/apricoteatsgorilla/apricoteatsgorilla_xml_to_hash_spec.rb",
      "spec/apricoteatsgorilla/xml_node_spec.rb",
-     "spec/apricoteatsgorilla/apricoteatsgorilla_spec.rb",
-     "spec/apricoteatsgorilla/apricoteatsgorilla_hash_to_xml_spec.rb"
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+    s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<hpricot>, ["= 0.8.241"])

data/lib/apricoteatsgorilla/apricoteatsgorilla.rb

@@ -10,6 +10,12 @@ end
 class ApricotEatsGorilla
   class << self
 
+    # SOAP namespaces by SOAP version.
+    SOAPNamespace = {
+      1 => "http://schemas.xmlsoap.org/soap/envelope/",
+      2 => "http://www.w3.org/2003/05/soap-envelope"
+    }
+
     # Flag to enable sorting of Hash keys.
     attr_accessor :sort_keys
 
@@ -107,7 +113,8 @@ class ApricotEatsGorilla
 
     # Builds a SOAP request envelope and includes the content of a given
     # +block+ into the envelope body. Accepts a Hash of additional +namespaces+
-    # to set.
+    # to set. Also accepts an optional +version+ to specify the SOAP envelope
+    # namespace to use by SOAP version.
     #
     # ==== Examples
     #
@@ -128,8 +135,9 @@ class ApricotEatsGorilla
     #   # =>      pureText
     #   # =>    </env:Body>
     #   # =>  </env:Envelope>'
-    def soap_envelope(namespaces = {})
-      namespaces[:env] = "http://schemas.xmlsoap.org/soap/envelope/"
+    def soap_envelope(namespaces = {}, version = 1)
+      namespaces[:env] = SOAPNamespace[version] unless
+        namespaces[:env] || SOAPNamespace[version].nil?
 
       xml_node("env:Envelope", namespaces) do
         xml_node("env:Body") { yield if block_given? }

data/spec/apricoteatsgorilla/apricoteatsgorilla_spec.rb

@@ -16,21 +16,37 @@ describe ApricotEatsGorilla do
   describe "soap_envelope" do
     before { ApricotEatsGorilla.sort_keys = true }
 
-    it "returns a SOAP envelope with an empty-element body tag" do
+    it "returns an empty SOAP envelope with a SOAP 1.1 envelope namespace" do
       ApricotEatsGorilla.soap_envelope.should ==
         '<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/">' <<
         '<env:Body /></env:Envelope>'
     end
-    
+
     it "returns a SOAP envelope with a custom namespace and body content" do
-      result = ApricotEatsGorilla.soap_envelope(:wsdl => "http://example.com") do
+      ApricotEatsGorilla.soap_envelope(:wsdl => "http://example.com") do
         "<id>123</id>"
-      end
-      result.should == '<env:Envelope' <<
+      end.should == '<env:Envelope' <<
         ' xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"' <<
         ' xmlns:wsdl="http://example.com">' <<
         '<env:Body><id>123</id></env:Body></env:Envelope>'
     end
+
+    it "does not change an already defined SOAP envelope namespace" do
+      ApricotEatsGorilla.soap_envelope(:env => "http://example.com").should ==
+        '<env:Envelope xmlns:env="http://example.com">' <<
+        '<env:Body /></env:Envelope>'
+    end
+
+    it "sets the SOAP envelope namespace for SOAP version 1.2 if requested" do
+      ApricotEatsGorilla.soap_envelope({}, 2).should ==
+        '<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope">' <<
+        '<env:Body /></env:Envelope>'
+    end
+
+    it "does not set a SOAP envelope namespace in case of an invalid SOAP version" do
+      ApricotEatsGorilla.soap_envelope({}, 123).should ==
+        '<env:Envelope><env:Body /></env:Envelope>'
+    end
   end
 
   # []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubiii-apricoteatsgorilla
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -33,7 +33,7 @@ dependencies:
         version: 1.2.8
     version: 
 description: SOAP communication helper.
-email: me@d-harrington.com
+email: me@rubiii.com
 executables: []
 
 extensions: []
@@ -54,7 +54,7 @@ files:
 - spec/apricoteatsgorilla/apricoteatsgorilla_xml_to_hash_spec.rb
 - spec/apricoteatsgorilla/xml_node_spec.rb
 - spec/spec_helper.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/rubiii/apricoteatsgorilla
 post_install_message: 
 rdoc_options: 
@@ -84,11 +84,11 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: SOAP communication helper.
 test_files: 
-- spec/spec_helper.rb
+- spec/apricoteatsgorilla/apricoteatsgorilla_hash_to_xml_spec.rb
+- spec/apricoteatsgorilla/apricoteatsgorilla_spec.rb
 - spec/apricoteatsgorilla/apricoteatsgorilla_xml_to_hash_spec.rb
 - spec/apricoteatsgorilla/xml_node_spec.rb
-- spec/apricoteatsgorilla/apricoteatsgorilla_spec.rb
-- spec/apricoteatsgorilla/apricoteatsgorilla_hash_to_xml_spec.rb
+- spec/spec_helper.rb