reform-rails 0.1.7 → 0.2.1

data/lib/reform/form/active_record.rb

@@ -1,5 +1,3 @@
-require "reform/form/orm"
-
 module Reform::Form::ActiveRecord
   def self.included(base)
     base.class_eval do

data/lib/reform/form/mongoid.rb

@@ -0,0 +1,26 @@
+gem 'mongoid', ">= 4.0"
+
+module Reform::Form::Mongoid
+  def self.included(base)
+    base.class_eval do
+      register_feature Reform::Form::Mongoid
+      include Reform::Form::ActiveModel
+      include Reform::Form::ORM
+      extend ClassMethods
+    end
+  end
+
+  module ClassMethods
+    def validates_uniqueness_of(attribute, options={})
+      options = options.merge(:attributes => [attribute])
+      validates_with(UniquenessValidator, options)
+    end
+    def i18n_scope
+      :mongoid
+    end
+  end
+
+  UniquenessValidator = Class.new("::Mongoid::Validatable::UniquenessValidator".constantize) do
+    include Reform::Form::ORM::UniquenessValidator
+  end
+end

data/lib/reform/form/multi_parameter_attributes.rb

@@ -19,7 +19,11 @@ module Reform::Form::MultiParameterAttributes
           )
         end
       end
-      params.merge!(date_attributes)
+
+      date_attributes.each do |attribute, date|
+        params[attribute] = date
+      end
+      params
     end
 
   private

data/lib/reform/form/orm.rb

@@ -19,7 +19,10 @@ module Reform::Form::ORM
 
       @klass = record.class # this is usually done in the super-sucky #setup method.
       super(record).tap do |res|
-        form.errors.add(property, record.errors.first.last) if record.errors.present?
+        if record.errors.present?
+          error = self.class.name.include?("Mongoid") ? record.errors.first.last : :taken
+          form.errors.add(property, error)
+        end
       end
     end
   end

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

@@ -7,6 +7,12 @@
 # validates :title, unique: true
 #
 # == Options
+#
+# = Case Sensitivity
+# Case sensitivity is true by default, but can be set to false:
+#
+# validates :title, unique: { case_sensitive: false }
+#
 # = Scope
 # A scope can be use 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.
@@ -31,9 +37,19 @@
 class Reform::Form::UniqueValidator < ActiveModel::EachValidator
   def validate_each(form, attribute, value)
     model = form.model_for_property(attribute)
+    original_attribute = form.options_for(attribute)[:private_name]
 
     # search for models with attribute equals to form field value
-    query = model.class.where(attribute => value)
+    query = if options[:case_sensitive] == false && value
+              model.class.where("lower(#{original_attribute}) = ?", value.downcase)
+            else
+              model.class.where(original_attribute => value)
+            end
+
+    # if model persisted, query should bypass model
+    if model.persisted?
+      query = query.where("#{model.class.primary_key} != ?", model.id)
+    end
 
     # apply scope if options has been declared
     Array(options[:scope]).each do |field|
@@ -41,9 +57,7 @@ class Reform::Form::UniqueValidator < ActiveModel::EachValidator
       query = query.where(field => form.send(field))
     end
 
-    # if model persisted, query may return 0 or 1 rows, else 0
-    allow_count = model.persisted? ? 1 : 0
-    form.errors.add(attribute, :taken) if query.count > allow_count
+    form.errors.add(attribute, :taken) if query.count > 0
   end
 end
 

data/lib/reform/mongoid.rb

@@ -0,0 +1,4 @@
+require 'reform/form/orm'
+require 'reform/form/active_model'
+require 'reform/form/mongoid'
+require 'reform/form/active_model/model_reflections' # only load this in AR context as simple_form currently is bound to AR.

data/lib/reform/rails.rb

@@ -1,4 +1,5 @@
 require "reform/rails/version"
+require 'reform'
 require "reform/rails/railtie"
 
 module Reform

data/lib/reform/rails/railtie.rb

@@ -6,48 +6,53 @@ module Reform
       initializer "reform.form_extensions", after: :load_config_initializers do
         validations = config.reform.validations || :active_model
 
+        require "reform/form/multi_parameter_attributes"
+
         if validations == :active_model
           active_model!
         elsif validations == :dry
-          dry!
+          enable_form_builder_methods = config.reform.enable_active_model_builder_methods || false
+
+          dry!(enable_form_builder_methods)
         else
           warn "[Reform::Rails] No validation backend set. Please do so via `config.reform.validations = :active_model`."
         end
       end
 
       def active_model!
-        require "reform"
-        require "reform/form/active_model/model_validations"
         require "reform/form/active_model/form_builder_methods"
         require "reform/form/active_model"
+
+        require "reform/form/active_model/model_validations"
         require "reform/form/active_model/validations"
