redistat 0.3.0 → 0.4.0

data/lib/redistat/finder.rb

@@ -3,117 +3,117 @@ require 'redistat/finder/date_set'
 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(opts = {})
       set_options(opts)
     end
-    
+
     def options
       @options ||= {}
     end
-    
+
     def all(reload = false)
       @result = nil if reload
       @result ||= find
     end
-    
+
     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 parent
       @parent ||= self.class.new(options.merge(:label => options[:label].parent)) unless options[:label].nil?
     end
-    
+
     def children
       build_key.children.map { |key|
         self.class.new(options.merge(:label => key.label.to_s))
       }
     end
-    
+
     def connection_ref(ref = nil)
       return options[:connection_ref] if ref.nil?
       reset! if options[:connection_ref] != ref
       options[:connection_ref] = ref
       self
     end
-    
+
     def scope(input = nil)
       return options[:scope] if input.nil?
       reset! if !options[:scope].nil? && options[:scope].to_s != input.to_s
       options[:scope] = Scope.new(input)
       self
     end
-    
+
     def label(input = nil)
       return options[:label] if input.nil?
       reset! if options.has_key?(:label) && options[:label].to_s != input.to_s
       options[:label] = (!input.nil?) ? Label.new(input) : nil
       self
     end
-    
+
     def dates(start, finish)
       from(start).till(finish)
     end
     alias :date :dates
-    
+
     def from(date = nil)
       return options[:from] if date.nil?
       reset! if options[:from] != date
       options[:from] = date
       self
     end
-    
+
     def till(date = nil)
       return options[:till] if date.nil?
       reset! if options[:till] != date
@@ -121,21 +121,21 @@ module Redistat
       self
     end
     alias :until :till
-    
+
     def depth(unit = nil)
       return options[:depth] if unit.nil?
       reset! if options[:depth] != unit
       options[:depth] = unit
       self
     end
-    
+
     def interval(unit = nil)
       return options[:interval] if unit.nil?
       reset! if options[:interval] != unit
       options[:interval] = unit
       self
     end
-    
+
     def find(opts = {})
       set_options(opts)
       raise InvalidOptions.new if !valid_options?
@@ -145,9 +145,9 @@ module Redistat
         find_by_interval
       end
     end
-    
+
     private
-    
+
     def set_options(opts = {})
       opts = opts.clone
       opts.each do |key, value|
@@ -155,7 +155,7 @@ module Redistat
       end
       self.options.merge!(opts)
     end
-    
+
     def find_by_interval
       raise InvalidOptions.new if !valid_options?
       key = build_key
@@ -174,7 +174,7 @@ module Redistat
       end
       col
     end
-    
+
     def find_by_magic
       raise InvalidOptions.new if !valid_options?
       key = build_key
@@ -196,20 +196,20 @@ module Redistat
       @result = nil
       @parent = 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
       Key.new(options[:scope], options[:label])
     end
-    
+
     def summarize_add_keys(sets, key, sum)
       sets.each do |date|
         db.hgetall("#{key.prefix}#{date}").each do |k, v|
@@ -218,7 +218,7 @@ module Redistat
       end
       sum
     end
-    
+
     def summarize_rem_keys(sets, key, sum)
       sets.each do |date|
         db.hgetall("#{key.prefix}#{date}").each do |k, v|
@@ -227,10 +227,10 @@ module Redistat
       end
       sum
     end
-    
+
     def db
       super(options[:connection_ref])
     end
-    
+
   end
-end
+end

data/lib/redistat/finder/date_set.rb

@@ -1,7 +1,7 @@
 module Redistat
   class Finder
     class DateSet < Array
-      
+
       def initialize(start_date = nil, end_date = nil, depth = nil, interval = false)
         if !start_date.nil? && !end_date.nil?
           find_date_sets(start_date, end_date, depth, interval)
@@ -71,7 +71,7 @@ module Redistat
           end
           { :add => add, :rem => [] }
         elsif has_nunit
