grape-swagger 0.7.0 → 0.7.1

data/.travis.yml

@@ -1,4 +1,5 @@
 rvm:
+  - jruby-19mode
   - 1.9.3
   - 2.0.0
 

data/Gemfile

@@ -5,7 +5,7 @@ source "http://rubygems.org"
 
 gem 'grape', '>= 0.2.0'
 gem 'grape-entity', '>= 0.3.0'
-gem 'github-markdown'
+gem 'kramdown', '>= 1.3.1'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -11,7 +11,6 @@ GEM
     diff-lcs (1.1.3)
     ffi (1.9.3-java)
     git (1.2.5)
-    github-markdown (0.6.4)
     grape (0.5.0)
       activesupport
       builder
@@ -34,6 +33,7 @@ GEM
       rdoc
     json (1.7.3)
     json (1.7.3-java)
+    kramdown (1.3.1)
     method_source (0.8)
     multi_json (1.7.7)
     multi_xml (0.5.4)
@@ -83,10 +83,10 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (> 1.0.0)
-  github-markdown
   grape (>= 0.2.0)
   grape-entity (>= 0.3.0)
   jeweler (~> 1.8.4)
+  kramdown (>= 1.3.1)
   pry
   rack-test
   rdoc (~> 3.12)

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/grape-swagger.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "grape-swagger"
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Vandecasteele"]
@@ -52,7 +52,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<grape>, [">= 0.2.0"])
       s.add_runtime_dependency(%q<grape-entity>, [">= 0.3.0"])
-      s.add_runtime_dependency(%q<github-markdown>, [">= 0"])
+      s.add_runtime_dependency(%q<kramdown>, [">= 1.3.1"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["> 1.0.0"])
@@ -63,7 +63,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<grape>, [">= 0.2.0"])
       s.add_dependency(%q<grape-entity>, [">= 0.3.0"])
-      s.add_dependency(%q<github-markdown>, [">= 0"])
+      s.add_dependency(%q<kramdown>, [">= 1.3.1"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["> 1.0.0"])
@@ -75,7 +75,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<grape>, [">= 0.2.0"])
     s.add_dependency(%q<grape-entity>, [">= 0.3.0"])
-    s.add_dependency(%q<github-markdown>, [">= 0"])
+    s.add_dependency(%q<kramdown>, [">= 1.3.1"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["> 1.0.0"])

data/lib/grape-swagger.rb

@@ -1,4 +1,4 @@
-require 'github/markdown'
+require 'kramdown'
 
 module Grape
   class API
@@ -49,6 +49,7 @@ module Grape
               :markdown                 => false,
               :hide_documentation_path  => false,
               :hide_format              => false,
+              :format                   => nil,
               :models                   => [],
               :info                     => {},
               :authorizations           => nil,
@@ -72,6 +73,12 @@ module Grape
 
             @@hide_documentation_path = options[:hide_documentation_path]
 
+            if options[:format]
+              [:format, :default_format, :default_error_formatter].each do |method|
+                send(method, options[:format])
+              end
+            end
+
             desc 'Swagger compatible API description'
             get @@mount_path do
               header['Access-Control-Allow-Origin']   = '*'
@@ -175,7 +182,7 @@ module Grape
           helpers do
 
             def as_markdown(description)
-              description && @@markdown ? GitHub::Markdown.render_gfm(strip_heredoc(description)) : description
+              description && @@markdown ? Kramdown::Document.new(strip_heredoc(description), :input => 'GFM', :enable_coderay => false).to_html : description
             end
 
             def parse_params(params, path, method)

data/spec/non_default_api_spec.rb

@@ -520,4 +520,29 @@ describe "options: " do
       }
     end
   end
+
+  context ":formatting" do
+    before :all do
+      class JSONDefaultFormatAPI < Grape::API
+        desc 'This gets something.'
+        get '/something' do
+          { bla: 'something' }
+        end
+      end
+
+      class SimpleJSONFormattedAPI < Grape::API
+        mount JSONDefaultFormatAPI
+        add_swagger_documentation format: :json
+      end
+    end
+
+    def app; SimpleJSONFormattedAPI; end
+
+    it "defaults to JSON format when none is specified" do
+      get '/swagger_doc/something'
+
+      lambda{ JSON.parse(last_response.body) }.should_not raise_error
+    end
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-swagger
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -44,13 +44,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: github-markdown
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -217,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1382622318618846643
+      hash: -4023410877516363028
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: