by_star 0.5.2 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.6.0

data/by_star.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{by_star}
-  s.version = "0.5.2"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Bigg", "Mislav Marohni\304\207"]
-  s.date = %q{2010-01-13}
+  s.date = %q{2010-01-18}
   s.description = %q{ActiveRecord extension for easier date scopes and time ranges}
   s.email = %q{radarlistener@gmail.com}
   s.extra_rdoc_files = [
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "by_star.gemspec",
+     "init.rb",
      "lib/by_star.rb",
      "lib/calculations.rb",
      "lib/calculations/count.rb",

data/init.rb

@@ -0,0 +1,2 @@
+require 'by_star'
+ActiveRecord::Base.send :include, ByStar

data/spec/by_star_spec.rb

@@ -3,7 +3,7 @@ require 'by_star'
 
 describe Post do
     
-  def stub_time(day=15, month=5, year=Time.zone.now.year, hour=0, minute=0)
+  def stub_time(day=1, month=1, year=Time.zone.now.year, hour=0, minute=0)
     stub = "#{day}-#{month}-#{year} #{hour}:#{minute}".to_time
     Time.stub!(:now).and_return(stub)
     Time.zone.stub!(:now).and_return(stub)
@@ -77,11 +77,11 @@ describe Post do
     
       it "should be able to find posts for the current month" do
         stub_time
-        size.should eql(8)
+        size.should eql(10)
       end
       
       it "should be able to find a single post for January" do
-        size("January").should eql(1)
+        size("January").should eql(10)
       end
   
       it "should be able to find two posts for the 2nd month" do
@@ -107,7 +107,7 @@ describe Post do
       end
     
       it "should be able to take decimals" do
-        size(1.5).should eql(1)
+        size(1.5).should eql(10)
       end
     
       it "should be able to use an alternative field" do
@@ -129,16 +129,16 @@ describe Post do
     
       it "should be able to find posts in the current fortnight" do
         stub_time
-        size.should eql(3)
+        size.should eql(4)
       end
     
       it "should be able to find posts in the 1st fortnight" do
-        size(0).should eql(1)
+        size(0).should eql(4)
       end
     
       it "should be able to find posts for a fortnight ago" do
         stub_time
-        size(2.weeks.ago).should eql(5)
+        size(2.weeks.ago).should eql(0)
       end
     
       it "should raise an error when given an invalid argument" do
@@ -155,11 +155,11 @@ describe Post do
     
       it "should be able to find posts in the current week" do
         stub_time
-        size.should eql(3)
+        size.should eql(4)
       end
     
       it "should be able to find posts in the 1st week" do
-        size(0).should eql(1)
+        size(0).should eql(4)
       end
     
       it "should be able to find posts in the 1st week of last year" do
@@ -192,7 +192,7 @@ describe Post do
       end
     
       it "should find posts at the start of the year" do
-        size(0).should eql(1)
+        size(0).should eql(4)
       end
     
       it "should find posts at the end of the year" do
@@ -202,15 +202,15 @@ describe Post do
     end
   
     describe "by weekend" do
-      it "should be able to find the posts on the weekend of the 1st May" do
-        stub_time(1, 8)
-        size.should eql(8)
+      it "should be able to find the posts on the weekend of the 1st of January" do
+        stub_time
+        size.should eql(1)
       end
     
       it "should be able to use an alternative field" do
         year = Time.zone.now.year
         stub_time(1, 8)
-        Event.by_weekend(nil, :field => "start_time").size.should eql(1)
+        Event.by_weekend(nil, :field => "start_time").size.should eql(0)
       end
     end
   
@@ -233,12 +233,12 @@ describe Post do
     describe "by day" do
       it "should be able to find a post for today" do
         stub_time
-        size.should eql(2)
+        size.should eql(3)
       end
     
       it "should be able to find a post by a given date" do
         stub_time
-        size(Date.today).should eql(2)
+        size(Date.today).should eql(3)
       end
     
       it "should be able to use an alternative field" do
@@ -305,26 +305,27 @@ describe Post do
       end
     
       it "should show the correct number of posts in the past" do
-        size.should eql(16)
+        size.should eql(1)
       end
     
       it "should find for a given time" do
-        size(Time.zone.now - 2.days).should eql(16)
+        size(Time.zone.now - 2.days).should eql(1)
       end
     
       it "should find for a given date" do
-        size(Date.today - 2).should eql(16)
+        size(Date.today - 2).should eql(1)
       end
     
       it "should find for a given string" do
-        size("next tuesday").should eql(19)
+        size("next tuesday").should eql(5)
       end
     
       it "should be able to find all events before Ryan's birthday using a non-standard field" do
-        Event.past("01-01-#{Time.zone.now.year+2}".to_time, :field => "start_time").size.should eql(8)
+        Event.past("01-01-#{Time.zone.now.year+2}".to_time, :field => "start_time").size.should eql(9)
       end 
       
       it "should be able to order the find" do
+        stub_time(2,1)
         find(Date.today, :order => "created_at ASC").first.text.should eql("Last year")
         find(Date.today, :order => "created_at DESC").first.text.should eql("post 0")
       end
@@ -337,31 +338,32 @@ describe Post do
       end
     
       it "should show the correct number of posts in the future" do
-        size.should eql(71)
+        size.should eql(85)
       end
     
       it "should find for a given date" do
-        size(Date.today - 2).should eql(73)
+        size(Date.today - 2).should eql(88)
       end
     
       it "should find for a given string" do
-        size("next tuesday").should eql(70)
+        size("next tuesday").should eql(84)
       end
     
-      it "should be able to find all events after Dad's birthday using a non-standard field" do
-        Event.past("05-07-#{Time.zone.now.year}".to_time, :field => "start_time").size.should eql(1)
+      it "should be able to find all events before Dad's birthday using a non-standard field" do
+        # TODO: This will change in May. Figure out how to fix.
+        Event.past("05-07-#{Time.zone.now.year}".to_time, :field => "start_time").size.should eql(5)
       end
     end
   
     describe "as of" do
       it "should be able to find posts as of 2 weeks ago" do
         stub_time
-        Post.as_of_2_weeks_ago.size.should eql(7)
+        Post.as_of_2_weeks_ago.size.should eql(3)
       end
     
       it "should be able to find posts as of 2 weeks before a given time" do
         stub_time
-        Post.as_of_2_weeks_ago(Time.zone.now + 1.month).size.should eql(14)
+        Post.as_of_2_weeks_ago(Time.zone.now + 1.month).size.should eql(12)
       end
     
       it "should error if given a date in the past far enough back" do
@@ -376,29 +378,29 @@ describe Post do
     describe "between" do
       it "should find posts between last tuesday and next tuesday" do
         stub_time
-        size("last tuesday", "next tuesday").should eql(3)
+        size("last tuesday", "next tuesday").should eql(4)
       end
     
       it "should find between two times" do
         stub_time
-        size(Time.zone.now - 5.days, Time.zone.now + 5.days).should eql(3)
+        size(Time.zone.now - 5.days, Time.zone.now + 5.days).should eql(4)
       end
     
       it "should find between two dates" do
         stub_time
-        size(Date.today, Date.today + 5).should eql(3)
+        size(Date.today, Date.today + 5).should eql(4)
       end
     end
   
     describe "up to" do
       it "should be able to find posts up to 2 weeks from now" do
         stub_time
-        Post.up_to_6_weeks_from_now.size.should eql(9)
+        Post.up_to_6_weeks_from_now.size.should eql(12)
       end
     
       it "should be able to find posts up to 2 weeks from a given time" do
         stub_time
-        Post.up_to_6_weeks_from_now(Time.zone.now - 1.month).size.should eql(14)
+        Post.up_to_6_weeks_from_now(Time.zone.now - 1.month).size.should eql(12)
       end
     
       it "should error if given a date in the past" do
@@ -441,7 +443,7 @@ describe Post do
     
       it "should be able to find posts after right now" do
         stub_time
-        Post.by_current_work_week.size.should eql(2)
+        Post.by_current_work_week.size.should eql(3)
         Post.by_current_work_week do
           { :conditions => ["created_at > ?", Time.now] }
         end.size.should eql(0)
@@ -513,7 +515,7 @@ describe Post do
       
       it "should work when block is empty" do
         stub_time
-        Post.future { }.size.should eql(71)
+        Post.future { }.size.should eql(85)
       end
       
       it "should be able to find a single post from the future with the tag 'tomorrow' (redux)" do
@@ -534,7 +536,7 @@ describe Post do
         describe "by month" do
           it "current month" do
             stub_time
-            Invoice.sum_by_month(:value).should eql(15000)
+            Invoice.sum_by_month(:value).should eql(11000)
           end
         end
       end
@@ -582,7 +584,7 @@ describe Post do
           
           it "current month with blank block" do
             stub_time
-            Post.count_by_month(:all, Time.zone.now) { }.should eql(8)
+            Post.count_by_month(:all, Time.zone.now) { }.should eql(10)
           end
         end
       end

data/spec/fixtures/models.rb

@@ -55,7 +55,13 @@ Post.factory "Tomorrow's post", Time.zone.now + 1.day
 Post.factory "That's it!", Time.zone.now.end_of_year
 
 # For by_weekend scoped test
-post = Post.factory "Weekend of May", "16-05-#{Time.zone.now.year}".to_time
+# We need to calculate the weekend.
+time = Time.now.beginning_of_year
+while time.wday != 6
+  time += 1.day
+end
+
+post = Post.factory "Weekend of January", time
 post.tags.create(:name => "weekend")
 
 # For by_day scoped test
@@ -70,17 +76,18 @@ post.tags.create(:name => "yesterday")
 post = Post.factory "Tomorrow's Another Day", Time.zone.now.tomorrow
 post.tags.create(:name => "tomorrow")
 
-post = Post.factory "Last year", Time.local(year - 1, 1, 1)
+post = Post.factory "Last year", Time.zone.now.beginning_of_year - 1.year
 post.tags.create(:name => "ruby")
 
-post = Post.factory "The 'Current' Fortnight", Time.local(year, 5, 15)
+post = Post.factory "The 'Current' Fortnight", Time.zone.now.beginning_of_year
 post.tags.create(:name => "may")
 
-post = Post.factory "The 'Current' Week", Time.local(year, 5, 15)
+post = Post.factory "The 'Current' Week", Time.zone.now.beginning_of_year
 post.tags.create(:name => "may2")
 
 
 Event.create(:name => "Ryan's birthday!", :start_time  => "04-12-#{Time.zone.now.year}".to_time)
+Event.create(:name => "Ryan's birthday, last year!", :start_time  => "04-12-#{Time.zone.now.year-1}".to_time)
 Event.create(:name => "Dad's birthday!",  :start_time  => "05-07-#{Time.zone.now.year}".to_time)
 Event.create(:name => "Mum's birthday!",  :start_time  => "17-11-#{Time.zone.now.year}".to_time)
 Event.create(:name => "Today",            :start_time  => Time.zone.now)

data/spec/spec_helper.rb

@@ -1,12 +1,13 @@
 require 'rubygems'
-require 'activerecord'
+require 'active_record'
 require 'fileutils'
+require 'logger'
 FileUtils.mkdir_p("tmp")
 
 ActiveRecord::Base.logger = Logger.new("tmp/activerecord.log")
 $:.unshift(File.join(File.dirname(__FILE__), "../lib"))
 
-require 'activesupport'
+require 'active_support'
 require 'by_star'
 require 'spec'
 
@@ -24,3 +25,13 @@ end
 # bootstraping the plugin through init.rb
 # tests how it would load in a real application
 load File.dirname(__FILE__) + "/../rails/init.rb"
+# Print the location of puts/p calls so you can find them later
+def puts str
+  super caller.first if caller.first.index("shoulda.rb") == -1
+  super str
+end
+
+def p obj
+  puts caller.first
+  super obj
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: by_star
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors: 
 - Ryan Bigg
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-13 00:00:00 +10:00
+date: 2010-01-18 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,7 @@ files:
 - Rakefile
 - VERSION
 - by_star.gemspec
+- init.rb
 - lib/by_star.rb
 - lib/calculations.rb
 - lib/calculations/count.rb