assignable_values 0.16.5 → 0.16.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f048184ed974a9878de297fd61fb4839872c0f3d420ca4fc7404c9ed4afd985c
-  data.tar.gz: b6a3a9e3fbdbb135130ff94e61abfc54702762e1fc517aba0f75a0e71cf550aa
+  metadata.gz: 5b8661c6374664b624b4fd0a3e54529ac3783fff619a7d846b9c2836e8839608
+  data.tar.gz: 2c72259b1eee2a767778975f95a6ac4f08ed02bbda8056426d7e7bca19e004da
 SHA512:
-  metadata.gz: 788afc6930322071801a893621d516c733ab0bcd2a60bda0e9898d4d7711955d69a8ca2659e2cd6d693cf33134884a9c323372615300eb0103cf3da294442eda
-  data.tar.gz: 381ec97d744d0b97a2eef32aa9b2e03a03b157a3cf1537abdf1bd95a8e090ddc6ddcb11ae56653f4efe9be5cb8126cf4a64d4a234e3efab88ebeb819caf86c0c
+  metadata.gz: 774ebe2bd0bbee83b66ab01a4a8358068c86688a543fdaea24b8f54220b7b9533de93d163c8d263a35dd33e6cd5855f9eeb4132e9b83a1e2d71f6fbb5bb647ce
+  data.tar.gz: 1a7e51073af59fe8bcaf86537de1ba7d7c33fd116f5573c0a171915cc00ad975b16062d1e327caeee7f38afc21baee695dbd2a8e7cf09d573d0512f80201be65

data/.github/workflows/test.yml

@@ -26,16 +26,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - ruby: 2.3.8
-          gemfile: Gemfile.4.2
-        - ruby: 2.3.8
-          gemfile: Gemfile.5.0
-        - ruby: 2.3.8
-          gemfile: Gemfile.5.1
-        - ruby: 2.4.2
-          gemfile: Gemfile.5.0
-        - ruby: 2.4.2
-          gemfile: Gemfile.5.1
         - ruby: 2.5.3
           gemfile: Gemfile.5.0
         - ruby: 2.5.3
@@ -48,10 +38,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 mysql-client libmariadbclient-dev
     - name: Bundle
       run: |
         gem install bundler:2.1.4
@@ -76,14 +62,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - ruby: 2.3.8
-          gemfile: Gemfile.5.1.pg
-        - ruby: 2.4.2
-          gemfile: Gemfile.5.1.pg
         - ruby: 2.5.3
           gemfile: Gemfile.5.1.pg
         - ruby: 2.5.3
-          gemfile: Gemfile.6.0.pg
+          gemfile: Gemfile.6.1.pg
+        - ruby: 2.7.3
+          gemfile: Gemfile.6.1.pg
+        - ruby: 2.7.3
+          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 }}"
     steps:

data/.ruby-version

@@ -1 +1 @@
-2.3.8
+3.0.1

data/CHANGELOG.md

@@ -6,8 +6,22 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ### Breaking changes
 
+-
+
 ### Compatible changes
 
+-
+
+## 0.16.6 - 2022-03-16
+
+### Breaking changes
+
+- Remove no longer supported ruby versions (2.3.8, 2.4.2)
+
+### Compatible changes
+
+- test against ActiveRecord 7.0
+
 ## 0.16.5 - 2021-01-10
 
 ### Compatible changes

data/Gemfile

@@ -1 +1 @@
-./Gemfile.4.2
+./Gemfile.7.0.pg

data/{Gemfile.6.0.pg → Gemfile.6.1.pg}

@@ -1,9 +1,9 @@
 source 'https://rubygems.org'
 
 # Runtime dependencies
-gem 'activerecord', '~>6.0.0'
+gem 'activerecord', '~>6.1.3'
 gem 'i18n'
-gem 'pg', '<1'
+gem 'pg', '1.1'
 
 # Development dependencies
 gem 'rake'

data/{Gemfile.6.0.pg.lock → Gemfile.6.1.pg.lock}

@@ -1,31 +1,31 @@
 PATH
   remote: .
   specs:
-    assignable_values (0.16.4)
+    assignable_values (0.16.5)
       activerecord (>= 2.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.0)
