genny 0.2.1 → 0.2.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGEzMzY1ZDZkMGIxYzYyYjYzOTZjODI0NTY1MzFmMTVlNTMyNjY0Mw==
+    ODA4NWZiM2YxMjk1OTE1ZjIzNDg4N2U3MmY1YTBjYjllZjk2ODg1Zg==
   data.tar.gz: !binary |-
-    OTY1ZTlkNGYzZjI2MmFjODMyYTkzZDlhM2U3ZmRkNDQ4ZmY0ZGQwOQ==
+    NGYzMDZkNzQyMzE1Y2I3OGZiZDFiNDgyZDk4YWUwNDU1MDQ1Yzg2NQ==
 SHA512:
   metadata.gz: !binary |-
-    YTI0OTljMmNlOGZkMTI2ODQ3NTFhMWQzZjliNzEwMzc2MWM2ZmNmNTgzZmY4
-    ZGYwYjFiMjY3Y2RiMDJkMGJlNzBiMTAwYzgyZDJmMTJiODQyODUwMDY4MzZj
-    Nzk0MGNjNWNmMzBkMTVlYzdjYTI0ZmJkNmYxMTcyOWExOWE2ODk=
+    NGQ3OGVlOTA0ZTM4NzRhOTAyNTU5ZTRhZTMxZTZmNTc2ZThjY2Q1YWIzYzVk
+    MDE3M2QxMGEwOTQ1YzdhMzdkYjNmZWI3NTM2YWRlYWM2MDBkMDU5NzRkYzYx
+    NmFjMDFiMDNjMDYzZWY4Mjc3ZjNiZjM2OGFlYTBhN2EyYzUzZDQ=
   data.tar.gz: !binary |-
-    ODJkMWQ1NTU2MTBjNWM0ZGJlNzg3NjhmYmJkMTY3ZjRkOTE2ZjFkZDRmNzkx
-    Njk5MGEyZDRlYzVkNThlMTIwZmJmZDA5NGVhOGFiODJhMDI5YzliNjg5MDRm
-    MmVkNmJkOGU4Y2U0OTg0M2VmZmZiMjdhMjYyYjBjMDBkZWZiZmQ=
+    Nzk5OGNmMDdhYjIzMWI4MzYzMjljNjdjMWQ3NmZjNWExN2M0Yjc1Yjg0MDNm
+    ZjFmM2RmNWY5MTU4NjBmZThiOGJlNDQwMTA2YjZiYmI1MzdmYmRjOTMxNjYy
+    ZjY0YTg4YzU0ZjEwYWZmNzdjNDJmZTMyOWI3NDg4OTdjZjJkMmQ=

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/genny/array.rb

@@ -21,7 +21,7 @@ module Genny
     # @return [Array]
     def self.genny(opts = {})
       opts = Genny.symbolize(opts)
-      opts[:items] = opts[:items].is_a?(Array) ? opts[:items] : [opts[:items]].compact
+      opts[:items] = opts[:items].is_a?(::Array) ? opts[:items] : [opts[:items]].compact
       raise ArgumentError, "classes must be an array" unless opts[:items].respond_to?(:select)
       items = opts[:items].select { |item| item.respond_to?(:genny) }
       if items.empty?
@@ -29,7 +29,7 @@ module Genny
         return []
       end
       min_count = opts[:minItems] || 1
-      max_count = opts[:maxItems] || [opts[:minItems], 5].max
+      max_count = opts[:maxItems] || [min_count, 5].max
       raise "maxItems is lower than minItems" if max_count < min_count
       count = Random.rand(max_count - min_count + 1) + min_count
       return count.times.map { items.sample.genny }

data/lib/genny/json_schema.rb

@@ -31,6 +31,10 @@ class JSONSchema < SimpleDelegator
       nil => Genny::Hash
     }[opts[:type]]
     raise "Cannot generate JSON Schema object of type '#{opts[:type]}'." unless klass.respond_to?(:genny)
+    # Convert the JSONSchema items object into something Array.genny can cope with
+    opts[:items] = (opts[:items].is_a?(::Array) ? opts[:items] : [opts[:items]].compact).map do |item|
+      JSONSchema.new(item, definitions: opts[:definitions])
+    end if klass == Genny::Array
     klass.genny(opts)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: genny
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - JP Hastings-Spital
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake