washout_builder 0.11.1 → 0.11.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWZiZmRhMWU0MWU5NDk2YmQ4NTdkYTYxYjU3MmY2MmZlZWVhNTY0Ng==
+    MWJiN2YxMDQ0NDg1ZGY0N2U4Y2Q0NWM5MjE1MjMyMTJkMjM0NzM5Nw==
   data.tar.gz: !binary |-
-    MGNhYzg3YjFhMmMwNzIzMjhiNTY1MzQxNDk5OGU5OTRmMmE4NGE1Nw==
+    NjUzYzA4YTc2MTBmOTg0ZDRkZWNlZDRkZWY5NzAzYmVjZmNiOTVjMA==
 SHA512:
   metadata.gz: !binary |-
-    MTg5NGZlYjJlMzhiZDJmMzY1NTRhNzhiYmJjZGM2MzA0YmViNzQ1ZjU5ZmYx
-    ZDE0NjRmOGJlY2ZhMzdiMDA3YmM3MDJhZTVhZjlmY2Y0MDJmOWU4YzRmMDFj
-    OTE3ODk2YjA4OGNiMDgzOGRlNDEzM2YwMGYyZjExN2RlODIxZjg=
+    NTk4YmY4Y2ZlYjhjOWYyNzBmOGFiM2I4MjU5NmUxMmUyYzM2MDQ3OGRlNTI0
+    ZGNhZjNjZjBjYmY1MmUyNDg0MGVlYTVlYmQ3Nzc4OWQzOGI0MGNmNmMzMzM0
+    MTY4NjUzYzEyNTIxZDRmNjU5NThmYmZjM2I1YTcwYjg4ZjFhMDQ=
   data.tar.gz: !binary |-
-    MWY0YzhmYjllZTQzNWMxZWI2NjJhZTIzNzk5NGVkMWY5NjY0YmNjMTg2ZWY1
-    OTJkMzg5MDg0MDkwYzJjMTU1YTg0NDIyOGI1ZTRjZjVkNWRkZjA3MzRhMWI4
-    ZTg4MTNlOTc2YWQ3ZWMwOWFkZjlmYjAwMzc4NzQzNDRlZDMwZjQ=
+    MjNkMmNiY2I3MzY4YmMzZTM5MTE2NzgyZTU1YjlkMmRlYzBkMWY4MzUwODc3
+    ZjliYWZhZDU2ZTc4YjA2NjdiYWY2ZGM4ZWRlNzUzYmYwMTE1ZmVmNDBkMWFl
+    NmNjODYwNDlhOWVmYzQ1Y2JiN2NjN2JkMjlhZjc2MTcxNWU3OGE=

data/.travis.yml

@@ -7,8 +7,4 @@ rvm:
   - jruby-19mode
   - 2.0.0
 env:
-  - RAILS_ENV=test RACK_ENV=test
-branches:
-  only:
-    - master
-    - develop 
+  - RAILS_ENV=test RACK_ENV=test 

data/README.rdoc

