event_calendar_engine 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/app/models/event.rb

@@ -19,12 +19,9 @@ class Event < ActiveRecord::Base
   
   acts_as_revisable :revision_class_name => 'EventRevision', :on_delete => :revise
   
-  scope :past, lambda{
-    where(sanitize_sql_array(["end_on < '%s'", Date.current]))
-  }
-  scope :future, lambda{
-    where(sanitize_sql_array(["start_on > '%s'", Date.current]))
-  }
+  scope :past, where(sanitize_sql_array(["end_on < '%s'", Date.current]))
+  scope :future, where(sanitize_sql_array(["start_on > '%s'", Date.current]))
+  scope :current, where(sanitize_sql_array(["end_on >= '%s' AND start_on <= '%s'", Date.current, Date.current]))
   
   validate :sane_dates
 

data/spec/models/event_spec.rb

@@ -10,24 +10,27 @@ describe Event do
       :location => "value for location",
       :description => "value for description"
     }
-  end
-  
-  it "Event.past finds past events" do
-    past = Event.create!(@valid_attributes)
-    Event.create!(@valid_attributes.merge!({
+    @may_2010 = Event.create!(@valid_attributes)
+    @mar_2100 = Event.create!(@valid_attributes.merge!({
       :start_on => Date.new(2100,3,12),
       :end_on => Date.new(2100,3,13)
     }))
-    Event.past.first.should eql past
+    @current = Event.create!(@valid_attributes.merge!({
+      :start_on => Date.yesterday,
+      :end_on => Date.tomorrow
+    }))
+  end
+  
+  it "Event.past finds past events" do
+    Event.past.first.should eql @may_2010
   end
   
   it "Event.future finds future events" do
-    Event.create!(@valid_attributes)
-    future = Event.create!(@valid_attributes.merge!({
-      :start_on => Date.new(2100,3,12),
-      :end_on => Date.new(2100,3,13)
-    }))
-    Event.future.first.should eql future
+    Event.future.first.should eql @mar_2100
+  end
+  
+  it "Event.current finds current events" do
+    Event.current.first.should eql @current
   end
 
   it "should create a new instance given valid attributes" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: event_calendar_engine
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jason LaPier