jimeh/redistat
1
0
Fork 0
mirror of https://github.com/jimeh/redistat.git synced 2026-02-19 13:26:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

reordered the argument order to Event.new

Browse Source
This commit is contained in:
Jim Myhrberg
2010-11-22 12:09:36 +00:00
parent 00131d5ed6
commit aaf98a8a62
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/redistat/event.rb
View File

@@ -9,7 +9,7 @@ module Redistat
attr_accessor :meta attr_accessor :meta
attr_accessor :options attr_accessor :options
def initialize(scope, label = nil, date = nil, stats = {}, meta = {}, options = {}, is_new = true) def initialize(scope, label = nil, date = nil, stats = {}, options = {}, meta = {}, is_new = true)
@options = default_options.merge(options) @options = default_options.merge(options)
@key = Key.new(scope, label, date, @options) @key = Key.new(scope, label, date, @options)
@stats = stats ||= {} @stats = stats ||= {}

10
spec/event_spec.rb
View File

@@ -12,7 +12,7 @@ describe Redistat::Event do
@meta = {:user_id => 239} @meta = {:user_id => 239}
@options = {:depth => :hour} @options = {:depth => :hour}
@date = Time.now @date = Time.now
@event = Redistat::Event.new(@scope, @label, @date, @stats, @meta, @options) @event = Redistat::Event.new(@scope, @label, @date, @stats, @options, @meta)
end end
it "should initialize properly" do it "should initialize properly" do
@@ -43,7 +43,7 @@ describe Redistat::Event do
end end
it "should increment next_id" do it "should increment next_id" do
event = Redistat::Event.new("VisitorCount", @label, @date, @stats, @meta, @options) event = Redistat::Event.new("VisitorCount", @label, @date, @stats, @options, @meta)
@event.next_id.should == 1 @event.next_id.should == 1
event.next_id.should == 1 event.next_id.should == 1
@event.next_id.should == 2 @event.next_id.should == 2
@@ -51,7 +51,7 @@ describe Redistat::Event do
end end
it "should store event properly" do it "should store event properly" do
@event = Redistat::Event.new(@scope, @label, @date, @stats, @meta, @options.merge({:store_event => true})) @event = Redistat::Event.new(@scope, @label, @date, @stats, @options.merge({:store_event => true}), @meta)
@event.new?.should be_true @event.new?.should be_true
@event.save @event.save
@event.new?.should be_false @event.new?.should be_false
@@ -61,7 +61,7 @@ describe Redistat::Event do
end end
it "should find event by id" do it "should find event by id" do
@event = Redistat::Event.new(@scope, @label, @date, @stats, @meta, @options.merge({:store_event => true})).save @event = Redistat::Event.new(@scope, @label, @date, @stats, @options.merge({:store_event => true}), @meta).save
fetched = Redistat::Event.find(@scope, @event.id) fetched = Redistat::Event.find(@scope, @event.id)
@event.scope.should == fetched.scope @event.scope.should == fetched.scope
@event.label.should == fetched.label @event.label.should == fetched.label
@@ -70,7 +70,7 @@ describe Redistat::Event do
it "should store summarized statistics" do it "should store summarized statistics" do
2.times do |i| 2.times do |i|
@event = Redistat::Event.new(@scope, @label, @date, @stats, @meta, @options).save @event = Redistat::Event.new(@scope, @label, @date, @stats, @options, @meta).save
Redistat::Date::DEPTHS.each do |depth| Redistat::Date::DEPTHS.each do |depth|
summary = db.hgetall @event.key.to_s(depth) summary = db.hgetall @event.key.to_s(depth)
summary.should have_at_least(1).items summary.should have_at_least(1).items