calendar_date_select 1.14 → 1.15

data/History.txt

@@ -1,3 +1,6 @@
+== Version 1.15
+ * Bugfix: don't include the :image option in the input field
+
 == Version 1.14
  * Added support for Rails 2.3
 

data/Rakefile

@@ -8,11 +8,11 @@ require "activesupport"
 require './lib/calendar_date_select.rb'
 
 Hoe.new('calendar_date_select', CalendarDateSelect::VERSION) do |p|
-  p.rubyforge_name = 'calendar_date_select'
+  p.rubyforge_name = 'cds'
   p.developer('Tim Harper', 'tim c harper at gmail dot com')
 end
 
-
+desc "Set the current gem version in the code (VERSION=version)"
 task :set_version do
   ["lib/calendar_date_select/calendar_date_select.rb", "public/javascripts/calendar_date_select/calendar_date_select.js"].each do |file|
     abs_file = File.dirname(__FILE__) + "/" + file

data/lib/calendar_date_select/calendar_date_select.rb

@@ -1,5 +1,5 @@
 module CalendarDateSelect
-  VERSION = '1.14'
+  VERSION = '1.15'
   FORMATS = {
     :natural => {
       :date => "%B %d, %Y",

data/lib/calendar_date_select/form_helpers.rb

@@ -96,7 +96,7 @@ module CalendarDateSelect::FormHelpers
   # 
   #   <%= calendar_date_select_tag "event_demo", "", :after_navigate => "alert('The current selected month is ' + this.calendar_date_select.selected_date.getMonth());" ,
   def calendar_date_select_tag( name, value = nil, options = {})
-    options, javascript_options = calendar_date_select_process_options(options)
+    image, options, javascript_options = calendar_date_select_process_options(options)
     value = CalendarDateSelect.format_time(value, javascript_options)
 
     javascript_options.delete(:format)
@@ -106,7 +106,7 @@ module CalendarDateSelect::FormHelpers
       hidden_field_tag(name, value, options) :
       text_field_tag(name, value, options)
 
-    calendar_date_select_output(tag, options, javascript_options)
+    calendar_date_select_output(tag, image, options, javascript_options)
   end
 
   # Similar to the difference between +text_field_tag+ and +text_field+, this method behaves like +text_field+
@@ -126,7 +126,7 @@ module CalendarDateSelect::FormHelpers
       use_time = false if Date===(obj.respond_to?(method) && obj.send(method))
     end
 
-    options, javascript_options = calendar_date_select_process_options(options)
+    image, options, javascript_options = calendar_date_select_process_options(options)
 
     options[:value] ||=
       if(obj.respond_to?(method) && obj.send(method).respond_to?(:strftime))
@@ -142,6 +142,7 @@ module CalendarDateSelect::FormHelpers
     tag = ActionView::Helpers::InstanceTag.new_with_backwards_compatibility(object, method, self, options.delete(:object))
     calendar_date_select_output(
       tag.to_input_field_tag( (javascript_options[:hidden] || javascript_options[:embedded]) ? "hidden" : "text", options),
+      image,
       options,
       javascript_options
     )
@@ -151,6 +152,7 @@ module CalendarDateSelect::FormHelpers
     # extracts any options passed into calendar date select, appropriating them to either the Javascript call or the html tag.
     def calendar_date_select_process_options(options)
       options, javascript_options = CalendarDateSelect.default_options.merge(options), {}
+      image = options.delete(:image)
       callbacks = [:before_show, :before_close, :after_show, :after_close, :after_navigate]
       for key in [:time, :valid_date_check, :embedded, :buttons, :clear_button, :format, :year_range, :month_year, :popup, :hidden, :minute_interval] + callbacks
         javascript_options[key] = options.delete(key) if options.has_key?(key)
@@ -184,10 +186,10 @@ module CalendarDateSelect::FormHelpers
       end
 
       javascript_options[:year_range] = format_year_range(javascript_options[:year_range] || 10)
-      [options, javascript_options]
+      [image, options, javascript_options]
     end
 
-    def calendar_date_select_output(input, options = {}, javascript_options = {})
+    def calendar_date_select_output(input, image, options = {}, javascript_options = {})
       out = input
       if javascript_options[:embedded]
         uniq_id = "cds_placeholder_#{(rand*100000).to_i}"
@@ -196,7 +198,7 @@ module CalendarDateSelect::FormHelpers
         out << javascript_tag("new CalendarDateSelect( $('#{uniq_id}').previous(), #{options_for_javascript(javascript_options)} ); ")
       else
         out << " "
-        out << image_tag(options[:image],
+        out << image_tag(image,
             :onclick => "new CalendarDateSelect( $(this).previous(), #{options_for_javascript(javascript_options)} );",
             :style => 'border:0px; cursor:pointer;',
 			:class=>'calendar_date_select_popup_icon')

data/public/javascripts/calendar_date_select/calendar_date_select.js

@@ -1,4 +1,4 @@
-// CalendarDateSelect version 1.14 - a prototype based date picker
+// CalendarDateSelect version 1.15 - a prototype based date picker
 // Questions, comments, bugs? - see the project page: http://code.google.com/p/calendardateselect
 if (typeof Prototype == 'undefined') alert("CalendarDateSelect Error: Prototype could not be found. Please make sure that your application's layout includes prototype.js (.g. <%= javascript_include_tag :defaults %>) *before* it includes calendar_date_select.js (.g. <%= calendar_date_select_includes %>).");
 if (Prototype.Version < "1.6") alert("Prototype 1.6.0 is required.  If using earlier version of prototype, please use calendar_date_select version 1.8.3");

data/spec/calendar_date_select/form_helpers_spec.rb

@@ -130,6 +130,10 @@ describe CalendarDateSelect::FormHelpers do
   end
 
   describe "calendar_date_select_tag" do
+    before(:each) do
+      @time = Time.parse("January 2, 2007 12:01:23 AM")
+    end
+    
     it "should use the string verbatim when provided" do
       output = calendar_date_select_tag(:name, "Some String")
 
@@ -137,25 +141,26 @@ describe CalendarDateSelect::FormHelpers do
     end
 
     it "should not render the time when time is false (or nil)" do
-      time = Time.parse("January 2, 2007 12:01:23 AM")
-      output = calendar_date_select_tag(:name, time, :time => false)
+      output = calendar_date_select_tag(:name, @time, :time => false)
 
       output.should_not match(/12:01 AM/)
-      output.should include(CalendarDateSelect.format_date(time.to_date))
+      output.should include(CalendarDateSelect.format_date(@time.to_date))
     end
 
     it "should render the time when :time => true" do
-      time = Time.parse("January 2, 2007 12:01:23 AM")
-      output = calendar_date_select_tag(:name, time, :time => true)
+      output = calendar_date_select_tag(:name, @time, :time => true)
 
-      output.should include(CalendarDateSelect.format_date(time))
+      output.should include(CalendarDateSelect.format_date(@time))
     end
 
     it "should render the time when :time => 'mixed'" do
-      time = Time.parse("January 2, 2007 12:01:23 AM")
-      output = calendar_date_select_tag(:name, time, :time => 'mixed')
-
-      output.should include(CalendarDateSelect.format_date(time))
+      output = calendar_date_select_tag(:name, @time, :time => 'mixed')
+      output.should include(CalendarDateSelect.format_date(@time))
+    end
+    
+    it "not include the image option in the result input tag" do
+      output = calendar_date_select_tag(:name, @time, :time => 'mixed')
+      output.should_not include("image=")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: calendar_date_select
 version: !ruby/object:Gem::Version 
-  version: "1.14"
+  version: "1.15"
 platform: ruby
 authors: 
 - Tim Harper
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: calendar_date_select
+rubyforge_project: cds
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2