evt-schema 2.2.6.1 → 2.3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9299b9d03473151d2ac17454be8a3fa58a77ff2db066742d5930960b041340a1
-  data.tar.gz: b414f51b769f2efad19b78af1b4c3e8ac31ae855516f303de78c2d464e60a666
+  metadata.gz: 6298a47ba57d055166492488cc80134821dc6c8854623a1828ab126beeb2f05f
+  data.tar.gz: c8bbcbc6d8ada0ce2169b1aa35cba6f117bd03928511d320fa4040820a65cd0d
 SHA512:
-  metadata.gz: 9e1dd9b3f459e6134c596674b634db32020767278ed6fd59283cc51c920bfc228d1b0e657e17450b06e552b568d2407218d22b3537b43fba57b4a2759da53a80
-  data.tar.gz: be27088bda8b35cc4ac9b507d89513fb6705b430040145d4e062492253b2884b52c60f2352705744088a21a9dc316243153c09fa2748ef25bc217071cbe3e5f8
+  metadata.gz: 1c0b44340c1d7dacb2eaff58411ddbf8e0decf77fc132590c290a7aed8314b719446076eb88e25ecd7a795ae1298e90416bd58f476a8ea5bc6a1ef89648ce5d8
+  data.tar.gz: bd84b8ee4f51e07275fc1b21bc44edc275cc33985bc0b20148a825fcd796bdd902e9fd4f17228e18493e08248c92b1c79c3597da9e6214ddeb3807a5f0fa04d6

data/lib/schema/schema.rb

@@ -78,7 +78,9 @@ module Schema
       @attributes ||= AttributeRegistry.new
     end
 
-    def attribute_names
+    def attribute_names(include_transient: nil)
+      include_transient ||= false
+
       transient_attributes = []
       if respond_to?(:transient_attributes)
         transient_attributes = self.transient_attributes
@@ -86,12 +88,20 @@ module Schema
 
       attribute_names = []
       attributes.each do |attribute|
-        next if transient_attributes.include?(attribute.name)
+        if !include_transient &&
+            transient_attributes.include?(attribute.name)
+          next
+        end
+
         attribute_names << attribute.name
       end
 
       attribute_names
     end
+
+    def all_attribute_names
+      attribute_names(include_transient: true)
+    end
   end
 
   class AttributeRegistry
@@ -151,24 +161,35 @@ module Schema
     end
   end
 
-  def attributes
-    transient_attributes = []
-    if self.class.respond_to?(:transient_attributes)
-      transient_attributes = self.class.transient_attributes
-    end
+  def attributes(include_transient: nil)
+    include_transient ||= false
+
+    attribute_names = self.class.attribute_names(include_transient: include_transient)
 
-    data = self.class.attributes.each_with_object({}) do |attribute, attributes|
-      next if transient_attributes.include?(attribute.name)
-      attributes[attribute.name] = public_send(attribute.name)
+    data = attribute_names.each_with_object({}) do |attribute_name, attributes|
+      attributes[attribute_name] = public_send(attribute_name)
     end
 
     transform_write(data)
 
     data
   end
-  alias :to_h :attributes
+
+  def to_h
+    attributes
+  end
+
+  def all_attributes
+    attributes(include_transient: true)
+  end
 
   def ==(other, attributes_names=nil, ignore_class: nil)
+    ignore_class ||= false
+
+    if not ignore_class
+      return false if self.class != other.class
+    end
+
     comparison = Compare.(self, other, attributes_names)
 
     different = comparison.different?(ignore_class: ignore_class)

data/lib/schema/schema/compare/comparison.rb

@@ -50,12 +50,12 @@ module Schema
 
       def self.build_entry(control_name, control, compare_name, compare)
         control_class = control.class
-        if not control_class.attribute_names.include?(control_name)
+        if not control_class.all_attribute_names.include?(control_name)
           raise Error, "Attribute is not defined (Attribute Name: #{control_name.inspect}, Schema Class: #{control_class})"
         end
 
         compare_class = compare.class
-        if not compare_class.attribute_names.include?(compare_name)
+        if not compare_class.all_attribute_names.include?(compare_name)
           raise Error, "Attribute is not defined (Attribute Name: #{compare_name.inspect}, Schema Class: #{compare_class})"
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-schema
 version: !ruby/object:Gem::Version
-  version: 2.2.6.1
+  version: 2.3.0.0
 platform: ruby
 authors:
 - The Eventide Project
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-20 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-attribute
@@ -123,7 +123,7 @@ homepage: https://github.com/eventide-project/schema
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Primitives for schema and data structure
 test_files: []