direct_address 0.0.8 → 0.0.9

data/README.rdoc

@@ -64,7 +64,7 @@ Either way produces the same exact thing. Take note that this does require loadi
  
  ...
  <% form... %>
-  <%= f.country_select %>
+  <%= f.country_select(:include_labels => true) %> // include_labels adds a country and region label before each selector respectively
  <% end %>
  ...
  

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/direct_address.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{direct_address}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Nelson"]
-  s.date = %q{2010-03-01}
+  s.date = %q{2010-03-03}
   s.description = %q{Direct Address provides a rails app with simple address features. This is a streamlined implementation of address functionality. Direct Address provides you with address, country, and region classes. It also provides a generator which generates the necessary javascript and rake tasks to implement properly. You'll also get form helpers to easily implement Direct Address in your views. A rake task is provided that allows up to date country and region information to be downloaded from geoname.org.}
   s.email = %q{mdnelson30@gmail.com}
   s.extra_rdoc_files = [

data/lib/direct_address/form_builder.rb

@@ -9,10 +9,13 @@ module ActionView
 			end
 		
 			module InstanceMethods
-				def country_select
+				def country_select(options = {})
 					@countries ||= Country.all
 					sanitized_object_id = self.object_name.split('[').collect{|s| (s = s.gsub(']','')) && s.size > 0 && s || nil}.compact.join('_')
-					html = self.select(:country_id, ([['Select a Country', nil]] + @countries.collect{|country| [country.name, country.id]}))
+					html = ''
+					html << self.label(:country) if options[:include_labels]
+					html << self.select(:country_id, ([['Select a Country', nil]] + @countries.collect{|country| [country.name, country.id]}))
+					html << self.label(:region) if options[:include_labels]
 					html << self.select(:region_id, ([['Select a Region', nil]] + (self.object && self.object.country && self.object.country.regions.collect{|region| [region.name, region.id]} || [])))
 					html << "<script type=\"text/javascript\">if(typeof(Prototype) != 'undefined'){Element.observe(window, 'load', function(){if(typeof(CountrySelect) == 'undefined'){try{console.log('country_select.js not loaded.');} catch (e) {};return;};new CountrySelect({country_select_id : '#{sanitized_object_id}_country_id', region_select_id : '#{sanitized_object_id}_region_id'})});}else{document.getElementById('#{sanitized_object_id}_country_id').style.display = 'none';document.getElementById('#{sanitized_object_id}_region_id').style.display = 'none';}</script>"
 					html

data/lib/direct_address/form_helper.rb

@@ -10,14 +10,17 @@ module ActionView
 			end
 			
 			module InstanceMethods
-				def country_select_tag(object_string, country_id = nil, region_id = nil)
+				def country_select_tag(object_string, country_id = nil, region_id = nil, options = {})
 					object_string = object_string.to_s
 					object_id = object_string.split('[').collect{|s| (s = s.gsub(']','')) && s.size > 0 && s || nil}.compact.join('_')
 					@countries ||= Country.all
 					@regions = !country_id.nil? && Region.by_country(country_id) || [] 
 					country_options = options_for_select([['Select a Country', nil]] + @countries.collect{|country| [country.name, country.id]}, country_id)
 					region_options = options_for_select([['Select a Region', nil]] + @regions.collect{|region| [region.name, region.id]}, region_id)
-					html = select_tag("#{object_string}[country_id]", country_options, :id => "#{object_id}_country_id")
+					html = ''
+					html << label_tag("#{object_string}[country_id]", 'Country') if options[:include_labels]
+					html << select_tag("#{object_string}[country_id]", country_options, :id => "#{object_id}_country_id")
+					html << label_tag("#{object_string}[region_id]", 'Region') if options[:include_labels]
 					html << select_tag("#{object_string}[region_id]", region_options, :id => "#{object_id}_region_id")
 					html << "<script type=\"text/javascript\">if(typeof(Prototype) != 'undefined'){Element.observe(window, 'load', function(){if(typeof(CountrySelect) == 'undefined'){try{console.log('country_select.js not loaded.');} catch (e) {};return;};new CountrySelect({country_select_id : '#{object_id}_country_id', region_select_id : '#{object_id}_region_id'});});}else{document.getElementById('#{object_id}_country_id').style.display = 'none';document.getElementById('#{object_id}_region_id').style.display = 'none';}</script>"
 					html

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: direct_address
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Mike Nelson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 -05:00
+date: 2010-03-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency