date_range_scopes 0.0.1 → 0.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (2) hide show
  1. data/lib/date_range_scopes.rb +16 -10
  2. metadata +7 -9
@@ -30,11 +30,14 @@ module DateRangeScopes
30
30
  time = time.respond_to?(:to_time_in_current_zone) ?
31
31
  time.to_time_in_current_zone : time
32
32
 
33
- where(
34
- "#{full_name} >= ? AND #{full_name} <= ?",
35
- time.beginning_of_day,
36
- time.end_of_day
37
- )
33
+ starts_at = time.beginning_of_day
34
+ ends_at = time.end_of_day
35
+ if key =~ /_on\z/
36
+ starts_at = starts_at.to_date
37
+ ends_at = ends_at.to_date
38
+ end
39
+
40
+ where "#{full_name} >= ? AND #{full_name} <= ?", starts_at, ends_at
38
41
  }
39
42
 
40
43
  scope "#{key}_today", send("#{key}_on")
@@ -45,11 +48,14 @@ module DateRangeScopes
45
48
  time = time.respond_to?(:to_time_in_current_zone) ?
46
49
  time.to_time_in_current_zone : time
47
50
 
48
- where(
49
- "#{full_name} >= ? AND #{full_name} <= ?",
50
- time.send("beginning_of_#{period}"),
51
- time.send("end_of_#{period}")
52
- )
51
+ starts_at = time.send("beginning_of_#{period}")
52
+ ends_at = time.send("end_of_#{period}")
53
+ if key =~ /_on\z/
54
+ starts_at = starts_at.to_date
55
+ ends_at = ends_at.to_date
56
+ end
57
+
58
+ where "#{full_name} >= ? AND #{full_name} <= ?", starts_at, ends_at
53
59
  }
54
60
 
55
61
  scope "#{key}_this_#{period}", send("#{key}_in_#{period}")
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: date_range_scopes
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.1
4
+ version: 0.0.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,12 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-06-29 00:00:00.000000000 -04:00
13
- default_executable:
12
+ date: 2011-09-21 00:00:00.000000000Z
14
13
  dependencies:
15
14
  - !ruby/object:Gem::Dependency
16
15
  name: rails
17
- requirement: &2157626560 !ruby/object:Gem::Requirement
16
+ requirement: &70184094804960 !ruby/object:Gem::Requirement
18
17
  none: false
19
18
  requirements:
20
19
  - - ~>
@@ -22,10 +21,10 @@ dependencies:
22
21
  version: '3'
23
22
  type: :runtime
24
23
  prerelease: false
25
- version_requirements: *2157626560
24
+ version_requirements: *70184094804960
26
25
  - !ruby/object:Gem::Dependency
27
26
  name: sqlite3
28
- requirement: &2157626160 !ruby/object:Gem::Requirement
27
+ requirement: &70184094804380 !ruby/object:Gem::Requirement
29
28
  none: false
30
29
  requirements:
31
30
  - - ! '>='
@@ -33,7 +32,7 @@ dependencies:
33
32
  version: '0'
34
33
  type: :development
35
34
  prerelease: false
36
- version_requirements: *2157626160
35
+ version_requirements: *70184094804380
37
36
  description: Automatically add scopes for day, week, month and year ranges to Active
38
37
  Record models.
39
38
  email: nick.ragaz@gmail.com
@@ -45,7 +44,6 @@ files:
45
44
  - MIT-LICENSE
46
45
  - Rakefile
47
46
  - README.md
48
- has_rdoc: true
49
47
  homepage: http://github.com/nragaz/date_range_scopes
50
48
  licenses: []
51
49
  post_install_message:
@@ -66,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
66
64
  version: '0'
67
65
  requirements: []
68
66
  rubyforge_project:
69
- rubygems_version: 1.6.2
67
+ rubygems_version: 1.8.6
70
68
  signing_key:
71
69
  specification_version: 3
72
70
  summary: Automatically add scopes for day, week, month and year ranges to Active Record