by_star 0.7.2 → 0.8.0

data/README.markdown

@@ -34,7 +34,7 @@ If you're not using the standard `created_at` field: don't worry! I've covered t
 You can treat all `by_*` methods exactly how you would treat `named_scope`s: they are effectively scopes in their own right. This means you are able to call them like this:
 
     Post.by_month.my_special_scope
-    
+
 Where `my_special_scope` is a `named_scope` you have specified.
 
 All the `by_*` methods, with the exception of `previous` and `next`, take a block which will then scope the find based on the options passed into it. You can also specify these options for each method, but the syntax may differ. The supported options are the same options that are supported by `find` from ActiveRecord. Please note that if you want to use conditions you *have* to use this syntax:
@@ -371,7 +371,7 @@ To find records up to a certain time from the current time:
 To find the record prior to this one call `previous` on any model instance:
 
     Post.last.previous
-  
+
 You can specify a field also:
 
     Post.last.previous("published_at")
@@ -391,9 +391,9 @@ You can specify a field also:
 If your database uses something other than `created_at` for storing a timestamp, you can specify the field option like this:
 
     Post.by_month("January", :field => :something_else)
-    
+
 All methods support this extra option.
-    
+
 Or if you're doing it all the time on your model, then it's best to use `by_star_field` at the top of your model:
 
     class Post < ActiveRecord::Base

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.8.0

data/by_star.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{by_star}
-  s.version = "0.7.2"
+  s.version = "0.8.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-05-05}
+  s.date = %q{2010-06-05}
   s.description = %q{ActiveRecord extension for easier date scopes and time ranges}
   s.email = %q{radarlistener@gmail.com}
   s.extra_rdoc_files = [

data/lib/by_star.rb

@@ -26,7 +26,7 @@ module ByStar
     include Vanilla
     include Calculations
   end
-  
+
   module InstanceMethods
     include Neighbours
   end

data/lib/neighbours.rb

@@ -3,13 +3,13 @@ module ByStar
     # Find the previous record to this.
     def previous(field=nil)
       field = field || self.class.by_star_field
-      self.class.past(self.send(field.split(".").last)) { { :order => "#{field} DESC" }}.first
+      self.class.past(self.send(field.to_s.split(".").last)) { { :order => "#{field} DESC" }}.first
     end
-    
+
     # Find the next record to this.
     def next(field=nil)
       field = field || self.class.by_star_field
-      self.class.future(self.send(field.split(".").last)) { { :order => "#{field} ASC" }}.first
+      self.class.future(self.send(field.to_s.split(".").last)) { { :order => "#{field} ASC" }}.first
     end
   end
 end

data/lib/vanilla.rb

@@ -81,19 +81,15 @@ module ByStar
       # Surely there's a method in Rails to do this.
       start_time = if valid_time_or_date?(time)
         weeks = time.strftime("%U").to_i
-
-        # Sunday defines the start of the week.
-        # Finds the sunday that defines the starting week of the year.
-        # This is because AS +*.weeks helper works off the given time, which could be any day.
-        # Principle of least surprise and all. Ideally.
-        start_time = Time.now.beginning_of_year
-        start_time.strftime("%w").to_i != 0 ? start_time - (7 - start_time.strftime("%w").to_i).days : start_time
+        Time.zone.now.beginning_of_year
       elsif time.is_a?(Numeric) && time < 53
         weeks = time.to_i
         Time.utc(year, 1, 1)
       else
         raise ParseError, "by_week takes only a Time or Date object, a Fixnum (less than or equal to 53) or a Chronicable string."
       end
+      # Make the start of the week predictably Sunday.
+      start_time.strftime("%w").to_i != 0 ? start_time - (7 - start_time.strftime("%w").to_i).days : start_time
       start_time += weeks.weeks
       end_time = start_time + 1.week
       by_star(start_time, end_time, options, &block)

data/spec/by_star_spec.rb

@@ -79,7 +79,7 @@ describe Post do
       it "should be able to use an alternative field (symbol)" do
         Event.by_year(nil, :field => :start_time).size.should eql(8)
       end
-      
+
       it "should not have to specify the field when using by_star_field" do
         Event.by_year.size.should eql(8)
       end
@@ -644,37 +644,47 @@ describe Post do
       end
 
     end
-    
+
     describe "directional finders" do
       subject { Post.today.first }
-      
+      let(:event) { Event.last }
+
       describe "previous" do
         it "should find the post previous to it" do
           subject.previous.text.should eql("Yesterday's post")
         end
+        
+        it "should find the previous event" do
+          event.previous.name.should eql("Ryan's birthday, last year!")
+        end
       end
-    
-    
+
+
       describe "next" do
+        let(:event) { Event.first }
         it "should find the post next to it" do
           subject.next.text.should eql("Tomorrow's post")
         end
+        
+        it "should find the next event" do
+          event.next.should be_nil
+        end
       end
     end
-    
+
     describe "chaining of methods" do
       # a by_star and a by_direction method, in that order
       it "should be able to chain today and past" do
         Post.today.past.size.should eql(4)
       end
-      
+
       # a by_direction and by_star method, in that order
       it "should be able to chain together past and today" do
         Post.past.today.size.should eql(4)
       end
-      
+
     end
-    
+
     describe "edge cases" do
       # This method previously generated sql like: `day_entries`.`spent_at`.`spent_at`.`spent_at`.`spent_at`
       # Which is *obviously* incorrect and #omg worthy.

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 2
-  version: 0.7.2
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Ryan Bigg
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-05 00:00:00 +10:00
+date: 2010-06-05 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency