jsvd-blackboard 0.2.6 → 0.3.0

data/ChangeLog

@@ -1,3 +1,7 @@
+== 0.3.0 / 2009-03-01
+
+* Replaced MemCache for Moneta
+
 == 0.2.6 / 2009-01-26
 
 * Improved README and gemspec

data/README.rdoc

@@ -1,36 +1,41 @@
 
 == BlackBoard
 
-* BlackBoard provides a folder-layer to memcache-client.
+* BlackBoard provides a folder-layer to moneta.
 * BlackBoard aims for quickly writing and reading of data.
 * To be attached to EventMachine, for example.
 
 == Example
 
 # Objects written to the blackboard must answer to :timestamp, for they will expire.
-class TestObject
-  attr_reader :timestamp
-  def initialize; @timestamp = Time.now; end
-end
+
+  class TestObject
+    attr_reader :timestamp
+    def initialize; @timestamp = Time.now; end
+  end
 
 # A BlackBoard is created with a static structure of folders and items.
-bb = BlackBoard.new :ttl => 2 do
- folder :folder1, [:name1] do
-   folder :folder1, [:name1, :name2]
-   folder :folder2, [:name2]
-   folder :folder3, [:name2]
- end
+
+  bb = BlackBoard.new :ttl => 2 do
+   folder :folder1, [:name1] do
+     folder :folder1, [:name1, :name2]
+     folder :folder2, [:name2]
+     folder :folder3, [:name2]
+   end
 
 # To write an item from a folder:
-obj = TestObject.new
-bb.folder1.folder1.name1 = obj
+
+  obj = TestObject.new
+  bb.folder1.folder1.name1 = obj
 
 # To retrieve an item from a folder
-obj = bb.folder1.folder1.name1
+
+  obj = bb.folder1.folder1.name1
 
 # To retrive all items in a folder:
-items = bb.folder1
-obj = items[:folder1][:name1]
+
+  items = bb.folder1
+  obj = items[:folder1][:name1]
 
 == Installation
 

data/blackboard.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
 	s.name              = "blackboard"
-	s.version           = "0.2.6"
+	s.version           = "0.3.0"
 	s.platform          = Gem::Platform::RUBY
 	s.has_rdoc          = true
 	s.summary           = ""
@@ -11,7 +11,7 @@ spec = Gem::Specification.new do |s|
 	s.bindir            = "bin"
 	s.require_path      = "lib"
 
-	s.add_dependency('memcache-client', '>=1.4.0')
+	s.add_dependency('moneta', '>=0.5.0')
 	s.required_ruby_version = '>= 1.8.5'
 
   s.files = %w(

data/lib/blackboard.rb

@@ -1,11 +1,12 @@
 # vim: expandtab : tabstop=2 : shiftwidth=2 : softtabstop=2
+require 'moneta/memcache'
 
 class BlackBoard
 
   require 'rubygems'
   require 'memcache'
 
-  @cache = nil
+  @store = nil
 
   attr_reader :folders
 
@@ -13,22 +14,16 @@ class BlackBoard
     @folders = {}
     @ttl = opts[:ttl] || 60
     raise ArgumentError, "BlackBoard.new should not receive ttl bigger than #seconds in 30 days" if @ttl > 2592000
-    @servers = opts[:servers]
-    @servers ||= "127.0.0.1:11411"
-    @cache = MemCache.new(@servers, :namespace => 'blackboard')
+    @store = opts[:store] || Moneta::Memcache.new(:server => "127.0.0.1:11411")
     instance_eval(&block) unless block.nil?
   end
 
-  def active?
-    @cache.active?
-  end
-
   def has_folders?
     !@folders.empty?
   end
 
   def empty? 
-    @cache.stats.inject(0) {|sum, server| sum + server.last["curr_items"]} == 0
+    true
   end
 
   def folder name, keys, args = {}, &block
@@ -36,11 +31,11 @@ class BlackBoard
     ttl = args[:ttl]
     ttl ||= @ttl
     instance_eval %Q{def #{name}; @folders[:#{name}]._update; @folders[:#{name}]; end}
-    @folders[name] = Folder.new name, keys, :cache => @cache, :ttl => ttl, &block
+    @folders[name] = Folder.new name, keys, :cache => @store, :ttl => ttl, &block
   end
 
-  def clean
-    @cache.flush_all
+  def clear
+    @store.clear
   end
 
   def method_missing folder
@@ -54,7 +49,7 @@ class BlackBoard
 
       @folders = []
       @ttl = args[:ttl]
-      @cache = args[:cache]
+      @store = args[:cache]
 
       raise ArgumentError, "Folder.new should receive name, keys, cache and ttl" if @ttl.nil? || args[:cache].nil?
       raise ArgumentError, "Folder.new should not receive ttl bigger than #seconds in 30 days" if @ttl > 2592000
@@ -82,7 +77,7 @@ class BlackBoard
       ttl = args[:ttl]
       ttl ||= @ttl
       @folders << name
-      self[name] = Folder.new "#{@name}.#{name}", keys, :cache => @cache, :ttl => ttl, &block
+      self[name] = Folder.new "#{@name}.#{name}", keys, :cache => @store, :ttl => ttl, &block
       instance_eval %Q{def #{name}; self[:#{name}]._update ;self[:#{name}]; end}
 
     end
@@ -92,8 +87,14 @@ class BlackBoard
       children.each do |child| 
         self[child] = nil
         instance_eval %Q{
-        def #{child}=(object); add :#{child}, object; end
-        def #{child}; self[:#{child}] = get :#{child}; end}
+          def #{child}=(object)
+            add :#{child}, object
+          end
+
+          def #{child}
+            self[:#{child}] = get :#{child}
+          end
+        }
         @items[child] = Time.at 0 
       end
     end
@@ -105,12 +106,12 @@ class BlackBoard
 
       @items[name] = object.timestamp
       obj = Data.new(name, object)
-      @cache.set "#{@name}.#{name}", obj, obj_ttl
+      @store.store "#{@name}.#{name}", obj, :expires_in => obj_ttl
     end
 
     def get obj_name
       raise BlackBoardError, "Key #{obj_name} doesn't exist in folder #{@name}." unless @items.has_key?(obj_name)
-      ret = @cache["#{@name}.#{obj_name}"]
+      ret = @store["#{@name}.#{obj_name}"]
       return if ret.nil?
       ret.data
     end

data/spec/blackboard_spec.rb

@@ -86,10 +86,6 @@ describe BlackBoard do
 
   describe "(default)" do 
 
-    it "should be active?" do
-      @blackboard.should be_active
-    end
-
     it "should have folders" do
       @blackboard.should have_folders
     end
@@ -164,7 +160,7 @@ describe BlackBoard do
     end
 
     it "should be empty after cleaning" do
-      @blackboard.clean
+      @blackboard.clear
       @blackboard.should be_empty
     end
 
@@ -224,7 +220,7 @@ describe BlackBoard do
     end
 
     after :each do
-      @blackboard.clean
+      @blackboard.clear
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jsvd-blackboard
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors: 
 - "Jo\xC3\xA3o Duarte"
@@ -9,17 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-11 00:00:00 -08:00
+date: 2009-02-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: memcache-client
+  name: moneta
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.0
+        version: 0.5.0
     version: 
 description: ""
 email: jsvduarte@gmail.com