active_type 2.1.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0a5d8d33884c5002323fee2411daea972323f973b14f885ea5b3c6336569f8f
-  data.tar.gz: 4b29935992035498d74b4c4d80c1041e17adc890234f81357828fe71e723288d
+  metadata.gz: b818373b67ad6b12646808562b48545c2c32ed846073660013132e619fc689c6
+  data.tar.gz: 204ebaf99158e1dd12f4255bf005cc123373ffaca797673427a8bb87981bbdae
 SHA512:
-  metadata.gz: a853c942d84f065a4f1be9fad10801f635f5d759bbb969bc655d2160d0e9757f579147f0197f52af0335eb412e1cea164a78eff56ce6747f9ca36a2340fdb36f
-  data.tar.gz: b91df99ae7b73ee3702d05b9d70bcde4a45623054293cc3ccbcedd3d6c83c22a5ac2261ca140730fd5afd3299c96ad71b275102a0ac5612260e0d5771cc11f8d
+  metadata.gz: 26c254234076e2ad182baf8c279d1eaec7e78b388e44682da5323fa429313e0bb3ecb001d175eb2bdc0ae081962f1576f07f73900f7cefe67d5f0f423407ab22
+  data.tar.gz: b114398d46139b9ed15228392b231fd8198b734e6d7f821b09752bc84442f3dd52508dbdf4f7ca1411c971ab02dfc0ed1ee470755d3108cf7b1137f22e184a51

data/.github/workflows/test.yml

@@ -28,8 +28,6 @@ jobs:
             gemfile: Gemfile.6.0.sqlite3
           - ruby: "2.6.3"
             gemfile: Gemfile.6.1.sqlite3
-          - ruby: "2.6.3"
-            gemfile: Gemfile.7.0.sqlite3
           - ruby: "2.7.4"
             gemfile: Gemfile.5.2.sqlite3
           - ruby: "2.7.4"
@@ -97,10 +95,6 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - name: Install database client
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y mariadb-client libmariadbclient-dev
       - name: Bundle
         run: |
           gem install bundler:2.2.27

data/CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased changes
 
+## 2.3.0 (2022-07-21)
+
+* Fixed: Fixed an issue when certain keywords are used as attribute names. Thanks to @tom-kuca.
+* Fixed: Original Rails #attribute method now aliased as #ar_attribute correctly. Thanks to @sudoremo.
+* Fixed: ActiveType::Object#serializable_hash includes virtual attributes.
+
+## 2.2.0 (2022-06-02)
+
+* Fixed: ActiveType now actually works for Rails 7. Sorry for that. Thanks to @atcruice.
+
 ## 2.1.1 (2021-12-22)
 
 * Fixed: Ruby compiler warning and suboptimal attribut name validation. Thanks to @remofrizsche.

data/Gemfile.4.2.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (2.1.1)
+    active_type (2.2.0)
       activerecord (>= 3.2)
 
 GEM

data/Gemfile.4.2.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (2.1.1)
+    active_type (2.2.0)
       activerecord (>= 3.2)
 
 GEM

data/Gemfile.5.2.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (2.1.1)
+    active_type (2.2.0)
       activerecord (>= 3.2)
 
 GEM
@@ -56,4 +56,4 @@ DEPENDENCIES
   rspec (~> 3.4)
 
 BUNDLED WITH
-   2.2.16
+   2.2.27

data/Gemfile.5.2.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (2.1.1)
+    active_type (2.2.0)
       activerecord (>= 3.2)
 
 GEM

data/Gemfile.5.2.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (2.1.1)
+    active_type (2.2.0)
       activerecord (>= 3.2)
 
 GEM
@@ -56,4 +56,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.2.16
+   2.2.27

data/Gemfile.6.0.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (2.1.1)
+    active_type (2.2.0)
       activerecord (>= 3.2)
 
 GEM
@@ -56,4 +56,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.2.16
+   2.2.27

data/Gemfile.6.1.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (2.1.1)
+    active_type (2.2.0)
       activerecord (>= 3.2)
 
 GEM
@@ -56,4 +56,4 @@ DEPENDENCIES
   rspec (~> 3.4)
 
 BUNDLED WITH
-   2.2.16
+   2.2.27

data/Gemfile.6.1.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (2.1.1)
+    active_type (2.2.0)
       activerecord (>= 3.2)
 
 GEM
@@ -56,4 +56,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.2.16
+   2.2.27

data/Gemfile.7.0.pg

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~>6.1.0'
+gem 'activerecord', '~>7.0.3'
 gem 'rspec', '~>3.4'
 gem 'pg'
 gem 'rake'

data/Gemfile.7.0.pg.lock

@@ -1,54 +1,52 @@
 PATH
   remote: .
   specs:
-    active_type (2.1.1)
+    active_type (2.2.0)
       activerecord (>= 3.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.4.4)
