effective_addresses 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66a2d81b649e9100efaa6c5f170a0fdddb133df5
-  data.tar.gz: fb01322e03627d40a8a0b7561ec5f782dbffb1ec
+  metadata.gz: 5d46ad50e796ff7c0c17cdd23a1fe6d29b3bf1a3
+  data.tar.gz: 0485776d5ae75eb3ec9ecca74d2c739c0652de82
 SHA512:
-  metadata.gz: eb91fd23e15863be1f442581bd9f6b4aac6d7b26d9893fb43f3f635ac37ef43b9305a6dc7bdf9c7f7a69a4296ac338e5a0064c8e27fb50add9302c1f7b4f5d37
-  data.tar.gz: c5c27f859d2e41cde1c659dfbdef21e7160c32482c881251d33d8015661361bd98b1660b569517ddfd6d504cd7d1e3a05dcd95201553916292ba249d29a42d38
+  metadata.gz: 2d0f8119f35746bb95ab5774b5a3c6f4fe42e098c5491b6cb50f47d15a104daf0c1eda92914652e5e8c198be72cab523b8289d91e381aa0a0f5eeafd3ad21e66
+  data.tar.gz: 4f63eaa8c584c15592849e33a32a0457ed976b89d575e28ccd49a2c5a91ce13c41c7f3c78c991b42fc9d2843b06b9d27d778d08248801cb2d10fc4c4db29b634

data/app/helpers/effective_addresses_helper.rb

@@ -5,8 +5,9 @@ module EffectiveAddressesHelper
     method = (method.to_s.include?('_address') ? method.to_s : "#{method}_address")
 
     required = (form.object._validators[method.to_sym].any? { |v| v.kind_of?(ActiveRecord::Validations::PresenceValidator) && (v.options[:if].blank? || (v.options[:if].respond_to?(:call) ? f.object.instance_exec(&v.options[:if]) : v.options[:if])) } rescue true)
+    use_full_name = form.object._validators[method.to_sym].any? { |v| v.kind_of?(EffectiveAddressFullNamePresenceValidator) }
 
-    opts = {:f => form, :method => method, :required => required}.merge(options)
+    opts = {:f => form, :method => method, :required => required, :use_full_name => use_full_name}.merge(options)
 
     if form.class.name == 'SimpleForm::FormBuilder'
       render :partial => 'effective/addresses/address_fields_simple_form', :locals => opts

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

@@ -5,7 +5,7 @@
   - if ((f.object.errors.include?(method) && !f.object.errors.include?(:addresses)) rescue false)
     - fa.object.errors.add(:address1, f.object.errors[method].first)
 
-  - if f.object._validators[method].any? { |v| v.kind_of?(EffectiveAddressFullNamePresenceValidator) }
+  - if use_full_name || fa.object.errors.include?(:full_name)
     = fa.input :full_name, :required => true, :label => 'Full name', :prompt => 'Full name'
 
   = fa.input :address1, :placeholder => 'Address', :label => "Address 1"

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

@@ -5,8 +5,8 @@
   - if ((f.object.errors.include?(method) && !f.object.errors.include?(:addresses)) rescue false)
     - fa.object.errors.add(:address1, f.object.errors[method].first)
 
-  - if f.object._validators[method].any? { |v| v.kind_of?(EffectiveAddressFullNamePresenceValidator) }
-    = fa.input :full_name, :required => true, :label => 'Full name', :prompt => 'Full name'
+  - if use_full_name || fa.object.errors.include?(:full_name)
+    = fa.input :full_name, :required => required, :label => 'Full name', :prompt => 'Full name'
 
   = fa.input :address1, :placeholder => 'Address', :label => 'Address 1', :required => required
   = fa.input :address2, :label => 'Address 2'

data/lib/effective_addresses/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAddresses
-  VERSION = '1.0.5'.freeze
+  VERSION = '1.0.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_addresses
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails