evt-schema-fixtures 0.0.0.1 → 1.0.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 783a3842c3daedef33a37e3aa3e2fc9ba3a124008d8b965687b7e985d1e359c5
-  data.tar.gz: e228cc08b885e8b8456aabc38ce1831aaff7dc9ba24a50924e33a3bd3e1ad16a
+  metadata.gz: ccd5470add57e63482e080c406b6b8ea28cfd0c145d064166591841cd51eb520
+  data.tar.gz: dc1f9660049c115f5113ab53f3a2df9957ac7a68a3ac51404350dbad003c125f
 SHA512:
-  metadata.gz: 12edf0070476d0cbdf33c4506111afe09a2a19b0d5e17eec71c3f99801212a6dee8fe1d78103a35182ac4d533b0f8c931b411950a6b621cdb7891f55da4a92b6
-  data.tar.gz: d097d45abb8646a815f93a9d4ed308309a810cff871816b20c6462b93ea480d52d6caed51711547bc744afb900cb9703c88889e88a2b50c491a954c7ec75b849
+  metadata.gz: c2f75ee2c3cdd8e283eaacba6c2d4ac0616637f6dc447df3caf6c08a0851c7c91befe477160f619c1b98b786bb32dc9d8417afd8c4ae242044c72a0b6ce7dde9
+  data.tar.gz: 637789888a210d147d6175fafb52a6aaaaaeb873e084053821f30178020f14f45f8055fe0cfc1b1c9a926e625d9a90ba350ebe9d97ae999753e4db2c49c0d203

data/lib/schema/fixtures/assignment.rb

@@ -19,6 +19,10 @@ module Schema
         @attributes_context_name ||= 'Attributes'
       end
 
+      def schema_class
+        comparison.control_class
+      end
+
       initializer :comparison, na(:print_title_context), na(:title_context_name), na(:attributes_context_name)
 
       def self.build(compare, attribute_names=nil, print_title_context: nil, title_context_name: nil, attributes_context_name: nil)
@@ -27,33 +31,31 @@ module Schema
         new(comparison, print_title_context, title_context_name, attributes_context_name)
       end
 
-      def call()
-        schema_class = comparison.control_class
-
-        test_attributes = proc do
-          context attributes_context_name do
-            comparison.entries.each do |entry|
-              default_attribute_value = entry.control_value
-              attribute_value = entry.compare_value
-
-              test "#{entry.compare_name}" do
-                detail "Default Value: #{default_attribute_value.inspect}"
-                detail "Assigned Value: #{attribute_value.inspect}"
-
-                refute(attribute_value == default_attribute_value)
-              end
-            end
-          end
-        end
-
+      def call
         if print_title_context?
           context "#{title_context_name}" do
             detail "Class: #{schema_class.name}"
 
-            test_attributes.()
+            call!
           end
         else
-          test_attributes.()
+          call!
+        end
+      end
+
+      def call!
+        context attributes_context_name do
+          comparison.entries.each do |entry|
+            default_attribute_value = entry.control_value
+            attribute_value = entry.compare_value
+
+            test "#{entry.compare_name}" do
+              detail "Default Value: #{default_attribute_value.inspect}"
+              detail "Assigned Value: #{attribute_value.inspect}"
+
+              refute(attribute_value == default_attribute_value)
+            end
+          end
         end
       end
     end

data/lib/schema/fixtures/equality.rb

@@ -23,6 +23,14 @@ module Schema
         @attributes_context_name ||= 'Attributes'
       end
 
+      def control_class
+        comparison.control_class
+      end
+
+      def compare_class
+        comparison.compare_class
+      end
+
       initializer :comparison, na(:ignore_class), na(:print_title_context), na(:title_context_name), na(:attributes_context_name)
 
       def self.build(control, compare, attribute_names=nil, ignore_class: nil, print_title_context: nil, title_context_name: nil, attributes_context_name: nil)
@@ -30,45 +38,40 @@ module Schema
         new(comparison, ignore_class, print_title_context, title_context_name, attributes_context_name)
       end
 
-      def call()
-        control_class = comparison.control_class
-        compare_class = comparison.compare_class
-
-        test_attributes = proc do
-          context attributes_context_name do
-            comparison.entries.each do |entry|
-              printed_attribute_name = Attribute.printed_name(entry)
-
-              control_attribute_value = entry.control_value
-              compare_attribute_value = entry.compare_value
+      def call
+        if print_title_context?
+          context "#{title_context_name}" do
+            detail "Control Class: #{control_class.name}"
+            detail "Compare Class: #{compare_class.name}"
 
-              test printed_attribute_name do
-                detail "#{control_class.name.split('::').last} Value: #{control_attribute_value.inspect}"
-                detail "#{compare_class.name.split('::').last} Value: #{compare_attribute_value.inspect}"
+            call!
+          end
+        else
+          call!
+        end
+      end
 
-                assert(compare_attribute_value == control_attribute_value)
-              end
-            end
+      def call!
+        if not ignore_class?
+          test "Classes are the same" do
+            assert(control_class == compare_class)
           end
         end
 
-        if print_title_context?
-          context "#{title_context_name}" do
-            detail "Control Class: #{control_class.name}"
-            detail "Compare Class: #{compare_class.name}"
+        context attributes_context_name do
+          comparison.entries.each do |entry|
+            printed_attribute_name = Attribute.printed_name(entry)
 
-            if not ignore_class?
-              test "Classes are the same" do
-                assert(control_class == compare_class)
-              end
-            else
-              detail 'Class comparison is ignored'
-            end
+            control_attribute_value = entry.control_value
+            compare_attribute_value = entry.compare_value
+
+            test printed_attribute_name do
+              detail "#{control_class.name.split('::').last} Value: #{control_attribute_value.inspect}"
+              detail "#{compare_class.name.split('::').last} Value: #{compare_attribute_value.inspect}"
 
-            test_attributes.()
+              assert(compare_attribute_value == control_attribute_value)
+            end
           end
-        else
-          test_attributes.()
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-schema-fixtures
 version: !ruby/object:Gem::Version
-  version: 0.0.0.1
+  version: 1.0.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-02 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-schema