washout_builder 0.13.1 → 0.13.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjE2OTY2YzkwZDc4ZmY3OWQ2YTkyYzM5ODA0MmY3ZjRlMDI4YzYwMw==
+    NjdhNzFiNjYwNDg0M2U0ZGQ5ZTcxNjg3NWIzMDJiYmIzYjZmYTI4MQ==
   data.tar.gz: !binary |-
-    YzJjNDYzMGVhNjk3N2FjZmQ1NmM2ZDg2ODFmZGQ5OTMwYzVlM2M1YQ==
+    NmY0Y2ZiM2NjZWQzYzEwZTNhZThhNjJkYzczNzczOGI3Y2M0NGYzYw==
 SHA512:
   metadata.gz: !binary |-
-    ZDQ3YjEzZTIyNzIzOGVlM2RlODE0ZDAzMzExMzQ2NThmZmQ5YjA1NWI3ZGZl
-    NGMzNGNhMGIzY2I2OTU1MjFhNzdmZDljYTZjODFjYzI0YTAyODhmZjAwZDgy
-    ZTE1MTdjY2RiZGY4MzdhNzNmODEwZWJlYmNhY2NkZDBmNmU2NTc=
+    MDc1YjY5MDBjYjkyYWIyMmE3MTE0M2ZlZGE2OGY1OTQzZDAxZTNiNGU4YWRj
+    ZTQzODRlZmUyZmIwYzUxNzBmY2RmMTEwYjQzNDk0NDE2MjBhMmFkMjFmZjJh
+    Y2NkZTNlYmQ1ZDU4YjZjODQxOGI2ZmJiNDA0ZjI1MjFmN2E3ZjE=
   data.tar.gz: !binary |-
-    ZTkzZDBjODdlOGRmOWY0YWU5OGJjZWMyNWJkYmFkNmQ1MmM3MmY3ZmMzOWQ3
-    MzcwZjFiZDNiZjc5ODZiZTdlMDc0YTg3YzQxNzRhNzE3NjUzNzc3MjhkZjNh
-    NDQ5OTcyODBjYzZiODhlZjlmYTI1MzAyOWNlNDcwNTQ4YWQ5ZWQ=
+    Y2Y3MTRjNzZkYWE0MjUyZDRlMDE1YmZkNDgxYzdiOWMxMzRlYzdmYjRkMTg5
+    M2NjNjI4ZDgwOTczZTlkM2JmYWJmYmIyYTdhZGQ0NjZhYWE4N2Q0ZWUyZTlj
+    ODM3OWVhNWQwMmE1YjM3ZTllNjExNWUwMGM5NGIxMjEzN2IyOGM=

data/app/views/wash_with_html/doc.builder

