evt-schema 2.3.0.2 → 2.3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3799452dd8ae40202fbebec160485b2fb4810e5ecb873b1a4520a98e48117a3
-  data.tar.gz: 989066b6a844b998e8b8debfe8d20cec98014ca3a227e2693c61ff578bf79462
+  metadata.gz: 971bea799a068571a832fd0d91d795d358b4bf2353815af0deeba7bd06575f2b
+  data.tar.gz: ce668827143bc600c0cff547599342ef8b407360532645b31fa316e6b183cb6d
 SHA512:
-  metadata.gz: e0c2a231c2ceccd4d2a4b8472f43d23f78ef1fa18fc0ac673b1ad2eaf2d30b7afe7fffccc02f86753b517e4078fe32353765c19f78a832beac208caa763d8c3a
-  data.tar.gz: ffd08b7990b33add23ff1daada6031a30c1c96d2d70ee58ebc7fee895f305ca38b1a0c6f24c3b59f60776152e55a7fd4864bd7909aced652673036365da911db
+  metadata.gz: f574566d0440bfee26e16529dcd2d577c29d7a38ec6db7a50d8b2241f100fd3fbb31a6a8138983b8c48d006576f2d73505a90359b80d73b62b0382bd7a052107
+  data.tar.gz: 5a5d352f13748253fb1a0b499d21305e2a750c14ca2e4d0d6026fcb2f9e53650199e1a7280fdd20585c4a9faad55ccc15b680875b7559dfeb96daf3c48c7b031

data/lib/schema/controls/data_structure.rb

@@ -27,6 +27,7 @@ module Schema
 
       class Example
         include ::Schema::DataStructure
+
         attribute :some_attribute
       end
 
@@ -66,7 +67,11 @@ module Schema
           example
         end
 
-        class Example < DataStructure::Example
+        class Example
+          include ::Schema::DataStructure
+
+          attribute :some_attribute
+
           def transform_read(data)
             data[:some_attribute] = 'some read value'
           end
@@ -91,7 +96,11 @@ module Schema
             example
           end
 
-          class Example < DataStructure::Example
+          class Example
+            include ::Schema::DataStructure
+
+            attribute :some_attribute
+
             def transform_in(data)
               data[:some_attribute] = 'some read value'
             end
@@ -107,6 +116,10 @@ module Schema
         Error = Class.new(RuntimeError)
 
         class Example < DataStructure::Example
+          include ::Schema::DataStructure
+
+          attribute :some_attribute
+
           def transform_read(data)
             raise Error
           end

data/lib/schema/schema.rb

@@ -41,7 +41,7 @@ module Schema
 
         check = proc do |val|
           unless val.nil? || Boolean.(val)
-            raise Schema::Attribute::TypeError, "#{val.inspect} is not a boolean"
+            raise Schema::Attribute::TypeError, "#{val.inspect} of type #{val.class.name} cannot be assigned to attribute #{attribute_name} of type Boolean (Strict: #{strict.inspect})"
           end
         end
       elsif !type.nil?
@@ -50,9 +50,13 @@ module Schema
         check = proc do |val|
           unless val.nil?
             if strict
-              raise Schema::Attribute::TypeError, "#{val.inspect} is not an instance of #{type.name}" unless val.instance_of? type
+              if not val.instance_of?(type)
+                raise Schema::Attribute::TypeError, "#{val.inspect} of type #{val.class.name} cannot be assigned to attribute #{attribute_name} of type #{type.name} (Strict: #{strict.inspect})"
+              end
             else
-              raise Schema::Attribute::TypeError, "#{val.inspect} is not a kind of #{type.name}" unless val.is_a? type
+              if not val.is_a?(type)
+                raise Schema::Attribute::TypeError, "#{val.inspect} of type #{val.class.name} cannot be assigned to attribute #{attribute_name} of type #{type.name} (Strict: #{strict.inspect})"
+              end
             end
           end
         end
@@ -161,14 +165,23 @@ module Schema
     end
   end
 
+  def raw_attributes
+    all_attribute_names = self.class.all_attribute_names
+    get_attributes(all_attribute_names)
+  end
+
+  def get_attributes(attribute_names)
+    attribute_names.each_with_object({}) do |attribute_name, attributes|
+      attributes[attribute_name] = public_send(attribute_name)
+    end
+  end
+
   def attributes(include_transient: nil)
     include_transient ||= false
 
     attribute_names = self.class.attribute_names(include_transient: include_transient)
 
-    data = attribute_names.each_with_object({}) do |attribute_name, attributes|
-      attributes[attribute_name] = public_send(attribute_name)
-    end
+    data = get_attributes(attribute_names)
 
     transform_write(data)
 
@@ -197,4 +210,8 @@ module Schema
     !different
   end
   alias :eql? :==
+
+  def hash
+    [self.class, raw_attributes].hash
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-schema
 version: !ruby/object:Gem::Version
-  version: 2.3.0.2
+  version: 2.3.1.4
 platform: ruby
 authors:
 - The Eventide Project
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-31 00:00:00.000000000 Z
+date: 2022-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-attribute