smarter_dates 0.2.7.14 → 0.2.8

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 # Specify your gem's dependencies in smarter_dates.gemspec
 gemspec

data/lib/smarter_dates/chronic_parsable_validator.rb

@@ -0,0 +1,51 @@
+# validates attributes are parsable by the chronic gem
+class ChronicParsableValidator < ActiveModel::EachValidator
+
+  # == Creation
+  # To use this Validator, initialize it as any other validator
+  #
+  #   class ExampleValidator < ActiveRecord::Base
+  #     validates :attr1, :chronic_parsable => true
+  #   end
+
+  def initialize(*args) # :nodoc:
+    @errors = []
+    super(*args)
+  end
+
+  # :call-seq:
+  # validate_each :record, :attribute, :value
+  #
+  # <tt>:record</tt>:: AR instance
+  # <tt>:attribute</tt>:: symbol for attribute
+  # <tt>:value</tt>:: value to check validity
+
+  def validate_each(record, attribute, value = "") #:nodoc:
+    @value = value
+    unless is_valid?
+      record.errors[attribute] << 'not a valid Date or DateTime'
+    end
+  end
+
+  # :call-seq:
+  # is_valid?
+  #
+  # alias for :is_valid_datetime?
+
+  def is_valid?
+    is_valid_datetime?
+  end
+
+  # :call-seq:
+  # is_valid_datetime?
+  #
+  # returns true if the string is parsable by chronic
+
+  def is_valid_datetime?
+    obj = Chronic.parse(@value.respond_to?(:to_date) ?
+      @value.to_date : @value.to_s)
+    !obj.nil?
+  end
+
+end
+

data/lib/smarter_dates/parser.rb

@@ -2,23 +2,21 @@ require 'smarter_dates/version'
 require 'chronic'
 
 module SmarterDates
-def self.included( klass ) # :nodoc:
+def self.included(klass) # :nodoc:
   attr_accessor :dt_attributes
 
   @dt_attributes = []
   db_migrated = true
   if defined?(Rails)
     begin
-      @dt_attributes.concat(klass.column_names.select{|k|k.match(/_(?:at|on|dt|d)$/)})
-      Rails.logger.debug(RuntimeError,"unused include - #{klass.class.to_s} does not have any attributes ending in _at, _on, _dt, or _d") if db_migrated && @dt_attributes.empty?
-    rescue ActiveRecord::StatementInvalid => e
-      db_migrated = false
-    rescue => e
-      Rails.logger.debug(e.inspect)
-      db_migrated = false
+      @dt_attributes.concat(klass.column_names.select { |k| k.match(/_(?:at|on|dt|d)$/) })
+      Rails.logger.debug(RuntimeError, "unused include - #{klass.class.to_s} does not have any attributes ending in _at, _on, _dt, or _d") if db_migrated && @dt_attributes.empty?
+    rescue ActiveRecord::StatementInvalid => _
+    rescue => err
+      Rails.logger.debug(err.inspect)
     end
   else
-    @dt_attributes.concat(klass.instance_methods.select{|k|k.match(/_(?:at|on|dt|d)$/)})
+    @dt_attributes.concat(klass.instance_methods.select { |k| k.match(/_(?:at|on|dt|d)$/) })
   end
 
   # :call-seq:
@@ -38,7 +36,7 @@ def self.included( klass ) # :nodoc:
       begin
         dt = Chronic.parse(val.to_s)
       rescue
-        dt = DateTime.parse(val)
+        dt = DateTime.parse(val.to_s)
       rescue
         dt = Date.parse(val)
       rescue
@@ -53,7 +51,7 @@ def self.included( klass ) # :nodoc:
           self[k] = dt
         end
       else
-        instance_variable_set(:"@#{k}",dt)
+        instance_variable_set(:"@#{k}", dt)
       end
     end
     klass.send(:define_method, "#{k}=".to_sym, &parse)

data/lib/smarter_dates/version.rb

@@ -1,4 +1,4 @@
 module SmarterDates
-  VERSION = '0.2.7.14'
+  VERSION = '0.2.8'
 end
 

data/lib/smarter_dates.rb

@@ -1,3 +1,6 @@
-require File.join('smarter_dates','version')
-require File.join('smarter_dates','parser')
+require File.join('smarter_dates', 'version')
+require File.join('smarter_dates', 'parser')
+if defined? ActiveModel
+  require File.join('smarter_dates', 'chronic_parsable_validator')
+end
 

data/smarter_dates.gemspec

@@ -2,22 +2,35 @@
 $:.push File.expand_path('../lib', __FILE__)
 require 'smarter_dates/version'
 