@@ -50,7 +50,7 @@ xml.html( "xmlns" => "http://www.w3.org/1999/xhtml" ) {
 
       xml.h2 "Index "
       @complex_types =  @document.complex_types
-      @fault_types, @fault_complex_types = @document.fault_types
+      @fault_types = @document.fault_types
       unless @complex_types.blank?
         xml.p  "Complex Types: "
       
@@ -58,11 +58,6 @@ xml.html( "xmlns" => "http://www.w3.org/1999/xhtml" ) {
           @complex_types.each do |hash|
             xml.li { |y| y << "<a href='##{hash[:class]}'><span class='pre'>#{hash[:class]}</span></a>" }
           end
-          unless @fault_complex_types.blank?
-            @fault_complex_types.each do |hash| 
-              xml.li { |y| y << "<a href='##{hash[:fault].to_s}'><span class='pre'>#{hash[:fault].to_s}</span></a>" } 
-            end
-          end
         end
       
       end

data/lib/washout_builder/document/exception_model.rb

@@ -37,25 +37,7 @@ module WashoutBuilder
         get_virtus_model_structure.delete_if{|key,value|  keys.include?(key) }
       end
        
-      
-#      def attr_details_array?(attr_details)
-#        attr_details[:primitive].to_s.downcase == "array" 
-#      end
-#      
-#      def attr_details_basic_type?(attr_details, field)
-#        WashoutBuilder::Type::BASIC_TYPES.include?(attr_details[field.to_sym].to_s.downcase)
-#      end
-      
-#      def get_virtus_member_type_primitive(attr_details)
-#        complex_class = nil
-#        if attr_details_array?(attr_details) && !attr_details_basic_type?(attr_details, "member_type")
-#          complex_class = attr_details[:member_type]
-#        elsif !attr_details_array?(attr_details) && !attr_details_basic_type?(attr_details, "primitive")
-#          complex_class = attr_details[:primitive]
-#        end
-#        complex_class
-#      end
-# 
+       
       
       def get_exception_attributes
         attrs = self.instance_methods.find_all do |method|
@@ -86,19 +68,7 @@ module WashoutBuilder
         return h
       end
       
-      
-#      def self.extract_nested_complex_types(complex_class, complex_types)
-#        unless complex_class.nil?
-#          param_class = complex_class.is_a?(Class) ? complex_class : complex_class.constantize rescue nil
-#          if param_class.present? && WashoutBuilder::Type.valid_fault_class?(param_class)
-#            param_class.send :extend, WashoutBuilder::Document::ExceptionModel
-#            param_class.get_fault_class_ancestors( complex_types)
-#          elsif param_class.present? && !WashoutBuilder::Type.valid_fault_class?(param_class)
-#            raise RuntimeError, "Non-existent use of `#{param_class}` type name or this class does not inherit from SoapError. Consider using classified types that include SoapError  for exception classes."
-#          end 
-#        end
-#      end
-      
+          
     end
   end
 end

data/lib/washout_builder/document/generator.rb

@@ -92,40 +92,19 @@ module WashoutBuilder
         exceptions_raised.select { |x|  WashoutBuilder::Type.valid_fault_class?(x)  }  unless actions_with_exceptions.blank?
       end
       
-      def get_complex_fault_types(fault_types)
+      def get_complex_fault_types(base_fault_array)
+        fault_types =[]
         defined  = filter_exceptions_raised
-        if defined.blank?
-          defined = [WashoutBuilder::Type.get_fault_classes.first]
-        else
-          defined  << WashoutBuilder::Type.get_fault_classes.first
-        end
+        defined = defined.blank? ?  base_fault_array  :  defined.concat(base_fault_array)
         defined.each{ |exception_class|  exception_class.get_fault_class_ancestors( fault_types, true)}  unless   defined.blank?
         fault_types 
       end
       
       def fault_types
-        fault_types = get_complex_fault_types([])
-     #   complex_types = extract_nested_complex_types_from_exceptions(fault_types)
-        complex_types.delete_if{ |hash|  fault_types << hash   if  WashoutBuilder::Type.valid_fault_class?(hash[:fault])  } unless complex_types.blank?
-        fault_types = sort_complex_types(fault_types, "fault")
-        complex_types = sort_complex_types(complex_types, "fault")
-        [fault_types, complex_types]
-      end
-      
-#      def extract_nested_complex_types_from_exceptions(fault_types)
-#        complex_types = []
-#        fault_types.each do |hash| 
-#          hash[:structure].each do |attribute, attr_details|
-#            complex_class = hash[:fault].get_virtus_member_type_primitive(attr_details)
-#            WashoutBuilder::Document::ExceptionModel.extract_nested_complex_types(complex_class, complex_types)
-#          end
-#        end
-#        complex_types
-#      end
-      
-       
-       
-    
+         base_fault =[WashoutBuilder::Type.get_fault_classes.first]
+        fault_types = get_complex_fault_types(base_fault)
+        sort_complex_types(fault_types, "fault")
+      end
       
     end
   end

data/lib/washout_builder/version.rb

@@ -1,3 +1,3 @@
 module WashoutBuilder
-  VERSION = "0.13.1"
+  VERSION = "0.13.2"
 end

data/spec/lib/washout_builder/document/exception_model_spec.rb

@@ -14,18 +14,18 @@ describe WashoutBuilder::Document::ExceptionModel do
   it "gets the strcuture" do
     subject.get_virtus_model_structure.should eq({"code"=>{:primitive=>"integer", :member_type=>nil}, "message"=>{:primitive=>"string", :member_type=>nil}, "backtrace"=>{:primitive=>"string", :member_type=>nil}})
   end
-  
-  it "gets the member type for arrays" do
-    subject.get_virtus_member_type_primitive({:primitive=>"Array", :member_type=>"SomeInexistentClass"}).should eq("SomeInexistentClass")
-  end
-  
-  it "gets the member type for clasified types" do
-    subject.get_virtus_member_type_primitive({:primitive=>"SomeInexistentClass", :member_type=>nil}).should eq("SomeInexistentClass")
-  end
-    
-  it "returns nil because is not a classified object" do
-    subject.get_virtus_member_type_primitive({:primitive=>"integer", :member_type=>nil}).should eq(nil)
-  end
+#  
+#  it "gets the member type for arrays" do
+#    subject.get_virtus_member_type_primitive({:primitive=>"Array", :member_type=>"SomeInexistentClass"}).should eq("SomeInexistentClass")
+#  end
+#  
+#  it "gets the member type for clasified types" do
+#    subject.get_virtus_member_type_primitive({:primitive=>"SomeInexistentClass", :member_type=>nil}).should eq("SomeInexistentClass")
+#  end
+#    
+#  it "returns nil because is not a classified object" do
+#    subject.get_virtus_member_type_primitive({:primitive=>"integer", :member_type=>nil}).should eq(nil)
+#  end
   
     
   it "gets the strcuture" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: washout_builder
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - bogdanRada