effective_addresses 1.8.4 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ff3f966afab7e2c3b8199c448af7fea1ceee0411
-  data.tar.gz: ff0c0b5f1b79f540088db80a4199204873ff6e1c
+SHA256:
+  metadata.gz: f68f7e9190672bf40b176596387019c6e4ff3ce76f299950469dba367eca0d77
+  data.tar.gz: 180012dead028e83f163659605bc5f55dc9c345f3fccce1e201cf140f83c21a4
 SHA512:
-  metadata.gz: aafa438364c21b562ab22fbfd5456f5ea760aeec032d243daa5f14571e9cb6cb1e77c62b249425b6a7554a4230648f2ff78cf4975328c0f6bbeb1eb78225e011
-  data.tar.gz: 12fc4c7ad7132879f28e982aa7e4a658879c5e670f2d1eac59db063997e09db6a7d17a2a4389b0dc320f33751385085261487bbc3ead260c4cdfd84b3bd90bcb
+  metadata.gz: b879876863da03b54413dd98e9bce145e77e166b99822d8315c1f2d9620c150fb9999a1303aaeeb75e256c28aae9bc64c47391a1713deca10d53b6d462d78196
+  data.tar.gz: d6855b8a7b2b6171c1a88d973abd73347152ab5ce90884ded6409136f767aaf07b087126045bbc4a743f1605e2a9fe9cf1597d567f60d6e5227d4aa18de7c63e

data/app/helpers/effective_addresses_helper.rb

@@ -37,7 +37,7 @@ module EffectiveAddressesHelper
     end
   end
 
-  def region_options_for_simple_form_select(regions = nil)
+  def effective_address_regions_collection(regions = nil)
     if regions.present?
       countries = regions
     elsif EffectiveAddresses.country_codes == :all
@@ -46,20 +46,22 @@ module EffectiveAddressesHelper
       countries = Carmen::Country.all.select { |c| (EffectiveAddresses.country_codes || []).include?(c.code) }
     end
 
-    collection = countries.map { |c| [c.name, c.code] }.sort! { |a, b| a.first <=> b.first }
-
     if regions.blank? && EffectiveAddresses.country_codes_priority.present?
-      collection.insert(0, ['---------------------', '', :disabled])
+      countries = countries.reject { |c| EffectiveAddresses.country_codes_priority.include?(c.code) }
+    end
+
+    countries = countries.map { |c| [c.name, c.code] }.sort! { |a, b| a.first <=> b.first }
 
-      EffectiveAddresses.country_codes_priority.reverse.each do |code|
-        if (country = Carmen::Country.coded(code))
-          collection.insert(0, [country.name, country.code])
-        end
-      end
+    if regions.blank? && EffectiveAddresses.country_codes_priority.present?
+      countries.unshift(*
+        EffectiveAddresses.country_codes_priority.map do |code|
+          country = Carmen::Country.coded(code)
+          [country.name, country.code]
+        end + [['-------------------', '-', disabled: :disabled]]
+      )
     end
 
-    collection
+    countries
   end
-
 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
@@ -56,10 +56,14 @@ module ActsAsAddressable
       end
     end
 
-    if ((categories.try(:keys) rescue nil) || categories).include?('billing') && ((categories.try(:keys) rescue nil) || categories).include?('shipping')
+    # [:billing_address, :shipping_address]
+    address_names = (categories.respond_to?(:keys) ? categories.keys : categories).map { |category| (category.to_s + '_address').to_sym }
+
+    if address_names.include?(:billing_address) && address_names.include?(:shipping_address)
       self.send(:define_method, :shipping_address_same_as_billing?) { billing_address == shipping_address }
     end
 
+    self.send(:define_method, :effective_address_names) { address_names }
   end
 
   module ClassMethods
@@ -87,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
@@ -113,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/models/effective/address.rb

@@ -8,6 +8,29 @@ module Effective
 
     belongs_to :addressable, polymorphic: true, touch: true
 
+    if defined?(EffectiveResources)
+      effective_resource do
+        category          :string
+
+        full_name         :string
+        address1          :string
+        address2          :string
+
+        if EffectiveAddresses.use_address3
+          address3          :string
+        end
+
+        city              :string
+        state_code        :string
+        country_code      :string
+        postal_code       :string
+
+        shipping_address_same_as_billing permitted: true
+
+        timestamps
+      end
+    end
+
     validates :category, :address1, :city, :country_code, :postal_code, presence: true, if: Proc.new { |address| address.present? }
     validates :state_code, presence: true, if: Proc.new { |address| address.present? && (address.country_code.blank? || Carmen::Country.coded(address.country_code).try(:subregions).present?) }
 
@@ -126,7 +149,7 @@ module Effective
       if defined?(::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES)  # Rails 5
         ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(shipping_address_same_as_billing)
       else
-        ActiveRecord::Type::Boolean.new.cast(shipping_address_same_as_billing)
+        ::ActiveRecord::Type::Boolean.new.cast(shipping_address_same_as_billing)
       end
     end
   end

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)
+  - if fa.object.respond_to?(:address3) && EffectiveAddresses.use_address3
     = fa.text_field :address3,
       label: false,
       required: false,
@@ -41,7 +41,7 @@
 
   .row
     .col-md-4
-      = fa.select :country_code, region_options_for_simple_form_select(),
+      = fa.select :country_code, effective_address_regions_collection(),
         label: 'Country',
         required: required,
         disabled: same_as_billing,
@@ -50,7 +50,7 @@
 
     .col-md-5
       - if fa.object.try(:country_code).present?
-        = fa.select :state_code, region_options_for_simple_form_select(Carmen::Country.coded(fa.object.country_code).subregions),
+        = fa.select :state_code, effective_address_regions_collection(Carmen::Country.coded(fa.object.country_code).subregions),
           label: 'State / Province',
           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: region_options_for_simple_form_select(),
+          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) }
@@ -51,7 +51,7 @@
           = fa.input :state_code,
             as: (defined?(EffectiveFormInputs) ? :effective_select : :select),
             required: required,
-            collection: region_options_for_simple_form_select(Carmen::Country.coded(fa.object.country_code).subregions),
+            collection: effective_address_regions_collection(Carmen::Country.coded(fa.object.country_code).subregions),
             prompt: 'Please choose',
             input_html: {'data-effective-address-state' => uuid},
             input_js: { placeholder: 'Please choose' },

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

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

data/config/effective_addresses.rb

@@ -6,12 +6,15 @@ EffectiveAddresses.setup do |config|
   # (can be overridden on a per address basis)
   config.use_full_name = true
 
+  # A 3rd address field
+  config.use_address3 = false
+
   # Country codes to display in country_select dropdowns.
   config.country_codes = :all
   #config.country_codes = ['US', 'CA'] # Or you can be more selective...
 
   # Select these countries ontop of the others
-  config.country_codes_priority = ['US', 'CA'] # nil for no priority countries
+  # config.country_codes_priority = ['US', 'CA']
 
   # Force this country to be preselected on any new address forms.
   # Valid values are: country code, country name, or nil.

data/lib/effective_addresses.rb

@@ -1,5 +1,4 @@
 require 'carmen'
-require 'carmen-rails'
 require 'effective_addresses/engine'
 require 'effective_addresses/version'
 
@@ -10,6 +9,7 @@ module EffectiveAddresses
   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
@@ -20,7 +20,7 @@ module EffectiveAddresses
   end
 
   def self.permitted_params
-    [:address1, :address2, :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.4'.freeze
+  VERSION = '1.9.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_addresses
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.9.2
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2020-08-13 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.5.2.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.