active_type 2.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0d4c00a8c504822572083cb1a051ff4582c5e0638bc4eca0f064df38f175b2e
-  data.tar.gz: b38c8570c9ecf88d267ae7f6e46bd1773c5658494a329b6ae00de114ce274d01
+  metadata.gz: 40083adc49f1500ec21e7e2febbca83a4757bc7daf87c3f5e8a1edb31c242502
+  data.tar.gz: 2a801dc75197b91f61a40f0a06de9f96d743cd092004c6426dabeeceb2787ea2
 SHA512:
-  metadata.gz: 925a22fc4566431fc6fa4c3a22cdb86d2889e2c6066ece8a652b98fc8b2a81267c3c4221dc3429bbae7cc34bf9a14534d75b6f0e286c78b95909e581a27e840b
-  data.tar.gz: '097eafa44f1c006d76185d0e697bcca2072e820e019c84327432e18d4bf767925f69b988c468a82978fc5cfcfe2a21751b714dd2914adbcc94065ca70aba4a09'
+  metadata.gz: f9b8c4b430b352bc0f178354fe43685a19e1fbd24cf8c6fdff0ce18713f97afa682051dcd2dabdf670769d79b24fb760ec9a573d0e312803ce2d887fef04a874
+  data.tar.gz: 6f4bda1b9867f569a5269edae81351e59ad0a1eb4b021aeb14735aa23dafca5ce1321236557c7c007fa8632ad1671c6881aab6b06fc429d62392d95d462ce6bc

data/.github/workflows/test.yml

@@ -2,9 +2,9 @@ name: Tests
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   test_sqlite:
@@ -28,16 +28,22 @@ jobs:
             gemfile: Gemfile.6.0.sqlite3
           - ruby: "2.6.3"
             gemfile: Gemfile.6.1.sqlite3
-          - ruby: "2.7.2"
+          - ruby: "2.6.3"
+            gemfile: Gemfile.7.0.sqlite3
+          - ruby: "2.7.4"
             gemfile: Gemfile.5.2.sqlite3
-          - ruby: "2.7.2"
+          - ruby: "2.7.4"
             gemfile: Gemfile.6.0.sqlite3
-          - ruby: "2.7.2"
+          - ruby: "2.7.4"
             gemfile: Gemfile.6.1.sqlite3
+          - ruby: "2.7.4"
+            gemfile: Gemfile.7.0.sqlite3
           - ruby: "3.0.1"
             gemfile: Gemfile.6.0.sqlite3
           - ruby: "3.0.1"
             gemfile: Gemfile.6.1.sqlite3
+          - ruby: "3.0.1"
+            gemfile: Gemfile.7.0.sqlite3
 
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
@@ -50,12 +56,11 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
       - name: Bundle
         run: |
-          gem install bundler:2.0.2
+          gem install bundler:2.2.27
           bundle install --no-deployment
       - name: Run tests
         run: bundle exec rake spec
 
-
   test_mysql:
     runs-on: ubuntu-20.04
 
@@ -65,7 +70,7 @@ jobs:
         env:
           MYSQL_ROOT_PASSWORD: password
         ports:
-        - 3306:3306
+          - 3306:3306
         options: >-
           --health-cmd="mysqladmin ping"
           --health-interval=10s
@@ -80,7 +85,7 @@ jobs:
             gemfile: Gemfile.4.2.mysql2
           - ruby: "2.6.3"
             gemfile: Gemfile.5.2.mysql2
-          - ruby: "2.7.2"
+          - ruby: "2.7.4"
             gemfile: Gemfile.5.2.mysql2
 
     env:
@@ -95,10 +100,10 @@ jobs:
       - name: Install database client
         run: |
           sudo apt-get update
-          sudo apt-get install -y mysql-client libmariadbclient-dev
+          sudo apt-get install -y mariadb-client libmariadbclient-dev
       - name: Bundle
         run: |
-          gem install bundler:2.0.2
+          gem install bundler:2.2.27
           bundle install --no-deployment
       - name: Setup databases
         run: |
@@ -106,7 +111,6 @@ jobs:
       - name: Run tests
         run: bundle exec rake spec
 
-
   test_pg:
     runs-on: ubuntu-20.04
 
@@ -137,12 +141,16 @@ jobs:
             gemfile: Gemfile.5.2.pg
           - ruby: "2.6.3"
             gemfile: Gemfile.6.1.pg
-          - ruby: "2.7.2"
+          - ruby: "2.7.4"
             gemfile: Gemfile.5.2.pg
-          - ruby: "2.7.2"
+          - ruby: "2.7.4"
             gemfile: Gemfile.6.1.pg
+          - ruby: "2.7.4"
+            gemfile: Gemfile.7.0.pg
           - ruby: "3.0.1"
             gemfile: Gemfile.6.1.pg
+          - ruby: "3.0.1"
+            gemfile: Gemfile.7.0.pg
 
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
@@ -158,7 +166,7 @@ jobs:
           sudo apt-get install -y postgresql-client
       - name: Bundle
         run: |
-          gem install bundler:2.0.2
+          gem install bundler:2.2.27
           bundle install --no-deployment
       - name: Setup databases
         run: |

data/.ruby-version

@@ -1 +1 @@
-2.7.2
+2.7.4

data/CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased changes
 
+## 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.
+
 ## 2.0.0 (2021-11-24)
 
 * Added: Casting is prevented when the base record has changes in its already loaded associations, because those would be lost. Option `force: true` can be used to override this and still do the cast (this is not recommended).

data/Gemfile.4.2.mysql2.lock

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

data/Gemfile.4.2.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (2.0)
+    active_type (2.1.1)
       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.1.2)
       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.0)
+    active_type (2.1.2)
       activerecord (>= 3.2)
 
 GEM
@@ -56,4 +56,4 @@ DEPENDENCIES
   rspec (~> 3.4)
 
 BUNDLED WITH
-   2.2.16
+   2.2.27

data/Gemfile.5.2.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (2.0)
+    active_type (2.1.2)
       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.1.2)
       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.1.2)
       activerecord (>= 3.2)
 
 GEM
@@ -44,6 +44,7 @@ GEM
     zeitwerk (2.4.2)
 
 PLATFORMS
+  ruby
   x86_64-linux
 
 DEPENDENCIES
@@ -55,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.1.2)
       activerecord (>= 3.2)
 
 GEM
@@ -44,6 +44,7 @@ GEM
     zeitwerk (2.4.2)
 
 PLATFORMS
+  ruby
   x86_64-linux
 
 DEPENDENCIES
@@ -55,4 +56,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.2.16
+   2.2.27

data/Gemfile.7.0.pg

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~>6.1.0'
+gem 'rspec', '~>3.4'
+gem 'pg'
+gem 'rake'
+gem 'gemika'
+
+gem 'active_type', :path => '.'

data/Gemfile.7.0.pg.lock

@@ -0,0 +1,58 @@
+PATH
+  remote: .
+  specs:
+    active_type (2.1.2)
+      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)
+      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.0)
+    minitest (5.15.0)
+    pg (1.2.3)
+    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)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.5.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  active_type!
+  activerecord (~> 6.1.0)
+  gemika
+  pg
+  rake
+  rspec (~> 3.4)
+
+BUNDLED WITH
+   2.1.4

data/Gemfile.7.0.sqlite3

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~>6.1.0'
+gem 'rspec', '~>3.4'
+gem 'sqlite3'
+gem 'rake'
+gem 'gemika'
+
+gem 'active_type', :path => '.'

data/Gemfile.7.0.sqlite3.lock

@@ -0,0 +1,58 @@
+PATH
+  remote: .
+  specs:
+    active_type (2.1.2)
+      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)
+      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.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)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    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)
+  gemika
+  rake
+  rspec (~> 3.4)
+  sqlite3
+
+BUNDLED WITH
+   2.1.4

data/README.md

@@ -53,7 +53,7 @@ end
 
 ### A note on Rails 5+
 
-Rails 5 comes with its own implementation of `.attribute`. This implementation is functionally very
+Rails 5+ comes with its own implementation of `.attribute`. This implementation is functionally very
 similar, but not identical to ActiveType's.
 
 We have decided to continue to use our own implementation. This means that if you use ActiveType, `ActiveRecord::Base.attribute` will be overriden.

data/active_type.gemspec

@@ -10,16 +10,17 @@ 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) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "bundler", "~> 1.5"
+  s.add_development_dependency "bundler", ">= 1.5"
   s.add_development_dependency "rake"
 
   s.add_runtime_dependency('activerecord', '>= 3.2')
 
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.5.0'
 end

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)

data/lib/active_type/record_extension/inheritance.rb

@@ -120,7 +120,7 @@ module ActiveType
             type_name = base_class.type_for_attribute(inheritance_column).cast(type_name)
             subclass = begin
               if store_full_sti_class
-                ActiveSupport::Dependencies.constantize(type_name)
+                type_name.constantize
               else
                 compute_type(type_name)
               end

data/lib/active_type/version.rb

@@ -1,3 +1,3 @@
 module ActiveType
-  VERSION = '2.0'
+  VERSION = '2.1.2'
 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.0'
+  version: 2.1.2
 platform: ruby
 authors:
 - Tobias Kraze
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-24 00:00:00.000000000 Z
+date: 2022-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
@@ -83,6 +83,10 @@ files:
 - Gemfile.6.1.pg.lock
 - Gemfile.6.1.sqlite3
 - Gemfile.6.1.sqlite3.lock
+- Gemfile.7.0.pg
+- Gemfile.7.0.pg.lock
+- Gemfile.7.0.sqlite3
+- Gemfile.7.0.sqlite3.lock
 - Gemfile.lock
 - LICENSE
 - README.md
@@ -110,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:
@@ -119,14 +124,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Make any Ruby object quack like ActiveRecord