washout_builder 0.12.4 → 0.13.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2JhN2Y4NzUzNWRkMmRmMTFiZGZiZTlkNzkxMjA3YzhjYWUwOGZjNg==
+    ZDQ2OGJiMzYxM2FkYWM5ZjZlNWViOWU1MjA3NWZiNGFlNDUyYjAyNQ==
   data.tar.gz: !binary |-
-    NjFkM2ZmZGYxZjU5M2Y3ODJmYzVjZGM4OTI2M2I2ODg4OTJmMDNmNw==
+    ZDlhOTM3MGFmNTEwZjk1YTM3NTlkYzM5MDE1ODBmMjlhMTcyYTU0OA==
 SHA512:
   metadata.gz: !binary |-
-    MWU0Mzc2ZDc3Mzg3NTRjODJmNGQ1YTY0YTg5NGVhOWJhZWVmNDhhMDA0NjUw
-    ZDU4YWRkYmE0MjllZjM1YWU4ZjhjMGNkMzM3MjFkMzIxNTcwMzM4YzhjODZl
-    NDFjZmM1OTNhZDc4MGM2YmFhMTQ2Mzc2YWZjMDFlYWU3NjE5ZDU=
+    OGVhM2QzYTVmNzMyMjM4ZGJkN2RjY2EyNmQ4YzViMTZhYTBiNDUxOWQ3MzE2
+    ZGQ1Zjc1ZmIzNWU1NjFhOGRmZDIyOTIzNDQ2N2YxYzgwOTRmMjU1ZWFlOWEz
+    MjlkMDBkY2UzMzUzNmU5OTE3ZDQwMzRlMmE2YTZkMmMwNGMwZTE=
   data.tar.gz: !binary |-
-    MzM0MjI0MDhlOTdiZjY1YjE4YjY3ODNlYTg1N2E1MTY2MmRjZjJkZWZjYWQx
-    YjQ3MmMyNWQ0ZTVlODc1ODVhMGIyYjZkMDIxYWVhNGZjMzNmNThmMmEyMjBi
-    MDQ4NzRiNzExNjZhNTcwZmViZWFlZmQ1ODM1ZjM2ZGM4YmJkNWI=
+    YjhkZDU3YTAyNmE2MDFkMWUzODk2NzJlMmJmZWI0NmZhZjI5YTU1YjRhNzc3
+    OWZiMWVlNzAyMWEyNWI2MzY4NWNhYTdlNjdhNTRlNWM4YjkwYTI4NGE3YTNh
+    ZDY4ZDQ1ZjkxNTIwM2JhNTJlMjI4NmZmNDRhZmRlNjhhMGE0ODA=

data/Gemfile

@@ -4,7 +4,6 @@ gemspec
 
 
 gem 'wash_out',  git: 'git://github.com/inossidabile/wash_out.git'
-gem 'virtus'
 gem 'wasabi'
 gem 'savon'
 gem 'httpi'

data/README.rdoc

@@ -25,7 +25,6 @@ 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.9.1}[https://github.com/inossidabile/wash_out]
-4. {Virtus Gem}[https://github.com/solnic/virtus]
 
 = Compatibility
 
@@ -105,47 +104,7 @@ Here is an example :
   :description => "some description about this method to show in the documentation"
 
 
-The exception classes used <b>must inherit</b> from  <tt>WashOut::Dispatcher::SOAPError</tt>, which has  by default  a error code and a message as attributes but you can extend it by adding more attributes to your own custom class. 
-
-The WashOut::SoapError now includes Virtus.model from +virtus+ gem. This way you can add attributes like this:
-
-  class MyCustomSoapError < WashOut::Dispatcher::SOAPError
-  
-    attribute :custom_attribute, String
-    attribute :other_custom_attribute, Integer
-  
-   end
-   
-You can also specify complex types like this:
-
-  class MyCustomSoapError < WashOut::Dispatcher::SOAPError
-  
-   attribute :errors,Array[Integer]
-   attribute :custom, Array[MyCustomModel]
-   attribute :custom2, MyCustomModel
-  
-   end
-
-<b>The class MyCustomModel must include +Virtus.model+ or +Virtus.value_object+ or it must include at least one module that includes +Virtus.module+ if you want it to show up in the documentation! 
-Please checkout {Virtus Gem}[https://github.com/solnic/virtus] for further documentation!</b> 
-
-You can also use aggregation with another fault class exception like this:
-
-  class MyCustomSoapError < WashOut::Dispatcher::SOAPError
-  
-   attribute :errors, Array[MyOtherCustomSoapError]
-  
-  end
-  
-And you can also use inheritance between custom exception classes like this:
-
-  class MySecondCustomSoapError < MyCustomSoapError
-  
-    atribute :option , String
-  
-   end
-
-And you will see in the documentation that the class +MySecondCustomSoapError+ will extend +MyCustomSoapError+
+The exception classes used <b>must inherit</b> from  <tt>WashOut::Dispatcher::SOAPError</tt>, which has  by default  a error code and a message as attributes .
 
 = Testing
 

data/app/helpers/washout_builder_helper.rb

@@ -194,7 +194,6 @@ module WashoutBuilderHelper
   end
   
   def create_html_public_method_arguments(xml, pre, operation, formats)
-    xml.span("class" => "bold") {|y|  y << "#{operation} (" }
     mlen = formats[:builder_in].size
     xml.br if mlen > 1
     spacer = "&nbsp;&nbsp;&nbsp;&nbsp;"
@@ -234,6 +233,7 @@ module WashoutBuilderHelper
 
     xml.p("class" => "pre"){ |pre|
       create_html_public_method_return_type(xml,pre, formats)
+       xml.span("class" => "bold") {|y|  y << "#{operation} (" }
       create_html_public_method_arguments(xml, pre, operation, formats)
     }
     xml.p "#{formats[:description]}" if !formats[:description].blank?

data/lib/washout_builder/document/{virtus_model.rb → exception_model.rb}

@@ -1,6 +1,6 @@
 module WashoutBuilder
   module Document
-    module VirtusModel
+    module ExceptionModel
       extend ActiveSupport::Concern
       include WashoutBuilder::Document::SharedComplexType  
       
@@ -56,22 +56,47 @@ module WashoutBuilder
         complex_class
       end
  
-       
+      
+      def get_exception_attributes
+        attrs = self.instance_methods.find_all do |method|
+          method != :== &&
+            method != :! &&
+            self.instance_methods.include?(:"#{method}=") 
+        end
+        attrs.concat(["message", "backtrace"])
+      end
+      
+      
       def get_virtus_model_structure
-        attribute_set.inject({}) {|h, elem|  h["#{elem.name}"]= { :primitive => "#{elem.primitive}", :member_type => elem.options[:member_type].nil? ? nil: elem.options[:member_type].primitive }; h }
+        h = {}
+        get_exception_attributes.each do |method_name|
+          primitive_type = case method_name.to_s.downcase
+          when "code" 
+             "integer"
+          when "message", "backtrace"
+             "string"
+          else
+             "string"
+          end
+          h["#{method_name}"]= { 
+            :primitive => "#{primitive_type}", 
+            :member_type => nil
+          }
+        end
+        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? && param_class.ancestors.include?(Virtus::Model::Core)
-              param_class.send :extend, WashoutBuilder::Document::VirtusModel
-              param_class.get_fault_class_ancestors( complex_types)
-            elsif param_class.present? && !param_class.ancestors.include?(Virtus::Model::Core)
-              raise RuntimeError, "Non-existent use of `#{param_class}` type name or this class does not use Virtus.model. Consider using classified types that include Virtus.mode for exception atribute types."
-            end 
-          end
+        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

data/lib/washout_builder/document/generator.rb

@@ -1,4 +1,4 @@
-require_relative "./virtus_model"
+require_relative "./exception_model"
 module WashoutBuilder
   module Document
     class Generator
@@ -117,7 +117,7 @@ module WashoutBuilder
         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::VirtusModel.extract_nested_complex_types(complex_class, complex_types)
+            WashoutBuilder::Document::ExceptionModel.extract_nested_complex_types(complex_class, complex_types)
           end
         end
         complex_types

data/lib/washout_builder/version.rb

@@ -1,3 +1,3 @@
 module WashoutBuilder
-  VERSION = "0.12.4"
+  VERSION = "0.13.0"
 end

data/lib/washout_builder.rb

@@ -1,37 +1,20 @@
 require 'wash_out'
-require 'virtus'
 require 'washout_builder/soap'
 require 'washout_builder/engine'
 require 'washout_builder/document/shared_complex_type'
 require 'washout_builder/document/complex_type'
-require 'washout_builder/document/virtus_model'
+require 'washout_builder/document/exception_model'
 require 'washout_builder/document/generator'
 require 'washout_builder/type'
 require 'washout_builder/version'
 
 
-
-Virtus::InstanceMethods::Constructor.class_eval do
-  alias_method  :original_initialize,:initialize
-  def initialize(attributes = nil)
-    if WashoutBuilder::Type.valid_fault_class?(self.class)
-      attributes = {:message => attributes} unless attributes.is_a?(Hash) 
-    end
-    original_initialize(attributes)
-  end
-end
-
-
 WashOut::Param.send :include, WashoutBuilder::Document::ComplexType
 
 
 WashoutBuilder::Type.get_fault_classes.each do |exception_class|
   exception_class.class_eval do
-    extend WashoutBuilder::Document::VirtusModel
-    include Virtus.model
-    attribute :code, Integer
-    attribute :message, String
-    attribute :backtrace, String
+    extend WashoutBuilder::Document::ExceptionModel
   end
 end
 

data/spec/lib/washout_builder/document/{virtus_model_spec.rb → exception_model_spec.rb}

@@ -5,14 +5,14 @@ class SOAPError < WashOut::Dispatcher::SOAPError
   
 end
 
-describe WashoutBuilder::Document::VirtusModel do
+describe WashoutBuilder::Document::ExceptionModel 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}})
+    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
@@ -29,7 +29,7 @@ describe WashoutBuilder::Document::VirtusModel do
   
     
   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}})
