hot_date_rails 1.5.9 → 1.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2ae82e3392393b3cec696aafa523743f88a3975
-  data.tar.gz: 100664aa827b6357d5f9e7da8879c232744039eb
+  metadata.gz: 7dc8f79bd9abf2f5ef9ad296b604f746767ed1ad
+  data.tar.gz: ffc05184af4412204f9b64696f5228ace409e7fe
 SHA512:
-  metadata.gz: 7a93b0bdb6f1b35dca6da9536d4982ed46e000d2d2097fbfd19b524a2689502f376cdaa5e2fe2a913800291888ae5772e7c1ae8814df8a0106d19faec1fce45a
-  data.tar.gz: 27c6188d41baae44c2d1b09980fc80005441f860518276ba8af76ad3f44f41b5d930d338a26b071f5c9a2b4e8e5d93027d946d8584137186df33cc05bc393947
+  metadata.gz: 2469dc3b25ba282402f5f7c09711a55c8899263e80eed56cd08880c1d53dbec0ca8f41fe31fca566f719d96a17ae35cccd96b543ad9c43c47dd725e059f25bd0
+  data.tar.gz: c6e2c1cd9a23305ded81c67088ce53a5748b6825543e2cc0c2c6d76a94689e2e6ab538da2b9fc6bdd2b9b1650ac94f5e28fb33d257b5d5ec20e3cd67551d7ae6

data/app/helpers/form_helper.rb

@@ -7,12 +7,12 @@ module FormHelper
 	  end
 
 	  private
-	  def draw_ext_input_tag(field_name, value, cls, locale_format=nil, opts={})
-	  	formatted_value = I18n.l(value.to_date) if value.present?
-	  	input_attrs = InputAttrs.new(field_name, cls, opts)
-	  	text_field_tag("#{field_name}", formatted_value, input_attrs.to_h) + \
-	    hidden_field_tag(field_name, nil, { :class => field_name.to_s + "-alt", :id => "#{field_name}_hdn", value: value })
-	  end
+		def draw_ext_input_tag(field_name, value, cls, locale_format=nil, opts={})
+			formatted_value = I18n.l(value.to_date) if value.present?
+			input_attrs = InputAttrs.new(field_name, cls, opts)
+			text_field_tag("#{field_name}", formatted_value, input_attrs.to_h.reverse_merge({ id: FormHelper.random_input_id(field_name) })) + \
+			hidden_field_tag(field_name, nil, { class: field_name.to_s + "-alt", id: FormHelper.random_input_id(field_name, "hidden"), value: value })
+		end
 	end
 
 	class ActionView::Helpers::FormBuilder
@@ -49,7 +49,7 @@ module FormHelper
 	  	formatted_value = I18n.localize(value, format: locale_format) if value.present?
 	  	input_attrs = InputAttrs.new(attr, cls, opts)
 	  	self.text_field("#{attr}", input_attrs.to_h.merge(value: (formatted_value || ""))) + \
-	    self.hidden_field(attr, { :class => attr.to_s + "-alt", :id => "#{attr}_hdn" }) #hidden_field handles setting the value from the attribute
+	    self.hidden_field(attr, { :class => attr.to_s + "-alt", id: FormHelper.input_id(object, attr) })
 	  end
 
 	  def column_type(attr)
@@ -64,11 +64,10 @@ module FormHelper
 	class InputAttrs < Hash
 		def initialize(attr, hd_cls, opts={})
 			opts.reverse_merge!(html: {})
-			#Set html attribute hash here so :class and :id always get overridden in next lines
+			#Set html attribute hash here so :class always gets overridden in next line
 		  self.merge! opts[:html] 
 		  self[:class] = (self.fetch(:class, "").split(" ") << hd_cls).join(" ")
-	  	self[:id] = attr
-			opts[:hd_opts] ||= {}
+	  	opts[:hd_opts] ||= {}
 	  	opts[:data] ||= {}
 	  	data = opts[:hd_opts].merge(opts[:data])
 			hd_config = HotDateRails.config
@@ -83,4 +82,15 @@ module FormHelper
 	  	self[:data] = data
 		end
 	end
+
+	private
+	def self.input_id(parent_obj, suffix=nil)
+		#Uses the parent object for the id because each scope can only have a single input for each attribute
+		"hdr-hidden-#{parent_obj.class.to_s.downcase}-#{parent_obj.object_id}-#{suffix}"
+	end
+
+	def self.random_input_id(suffix=nil, type="text")
+		random_id = SecureRandom.urlsafe_base64
+		"hdr-#{type}-tag-#{random_id}-#{suffix}"
+	end
 end

data/lib/hot_date_rails/version.rb

@@ -1,3 +1,3 @@
 module HotDateRails
-  VERSION = "1.5.9"
+  VERSION = "1.5.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot_date_rails
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.5.10
 platform: ruby
 authors:
 - John O'Malley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails