effective_addresses 1.9.1 → 1.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aa7ce3d77614bfd059db69cef7d6a5b7d5d43d5fc77a34b8994130c32e7f520
-  data.tar.gz: 9f57e1ca5e3311d7782938154b8636d3e4f34c38cf7d4b9599efa2c3e35a7294
+  metadata.gz: ba2cb481ec7f7168ac0c9ee64c1aba99e55c67b8535a9f55391f554bb059662f
+  data.tar.gz: 8210fec82cbfceca33e406e3e093f0e77a98dcf68cd2bb386e75fd3a41796c03
 SHA512:
-  metadata.gz: 866ac98ef614cfcee03b0489dccd1fcde01a5d1c1f3ee62325dec9424f071ee8126ee9e883718d9252f33badec6c341ad35ad0a4b5b80a02a557abc7776f5aa8
-  data.tar.gz: '039fd9d17fdfdf3418aed12003f2792dbf292102058c5a6b7d1409731f759f08a526419c7e7e7492a057ff4347d7d5a8636720cb186e6e94dbbbca4c162bef40'
+  metadata.gz: 10354668f36119531aeb01e5a281a7d7f6c8932923b87a162686ff383a3b3af7bfaec819e43e10e5b727ba656325733e172e2005777c140995adbef32993f8e3
+  data.tar.gz: f0edbe4d32a1a377a80c8c4a3d02bcc1694094038a07b854c0af5eabf46134cb2ab9d7eff5729a4c2a8bf17fc78186f2b414a413e10efb6dbb00a477734cddf6

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/app/helpers/effective_addresses_helper.rb

@@ -1,6 +1,4 @@
 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")
 
@@ -28,7 +26,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 +35,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 +59,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/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

@@ -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/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/engine.rb

@@ -2,8 +2,8 @@ module EffectiveAddresses
   class Engine < ::Rails::Engine
     engine_name 'effective_addresses'
 
-    config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/models/validators"]
+    config.autoload_paths += Dir["#{config.root}/lib/validators"]
+    config.eager_load_paths += Dir["#{config.root}/lib/validators"]
 
     # Include acts_as_addressable concern and allow any ActiveRecord object to call it
     initializer 'effective_addresses.active_record' do |app|
@@ -19,4 +19,3 @@ module EffectiveAddresses
 
   end
 end
-

data/lib/effective_addresses/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAddresses
-  VERSION = '1.9.1'.freeze
+  VERSION = '1.9.5'.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.1
+  version: 1.9.5
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2021-10-25 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
@@ -69,8 +83,6 @@ files:
 - app/helpers/effective_addresses_helper.rb
 - app/models/concerns/acts_as_addressable.rb
 - app/models/effective/address.rb
-- app/models/validators/effective_address_full_name_presence_validator.rb
-- app/models/validators/effective_address_valid_validator.rb
 - app/views/effective/addresses/_address.html.haml
 - app/views/effective/addresses/_form_with.html.haml
 - app/views/effective/addresses/_formtastic.html.haml
@@ -84,11 +96,13 @@ files:
 - lib/effective_addresses/engine.rb
 - lib/effective_addresses/version.rb
 - lib/generators/effective_addresses/install_generator.rb
+- lib/validators/effective_address_full_name_presence_validator.rb
+- lib/validators/effective_address_valid_validator.rb
 homepage: https://github.com/code-and-effect/effective_addresses
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,8 +117,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Extend any ActiveRecord object to have one or more named addresses. Includes
   a geographic region-aware custom form input backed by Carmen.