cherring-rangetastic 0.1.3 → 0.2.0

data/README.markdown

@@ -23,4 +23,12 @@ You can then chain the between scope with any named_scope call you make:
 
     Order.fulfilled.between(1.week.ago, 10.minutes.ago, "fulfilled_on")
     
-And if you (or someone nasty!) try to use a field that is not whitelisted, it will raise ActiveRecord::StatementInvalid
+Now you can also access this with the following syntax for any field ending with _on that is on the Model you are calling from like so.
+
+    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.
+
+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.

data/Rakefile

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

@@ -6,11 +6,36 @@ module Rangetastic
   
   module ClassMethods
     def acts_as_rangetastic(options = {:fields => []})
+      @fields = options[:fields]
       named_scope :between, lambda{ |start_date, end_date, fieldname|
-        field = options[:fields].include?(fieldname) ? fieldname : raise(ActiveRecord::StatementInvalid)
+        field = @fields.include?(fieldname) ? fieldname : raise(ActiveRecord::StatementInvalid)
         { :conditions => ["#{field} >= ? AND #{field} <= ?", start_date, end_date] }
       }
     end
+    
+    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)
+        else
+          super
+        end
+      end
+      
+      def field(symbol)
+        "#{symbol.to_s.gsub("_between","")}_on"
+      end
+      
+      def make_scope(scope, field, *args)
+        named_scope scope, lambda{ |start_date, end_date|
+          { :conditions => ["#{field} BETWEEN ? AND ?", start_date, end_date] }
+        }
+        call_scope(scope, *args)
+      end
+    
+      def call_scope(scope, *args)
+        self.send(scope, args[0], args[1])
+      end
   end
 end
 

data/rangetastic.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rangetastic}
-  s.version = "0.1.3"
+  s.version = "0.2.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-01}
+  s.date = %q{2009-07-03}
   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/rangetastic_spec.rb

@@ -26,4 +26,17 @@ describe Order do
     end
   end
   
+  it "should have 5 orders fulfilled that were ordered no more than 10 days ago - 3" do
+    Order.fulfilled.ordered_between(10.days.ago, 1.day.ago).size.should == 5
+  end
+  
+  %w(ordered shipped fulfilled).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
+  end
+  
+  it "should raise no method error when a field doesn't exist" do
+    lambda{ Order.eaten_between(1.day.ago, Date.today) }.should raise_error(NoMethodError)
+  end
 end

metadata

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