wash_out 0.2.2 → 0.2.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wash_out (0.2.1)
+    wash_out (0.2.3)
       nori
 
 GEM

data/README.md

@@ -18,7 +18,7 @@ action corresponds to a certain controller method; this mapping, as well as the
 by [soap_action][] method. Check the method documentation for complete info; here, only a few examples will be
 demonstrated.
 
-  [soap_action]: http://rubydoc.info/gems/wash_out/0.2.1/WashOut/SOAP/ClassMethods#soap_action-instance_method
+  [soap_action]: http://rubydoc.info/gems/wash_out/WashOut/SOAP/ClassMethods#soap_action-instance_method
 
 ```ruby
 # app/controllers/api_controller.rb
@@ -42,7 +42,7 @@ class ApiController < ApplicationController
   soap_action "AddCircle",
               :args   => { :circle => { :center => { :x => :integer,
                                                      :y => :integer },
-                                        :radius => :float } },
+                                        :radius => :double } },
               :return => [],
               :to     => :add_circle
   def add_circle

data/lib/wash_out/param.rb

@@ -25,11 +25,10 @@ module WashOut
     # Converts a generic externally derived Ruby value, such as String or
     # Hash, to a native Ruby object according to the definition of this type.
     def load(data)
+      check_if_missing(data)
+
       if struct?
-        data = ActiveSupport::HashWithIndifferentAccess.new(data)
-        @map.map do |param|
-          param.load(data[param.name])
-        end
+        map_struct(data) { |param, elem| param.load(elem) }
       else
         case type
           when 'string';  data.to_s
@@ -43,11 +42,10 @@ module WashOut
 
     # The opposite of #load.
     def store(data)
+      check_if_missing(data)
+
       if struct?
-        data = ActiveSupport::HashWithIndifferentAccess.new(data)
-        @map.map do |param|
-          param.store(data[param.name])
-        end
+        map_struct(data) { |param, elem| param.store(elem) }
       else
         data.to_s
       end
@@ -66,12 +64,12 @@ module WashOut
     # Parses a +definition+. The format of the definition is best described
     # by the following BNF-like grammar.
     #
-    # simple_type := :string | :integer | :double | :boolean
-    # nested_type := type_hash | simple_type | WashOut::Param instance
-    # type_hash   := { :parameter_name => nested_type, ... }
-    # definition  := [ WashOut::Param, ... ] |
-    #                type_hash |
-    #                simple_type
+    #   simple_type := :string | :integer | :double | :boolean
+    #   nested_type := type_hash | simple_type | WashOut::Param instance
+    #   type_hash   := { :parameter_name => nested_type, ... }
+    #   definition  := [ WashOut::Param, ... ] |
+    #                  type_hash |
+    #                  simple_type
     #
     # If a simple type is passed as the +definition+, a single Param is returned
     # with the +name+ set to "value".
@@ -94,5 +92,27 @@ module WashOut
         definition.to_a
       end
     end
+
+    private
+
+    # Used to load or store an entire structure.
+    def map_struct(data)
+      data   = data.with_indifferent_access
+      struct = {}.with_indifferent_access
+
+      # RUBY18 Enumerable#each_with_object is better, but 1.9 only.
+      @map.map do |param|
+        struct[param.name] = yield param, data[param.name]
+      end
+
+      struct
+    end
+
+    # Raise an appropriate exception if a required datum is missing.
+    def check_if_missing(data)
+      if data.nil?
+        raise WashOut::Dispatcher::SOAPError, "Required SOAP parameter #{@name} is missing"
+      end
+    end
   end
 end

data/lib/wash_out/router.rb

@@ -10,7 +10,10 @@ module WashOut
       controller = @controller_name.constantize
 
       soap_action = env['HTTP_SOAPACTION']
-      soap_action.force_encoding('UTF-8')
+
+      # RUBY18 1.8 does not have force_encoding.
+      soap_action.force_encoding('UTF-8') if soap_action.respond_to? :force_encoding
+
       soap_action.gsub!(/^\"(.*)\"$/, '\1')
 
       env['wash_out.soap_action'] = soap_action

data/lib/wash_out/version.rb

@@ -1,3 +1,3 @@
 module WashOut
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/wash_out_spec.rb

@@ -66,6 +66,28 @@ describe WashOut do
     end.to_hash[:value].should == '420k'
   end
 
+  it "should understand nested parameter specifications" do
+    mock_controller do
+      soap_action "getArea", :args   => { :circle => { :center => { :x => :integer,
+                                                                    :y => :integer },
+                                                       :radius => :double } },
+                             :return => { :area => :double,
+                                          :distance_from_o => :double },
+                             :to     => :get_area
+      def get_area
+        circle = params[:circle]
+        render :soap => { :area            => Math::PI * circle[:radius] ** 2,
+                          :distance_from_o => Math.sqrt(circle[:center][:x] ** 2 + circle[:center][:y] ** 2) }
+      end
+    end
+
+    client = savon_instance
+    client.request(:get_area) do
+      soap.body = { :circle => { :center => { :x => 3, :y => 4 },
+                                 :radius => 5 } }
+    end.to_hash.should == ({ :area => (Math::PI * 25).to_s, :distance_from_o => (5.0).to_s })
+  end
+
   it "should allow arbitrary action names" do
     mock_controller do
       soap_action "AnswerToTheUltimateQuestionOfLifeTheUniverseAndEverything",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wash_out
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-19 00:00:00.000000000 Z
+date: 2011-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nori
-  requirement: &70120807486540 !ruby/object:Gem::Requirement
+  requirement: &73419490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70120807486540
+  version_requirements: *73419490
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70120807486020 !ruby/object:Gem::Requirement
+  requirement: &73418980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70120807486020
+  version_requirements: *73418980
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70120807485520 !ruby/object:Gem::Requirement
+  requirement: &73418630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70120807485520
+  version_requirements: *73418630
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70120807484900 !ruby/object:Gem::Requirement
+  requirement: &73417730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70120807484900
+  version_requirements: *73417730
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &70120807484020 !ruby/object:Gem::Requirement
+  requirement: &73415050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70120807484020
+  version_requirements: *73415050
 description: Dead simple Rails 3 SOAP server library
 email: boris@roundlake.ru
 executables: []
@@ -134,12 +134,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -441958353
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -441958353
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10