From 8b711d4d9c262be33bc5f5c0b95c39feee7d809c Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Sun, 13 Mar 2011 20:24:06 +0000
Subject: [PATCH] fixed a bug with Event#find

---
 lib/redistat/event.rb | 2 +-
 spec/event_spec.rb    | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/redistat/event.rb b/lib/redistat/event.rb
index 5313b31..dedd696 100644
--- a/lib/redistat/event.rb
+++ b/lib/redistat/event.rb
@@ -91,7 +91,7 @@ module Redistat
       event = db.hgetall "#{scope}#{KEY_EVENT}#{id}"
       return nil if event.size == 0
       self.new( event["scope"], event["label"], event["date"], JSON.parse(event["stats"]),
-                JSON.parse(event["meta"]), JSON.parse(event["options"]), false )
+                JSON.parse(event["options"]), JSON.parse(event["meta"]), false )
     end
     
   end
diff --git a/spec/event_spec.rb b/spec/event_spec.rb
index b7384c0..39add3b 100644
--- a/spec/event_spec.rb
+++ b/spec/event_spec.rb
@@ -8,8 +8,8 @@ describe Redistat::Event do
     @scope = "PageViews"
     @label = "about_us"
     @label_hash = Digest::SHA1.hexdigest(@label)
-    @stats = {:views => 1}
-    @meta = {:user_id => 239}
+    @stats = {'views' => 1}
+    @meta = {'user_id' => 239}
     @options = {:depth => :hour}
     @date = Time.now
     @event = Redistat::Event.new(@scope, @label, @date, @stats, @options, @meta)
@@ -66,6 +66,8 @@ describe Redistat::Event do
     @event.scope.to_s.should == fetched.scope.to_s
     @event.label.to_s.should == fetched.label.to_s
     @event.date.to_s.should == fetched.date.to_s
+    @event.stats.should == fetched.stats
+    @event.meta.should == fetched.meta
   end
   
   it "should store summarized statistics" do