effective_addresses 1.9.3 → 1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e41141e340c412a2e083dfb79792a86f102484fe61734eebf85963ba17c287c8
-  data.tar.gz: f0f60629f50f7f20e3e8ba6976e6ba9554b18ed6bb38870a4653ab1ad33b9c17
+  metadata.gz: 903de54494687e66176870441f7dbf08122086a9d1de3dae3a38da0cbd2cca99
+  data.tar.gz: 8535f034cd7392a7f9ee711386248618f2b8d647784e30dfc4fc726220ec55c5
 SHA512:
-  metadata.gz: 934bf8000a28eb370e5f444d6f70610ea7b63f5c0d71c0e1da9f1ed0d83265b697b424489b732d2469e3a23edde57c603d11b2daf2aec9a4688635239e45ee4d
-  data.tar.gz: 170e98c482c1d99e3907864773762f487f0b61b0e5fc8399ffcac6c11f4d03655b547450d0c7a8ae856b97a7b13469bbe83f7a602ad8304b9ae32397f9f82179
+  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

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/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

data/lib/effective_addresses/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAddresses
-  VERSION = '1.9.3'.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.9.3
+  version: 1.9.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-03 00:00:00.000000000 Z
+date: 2021-02-18 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