wash_away_the_soap 0.1.0 → 0.2.0

data/lib/wash_away_the_soap.rb

@@ -3,7 +3,7 @@ require "bundler/setup"
 require "nokogiri"
 
 class WashAwayTheSoap
-  attr_accessor :wsdls, :xsds, :wsdl_operations, :xsd_objects
+  attr_accessor :wsdls, :xsds, :wsdl_operations, :xsd_objects, :complex_objects, :temp_objects
   
   class << self
     def parse
@@ -14,6 +14,8 @@ class WashAwayTheSoap
   def initialize
     @wsdl_operations = []
     @xsd_objects = {}
+    @complex_objects = {}
+    @temp_objects = {}
     @wsdls = []
     @xsds = []
   end
@@ -38,23 +40,44 @@ class WashAwayTheSoap
     end
   rescue => e
     puts "Error parsing wsdl file #{filename}"
+    exit 1
   end
   
   def parse_xsd(xsd, filename = nil)
     doc = Nokogiri::XML(xsd)
-    doc.xpath("//xs:sequence//xs:element", doc.root.namespaces).each do |field|
+    doc.xpath("//xs:element//xs:sequence//xs:element", doc.root.namespaces).each do |field|
       operation = field.parent.parent.parent.attributes["name"]
       unless operation.nil?
         next unless operation.value
         next unless field.attributes["name"]
         operation_name = operation.value
         field_name = field.attributes["name"].value
-        field_type, allow_blank, required = "unknown", false, false
-        field_type = field.attributes["type"].value.gsub(/^xs:/, "") if field.attributes["type"]
-        allow_blank = (field.attributes["nillable"].value ? true : false) if field.attributes["nillable"]
-        required = (field.attributes["minOccurs"].value.to_i > 0 ? true : false) if field.attributes["minOccurs"]
+
         xsd_objects[operation_name] ||= {}
-        xsd_objects[operation_name][field_name] ||= {"type" => field_type, "allow_blank" => allow_blank, "required" => required}
+        xsd_objects[operation_name][field_name] ||= build_field_attributes(field)
+      end
+    end
+    doc.xpath("//xs:complexType//xs:element", doc.root.namespaces).each do |field|
+      if field.parent.parent.parent == doc.root
+        if field.attributes["type"].value =~ /tns:.*/
+          complex_name = field.parent.parent.attributes["name"].value
+          field_name = field.attributes["name"].value
+          complex_objects[complex_name] ||= {}
+          complex_objects[complex_name][field_name] ||= -1
+        else
+          complex_name = field.parent.parent.attributes["name"].value
+          field_name = field.attributes["name"].value
+          temp_objects[complex_name] ||= {}
+          temp_objects[complex_name][field_name] ||= build_field_attributes(field)
+        end
+      end
+    end
+    
+    complex_objects.each do |key, hash|
+      hash.each do |k, v|
+        if v == -1
+          complex_objects[key][k] = temp_objects[k] # inplace modification horribleness
+        end
       end
     end
   rescue => e
@@ -62,6 +85,23 @@ class WashAwayTheSoap
     exit 1
   end
   
+  def build_field_attributes(nokogiri_element)
+    field_type, allow_blank, required = "unknown", false, false
+
+    field_type = nokogiri_element.attributes["type"].value.gsub(/^xs:/, "") if nokogiri_element.attributes["type"]
+    allow_blank = (nokogiri_element.attributes["nillable"].value ? true : false) if nokogiri_element.attributes["nillable"]
+    required = (nokogiri_element.attributes["minOccurs"].value.to_i > 0 ? true : false) if nokogiri_element.attributes["minOccurs"]
+    {"type" => field_type, "allow_blank" => allow_blank, "required" => required}
+  end
+  
+  def build_field_options(values)
+    field_options = []
+    field_options << values["type"]
+    field_options << "required" if values["required"]
+    field_options << "no_blanks" unless values["allow_blank"]
+    field_options.join(", ")
+  end
+  
   def build_results
     output = []
     longest_field_name = 0
@@ -77,11 +117,21 @@ class WashAwayTheSoap
       output << operation
       if xsd_objects[operation]
         xsd_objects[operation].each do |field, values|
