effective_addresses 1.8.6 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16c334b39d46959ee4075c80627675a6a65ef8cc7810bfbcd887fc3a6746803a
-  data.tar.gz: 1dc9024d1f07d0b6d9b0ab998d9433cc5332c554026c47a5bc70c858f4532f4b
+  metadata.gz: 6e4cebe029705cfa2fc3fac6410655ea554da3bf8fc8357426cc049ea396f2bb
+  data.tar.gz: eef2302fd40877ef498480bc5feed15dd95132b2a1418092fac5570abb53d051
 SHA512:
-  metadata.gz: 90da29758f3cde3766a4d0000b04e586ba4796e647cfabe3cfd6429dadf21ff87fd05a4a8cc907da22951865dd7e3c45651cbae7661d5ea3677ef5fd849b0ae0
-  data.tar.gz: 7b36d586e4e89ac1af6a485a4389e347b4f6df9e72a2131541f866d39bb7af24f5343b33f67b6de5cde899b35282fedfa1e738b2a20dbfb5ce1dd4abdaa66b16
+  metadata.gz: cf9a8e89489de644ef11dab8bc03d71b5e823d2ccaff796acd748e73addd8c27ff9cc77f60e9be107f3d88b45dff324e3a774b53939f3f401503747eb88829c6
+  data.tar.gz: 759f04f06a56c966462a76810a2bd61c9e704326ee076beba956ff7b5ff3188c8044b5d4a362c23f5a17ab0230623184485992d39c1e32b900e627fd937d84b0

data/app/helpers/effective_addresses_helper.rb

@@ -63,8 +63,5 @@ module EffectiveAddressesHelper
 
     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/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(),
         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/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAddresses
-  VERSION = '1.8.6'.freeze
+  VERSION = '1.9.0'.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.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-31 00:00:00.000000000 Z
+date: 2020-03-16 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:
     - - ">="