prmd 0.11.11 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 360cb547141b8b6cb7530276cee8937fc3d67eeb
-  data.tar.gz: e5258d2ab83ccf065bed3c366ce915ad3b499f22
+  metadata.gz: d1010706b78a9b6d770bb52a5a3bc0dd40cbb516
+  data.tar.gz: 0c6021aedeb0bbeaee1af485ffdddcb7c4a83ec5
 SHA512:
-  metadata.gz: 05fe9b1d724b0fa2290b1fbd93338eda26819e6bfe2ebaaf27fae5b49a9c8c3fb1eac37377be484280ccf713ac10db897605195337146fe7c8285a2ff066b60a
-  data.tar.gz: 729a5aa7351f1ffd3777194370bb5a6beb59eed6407c00506baa1a0312eccdfd424d679552a91f555935080faf564a754c8305449c1bc1d3c4c42914d2c69dc9
+  metadata.gz: 812720e3b67bcf3f524a545364129751e4b87afb10dc67c74aaf586f6d18f5de644eaa20852bbe68017439004a3a6571eb4230dee4222221344c243a1ad26c99
+  data.tar.gz: 442813d217485037daf7aa7a9854c99ec76ddd6371f4d0945c69a9d0000812a232a6b8e8acc6d793f8a4a94952f41335c83a39fd4b592cda212e9526fd5cdc81

data/docs/schemata.md

@@ -42,7 +42,7 @@ Each attribute MUST include the following properties:
 Each attribute MAY include the following properties:
 
 * `pattern` - a javascript regex encoded in a string that the valid values MUST match
-* `format` - format of the value. MUST be one of spec defined `["date-time", "email", "hostname", "ipv4", "ipv6", "uri"]` or defined by us `["uuid"]`
+* `format` - format of the value. MUST be one of spec defined `["date", "date-time", "email", "hostname", "ipv4", "ipv6", "uri"]` or defined by us `["uuid"]`
 
 Examples:
 

data/lib/prmd/cli/combine.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('-t', '--type-as-string', 'Allow type as string') do |t|
+            options[:type_as_string] = t
+          end
         end
       end
 
@@ -30,7 +33,8 @@ module Prmd
       # @example Usage
       #   Prmd::CLI::Combine.execute(argv: ['schema/schemata/api'],
       #                              meta: 'schema/meta.json',
-      #                              output_file: 'schema/api.json')
+      #                              output_file: 'schema/api.json',
+      #                              type-as-string)
       #
       # @param (see Prmd::CLI::Base#execute)
       # @return (see Prmd::CLI::Base#execute)

data/lib/prmd/commands/combine.rb

@@ -119,7 +119,7 @@ module Prmd
         end
         meta ||= {}
       end
-      combiner = Prmd::Combiner.new(meta: meta, base: base, schema: schema)
+      combiner = Prmd::Combiner.new(meta: meta, base: base, schema: schema, options: options)
       combiner.combine(*schemata)
     end
 

data/lib/prmd/core/combiner.rb

@@ -13,6 +13,7 @@ module Prmd
       @schema = properties.fetch(:schema)
       @base = properties.fetch(:base, {})
       @meta = properties.fetch(:meta, {})
+      @options = properties.fetch(:options, {})
     end
 
     # @param [Object] datum
@@ -53,7 +54,7 @@ module Prmd
         reference_localizer(data['definitions'][id_ary])
       end
 
-      Prmd::Schema.new(data)
+      Prmd::Schema.new(data, @options)
     end
 
     private :reference_localizer

data/lib/prmd/schema.rb

@@ -10,6 +10,7 @@ module Prmd
     "number"  => 42.0,
     "string"  => "example",
 
+    "date"      => "2015-01-01",
     "date-time" => "2015-01-01T12:00:00Z",
     "email"     => "username@example.com",
     "hostname"  => "example.com",
@@ -24,24 +25,28 @@ module Prmd
     attr_reader :data
 
     # @param [Hash<String, Object>] new_data
-    def initialize(new_data = {})
-      @data = convert_type_to_array(new_data)
+    def initialize(new_data = {}, options = {})
+      @data = convert_type_to_array(new_data, options)
       @schemata_examples = {}
     end
 
     #
     # @param [Object] datum
     # @return [Object] same type as the input object
-    def convert_type_to_array(datum)
+    def convert_type_to_array(datum, options)
       case datum
       when Array
-        datum.map { |element| convert_type_to_array(element) }
+        datum.map { |element| convert_type_to_array(element, options) }
       when Hash
-        if datum.key?('type') && datum['type'].is_a?(String)
+        if datum.key?('type') && datum['type'].is_a?(String) && !options[:type_as_string]
           datum['type'] = [*datum['type']]
         end
         datum.each_with_object({}) do |(k, v), hash|
-          hash[k] = convert_type_to_array(v)
+          if k != 'example'
+            hash[k] = convert_type_to_array(v, options)
+          else
+            hash[k] = v
+          end
         end
       else
         datum

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, 11, 11, nil
+    MAJOR, MINOR, TEENY, PATCH = 0, 12, 0, nil
     # version string
     # @return [String]
     STRING = [MAJOR, MINOR, TEENY, PATCH].compact.join('.').freeze

data/schemas/interagent-hyper-schema.json

@@ -90,10 +90,6 @@
                 {
                     "required": ["example", "type"]
                 },
-                {
-                    "required": ["type"],
-                    "type": ["array"]
-                },
                 {
                     "required": ["type"],
                     "type": ["object"]

metadata

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