added default depth option to Key object

This commit is contained in:
2010-07-23 22:41:10 +03:00
parent de3d63282b
commit 7830b0c5be
2 changed files with 21 additions and 8 deletions

View File

@@ -9,13 +9,21 @@ module Redistat
@scope = scope
self.label = label if !label.nil?
self.date = date ||= Time.now
self.options = options
@options = default_options.merge(options ||= {})
end
def default_options
{ :depth => :day }
end
def date=(input)
@date = (input.instance_of?(Redistat::Date)) ? input : Date.new(input) # Redistat::Date, not ::Date
end
def depth
@options[:depth]
end
def label
@label.name
end
@@ -29,7 +37,7 @@ module Redistat
end
def to_s(depth = nil)
depth ||= @options[:depth] if !@options[:depth].nil?
depth ||= @options[:depth]
key = "#{@scope}"
key << "/" + ((@options[:label_hash].nil? || @options[:label_hash] == true) ? @label.hash : @label.name) if !label.nil?
key << ":#{@date.to_s(depth)}"