acts_as_table 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '094c1ccc47c5be95fd0ff783f99def543ec3aa957dbc62198e7c25d4299d9413'
-  data.tar.gz: 1691a2c67650095b28a07945d92169175beaa1fd705240af81cf09c48298435c
+  metadata.gz: a3ef91a81cb7c253155d751f72fb55639e313acb2695ff261b9de2e08f9019ab
+  data.tar.gz: 3e755c09c3553b1c404f8b73b788c0f9fb9ad46779fb26ef1a5933d30791191b
 SHA512:
-  metadata.gz: 10df998cefe210b72efefc907d000cfd50e5b0b68cbe658f96eff8f60362ebc26e7abb197af21cc3415c534274b882c7c56c6286ae2520596faf239fb204ade5
-  data.tar.gz: b8f8aed8df7ac0dc6844b54801edd40d113e0e16f0ec88bb1c641551ed316e626e753741311b9ff7201455089b6b9c66aeb07d1436bb0e27b86bdc8866290829
+  metadata.gz: d1e4816734444a8271685c7201bdc5b437953084951190bdc321cc57e42770171e6be5d433ba92400d5d517fdc38320adf026d684e7c60143154f5e87c174def
+  data.tar.gz: bc507f5e25ad5a5e79ad2c1ae66b5d86fa05c221c8a2e2d594c9fca1d9635da8ecaed7c2553b2008035606db8316eeca53087112ecbdfbf6fdd536b7709d9eda

data/app/models/acts_as_table/record_model.rb

@@ -136,7 +136,7 @@ module ActsAsTable
       end
 
       # @return [Hash<ActsAsTable::ValueProvider::InstanceMethods, Object>]
-      value_by_value_provider = self.each_acts_as_table_value_provider(except: [:row_model]).inject({}) { |acc, value_provider|
+      value_by_value_provider = self.each_acts_as_table_value_provider(nil, except: [:row_model, :row_models_as_root]).inject({}) { |acc, value_provider|
         acc[value_provider] ||= base.nil? ? ActsAsTable.adapter.wrap_value_for(value_provider, base, nil, nil) : ActsAsTable.adapter.get_value_for(value_provider, base, **options)
         acc
       }
@@ -157,7 +157,7 @@ module ActsAsTable
       end
 
       # @return [Array<Object>]
-      value_by_value_provider, changed = *self.each_acts_as_table_value_provider(except: [:row_model]).inject([{}, false]) { |acc, value_provider|
+      value_by_value_provider, changed = *self.each_acts_as_table_value_provider(nil, except: [:row_model, :row_models_as_root]).inject([{}, false]) { |acc, value_provider|
         # @return [Object, nil]
         new_value = new_value_by_value_provider.try(:[], value_provider)
 

data/app/models/acts_as_table/row_model.rb

@@ -107,8 +107,8 @@ module ActsAsTable
     def from_row(row = [], records = ActsAsTable::Record.all)
       # @return [Hash<ActsAsTable::RecordModel, Hash<ActsAsTable::ValueProvider::InstanceMethods, Object>>]
       value_by_record_model_and_value_provider = self.record_models.inject({}) { |acc_for_record_model, record_model|
-        acc_for_record_model[record_model] = record_model.each_acts_as_table_value_provider(except: [:row_model]).inject({}) { |acc_for_value_provider, value_provider|
-          acc_for_value_provider[value_provider] = value_provider.column_model.try { |column_model|
+        acc_for_record_model[record_model] ||= record_model.each_acts_as_table_value_provider(nil, except: [:row_model, :row_models_as_root]).inject({}) { |acc_for_value_provider, value_provider|
+          acc_for_value_provider[value_provider] ||= value_provider.column_model.try { |column_model|
             # @return [Integer]
             index = column_model.position - 1
 
@@ -215,7 +215,7 @@ module ActsAsTable
         # @return [ActsAsTable::ValueProvider::WrappedValue, nil]
         value_by_value_provider = value_by_record_model_and_value_provider.target_value.try(:[], record_model)
 
-        record_model.each_acts_as_table_value_provider(except: [:row_model]) do |value_provider|
+        record_model.each_acts_as_table_value_provider(nil, except: [:row_model, :row_models_as_root]) do |value_provider|
           value_provider.column_model.try { |column_model|
             # @return [Integer]
             index = column_model.position - 1

data/app/models/concerns/acts_as_table/value_provider_association_methods.rb

@@ -19,7 +19,7 @@ module ActsAsTable
         self.reflect_on_all_associations(macro).select { |reflection|
           reflection.klass.acts_as_table_value_provider?
         }.select { |reflection|
-          (options[:except].nil? || !options[:except].collect(&:to_sym).include?(reflection.name)) && (options[:only].nil? || options[:only].collect(&:to_sym).include?(reflection.name))
+          (options[:except].nil? || !options[:except].collect(&:to_sym).include?(reflection.name.to_sym)) && (options[:only].nil? || options[:only].collect(&:to_sym).include?(reflection.name.to_sym))
         }
       end
     end

data/lib/acts_as_table/version.rb

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

metadata

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