jekyll-ramler 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c62d98f44e879c5e455e68126e04798618d9e5e
-  data.tar.gz: 9d364fb6a8ee65e00aa6c4878e1f3318a33caef6
+  metadata.gz: e8c8f7b9ff188f55b8e43ba97d0a9008adf597f9
+  data.tar.gz: 17a4cd41e1e904142dffa6b51a02a45d8d6edbb0
 SHA512:
-  metadata.gz: 52771dd08ccbb20433c6e6f5f0a00ce71633e20387cb2235eac9000186b112735ca23dc03cae6465698a85a8b02d624780d86a9ed5269b2ec97e5ae785415a1f
-  data.tar.gz: 0d9bde906a622c2330ecd3b60c65798d3b25ad3c6b5b503c2d4248777a62c763f13a86c8ab2b560e43957e696d55a7e1011ca6fe7555cb6a5153a509ebb88482
+  metadata.gz: 986223e927a63c61221a9fb1f271fc2d90a7b57ff265c0b56261f8a0bafd64baa5a63da38336ebfb2b60cd739edecd7504f043406e5283ef52cf703ab59c3738
+  data.tar.gz: a9844a050da4c5aba6beac0299839bd15682b434989c08dad4e4fe71ceaeb85bda721d43eb61a9120e932c8cd2e0da6f9ef52baf33f825d9bb2fcc86e6bc0c9f

data/CHANGELOG

@@ -3,13 +3,20 @@ CHANGELOG
 
 This project does *not* adhere to Semantic Versioning
 
-## 0.0.5 - 2014-02-18 
+## 0.0.6 - 2015-02-23
+
+### Fixed
+
+- JSON Schema is now generated based on RAML if application/json is present
+	and nil
+
+## 0.0.5 - 2015-02-18 
 
 ### Fixed
 
 - Security pages are back to using the layout defined for resource pages
 
-## 0.0.4 - 2014-02-18
+## 0.0.4 - 2015-02-18
 
 ### Fixed
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jekyll-ramler (0.0.5)
+    jekyll-ramler (0.0.6)
       jekyll
 
 GEM

data/jekyll-ramler.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'jekyll-ramler'
-  s.version     = '0.0.5'
+  s.version     = '0.0.6'
   s.date        = '2015-02-09'
   s.authors     = ['GovDelivery']
   s.email       = 'support@govdelivery.com'

data/lib/utils.rb

@@ -42,7 +42,7 @@ module Jekyll
 
         if obj.include?('body')
           if obj['body'].fetch('application/x-www-form-urlencoded', {}).include?('formParameters')
-            if obj['body'].include?('application/json') && !(obj['body']['application/json'].include?('schema'))
+            if insert_json_schema?(obj)
               insert_json_schema(obj, generate_json_schema(obj))
             end
           end
@@ -54,6 +54,7 @@ module Jekyll
 
     # Inserts provided JSON Schema into obj['body']['application/json']['schema'] 
     def insert_json_schema(obj, schema)
+      obj['body']['application/json'] = {} if obj['body']['application/json'].nil?
       obj['body']['application/json']['schema'] = schema 
     end
 
@@ -88,6 +89,13 @@ module Jekyll
       
       JSON.pretty_generate(schema_hash)
     end
+
+    def insert_json_schema?(obj)
+      return false if !obj['body'].include?('application/json')
+      json_hash = obj['body']['application/json']
+      json_hash = {} if json_hash.nil?
+      !(json_hash.include?('schema'))
+    end
   end
 
   class JsonSchemaCompiler

data/spec/utils_raml_schema_generator_spec.rb

@@ -38,6 +38,32 @@ describe 'Utils' do
       end
     end
 
+    context '.insert_json_schema?' do
+      it 'returns true if application/json does not contain "schema"' do
+        method = @raml_hash['resources']['/test_resource']['post']
+        method['body']['application/json'] = {}
+        expect(@rsg.insert_json_schema?(method)).to be true
+      end
+
+      it 'returns true if application/json is nil' do
+        method = @raml_hash['resources']['/test_resource']['post']
+        method['body']['application/json'] = nil
+        expect(@rsg.insert_json_schema?(method)).to be true
+      end
+
+      it 'returns false if there is no application/json' do
+        method = @raml_hash['resources']['/test_resource']['post']
+        method['body'].delete('application/json')
+        expect(@rsg.insert_json_schema?(method)).to be false 
+      end
+
+      it 'returns false if application/json contains "schema"' do
+        method = @raml_hash['resources']['/test_resource']['post']
+        method['body']['application/json'] = {"schema" => "{A Schema!}"}
+        expect(@rsg.insert_json_schema?(method)).to be false
+      end
+    end
+
     context '.insert_json_schema' do
       it 'inserts an appropriate string into application/json:schema' do
         @raml_hash['resources']['/test_resource']['post']['body']['application/json'] = {}
@@ -55,6 +81,19 @@ describe 'Utils' do
       it 'throws an error if provided object does not have expected properties' do
         expect{@rsg.insert_json_schema(@raml_hash, 'foobar')}.to raise_error
       end
+
+      it 'elegantly handles a nil application/json and inserts an appropriate string into application/json:schema' do
+        @raml_hash['resources']['/test_resource']['post']['body']['application/json'] = nil
+        orig_raml_hash = DeepClone.clone @raml_hash
+
+        json_schema = @rsg.generate_json_schema(@raml_hash['resources']['/test_resource']['post'])
+        @rsg.insert_json_schema(@raml_hash['resources']['/test_resource']['post'], json_schema)
+
+        expect(@raml_hash['resources']['/test_resource']['post']['body']['application/json']).to include('schema')
+        expect(@raml_hash['resources']['/test_resource']['post']['body']['application/json']['schema']).to eq(json_schema)
+        @raml_hash['resources']['/test_resource']['post']['body']['application/json'] = nil
+        expect(@raml_hash).to eq(orig_raml_hash)
+      end
     end
 
     context '.insert_schemas' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-ramler
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - GovDelivery