blumquist 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a56519a62c8cda5595755e7e4a02c59ceaf06fdb
-  data.tar.gz: 35fe0e245587b62219342a67541f86fa7f0cbf5a
+  metadata.gz: 29ba6e431b5d179ef49358e17f117d29a1d05615
+  data.tar.gz: 7c91510b9be03ebf29b43206e10dc69b4fb43e5d
 SHA512:
-  metadata.gz: 4d34430761c31b38a0800a3cb8c7f38e3d4ad673560f8a6fc5e2fbd195e1f76dc3db14730146e8c60ac25ba93a5387a5d1c8a55b5bae301f8599cb97032bf95e
-  data.tar.gz: 3ca561664c837fb74a0f2eea5e5de158dd263a0eaf2c4a17496a141cfaa49c7d00201d213dcdd2dbd3cbc415b78180f73702a126f503609384825b0110ca71f5
+  metadata.gz: 4c8285345e463ee65590ed825b82cd9c4583828191d80d5541521becc48e2bf3f31b1347cc81ecef0d467d1de5daa9c66d61fb844760173b9d00efa7313071ec
+  data.tar.gz: dd6ac867efcef1d457aa13db890c5d433b28766d68c6d38f1e7ec9924ba0530d89bba7e056f48c3e119f2bbbe37dff6199e54192ee386e7bdc3981970af944d1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.4.2
+- Allow type arrays with just one element
+
 # 0.4.1
 - Fix broken arrays of objects
 

data/lib/blumquist.rb

@@ -64,7 +64,7 @@ class Blumquist
 
       # Wrap objects recursively
       if type == 'object' || type_def[:oneOf]
-        blumquistify_object(property)
+        @data[property] = blumquistify_property(property)
 
       # Turn array elements into Blumquists
       elsif type == 'array'
@@ -91,19 +91,47 @@ class Blumquist
     end
   end
 
-  def blumquistify_object(property)
+  def blumquistify_property(property)
     sub_schema = @schema[:properties][property].merge(
       definitions: @schema[:definitions]
     )
+    data = @data[property]
+    blumquistify_object(schema: sub_schema, data: data)
+  end
+
+  def blumquistify_object(options)
+    sub_schema = options[:schema]
+    data = options[:data]
 
     # If properties are defined directly, like this:
     #
     #     { "type": "object", "properties": { ... } }
     #
     if sub_schema[:properties]
-      sub_blumquist = Blumquist.new(schema: sub_schema, data: @data[property], validate: @validate)
-      @data[property] = sub_blumquist
-      return
+      if sub_schema[:type].is_a?(String)
+        sub_blumquist = Blumquist.new(schema: sub_schema, data: data, validate: false)
+        return sub_blumquist
+      end
+
+      # If the type is an array, we can't make much of it
+      # because we wouldn't know which type to model as a
+      # blumquist object. Unless, of course, it's one object
+      # and one or more primitives.
+      if sub_schema[:type].is_a?(Array)
+
+        # It's an array but only contains one allowed type,
+        # this is easy.
+        if sub_schema[:type].length == 1
+          sub_schema[:type] = sub_schema[:type].first
+          sub_blumquist = Blumquist.new(schema: sub_schema, data: data, validate: false)
+          return sub_blumquist
+        end
+
+        # We can implement the other cases at a leter point.
+      end
+
+      # We shouldn't arrive here
+      raise(Errors::UnsupportedType, sub_schema)
     end
 
     # Properties not defined directly, object must be 'oneOf',
@@ -113,7 +141,9 @@ class Blumquist
     #
     # The json schema v4 draft specifies, that:
     #
-    #    "the oneOf keyword is new in draft v4; its value is an array of schemas, and an instance is valid if and only if it is valid against exactly one of these schemas"
+    #    "the oneOf keyword is new in draft v4; its value is an array of
+    #    schemas, and an instance is valid if and only if it is valid
+    #    against exactly one of these schemas"
     #
     # *See: http://json-schema.org/example2.html
     #
@@ -133,8 +163,7 @@ class Blumquist
                 definitions: @schema[:definitions]
               )
             end
-            @data[property] = Blumquist.new(data: @data[property], schema: schema)
-            return
+            return Blumquist.new(data: data, schema: schema, validate: true)
           end
         rescue
           # On to the next oneOf
@@ -144,12 +173,10 @@ class Blumquist
       # We found no matching object definition.
       # If a primitve is part of the `oneOfs,
       # that's no problem though.
-      return if primitive_allowed
+      return data if primitive_allowed
 
       # We didn't find a schema in oneOf that matches our data
-      raise(Errors::NoCompatibleOneOf, one_ofs: sub_schema[:oneOf], data: @data[property])
-
-      return
+      raise(Errors::NoCompatibleOneOf, one_ofs: sub_schema[:oneOf], data: data)
     end
 
     # If there's neither `properties` nor `oneOf`, we don't
@@ -185,16 +212,16 @@ class Blumquist
 
       @data[property] ||= []
       @data[property] = @data[property].map do |item|
-        Blumquist.new(schema: sub_schema, data: item, validate: @validate)
+        Blumquist.new(schema: sub_schema, data: item, validate: false)
       end
-    elsif type_def[:type] == 'object'
+    elsif type_def[:type] == 'object' || type_def[:oneOf]
       sub_schema = type_def.merge(
         definitions: @schema[:definitions]
       )
 
       @data[property] ||= []
       @data[property] = @data[property].map do |item|
-        Blumquist.new(schema: sub_schema, data: item, validate: @validate)
+        blumquistify_object(schema: sub_schema, data: item)
       end
 
     elsif primitive_type?(type_def[:type])

data/lib/blumquist/version.rb

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

metadata

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