by_star 0.4.0 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/by_star.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{by_star}
-  s.version = "0.4.0"
+  s.version = "0.5.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{2009-10-30}
+  s.date = %q{2009-11-04}
   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

@@ -3,6 +3,7 @@ require 'shared'
 require 'range_calculations'
 require 'time_ext'
 require 'vanilla'
+
 Dir[File.dirname(__FILE__) + '/calculations/*.rb'].each { |file| require file }
 require 'calculations'
 module ByStar

data/lib/shared.rb

@@ -1,6 +1,6 @@
 module Shared
   def conditions_for_range(start_time, end_time, field="created_at")
-    field = connection.quote_table_name(table_name) << '.' << connection.quote_column_name(field || "created_at")
+    field = table_name << '.' << (field || "created_at")
     ["#{field} >= ? AND #{field} <= ?", start_time.utc, end_time.utc]
   end
   

data/spec/by_star_spec.rb

@@ -568,12 +568,21 @@ describe Post do
           end
           
           it "current month with blank block" do
-             Post.count_by_month(:all, Time.zone.now) { }.should eql(16)
+            stub_time
+            Post.count_by_month(:all, Time.zone.now) { }.should eql(8)
           end
         end
       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.
+      it "should not spam the field name when using a different field" do
+        Invoice.first.day_entries.between((Time.zone.now - 3.days).to_date, Time.zone.now.to_date, :field => "spent_at")
+      end
+    end
   
     describe Time do
       it "should work out the beginning of a weekend (Friday 3pm)" do

data/spec/fixtures/models.rb

@@ -16,11 +16,16 @@ class Event < ActiveRecord::Base
 end
 
 class Invoice < ActiveRecord::Base
+  has_many :day_entries
   def self.factory(value, created_at = nil)
     create!(:value => value, :created_at => created_at, :number => value)
   end
 end
 
+class DayEntry < ActiveRecord::Base
+  
+end
+
 ## seed data:
 
 year = Time.zone.now.year
@@ -85,4 +90,6 @@ Event.create(:name => "Tomorrow",         :start_time  => Time.zone.now.tomorrow
 # For by_weekend test
 Event.create(:name => "1st of August",    :start_time  => "01-08-#{Time.zone.now.year}".to_time)
 
-Event.create(:name => "FBI meeting",      :start_time  => "02-03-#{Time.zone.now.year}".to_time, :public => false)
+Event.create(:name => "FBI meeting",      :start_time  => "02-03-#{Time.zone.now.year}".to_time, :public => false)
+
+Invoice.first.day_entries.create(:spent_at => Time.zone.now + 1.hour, :name => "Working harder, better, faster stronger.")

data/spec/fixtures/schema.rb

@@ -27,4 +27,10 @@ ActiveRecord::Schema.define do
     t.boolean :public, :default => true
   end
   
+  create_table :day_entries, :force => true do |t|
+    t.references :invoice
+    t.datetime :spent_at
+    t.string :name
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: by_star
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Ryan Bigg
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-30 00:00:00 +10:00
+date: 2009-11-04 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency