effective_addresses 1.9.2 → 1.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f68f7e9190672bf40b176596387019c6e4ff3ce76f299950469dba367eca0d77
-  data.tar.gz: 180012dead028e83f163659605bc5f55dc9c345f3fccce1e201cf140f83c21a4
+  metadata.gz: 46461b09d7aa12fd73789e0d29640bac574d2b7295bb68ce8568cc64c0b52f30
+  data.tar.gz: 00b4f0c30fedc4ddaa7cf8a700a221768ad077322846494093850a575bf45d11
 SHA512:
-  metadata.gz: b879876863da03b54413dd98e9bce145e77e166b99822d8315c1f2d9620c150fb9999a1303aaeeb75e256c28aae9bc64c47391a1713deca10d53b6d462d78196
-  data.tar.gz: d6855b8a7b2b6171c1a88d973abd73347152ab5ce90884ded6409136f767aaf07b087126045bbc4a743f1605e2a9fe9cf1597d567f60d6e5227d4aa18de7c63e
+  metadata.gz: 1fb5fb6857f90e57e50fe17e4f28aa27732fb932dd57a9287041a8afb25b63ada63c6c8d870871026c4bbb51067b8ea6de7b33b68e6634a6c90141706358adc1
+  data.tar.gz: 61324d4eecfa40edc2c3b5cfc2957d59d96463e5bb3f55b2ad7d339a67c7cde1f849f4882f4167910311a6fc6e9788470015ce2acaa8b6edfaa96fa6fc080814

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2018 Code and Effect Inc.
+Copyright 2021 Code and Effect Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

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,16 +1,13 @@
 module EffectiveAddressesHelper
-  @@use_geocoder = defined?(Geocoder)
-
   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'
@@ -28,7 +25,7 @@ module EffectiveAddressesHelper
     if EffectiveAddresses.pre_selected_country.present?
       address.country = EffectiveAddresses.pre_selected_country
       address.state = EffectiveAddresses.pre_selected_state if EffectiveAddresses.pre_selected_state.present?
-    elsif @@use_geocoder && request.location.present?
+    elsif defined?(Geocoder) && request.location.present?
       location = request.location
       address.country = location.country_code
       address.state = location.state_code
@@ -37,7 +34,7 @@ module EffectiveAddressesHelper
     end
   end
 
-  def effective_address_regions_collection(regions = nil)
+  def effective_address_regions_collection(regions = nil, resource: nil)
     if regions.present?
       countries = regions
     elsif EffectiveAddresses.country_codes == :all
@@ -61,7 +58,15 @@ module EffectiveAddressesHelper
       )
     end
 
+    # Special behaviour if the address has CAN, we treat it as CA
+    if regions.blank? && resource.present? && resource.country_code == 'CAN'
+      ca = countries.index { |_, code| code == 'CA' }
+
+      if ca.present?
+        countries[ca] = ['Canada', 'CAN']
+      end
+    end
+
     countries
   end
 end
-

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/models/effective/address.rb

@@ -8,27 +8,22 @@ module Effective
 
     belongs_to :addressable, polymorphic: true, touch: true
 
-    if defined?(EffectiveResources)
-      effective_resource do
-        category          :string
+    effective_resource do
+      category          :string
 
-        full_name         :string
-        address1          :string
-        address2          :string
+      full_name         :string
+      address1          :string
+      address2          :string
+      address3          :string
 
-        if EffectiveAddresses.use_address3
-          address3          :string
-        end
-
-        city              :string
-        state_code        :string
-        country_code      :string
-        postal_code       :string
+      city              :string
+      state_code        :string
+      country_code      :string
+      postal_code       :string
 
-        shipping_address_same_as_billing permitted: true
+      shipping_address_same_as_billing permitted: true
 
-        timestamps
-      end
+      timestamps
     end
 
     validates :category, :address1, :city, :country_code, :postal_code, presence: true, if: Proc.new { |address| address.present? }

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,
@@ -41,7 +41,7 @@
 
   .row
     .col-md-4
-      = fa.select :country_code, effective_address_regions_collection(),
+      = fa.select :country_code, effective_address_regions_collection(resource: fa.object),
         label: 'Country',
         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/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.2'.freeze
+  VERSION = '1.9.6'.freeze
 end

data/lib/effective_addresses.rb

@@ -1,26 +1,31 @@
 require 'carmen'
+require 'effective_resources'
 require 'effective_addresses/engine'
 require 'effective_addresses/version'
 
 module EffectiveAddresses
 
-  # The following are all valid config keys
-  mattr_accessor :country_codes
-  mattr_accessor :country_codes_priority
-  mattr_accessor :addresses_table_name
-  mattr_accessor :use_full_name
-  mattr_accessor :use_address3
-  mattr_accessor :simple_form_options
-  mattr_accessor :validate_postal_code_format
-  mattr_accessor :pre_selected_country
-  mattr_accessor :pre_selected_state
-
-  def self.setup
-    yield self
+  def self.config_keys
+    [
+      :addresses_table_name,
+      :country_codes,
+      :country_codes_priority,
+      :use_full_name,
+      :use_address3,
+      :simple_form_options,
+      :validate_postal_code_format,
+      :pre_selected_country,
+      :pre_selected_state
+    ]
   end
 
+  include EffectiveGem
+
   def self.permitted_params
-    [:address1, :address2, :address3, :city, :country_code, :state_code, :postal_code, :full_name, :shipping_address_same_as_billing]
+    [
+      :address1, :address2, :address3, :city, :country_code, :state_code, :postal_code,
+      :full_name, :shipping_address_same_as_billing
+    ]
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_addresses
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-13 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: effective_resources
+  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'
 - !ruby/object:Gem::Dependency
   name: carmen
   requirement: !ruby/object:Gem::Requirement