smarter_dates 0.2.13 → 0.2.14

Sign up to get free protection for your applications and to get access to all the features.
@@ -42,7 +42,7 @@ class String
42
42
  # attempt to parse a string with Chronic
43
43
 
44
44
  def parse_with_chronic
45
- Chronic.time_class = Time.zone
45
+ #Chronic.time_class = Time.zone
46
46
  Chronic.parse(self)
47
47
  end
48
48
 
@@ -18,15 +18,7 @@ module SmarterDates
18
18
 
19
19
  def self.convert_to_dt(convert_me)
20
20
  Proc.new do |val|
21
- begin
22
- dt = Chronic.parse(val.to_s)
23
- rescue
24
- dt = DateTime.parse(val.to_s)
25
- rescue
26
- dt = Date.parse(val)
27
- rescue
28
- dt = val
29
- end
21
+ dt = val && val.to_chronic_datetime
30
22
  if defined?(Rails)
31
23
  set_rails_dt_attributes!(convert_me, dt)
32
24
  else
@@ -69,14 +61,14 @@ module SmarterDates
69
61
  # <tt>string</tt>:: A string
70
62
 
71
63
  def self.rails_dt_attributes(klass)
72
- dt_attrs = nil
64
+ dt_attrs = []
73
65
  logger = Rails.logger
74
66
  begin
75
67
  dt_attrs = klass.column_names.select { |meth| meth.match(/_(?:at|on|dt|d)$/) }
76
68
  logger.debug(RuntimeError, "unused include - #{self.class.to_s} does not have any attributes ending in _at, _on, _dt, or _d") if migrated? && dt_attrs.empty?
77
69
  rescue ActiveRecord::StatementInvalid => _
78
70
  end
79
- dt_attrs.uniq || []
71
+ dt_attrs.uniq
80
72
  end
81
73
 
82
74
  # :call-seq:
@@ -1,4 +1,4 @@
1
1
  module SmarterDates
2
- VERSION = '0.2.13'
2
+ VERSION = '0.2.14'
3
3
  end
4
4
 
@@ -0,0 +1,8 @@
1
+ begin
2
+ if RbConfig::CONFIG['RUBY_PROGRAM_VERSION'] == '1.9.3'
3
+ require 'debugger'
4
+ else
5
+ require 'ruby-debug'
6
+ end
7
+ rescue LoadError => _
8
+ end
@@ -9,7 +9,7 @@ REQUIREMENTS = {
9
9
  bundler: ['~> 1.3'],
10
10
  rake: ['>= 0'],
11
11
  sqlite3: ['>= 1.3.7'],
12
- debugger: ['>= 1.5.0'],
12
+ debugger: ['>= 1.6.0'],
13
13
  rspec: ['>= 2.13.0'],
14
14
  mocha: ['>= 0.13.0'],
15
15
  database_cleaner: ['>= 0.9.1'],
@@ -4,6 +4,7 @@ require 'active_record'
4
4
 
5
5
  if $LOAD_PATH.include?(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
6
6
  require 'smarter_dates'
7
+ require 'test_helper'
7
8
  else
8
9
  raise RuntimeError, "Try ruby -Ilib test/#{File.basename(__FILE__)}"
9
10
  end
@@ -1,7 +1,9 @@
1
1
  require 'test/unit'
2
+ require 'test_helper'
2
3
 
3
4
  if $LOAD_PATH.include?(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
4
5
  require 'smarter_dates'
6
+ require 'test_helper'
5
7
  else
6
8
  raise RuntimeError, "Try ruby -Ilib test/#{File.basename(__FILE__)}"
7
9
  end
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: smarter_dates
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 0.2.13
5
+ version: 0.2.14
6
6
  platform: ruby
7
7
  authors:
8
8
  - Paul Belt
@@ -81,13 +81,13 @@ dependencies:
81
81
  requirements:
82
82
  - - ! '>='
83
83
  - !ruby/object:Gem::Version
84
- version: 1.5.0
84
+ version: 1.6.0
85
85
  none: false
86
86
  requirement: !ruby/object:Gem::Requirement
87
87
  requirements:
88
88
  - - ! '>='
89
89
  - !ruby/object:Gem::Version
90
- version: 1.5.0
90
+ version: 1.6.0
91
91
  none: false
92
92
  prerelease: false
93
93
  type: :development
@@ -211,6 +211,7 @@ files:
211
211
  - lib/smarter_dates/engine.rb
212
212
  - lib/smarter_dates/parser.rb
213
213
  - lib/smarter_dates/version.rb
214
+ - lib/test_helper.rb
214
215
  - smarter_dates.gemspec
215
216
  - spec/dummy/.gitignore
216
217
  - spec/dummy/.rspec