-Gem::Specification.new do |s|
-  s.name        = 'smarter_dates'
-  s.version     = SmarterDates::VERSION
-  s.authors     = ['Paul Belt']
-  s.email       = ['paul.belt@gmail.com']
-  s.homepage    = 'http://github.com/belt/smarter_dates'
-  s.summary     = %q{Natural language date processing}
-  s.description = %q{Humans want to think of date and datetime attributes in a natural manner. Standard ruby Date and DateTime objects do not support this well.}
+Gem::Specification.new do |spec|
+  spec.name        = 'smarter_dates'
+  spec.version     = SmarterDates::VERSION
+  spec.authors     = ['Paul Belt']
+  spec.email       = %w(paul.belt@gmail.com)
+  spec.homepage    = 'http://github.com/belt/smarter_dates'
+  spec.summary     = %q{Natural language date processing}
+  spec.description = %q{Humans want to think of date and datetime attributes in a natural manner. Standard ruby Date and DateTime objects do not support this well.}
 
-  s.rubyforge_project = 'smarter_dates'
+  spec.rubyforge_project = 'smarter_dates'
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ['lib']
+  spec.files         = `git ls-files`.split("\n")
+  spec.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  spec.require_paths = %w(lib)
+  spec.required_ruby_version = Gem::Requirement.new('>= 1.8.7')
+  spec.required_rubygems_version = Gem::Requirement.new('>= 0') if spec.respond_to? :required_rubygems_version=
 
-  s.add_dependency('chronic')
+  if spec.respond_to? :specification_version
+    spec.specification_version = 3
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0')
+      spec.add_runtime_dependency 'chronic', ['>= 0']
+      spec.add_development_dependency 'bundler', ['~> 1.3']
+      spec.add_development_dependency 'rake', ['>= 0']
+    else
+      spec.add_dependency('chronic')
+    end
+  else
+    spec.add_dependency('chronic')
+  end
 end
 

data/test/smarter_dates_test.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 
-if $LOAD_PATH.include?(File.expand_path(File.join(File.dirname(__FILE__),'..','lib')))
+if $LOAD_PATH.include?(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
   require 'smarter_dates'
 else
   raise RuntimeError, "Try ruby -Ilib test/#{File.basename(__FILE__)}"
@@ -26,13 +26,13 @@ class SmarterDatesTest < Test::Unit::TestCase
     last_week = now - 60 * 60 * 24 * 7
     yesterday = now - 60 * 60 * 24
 
-    @model.name = "Paul Belt"
-    @model.birth_d = "22 April 1976"
-    @model.meeting_dt = "today"
-    @model.created_on = "one week ago"
-    @model.updated_at = "yesterday"
+    @model.name = 'Paul Belt'
+    @model.birth_d = '22 April 1976'
+    @model.meeting_dt = 'today'
+    @model.created_on = 'one week ago'
+    @model.updated_at = 'yesterday'
 
-    assert_equal "Paul Belt", @model.name
+    assert_equal 'Paul Belt', @model.name
 
     assert_equal 1976, @model.birth_d.year
     assert_equal 4, @model.birth_d.mon
@@ -53,7 +53,7 @@ class SmarterDatesTest < Test::Unit::TestCase
   end
 
   def test_parsing_failures
-    @model.birth_d = "32 April 1976"
+    @model.birth_d = '32 April 1976'
     assert_equal nil, @model.birth_d
 
     @model.birth_d = nil
@@ -61,7 +61,7 @@ class SmarterDatesTest < Test::Unit::TestCase
 
     # TODO: fix this in chronic
     if false
-    @model.birth_d = "30 Feb 1976"
+    @model.birth_d = '30 Feb 1976'
     assert_equal nil, @model.birth_d
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smarter_dates
 version: !ruby/object:Gem::Version
-  version: 0.2.7.14
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-14 00:00:00.000000000Z
+date: 2013-03-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &2193725540 !ruby/object:Gem::Requirement
+  requirement: &2267243440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,29 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2193725540
+  version_requirements: *2267243440
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2267242960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: *2267242960
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2267242480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2267242480
 description: Humans want to think of date and datetime attributes in a natural manner.
   Standard ruby Date and DateTime objects do not support this well.
 email:
@@ -37,6 +59,7 @@ files:
 - Rakefile
 - VERSION.yml
 - lib/smarter_dates.rb
+- lib/smarter_dates/chronic_parsable_validator.rb
 - lib/smarter_dates/parser.rb
 - lib/smarter_dates/version.rb
 - smarter_dates.gemspec
@@ -52,7 +75,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -67,4 +90,3 @@ specification_version: 3
 summary: Natural language date processing
 test_files:
 - test/smarter_dates_test.rb
-has_rdoc: