blumquist 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29ba6e431b5d179ef49358e17f117d29a1d05615
-  data.tar.gz: 7c91510b9be03ebf29b43206e10dc69b4fb43e5d
+  metadata.gz: 150c41e7fb3e641e3ce7593c7c9284fd67e8b460
+  data.tar.gz: 36068814a20c207c6076832c3e7d30402dcd77b7
 SHA512:
-  metadata.gz: 4c8285345e463ee65590ed825b82cd9c4583828191d80d5541521becc48e2bf3f31b1347cc81ecef0d467d1de5daa9c66d61fb844760173b9d00efa7313071ec
-  data.tar.gz: dd6ac867efcef1d457aa13db890c5d433b28766d68c6d38f1e7ec9924ba0530d89bba7e056f48c3e119f2bbbe37dff6199e54192ee386e7bdc3981970af944d1
+  metadata.gz: 35a20db0cf40272b03861a20231d4eec2630493d9bc0c4a1d47248c4b4072826bba2d6e117d98b242b9fa0ed9b6c79d6b0500d442b69e09bdb28250905573d0b
+  data.tar.gz: edffb883241b8688c65eb1025fd318119d364eb4f6885c0f342fd5efee4b445fe929a4a2045ae321e440caef734130a72a7534005910a95f4e1e59bd640c970d

data/CHANGELOG.md

@@ -1,5 +1,8 @@
+# 0.4.3
+- Allow arrays with single-array-types
+
 # 0.4.2
-- Allow type arrays with just one element
+- Allow objects with single-array-types
 
 # 0.4.1
 - Fix broken arrays of objects

data/lib/blumquist.rb

@@ -54,13 +54,11 @@ class Blumquist
 
   def define_getters
     @schema[:properties].each do |property, type_def|
-      types = [type_def[:type]].flatten - ["null"]
-      type = types.first
-
       # The type_def can contain one or more types.
-      # We only support single types, or one
+      # We only support multiple primitive types, or one
       # normal type and the null type.
-      raise(Errors::UnsupportedType, type_def[:type]) if types.length > 1
+      types = [type_def[:type]].flatten - ["null"]
+      type = types.first
 
       # Wrap objects recursively
       if type == 'object' || type_def[:oneOf]
@@ -73,6 +71,8 @@ class Blumquist
       # Nothing to do for primitive values
       elsif primitive_type?(type)
 
+      elsif all_primitive_types(types)
+
       # We don't know what to do, so let's panic
       else
         raise(Errors::UnsupportedType, type)
@@ -214,6 +214,8 @@ class Blumquist
       @data[property] = @data[property].map do |item|
         Blumquist.new(schema: sub_schema, data: item, validate: false)
       end
+
+    # The items are objects, defined directly or through oneOf
     elsif type_def[:type] == 'object' || type_def[:oneOf]
       sub_schema = type_def.merge(
         definitions: @schema[:definitions]
@@ -224,11 +226,20 @@ class Blumquist
         blumquistify_object(schema: sub_schema, data: item)
       end
 
+    # The items are all of the same primitive type
     elsif primitive_type?(type_def[:type])
 
+    # The items might all be primitives, that would be OK
+    elsif all_primitive_types(type_def[:type])
+
     # We don't know what to do, so let's panic
     else
       raise(Errors::UnsupportedType, type_def[:type])
     end
   end
-end
+
+  def all_primitive_types(types)
+    return false unless types.is_a?(Array)
+    types.all? { |t| primitive_type?(t) }
+  end
+end

data/lib/blumquist/version.rb

@@ -1,3 +1,3 @@
 class Blumquist
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blumquist
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Jannis Hermanns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport