atd-calendar_date_select 1.11.20090216 → 1.15

data/History.txt

@@ -1,4 +1,10 @@
- == Version 1.13
+== Version 1.15
+ * Bugfix: don't include the :image option in the input field
+
+== Version 1.14
+ * Added support for Rails 2.3
+
+== Version 1.13
  * Lots of code clean up!
  * Moved test suite over to rspec
  * CalendarDateSelect.default_options implemented.  Use CalendarDateSelect.default_options.update(...) to set the default_options for your app.

data/Rakefile

@@ -8,11 +8,16 @@ 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 "Generate gemspec for GitHub deploy"
+task :generate_gemspec do
+  `rake debug_gem > calendar_date_select.gemspec`
+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/js_test/functional/cds_test.html

@@ -127,6 +127,21 @@
       assert($('global').onchange_called, "onchange wasnt called");
       $("global").remove();
     }},
+    test_onchangeCallbackChangedOnclear: function() { with(this){
+      $("cds_test").up().build("div", {id: "global"});
+      cds = new CalendarDateSelect($("cds_test"), {time: "mixed", 
+        onchange: function() { $("global").onchange_called = true},
+      });
+      $("cds_test").value = "";
+      cds.clearDate();
+      assert( ! $('global').onchange_called, "onchange was called, when the value wasn't actually changed");
+      $("cds_test").value = "boogy";
+      cds.clearDate();
+      assert( $('global').onchange_called, "onchange wasnt called, but should ahve been");
+      cds.close();
+      $("global").remove();
+    }},
+    
     test_disabledElement_cantUpdate: function() {with(this){
       $("cds_test").value = "May 10, 2007";
       $("cds_test").disabled = true;

data/lib/calendar_date_select.rb

@@ -2,7 +2,7 @@ require "calendar_date_select/calendar_date_select.rb"
 require "calendar_date_select/form_helpers.rb"
 require "calendar_date_select/includes_helper.rb"
 
-if Object.const_defined?(:Rails) && File.directory?(Rails.root + "/public")
+if Object.const_defined?(:Rails) && File.directory?(Rails.root.to_s + "/public")  
   ActionView::Helpers::FormHelper.send(:include, CalendarDateSelect::FormHelpers)
   ActionView::Base.send(:include, CalendarDateSelect::FormHelpers)
   ActionView::Base.send(:include, CalendarDateSelect::IncludesHelper)

data/lib/calendar_date_select/calendar_date_select.rb

@@ -1,5 +1,5 @@
 module CalendarDateSelect
-  VERSION = '1.13'
+  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.13 - 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/calendar_date_select_spec.rb

@@ -0,0 +1,14 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe CalendarDateSelect do
+  it "should detect presence of time in a string" do
+    CalendarDateSelect.has_time?("January 7, 2007").should == false
+    CalendarDateSelect.has_time?("January 7, 2007 5:50pm").should == true
+    CalendarDateSelect.has_time?("January 7, 2007 5:50 pm").should == true
+    CalendarDateSelect.has_time?("January 7, 2007 16:30 pm").should == true
+    
+    CalendarDateSelect.has_time?(Date.parse("January 7, 2007 3:00 pm")).should == false
+    CalendarDateSelect.has_time?(Time.parse("January 7, 2007 3:00 pm")).should == true
+    CalendarDateSelect.has_time?(DateTime.parse("January 7, 2007 3:00 pm")).should == true
+  end
+end

data/spec/calendar_date_select/form_helpers_spec.rb

@@ -0,0 +1,166 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe CalendarDateSelect::FormHelpers do
+  include ActionView::Helpers::FormHelper
+  include ActionView::Helpers::JavaScriptHelper
+  include ActionView::Helpers::AssetTagHelper
+  include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::FormTagHelper
+
+  include CalendarDateSelect::FormHelpers
+
+  before(:each) do
+    @controller = ActionController::Base.new
+    @request = OpenStruct.new
+    @controller.request = @request
+
+    @model = OpenStruct.new
+  end
+
+  describe "mixed mode" do
+    it "should not output a time when the value is a Date" do
+      @model.start_datetime = Date.parse("January 2, 2007")
+      output = calendar_date_select(:model, :start_datetime, :time => "mixed")
+      output.should_not match(/12:00 AM/)
+    end
+
+    it "should output a time when the value is a Time" do
+      @model.start_datetime = Time.parse("January 2, 2007 12:00 AM")
+      output = calendar_date_select(:model, :start_datetime, :time => "mixed")
+      output.should match(/12:00 AM/)
+    end
+  end
+
+  it "should render a time when time is passed as 'true'" do
+    @model.start_datetime = Date.parse("January 2, 2007")
+    output = calendar_date_select(:model, :start_datetime, :time => "true")
+    output.should match(/12:00 AM/)
+  end
+
+  it "should time_false__model_returns_time__should_render_without_time" do
+    @model.start_datetime = Time.parse("January 2, 2007 12:00 AM")
+    output = calendar_date_select(:model, :start_datetime)
+    output.should_not match(/12:00 AM/)
+  end
+
+  it "should _nil_model__shouldnt_populate_value" do
+    @model = nil
+    output = calendar_date_select(:model, :start_datetime)
+
+    output.should_not match(/value/)
+  end
+
+  it "should _vdc__should_auto_format_function" do
+    @model.start_datetime = Time.parse("January 2, 2007 12:00 AM")
+    output = calendar_date_select(:model,
+      :start_datetime,
+      :valid_date_check => "date < new Date()"
+    )
+    output.should include("valid_date_check:function(date) { return(date &lt; new Date()) }")
+
+    output = calendar_date_select(:model,
+      :start_datetime,
+      :valid_date_check => "return(date < new Date())"
+    )
+    output.should include("valid_date_check:function(date) { return(date &lt; new Date()) }")
+    output = calendar_date_select(:model,
+      :start_datetime,
+      :valid_date_check => "function(p) { return(date < new Date()) }"
+    )
+    output.should include("valid_date_check:function(p) { return(date &lt; new Date()) }")
+  end
+
+  it "should raise an error if the valid_date_check function is missing a return statement" do
+    message = ":valid_date_check function is missing a 'return' statement.  Try something like: :valid_date_check => 'if (date > new(Date)) return true; else return false;'"
+    lambda {
+      output = calendar_date_select(:model,
+        :start_datetime,
+        :valid_date_check => "date = 5; date < new Date());"
+      )
+    }.should raise_error(ArgumentError, message)
+
+    lambda {
+      output = calendar_date_select(:model,
+        :start_datetime,
+        :valid_date_check => "function(p) { date = 5; date < new Date()); }"
+      )
+    }.should raise_error(ArgumentError, message)
+  end
+
+  it "should render the year_range argument correctly" do
+    output = calendar_date_select(:model, :start_datetime)
+    output.should include("year_range:10")
+    output = calendar_date_select(:model, :start_datetime, :year_range => 2000..2010)
+    output.should include("year_range:[2000, 2010]")
+    output = calendar_date_select(:model, :start_datetime, :year_range => (15.years.ago..5.years.ago))
+    output.should include("year_range:[#{15.years.ago.year}, #{5.years.ago.year}]")
+  end
+
+  it "should disregard the :object parameter when nil" do
+    @model.start_datetime = Time.parse("January 2, 2007 12:00 AM")
+    output = calendar_date_select(:model, :start_datetime, :time => true, :object => nil)
+    output.should include(CalendarDateSelect.format_date(@model.start_datetime))
+  end
+
+  it "should regard :object parameter" do
+    @model.start_datetime = Time.parse("January 2, 2007 12:00 AM")
+    output = calendar_date_select(:lame_o, :start_datetime, :time => true, :object => @model)
+    output.should include(CalendarDateSelect.format_date(@model.start_datetime))
+  end
+
+  it "should respect parameters provided in default_options" do
+    new_options = CalendarDateSelect.default_options.merge(:popup => "force")
+    CalendarDateSelect.stub!(:default_options).and_return(new_options)
+    calendar_date_select_tag(:name, "").should include("popup:'force'")
+  end
+
+  it "should respect the :image option" do
+    output = calendar_date_select_tag(:name, "Some String", :image => "boogy.png")
+    output.should include("boogy.png")
+  end
+
+  it "should not pass the :image option as a javascript option" do
+    output = calendar_date_select_tag(:name, "Some String", :image => "boogy.png")
+    output.should_not include("image:")
+  end
+
+  it "should use the CSS class calendar_date_select_tag for popup selector icon" do
+    output = calendar_date_select_tag(:name, "Some String", :image => "boogy.png")
+    output.should include("calendar_date_select_popup_icon")
+  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")
+
+      output.should include("Some String")
+    end
+
+    it "should not render the time when time is false (or nil)" do
+      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))
+    end
+
+    it "should render the time when :time => true" do
+      output = calendar_date_select_tag(:name, @time, :time => true)
+
+      output.should include(CalendarDateSelect.format_date(@time))
+    end
+
+    it "should render the time when :time => 'mixed'" do
+      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

