lib/grape-dsl/doc.rb in grape-dsl-2.1.0 vs lib/grape-dsl/doc.rb in grape-dsl-2.2.0

@@ -1,13 +1,9 @@
 module GrapeDSL
   module Extend
     module Doc
 
-      def syntax_highlight target,wrapper_begin,wrapper_end
-        return "#{wrapper_begin}#{target}#{wrapper_end}"
-      end
-
       # helpers for doc generation
       def wiki_body(route,wrapper_begin,wrapper_end,wrapper_close)
 
         require 'grape-dsl/doc_mp'
 
@@ -19,16 +15,16 @@
 
         #if route.route_path == "/booking/request(.:format)"
         #  debugger
         #end
 
-        case route.route_description.class.to_s.downcase
+        case true
 
-          when "string"
+          when route.route_description.class <= ::String
             params= route.route_params
 
-          when "hash"
+          when route.route_description.class <= ::Hash
 
             if !route.route_description[:content_type].nil?
               content_type= route.route_description[:content_type]
             end
 
@@ -38,47 +34,47 @@
             else
               params= route.route_description[description_key]
               evalue= "value"
             end
 
-          when "nilclass"
+          when route.route_description.class <= ::NilClass
             params= route.route_params
             params ||= "no return"
             content_type= "TXT"
 
           else
             params= route.route_params
             content_type= "TXT"
 
         end
 
-        case params.class.to_s.downcase
+        case true
 
-          when "hash"
+          when params.class <= ::Hash
 
             if params == route.route_params
               tmp_hash= Hash.new
               params.each do |key,value|
                 tmp_hash[key]= value[:type].to_s
               end
               params= tmp_hash
             end
 
-            params = params.convert_all_value_to_s
+            params = params.convert_all_value_to_grape_dsl_format
 
-          when "class"
+          when params.class <= ::Class
             begin
               if params.to_s.include? '::'
                 if params.to_s.downcase.include? 'boolean'
                   params= params.to_s.split('::').last
                 end
               end
 
               content_type= "TXT"
             end
 
-          when "string"
+          when params.class <= ::String
             content_type= "TXT"
 
           else
             begin
               params= "no params spec"
@@ -91,14 +87,12 @@
         case content_type.to_s.downcase
 
           when "json"
             begin
 
+              tmp_array.push [wrapper_begin,content_type.to_s,wrapper_end].join
 
-
-              tmp_array.push syntax_highlight(content_type.to_s,wrapper_begin,wrapper_end)
-
               require "json"
 
               formatted_string= params.to_json
 
               {
@@ -325,26 +319,39 @@
               begin
 
                 # create request description
                 begin
                   write_out_array.push("\n"+(uni_tab*1)+"#{mheader}Request description")
-                  case route.route_description.class.to_s.downcase
+                  case true
 
-                    when "string"
+                    when route.route_description.class <= String
                       route.route_description.each_line do |one_line|
                         write_out_array.push((uni_tab*2)+htsym+one_line.chomp)
                       end
 
-                    when "hash"
+                    when route.route_description.class <= Hash
                       begin
-                        sym_to_find= :desc
-                        if route.route_description[sym_to_find].nil?
-                          sym_to_find= :description
+
+                        description_msg = nil
+
+                        [:d,:desc,:description].each do |sym|
+                          description_msg ||= route.route_description[sym]
                         end
-                        route.route_description[sym_to_find].each_line do |one_line|
+
+                        if description_msg.class <= String
+                          description_msg= [*description_msg.split("\n")]
+                        end
+
+                        description_msg ||= "No description available for this path"
+                        description_msg= [*description_msg]
+
+                        puts description_msg.inspect
+
+                        description_msg.each do |one_line|
                           write_out_array.push((uni_tab*2)+htsym+one_line.chomp)
                         end
+
                       end
 
 
                   end
                 end
@@ -405,10 +412,11 @@
                 # pre response
                 begin
                   write_out_array.push("\n#{mheader}response\n")
                 end
 
+                #> TODO make better implementation for others to use
                 #create route content_type
                 begin
                   if !Grape::Endpoint.config_obj.nil?
 
                     write_out_array.push((uni_tab*2)+"#{sheader}Extra headers:")
@@ -418,10 +426,10 @@
                     end
 
                     write_out_array.push ""
 
                   end
-                end
+                end if Grape::Endpoint.respond_to?(:config_obj) && Grape::Endpoint.respond_to?(:header_config_obj)
 
                 # create response bodies
                 begin
                   #TODO check out why not working normaly with evry path!
                   write_out_array.push((uni_tab*2)+"#{sheader}*body:*")
\ No newline at end of file