-        require "reform/form/multi_parameter_attributes"
 
-        require "reform/active_record" if defined?(ActiveRecord)
-        require "reform/mongoid" if defined?(Mongoid)
+        require "reform/active_record" if defined?(::ActiveRecord)
+        require "reform/mongoid" if defined?(::Mongoid)
 
         Reform::Form.class_eval do
           include Reform::Form::ActiveModel
           include Reform::Form::ActiveModel::FormBuilderMethods
-          include Reform::Form::ActiveRecord if defined?(ActiveRecord)
-          include Reform::Form::Mongoid if defined?(Mongoid)
+          include Reform::Form::ActiveRecord if defined?(::ActiveRecord)
+          include Reform::Form::Mongoid if defined?(::Mongoid)
           include Reform::Form::ActiveModel::Validations
         end
       end
 
-      def dry!
-        require "reform"
-        require "reform/form/dry"
+      def dry!(enable_am = true)
+        if enable_am
+          require "reform/form/active_model/form_builder_methods" # this is for simple_form, etc.
 
-        require "reform/form/multi_parameter_attributes"
-        require "reform/form/active_model/form_builder_methods" # this is for simple_form, etc.
+          # This adds Form#persisted? and all the other crap #form_for depends on. Grrrr.
+          require "reform/form/active_model" # DISCUSS: only when using simple_form.
+        end
 
-        # This adds Form#persisted? and all the other crap #form_for depends on. Grrrr.
-        require "reform/form/active_model" # DISCUSS: only when using simple_form.
+        require "reform/form/dry"
 
         Reform::Form.class_eval do
-          include Reform::Form::ActiveModel # DISCUSS: only when using simple_form.
-          include Reform::Form::ActiveModel::FormBuilderMethods
+          if enable_am
+            include Reform::Form::ActiveModel
+            include Reform::Form::ActiveModel::FormBuilderMethods
+          end
 
           include Reform::Form::Dry
         end

data/lib/reform/rails/version.rb

@@ -1,5 +1,5 @@
 module Reform
   module Rails
-    VERSION = "0.1.7"
+    VERSION = "0.2.1"
   end
 end

data/reform-rails.gemspec

@@ -14,19 +14,12 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/trailblazer/reform-rails"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+                         f.match(%r{^(test/|spec/|features/|database.sqlite3)})
+                       end
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "reform", ">= 2.2.0"
-  spec.add_dependency "activemodel", ">= 3.2"
-
-  spec.add_development_dependency "rails"
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "actionpack"
-  spec.add_development_dependency "activerecord"
-  spec.add_development_dependency "mongoid"
-  spec.add_development_dependency "sqlite3"
+  spec.add_dependency "reform", ">= 2.3.1", "< 3.0.0"
+  spec.add_dependency "activemodel", ">= 5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reform-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.1
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reform
@@ -16,140 +16,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: 2.3.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: rails
-  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: bundler
-  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: rake
-  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
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: 2.3.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: actionpack
-  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: activerecord
-  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: mongoid
-  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: sqlite3
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '5.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 description: Automatically load and include all common Reform features for a standard
   Rails environment.
 email:
@@ -159,17 +53,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- database.sqlite3
-- gemfiles/Gemfile.rails-3.2
-- gemfiles/Gemfile.rails-4.0
-- gemfiles/Gemfile.rails-4.1
-- gemfiles/Gemfile.rails-4.2
 - lib/reform/active_record.rb
 - lib/reform/form/active_model.rb
 - lib/reform/form/active_model/form_builder_methods.rb
@@ -177,13 +68,14 @@ files:
 - lib/reform/form/active_model/model_validations.rb
 - lib/reform/form/active_model/validations.rb
 - lib/reform/form/active_record.rb
+- lib/reform/form/mongoid.rb
 - lib/reform/form/multi_parameter_attributes.rb
 - lib/reform/form/orm.rb
 - lib/reform/form/validation/unique_validator.rb
+- lib/reform/mongoid.rb
 - lib/reform/rails.rb
 - lib/reform/rails/railtie.rb
 - lib/reform/rails/version.rb
-- log/development.log
 - reform-rails.gemspec
 homepage: https://github.com/trailblazer/reform-rails
 licenses:
@@ -204,8 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Automatically load and include all common Rails form features.

data/gemfiles/Gemfile.rails-3.2

@@ -1,7 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in reform.gemspec
-gemspec :path => '../'
-
-gem 'railties', '~> 3.2.0'
-gem 'activerecord', '~> 3.2.0'

data/gemfiles/Gemfile.rails-4.0

@@ -1,7 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in reform.gemspec
-gemspec :path => '../'
-
-gem 'railties', '~> 4.0.0'
-gem 'activerecord', '~> 4.0.0'