json_schema 0.17.2 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 635babaf9176db9c16a7564e0cdb8804ba209201
-  data.tar.gz: c866943726dbe55237d5c7931793d5ecf149945a
+  metadata.gz: 2d133299adf9a9c71dad5525df64e25d4846e35e
+  data.tar.gz: 4d9aed1582b80eefcfc12656dddaf65b77fd894a
 SHA512:
-  metadata.gz: 5caf545cbf4684cad41d64fc889d5c167f2e4f3980b91014a7367fef4f070a4fd5b77b138f80f12f34b3d62fbae11bd0890a67d1a490228db59a4cccf9b1a263
-  data.tar.gz: ff16d212597fbeab145f40023052e1e792014cd78c7ebafc65bd75af7c505879622a65cbbe037037ff287ceb3274288da603f6afcf21c79eb5628a4dd398ee8f
+  metadata.gz: 6f156d37e4067bae3bbd2e7a471f921d362afea8e2900c88c13278b383efd52a5f7fefd3129418c2dd406a0ec5a103b748aa7183238d7445e67dbbe969f63b4b
+  data.tar.gz: 9e118b7e172ed7c52b8b9cddd26a29e6a8e872e0f8782f6a57f34bdd323165b3996b4d405e8639441fb4a5f93fbb155f24b5fd59ecf98cfead00e4a49dee0ad6

data/lib/json_schema/attributes.rb

@@ -43,10 +43,18 @@ module JsonSchema
             end
           end
         end
+
+        if options[:clear_cache]
+          remove_method(:"#{attr}=")
+          define_method(:"#{attr}=") do |value|
+            instance_variable_set(options[:clear_cache], nil)
+            instance_variable_set(ref, value)
+          end
+        end
       end
 
       def attr_schema(attr, options = {})
-        attr_copyable(attr, :default => options[:default])
+        attr_copyable(attr, :default => options[:default], :clear_cache => options[:clear_cache])
         self.schema_attrs[options[:schema_name] || attr] = attr
       end
 

data/lib/json_schema/schema.rb

@@ -2,6 +2,16 @@ require "json"
 
 module JsonSchema
   class Schema
+    TYPE_MAP = {
+      "array"   => Array,
+      "boolean" => [FalseClass, TrueClass],
+      "integer" => Integer,
+      "number"  => [Integer, Float],
+      "null"    => NilClass,
+      "object"  => Hash,
+      "string"  => String,
+    }
+
     include Attributes
 
     def initialize
@@ -129,7 +139,7 @@ module JsonSchema
     # of strings.
     #
     # Type: Array[String]
-    attr_schema :type, :default => []
+    attr_schema :type, :default => [], :clear_cache => :@type_parsed
 
     # validation: array
     attr_schema :additional_items, :default => true, :schema_name => :additionalItems
@@ -199,6 +209,14 @@ module JsonSchema
       true
     end
 
+    # An array of Ruby classes that are equivalent to the types defined in the
+    # schema.
+    #
+    # Type: Array[Class]
+    def type_parsed
+      @type_parsed ||= type.flat_map { |t| TYPE_MAP[t] }.compact
+    end
+
     def inspect
       "\#<JsonSchema::Schema pointer=#{pointer}>"
     end

data/lib/json_schema/validator.rb

@@ -2,16 +2,6 @@ require "uri"
 
 module JsonSchema
   class Validator
-    TYPE_MAP = {
-      "array"   => Array,
-      "boolean" => [FalseClass, TrueClass],
-      "integer" => Integer,
-      "number"  => [Integer, Float],
-      "null"    => NilClass,
-      "object"  => Hash,
-      "string"  => String,
-    }
-
     attr_accessor :errors
 
     def initialize(schema)
@@ -512,8 +502,7 @@ module JsonSchema
 
     def validate_type(schema, data, errors, path)
       return true if !schema.type || schema.type.empty?