data/spec/spec_helper.rb

@@ -0,0 +1,26 @@
+require "rubygems"
+
+require 'spec'
+
+gem 'activesupport', ">= 2.2.0"
+gem 'actionpack', ">= 2.2.0"
+
+require 'active_support'
+require 'action_pack'
+require 'action_controller'
+require 'action_view'
+
+require 'ostruct'
+
+ActionView::Helpers::InstanceTag.class_eval do
+  class << self; alias new_with_backwards_compatibility new; end
+end
+
+$: << (File.dirname(__FILE__) + "/../lib")
+require "calendar_date_select"
+
+class String
+  def to_regexp
+    is_a?(Regexp) ? self : Regexp.new(Regexp.escape(self.to_s))
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: atd-calendar_date_select
 version: !ruby/object:Gem::Version 
-  version: 1.11.20090216
+  version: "1.15"
 platform: ruby
 authors: 
 - Tim Harper
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-16 00:00:00 -08:00
+date: 2009-02-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,9 +20,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 1.8.3
     version: 
-description: ""
+description: 
 email: 
 - tim c harper at gmail dot com
 executables: []
@@ -42,8 +42,8 @@ files:
 - js_test/unit/cds_helper_methods.html
 - js_test/unittest.js
 - lib/calendar_date_select/calendar_date_select.rb
-- lib/calendar_date_select/form_helpers.rb
 - lib/calendar_date_select/includes_helper.rb
+- lib/calendar_date_select/form_helpers.rb
 - lib/calendar_date_select.rb
 - Manifest.txt
 - MIT-LICENSE
@@ -71,11 +71,13 @@ files:
 - public/stylesheets/calendar_date_select/silver.css
 - Rakefile
 - Readme.txt
-- test/functional/calendar_date_select_test.rb
-- test/functional/helper_methods_test.rb
-- test/test_helper.rb
+- spec/
+- spec/calendar_date_select
+- spec/calendar_date_select/calendar_date_select_spec.rb
+- spec/calendar_date_select/form_helpers_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
-homepage: http://code.google.com/p/calendardateselect/
+homepage: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -96,10 +98,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: calendar_date_select
+rubyforge_project: cds
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: ""
-test_files: 
-- test/test_helper.rb
+test_files: []
+