active_type 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ed97bd5057f4193d1ced6df666bc9250c4d57cbf830db65112c7686311ed2e5
-  data.tar.gz: 9b38760b9e205770507223ef9c11aae1813abb078b48e6a9e5bb5210a6fa464b
+  metadata.gz: bf7e0c548ca85d6d7cea9ffa097c10ec2c488d631e8c2919ba49b30a2f5849e1
+  data.tar.gz: fa88fa1d79a60dcc26b732157993f51b018b7e229b633aba605e1f03bf746ed2
 SHA512:
-  metadata.gz: 79d3b07256931a655d9a761485ffeb5a630442a83e13b12d44b519f4f485d5b05485c457273de50e9381ca8beddc9b1d6368c901b5ba121fc7761910b9f3c81a
-  data.tar.gz: 2c36129837464338002cb14c90442654ec7dc3b647ee4c9f01ace6b5611018600edd37927ce9882051336c54a54169cd1e4292e7c7e819e3e914170ea1720de4
+  metadata.gz: d44944e817c52c3bb2cea812a4fd6ae59eb5222c9a692f194721a1caf64037092535952e5b1badbb1a78b488331876a0fb6e68fe1ba134e5231236c420b1fa06
+  data.tar.gz: b208069bad2606d6d9cac527350cf2df5b0ad25aa54c134e10cb038b3b6fe8bf6f4b4e89e9db12658c9fd308ddcfecea98ff64c1d8a62bb45c4ec05c23338b0d

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,14 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased changes
 
+## 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.
+
 ## 2.1.0 (2021-12-22)
 
 * Fixed: ActiveType now works for Rails 7.

data/Gemfile.4.2.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (2.0)
+    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.0)
+    active_type (2.2.0)
       activerecord (>= 3.2)
 
 GEM

data/Gemfile.4.2.sqlite3.lock

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

data/Gemfile.5.2.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (2.0)
+    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.0)
+    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.0)
+    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.0)
+    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.0)
+    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.0)
+    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.0)
+    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.0)
+    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/active_type.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.summary = 'Make any Ruby object quack like ActiveRecord'
   s.description = s.summary
   s.license = 'MIT'
+  s.metadata = { 'rubygems_mfa_required' => 'true' }
 
   s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }

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.0'
+  VERSION = '2.2.0'
 end

data/lib/active_type/virtual_attributes.rb

@@ -112,7 +112,7 @@ module ActiveType
       end
 
       def validate_attribute_name!(name)
-        unless name.to_s =~ /\A[A-z0-9_]*\z/
+        unless name.to_s =~ /\A[A-Za-z0-9_]*\z/
           raise InvalidAttributeNameError.new("'#{name}' is not a valid name for a virtual attribute")
         end
       end
@@ -273,7 +273,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]}, ...])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_type
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Tobias Kraze
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-22 00:00:00.000000000 Z
+date: 2022-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,7 +114,8 @@ files:
 homepage: https://github.com/makandra/active_type
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths: