date_range_scopes 0.0.3 → 0.0.5

data/lib/date_range_scopes.rb

@@ -19,48 +19,53 @@ module DateRangeScopes
   #   > #{updated}_today -> same as #{updated}_on(Date.today)
   #   > today(date) -> same as created_on(date)
   included do
-    date_columns = column_names.select { |col| col =~ /((_at)|(_on))\z/ }
-    
-    date_columns.each do |col|
-      key = col.slice(0..-4)
-      full_name = "#{table_name}.#{col}"
-      date_column = col =~ /_on\z/
+    begin
+      date_columns = column_names.select { |col| col =~ /((_at)|(_on))\z/ }
       
-      scope "#{key}_on", lambda { |time=nil|
-        time ||= Time.zone.now
-        time = time.respond_to?(:to_time_in_current_zone) ?
-          time.to_time_in_current_zone : time
-        
-        starts_at = time.beginning_of_day
-        ends_at = time.end_of_day
-        if date_column
-          starts_at = starts_at.to_date
-          ends_at = ends_at.to_date
-        end
-        
-        where "#{full_name} >= ? AND #{full_name} <= ?", starts_at, ends_at
-      }
-      
-      scope "#{key}_today", send("#{key}_on")
-      
-      %w( week month year ).each do |period|
-        scope "#{key}_in_#{period}", lambda { |time=nil|
+      date_columns.each do |col|
+        key = col.slice(0..-4)
+        full_name = "#{table_name}.#{col}"
+        date_column = col =~ /_on\z/
+
+        scope "#{key}_on", lambda { |time=nil|
           time ||= Time.zone.now
           time = time.respond_to?(:to_time_in_current_zone) ?
             time.to_time_in_current_zone : time
-          
-          starts_at = time.send("beginning_of_#{period}")
-          ends_at = time.send("end_of_#{period}")
+
+          starts_at = time.beginning_of_day
+          ends_at = time.end_of_day
           if date_column
             starts_at = starts_at.to_date
             ends_at = ends_at.to_date
           end
-          
+
           where "#{full_name} >= ? AND #{full_name} <= ?", starts_at, ends_at
         }
-        
-        scope "#{key}_this_#{period}", send("#{key}_in_#{period}")
+
+        scope "#{key}_today", send("#{key}_on")
+
+        %w( week month year ).each do |period|
+          scope "#{key}_in_#{period}", lambda { |time=nil|
+            time ||= Time.zone.now
+            time = time.respond_to?(:to_time_in_current_zone) ?
+              time.to_time_in_current_zone : time
+
+            starts_at = time.send("beginning_of_#{period}")
+            ends_at = time.send("end_of_#{period}")
+            if date_column
+              starts_at = starts_at.to_date
+              ends_at = ends_at.to_date
+            end
+
+            where "#{full_name} >= ? AND #{full_name} <= ?", starts_at, ends_at
+          }
+
+          scope "#{key}_this_#{period}", send("#{key}_in_#{period}")
+        end
       end
+      
+    rescue
+      puts "Columns not available for date_range_scopes"
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: date_range_scopes
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-21 00:00:00.000000000Z
+date: 2012-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70186309036160 !ruby/object:Gem::Requirement
+  requirement: &70251478339160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70186309036160
+  version_requirements: *70251478339160
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70186309035600 !ruby/object:Gem::Requirement
+  requirement: &70251476248320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70186309035600
+  version_requirements: *70251476248320
 description: Automatically add scopes for day, week, month and year ranges to Active
   Record models.
 email: nick.ragaz@gmail.com
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Automatically add scopes for day, week, month and year ranges to Active Record