blumquist 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11ba5173f0cf7e4d511587c0183b98577fbec9f7
-  data.tar.gz: 41c86c469189421fa8f6586897328e3fca28309f
+  metadata.gz: f4879db47364122779e5e676bdf8856a3ab262e3
+  data.tar.gz: 0e7e11fe567658c3faf6f3818ab61a18bc84f5f6
 SHA512:
-  metadata.gz: 530d51062112f7f9c36de9c6bdd1371f27b0af5a887b2ba1c389b63f70e051f97e1a8358fb171429ab1f26e2dd200db1075b3e4e80ab5e01a0f97205b0945431
-  data.tar.gz: 9273ce2f23bbee2a5290ef98bd15c4070e693cbcc75d8e6063d8351fb5a3022ea3e28822c8e3d581edf269c8889910865312deddba4917c7e0d92de30fcc82b8
+  metadata.gz: f4ead88bf98e00094da661c9ae1ec0b4e042c8f382d32c6147d4e30184a49bd917ecc5b7c4735a2e23e446819c23f4eae50868db0ef1986e3a02a177ecd68871
+  data.tar.gz: 20c8f94af73909b36aa723b67070b9ce340ecbb3c9aca8c43484d586b7d3211f942bb08095f81a80a1c8eaa8899162d5df3a1c863df0b7e4749c01efbe224f9b

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.7.0
+- Add object equality comparison
+
 # 0.6.0
 - Add marshalling support
 

data/lib/blumquist.rb

@@ -5,10 +5,13 @@ require 'json-schema'
 require 'blumquist/errors'
 
 class Blumquist
+  attr_reader :_type
+
   def initialize(options)
     # Poor man's deep clone: json 🆗 🆒
     @data = JSON.parse(options.fetch(:data).to_json)
     @schema = options.fetch(:schema).with_indifferent_access
+    @original_properties = options.fetch(:schema).with_indifferent_access[:properties]
     @validate = options.fetch(:validate, true)
 
     validate_schema
@@ -30,6 +33,12 @@ class Blumquist
     @schema, @data, @validate = array
   end
 
+  def ==(other)
+    self.class == other.class && other.marshal_dump == marshal_dump
+  end
+
+  alias_method :eql?, :==
+
   private
 
   def validate_data
@@ -51,6 +60,13 @@ class Blumquist
     end
   end
 
+  def resolve_json_pointer(type_def)
+    key = type_def[:$ref].split('/').last
+    definition = @schema[:definitions][key]
+    raise(Errors::InvalidPointer, pointer) unless definition
+    type_def.merge(definition)
+  end
+
   def resolve_json_pointer!(type_def)
     # Should read up on how json pointers are really resolved
     pointer = type_def.delete(:$ref)
@@ -120,7 +136,10 @@ class Blumquist
       definitions: @schema[:definitions]
     )
     data = @data[property]
-    blumquistify_object(schema: sub_schema, data: data)
+    sub_blumquist = blumquistify_object(schema: sub_schema, data: data)
+    # In case of oneOf the definition was already set
+    sub_blumquist._type = type_name_for(property) if sub_blumquist && sub_blumquist._type.nil?
+    sub_blumquist
   end
 
   def blumquistify_object(options)
@@ -183,11 +202,13 @@ class Blumquist
             if one[:type]
               schema = one.merge(definitions: @schema[:definitions])
             else
-              schema = resolve_json_pointer!(one).merge(
+              schema = resolve_json_pointer(one).merge(
                 definitions: @schema[:definitions]
               )
             end
-            return Blumquist.new(data: data, schema: schema, validate: true)
+            sub_blumquist = Blumquist.new(data: data, schema: schema, validate: true)
+            sub_blumquist._type = type_from_type_def(one)
+            return sub_blumquist
           end
         rescue
           # On to the next oneOf
@@ -213,6 +234,11 @@ class Blumquist
     raise(Errors::MissingProperties, sub_schema)
   end
 
+  def type_from_type_def(type_def)
+    return 'object' unless type_def.is_a?(Hash) && type_def.has_key?(:$ref)
+    type_def[:$ref].split("/").last
+  end
+
   def blumquistify_array(property)
     # We only support arrays with one type defined, either through
     #
@@ -233,6 +259,7 @@ class Blumquist
 
     # The items of this array are defined by a pointer
     if type_def[:$ref]
+      reference_type = type_from_type_def(type_def)
       item_schema = resolve_json_pointer!(type_def)
 
       sub_schema = item_schema.merge(
@@ -241,7 +268,9 @@ class Blumquist
 
       @data[property] ||= []
       @data[property] = @data[property].map do |item|
-        Blumquist.new(schema: sub_schema, data: item, validate: false)
+        sub_blumquist = Blumquist.new(schema: sub_schema, data: item, validate: false)
+        sub_blumquist._type = reference_type
+        sub_blumquist
       end
 
     # The items are objects, defined directly or through oneOf
@@ -267,8 +296,18 @@ class Blumquist
     end
   end
 
+  def type_name_for(property)
+    type_from_type_def(@original_properties[property])
+  end
+
   def all_primitive_types(types)
     return false unless types.is_a?(Array)
     types.all? { |t| primitive_type?(t) }
   end
+
+  protected
+
+  def _type=(_type)
+    @_type = _type
+  end
 end

data/lib/blumquist/version.rb

@@ -1,3 +1,3 @@
 class Blumquist
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blumquist
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Jannis Hermanns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-29 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Turn some data and a json schema into an immutable object with getters from