cherring-rangetastic 0.2.0 → 0.3.0

data/README.markdown

@@ -27,8 +27,14 @@ Now you can also access this with the following syntax for any field ending with
 
     Order.fulfilled.ordered_between(1.week.ago, 10.minutes.ago)
 
-But if that field isn't on the Model or isn't an _on field then it will raise the standard NoMethodError.
+In this new version of rangetastic you can also query on _at fields. If you have an _at field such as created_at you can now
+
+    Order.fulfilled.created_between(1.week.ago, 10.minutes.ago)
+    
+However if you have an _on field and _at field the on field will take precedence over the at. If you want to access the _at field over _on field you will need to use the .between and whitelisted fields method specified first.
+
+But if your field isn't on the Model or isn't an _on or an _at field then it will raise the standard NoMethodError.
 
 And if you (or someone nasty!) try to use a field that is not whitelisted, it will raise ActiveRecord::StatementInvalid
 
-Thanks to spraints for some inspiration.
+Thanks to [spraints](http://github.com/spraints) for some inspiration.

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('rangetastic', '0.2.0') do |p|
+Echoe.new('rangetastic', '0.3.0') 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"

data/lib/rangetastic.rb

@@ -15,15 +15,25 @@ module Rangetastic
     
     private
       def method_missing(symbol, *args, &block)
-        if (columns_hash.has_key? field(symbol)) || @fields.has_key?(field(symbol))
-          make_scope(symbol, field(symbol), *args)
+        if (field(symbol) || @fields.include?(field_to_query))
+          make_scope(symbol, field_to_query, *args)
         else
           super
         end
       end
       
       def field(symbol)
-        "#{symbol.to_s.gsub("_between","")}_on"
+        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"
+        else
+          @field = nil
+        end
+      end
+      
+      def field_to_query
+        @field
       end
       
       def make_scope(scope, field, *args)

data/rangetastic.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rangetastic}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   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-03}
+  s.date = %q{2009-07-25}
   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"]

data/spec/fixtures/models.rb

@@ -1,6 +1,6 @@
 class Order < ActiveRecord::Base
 
-  acts_as_rangetastic :fields => ["fulfilled_on","ordered_on","shipped_on"]
+  acts_as_rangetastic :fields => ["fulfilled_on","ordered_on","shipped_at"]
   
   named_scope :fulfilled, :conditions => ["fulfilled_on is not null"]
   

data/spec/fixtures/structure.sql

@@ -13,7 +13,7 @@ CREATE TABLE orders (
     id integer NOT NULL default nextval('orders_id_seq'),
     ordered_on timestamp,
     fulfilled_on timestamp,
-    shipped_on timestamp,
+    shipped_at timestamp,
     created_at timestamp without time zone,
     updated_at timestamp without time zone
 );

data/spec/rangetastic_spec.rb

@@ -30,7 +30,7 @@ describe Order do
     Order.fulfilled.ordered_between(10.days.ago, 1.day.ago).size.should == 5
   end
   
-  %w(ordered shipped fulfilled).each do |field|
+  %w(ordered shipped fulfilled created updated).each do |field|
     it "should be able to access #{field}_between" do
       lambda{ Order.send("#{field}_between", 1.day.ago, Date.today) }.should_not raise_error(NoMethodError)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cherring-rangetastic
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Chris Herring
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-03 00:00:00 -07:00
+date: 2009-07-25 00:00:00 -07:00
 default_executable: 
 dependencies: []