formeze 4.2.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 959c1584612e08ca4e490f77a71bef8e2f2be9c1db827dc2903335a7f8a340b2
-  data.tar.gz: 60d9b150269c308824e72282e5ea55b5bdb369f04cfe7120dec8f9a7764157bd
+  metadata.gz: 65adcff0153dbcbf39d46bbdb6ad7a60765e57e8329b89d3003ed1e4c9c9bcf5
+  data.tar.gz: 99f871b6b7228ec472abaf8a2dbe820ea33a7cc5b3f3ef6dcd83f95a18410bda
 SHA512:
-  metadata.gz: d19f682f89a2222e8043d9a4a3569ef8e977cf33070723e655a4e6268b2bce45e5b410608db0a8648731a4be55774fe7d89ca15d63da2ac7c7247bdba23c4e9d
-  data.tar.gz: fe373bbd667d964054c625e7d188721222f02d384de318184296a3fef6ed85da96443c1834649349792f33a6320e69ac29ad933b2b6e3d1a013233f6a067b30d
+  metadata.gz: d1a01576d7f38d324e8aa7c33279fd25f36227d49e124b8f53f6f56605cd632478e88616cf13c9e4c37994472905bea37cc7fe211f85ac6e98aca5dbe2bf37c1
+  data.tar.gz: 12564e8c34d417f605c886fe43202fdde129aea2370699ee8411cb3e4703f99fbeb4ba5a4ad054a295ae8387708da3fe6db80454a5de3f779c69852e3c7777db

data/CHANGES.md

@@ -1,3 +1,15 @@
+# 4.3.0
+
+* Added dependency on cgi gem
+
+* Added support for lambda conditions without arguments
+
+* Fixed custom validation for fields with multiple values
+
+# 4.2.1
+
+* Fixed regression in v4.2.0 when mime-types gem is not loaded
+
 # 4.2.0
 
 * Fixed file validation for e.g. `.md` files sent as application/octet-stream

data/README.md

@@ -174,7 +174,7 @@ the `defined_if` or `defined_unless` options with a proc. Here's an example
 of using the defined_if option:
 
 ```ruby
-field :business_name, defined_if: proc { @account.business? }
+field :business_name, defined_if: ->{ @account.business? }
 ```
 
 In this example the `business_name` field will only be defined and validated
@@ -185,7 +185,7 @@ Here's an example of using the defined_unless option:
 ```ruby
 field :same_address, values: %w(true), key_required: false
 
-field :billing_address_line_one, defined_unless: proc { same_address? }
+field :billing_address_line_one, defined_unless: ->{ same_address? }
 
 def same_address?
   same_address == 'true'

data/formeze.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'formeze'
-  s.version = '4.2.0'
+  s.version = '4.3.0'
   s.license = 'LGPL-3.0'
   s.platform = Gem::Platform::RUBY
   s.authors = ['Tim Craft']
@@ -17,4 +17,5 @@ Gem::Specification.new do |s|
     'bug_tracker_uri' => 'https://github.com/readysteady/formeze/issues',
     'changelog_uri' => 'https://github.com/readysteady/formeze/blob/main/CHANGES.md'
   }
+  s.add_dependency 'cgi'
 end

data/lib/formeze/condition.rb

@@ -0,0 +1,11 @@
+module Formeze::Condition
+  def self.evaluate(instance, block)
+    block = block.to_proc
+
+    if block.arity.zero?
+      instance.instance_exec(&block)
+    else
+      instance.instance_eval(&block)
+    end
+  end
+end

data/lib/formeze/field.rb

@@ -14,12 +14,16 @@ class Formeze::Field
 
     values.each do |value|
       if String === value
-        validate(value, form)
+        value = validate(value, form)
       else
-        validate_file(value, form)
+        form.add_error(self, :not_accepted, 'is not an accepted file type') unless acceptable_file?(value)
 
         size += value.size
       end
+
+      value = Array(form.send(name)).push(value) if multiple?
+
+      form.send(:"#{name}=", value)
     end
 
     form.add_error(self, :too_large, 'is too large') if maxsize? && size > maxsize
@@ -44,31 +48,17 @@ class Formeze::Field
       form.add_error(self, :bad_value, 'is invalid') if values? && !values.include?(value)
     end
 
-    value = Array(form.send(name)).push(value) if multiple?
-
-    form.send(:"#{name}=", value)
+    value
   end
 
-  def validate_file(object, form)
-    unless acceptable_file?(object)
-      form.add_error(self, :not_accepted, 'is not an accepted file type')
-    end
-
-    object = Array(form.send(name)).push(object) if multiple?
-
-    form.send(:"#{name}=", object)
-  end
-
-  BINARY = MIME::Types['application/octet-stream'].first
-
   def acceptable_file?(object)
-    type = MIME::Types[object.content_type].first
-
     types = MIME::Types.type_for(object.original_filename)
 
-    if type == BINARY
+    if object.content_type == 'application/octet-stream'
       types.any? { |type| accept.include?(type) }
     else
+      type = MIME::Types[object.content_type].first
+
       accept.include?(type) && types.include?(type)
     end
   end

data/lib/formeze/presence.rb

@@ -1,11 +1,14 @@
 module Formeze::Presence
   REGEXP = /\S/
 
-  def present?(string)
-    string =~ REGEXP
+  def present?(value)
+    return false if value.nil?
+    return false if value.respond_to?(:empty?) && value.empty?
+    return false if value.is_a?(String) && value !~ REGEXP
+    return true
   end
 
-  def blank?(string)
-    string !~ REGEXP
+  def blank?(value)
+    !present?(value)
   end
 end

data/lib/formeze/validation.rb

@@ -14,7 +14,7 @@ class Formeze::Validation
   end
 
   def validates?(form)
-    @precondition ? form.instance_eval(&@precondition) : true
+    @precondition ? Formeze::Condition.evaluate(form, @precondition) : true
   end
 
   def field_value?(form)

data/lib/formeze.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Formeze
+  autoload :Condition, 'formeze/condition'
   autoload :Errors, 'formeze/errors'
   autoload :Field, 'formeze/field'
   autoload :Form, 'formeze/form'
@@ -134,9 +135,9 @@ module Formeze
 
     def field_defined?(field)
       if field.defined_if?
-        instance_eval(&field.defined_if)
+        Formeze::Condition.evaluate(self, field.defined_if)
       elsif field.defined_unless?
-        !instance_eval(&field.defined_unless)
+        !Formeze::Condition.evaluate(self, field.defined_unless)
       else
         true
       end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: formeze
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.0
 platform: ruby
 authors:
 - Tim Craft
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-07 00:00:00.000000000 Z
-dependencies: []
+date: 2024-04-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: cgi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby gem for validating form data
 email:
 - mail@timcraft.com
@@ -22,6 +36,7 @@ files:
 - README.md
 - formeze.gemspec
 - lib/formeze.rb
+- lib/formeze/condition.rb
 - lib/formeze/errors.rb
 - lib/formeze/field.rb
 - lib/formeze/form.rb