@@ -1 +1 @@ -0.4.1 +0.5.0 VERSION @@ -5,11 +5,11 @@ Gem::Specification.new do |s| s.name = %q{by_star} - s.version = "0.3.1" + s.version = "0.4.1" 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 = [ by_star.gemspec @@ -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 lib/by_star.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 lib/shared.rb @@ -575,6 +575,14 @@ describe Post do 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 spec/by_star_spec.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) \ No newline at end of file +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.") \ No newline at end of file spec/fixtures/models.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 \ No newline at end of file spec/fixtures/schema.rb 174761a82c17cdcf6a058bf27dba6c29016770e9 Ryan Bigg radarlistener@gmail.com http://github.com/radar/by_star/commit/bfadd090962b168577e66fdc641f93aa9abc2de4 bfadd090962b168577e66fdc641f93aa9abc2de4 2009-11-03T20:22:21-08:00 2009-11-03T20:21:39-08:00 Version bump to 0.5.0 - If you need me to quote YOUR table/field names for you, YOU'RE doing it wrong. e69a41fbfd28b29d9d20b8168c6c3cda7055c551 Ryan Bigg radarlistener@gmail.com