washout_builder 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ad8d849dc2071cd6beb38f0d1ec8d053857e4ed
-  data.tar.gz: 86f0df05faa8d71ba29a7a5f933a11d2d8760551
+  metadata.gz: df24805fd747f5ee4264ddd30bbb664a64980fed
+  data.tar.gz: e1f7a66e3c6ae46f56fc8230defef7d17fd850de
 SHA512:
-  metadata.gz: b8269346c5e2e1a35e78d510988853dd117d158add2f4bc4586a2cf8d7adae8a1ecdbe8e9d65e5575b5f437236bfeef763e56297c99a444ceb1fd025779caf53
-  data.tar.gz: ab69d71b6d7c9d94beb4e90777e8b37667f078abb5acc8814320c6326759a184686ea036eea3fb17de90b5dd4597418847c764fa9dd244c4d83878ff7968214b
+  metadata.gz: 746b52b2afc23edcf448c2d140a8cb4c40646728484aeb28a5a069beb92711d48fc48a9788aa604d44bf2e0cdb1150ecfdeb3b41684058ae4c3bf886dbbef25f
+  data.tar.gz: 9a5839e1fba426d88f22711b1d9055f17a50b7c0c02456b070f39b2643c9150c8eafc2edfe7fab085f6a1388107b12422f437f4e49dd23f06f021d3dd3be918f

data/app/controllers/washout_builder/washout_builder_controller.rb

@@ -15,19 +15,20 @@ module WashoutBuilder
     #
     # @api public
     def all
+      @routes = find_all_routes
       route = params[:name].present? ? controller_is_a_service?(params[:name]) : nil
       if route.present?
         @document = WashoutBuilder::Document::Generator.new(route.defaults[:controller])
         render template: 'wash_with_html/doc', layout: false,
-               content_type: 'text/html'
+        content_type: 'text/html'
       else
         @services = all_services
         render template: 'wash_with_html/all_services', layout: false,
-               content_type: 'text/html'
+        content_type: 'text/html'
       end
     end
 
-  private
+    private
 
     # tries to find all services by searching through the rails controller
     # and returns their namespace, endpoint and a documentation url
@@ -74,6 +75,17 @@ module WashoutBuilder
       route.defaults[:action] == '_generate_wsdl'
     end
 
+    def find_all_routes
+      rails_routes = Rails.application.routes.routes.map {|route| route }
+      engine_routes = []
+      ::Rails::Engine.subclasses.each do |engine|
+        engine.routes.routes.each do |route|
+          engine_routes << route
+        end
+      end
+      rails_routes.concat(engine_routes).uniq.compact
+    end
+
     # method for getting all controllers that have the generate wsdl action or finding out
     # if a single controller is a soap service
     # @see #route_can_generate_wsdl?
@@ -86,7 +98,7 @@ module WashoutBuilder
     #
     # @api private
     def map_controllers(action = 'map')
-      res = Rails.application.routes.routes.send(action) do |route|
+      res = @routes.send(action) do |route|
         if route_can_generate_wsdl?(route)
           yield route if block_given?
         end

data/app/helpers/washout_builder_complex_type_helper.rb

@@ -18,13 +18,23 @@ module WashoutBuilderComplexTypeHelper
     element.type = 'integer' if element.type == 'int'
     if WashoutBuilder::Type::BASIC_TYPES.include?(element.type)
       pre << "<span class='blue'>#{element.type}</span>&nbsp;<span class='bold'>#{element.name}</span>"
-      pre << "&#8194;<span>#{element_description}</span>" unless element_description.blank?
+      pre << "&#8194;<span>#{html_safe(element_description)}</span>" unless element_description.blank?
       pre
     else
       create_complex_element_type_html(pre, element, element_description)
     end
   end
 
+  # used for escaping strings
+  # @param [String] string The string that needs to be escaped
+  #
+  # @return [String]
+  #
+  # @api public
+  def html_safe(string)
+    string.present? ? ActiveSupport::SafeBuffer.new(string) : string
+  end
+
   # checks if a complex attribute of a complex type is a array or not
   # and retrieves the complex class name of the attribute and prints it
   # @see WashoutBuilder::Document::ComplexType#find_complex_class_name
@@ -41,7 +51,7 @@ module WashoutBuilderComplexTypeHelper
     return if complex_class.nil?
     complex_class_content = element.multiplied == false ? "#{complex_class}" : "Array of #{complex_class}"
     pre << "<a href='##{complex_class}'><span class='lightBlue'>#{complex_class_content}</span></a>&nbsp;<span class='bold'>#{element.name}</span>"
-    pre << "&#8194;<span>#{element_description}</span>" unless element_description.blank?
+    pre << "&#8194;<span>#{html_safe(element_description)}</span>" unless element_description.blank?
     pre
   end
 end

data/lib/washout_builder.rb

@@ -2,6 +2,8 @@ require 'wash_out'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/hash/keys'
 require 'active_support/concern'
+require 'active_support/core_ext/string/output_safety.rb'
+
 Gem.find_files('washout_builder/**/*.rb').each { |path| require path }
 
 # finds all the exception class and extends them by including the ExceptionModel module in order to be

data/lib/washout_builder/version.rb

@@ -12,7 +12,7 @@ module WashoutBuilder
     # the minor version of the gem
     MINOR = 0
     # the tiny version of the gem
-    TINY = 9
+    TINY = 10
     # if the version should be a e
     PRE = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: washout_builder
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wash_out