effective_addresses 1.8.6 → 1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16c334b39d46959ee4075c80627675a6a65ef8cc7810bfbcd887fc3a6746803a
-  data.tar.gz: 1dc9024d1f07d0b6d9b0ab998d9433cc5332c554026c47a5bc70c858f4532f4b
+  metadata.gz: 903de54494687e66176870441f7dbf08122086a9d1de3dae3a38da0cbd2cca99
+  data.tar.gz: 8535f034cd7392a7f9ee711386248618f2b8d647784e30dfc4fc726220ec55c5
 SHA512:
-  metadata.gz: 90da29758f3cde3766a4d0000b04e586ba4796e647cfabe3cfd6429dadf21ff87fd05a4a8cc907da22951865dd7e3c45651cbae7661d5ea3677ef5fd849b0ae0
-  data.tar.gz: 7b36d586e4e89ac1af6a485a4389e347b4f6df9e72a2131541f866d39bb7af24f5343b33f67b6de5cde899b35282fedfa1e738b2a20dbfb5ce1dd4abdaa66b16
+  metadata.gz: 0601a1e879b7cdce8604dd836bd4d80bbca09c1606ff68523ef591b07925ad9b5aba9c679a060a82b7cc5b3e16fa8f2bd0a9a4301ca4e1ab399d9c610ee81b94
+  data.tar.gz: 0fc12952f62102c4f792a4c25f380daec74a862a5a6a1fab39edd1a2546d11aa44442ea41c60318b64d3773e4a1adb965e767f5b18ed6c50c079f0b8e29f0b45

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,10 +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
-  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

data/app/models/effective/address.rb

@@ -8,27 +8,25 @@ 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
 
-        if EffectiveAddresses.use_address3
-          address3          :string
-        end
+      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

@@ -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,27 +1,31 @@
 require 'carmen'
-require 'carmen-rails'
+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

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.6'.freeze
+  VERSION = '1.9.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_addresses
 version: !ruby/object:Gem::Version
-  version: 1.8.6
+  version: 1.9.4
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-31 00:00:00.000000000 Z
+date: 2021-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,7 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: carmen-rails
+  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
     requirements:
     - - ">="
@@ -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.