-      activesupport (= 6.0.0)
-    activerecord (6.0.0)
-      activemodel (= 6.0.0)
-      activesupport (= 6.0.0)
-    activesupport (6.0.0)
+    activemodel (6.1.3.2)
+      activesupport (= 6.1.3.2)
+    activerecord (6.1.3.2)
+      activemodel (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+    activesupport (6.1.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     concurrent-ruby (1.1.5)
     database_cleaner (1.7.0)
     diff-lcs (1.3)
-    gemika (0.3.4)
+    gemika (0.5.0)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
-    pg (0.21.0)
+    minitest (5.14.4)
+    pg (1.1.0)
     rake (12.3.2)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -45,24 +45,23 @@ GEM
       sneaky-save
     sneaky-save (0.1.3)
       activerecord (>= 3.2.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    zeitwerk (2.1.9)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 6.0.0)
+  activerecord (~> 6.1.3)
   assignable_values!
   database_cleaner
-  gemika
+  gemika (>= 0.5.0)
   i18n
-  pg (< 1)
+  pg (= 1.1)
   rake
   rspec
   rspec_candy
 
 BUNDLED WITH
-   1.17.3
+   2.2.15

data/{Gemfile.4.2 → Gemfile.7.0.pg}

@@ -1,14 +1,14 @@
 source 'https://rubygems.org'
 
 # Runtime dependencies
-gem 'activerecord', '~>4.2.0'
-gem 'i18n', '~>0.7.0'
-gem 'mysql2'
+gem 'activerecord', '~>7.0.0'
+gem 'i18n'
+gem 'pg', '1.1'
 
 # Development dependencies
 gem 'rake'
 gem 'database_cleaner'
-gem 'rspec', '~> 3.4'
+gem 'rspec'
 gem 'rspec_candy'
 gem 'gemika', '>= 0.5.0'
 

data/Gemfile.7.0.pg.lock

@@ -0,0 +1,65 @@
+PATH
+  remote: .
+  specs:
+    assignable_values (0.16.6)
+      activerecord (>= 2.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (7.0.0)
+      activesupport (= 7.0.0)
+    activerecord (7.0.0)
+      activemodel (= 7.0.0)
+      activesupport (= 7.0.0)
+    activesupport (7.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    concurrent-ruby (1.1.5)
+    database_cleaner (1.7.0)
+    diff-lcs (1.3)
+    gemika (0.5.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    minitest (5.15.0)
+    pg (1.1.0)
+    rake (12.3.2)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    rspec_candy (0.5.1)
+      rspec
+      sneaky-save
+    sneaky-save (0.1.3)
+      activerecord (>= 3.2.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 7.0.0)
+  assignable_values!
+  database_cleaner
+  gemika (>= 0.5.0)
+  i18n
+  pg (= 1.1)
+  rake
+  rspec
+  rspec_candy
+
+BUNDLED WITH
+   2.2.15

data/Gemfile.lock

@@ -1 +1 @@
-./Gemfile.4.2.lock
+./Gemfile.7.0.pg.lock

data/README.md

@@ -5,7 +5,7 @@ assignable_values - Enums on vitamins [![Tests](https://github.com/makandra/assi
 
 We carefully enhanced the core enum functionality with small tweaks that are useful for web forms, internationalized applications and common authorization patterns.
 
-`assignable_values` is tested with Rails 2.3, 3.2, 4.2, 5.1 and 6.0 (beta) on Ruby 1.8.7, 2.1, 2.3, 2.4 and 2.5.
+`assignable_values` is tested with Rails 5.1 and 6.1 on Ruby 2.5, 2.7 and 3.0.
 
 
 Restricting scalar attributes

data/assignable_values.gemspec

@@ -11,6 +11,14 @@ Gem::Specification.new do |s|
   s.description = s.summary
   s.license = 'MIT'
 
+  if RUBY_VERSION.to_f >= 2.0
+    s.metadata = {
+      'bug_tracker_uri' => 'https://github.com/makandra/assignable_values/issues',
+      'changelog_uri' => 'https://github.com/makandra/assignable_values/blob/master/CHANGELOG.md',
+      'rubygems_mfa_required' => 'true',
+    }
+  end
+
   s.files         = `git ls-files`.split($\)
   s.test_files    = s.files.grep(%r{^spec/})
   s.require_paths = ["lib"]

data/lib/assignable_values/version.rb

@@ -1,3 +1,3 @@
 module AssignableValues
-  VERSION = '0.16.5'
+  VERSION = '0.16.6'
 end

data/spec/assignable_values/active_record_spec.rb

@@ -53,6 +53,20 @@ describe AssignableValues::ActiveRecord do
 
     end
 
+    context 'when the options are passed as a hash' do
+      before :each do
+        @klass = Song.disposable_copy do
+          assignable_values_for(:virtual_multi_genres, { :multiple => true, :allow_blank => true }) do
+            %w[pop rock]
+          end
+        end
+      end
+
+      it 'should not raise an error' do
+        @klass.new(:virtual_multi_genres => ['rock']).should be_valid
+      end
+    end
+
     context 'when validating virtual attributes with multiple: true' do
 
       context 'with allow_blank: false' do
@@ -122,7 +136,7 @@ describe AssignableValues::ActiveRecord do
           record = @klass.new(:genre => 'disallowed value')
           record.valid?
           errors = record.errors[:genre]
-          error = errors.is_a?(Array) ? errors.first : errors # the return value sometimes was a string, sometimes an Array in Rails
+          error = errors.respond_to?(:first) ? errors.first : errors # the return value sometimes was a string, sometimes an Array in Rails
           error.should == I18n.t('errors.messages.inclusion')
           error.should == 'is not included in the list'
         end
@@ -274,7 +288,7 @@ describe AssignableValues::ActiveRecord do
           record = @klass.new(:genre => 'disallowed value')
           record.valid?
           errors = record.errors[:genre]
-          error = errors.is_a?(Array) ? errors.first : errors # the return value sometimes was a string, sometimes an Array in Rails
+          error = errors.respond_to?(:first) ? errors.first : errors # the return value sometimes was a string, sometimes an Array in Rails
           error.should == 'should be something different'
         end
 
@@ -373,7 +387,7 @@ describe AssignableValues::ActiveRecord do
         record = klass.new(:artist => disallowed_association)
         record.valid?
         errors = record.errors[:artist_id]
-        error = errors.is_a?(Array) ? errors.first : errors # the return value sometimes was a string, sometimes an Array in Rails
+        error = errors.respond_to?(:first) ? errors.first : errors # the return value sometimes was a string, sometimes an Array in Rails
         error.should == I18n.t('errors.messages.inclusion')
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assignable_values
 version: !ruby/object:Gem::Version
-  version: 0.16.5
+  version: 0.16.6
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-10 00:00:00.000000000 Z
+date: 2022-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -36,16 +36,16 @@ files:
 - ".ruby-version"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.4.2
-- Gemfile.4.2.lock
 - Gemfile.5.0
 - Gemfile.5.0.lock
 - Gemfile.5.1
 - Gemfile.5.1.lock
 - Gemfile.5.1.pg
 - Gemfile.5.1.pg.lock
-- Gemfile.6.0.pg
-- Gemfile.6.0.pg.lock
+- Gemfile.6.1.pg
+- Gemfile.6.1.pg.lock
+- Gemfile.7.0.pg
+- Gemfile.7.0.pg.lock
 - Gemfile.lock
 - LICENSE
 - README.md
@@ -71,7 +71,10 @@ files:
 homepage: https://github.com/makandra/assignable_values
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/makandra/assignable_values/issues
+  changelog_uri: https://github.com/makandra/assignable_values/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -87,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.9
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Restrict the values assignable to ActiveRecord attributes or associations

data/Gemfile.4.2.lock

@@ -1,70 +0,0 @@
-PATH
-  remote: .
-  specs:
-    assignable_values (0.16.5)
-      activerecord (>= 2.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (4.2.7.1)
-      activesupport (= 4.2.7.1)
-      builder (~> 3.1)
-    activerecord (4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      arel (~> 6.0)
-    activesupport (4.2.7.1)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    arel (6.0.3)
-    builder (3.2.2)
-    database_cleaner (1.5.3)
-    diff-lcs (1.2.5)
-    gemika (0.5.0)
-    i18n (0.7.0)
-    json (1.8.3)
-    minitest (5.9.1)
-    mysql2 (0.4.10)
-    rake (10.3.2)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    rspec_candy (0.3.1)
-      rspec
-      sneaky-save
-    sneaky-save (0.0.5)
-      activerecord (>= 3.2.0)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 4.2.0)
-  assignable_values!
-  database_cleaner
-  gemika (>= 0.5.0)
-  i18n (~> 0.7.0)
-  mysql2
-  rake
-  rspec (~> 3.4)
-  rspec_candy
-
-BUNDLED WITH
-   2.1.4