grape-dsl 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d7f0e1da4083899e3f9f29e9f005cd37516fa52
-  data.tar.gz: 65b5b347c5c2d40a0d0c59a7cd544e506e42ac3f
+  metadata.gz: 4dc18b0dd29b0369d3c564db0447d1efc158ebc5
+  data.tar.gz: 4b1d89dd10ea8c441f6a0384cecb4d13149f2313
 SHA512:
-  metadata.gz: ec22bd9a3ddb8c4854ca1644c13130bb003f106339ba161afbf22480395e78907cf560ec6dff79c8c4199f8949e88e2670ede0d2a510e515d013c03559c5bcae
-  data.tar.gz: 34ac2f981b70dff8472578453afcec80822f1148411563e0cbd68ca660faa3f87c7417f78bc89c7b6f75c3cca5ace19e65d261e9ba4e7631b41b0b4a969525df
+  metadata.gz: dc1f89349bde5ca96e2b5b50ff8219ee663007be8d3d2172955ac24a795623b1635d733a049882250aee65afdacbfb5a4da6abac4b157b1c2734c4c2c7b65748
+  data.tar.gz: d0064cc0334ab78b34e772a37f39abdb0057a33f4753e039e89c31a99561fd48fc64ebcca9c8eca38a3c9f40db35412782c476bfd164ef126c1f63595ab78b07

data/TODO

@@ -0,0 +1 @@
+refactor doc generation logic with description logic

data/VERSION

@@ -1 +1 @@
-2.2.1
+2.3.0

data/lib/grape-dsl/doc.rb

@@ -83,38 +83,40 @@ module GrapeDSL
 
         end
 
-        content_type ||= "TXT"
-        case content_type.to_s.downcase
+        content_type ||= 'TXT'
+        content_type = content_type.keys if content_type.class <= ::Hash
 
-          when "json"
-            begin
+        [*content_type].each do |one_content_type|
 
-              tmp_array.push [wrapper_begin,content_type.to_s,wrapper_end].join
+          case one_content_type.to_s.downcase
 
-              require "json"
+            when 'json'
+              begin
 
-              formatted_string= params.to_json
+                tmp_array.push [wrapper_begin,one_content_type.to_s,wrapper_end].join
 
-              {
-                  "{" => "{\n",
-                  "}" => "\n}",
-                  "," => ",\n"
-              }.each do |from,to|
-                formatted_string.gsub!(from,to)
-              end
+                require 'json'
 
-              formatted_string.gsub!(/^"/," \"")
+                formatted_string= params.to_json
 
-              tmp_array.push formatted_string
-              tmp_array.push wrapper_close
-            end
+                {
+                    '{' => "{\n",
+                    '}' => "\n}",
+                    ',' => ",\n"
+                }.each do |from,to|
+                  formatted_string.gsub!(from,to)
+                end
 
-          when "txt"
-            begin
-              tmp_array.push(params.inspect)
-            end
+                formatted_string.gsub!(/^"/," \"")
+                tmp_array.push formatted_string
+                tmp_array.push wrapper_close
+
+              end
 
+            when "txt"
+              tmp_array.push(params.inspect)
 
+          end
 
         end
 

data/lib/grape-dsl/dsl.rb

@@ -12,7 +12,13 @@ module GrapeDSL
 
         @last_description ||= {}
         unless @last_description[:description].class == Hashie::Mash
-          @last_description[:description]= Hashie::Mash.new(opts.merge(desc: @last_description[:desc]))
+
+          @last_description[:description]= Hashie::Mash.new(
+              opts.merge(
+                  desc: @last_description[:desc],
+                  content_type: self.content_types
+              )
+          )
         end
         return @last_description[:description]
 
@@ -62,7 +68,7 @@ module GrapeDSL
       end
 
       alias :cw_routes :console_write_out_routes
-
+      alias :puts_routes :console_write_out_routes
 
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-dsl
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mpatch
@@ -51,6 +51,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- TODO
 - VERSION
 - files.rb
 - grape-dsl.gemspec