effective_addresses 1.8.5 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 10e0a18e1057bb62aa50278891d207d8cfb1420a
-  data.tar.gz: 09d6a1fa25e100cc1e1690d53015799d0447d874
+SHA256:
+  metadata.gz: e41141e340c412a2e083dfb79792a86f102484fe61734eebf85963ba17c287c8
+  data.tar.gz: f0f60629f50f7f20e3e8ba6976e6ba9554b18ed6bb38870a4653ab1ad33b9c17
 SHA512:
-  metadata.gz: 52d258748596da058b01e2a092f810ade1451171bb56035dec4b39292530aa603a88574c5ab60ae27d7bbf5dce030c872d6efae6b14035e4dbd2d3b10e322b10
-  data.tar.gz: 6af33db771036fd87c82e991917d8b96cac6d7ab461b715587752d8dcf6d7b9d776b9de058093bc84b1cbd1e4d3e12da5fb7c66506720b1a5429ad45e835df3a
+  metadata.gz: 934bf8000a28eb370e5f444d6f70610ea7b63f5c0d71c0e1da9f1ed0d83265b697b424489b732d2469e3a23edde57c603d11b2daf2aec9a4688635239e45ee4d
+  data.tar.gz: 170e98c482c1d99e3907864773762f487f0b61b0e5fc8399ffcac6c11f4d03655b547450d0c7a8ae856b97a7b13469bbe83f7a602ad8304b9ae32397f9f82179

data/app/helpers/effective_addresses_helper.rb

@@ -37,7 +37,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,10 +61,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
-  alias_method :effective_address_countries_collection, :effective_address_regions_collection
-  alias_method :region_options_for_simple_form_select, :effective_address_regions_collection
-
 end
-

data/app/models/concerns/acts_as_addressable.rb

@@ -3,7 +3,7 @@
 module ActsAsAddressable
   extend ActiveSupport::Concern
 
-  module ActiveRecord
+  module Base
     def acts_as_addressable(*options)
       @acts_as_addressable_opts = options || []
       include ::ActsAsAddressable
@@ -91,6 +91,7 @@ module ActsAsAddressable
     return effective_address(category) if address == effective_address(category)
 
     (self.addresses.build).tap do |existing|
+      existing.addressable  = self
       existing.category     = category.to_s
       existing.full_name    = address.full_name
       existing.address1     = address.address1
@@ -117,6 +118,7 @@ module ActsAsAddressable
     return effective_address(category) if address == effective_address(category)
 
     (effective_address(category) || self.addresses.build).tap do |existing|
+      existing.addressable  = self
       existing.category     = category.to_s
       existing.full_name    = address.full_name
       existing.address1     = address.address1

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

@@ -41,7 +41,7 @@
 
   .row
     .col-md-4
-      = fa.select :country_code, effective_address_countries_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

@@ -29,7 +29,7 @@
           :as => (defined?(EffectiveFormInputs) ? :effective_select : :select),
           :label => 'Country',
           :prompt => 'Country...',
-          :collection => region_options_for_select(EffectiveAddresses.country_codes == :all ? Carmen::Country.all : Carmen::Country.all.select{ |c| EffectiveAddresses.country_codes.include?(c.code) rescue true}, fa.object.country_code, :priority => EffectiveAddresses.country_codes_priority),
+          :collection => options_for_select(effective_address_regions_collection()),
           :input_html => { 'data-effective-address-country' => uuid },
           :input_js => { placeholder: 'Please choose' }
 
@@ -38,7 +38,7 @@
           = fa.input :state_code,
             :as => (defined?(EffectiveFormInputs) ? :effective_select : :select),
             :label => 'Province / State',
-            :collection => region_options_for_select(Carmen::Country.coded(fa.object.country_code).subregions, fa.object.state_code),
+            :collection => options_for_select(effective_address_regions_collection(Carmen::Country.coded(fa.object.country_code).subregions)),
             :prompt => 'please select a country',
             :input_html => { 'data-effective-address-state' => uuid },
             :input_js => { :placeholder => 'Please choose' }

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

@@ -41,7 +41,7 @@
         = fa.input :country_code,
           as: (defined?(EffectiveFormInputs) ? :effective_select : :select),
           required: required,
-          collection: effective_address_countries_collection(),
+          collection: effective_address_regions_collection(),
           input_html: {'data-effective-address-country' => uuid},
           disabled: shipping_address_same_as_billing,
           wrapper_html: { style: ('display: none;' if shipping_address_same_as_billing) }

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

@@ -1 +1 @@
-= region_options_for_select(@subregions)
+= options_for_select(effective_address_regions_collection(@subregions))

data/lib/effective_addresses.rb

@@ -1,5 +1,4 @@
 require 'carmen'
-require 'carmen-rails'
 require 'effective_addresses/engine'
 require 'effective_addresses/version'
 

data/lib/effective_addresses/engine.rb

@@ -2,13 +2,13 @@ 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|
       ActiveSupport.on_load :active_record do
-        ActiveRecord::Base.extend(ActsAsAddressable::ActiveRecord)
+        ActiveRecord::Base.extend(ActsAsAddressable::Base)
       end
     end
 
@@ -19,4 +19,3 @@ module EffectiveAddresses
 
   end
 end
-

data/lib/effective_addresses/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAddresses
-  VERSION = '1.8.5'.freeze
+  VERSION = '1.9.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_addresses
 version: !ruby/object:Gem::Version
-  version: 1.8.5
+  version: 1.9.3
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-05 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: carmen-rails
+  name: carmen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -69,8 +69,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 +82,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,9 +103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-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.