shapewear 0.1.4 → 0.1.5

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.1.5
+* #camelize in parameters and complex types is only called if they are declared as symbols.
+  This allows usage of custom character casing when writing the SOAP services.
+* Parameters are now camelized with first letter as lowercase.
+
 ## 0.1.4
 * Parameters are now read in the correct order, as specified in the metadata;
 * Complex return types are now working correctly;

data/lib/shapewear.rb

@@ -24,11 +24,37 @@ module Shapewear
   end
 end
 
-# defines String.camelize if it is not defined by, e.g. Rails
-unless ''.respond_to? :camelize
-  class String
-    def camelize
-      self.split('_').map(&:capitalize).join
+# defines String.camelize and String.underscore, if it is not defined by, e.g. Rails
+class String
+  unless ''.respond_to? :camelize
+    def camelize(first_letter_in_uppercase = true)
+      if first_letter_in_uppercase
+        self.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+      else
+        self.to_s[0].chr.downcase + self.camelize[1..-1]
+      end
+    end
+  end
+
+  unless ''.respond_to? :underscore
+    def underscore
+      word = self.to_s.dup
+      word.gsub!(/::/, '/')
+      word.gsub!(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+      word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+      word.tr!("-", "_")
+      word.downcase!
+      word
+    end
+  end
+end
+
+class Object
+  def camelize_if_symbol(first_letter_in_uppercase = true)
+    if is_a?(Symbol) then
+      to_s.camelize(first_letter_in_uppercase)
+    else
+      to_s
     end
   end
 end

data/lib/shapewear/request.rb

@@ -71,8 +71,8 @@ module Shapewear::Request
       logger.debug "Operation node: #{node.inspect}"
       r = []
       op_options[:parameters].each do |p|
-        logger.debug "  Looking for: tns:#{p.first.to_s.camelize}"
-        v = node.xpath("tns:#{p.first.to_s.camelize}", namespaces).first
+        logger.debug "  Looking for: tns:#{p.first.camelize_if_symbol(false)}"
+        v = node.xpath("tns:#{p.first.camelize_if_symbol(false)}", namespaces).first
         if v.nil?
           # does nothing
         elsif p.last == Fixnum
@@ -124,14 +124,16 @@ module Shapewear::Request
         obj[field]
       elsif obj.respond_to?(field)
         obj.send(field)
+      elsif obj.respond_to?(field.underscore)
+        obj.send(field.underscore)
       else
         raise "Could not extract #{field.inspect} from object: #{obj.inspect}"
       end
 
       if v.nil?
-        builder.tag! field.to_s.camelize, 'xsi:nil' => 'true'
+        builder.tag! field.camelize_if_symbol, 'xsi:nil' => 'true'
       else
-        builder.tag! field.to_s.camelize, v
+        builder.tag! field.camelize_if_symbol, v
       end
     end
 

data/lib/shapewear/version.rb

@@ -2,6 +2,6 @@
 
 module Shapewear
 
-  Version = "0.1.4"
+  Version = "0.1.5"
 
 end

data/lib/shapewear/wsdl.rb

@@ -92,7 +92,7 @@ module Shapewear::WSDL
           params.each do |p|
             t = p.last
             param_name = p.first
-            param_name = param_name.to_s.camelize if param_name.is_a?(Symbol)
+            param_name = param_name.camelize_if_symbol(false)
             if t.nil?
               xseq.element :name => param_name, :minOccurs => 0, :maxOccurs => 1, :type => 'xsd:any'
             elsif t.is_a?(Class)
@@ -135,7 +135,7 @@ module Shapewear::WSDL
       xschema.complexType :name => "#{op_options[:public_name]}Struct" do |xctr|
         xctr.sequence do |xseqr|
           ret.each do |name, type|
-            name = name.to_s.camelize if name.is_a?(Symbol)
+            name = name.camelize_if_symbol
             xseqr.element :name => name, :minOccurs => 0, :maxOccurs => 1, :type => to_xsd_type(type)
           end
         end

data/spec/shapewear/savon_usage_spec.rb

@@ -16,7 +16,7 @@ describe Shapewear do
       it "should work for simple requests" do
         client = Savon::Client.new 'http://services.example.com/complete/soap/wsdl'
         response = client.request :echo_in_uppercase, :xmlns => 'http://services.example.com/v1' do
-          soap.body = { 'Text' => 'uppercase text' }
+          soap.body = { :text => 'uppercase text' }
         end
 
         puts response.inspect
@@ -28,7 +28,7 @@ describe Shapewear do
       it "should work for structured responses from objects" do
         client = Savon::Client.new 'http://services.example.com/complete/soap/wsdl'
         response = client.request :get_structured_data, :xmlns => 'http://services.example.com/v1' do
-          soap.body = { 'Id' => 0 }
+          soap.body = { 'ID' => 0 }
         end
 
         r = response.body[:get_structured_data_response][:get_structured_data_result]
@@ -39,7 +39,7 @@ describe Shapewear do
       it "should work for structured responses from hashes" do
         client = Savon::Client.new 'http://services.example.com/complete/soap/wsdl'
         response = client.request :get_structured_data, :xmlns => 'http://services.example.com/v1' do
-          soap.body = { 'Id' => 1 }
+          soap.body = { 'ID' => 1 }
         end
 
         r = response.body[:get_structured_data_response][:get_structured_data_result]
@@ -52,7 +52,7 @@ describe Shapewear do
 
         expect {
           client.request :get_structured_data, :xmlns => 'http://services.example.com/v1' do
-            soap.body = { 'Id' => 55 }
+            soap.body = { 'ID' => 55 }
           end
         }.to raise_error Savon::SOAP::Fault, "(e:Server.RuntimeError) ID must be 0 or 1"
       end
@@ -63,7 +63,7 @@ describe Shapewear do
         expect {
           client.request :get_structured_data, :xmlns => 'http://services.example.com/v1' do
             soap.version = 2
-            soap.body = { 'Id' => 55 }
+            soap.body = { 'ID' => 55 }
           end
         }.to raise_error Savon::SOAP::Fault, "(e:Server.RuntimeError) ID must be 0 or 1"
       end

data/spec/shapewear/service_definitions/complete_service.rb

@@ -17,8 +17,8 @@ class CompleteService
             :returns => Fixnum
 
   operation :get_structured_data, :documentation => 'Returns structured data. 0 uses a Hash, 1 uses a struct, any other value raises a fault',
-            :parameters => [[:id, Fixnum]],
-            :returns => {:text => String, :random_value => Fixnum, :created_at => DateTime}
+            :parameters => [['ID', Fixnum]],
+            :returns => { :text => String, :random_value => Fixnum, :created_at => DateTime, 'XYZ' => String }
 
   def echo_in_uppercase(text)
     text.upcase unless text.nil?
@@ -33,19 +33,20 @@ class CompleteService
       when 0 then
         Structured.new('text from the struct')
       when 1 then
-        {:text => 'text from a hash', :random_value => rand(999), @created_at => DateTime.now}
+        { :text => 'text from a hash', :random_value => rand(999), :created_at => DateTime.now }
       else
         raise "ID must be 0 or 1"
     end
   end
 
   class Structured
-    attr_reader :text, :random_value, :created_at
+    attr_reader :text, :random_value, :created_at, :xyz
 
     def initialize(text)
       @text = text
       @random_value = rand(999)
       @created_at = DateTime.now
+      @xyz = 'xyz'
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shapewear
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - "F\xC3\xA1bio Batista"