washout_builder 0.11.2 → 0.11.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWJiN2YxMDQ0NDg1ZGY0N2U4Y2Q0NWM5MjE1MjMyMTJkMjM0NzM5Nw==
+    YTY0YWEzYzBmZTdjMmVmMWU5MzFkNzE1OTYwZjQ2OTA1YWUxODc3MQ==
   data.tar.gz: !binary |-
-    NjUzYzA4YTc2MTBmOTg0ZDRkZWNlZDRkZWY5NzAzYmVjZmNiOTVjMA==
+    Yzg2MGQ2MjAxNGU4ZWI2YjRlOTE5MzkxOWQwMGIyOWJkN2M3NDUwZg==
 SHA512:
   metadata.gz: !binary |-
-    NTk4YmY4Y2ZlYjhjOWYyNzBmOGFiM2I4MjU5NmUxMmUyYzM2MDQ3OGRlNTI0
-    ZGNhZjNjZjBjYmY1MmUyNDg0MGVlYTVlYmQ3Nzc4OWQzOGI0MGNmNmMzMzM0
-    MTY4NjUzYzEyNTIxZDRmNjU5NThmYmZjM2I1YTcwYjg4ZjFhMDQ=
+    NmI3N2U5OTdmZTAzMjRmZWRjYzBiYWZmZDE3OTdhOTM0NGNjNTg3Yzk2YjU2
+    YTc3ZDUwYWE4NWJjZmNkZGNhZjMzZTI2NDkyYmYzYTc0OTEwZmEyNDRlMTkz
+    ODI1MDYwMGY3MDU0NGEyMmZhNDhkNTBhNjcwODk2YmM0ZTk3Mjk=
   data.tar.gz: !binary |-
-    MjNkMmNiY2I3MzY4YmMzZTM5MTE2NzgyZTU1YjlkMmRlYzBkMWY4MzUwODc3
-    ZjliYWZhZDU2ZTc4YjA2NjdiYWY2ZGM4ZWRlNzUzYmYwMTE1ZmVmNDBkMWFl
-    NmNjODYwNDlhOWVmYzQ1Y2JiN2NjN2JkMjlhZjc2MTcxNWU3OGE=
+    NzU3ZTFjNmI1NGU5MWRhMTQ4ZTI2NmNkNDQxNmUxMmNhZjYxYmI1NmViNDMz
+    ZGEyN2U1MTA4NGMxOTM3ZmY0NjM1MzIwMGU1NWRiMmQ3ZGY0MWY5NTJhODYy
+    NTg1NWYzZWI4NWNhMTVhMmJiNGMwNmU0MTU3OGQ0YTVlYjBlM2U=

data/app/controllers/washout_builder_controller.rb

@@ -14,10 +14,10 @@ class WashoutBuilderController < ActionController::Base
       controllers.map do |hash|
         namespace  = hash[:class].soap_config.namespace
         @services << {
-          :service_name =>  hash[:class].to_s.underscore.gsub("_controller", "").camelize ,
-          :namespace => namespace,
-          :endpoint => namespace.gsub("/wsdl", "/action"),
-          :documentation_url => "#{request.protocol}#{request.host_with_port}/#{hash[:name]}/doc",
+          'service_name' =>  hash[:class].to_s.underscore.gsub("_controller", "").camelize ,
+          'namespace' => namespace,
+          'endpoint' => namespace.gsub("/wsdl", "/action"),
+          'documentation_url' => "#{request.protocol}#{request.host_with_port}/#{hash[:name]}/doc",
         }
       end
     end

data/app/views/wash_with_html/all_services.builder

