shapewear 0.1.5 → 0.1.7

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.7
+* Better key lookup on hashes.
+* Changed #camelize to work the same way as in Rails.
+
 ## 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.

data/lib/shapewear.rb

@@ -27,18 +27,18 @@ end
 # 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 }
+    def camelize(first_letter = :upper)
+      if first_letter == :upper
+        self.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
       else
-        self.to_s[0].chr.downcase + self.camelize[1..-1]
+        self[0].chr.downcase + self.camelize[1..-1]
       end
     end
   end
 
   unless ''.respond_to? :underscore
     def underscore
-      word = self.to_s.dup
+      word = self.dup
       word.gsub!(/::/, '/')
       word.gsub!(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
       word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
@@ -50,11 +50,11 @@ class String
 end
 
 class Object
-  def camelize_if_symbol(first_letter_in_uppercase = true)
-    if is_a?(Symbol) then
-      to_s.camelize(first_letter_in_uppercase)
+  def camelize_if_symbol(first_letter = :upper)
+    if self.is_a?(Symbol)
+      self.to_s.camelize(first_letter)
     else
-      to_s
+      self.to_s
     end
   end
-end
+end

data/lib/shapewear/request.rb

@@ -67,12 +67,17 @@ module Shapewear::Request
       raise "Operation not found: #{@op_node.name}"
     end
 
+    # Extracts all parameters from the operation node, and return as an array.
+    #
+    # @param op_options [Hash] The operation options.
+    # @param node [Nokogiri::XML] The operation node.
+    # @return [Array] The parsed parameters.
     def extract_parameters(op_options, node)
       logger.debug "Operation node: #{node.inspect}"
       r = []
       op_options[:parameters].each do |p|
-        logger.debug "  Looking for: tns:#{p.first.camelize_if_symbol(false)}"
-        v = node.xpath("tns:#{p.first.camelize_if_symbol(false)}", namespaces).first
+        logger.debug "  Looking for: tns:#{p.first.camelize_if_symbol(:lower)}"
+        v = node.xpath("tns:#{p.first.camelize_if_symbol(:lower)}", namespaces).first
         if v.nil?
           # does nothing
         elsif p.last == Fixnum
@@ -88,6 +93,10 @@ module Shapewear::Request
       r
     end
 
+    # Serializes the result of an operation as a SOAP Envelope.
+    #
+    # @param op_options [Hash] The operation options.
+    # @param r [Hash,Object] The operation result.
     #noinspection RubyArgCount
     def serialize_soap_result(op_options, r)
       xb = Builder::XmlMarkup.new
@@ -96,7 +105,6 @@ module Shapewear::Request
       xb.Envelope :xmlns => soap_env_ns, 'xmlns:xsi' => namespaces['xsi'] do |xenv|
         xenv.Body do |xbody|
           xbody.tag! "#{op_options[:public_name]}Response", :xmlns => namespaces['tns'] do |xresp|
-
             if r.nil?
               xresp.tag! "#{op_options[:public_name]}Result", 'xsi:nil' => 'true'
             else
@@ -119,9 +127,15 @@ module Shapewear::Request
       end
     end
 
+    # Extracts a field from an object, casts it to the appropriate type, and serializes as XML.
+    #
+    # @param builder [Builder::XmlMarkup] The XML builder.
+    # @param obj [Hash,Object] The resulting object.
+    # @param field [Symbol,String] The field to extract.
+    # @param type [Class] The type to convert.
     def extract_and_serialize_value(builder, obj, field, type)
       v = if obj.is_a?(Hash)
-        obj[field]
+        obj[field] or obj[field.underscore]
       elsif obj.respond_to?(field)
         obj.send(field)
       elsif obj.respond_to?(field.underscore)
@@ -137,6 +151,10 @@ module Shapewear::Request
       end
     end
 
+    # Serializes an exception as a SOAP Envelope containing a SOAP Fault.
+    #
+    # @param ex [Exception] The Exception to serialize.
+    # @return [String] The SOAP Envelope containing the Fault.
     #noinspection RubyArgCount
     def serialize_soap_fault(ex)
       logger.debug "Serializing SOAP Fault: #{ex.inspect}"
@@ -167,6 +185,9 @@ module Shapewear::Request
       end
     end
 
+    # Returns the correct SOAP Envelope namespace.
+    #
+    # @return [String] The correct SOAP Envelope namespace.
     def soap_env_ns
       case soap_version
         when :soap11

data/lib/shapewear/version.rb

@@ -2,6 +2,6 @@
 
 module Shapewear
 
-  Version = "0.1.5"
+  Version = "0.1.7"
 
 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.camelize_if_symbol(false)
+            param_name = param_name.camelize_if_symbol(:lower)
             if t.nil?
               xseq.element :name => param_name, :minOccurs => 0, :maxOccurs => 1, :type => 'xsd:any'
             elsif t.is_a?(Class)

metadata

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