@@ -1,4 +1,4 @@
-= washout_builder {<img src="https://travis-ci.org/bogdanRada/washout_builder.png" />}[https://travis-ci.org/bogdanRada/washout_builder] {<img src="https://badge.fury.io/rb/washout_builder.png" alt="Gem Version" />}[http://badge.fury.io/rb/washout_builder]
+= washout_builder {<img src="https://travis-ci.org/bogdanRada/washout_builder.png?branch=master,develop" />}[https://travis-ci.org/bogdanRada/washout_builder] {<img src="https://badge.fury.io/rb/washout_builder.png" alt="Gem Version" />}[http://badge.fury.io/rb/washout_builder]
 
 = Overview
 WashOutBuilder is a  Soap Service Documentation generator (extends WashOut https://github.com/inossidabile/wash_out/)
@@ -20,7 +20,7 @@ The way WashOut is used is not modified, it just extends its functionality by ge
 
 1. {Ruby 1.9.x or Ruby 2.0.x}[http://www.ruby-lang.org]
 2. {Ruby on Rails}[http://rubyonrails.org].
-3. {WashOut Gem version >= 0.10.0.beta.1}[https://github.com/inossidabile/wash_out]
+3. {WashOut Gem version >= 0.9.1}[https://github.com/inossidabile/wash_out]
 4. {Virtus Gem}[https://github.com/solnic/virtus]
 
 = Compatibility

data/Rakefile

@@ -7,8 +7,20 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
  # spec.rspec_opts = ['--backtrace '] 
 end
 
+#desc "Prepare dummy application"
+#task :prepare do
+#  ENV["RAILS_ENV"] ||= 'test'
+#
+#  require File.expand_path("./spec/dummy/config/environment", File.dirname(__FILE__))
+#  Dummy::Application.load_tasks
+#
+#  Rake::Task["db:test:prepare"].invoke
+#end
+
+
+
 desc "Default: run the unit tests."
-task :default => [:all]
+task :default => [ :all]
 
 desc 'Test the plugin under all supported Rails versions.'
 task :all => ["appraisal:install"] do |t|

data/lib/washout_builder.rb

@@ -30,7 +30,7 @@ end
 Virtus::InstanceMethods::Constructor.class_eval do
   alias_method  :original_initialize,:initialize
   def initialize(attributes = nil)
-    if self.class.ancestors.detect{ |fault|  WashoutBuilder::Type.get_fault_classes.include?(fault)  }.present? or WashoutBuilder::Type.get_fault_classes.include?(self.class)    
+    if self.class.ancestors.detect{ |fault|  WashoutBuilder::Type.get_fault_classes.include?(fault)  }.present? || WashoutBuilder::Type.get_fault_classes.include?(self.class)    
       attributes = {:message => attributes} unless attributes.is_a?(Hash) 
     end
     original_initialize(attributes)
@@ -40,13 +40,6 @@ end
 
 WashOut::Param.send :include, WashoutBuilder::Document::ComplexType
 
-if defined?(WashOut::Model)
-  WashOut::Model.class_eval do
-    def wash_out_param_name(*args)
-      return name.underscore
-    end
-  end
-end
 
 WashoutBuilder::Type.get_fault_classes.each do |exception_class|
   exception_class.class_eval do

data/lib/washout_builder/document/complex_type.rb

@@ -37,7 +37,7 @@ module WashoutBuilder
       def fix_descendant_wash_out_type(config, complex_class)
         param_class = complex_class.is_a?(Class) ? complex_class : complex_class.constantize rescue nil
         if !param_class.nil? && param_class.ancestors.include?(WashOut::Type) && !map[0].nil? 
-          descendant = WashOut::Param.parse_def(config, param_class.wash_out_param_map)[0]
+          descendant = WashOut::Param.parse_builder_def(config, param_class.wash_out_param_map)[0]
           self.name =  descendant.name 
           self.map = descendant.map
         end

data/lib/washout_builder/version.rb

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

data/spec/app/controllers/washout_builder_controller_spec.rb

@@ -1,8 +1,27 @@
 require 'spec_helper'
 
-describe WashoutBuilderController  do
+
+describe WashoutBuilderController, :type => :controller  do
+  
+  let(:soap_config) { OpenStruct.new(
+      camelize_wsdl: false,
+      namespace: "/api/wsdl",
+    ) }
   
+  before(:each) do
+    ApiController.stubs(:soap_config).returns(soap_config)
+  end
+
+  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"}])
+  end
   
   
+  it "renders the template" do
+    get :all
+    response.should render_template("wash_with_html/all_services")
+  end
   
+
 end

data/spec/lib/washout_builder/dispatcher_spec.rb

@@ -5,7 +5,7 @@ mock_controller do
   soap_action 'dispatcher_method', :args => nil, :return => nil
 
   def dispatcher_method
-    raise SOAPError.new("some message", 1001) 
+     #nothing
   end
 end
 
@@ -23,9 +23,17 @@ describe ApiController, :type => :controller do
     WashoutBuilder::Document::Generator.expects(:new).with(
       :config => ApiController.soap_config, 
       :service_class => ApiController,  
-      :soap_actions =>  {'dispatcher_method' => 
-          {:args => nil, :return => nil, :in => [], :out => [],:builder_in => [], :builder_out => [],  :to => 'dispatcher_method'}
-      }
+      :soap_actions =>  {"dispatcher_method"=>{
+          :args=>nil,
+          :return=>nil,
+          :in=>[], 
+          :out=>[], 
+          :to=>"dispatcher_method", 
+          :response_tag=>"tns:dispatcher_methodResponse", 
+          :builder_in=>[], 
+          :builder_out=>[]
+          }
+        }
     )      
     get :_generate_doc
   end

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

@@ -0,0 +1,61 @@
+#encoding:utf-8
+require 'spec_helper'
+
+
+describe WashoutBuilder::Document::ComplexType do
+  let(:soap_config) { OpenStruct.new(
+      camelize_wsdl: false,
+      namespace: "/api/wsdl",
+      description: "some description"
+    ) }
+  
+  def get_wash_out_param(class_name_or_structure, soap_config = soap_config)
+    WashOut::Param.parse_builder_def(soap_config, class_name_or_structure)[0]
+  end
+  
+  let(:subject) {  get_wash_out_param(ProjectType) }
+  let(:namespaced_object) { get_wash_out_param(Api::TestType) }
+  
+  it "returns the complex class name" do
+    subject.get_complex_class_name.should eq("ProjectType")
+  end
+  
+  
+  it "returns the complex class name" do
+    subject.get_complex_class_name.should eq("ProjectType")
+  end
+   
+  
+  it "returns the complex class with namespace" do
+    namespaced_object.get_complex_class_name.should eq("Api::TestType")
+  end
+  
+    
+  it "returns error if classname already detected (only used for hashes)" do
+    subject.stubs(:classified?).returns(false)
+    subject.stubs(:basic_type).returns("ProjectType")
+    defined  = [ { :class= => "ProjectType" }]
+    defined.stubs(:detect).returns({:class => "ProjectType"})
+    expect {subject.get_complex_class_name(defined) }.to  raise_error(RuntimeError, "Duplicate use of `ProjectType` type name. Consider using classified types.")
+  end
+  
+  it "returns the param structure" do
+    subject.get_param_structure.should eq({"project"=>"struct"})
+  end
+  
+  it "fixes the first descendant " do
+    descendant = get_wash_out_param(ProjectType.wash_out_param_map)
+    subject.fix_descendant_wash_out_type(soap_config, ProjectType)
+    subject.name.should eq(descendant.name)
+    subject.map[0].get_param_structure.should eq(descendant.map[0].get_param_structure)
+  end
+  
+  it "same as ancestor" do
+    subject.get_ancestors(ProjectType).should eq([])
+  end
+  
+  
+ 
+  
+  
+end

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

@@ -0,0 +1,35 @@
+#encoding:utf-8
+require 'spec_helper'
+
+class SOAPError < WashOut::Dispatcher::SOAPError
+  
+end
+
+describe WashoutBuilder::Document::VirtusModel do
+
+  let(:subject) { SOAPError}
+  
+  
+  
+  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 strcuture" do
+    subject.remove_fault_type_inheritable_elements(["code"]).should eq({ "message"=>{:primitive=>"String", :member_type=>nil}, "backtrace"=>{:primitive=>"String", :member_type=>nil}})
+  end
+  
+end

data/spec/lib/washout_builder_spec.rb

@@ -5,10 +5,10 @@ require 'spec_helper'
 describe WashoutBuilder do
 
   before(:each) do
-    WashOut::Rails::Engine.config.wash_out[:wsdl_style] = 'rpc'
-    WashOut::Rails::Engine.config.wash_out[:parser] = :nokogiri
-    WashOut::Rails::Engine.config.wash_out[:catch_xml_errors] = true
-    WashOut::Rails::Engine.config.wash_out[:camelize_wsdl] = "lower"
+    WashOut::Engine.config.wash_out[:wsdl_style] = 'rpc'
+    WashOut::Engine.config.wash_out[:parser] = :nokogiri
+    WashOut::Engine.config.wash_out[:catch_xml_errors] = true
+    WashOut::Engine.config.wash_out[:camelize_wsdl] = "lower"
   end
   
   let :nori do
@@ -558,12 +558,12 @@ describe WashoutBuilder do
         end
 
         lambda { savon(:bad) }.should raise_exception(
-          WashOut::ProgrammerError,
+          WashOut::Dispatcher::ProgrammerError,
           /SOAP response .*wyldness.*Array.*Hash.*stallion/
         )
 
         lambda { savon(:bad2) }.should raise_exception(
-          WashOut::ProgrammerError,
+          WashOut::Dispatcher::ProgrammerError,
           /SOAP response .*oops.*String.*telephone_booths.*Array/
         )
       end
@@ -571,7 +571,7 @@ describe WashoutBuilder do
       context "custom exceptions" do
         let(:error_message) { "some message" }
         let(:error_code) { 1001 }
-        let(:soap_exception) { SOAPError.new(error_message,error_code) }
+        let(:soap_exception) { WashOut::Dispatcher::SOAPError.new(error_message,error_code) }
         
         before(:each) do
           # Savon::Response.raise_errors = false
@@ -582,7 +582,7 @@ describe WashoutBuilder do
             soap_action 'bad', :args => nil, :return => nil
 
             def bad
-              raise SOAPError.new("some message", 1001) 
+              raise WashOut::Dispatcher::SOAPError.new("some message", 1001) 
             end
           end
 

data/spec/support/exceptions/another_exception.rb

@@ -1,4 +1,4 @@
-class AnotherException < SOAPError
+class AnotherException < WashOut::Dispatcher::SOAPError
   
   attribute :ex3_name, String
   attribute :ex3_id, Integer

data/spec/support/exceptions/custom2.rb

@@ -1,4 +1,4 @@
-class Custom2 < WashOut::SOAPError
+class Custom2 < WashOut::Dispatcher::SOAPError
   
   attribute :ex2_name, String
   attribute :ex2_id, Integer

metadata

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