-      valid_types = schema.type.flat_map { |t| TYPE_MAP[t] }.compact
-      if valid_types.any? { |t| data.is_a?(t) }
+      if schema.type_parsed.include?(data.class)
         true
       else
         key = find_parent(schema)

data/test/json_reference/reference_test.rb

@@ -5,7 +5,7 @@ require "json_reference"
 describe JsonReference::Reference do
   it "expands a reference without a URI" do
     ref = reference("#/definitions")
-    assert_equal nil, ref.uri
+    assert_nil ref.uri
     assert_equal "#/definitions", ref.pointer
   end
 
@@ -17,7 +17,7 @@ describe JsonReference::Reference do
 
   it "expands just a root sign" do
     ref = reference("#")
-    assert_equal nil, ref.uri
+    assert_nil ref.uri
     assert_equal "#", ref.pointer
   end
 
@@ -29,13 +29,13 @@ describe JsonReference::Reference do
 
   it "normalizes pointers by adding a root sign prefix" do
     ref = reference("/definitions")
-    assert_equal nil, ref.uri
+    assert_nil ref.uri
     assert_equal "#/definitions", ref.pointer
   end
 
   it "normalizes pointers by stripping a trailing slash" do
     ref = reference("#/definitions/")
-    assert_equal nil, ref.uri
+    assert_nil ref.uri
     assert_equal "#/definitions", ref.pointer
   end
 

data/test/json_schema/attribute_test.rb

@@ -14,7 +14,7 @@ describe JsonSchema::Attributes do
     obj = TestAttributes.new
     obj.schema = "foo"
     assert_equal "foo", obj.schema
-    assert_equal({:schema => :schema, :named => :schema_named},
+    assert_equal({:schema => :schema, :named => :schema_named, :cached => :cached},
       obj.class.schema_attrs)
   end
 
@@ -48,7 +48,7 @@ describe JsonSchema::Attributes do
     obj.schema = "schema"
 
     assert_raises NoMethodError do
-      assert_equal nil, obj[:copyable]
+      assert_nil obj[:copyable]
     end
 
     assert_equal "schema", obj[:schema]
@@ -71,8 +71,18 @@ describe JsonSchema::Attributes do
     obj = TestAttributes.new
 
     # should produce a nil value *without* a Ruby warning
-    assert_equal nil, obj.copyable
-    assert_equal nil, obj.schema
+    assert_nil obj.copyable
+    assert_nil obj.schema
+  end
+
+  it "cleans cached values when assigning parent attribute" do
+    obj = TestAttributes.new
+
+    obj.cached = "test"
+    assert_equal "test_123", obj.cached_parsed
+
+    obj.cached = "other"
+    assert_equal "other_123", obj.cached_parsed
   end
 
   class TestAttributes
@@ -87,6 +97,11 @@ describe JsonSchema::Attributes do
     attr_schema :schema
     attr_schema :schema_named, :schema_name => :named
 
+    attr_schema :cached, :clear_cache => :@cached_parsed
+    def cached_parsed
+      @cached_parsed ||= "#{cached}_123"
+    end
+
     attr_copyable :copyable_default, :default => []
     attr_copyable :copyable_default_with_string, :default => "application/json"
     attr_copyable :copyable_default_with_object, :default => {}

data/test/json_schema/schema_test.rb

@@ -34,4 +34,13 @@ describe JsonSchema::Schema do
       schema[:expanded]
     end
   end
+
+  it "updates type_parsed when type is changed" do
+    schema = JsonSchema::Schema.new
+    schema.type = ["integer"]
+    assert_equal [Integer], schema.type_parsed
+
+    schema.type = ["string"]
+    assert_equal [String], schema.type_parsed
+  end
 end

data/test/json_schema_test.rb

@@ -7,7 +7,7 @@ describe JsonSchema do
     it "succeeds" do
       schema, errors = JsonSchema.parse(schema_sample)
       assert schema
-      assert_equal nil, errors
+      assert_nil errors
     end
 
     it "returns errors on a parsing problem" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schema
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.18.0
 platform: ruby
 authors:
 - Brandur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecma-re-validator