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

@@ -1,72 +1,33 @@
 require "date_supercharger/version"
+require "date_supercharger/matcher"
+require "date_supercharger/method_definer"
 require "active_record"
 
 module DateSupercharger
   extend ActiveSupport::Concern
 
   included do
     def self.method_missing(method_sym, *arguments, &block)
       return super unless descends_from_active_record?
-      match = ModelDateExtensionMatch.new(self,method_sym)
+      matcher = Matcher.new(self,method_sym)
 
-      if match.match?
-        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
+      if matcher.match?
+        method_definer = MethodDefiner.new(self)
+        method_definer.define(attribute: matcher.attribute, suffix: matcher.suffix)
         send(method_sym, *arguments)
       else
         super
       end
     end
 
     def self.respond_to?(method_sym, include_private = false)
       return super unless descends_from_active_record?
-      if ModelDateExtensionMatch.new(self,method_sym).match?
+      if Matcher.new(self,method_sym).match?
         true
       else
         super
       end
     end
   end
-
-  class ModelDateExtensionMatch
-
-    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|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
-      end
-
-    end
-
-    def match?
-      @attribute != nil
-    end
-  end
-
 end
 ActiveRecord::Base.send :include, DateSupercharger