acts_as_table 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ddec3541153f4ca9a0ed47acafd1937e4311a56cd400116a50ea615fda30eaa
-  data.tar.gz: 19cb06bb9212a667da4c5cc220e178cd39016fd15cc97274a097f44480f9b0f0
+  metadata.gz: '094c1ccc47c5be95fd0ff783f99def543ec3aa957dbc62198e7c25d4299d9413'
+  data.tar.gz: 1691a2c67650095b28a07945d92169175beaa1fd705240af81cf09c48298435c
 SHA512:
-  metadata.gz: 654d4d54a3a51e2c0a13c2c57cabe33b619817596cc07f3114aa69835b3e5525611de6fb2a5756e5abd98e7bc4c5fe07bc40719c77c0c2d38f0d5036fd6d1b43
-  data.tar.gz: 1f6b40cbd24c22505c683698ef4a003c9b09cbc26978fafe7f1f6ddac925872ebdc5827d7d7a80ada8aad2c8c49a0dfac60016488b205c2122f5dc6f2fdfc548
+  metadata.gz: 10df998cefe210b72efefc907d000cfd50e5b0b68cbe658f96eff8f60362ebc26e7abb197af21cc3415c534274b882c7c56c6286ae2520596faf239fb204ade5
+  data.tar.gz: b8f8aed8df7ac0dc6844b54801edd40d113e0e16f0ec88bb1c641551ed316e626e753741311b9ff7201455089b6b9c66aeb07d1436bb0e27b86bdc8866290829

data/app/models/acts_as_table/record.rb

@@ -80,17 +80,17 @@ module ActsAsTable
 
     # validates :record_model_changed, **{}
 
-    validate :record_must_be_valid_class, :record_model_must_belong_to_row_model_for_table, **{
+    validate :base_must_be_valid_class, :record_model_must_belong_to_row_model_for_table, **{
       if: ::Proc.new { |record| record.record_model.present? },
     }
 
     private
 
     # @return [void]
-    def record_must_be_valid_class
-      self.record_type.try { |record_type|
-        unless record_type.eql?(self.record_model.class_name)
-          self.errors.add('record_type', :invalid)
+    def base_must_be_valid_class
+      self.base_type.try { |base_type|
+        unless base_type.nil? || base_type.eql?(self.record_model.class_name)
+          self.errors.add('base_type', :invalid)
         end
       }
     end

data/app/models/acts_as_table/row_model.rb

@@ -180,16 +180,18 @@ module ActsAsTable
               }
 
               new_record_or_persisted.errors[attribute_name].each do |message|
-                value.record_errors.build(attribute_name: attribute_name, message: message)
+                value.record_errors.build(attribute_name: attribute_name, message: message) do |record_error|
+                  record.record_errors.proxy_association.add_to_target(record_error)
+                end
               end
             end
           end
 
-          new_record_or_persisted.errors.each do |attribute_name, message|
-            unless attribute_names.include?(attribute_name.to_s)
-              record.record_errors.build(attribute_name: attribute_name, message: message)
-            end
-          end
+          # new_record_or_persisted.errors.each do |attribute_name, message|
+          #   unless attribute_names.include?(attribute_name.to_s)
+          #     record.record_errors.build(attribute_name: attribute_name, message: message)
+          #   end
+          # end
         end
       }
     end

data/db/migrate/1_acts_as_table_migration.rb

@@ -13,7 +13,6 @@ ActsAsTableMigration.class_eval do
 
       t.timestamps null: false
     end
-    add_foreign_key ActsAsTable.row_models_table, ActsAsTable.record_models_table, column: 'root_record_model_id'
 
     create_table ActsAsTable.column_models_table do |t|
       t.references :row_model, index: true, foreign_key: { to_table: ActsAsTable.row_models_table }, null: true
@@ -92,8 +91,6 @@ ActsAsTableMigration.class_eval do
 
       t.timestamps null: false
     end
-    add_foreign_key ActsAsTable.belongs_tos_table, ActsAsTable.record_models_table, column: 'source_record_model_id'
-    add_foreign_key ActsAsTable.belongs_tos_table, ActsAsTable.record_models_table, column: 'target_record_model_id'
 
     create_table ActsAsTable.has_manies_table do |t|
       t.references :row_model, index: true, foreign_key: { to_table: ActsAsTable.row_models_table }, null: false
@@ -105,7 +102,6 @@ ActsAsTableMigration.class_eval do
 
       t.timestamps null: false
     end