-          field_options = []
-          field_options << values["type"]
-          field_options << "required" if values["required"]
-          field_options << "no_blanks" unless values["allow_blank"]
-          output << " #{field.rjust(longest_field_name)}: #{field_options.join(', ')}"
+          if values["type"] =~ /.*:.*/ && complex_objects.keys.include?(values["type"].split(":").last)
+            complex_name = values["type"].split(":").last
+            complex_line = " #{field.rjust(longest_field_name)}: #{complex_name}"
+            output << complex_line
+            
+            complex_objects[complex_name].each do |object_name, fields|
+              object_line = "- #{object_name}".rjust(complex_line.length + 1)
+              output << object_line
+              fields.each do |field_name, complex_values|
+                output << "   #{field_name.rjust(object_line.length + 5)}: #{build_field_options(complex_values)}"
+              end
+            end
+          else
+            output << " #{field.rjust(longest_field_name)}: #{build_field_options(values)}"
+          end
         end
       else
         output << " - no fields found?"

data/spec/wash_away_the_soap_spec.rb

@@ -49,6 +49,17 @@ describe WashAwayTheSoap do
         <xs:simpleType name="ignoredSimpleType">
           <xs:restriction base="xs:int" />
         </xs:simpleType>
+        <xs:complexType name="ArrayOfStuff">
+          <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="unbounded" name="SOME_STUFF" nillable="true" type="tns:SOME_STUFF" />
+          </xs:sequence>
+        </xs:complexType>
+        <xs:element name="ArrayOfStuff" nillable="true" type="tns:ArrayOfStuff" />
+        <xs:complexType name="SOME_STUFF">
+          <xs:sequence>
+            <xs:element minOccurs="0" name="SOME_COMPLEX_FIELD" nillable="true" type="xs:dateTime" />
+          </xs:sequence>
+        </xs:complexType>
       </xs:schema>
       XML
       subject.parse_xsd(@xsd_doc)
@@ -74,6 +85,11 @@ describe WashAwayTheSoap do
       subject.xsd_objects["OperationFoo"]["NillableStringField"]["allow_blank"].should be_true
     end
     
+    it "records complex types for later use" do
+      subject.complex_objects["ArrayOfStuff"].should == {"SOME_STUFF" => {"SOME_COMPLEX_FIELD" => 
+                                                         {"allow_blank" => true, "required" => false, "type" => "dateTime"}}}
+    end
+
   end
   describe "#build_results" do
     before do
@@ -89,6 +105,9 @@ describe WashAwayTheSoap do
               <soap:body use="literal" />
             </wsdl:output>
           </wsdl:operation>
+          <wsdl:operation name="OperationBar">
+            <soap:operation soapAction="http://tempuri.org/SomeService/OperationBar" style="document" />
+          </wsdl:operation>
         </wsdl:binding>
       </wsdl:definitions>
       XML
@@ -104,6 +123,24 @@ describe WashAwayTheSoap do
             </xs:sequence>
           </xs:complexType>
         </xs:element>
+        <xs:element name="OperationBar">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element xmlns:q10="http://whatever" minOccurs="0" name="someName" nillable="true" type="q10:ArrayOfStuff" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:complexType name="ArrayOfStuff">
+          <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="unbounded" name="SOME_STUFF" nillable="true" type="tns:SOME_STUFF" />
+          </xs:sequence>
+        </xs:complexType>
+        <xs:element name="ArrayOfStuff" nillable="true" type="tns:ArrayOfStuff" />
+        <xs:complexType name="SOME_STUFF">
+          <xs:sequence>
+            <xs:element minOccurs="0" name="SOME_COMPLEX_FIELD" nillable="true" type="xs:dateTime" />
+          </xs:sequence>
+        </xs:complexType>
       </xs:schema>
       XML
       subject.parse_xsd(@xsd_doc)
@@ -115,6 +152,10 @@ OperationFoo
  UnrequiredNumberField: decimal, no_blanks
      RequiredDateField: dateTime, required, no_blanks
    NillableStringField: string
+OperationBar
+              someName: ArrayOfStuff
+                         - SOME_STUFF
+                           SOME_COMPLEX_FIELD: dateTime
       EOS
     end
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Michael Schubert