@@ -2,7 +2,7 @@ require 'rubygems' require 'rake' require 'echoe' -Echoe.new('rangetastic', '0.3.0') do |p| +Echoe.new('rangetastic', '0.3.1') do |p| p.description = "Chain a date range to any named_scope on any date field with specified white listed fields" p.url = "http://github.com/cherring/rangetastic" p.author = "Chris Herring" Rakefile @@ -23,15 +23,23 @@ module Rangetastic end def field(symbol) - if columns_hash.has_key? "#{symbol.to_s.gsub("_between","")}_on" - @field = "#{symbol.to_s.gsub("_between","")}_on" - elsif columns_hash.has_key? "#{symbol.to_s.gsub("_between","")}_at" - @field = "#{symbol.to_s.gsub("_between","")}_at" + if columns_hash.has_key? on_field(symbol) + @field = on_field(symbol) + elsif columns_hash.has_key? at_field(symbol) + @field = at_field(symbol) else @field = nil end end + def at_field(symbol) + "#{symbol.to_s.gsub("_between","")}_at" + end + + def on_field(symbol) + "#{symbol.to_s.gsub("_between","")}_on" + end + def field_to_query @field end lib/rangetastic.rb @@ -2,11 +2,11 @@ Gem::Specification.new do |s| s.name = %q{rangetastic} - s.version = "0.3.0" + s.version = "0.3.1" s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version= s.authors = ["Chris Herring"] - s.date = %q{2009-07-25} + s.date = %q{2009-07-28} s.description = %q{Chain a date range to any named_scope on any date field with specified white listed fields} s.email = %q{chris.herring.iphone@gmail.com} s.extra_rdoc_files = ["lib/rangetastic.rb", "README.markdown"] rangetastic.gemspec @@ -21,7 +21,7 @@ describe Order do end it "should be able to filter on any field that is in fields => []" do - %w(ordered_on fulfilled_on shipped_on).each do |field| + %w(ordered_on fulfilled_on shipped_at).each do |field| lambda{ Order.fulfilled.between(1.week.ago, 1.day.ago, field) }.should_not raise_error(ActiveRecord::StatementInvalid) end end spec/rangetastic_spec.rb a65aa40a7ea3f5cf12d782faf53c1d01886bf875 Chris Herring chris.herring.iphone@gmail.com http://github.com/cherring/rangetastic/commit/1b8d73a2aecb1219eb6785015dda9155ffca5383 1b8d73a2aecb1219eb6785015dda9155ffca5383 2009-07-28T05:57:48-07:00 2009-07-28T05:57:48-07:00 Pushed to 0.3.1, tidied up the private code a bit made more DRY 7310599d887906eda6e7e84678a04a962d666aba Chris Herring chris.herring.iphone@gmail.com