-    add_foreign_key ActsAsTable.has_manies_table, ActsAsTable.record_models_table, column: 'source_record_model_id'
 
     create_table ActsAsTable.has_many_targets_table do |t|
       t.references :has_many, index: true, foreign_key: { to_table: ActsAsTable.has_manies_table }, null: false
@@ -165,6 +161,11 @@ ActsAsTableMigration.class_eval do
 
       t.integer :record_errors_count, null: false, default: 0
     end
+
+    add_foreign_key ActsAsTable.belongs_tos_table, ActsAsTable.record_models_table, column: 'source_record_model_id'
+    add_foreign_key ActsAsTable.belongs_tos_table, ActsAsTable.record_models_table, column: 'target_record_model_id'
+    add_foreign_key ActsAsTable.has_manies_table, ActsAsTable.record_models_table, column: 'source_record_model_id'
+    add_foreign_key ActsAsTable.row_models_table, ActsAsTable.record_models_table, column: 'root_record_model_id'
   end
 
   def self.down

data/lib/acts_as_table/mapper.rb

@@ -78,7 +78,7 @@ module ActsAsTable
       #
       # @param [String, Regexp] from
       # @param [Hash<Symbol, Object>] options
-      # @option options [String] to
+      # @option options [String] :to
       # @return [ActsAsTable::Mapper::ForeignKey]
       #
       # @example Map from a string to another string.

data/lib/acts_as_table/reader.rb

@@ -1,4 +1,16 @@
 module ActsAsTable
+  # ActsAsTable reader error.
+  class ReaderError < ArgumentError
+  end
+
+  # Raised when the headers are not found.
+  class HeadersNotFound < ReaderError
+  end
+
+  # Raised when the headers do not match the ActsAsTable row model.
+  class InvalidHeaders < ReaderError
+  end
+
   # ActsAsTable reader object.
   #
   # @!attribute [r] row_model
@@ -71,7 +83,8 @@ module ActsAsTable
     # Returns a pair, where the first element is the headers and the second element is a flag that indicates if input stream is at end of file.
     #
     # @return [Array<Object>]
-    # @raise [ArgumentError] If the headers do not match the ActsAsTable row model for this ActsAsTable reader object.
+    # @raise [ActsAsTable::HeadersNotFound] If the headers are not found by this ActsAsTable reader object.
+    # @raise [ActsAsTable::InvalidHeaders] If the headers do not match the ActsAsTable row model for this ActsAsTable reader object.
     def read_headers
       # @return [ActsAsTable::Headers::Array]
       headers = @row_model.to_headers
@@ -91,11 +104,11 @@ module ActsAsTable
       }
 
       if rows.any?(&:nil?)
-        raise ::ArgumentError.new("#{self.class}#read_headers - must exist")
+        raise ActsAsTable::HeadersNotFound.new("#{self.class}#read_headers - must exist")
       end
 
       unless [headers, rows].transpose.all? { |pair| pair[0] == pair[1] }
-        raise ::ArgumentError.new("#{self.class}#read_headers - invalid")
+        raise ActsAsTable::InvalidHeaders.new("#{self.class}#read_headers - invalid")
       end
 
       [rows, eof]
@@ -113,7 +126,8 @@ module ActsAsTable
     # @yieldparam [Array<String, nil>, nil] row
     # @yieldreturn [void]
     # @return [Enumerable<Array<String, nil>, nil>]
-    # @raise [ArgumentError] If the headers do not match the ActsAsTable row model for this ActsAsTable reader object.
+    # @raise [ActsAsTable::HeadersNotFound] If the headers are not found by this ActsAsTable reader object.
+    # @raise [ActsAsTable::InvalidHeaders] If the headers do not match the ActsAsTable row model for this ActsAsTable reader object.
     def each_row(&block)
       ::Enumerator.new { |enumerator|
         headers, eof = *self.read_headers
@@ -131,6 +145,8 @@ module ActsAsTable
     # Returns a new ActsAsTable table object by reading all rows in the input stream.
     #
     # @return [ActsAsTable::Table]
+    # @raise [ActsAsTable::HeadersNotFound] If the headers are not found by this ActsAsTable reader object.
+    # @raise [ActsAsTable::InvalidHeaders] If the headers do not match the ActsAsTable row model for this ActsAsTable reader object.
     # @raise [ArgumentError] If the name of a class for a given record does not match the class name for the corresponding ActsAsTable record model.
     def read_table
       ActsAsTable::Table.new do |table|

data/lib/acts_as_table/version.rb

@@ -1,4 +1,4 @@
 module ActsAsTable
   # @return [String]
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_table
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Mark Borkum
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-10 00:00:00.000000000 Z
+date: 2021-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord