diff --git a/lib/redistat.rb b/lib/redistat.rb index 2d6cd95..d718fe3 100644 --- a/lib/redistat.rb +++ b/lib/redistat.rb @@ -14,10 +14,10 @@ require 'redistat/date' require 'redistat/event' require 'redistat/finder' require 'redistat/finder/date_set' -require 'redistat/hash' require 'redistat/key' require 'redistat/label' require 'redistat/model' +require 'redistat/result' require 'redistat/scope' require 'redistat/summary' diff --git a/lib/redistat/finder.rb b/lib/redistat/finder.rb index 0bb9807..fbd8578 100644 --- a/lib/redistat/finder.rb +++ b/lib/redistat/finder.rb @@ -18,9 +18,9 @@ module Redistat return nil if !valid_options? sets = Finder::DateSet.new(@options[:from], @options[:till], @options[:depth], @options[:interval]) key = Key.new(@options[:scope], @options[:label]) - total_sum = Hash.new + total_sum = Result.new sets.each do |set| - sum = Hash.new + sum = Result.new sum = summarize_add_keys(set[:add], key, sum) sum = summarize_rem_keys(set[:rem], key, sum) sum.each do |k, v| diff --git a/lib/redistat/hash.rb b/lib/redistat/hash.rb deleted file mode 100644 index 5192e0d..0000000 --- a/lib/redistat/hash.rb +++ /dev/null @@ -1,11 +0,0 @@ -module Redistat - class Hash < ::Hash - - def set_or_incr(key, value) - self[key] = 0 if !self.has_key?(key) - self[key] += value - self - end - - end -end \ No newline at end of file