effective_addresses 1.7.3 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3376de3376b723d9fbe00ce43d7b6b99360afee9
-  data.tar.gz: e8cfb0a633cfd35f16090be9c95130b7d7a95440
+  metadata.gz: 1e242bd222bdf45a2b873aea1cb4a99966fbd3d7
+  data.tar.gz: 510cde83910aee2c94fda85928003375da8bf9e5
 SHA512:
-  metadata.gz: b35f500058ff20a3e79f5b0b79d685e86be98d1cb326283c46c87d04943d2330bef950b0c8b33a5ca962dabb36887a8ef60a66d948573e27bbfdedd62c3b8ebd
-  data.tar.gz: 3ec0d596f357b3bc4f9d6aee60123740833f23a988fadfcd8ecd304aad9919dd766b71dda29c2b7526d37d48661a769d3c39bffc459768dbf96b1c7a8c4575d7
+  metadata.gz: a2ddc40defbc7a58d324f33e83329e3ee6b133eebf2542e44d605c973a38f11f861156362dc93ebd4e33fce0a061f2a41322038301260dcc0dfc2d3f112ef438
+  data.tar.gz: 4ce4c776b7ab5a11c985005151ff0522dee5440938675cefd7b415c0d30c8909725aca9d828954091b038f85297ff8b89e49e1321e72ce5e4e4c80763642cf5d

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2014 Code and Effect Inc.
+Copyright 2017 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/controllers/effective/addresses_controller.rb

@@ -6,9 +6,9 @@ module Effective
       @subregions = Carmen::Country.coded(params[:country_code]).try(:subregions)
 
       if @subregions.present?
-        render :partial => 'effective/addresses/subregions'
+        render partial: 'effective/addresses/subregions'
       else
-        render :body => "<option value=''>None Available</option>"
+        render body: "<option value=''>None Available</option>"
       end
     end
   end

data/app/models/concerns/acts_as_addressable.rb

@@ -11,7 +11,7 @@ module ActsAsAddressable
   end
 
   included do
-    has_many :addresses, as: :addressable, class_name: 'Effective::Address', dependent: :delete_all, autosave: true
+    has_many :addresses, -> { order(:updated_at) }, as: :addressable, class_name: 'Effective::Address', dependent: :delete_all, autosave: true
 
     # Normalize categories
     categories = @acts_as_addressable_opts.try(:flatten) || []
@@ -58,13 +58,6 @@ module ActsAsAddressable
 
     if ((categories.try(:keys) rescue nil) || categories).include?('billing') && ((categories.try(:keys) rescue nil) || categories).include?('shipping')
       self.send(:define_method, :shipping_address_same_as_billing?) { billing_address == shipping_address }
-
-      before_validation do
-        if @_effective_addresses_shipping_address_same_as_billing
-          self.shipping_address = self.billing_address
-        end
-      end
-
     end
 
   end
@@ -81,58 +74,54 @@ module ActsAsAddressable
     effective_addresses(category).last
   end
 
-  def set_effective_address(category, atts)
-    unless (atts.kind_of?(Effective::Address) || atts.kind_of?(Hash) || atts == nil)
-      raise ArgumentError.new("Effective::Address #{category}_address= expecting an Effective::Address or Hash of attributes")
-    end
+  def set_effective_address(category, obj)
+    raise "#{category}_address= expected an Effective::Address or Hash" unless obj.kind_of?(Effective::Address) || obj.kind_of?(Hash)
 
-    atts = HashWithIndifferentAccess.new(atts.kind_of?(Effective::Address) ? atts.attributes : atts)
-
-    return if atts[:address1].blank?
-
-    add = Effective::Address.new(
-      :category     => category.to_s,
-      :full_name    => atts[:full_name],
-      :address1     => atts[:address1],
-      :address2     => atts[:address2],
-      :city         => atts[:city],
-      :state_code   => atts[:state_code],
-      :country_code => atts[:country_code],
-      :postal_code  => atts[:postal_code],
-      :shipping_address_same_as_billing => atts[:shipping_address_same_as_billing]
-    )
-
-    if category == 'shipping' && add.shipping_address_same_as_billing?
-      @_effective_addresses_shipping_address_same_as_billing = true
-      return
+    address = (obj.kind_of?(Effective::Address) ? obj : Effective::Address.new(obj))
+
+    if category == 'shipping' && address.shipping_address_same_as_billing? && respond_to?(:billing_address)
+      address = effective_address('billing')
     end
 
-    self.addresses.build(add.attributes) unless (add == effective_address(category))
-  end
+    # Prevents duplicates from being created
+    return effective_address(category) if address == effective_address(category)
 
-  def set_singular_effective_address(category, atts)
-    raise ArgumentError.new("Effective::Address #{category}_address= expecting an Effective::Address or Hash of attributes") unless (atts.kind_of?(Effective::Address) || atts.kind_of?(Hash) || atts == nil)
+    (self.addresses.build).tap do |existing|
+      existing.category     = category.to_s
+      existing.full_name    = address.full_name
+      existing.address1     = address.address1
+      existing.address2     = address.address2
+      existing.city         = address.city
+      existing.state_code   = address.state_code
+      existing.country_code = address.country_code
+      existing.postal_code  = address.postal_code
+      existing.shipping_address_same_as_billing = address.shipping_address_same_as_billing?
+    end
+  end
 
-    atts = HashWithIndifferentAccess.new(atts.kind_of?(Effective::Address) ? atts.attributes : atts)
+  def set_singular_effective_address(category, obj)
+    raise "#{category}_address= expected an Effective::Address or Hash" unless obj.kind_of?(Effective::Address) || obj.kind_of?(Hash)
 
-    return if atts[:address1].blank?
+    address = (obj.kind_of?(Effective::Address) ? obj : Effective::Address.new(obj))
 
-    add = (effective_address(category) || self.addresses.build()).tap do |existing|
-      existing.category     = category.to_s
-      existing.full_name    = atts[:full_name]
-      existing.address1     = atts[:address1]
-      existing.address2     = atts[:address2]
-      existing.city         = atts[:city]
-      existing.state_code   = atts[:state_code]
-      existing.country_code = atts[:country_code]
-      existing.postal_code  = atts[:postal_code]
-      existing.shipping_address_same_as_billing = atts[:shipping_address_same_as_billing]
+    if category == 'shipping' && address.shipping_address_same_as_billing? && respond_to?(:billing_address)
+      address = effective_address('billing')
     end
 
-    if category == 'shipping' && add.shipping_address_same_as_billing?
-      @_effective_addresses_shipping_address_same_as_billing = true
-    end
+    # This wouldn't create duplicates anyway
+    return effective_address(category) if address == effective_address(category)
 
+    (effective_address(category) || self.addresses.build).tap do |existing|
+      existing.category     = category.to_s
+      existing.full_name    = address.full_name
+      existing.address1     = address.address1
+      existing.address2     = address.address2
+      existing.city         = address.city
+      existing.state_code   = address.state_code
+      existing.country_code = address.country_code
+      existing.postal_code  = address.postal_code
+      existing.shipping_address_same_as_billing = address.shipping_address_same_as_billing?
+    end
   end
 
 end

data/app/models/effective/address.rb

@@ -21,8 +21,7 @@ module Effective
       :allow_blank => true,  # We're already checking for presence above
       :message => 'is an invalid United States zip code'
 
-    default_scope -> { order(:updated_at) }
-
+    scope :sorted, -> { order(:updated_at) }
     scope :billing, -> { where(:category => 'billing') }
     scope :shipping, -> { where(:category => 'shipping') }
 
@@ -124,9 +123,9 @@ module Effective
 
     def shipping_address_same_as_billing?
       if defined?(::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES)  # Rails 5
-        ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(self.shipping_address_same_as_billing)
+        ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(shipping_address_same_as_billing)
       else
-        ActiveRecord::Type::Boolean.new.cast(self.shipping_address_same_as_billing)
+        ActiveRecord::Type::Boolean.new.cast(shipping_address_same_as_billing)
       end
     end
   end

data/config/effective_addresses.rb

@@ -33,7 +33,7 @@ EffectiveAddresses.setup do |config|
   config.simple_form_options = {}
 
   # config.simple_form_options = {
-  #   :html => {:class => 'form-horizontal'},
+  #   :html => {:class => ['form-horizontal']},
   #   :wrapper => :horizontal_form,
   #   :wrapper_mappings => {
   #     :boolean => :horizontal_boolean,

data/lib/effective_addresses/engine.rb

@@ -20,7 +20,7 @@ module EffectiveAddresses
     end
 
     # Set up our default configuration options.
-    initializer "effective_addresses.defaults", :before => :load_config_initializers do |app|
+    initializer 'effective_addresses.defaults', before: :load_config_initializers do |app|
       eval File.read("#{config.root}/config/effective_addresses.rb")
     end
 

data/lib/effective_addresses/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAddresses
-  VERSION = '1.7.3'.freeze
+  VERSION = '1.7.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_addresses
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2017-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -62,7 +62,6 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
-- Rakefile
 - app/assets/javascripts/effective_addresses.js
 - app/assets/javascripts/effective_addresses/address_fields.js.coffee
 - app/assets/javascripts/effective_addresses/shipping_address_same_as_billing.js.coffee
@@ -84,7 +83,6 @@ files:
 - lib/effective_addresses/engine.rb
 - lib/effective_addresses/version.rb
 - lib/generators/effective_addresses/install_generator.rb
-- lib/tasks/effective_addresses_tasks.rake
 - spec/controllers/addresses_controller_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile

data/Rakefile

@@ -1,23 +0,0 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-# Our tasks
-load 'lib/tasks/effective_addresses_tasks.rake'
-
-# Testing tasks
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-
-Bundler::GemHelper.install_tasks
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-desc "Run all specs in spec directory (excluding plugin specs)"
-RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
-
-task :default => :spec

data/lib/tasks/effective_addresses_tasks.rake

@@ -1,4 +0,0 @@
-#desc "Explaining what the task does"
-# task :effective_address_task do
-#   puts "okay"
-# end