-      activesupport (= 6.1.4.4)
-    activerecord (6.1.4.4)
-      activemodel (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
-    activesupport (6.1.4.4)
+    activemodel (7.0.3)
+      activesupport (= 7.0.3)
+    activerecord (7.0.3)
+      activemodel (= 7.0.3)
+      activesupport (= 7.0.3)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
-    gemika (0.6.1)
-    i18n (1.8.11)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    gemika (0.7.1)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     minitest (5.15.0)
-    pg (1.2.3)
+    pg (1.3.5)
     rake (13.0.6)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   active_type!
-  activerecord (~> 6.1.0)
+  activerecord (~> 7.0.3)
   gemika
   pg
   rake

data/Gemfile.7.0.sqlite3

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~>6.1.0'
+gem 'activerecord', '~>7.0.3'
 gem 'rspec', '~>3.4'
 gem 'sqlite3'
 gem 'rake'

data/Gemfile.7.0.sqlite3.lock

@@ -1,54 +1,52 @@
 PATH
   remote: .
   specs:
-    active_type (2.1.1)
+    active_type (2.2.0)
       activerecord (>= 3.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.4.4)
-      activesupport (= 6.1.4.4)
-    activerecord (6.1.4.4)
-      activemodel (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
-    activesupport (6.1.4.4)
+    activemodel (7.0.3)
+      activesupport (= 7.0.3)
+    activerecord (7.0.3)
+      activemodel (= 7.0.3)
+      activesupport (= 7.0.3)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
-    gemika (0.6.1)
-    i18n (1.8.11)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    gemika (0.7.1)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     minitest (5.15.0)
     rake (13.0.6)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     sqlite3 (1.4.2)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   active_type!
-  activerecord (~> 6.1.0)
+  activerecord (~> 7.0.3)
   gemika
   rake
   rspec (~> 3.4)

data/lib/active_type/nested_attributes/association.rb

@@ -16,11 +16,15 @@ module ActiveType
         @allow_destroy = options.fetch(:allow_destroy, false)
         @reject_if = options.delete(:reject_if)
         @options = options.dup
-        @index_errors = if ActiveRecord::VERSION::MAJOR < 5
-          @options[:index_errors]
-        else
-          @options[:index_errors] || ActiveRecord::Base.index_nested_attribute_errors
-        end
+
+        @index_errors = case
+                        when ActiveRecord::VERSION::MAJOR < 5
+                          @options[:index_errors]
+                        when ActiveRecord::VERSION::MAJOR < 7
+                          @options[:index_errors] || ActiveRecord::Base.index_nested_attribute_errors
+                        else
+                          @options[:index_errors] || ActiveRecord.index_nested_attribute_errors
+                        end
       end
 
       def assign_attributes(parent, attributes)
@@ -126,7 +130,7 @@ module ActiveType
       end
 
       def add_errors_to_parent(parent, child, index)
-        if ActiveRecord::VERSION::MAJOR >= 6 && ActiveRecord::VERSION::MINOR >= 1
+        if Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("6.1")
           child.errors.each do |error|
             attribute = translate_error_attribute(error.attribute, index)
             parent.errors.add(attribute, error.message)

data/lib/active_type/no_table.rb

@@ -101,7 +101,7 @@ module ActiveType
         def columns_hash(table_name)
           {}
         end
-        
+
         def columns_hash?(table_name)
           return false
         end
@@ -144,6 +144,10 @@ module ActiveType
           []
         end
 
+        def _query_by_sql(*)
+          []
+        end
+
       end
 
       def destroy

data/lib/active_type/version.rb

@@ -1,3 +1,3 @@
 module ActiveType
-  VERSION = '2.1.1'
+  VERSION = '2.3.0'
 end

data/lib/active_type/virtual_attributes.rb

@@ -100,7 +100,7 @@ module ActiveType
 
         @module.module_eval <<-BODY, __FILE__, __LINE__ + 1
           def #{name}_changed?
-            #{name} != virtual_attributes_were["#{name}"]
+            self.#{name} != virtual_attributes_were["#{name}"]
           end
         BODY
 
@@ -137,6 +137,7 @@ module ActiveType
       class << self
         if method_defined?(:attribute)
           alias_method :ar_attribute, :attribute
+          alias_method :attribute, :at_attribute
         end
       end
     end
@@ -217,6 +218,10 @@ module ActiveType
       end
     end
 
+    def attribute_names
+      super + self.class._virtual_column_names
+    end
+
     def changed?
       self.class._virtual_column_names.any? { |attr| virtual_attributes_were[attr] != send(attr) } || super
     end
@@ -273,7 +278,7 @@ module ActiveType
       if value.is_a?(String) && value.length > 50
         "#{value[0, 50]}...".inspect
       elsif value.is_a?(Date) || value.is_a?(Time)
-        %("#{value.to_s(:db)}")
+        %("#{value.to_formatted_s(:db)}")
       elsif value.is_a?(Array) && value.size > 10
         inspected = value.first(10).inspect
         %(#{inspected[0...-1]}, ...])
@@ -323,7 +328,7 @@ module ActiveType
         end
       end
 
-      def attribute(name, *args)
+      def at_attribute(name, *args)
         options = args.extract_options!
         type = args.first
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_type
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Tobias Kraze
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-15 00:00:00.000000000 Z
+date: 2022-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler