prmd 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 579c3db87d3792ad0cec85d4ffe6cc8768c75ecf
-  data.tar.gz: a268c574753449a9c4c26b133edbb197e110a656
+  metadata.gz: b6c1c60fbfffb354907c790aa138cf4cf32d3e8f
+  data.tar.gz: 39a28c6f1b00bf1099f25c50bac8dc629b781073
 SHA512:
-  metadata.gz: b47a74089c0f70e5e981f8c684935158a1efce15393979605aa9a6773f9464c37b9ab2c8398de071912b30c5655bbe1dc0467cb947fdc8979e56ff8ea1f3ebf6
-  data.tar.gz: d2e6700a36c36a4483d09949ea54c96e2ced5d1faa031e63f00d8f3e401df2a61d29f4edfa5fb14c4746ce0061b8956a3ab13f46664a4d9a337547331f83ff98
+  metadata.gz: 3bde164e0084e1e6a0bc736b6620b67bff6d7099888fd0031a5074f15fd82d58f41e83f6d9c695ea6438f9a91fd2ae311417afeb333f9ec2c8391ace10a5aa57
+  data.tar.gz: a76bdc4c776a3e90127401c14efdb827f1db7cb6c1c89c2217532f9b199c120d87f4f33fdcdef24d0019d2656c28379b3f3e3472eb3fdafe3ef78eb96668d048

data/lib/prmd/cli/doc.rb

@@ -22,15 +22,15 @@ module Prmd
             options = HashHelpers.deep_symbolize_keys(settings)
             yield :settings, options
           end
-          opts.on('-p', '--prepend header,overview', Array, 'Prepend files to output') do |p|
-            yield :prepend, p
-          end
           opts.on('-c', '--content-type application/json', String, 'Content-Type header') do |c|
             yield :content_type, c
           end
           opts.on('-o', '--output-file FILENAME', String, 'File to write result to') do |n|
             yield :output_file, n
           end
+          opts.on('-p', '--prepend header,overview', Array, 'Prepend files to output') do |p|
+            yield :prepend, p
+          end
         end
       end
 

data/lib/prmd/cli/render.rb

@@ -16,15 +16,18 @@ module Prmd
 
         OptionParser.new do |opts|
           opts.banner = "#{binname} render [options] <combined schema>"
+          opts.on('-c', '--content-type application/json', String, 'Content-Type header') do |c|
+            yield :content_type, c
+          end
+          opts.on('-o', '--output-file FILENAME', String, 'File to write result to') do |n|
+            yield :output_file, n
+          end
           opts.on('-p', '--prepend header,overview', Array, 'Prepend files to output') do |p|
             yield :prepend, p
           end
           opts.on('-t', '--template templates', String, 'Use alternate template') do |t|
             yield :template, t
           end
-          opts.on('-o', '--output-file FILENAME', String, 'File to write result to') do |n|
-            yield :output_file, n
-          end
         end
       end
 

data/lib/prmd/cli/verify.rb

@@ -22,6 +22,9 @@ module Prmd
           opts.on('-o', '--output-file FILENAME', String, 'File to write result to') do |n|
             yield :output_file, n
           end
+          opts.on('-s', '--custom-schema FILENAME', String, 'Path to custom schema') do |n|
+            yield :custom_schema, n
+          end
         end
       end
 
@@ -35,7 +38,8 @@ module Prmd
       def self.execute(options = {})
         filename = options.fetch(:argv).first
         _, data = try_read(filename)
-        errors = Prmd.verify(data)
+        custom_schema = options[:custom_schema]
+        errors = Prmd.verify(data, custom_schema: custom_schema)
         unless errors.empty?
           errors.map! { |error| "#{filename}: #{error}" } if filename
           errors.each { |error| $stderr.puts(error) }

data/lib/prmd/commands/verify.rb

@@ -18,14 +18,19 @@ module Prmd
       store = JsonSchema::DocumentStore.new
       SCHEMAS.each do |file|
         file = File.expand_path("../../../../schemas/#{file}", __FILE__)
-        data = JSON.parse(File.read(file))
-        schema = JsonSchema::Parser.new.parse!(data)
-        schema.expand_references!(store: store)
-        store.add_schema(schema)
+        add_schema(store, file)
       end
+      add_schema(store, @custom_schema) unless @custom_schema.nil?
       store
     end
 
+    def self.add_schema(store, file)
+      data = JSON.parse(File.read(file))
+      schema = JsonSchema::Parser.new.parse!(data)
+      schema.expand_references!(store: store)
+      store.add_schema(schema)
+    end
+
     # @return [JsonSchema::DocumentStore]
     def self.document_store
       @document_store ||= init_document_store
@@ -70,7 +75,8 @@ module Prmd
     #
     # @param [Hash] schema_data
     # @return [Array<String>] errors from failed verification
-    def self.verify(schema_data)
+    def self.verify(schema_data, custom_schema: nil)
+      @custom_schema = custom_schema
       a = verify_schema(schema_data)
       return a unless a.empty?
       b = verify_parsable(schema_data)
@@ -88,7 +94,7 @@ module Prmd
   end
 
   # (see Prmd::Verification.verify)
-  def self.verify(schema_data)
-    Verification.verify(schema_data)
+  def self.verify(schema_data, custom_schema: nil)
+    Verification.verify(schema_data, custom_schema: custom_schema)
   end
 end

data/lib/prmd/link.rb

@@ -46,7 +46,7 @@ module Prmd
 
     class Schema < OpenStruct
       def has_properties?
-        !self.properties.empty?
+        self.properties && !self.properties.empty?
       end
 
       def property_is_required?(property_name)

data/lib/prmd/templates/schemata/link_curl_example.md.erb

@@ -22,7 +22,7 @@ $ curl -n -X <%= link['method'] %> <%= schema.href %><%= path -%><%- unless opti
 $ curl -n <%= schema.href %><%= path -%><%- unless options[:http_header].empty? %> \<%- end %>
 <%- end %>
   <%- options[:http_header].each do |key, value| %>
-  -H "<%= key %>: <%= value %>" \
+  -H "<%= key %>: <%= value %>"<%- unless key == options[:http_header].keys.last %> =<%- end %>
   <%- end %>
 <%- if !data.nil? && link['method'].upcase != 'GET' %> \
   -d '<%= JSON.pretty_generate(data) %>'

data/lib/prmd/version.rb

@@ -2,7 +2,7 @@
 module Prmd
   # Well, duh, its a Version module, what did you expect?
   module Version
-    MAJOR, MINOR, TEENY, PATCH = 0, 10, 0, nil
+    MAJOR, MINOR, TEENY, PATCH = 0, 11, 0, nil
     # version string
     # @return [String]
     STRING = [MAJOR, MINOR, TEENY, PATCH].compact.join('.').freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prmd
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - geemus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis