reform-rails 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d136641745a9b830812afa8cb959e3dfd016166bd08100411481ca3215f3a87
-  data.tar.gz: d3dcb1ddb5c7d77305bd42382068e8b9fb1f5f6556682529ad742001126394cc
+  metadata.gz: 43ce92d480a18dfc398266771235ed677f949aaefef85fca362c787d49b3443b
+  data.tar.gz: f6d7d3f34e15f3ee674aacdba842cc0f42d43850f71dbc29d24704903342427a
 SHA512:
-  metadata.gz: 98612de254f296d0000e8e942d82c7f249d5b557c97d42fdbaebec433aee338427e00df42be8f3ab106c147465f4ee9afdeac4be593b270bdb6d86e840e04c28
-  data.tar.gz: 53e08abfcfe1a97bc91191e05159cfcb51f0f2d0d831bf3ed7ef4b7cdee90ebcf4f36d38471bd10681441f4e4762b9454706e81cd2b87d1186ef6619b53aa095
+  metadata.gz: 51d6a79615a1b7e4d191c80a3be1584f7e719f7c1907583600225c160938400ecdfac6b616440669f49c0b98bf3f36224bfb2f9a2355e94cd994be16355bfcf9
+  data.tar.gz: 95904bb3946944f63c6c802191dbd91b95e8d9d663a8dc2c8665ac1f94a9f863a729c27606e79be2e5cf960b6a4c8c54aa50a08be8357b6c354bf2e5522e4edd

data/.github/workflows/ci.yml

@@ -1,28 +1,95 @@
 name: CI
+
 on: [push, pull_request]
+
 jobs:
-  test:
-    strategy:
-      fail-fast: false
-      matrix:
-        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-        ruby: [2.5, 2.6, 2.7, '3.0', head]
-        rails: ['6.1', '6.0', '5.2']
-        mongodb-version: ['4.4']
-        exclude:
-          - ruby: '3.0'
-            rails: 5.2
-          - ruby: head
-            rails: 5.2
+  test-rails5:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: supercharge/mongodb-github-action@1.6.0
+    - uses: actions/checkout@v5
+    - uses: supercharge/mongodb-github-action@1.12.0
       with:
-        mongodb-version: ${{ matrix.mongodb-version }}
+        mongodb-version: "4.4"
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: ${{ matrix.ruby }}
-        # bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - run: RAILS_VERSION=${{ matrix.rails }} bundle install
-    - run: RAILS_VERSION=${{ matrix.rails }} bundle exec rake
+        ruby-version: "2.5"
+    - run: BUNDLE_GEMFILE=Gemfile-rails5 bundle install
+    - run: BUNDLE_GEMFILE=Gemfile-rails5 bundle exec rake
+
+  test-rails6_0:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v5
+    - uses: supercharge/mongodb-github-action@1.12.0
+      with:
+        mongodb-version: "4.4"
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: "2.6"
+    - run: BUNDLE_GEMFILE=Gemfile-rails6.0 bundle install
+    - run: BUNDLE_GEMFILE=Gemfile-rails6.0 bundle exec rake
+
+  test-rails6_1:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v5
+    - uses: supercharge/mongodb-github-action@1.12.0
+      with:
+        mongodb-version: "4.4"
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: "3.0"
+    - run: BUNDLE_GEMFILE=Gemfile-rails6.1 bundle install
+    - run: BUNDLE_GEMFILE=Gemfile-rails6.1 bundle exec rake
+
+  test-rails7_0:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v5
+    - uses: supercharge/mongodb-github-action@1.12.0
+      with:
+        mongodb-version: "4.4"
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: "3.0"
+    - run: BUNDLE_GEMFILE=Gemfile-rails7.0 bundle install
+    - run: BUNDLE_GEMFILE=Gemfile-rails7.0 bundle exec rake
+
+  test-rails7_1:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v5
+    - uses: supercharge/mongodb-github-action@1.12.0
+      with:
+        mongodb-version: "4.4"
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: "3.2"
+    - run: BUNDLE_GEMFILE=Gemfile-rails7.1 bundle install
+    - run: BUNDLE_GEMFILE=Gemfile-rails7.1 bundle exec rake
+
+  test-rails7_2:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v5
+    - uses: supercharge/mongodb-github-action@1.12.0
+      with:
+        mongodb-version: "4.4"
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: "3.3"
+    - run: BUNDLE_GEMFILE=Gemfile-rails7.2 bundle install
+    - run: BUNDLE_GEMFILE=Gemfile-rails7.2 bundle exec rake
+
+  test-rails8:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v5
+    - uses: supercharge/mongodb-github-action@1.12.0
+      with:
+        mongodb-version: "4.4"
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: "3.3"
+    - run: BUNDLE_GEMFILE=Gemfile-rails8 bundle install
+    - run: BUNDLE_GEMFILE=Gemfile-rails8 bundle exec rake

data/.gitignore

@@ -1,6 +1,6 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
+/*.lock
 /_yardoc/
 /coverage/
 /doc/

data/CHANGES.md

@@ -1,3 +1,12 @@
+# 0.3.0
+
+* Add `conditions` option to Reform Uniqueness validation.
+* ActiveModel acceptance validation works
+
+# 0.2.6
+
+* Allow to override `#persisted?` and friends with modules.
+
 # 0.2.5
 
 * Fix: Delegating from form object causes ArgumentError with 0.2.4 (https://github.com/trailblazer/reform-rails/issues/99)

data/Gemfile-rails5

@@ -0,0 +1,9 @@
+source "https://rubygems.org"
+gemspec
+
+ruby '~> 2.5'
+
+gem "mongoid", "< 7.0"
+gem "activerecord", "~> 5.2"
+gem "railties", "~> 5.2"
+gem "sqlite3", "~> 1.3", "< 1.4"

data/Gemfile-rails6.0

@@ -0,0 +1,9 @@
+source "https://rubygems.org"
+gemspec
+
+ruby '~> 2.6'
+
+gem "activerecord", "~> 6.0.0"
+gem "railties", "~> 6.0.0"
+gem "sqlite3"
+gem "mongoid"

data/Gemfile-rails6.1

@@ -0,0 +1,9 @@
+source "https://rubygems.org"
+gemspec
+
+ruby '~> 3.0'
+
+gem "activerecord", "~> 6.1.0"
+gem "railties", "~> 6.1.0"
+gem "sqlite3", "~> 1.4"
+gem "mongoid"

data/Gemfile-rails7.0

@@ -0,0 +1,9 @@
+source "https://rubygems.org"
+gemspec
+
+ruby '~> 3.0'
+
+gem "activerecord", "~> 7.0.0"
+gem "railties", "~> 7.0.0"
+gem "sqlite3", "~> 1.4"
+gem "mongoid"

data/Gemfile-rails7.1

@@ -0,0 +1,9 @@
+source "https://rubygems.org"
+gemspec
+
+ruby '~> 3.2'
+
+gem "activerecord", "~> 7.1.0"
+gem "railties", "~> 7.1.0"
+gem "sqlite3"
+gem "mongoid"

data/Gemfile-rails7.2

@@ -0,0 +1,9 @@
+source "https://rubygems.org"
+gemspec
+
+ruby '~> 3.3'
+
+gem "activerecord", "~> 7.2.0"
+gem "railties", "~> 7.2.0"
+gem "sqlite3"
+gem "mongoid"

data/Gemfile-rails8

@@ -0,0 +1,9 @@
+ 	source "https://rubygems.org"
+gemspec
+
+ruby '~> 3.2'
+
+gem "activerecord", "~> 8.0.0"
+gem "railties", "~> 8.0.0"
+gem "sqlite3"
+gem "mongoid"

data/README.md

@@ -28,14 +28,15 @@ Reform-rails needs Reform >= 2.3.
 
 ## Contributing
 
-By default your tests will run against rails 6.0.1.
-Please ensure that you test your changes against all supported ruby and rails versions (see .travis.yml)
+Please ensure that you test your changes against all supported ruby and rails versions
 
 You can run tests for a specific version of rails by running the following:
 
-`export RAILS_VERSION=5.0.0; bundle update; bundle exec rake test`
+```shell
+BUNDLE_GEMFILE=Gemfile-rails7.0 bundle install
+BUNDLE_GEMFILE=Gemfile-rails7.0 bundle exec rake test
+```
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/lib/reform/form/active_model/validations.rb

@@ -141,9 +141,9 @@ module Reform
             messages.to_s
           end
 
-          def add(key, error_text)
+          def add(key, error_text, **error_options)
             # use rails magic to get the correct error_text and make sure we still update details and fields
-            error = @amv_errors.add(key, error_text)
+            error = @amv_errors.add(key, error_text, **error_options)
             error = [error.message] unless error.is_a?(Array)
 
             # using error_text instead of text to either keep the symbol which will be
@@ -171,12 +171,12 @@ module Reform
             base_errors = @amv_errors.full_messages
             form_fields = @amv_errors.instance_variable_get(:@base).instance_variable_get(:@fields)
             nested_errors = full_messages_for_nested_fields(form_fields)
-            
+
             [base_errors, nested_errors].flatten.compact
           end
 
           private
-          
+
           def full_messages_for_nested_fields(form_fields)
             form_fields.map { |field| full_messages_for_twin(field[1]) }
           end

data/lib/reform/form/active_model.rb

@@ -4,7 +4,11 @@ module Reform::Form::ActiveModel
       extend ClassMethods
       register_feature ActiveModel
 
-      delegate :persisted?, :to_key, :to_param, :id, to: :model
+      delegations = Module.new do
+        delegate :persisted?, :to_key, :to_param, :id, to: :model
+      end
+
+      include delegations # now, those methods (e.g. {#persisted?}) can be overridden by another module.
 
       def to_model # this is called somewhere in FormBuilder and ActionController.
         self

data/lib/reform/form/orm.rb

@@ -20,7 +20,11 @@ module Reform::Form::ORM
       @klass = record.class # this is usually done in the super-sucky #setup method.
       super(record).tap do |res|
         if record.errors.present?
-          error = self.class.name.include?("Mongoid") ? record.errors.first.last : :taken
+          error = if Gem::Version.new(ActiveModel::VERSION::STRING) >= Gem::Version.new('6.1.0')
+                    self.class.name.include?("Mongoid") ? record.errors.first.type : :taken
+                  else
+                    self.class.name.include?("Mongoid") ? record.errors.first.last : :taken
+                  end
           form.errors.add(property, error)
         end
       end

data/lib/reform/form/validation/unique_validator.rb

@@ -14,7 +14,7 @@
 # validates :title, unique: { case_sensitive: false }
 #
 # = Scope
-# A scope can be use to filter the records that need to be compare with the
+# A scope can be used to filter the records that need to be compare with the
 # current value to validate. A scope array can have one to many fields define.
 #
 # A scope can be define the following ways:
@@ -33,6 +33,20 @@
 # This use case is useful if album_id is set to a Song this way:
 # song = album.songs.new
 # album_id is automatically set and can't be change by the operation
+#
+# = Conditions
+# A condition can be passed to filter the records with partial indexes
+#
+# Conditions can be define the following ways:
+# validates :title, unique: { conditions: -> { where(archived_at: nil) } }
+# - This will check that the title is unique for non archived records
+# validates :title, unique: {
+#   conditions: ->(record) {
+#     published_at = record.published_at
+#     where(published_at: published_at.beginning_of_year..published_at.end_of_year)
+#   }
+# }
+#
 
 class Reform::Form::UniqueValidator < ActiveModel::EachValidator
   def validate_each(form, attribute, value)
@@ -57,6 +71,16 @@ class Reform::Form::UniqueValidator < ActiveModel::EachValidator
       query = query.where(field => form.send(field))
     end
 
+    if options[:conditions]
+      conditions = options[:conditions]
+
+      query = if conditions.arity.zero?
+                query.instance_exec(&conditions)
+              else
+                query.instance_exec(form, &conditions)
+              end
+    end
+
     form.errors.add(attribute, :taken) if query.count > 0
   end
 end

data/lib/reform/rails/version.rb

@@ -1,5 +1,5 @@
 module Reform
   module Rails
-    VERSION = "0.2.5"
+    VERSION = "0.3.0"
   end
 end

data/lib/reform/rails.rb

@@ -4,3 +4,29 @@ require "reform/rails/railtie"
 
 module Reform
 end
+
+module ActiveModel
+  module Validations
+    class AcceptanceValidator < EachValidator # :nodoc:
+      def initialize(options)
+        super({ allow_nil: true, accept: ["1", true] }.merge!(options))
+      end
+
+      def validate_each(record, attribute, value)
+        unless acceptable_option?(value)
+          if Gem::Version.new(ActiveModel::VERSION::STRING) >= Gem::Version.new('6.1.0')
+            record.errors.add(attribute, :accepted, **options.except(:accept, :allow_nil))
+          else
+            record.errors.add(attribute, :accepted, options.except(:accept, :allow_nil))
+          end
+        end
+      end
+
+      private
+
+        def acceptable_option?(value)
+          Array(options[:accept]).include?(value)
+        end
+    end
+  end
+end

data/reform-rails.gemspec

@@ -22,4 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "reform", ">= 2.3.1", "< 3.0.0"
   spec.add_dependency "activemodel", ">= 5.0"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "minitest-line"
+  spec.add_development_dependency "debug"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reform-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-15 00:00:00.000000000 Z
+date: 2025-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reform
@@ -44,6 +44,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-line
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: debug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Automatically load and include all common Reform features for a standard
   Rails environment.
 email:
@@ -55,7 +97,13 @@ files:
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - CHANGES.md
-- Gemfile
+- Gemfile-rails5
+- Gemfile-rails6.0
+- Gemfile-rails6.1
+- Gemfile-rails7.0
+- Gemfile-rails7.1
+- Gemfile-rails7.2
+- Gemfile-rails8
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -95,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Automatically load and include all common Rails form features.

data/Gemfile

@@ -1,33 +0,0 @@
-git_source(:github) do |repo_name|
-  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
-  "https://github.com/#{repo_name}.git"
-end
-
-source "https://rubygems.org"
-gemspec
-
-gem 'pry-byebug'
-gem "minitest-line"
-
-case ENV["GEMS_SOURCE"]
-  when "local"
-    gem "reform", path: "../reform"
-  when "github"
-    gem "reform", github: "trailblazer/reform"
-end
-
-rails_version = ENV.fetch("RAILS_VERSION", "6.0.0")
-
-# bored of wrestling with rails...
-
-gem("mongoid", "< 7.0") unless rails_version.to_i >= 6
-
-
-gem "activerecord", "~> #{rails_version}"
-gem "railties", "~> #{rails_version}"
-if rails_version.to_i >= 6
-  gem "sqlite3", "~> 1.4"
-else
-  gem "sqlite3", "~> 1.3", "< 1.4"
-end
-puts "Rails version #{rails_version}"