wash_out 0.4.1 → 0.4.2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.4.2
+
+* Better camelization: reusable types and methods are now supported [@inossidabile][]
+
 ## 0.4.1
 
 * .NET-compliant :integer type WSDL [@inossidabile][]

data/Gemfile.lock

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

data/README.md

@@ -1,12 +1,10 @@
-WashOut
-========
+# WashOut
 
 WashOut is a gem that greatly simplifies creation of SOAP service providers.
 
 But if you have a chance, please [http://stopsoap.com/](http://stopsoap.com/).
 
-Compatibility
---------------
+## Compatibility
 
 Rails >3.0 only.
 
@@ -21,15 +19,13 @@ version and give us enough issues and pull-requests to make it work.
 All dependencies are JRuby-compatible so again it will work well in --1.9 mode but it can fail with
 fresh releases if you go --1.8.
 
-Installation
-------------
+## Installation
 
 In your Gemfile, add this line:
 
     gem 'wash_out'
 
-Usage
------
+## Usage
 
 A SOAP endpoint in WashOut is simply a Rails controller which includes the module WashOut::SOAP. Each SOAP
 action corresponds to a certain controller method; this mapping, as well as the argument definition, is defined
@@ -122,8 +118,7 @@ result.to_hash # => {:value=>"123abc"}
 
 Take a look at [WashOut sample application](https://github.com/roundlake/wash_out-sample).
 
-Reusable types
----------
+## Reusable types
 
 Basic inline types definition is fast and furious for the simple cases. You have an option to describe SOAP types
 inside separate classes for the complex ones. Here's the way to do that:
@@ -149,8 +144,7 @@ To use defined type inside your inline declaration, pass the class instead of ty
 Note that WashOut extends the `ActiveRecord` so every model you use is already a WashOut::Type and can be used
 inside your interface declarations.
 
-Configuration
----------
+## Configuration
 
 Use `config.wash_out...` inside your environment configuration to setup WashOut.
 
@@ -161,21 +155,27 @@ Available properties are:
 * **snakecase_input**: Determines if WashOut should modify parameters keys to snakecase. Default is `false`.
 * **camelize_wsdl**: Determinse if WashOut should camelize types within WSDL and responses. Default is `false`.
 
-Credits
--------
+### Camelization
+
+Note that WSDL camelization will affect method names but only if they were given as a symbol:
+
+```ruby
+soap_action :foo  # this will be affected
+soap_action "foo" # this will be passed as is
+```
+
+## Credits
 
 <img src="http://roundlake.ru/assets/logo.png" align="right" />
 
 * Boris Staal ([@_inossidabile](http://twitter.com/#!/_inossidabile))
 * Peter Zotov ([@whitequark](http://twitter.com/#!/whitequark))
 
-Contributors
-------------
+## Contributors
 
 * Björn Nilsson ([@Bjorn-Nilsson](https://github.com/Bjorn-Nilsson))
 * Tobias Bielohlawek ([@rngtng](https://github.com/rngtng))
 
-LICENSE
--------
+## LICENSE
 
 It is free software, and may be redistributed under the terms of MIT license.

data/lib/wash_out/soap.rb

@@ -14,7 +14,17 @@ module WashOut
       # An optional option :to can be passed to allow for names of SOAP actions
       # which are not valid Ruby function names.
       def soap_action(action, options={})
-        self.soap_actions[action.to_s] = {
+        if action.is_a?(Symbol)
+          if WashOut::Engine.camelize_wsdl.to_s == 'lower'
+            options[:to] ||= action.to_s
+            action         = action.to_s.camelize(:lower)
+          elsif WashOut::Engine.camelize_wsdl
+            options[:to] ||= action.to_s
+            action         = action.to_s.camelize
+          end
+        end
+
+        self.soap_actions[action] = {
           :in     => WashOut::Param.parse_def(options[:args]),
           :out    => WashOut::Param.parse_def(options[:return]),
           :to     => options[:to] || action

data/lib/wash_out/type.rb

@@ -14,8 +14,14 @@ module WashOut
     end
 
     def self.wash_out_param_name
-      return name.underscore unless @param_type_name
+      @param_type_name ||= name.underscore
       @param_type_name
+
+      if WashOut::Engine.camelize_wsdl.to_s == 'lower'
+        @param_type_name = @param_type_name.camelize(:lower)
+      elsif WashOut::Engine.camelize_wsdl
+        @param_type_name = @param_type_name.camelize
+      end
     end
   end
 end

data/lib/wash_out/version.rb

@@ -1,3 +1,3 @@
 module WashOut
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/wash_out/type_spec.rb

@@ -13,10 +13,10 @@ describe WashOut::Type do
       map :foo => Abraka1
     end
 
-    Abraka1.wash_out_param_name.should == 'abraka1'
+    Abraka1.wash_out_param_name.should == 'Abraka1'
     Abraka1.wash_out_param_map.should == {:test => :string}
 
-    Abraka2.wash_out_param_name.should == 'test'
+    Abraka2.wash_out_param_name.should == 'Test'
     Abraka2.wash_out_param_map.should == {:foo => Abraka1}
   end
 

data/spec/wash_out_spec.rb

@@ -23,7 +23,7 @@ describe WashOut do
 
   it "should generate WSDL" do
     mock_controller do
-      soap_action "answer", :args => nil, :return => :int
+      soap_action :result, :args => nil, :return => :int
       def answer
         render :soap => "42"
       end
@@ -49,13 +49,13 @@ describe WashOut do
 
     # Savon underscores method names so we
     # get back just what we have at controller
-    client.wsdl.soap_actions.should == [:answer, :get_area, :rocky]
+    client.wsdl.soap_actions.should == [:result, :get_area, :rocky]
 
     x = xml[:definitions][:types][:schema][:complex_type].find{|x| x[:'@name'] == 'Center'}[:sequence][:element].find{|x| x[:'@name'] == 'X'}
     x[:'@min_occurs'].should == "0"
     x[:'@max_occurs'].should == "unbounded"
 
-    xml[:definitions][:binding][:operation].map{|e| e[:'@name']}.should == ['answer', 'getArea', 'rocky']
+    xml[:definitions][:binding][:operation].map{|e| e[:'@name']}.should == ['Result', 'getArea', 'rocky']
 
     client.wsdl.xml.include?('<xsd:complexType name="Circle1">').should == true
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wash_out
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000 Z
+date: 2012-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nori
-  requirement: &70183612678980 !ruby/object:Gem::Requirement
+  requirement: &70248126040800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70183612678980
+  version_requirements: *70248126040800
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70183612678160 !ruby/object:Gem::Requirement
+  requirement: &70248126040380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70183612678160
+  version_requirements: *70248126040380
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70183612701640 !ruby/object:Gem::Requirement
+  requirement: &70248126039960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70183612701640
+  version_requirements: *70248126039960
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70183612700480 !ruby/object:Gem::Requirement
+  requirement: &70248126055900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70183612700480
+  version_requirements: *70248126055900
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &70183612699180 !ruby/object:Gem::Requirement
+  requirement: &70248126055480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70183612699180
+  version_requirements: *70248126055480
 description: Dead simple Rails 3 SOAP server library
 email: boris@roundlake.ru
 executables: []