-          { :add => [end_date.beginning_of(nunit).to_rs.to_s(nunit)], 
+          { :add => [end_date.beginning_of(nunit).to_rs.to_s(nunit)],
             :rem => end_date.map_beginning_of_each(unit, :include_start => !lowest_depth).until(end_date.end_of(nunit)) { |t| t.to_rs.to_s(unit) } }
         else
           { :add => [], :rem => [] }
@@ -93,7 +93,7 @@ module Redistat
           { :add => [], :rem => [] }
         end
       end
-      
+
     end
   end
-end
+end

data/lib/redistat/key.rb

@@ -2,56 +2,56 @@ module Redistat
   class Key
     include Database
     include Options
-    
+
     def default_options
       { :depth => :hour }
     end
-    
+
     def initialize(scope, label_name = nil, time_stamp = nil, opts = {})
       parse_options(opts)
       self.scope = scope
       self.label = label_name if !label_name.nil?
       self.date = time_stamp ||= Time.now
     end
-    
+
     def prefix
       key = "#{@scope}"
       key << "/#{label.name}" if !label.nil?
       key << ":"
       key
     end
-    
+
     def date=(input)
       @date = (input.instance_of?(Redistat::Date)) ? input : Date.new(input) # Redistat::Date, not ::Date
     end
     attr_reader :date
-    
+
     def depth
       options[:depth]
     end
-    
+
     # def scope
     #   @scope.to_s
     # end
-    
+
     def scope=(input)
       @scope = (input.instance_of?(Redistat::Scope)) ? input : Scope.new(input)
     end
     attr_reader :scope
-    
+
     def label=(input)
       @label = (input.instance_of?(Redistat::Label)) ? input : Label.create(input, @options)
     end
     attr_reader :label
-    
+
     def label_hash
       @label.hash
     end
-    
+
     def parent
       @parent ||= self.class.new(self.scope, @label.parent, self.date, @options) unless @label.parent.nil?
     end
-    
+
     def children
       members = db.smembers("#{scope}#{LABEL_INDEX}#{@label}") || [] # older versions of Redis returns nil
       members.map { |member|
@@ -59,26 +59,26 @@ module Redistat
         self.class.new(self.scope, child_label.join(GROUP_SEPARATOR), self.date, @options)
       }
     end
-    
+
     def update_index
       @label.groups.each do |label|
         parent = (label.parent || "")
         db.sadd("#{scope}#{LABEL_INDEX}#{parent}", label.me)
       end
     end
-    
+
     def groups
       @groups ||= @label.groups.map do |label|
         self.class.new(@scope, label, self.date, @options)
       end
     end
-    
+
     def to_s(depth = nil)
       depth ||= @options[:depth]
       key = self.prefix
       key << @date.to_s(depth)
       key
     end
-    
+
   end
-end
+end

data/lib/redistat/label.rb

@@ -2,55 +2,55 @@ module Redistat
   class Label
     include Database
     include Options
-    
+
     def default_options
       { :hashed_label => false }
     end
-    
+
     def self.create(name, opts = {})
       self.new(name, opts).save
     end
-    
+
     def self.join(*args)
       args = args.map {|i| i.to_s}
       self.new(args.reject {|i| i.blank? }.join(GROUP_SEPARATOR))
     end
-    
+
     def initialize(str, opts = {})
       parse_options(opts)
       @raw = str.to_s
     end
-    
+
     def to_s
       @raw
     end
-    
+
     def name
       @options[:hashed_label] ? hash : self.to_s
     end
-    
+
     def hash
       @hash ||= Digest::SHA1.hexdigest(self.to_s)
     end
-    
+
     def save
       @saved = db.hset(KEY_LABELS, hash, self.to_s) if @options[:hashed_label]
       self
     end
-    
+
     def saved?
       return true unless @options[:hashed_label]
       @saved ||= false
     end
-    
+
     def parent
       @parent ||= groups[1] if groups.size > 1
     end
-    
+
     def me
       self.to_s.split(GROUP_SEPARATOR).last
     end
-    
+
     def groups
       return @groups unless @groups.nil?
       @groups = []
@@ -64,6 +64,6 @@ module Redistat
       end
       @groups.reverse!
     end
-    
+
   end
-end
+end

data/lib/redistat/mixins/database.rb

@@ -8,4 +8,4 @@ module Redistat
       Redistat.connection(ref)
     end
   end
-end
+end