@@ -38,10 +38,10 @@ xml.html( "xmlns" => "http://www.w3.org/1999/xhtml" ) {
     unless @services.blank?
 
       @services.each do |service|
-        xml.h1 "#{service[:service_name]} Soap Webservice"
-        xml.p {|pre| pre << "Documentation URI: &nbsp;<a href='#{service[:documentation_url]}'><span class='pre'>#{service[:documentation_url]}</span></a>" }
-        xml.p {|pre| pre << "Endpoint URI: &nbsp;<span class='pre'>#{service[:endpoint]}</span>" }
-        xml.p {|pre|  pre << "WSDL URI: &nbsp;<a href='#{service[:namespace]}'><span class='pre'>#{service[:namespace]}</span></a>" }
+        xml.h1 "#{service['service_name']} Soap Webservice"
+        xml.p {|pre| pre << "Documentation URI: &nbsp;<a href='#{service['documentation_url']}'><span class='pre'>#{service['documentation_url']}</span></a>" }
+        xml.p {|pre| pre << "Endpoint URI: &nbsp;<span class='pre'>#{service['endpoint']}</span>" }
+        xml.p {|pre|  pre << "WSDL URI: &nbsp;<a href='#{service['namespace']}'><span class='pre'>#{service['namespace']}</span></a>" }
       end
     end
     

data/lib/washout_builder/document/generator.rb

@@ -69,7 +69,7 @@ module WashoutBuilder
         (input_types + output_types).each do |p|
           defined.concat(p.get_nested_complex_types(config,  defined))
         end
-        defined.sort_by { |hash| hash[:class].to_s.downcase }.uniq unless defined.blank?
+        defined.sort_by { |hash| hash[:class].to_s.downcase }.uniq{|hash| hash[:class] } unless defined.blank?
       end
             
        
@@ -85,8 +85,8 @@ module WashoutBuilder
         defined.each{ |exception_class|  exception_class.get_fault_class_ancestors( fault_types, true)}  unless   defined.blank?
         complex_types = extract_nested_complex_types_from_exceptions(fault_types)
         complex_types.delete_if{ |hash|  fault_types << hash if  (hash[:fault].is_a?(Class) && hash[:fault].ancestors.detect{ |fault|  WashoutBuilder::Type.get_fault_classes.include?(fault)  }.present?) || (hash[:fault].is_a?(Class) && WashoutBuilder::Type.get_fault_classes.include?(hash[:fault]))  } unless complex_types.blank?
-        fault_types = fault_types.sort_by { |hash| hash[:fault].to_s.downcase }.uniq unless fault_types.blank?  
-        complex_types = complex_types.sort_by { |hash| hash[:fault].to_s.downcase }.uniq unless complex_types.blank?
+        fault_types = fault_types.sort_by { |hash| hash[:fault].to_s.downcase }.uniq {|hash| hash[:fault] } unless fault_types.blank?  
+        complex_types = complex_types.sort_by { |hash| hash[:fault].to_s.downcase }.uniq {|hash| hash[:fault] } unless complex_types.blank?
         [fault_types, complex_types]
       end
       

data/lib/washout_builder/version.rb

@@ -1,3 +1,3 @@
 module WashoutBuilder
-  VERSION = "0.11.2"
+  VERSION = "0.11.3"
 end

data/spec/app/controllers/washout_builder_controller_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 
-
 describe WashoutBuilderController, :type => :controller  do
   
   let(:soap_config) { OpenStruct.new(
@@ -14,14 +13,12 @@ describe WashoutBuilderController, :type => :controller  do
 
   it "gets the services" do
     get :all
-    assigns(:services).should eq([{"service_name"=>"Api", "namespace"=>"/api/wsdl", "endpoint"=>"/api/action", "documentation_url"=>"http://test.host/api/doc"}])
+    assigns(:services).should eq([{'service_name'=>"Api", 'namespace'=>"/api/wsdl", 'endpoint'=>"/api/action", 'documentation_url'=>"http://test.host/api/doc"}])
   end
   
-  
   it "renders the template" do
     get :all
     response.should render_template("wash_with_html/all_services")
   end
-  
 
-end
+end

data/spec/support/complex_types/test_type.rb

@@ -0,0 +1,10 @@
+module Api
+  class TestType < WashOut::Type
+    map :project => {
+      :name                                    => :string,
+      :description                           => :string,
+      :users                                    => [{:mail => :string }],
+      #  'dada'                                    => [Project]
+    }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: washout_builder
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - bogdanRada
@@ -105,6 +105,7 @@ files:
 - spec/support/complex_types/fluffy.rb
 - spec/support/complex_types/fluffy_container.rb
 - spec/support/complex_types/project_type.rb
+- spec/support/complex_types/test_type.rb
 - spec/support/exceptions/another_exception.rb
 - spec/support/exceptions/base_exception.rb
 - spec/support/exceptions/custom2.rb
@@ -175,6 +176,7 @@ test_files:
 - spec/support/complex_types/fluffy.rb
 - spec/support/complex_types/fluffy_container.rb
 - spec/support/complex_types/project_type.rb
+- spec/support/complex_types/test_type.rb
 - spec/support/exceptions/another_exception.rb
 - spec/support/exceptions/base_exception.rb
 - spec/support/exceptions/custom2.rb