effective_addresses 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ade1e6d3f8bf4f00965f7a1c3c98971538ed7b7e
-  data.tar.gz: 26251527f1b9a46efe20d0756b7c9eeb6cbc5c8b
+  metadata.gz: 040257bf768402e6145101e420df24f063c5a8c3
+  data.tar.gz: 0ee1ac756cf2119af9408f88517b5e630e361316
 SHA512:
-  metadata.gz: 72e935a846ef87ea09701d19bf05f191929d745a8d76cab0fca80e2e7f8b29ec03eb51e1a545900090ec5dea63aa00909d020b23ec6dea27c02abeb33be31939
-  data.tar.gz: 5a0ce0fdbc852880d554512eab90177ab177926cb077ea69931e5c6f463c49ff4f6bfd56b2440054feac6c3e7020e8bf0be71f8c77ba394c395ff8feb5faff5b
+  metadata.gz: ffcafceb79f86ecd54d39123eee62280af339dffb3103c35b8df8e9573130c5169894bb1e2f417908cbbadaeaaf8c5853d7f24239edcbb76fb8e45f52b5187bd
+  data.tar.gz: 44442cbfb9cee3de8ac731bb212a9a940609c364578f03bee7f5049e184e1d5e272e69fbe1e4e8f55c7063c3b57b17193ba348d04906715c13385a0affc98173

data/app/models/effective/address.rb

@@ -7,9 +7,8 @@ module Effective
 
     belongs_to :addressable, :polymorphic => true, :touch => true
 
-    validates_presence_of :category, :address1, :city, :country_code, :postal_code
-
-    validates_presence_of :state_code, :if => Proc.new { |address| address.country_code.blank? || Carmen::Country.coded(address.country_code).try(:subregions).present? }
+    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?) }
 
     validates_format_of :postal_code, :with => POSTAL_CODE_CA,
       :if => proc { |address| Array(EffectiveAddresses.validate_postal_code_format).include?('CA') && address.country_code == 'CA' },

data/app/models/validators/effective_address_full_name_presence_validator.rb

@@ -1,7 +1,7 @@
 class EffectiveAddressFullNamePresenceValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     if value.present? && !value.empty? && value.full_name.blank?
-      record.errors[attribute] << "is invalid"
+      record.errors[attribute] << 'is invalid'
       value.errors[:full_name] << "can't be blank"
     end
   end

data/lib/effective_addresses/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAddresses
-  VERSION = '1.5.0'.freeze
+  VERSION = '1.5.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_addresses
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails