lib/redistat/finder.rb in redistat-0.1.0 vs lib/redistat/finder.rb in redistat-0.1.1

@@ -1,36 +1,141 @@
 module Redistat
   class Finder
     include Database
     
+    class << self
+      def find(*args)
+        new.find(*args)
+      end
+      
+      def scope(scope)
+        new.scope(scope)
+      end
+      
+      def label(label)
+        new.label(label)
+      end
+      
+      def dates(from, till)
+        new.dates(from, till)
+      end
+      alias :date :dates
+      
+      def from(date)
+        new.from(date)
+      end
+      
+      def till(date)
+        new.till(date)
+      end
+      alias :untill :till
+      
+      def depth(unit)
+        new.depth(unit)
+      end
+      
+      def interval(unit)
+        new.interval(unit)
+      end
+    end
+    
     attr_reader :options
     
     def initialize(options = {})
       @options = options
     end
     
-    def db
-      super(@options[:connection_ref])
+    def all(reload = false)
+      @result = nil if reload
+      @result ||= find
     end
     
-    def valid_options?
-      return true if !@options[:scope].blank? && !@options[:label].blank? && !@options[:from].blank? && !@options[:till].blank?
-      false
+    def total
+      all.total
     end
     
+    def each(&block)
+      all.each(&block)
+    end
+    
+    def map(&block)
+      all.map(&block)
+    end
+    
+    def each_with_index(&block)
+      all.each_with_index(&block)
+    end
+    
+    def connection_ref(ref)
+      reset! if @options[:connection_ref] != ref
+      @options[:connection_ref] = ref
+      self
+    end
+    
+    def scope(scope)
+      reset! if @options[:scope] != scope
+      @options[:scope] = scope
+      self
+    end
+    
+    def label(label)
+      reset! if @options[:label] != label
+      @options[:label] = label
+      self
+    end
+    
+    def dates(from, till)
+      from(from).till(till)
+    end
+    alias :date :dates
+    
+    def from(date)
+      reset! if @options[:from] != date
+      @options[:from] = date
+      self
+    end
+    
+    def till(date)
+      reset! if @options[:till] != date
+      @options[:till] = date
+      self
+    end
+    alias :until :till
+    
+    def depth(unit)
+      reset! if @options[:depth] != unit
+      @options[:depth] = unit
+      self
+    end
+    
+    def interval(unit)
+      reset! if @options[:interval] != unit
+      @options[:interval] = unit
+      self
+    end
+    
     def find(options = {})
-      @options.merge!(options)
+      set_options(options)
       raise InvalidOptions.new if !valid_options?
       if @options[:interval].nil? || !@options[:interval]
         find_by_magic
       else
         find_by_interval
       end
     end
     
+    private
+    
+    def set_options(opts = {})
+      opts = opts.clone
+      opts.each do |key, value|
+        self.send(key, opts.delete(key)) if self.respond_to?(key)
+      end
+      @options.merge!(opts)
+    end
+    
     def find_by_interval(options = {})
-      @options.merge!(options)
       raise InvalidOptions.new if !valid_options?
       key = build_key
       col = Collection.new(@options)
       col.total = Result.new(@options)
       build_date_sets.each do |set|
@@ -46,11 +151,10 @@
       end
       col
     end
     
     def find_by_magic(options = {})
-      @options.merge!(options)
       raise InvalidOptions.new if !valid_options?
       key = Key.new(@options[:scope], @options[:label])
       col = Collection.new(@options)
       col.total = Result.new(@options)
       col << col.total
@@ -62,11 +166,20 @@
           col.total.set_or_incr(k, v.to_i)
         end
       end
       col
     end
+
+    def reset!
+      @result = nil
+    end
     
+    def valid_options?
+      return true if !@options[:scope].blank? && !@options[:label].blank? && !@options[:from].blank? && !@options[:till].blank?
+      false
+    end
+    
     def build_date_sets
       Finder::DateSet.new(@options[:from], @options[:till], @options[:depth], @options[:interval])
     end
     
     def build_key
@@ -89,81 +202,11 @@
         end
       end
       sum
     end
     
-    class << self
-    
-      def find(*args)
-        new.find(*args)
-      end
-      
-      def scope(scope)
-        new.scope(scope)
-      end
-      
-      def label(label)
-        new.label(label)
-      end
-      
-      def dates(from, till)
-        new.dates(from, till)
-      end
-      alias :date :dates
-      
-      def from(date)
-        new.from(date)
-      end
-      
-      def till(date)
-        new.till(date)
-      end
-      alias :untill :till
-      
-      def depth(unit)
-        new.depth(unit)
-      end
-      
-      def interval(unit)
-        new.interval(unit)
-      end
-      
-    end
-    
-    def scope(scope)
-      @options[:scope] = scope
-      self
-    end
-    
-    def label(label)
-      @options[:label] = label
-      self
-    end
-    
-    def dates(from, till)
-      from(from).till(till)
-    end
-    alias :date :dates
-    
-    def from(date)
-      @options[:from] = date
-      self
-    end
-    
-    def till(date)
-      @options[:till] = date
-      self
-    end
-    alias :until :till
-    
-    def depth(unit)
-      @options[:depth] = unit
-      self
-    end
-    
-    def interval(unit)
-      @options[:interval] = unit
-      self
+    def db
+      super(@options[:connection_ref])
     end
     
   end
 end
\ No newline at end of file