dam 0.2.0 → 0.3.0

data/lib/dam.rb

@@ -7,9 +7,7 @@ require 'yajl'
 module Dam
   
   def self.push(activity)
-    Dam::Stream.all.select {|stream| stream.matches? activity }.each do |stream|
-      Dam::Storage.insert(stream, activity)
-    end
+    Dam::Storage.insert(activity, Dam::Stream.all.select {|stream| stream.matches? activity })
   end
   
   def self.post(type, params = {})

data/lib/dam/storage.rb

@@ -15,23 +15,41 @@ module Dam
       @database = database
     end
     
-    def self.insert(stream, activity)
-      key = stream.name
-      
-      self.database.push_head("stream:#{key}", activity.to_json)
-      self.database.ltrim("stream:#{key}", 0, (stream.limit || 10) - 1)
+    def self.insert(activity, streams)
+      id = self.save(activity)
       
+      streams.each do |stream|
+        self.database.push_head("stream:#{stream.name}", "activity:#{id}")
+        self.database.ltrim("stream:#{stream.name}", 0, (stream.limit || 10) - 1)
+      end
     end
     
     def self.get(stream_name)
-      self.database.list_range("stream:#{stream_name}", 0, -1)
+      self.database.mget(self.database.list_range("stream:#{stream_name}", 0, -1))
     end
     
     def self.head(stream_name)
-      self.database.list_index("stream:#{stream_name}", 0)
+      self.database[self.database.list_index("stream:#{stream_name}", 0)]
+    end
+    
+    def self.keys(spec='*')
+      self.database.keys("stream:#{spec}").collect {|key| key.sub(/^stream:/, '')}
+    end
+    
+    def self.save activity
+      id = self.generate_unique_id!
+      
+      self.database["activity:#{id}"] = activity.to_json
+      
+      id
     end
     
     private 
+    
+    def self.generate_unique_id!
+      database.incr("dam:activity:id")
+    end
+    
     def Storage.lookup(name)
       @engines ||= {}
       @engines[name]

data/lib/dam/stream.rb

@@ -64,7 +64,7 @@ module Dam
     end
     
     def instances
-      elems = Dam::Storage.database.keys("stream:" + @glob_pattern)
+      elems = Dam::Storage.keys(@glob_pattern)
       elems.collect {|elem| apply(elem) }
     end
     

data/lib/dam/version.rb

@@ -1,3 +1,3 @@
 module Dam
-  Version = "0.2.0"
+  Version = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dam
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jean-Philippe Bougie
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 -05:00
+date: 2009-11-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency