lib/date_supercharger.rb in date_supercharger-0.0.2 vs lib/date_supercharger.rb in date_supercharger-0.1.0

@@ -8,15 +8,30 @@
     def self.method_missing(method_sym, *arguments, &block)
       return super unless descends_from_active_record?
       match = ModelDateExtensionMatch.new(self,method_sym)
 
       if match.match?
-        operators = { after: ">", before: "<", before_or_at: "<=", after_or_at: ">=" }
-        singleton_class.class_eval do
-          define_method("#{match.attribute}_#{match.suffix}") do |date|
-            where("#{match.attribute} #{operators[match.suffix]} ?", date)
+        case match.suffix
+        when :after,:before,:before_or_at,:after_or_at
+          operators = { after: ">", before: "<", before_or_at: "<=", after_or_at: ">=" }
+          singleton_class.class_eval do
+            define_method("#{match.attribute}_#{match.suffix}") do |date|
+              where("#{match.attribute} #{operators[match.suffix]} ?", date)
+            end
           end
+        when :between
+          singleton_class.class_eval do
+            define_method("#{match.attribute}_#{match.suffix}") do |from,to|
+              send("#{match.attribute}_after_or_at",from).send("#{match.attribute}_before",to)
+            end
+          end
+        when :between_inclusive
+          singleton_class.class_eval do
+            define_method("#{match.attribute}_#{match.suffix}") do |from,to|
+              send("#{match.attribute}_after_or_at",from).send("#{match.attribute}_before_or_at",to)
+            end
+          end
         end
         send(method_sym, *arguments)
       else
         super
       end
@@ -36,10 +51,10 @@
 
     attr_accessor :attribute,:suffix
 
     def initialize(model,method_sym)
       #TODO: implement between and between_inclusive
-      if method_sym.to_s =~ /^(.+)_(before|after|before_or_at|after_or_at)$/
+      if method_sym.to_s =~ /^(.+)_(before|after|before_or_at|after_or_at|between|between_inclusive)$/
         date_columns = model.columns_hash.keys.select { |c| [:datetime,:date].include? model.columns_hash[c].type }.map(&:to_sym)
         if date_columns.include? $1.to_sym
           @attribute = $1.to_sym
           @suffix = $2.to_sym
         end