effective_addresses 1.9.5 → 1.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba2cb481ec7f7168ac0c9ee64c1aba99e55c67b8535a9f55391f554bb059662f
-  data.tar.gz: 8210fec82cbfceca33e406e3e093f0e77a98dcf68cd2bb386e75fd3a41796c03
+  metadata.gz: 46461b09d7aa12fd73789e0d29640bac574d2b7295bb68ce8568cc64c0b52f30
+  data.tar.gz: 00b4f0c30fedc4ddaa7cf8a700a221768ad077322846494093850a575bf45d11
 SHA512:
-  metadata.gz: 10354668f36119531aeb01e5a281a7d7f6c8932923b87a162686ff383a3b3af7bfaec819e43e10e5b727ba656325733e172e2005777c140995adbef32993f8e3
-  data.tar.gz: f0edbe4d32a1a377a80c8c4a3d02bcc1694094038a07b854c0af5eabf46134cb2ab9d7eff5729a4c2a8bf17fc78186f2b414a413e10efb6dbb00a477734cddf6
+  metadata.gz: 1fb5fb6857f90e57e50fe17e4f28aa27732fb932dd57a9287041a8afb25b63ada63c6c8d870871026c4bbb51067b8ea6de7b33b68e6634a6c90141706358adc1
+  data.tar.gz: 61324d4eecfa40edc2c3b5cfc2957d59d96463e5bb3f55b2ad7d339a67c7cde1f849f4882f4167910311a6fc6e9788470015ce2acaa8b6edfaa96fa6fc080814

data/README.md

@@ -89,7 +89,7 @@ or
 
 ```ruby
 class User
-  acts_as_addressable :billing => {:presence => true, :use_full_name => false}
+  acts_as_addressable :billing => {:presence => true}
 end
 ```
 
@@ -110,11 +110,7 @@ This means when a User is created, it will not be valid unless a billing_address
 
 Sometimes you want to collect a `full_name` field with your addresses, such as in the case of a mailing address; other times, it's an unnecessary field.
 
-When you specify the config option `config.use_full_name = true` all `acts_as_addressable` defined addresses will use `use_full_name => true` by default.
-
-This can be overridden on a per-address basis when declared in the model.
-
-When `use_full_name == true`, any calls to `effective_address_fields` form helper will display the full_name input, and the model will `validate_presence_of :full_name`.
+When you specify the config option `config.use_full_name = true` all, any calls to `effective_address_fields` form helper will display the full_name input, and the model will `validate_presence_of :full_name`.
 
 
 ### Address Validations

data/app/helpers/effective_addresses_helper.rb

@@ -3,12 +3,11 @@ module EffectiveAddressesHelper
     method = (method.to_s.include?('_address') ? method.to_s : "#{method}_address")
 
     required = (form.object._validators[method.to_sym].any? { |v| v.kind_of?(ActiveRecord::Validations::PresenceValidator) && (v.options[:if].blank? || (v.options[:if].respond_to?(:call) ? f.object.instance_exec(&v.options[:if]) : v.options[:if])) } rescue true)
-    use_full_name = form.object._validators[method.to_sym].any? { |v| v.kind_of?(EffectiveAddressFullNamePresenceValidator) }
 
     address = form.object.send(method) || form.object.addresses.build(category: method.to_s.gsub('_address', ''))
     effective_address_pre_select(address) if address.new_record?
 
-    opts = { required: required, use_full_name: use_full_name, field_order: [:full_name, :address1, :address2, :city, :country_code, :state_code, :postal_code] }.merge(options).merge({:f => form, :address => address, :method => method})
+    opts = { required: required, field_order: [:full_name, :address1, :address2, :city, :country_code, :state_code, :postal_code] }.merge(options).merge({:f => form, :address => address, :method => method})
 
     case form.class.name
     when 'Effective::FormBuilder'

data/app/models/concerns/acts_as_addressable.rb

@@ -23,7 +23,7 @@ module ActsAsAddressable
     end
 
     # Categories can be either:
-    # {'billing'=>{:singular=>true, :use_full_name=>false}, 'shipping'=>{:singular=>true, :use_full_name=>false}}
+    # {'billing'=>{:singular=>true}, 'shipping'=>{:singular=>true}}
     # or
     # {'billing' => true, 'shipping' => true}
     # or
@@ -46,11 +46,13 @@ module ActsAsAddressable
 
       case options
       when Hash
-        validates "#{category}_address", presence: options.fetch(:presence, false)
-        validates "#{category}_address", effective_address_full_name_presence: options.fetch(:use_full_name, EffectiveAddresses.use_full_name)
-      when TrueClass, FalseClass
-        validates "#{category}_address", presence: (options == true)
-        validates "#{category}_address", effective_address_full_name_presence: EffectiveAddresses.use_full_name
+        validates("#{category}_address", presence: true) if options[:presence]
+        validates("#{category}_address", effective_address_full_name_presence: true) if options[:use_full_name]
+      when TrueClass
+        validates "#{category}_address", presence: true
+        validates "#{category}_address", effective_address_full_name_presence: true, if: -> { EffectiveAddresses.use_full_name }
+      when FalseClass
+        # Nothing to do
       else
         raise 'Unexpected options. Expected a Hash or Boolean'
       end
@@ -133,4 +135,3 @@ module ActsAsAddressable
   end
 
 end
-

data/app/views/effective/addresses/_form_with.html.haml

@@ -8,7 +8,7 @@
   - if ((f.object.errors.include?(method) && !f.object.errors.include?(:addresses)) rescue false)
     = f.errors method
 
-  - if use_full_name || fa.object.errors.include?(:full_name)
+  - if EffectiveAddresses.use_full_name || fa.object.errors.include?(:full_name)
     = fa.text_field :full_name,
       required: required,
       disabled: same_as_billing,

data/app/views/effective/addresses/_formtastic.html.haml

@@ -9,7 +9,7 @@
 
     - case field
       - when :full_name
-        - if use_full_name || fa.object.errors.include?(:full_name)
+        - if EffectiveAddresses.use_full_name || fa.object.errors.include?(:full_name)
           = fa.input :full_name, :required => true, :label => 'Full name', :placeholder => 'Full name'
 
       - when :address1

data/app/views/effective/addresses/_simple_form.html.haml

@@ -10,7 +10,7 @@
 
     - case field
       - when :full_name
-        - if use_full_name || fa.object.errors.include?(:full_name)
+        - if EffectiveAddresses.use_full_name || fa.object.errors.include?(:full_name)
           = fa.input :full_name,
             required: required,
             disabled: shipping_address_same_as_billing,
@@ -81,4 +81,3 @@
       label: 'Shipping address is same as billing address',
       required: false,
       input_html: { checked: shipping_address_same_as_billing }
-

data/lib/effective_addresses/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAddresses
-  VERSION = '1.9.5'.freeze
+  VERSION = '1.9.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_addresses
 version: !ruby/object:Gem::Version
-  version: 1.9.5
+  version: 1.9.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-25 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails