just-datetime-picker 0.0.5 → 0.0.6

data/README.rdoc

@@ -1,6 +1,6 @@
 = Introduction
 
-This is a simple gem for {Active Admin}[http://www.activeadmin.infp] that just 
+This is a simple gem for {Active Admin}[http://www.activeadmin.info] that just 
 adds support for Date/Time picker.
 
 It supports both ActiveRecord for relational databases and {Mongoid}[http://www.mongoid.org] 
@@ -12,9 +12,11 @@ Screenshot[https://raw.github.com/saepia/just-datetime-picker/master/doc/just-da
 
 == Code samples
 
-Here comes a quick code sample. Sorry, currently no docs.
+Here comes a quick code sample. Sorry, currently no detailed docs.
 
-That should create nice date/time picker for User#born_at.
+That should create nice date/time picker for User#born_at. Associated column in the DB should be nullable.
+
+To delete previously stored date/time just make all fields blank (date, hour and minute).
 
 === Migration (if you use ActiveRecord)
 
@@ -96,13 +98,15 @@ Once you have the source, you can unpack it and use from wherever you downloaded
 
 === CSS
 
-If you use Rails >= 3.1 just add this line to active_admin.css.scss
+If you use Rails >= 3.1 AND ActiveAdmin >= 0.5.0 just add this line to active_admin.css.scss
 
   @import "just_datetime_picker/base";
 
 Otherwise, just manually append the code from {this file}[https://raw.github.com/saepia/just-datetime-picker/master/app/assets/stylesheets/just_datetime_picker/base.css] 
 to your CSS stylesheet.
 
+In ActiveAdmin 0.4.x you must strip body.active_admin from CSS declarations.
+
 === JavaScript
 
 If you use nested set and dynamically create date or date/time pickers,
@@ -121,10 +125,10 @@ to your JS script.
 
 Code was tested with:
 
-* ruby[http://www.ruby-lang.org] 1.9.3-p194 [ amd64 ] under RVM[http://www.rvm.io],
-* ActiveAdmin[http://www.activeadmin.info] 0.4.4 and 0.5.0,
+* ruby[http://www.ruby-lang.org] 1.9.3-p194 [ amd64 ] and 1.9.3p286 [ i386 ] under RVM[http://www.rvm.io],
+* ActiveAdmin[http://www.activeadmin.info] 0.4.4, 0.5.0 and 0.5.1,
 * formtastic[https://github.com/justinfrench/formtastic] 2.2.1,
-* {Ruby on Rails}[http://www.rubyonrails.org] 3.2.8.
+* {Ruby on Rails}[http://www.rubyonrails.org] 3.2.8, 3.2.11.
 
 == License
 
@@ -137,6 +141,11 @@ This code is licensed under GPLv3[http://www.gnu.org/licenses/gpl.html].
 
 == ChangeLog
 
+=== 0.0.6 (February 23, 2013)
+
+* Fixed nested form workaround - do not use obsolete jQuery live() syntax ({Marcin Lewandowski}[https://github.com/saepia])
+* Allow to set date time to null value (thanks to {yaoquan}[https://github.com/yaoquan] for pointing this out)
+
 === 0.0.5 (September 28, 2012)
 
 * Changed dependency of ActiveAdmin 0.5.0 to 0.4.4 ({Marcin Lewandowski}[https://github.com/saepia])

data/app/assets/javascripts/just_datetime_picker/nested_form_workaround.js

@@ -1,4 +1,11 @@
-$('body.active_admin a.button').live('click', function() {
+// Workaround that enables date picker for fields in nested forms.
+// By default ActiveAdmin enables date picker once, after the page
+// has been loaded, so all datepicker fields created afterwards
+// are dead by default.
+//
+// We attach to a.button to catch a moment where user can potentially
+// add new field like this in a nested form.
+$(document).on('click', 'body.active_admin a.button', function() {
   $('input.datepicker:not(.hasDatepicker)').datepicker();
 });
 

data/just-datetime-picker.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "just-datetime-picker"
   gem.require_paths = ["lib"]
-  gem.version       = '0.0.5'
+  gem.version       = '0.0.6'
   gem.add_dependency 'formtastic', '>= 2.0.0'
   gem.add_dependency 'activeadmin', '>= 0.4.4'
 end

data/lib/just-datetime-picker/databases/common.rb

@@ -69,33 +69,53 @@ module Just
             end
 
             define_method "#{field_name}_date=" do |v|
-              return if v.to_s.empty?
+              if v.to_s.empty?
+                instance_variable_set("@#{field_name}_date", nil)
+              else
+                instance_variable_set("@#{field_name}_date", v)
+              end
               
-              instance_variable_set("@#{field_name}_date", v)
               just_combine_datetime field_name
             end
 
             define_method "#{field_name}_time_hour=" do |v|
-              return if v.to_s.empty?
-
-              instance_variable_set("@#{field_name}_time_hour", v.to_i)
+              if v.to_s.empty?
+                instance_variable_set("@#{field_name}_time_hour", nil)
+              else
+                instance_variable_set("@#{field_name}_time_hour", v.to_i)
+              end
+              
               just_combine_datetime field_name
             end
             
             define_method "#{field_name}_time_minute=" do |v|
-              return if v.to_s.empty?
-
-              instance_variable_set("@#{field_name}_time_minute", v.to_i)
+              if v.to_s.empty?
+                instance_variable_set("@#{field_name}_time_minute", nil)
+              else
+                instance_variable_set("@#{field_name}_time_minute", v.to_i)
+              end
+              
               just_combine_datetime field_name
             end
             
-            
             if options.has_key? :add_to_attr_accessible and options[:add_to_attr_accessible] == true
               attr_accessible "#{field_name}_date".to_sym, "#{field_name}_time_hour".to_sym, "#{field_name}_time_minute".to_sym
             end
           end # just_define_datetime_picker
 
           protected
+
+          # Combines values passed to individual fields (date, hour and minutes) into syntax acceptable by DB.
+          #
+          # It performs validation by trying to parse combined time. In case of error it just logs warning.
+          # In such case, stored date/time remains unchanged.
+          #
+          # It performs and tries to store the value only if all components (date, hour and minutes) are set.
+          # Otherwise it checks the opposite - if maybe all values are nil, and then sets NULL in the DB if
+          # this condition is true.
+          #
+          # * *Arguments*    :
+          #   - +field_name+ -> attribute that is used to represent +Just Date/Time Picker+ storage
           def just_combine_datetime(field_name)
             if not instance_variable_get("@#{field_name}_date").nil? and not instance_variable_get("@#{field_name}_time_hour").nil? and not instance_variable_get("@#{field_name}_time_minute").nil?
 
@@ -106,11 +126,11 @@ module Just
               rescue ArgumentError
                 logger.warn "Just error while trying to set #{field_name} attribute: \"#{combined}\" is not valid date/time"
               end
+            
+            elsif instance_variable_get("@#{field_name}_date").nil? and instance_variable_get("@#{field_name}_time_hour").nil? and instance_variable_get("@#{field_name}_time_minute").nil?
+              self.send("#{field_name}=", nil)              
             end
-
-          end          
-
-          
+          end
         end # included
 
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: just-datetime-picker
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2013-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: formtastic