+    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/document/generator_spec.rb

@@ -1,12 +1,14 @@
 #encoding:utf-8
 require 'spec_helper'
 mock_controller do
-   soap_action 'dispatcher_method', :args => nil, :return => nil
+  soap_service  namespace: "/api/wsdl", description: "some description"
+
+  soap_action 'dispatcher_method', :args => nil, :return => nil
  
-   def dispatcher_method
-      #nothing
-   end
- end
+  def dispatcher_method
+    #nothing
+  end
+end
 
 describe WashoutBuilder::Document::Generator do
   
@@ -22,32 +24,12 @@ describe WashoutBuilder::Document::Generator do
     }
   }
   let(:service_class) { ApiController }
-  let(:attributes) {
-    {
-      :config => soap_config,
-      :service_class => service_class,  
-      :soap_actions =>  soap_actions
-    }}
-  
   before(:each) do
-    @document = WashoutBuilder::Document::Generator.new(attributes)
-  end
-    
-  context "initialize" do
-  
-    it "sets the config " do
-      @document.config.should eq(soap_config) 
-    end
-   
-    it "sets the service_class " do
-      @document.service_class.should eq(service_class) 
-    end
-    
-    it "sets the soap_actions " do
-      @document.soap_actions.should eq(soap_actions) 
-    end
+    @document = WashoutBuilder::Document::Generator.new("api")
+    @document.stubs(:controller_class).returns(service_class)
     
   end
+    
   
   
   context "namespace" do

data/spec/lib/washout_builder_spec.rb

@@ -595,9 +595,6 @@ describe WashoutBuilder do
 
         end
      
-        it "intanstiates correctly a custom exception" do
-          soap_exception.attributes.should eq({:code=>error_code, :message=>error_message, :backtrace=>nil})
-        end
       end
       
      

data/washout_builder.gemspec

@@ -16,5 +16,4 @@ Gem::Specification.new do |s|
   s.test_files = s.files.grep(/^(spec)/)
   s.require_paths = ["lib"]
   s.add_runtime_dependency 'wash_out', '~> 0.9', '>= 0.9.1'
-  s.add_runtime_dependency 'virtus', '~> 1.0', '>= 1.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: washout_builder
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.13.0
 platform: ruby
 authors:
 - bogdanRada
@@ -30,26 +30,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.1
-- !ruby/object:Gem::Dependency
-  name: virtus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 description: ! 'WashOut Soap Service HTML-Documentation generator (extends WashOut
   https://github.com/inossidabile/wash_out/) '
 email: raoul_ice@yahoo.com
@@ -75,9 +55,9 @@ files:
 - init.rb
 - lib/washout_builder.rb
 - lib/washout_builder/document/complex_type.rb
+- lib/washout_builder/document/exception_model.rb
 - lib/washout_builder/document/generator.rb
 - lib/washout_builder/document/shared_complex_type.rb
-- lib/washout_builder/document/virtus_model.rb
 - lib/washout_builder/engine.rb
 - lib/washout_builder/soap.rb
 - lib/washout_builder/type.rb
@@ -110,8 +90,8 @@ files:
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/lib/washout_builder/document/complex_type_spec.rb
+- spec/lib/washout_builder/document/exception_model_spec.rb
 - spec/lib/washout_builder/document/generator_spec.rb
-- spec/lib/washout_builder/document/virtus_model_spec.rb
 - spec/lib/washout_builder/type_spec.rb
 - spec/lib/washout_builder_spec.rb
 - spec/spec_helper.rb
@@ -119,13 +99,6 @@ files:
 - 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
-- spec/support/exceptions/ex_model.rb
-- spec/support/exceptions/name_mod.rb
-- spec/support/exceptions/name_model.rb
-- spec/support/exceptions/value_object_model.rb
 - washout_builder.gemspec
 homepage: http://github.com/bogdanRada/washout_builder/
 licenses:
@@ -180,8 +153,8 @@ test_files:
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/lib/washout_builder/document/complex_type_spec.rb
+- spec/lib/washout_builder/document/exception_model_spec.rb
 - spec/lib/washout_builder/document/generator_spec.rb
-- spec/lib/washout_builder/document/virtus_model_spec.rb
 - spec/lib/washout_builder/type_spec.rb
 - spec/lib/washout_builder_spec.rb
 - spec/spec_helper.rb
@@ -189,10 +162,3 @@ test_files:
 - 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
-- spec/support/exceptions/ex_model.rb
-- spec/support/exceptions/name_mod.rb
-- spec/support/exceptions/name_model.rb
-- spec/support/exceptions/value_object_model.rb

data/spec/support/exceptions/another_exception.rb

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

data/spec/support/exceptions/base_exception.rb

@@ -1,15 +0,0 @@
-Dir["#{File.dirname(__FILE__)}/**/*.rb"].each { |f| require f }
-class BaseException < AnotherException
-  
-  attribute :custom_attribute, String
-  attribute :other_custom_attribute, Integer
-  attribute :errors,Array[Integer]
-  attribute :custom, Array[ExModel]
-  attribute :custom2, ExModel
-  attribute :errors_2, Array[Custom2]
-  attribute :error, Custom2
-  attribute :module, NameModel
-  attribute :geo, ValueObjectModel
-  
-end
- 

data/spec/support/exceptions/custom2.rb

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

data/spec/support/exceptions/ex_model.rb

@@ -1,8 +0,0 @@
-class ExModel
-  include Virtus.model
-  
-  attribute :name, String
-  attribute :id, Integer
-  
-end
- 

data/spec/support/exceptions/name_mod.rb

@@ -1,5 +0,0 @@
-module NameMod
-  include Virtus.module
-
-  attribute :name, String
-end

data/spec/support/exceptions/name_model.rb

@@ -1,5 +0,0 @@
-require_relative "./name_mod"
-
-class NameModel
-  include NameMod
-end

data/spec/support/exceptions/value_object_model.rb

@@ -1,8 +0,0 @@
-class ValueObjectModel
-  include Virtus.value_object
-
-  values do
-    attribute :latitude,  Float
-    attribute :longitude, Float
-  end
-end