effective_addresses 1.9.4 → 1.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 903de54494687e66176870441f7dbf08122086a9d1de3dae3a38da0cbd2cca99
-  data.tar.gz: 8535f034cd7392a7f9ee711386248618f2b8d647784e30dfc4fc726220ec55c5
+  metadata.gz: 745f86571f2a0f52bf54edf6045a56c5ac5537f1b414344ab55a778b402b8f0b
+  data.tar.gz: ba0656435d9378d950fa2165c7c936bc8a1542827889b60a3cadff148f780ec4
 SHA512:
-  metadata.gz: 0601a1e879b7cdce8604dd836bd4d80bbca09c1606ff68523ef591b07925ad9b5aba9c679a060a82b7cc5b3e16fa8f2bd0a9a4301ca4e1ab399d9c610ee81b94
-  data.tar.gz: 0fc12952f62102c4f792a4c25f380daec74a862a5a6a1fab39edd1a2546d11aa44442ea41c60318b64d3773e4a1adb965e767f5b18ed6c50c079f0b8e29f0b45
+  metadata.gz: '059f454408860bea37b7627c1269ee37ca7b9835fb04d0bed34e9cb0b20a4128a3dadbd2ab2ff9e7462e632da6cb9512ad96f034122375008f86b04a9e276cf4'
+  data.tar.gz: 7d157adab8db96dffefdb8dbe18037cd37fc1f1858f86afe60c6985d8984161ed1f6b40d8a6297e83cfdc4c5099dd055620c1e9267ee8233a569ca31461fd526

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

@@ -1,14 +1,15 @@
+# frozen_string_literal: true
+
 module EffectiveAddressesHelper
   def effective_address_fields(form, method = 'billing', options = {})
     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'
@@ -24,8 +25,8 @@ module EffectiveAddressesHelper
 
   def effective_address_pre_select(address)
     if EffectiveAddresses.pre_selected_country.present?
-      address.country = EffectiveAddresses.pre_selected_country
-      address.state = EffectiveAddresses.pre_selected_state if EffectiveAddresses.pre_selected_state.present?
+      address.country ||= EffectiveAddresses.pre_selected_country
+      address.state ||= EffectiveAddresses.pre_selected_state if EffectiveAddresses.pre_selected_state.present?
     elsif defined?(Geocoder) && request.location.present?
       location = request.location
       address.country = location.country_code

data/app/models/concerns/acts_as_addressable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # ActsAsAddressable
 
 module ActsAsAddressable
@@ -23,7 +25,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 +48,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 +137,3 @@ module ActsAsAddressable
   end
 
 end
-

data/app/models/effective/address.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   class Address < ActiveRecord::Base
     self.table_name = EffectiveAddresses.addresses_table_name.to_s
@@ -14,10 +16,7 @@ module Effective
       full_name         :string
       address1          :string
       address2          :string
-
-      if EffectiveAddresses.use_address3
-        address3          :string
-      end
+      address3          :string
 
       city              :string
       state_code        :string

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,
@@ -26,7 +26,7 @@
     disabled: same_as_billing,
     wrapper: wrapper_options
 
-  - if fa.object.respond_to?(:address3) && EffectiveAddresses.use_address3
+  - if EffectiveAddresses.use_address3
     = fa.text_field :address3,
       label: false,
       required: false,

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/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 EffectiveAddresses::Engine.routes.draw do
   scope :module => 'effective' do
     match 'addresses/subregions/:country_code', to: 'addresses#subregions', as: 'address_subregions', via: :get

data/db/migrate/01_create_effective_addresses.rb.erb

@@ -7,9 +7,7 @@ class CreateEffectiveAddresses < ActiveRecord::Migration[4.2]
       t.string :full_name
       t.string :address1
       t.string :address2
-
-      # Uncomment this if you want 3 address fields
-      # t.string :address3
+      t.string :address3
 
       t.string :city
       t.string :state_code

data/lib/effective_addresses/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAddresses
-  VERSION = '1.9.4'.freeze
+  VERSION = '1.9.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_addresses
 version: !ruby/object:Gem::Version
-  version: 1.9.4
+  version: 1.9.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-18 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails