prmd 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTIwZDk1MjQwNDczNDkxOTkyZWE4NjVhNjgyZGI5MDBhOWY4ODNlZA==
+    NjVhYzZlMzA0ODZlNDdhM2M1NWYzYzM0MjExMzM5NTZmMDQ2NDBhMw==
   data.tar.gz: !binary |-
-    NGQxYTRlZjE5NmQ5YzcwZGM4OWZmMzFiYTU5OGU3N2FjYzkyYTMxOA==
+    N2VlOGY4NDYwYmIwYzM4M2VhNjVjZTViZjk0MTg0YTRlMmRiNmNlZA==
 SHA512:
   metadata.gz: !binary |-
-    MmUwNWIxYjEwMDExY2FkYTM5MDliNDM0MGNlYjY2NzFhYzhhNzhlNWNhY2M2
-    YmFiOTFiOGFkMzdhZGFlMWU5ODk2OTY4ZWVkMDE3MjA5YzAyOTIyZDFlZjdi
-    MjEwNzVlZjUzMWUyNzI5NDc0NDk2OTgzMmZiZTc2NjNkYmI0N2E=
+    NDMwNDFlZWZjM2VjZDg0Yzc0YjhhNzA4MDc5NmUxM2FiMzExZjA4NzAyOTdj
+    YjE1NjZlNDc2Nzc5ZDY4MzNjZTAyZjhmNTI4ZTdlMWY0NDBhYmQwNGM0NDAy
+    MjI4NTQ3NDAxMDFhMmNmZjI2N2FhOWM4N2QyM2JjNTFlNTA0NTQ=
   data.tar.gz: !binary |-
-    ZDAxNWM4ZWJmZDJhN2YwZjIyMDNkZmJlY2E2ZGMzYzllOTI2Y2UxYzI5M2Nm
-    ZDU0YzYzNTI1YTI5NGM0NjA3NmRhZjI3MWFjZGY0OGNmMzliNThkNzg0NjBj
-    MjEzYWUwZDhlMDc3ZWU3MWZhMmVjMWRmNTNmZDk1ODQwNDk5YzI=
+    OTAwZjNiNzI2M2ZkZTBiZDQ1OGFlMjJkMTY0YmYwNDM0NDQ5MzQ0NGJhODU1
+    OGE2MTk5Y2M1YjBlOGJjOGNmMDBhM2FlM2ExMzhlYmY5NDgyZWQwOTlmZTlh
+    YzQ0NzkzODE4MmEwZjQ0ZGVlMGZiNzc2Y2MzMzI0NzYxNmViNjk=

data/lib/prmd/commands/verify.rb

@@ -2,10 +2,12 @@ module Prmd
   def self.verify(schema)
     errors = []
     errors << verify_schema(schema)
-    if schema['definitions']
-      schema['definitions'].each do |key, value|
-        errors << verify_schema(value)
-        errors << verify_definitions_and_links(value)
+    schema = Prmd::Schema.new(schema)
+    if schema['properties']
+      schema['properties'].each do |key, value|
+        _, schemata = schema.dereference(value)
+        errors << verify_schema(schemata)
+        errors << verify_definitions_and_links(schemata)
       end
     end
     errors.flatten!

data/lib/prmd/templates/schemata.erb

@@ -28,14 +28,14 @@
         end
 
         # avoid repetition :}
-        if descriptions.size > 1
+        description = if descriptions.size > 1
           descriptions.first.gsub!(/ of (this )?.*/, "")
           descriptions[1..-1].map { |d| d.gsub!(/unique /, "") }
+          [descriptions[0...-1].join(", "), descriptions.last].join(" or ")
+        else
+          description = descriptions.last
         end
 
-        last = descriptions.pop
-        description = [descriptions.join(", "), last].join(" or ")
-
         example = [*examples].map { |e| "<code>#{e.to_json}</code>" }.join(" or ")
         attributes << [key, "string", description, example]
 

data/lib/prmd/version.rb

@@ -1,3 +1,3 @@
 module Prmd
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prmd
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - geemus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis