hyperactive 0.1.1 → 0.2.2

data/lib/hyperactive/tree.rb

@@ -23,209 +23,217 @@ require 'rbtree'
 module Hyperactive
 
   #
-  # A class suitable for storing large and often-changing datasets in 
-  # an Archipelago environment.
+  # The package containing the Hash-like Tree class that provides any
+  # kind of index for your Hyperactive classes.
   #
-  # Is constructed like a set of nested Hashes that automatically create
-  # new children on demand, and will thusly only have to check the path from
-  # the root node to the leaf for changes when method calls return (see Archipelago::Treasure::Chest)
-  # and will only have to actually store into database the leaf itself if it
-  # has changed.
-  #
-  class Tree < Record
-
-    attr_accessor :elements, :subtrees
-
-    WIDTH = 1 << 3
+  module Tree
 
     #
-    # Dont call this! Call <i>Tree.get_instance(options)</i> instead!
-    #
-    def initialize(options = {})
-      @width = options[:width] || WIDTH
-      @elements = {}
-      @subtrees = nil
-    end
-    
+    # A class suitable for storing large and often-changing datasets in 
+    # an Archipelago environment.
     #
-    # Deletes +key+ in this Tree.
+    # Is constructed like a set of nested Hashes that automatically create
+    # new children on demand, and will thusly only have to check the path from
+    # the root node to the leaf for changes when method calls return (see Archipelago::Treasure::Chest)
+    # and will only have to actually store into database the leaf itself if it
+    # has changed.
     #
-    def delete(key)
-      if @elements
-        @elements.delete(key)
-      else
-        subtree_for(key).delete(key)
-      end
-    end
+    class Root < Hyperactive::Record::Bass
 
-    #
-    # Returns the size of this Tree.
-    #
-    def size
-      if @elements
-        @elements.size
-      else
-        @subtrees.t_collect do |tree_id, tree|
-          tree.size
-        end.inject(0) do |sum, size|
-          sum + size
+      attr_accessor :elements, :subtrees
+
+      WIDTH = 1 << 3
+
+      #
+      # Dont call this! Call <i>Root.get_instance(options)</i> instead!
+      #
+      def initialize(options = {})
+        @width = options[:width] || WIDTH
+        @elements = {}
+        @subtrees = nil
+      end
+      
+      #
+      # Deletes +key+ in this Root.
+      #
+      def delete(key)
+        if @elements
+          @elements.delete(key)
+        else
+          subtree_for(key).delete(key)
         end
       end
-    end
-    
-    #
-    # Returns all keys and values returning true for +callable+.call(key, value) in this Tree.
-    #
-    def select(callable)
-      if @elements
-        @elements.select do |k,v|
-          callable.call(k,v)
+
+      #
+      # Returns the size of this Root.
+      #
+      def size
+        if @elements
+          @elements.size
+        else
+          @subtrees.t_collect do |tree_id, tree|
+            tree.size
+          end.inject(0) do |sum, size|
+            sum + size
+          end
         end
-      else
-        @subtrees.t_collect do |tree_id, tree|
-          tree.select(callable)
-        end.inject([]) do |sum, match|
-          sum + match
+      end
+      
+      #
+      # Returns all keys and values returning true for +callable+.call(key, value) in this Root.
+      #
+      def select(callable)
+        if @elements
+          @elements.select do |k,v|
+            callable.call(k,v)
+          end
+        else
+          @subtrees.t_collect do |tree_id, tree|
+            tree.select(callable)
+          end.inject([]) do |sum, match|
+            sum + match
+          end
         end
       end
-    end
 
-    #
-    # Returns all keys and values returning false for +callable+.call(key, value) in this Tree.
-    #
-    def reject(callable)
-      if @elements
-        @elements.reject do |k,v|
-          callable.call(k,v)
-        end
-      else
-        @subtrees.t_collect do |tree_id, tree|
-          tree.reject(callable)
-        end.inject([]) do |sum, match|
-          sum + match
+      #
+      # Returns all keys and values returning false for +callable+.call(key, value) in this Root.
+      #
+      def reject(callable)
+        if @elements
+          @elements.reject do |k,v|
+            callable.call(k,v)
+          end
+        else
+          @subtrees.t_collect do |tree_id, tree|
+            tree.reject(callable)
+          end.inject([]) do |sum, match|
+            sum + match
+          end
         end
       end
-    end
 
-    #
-    # Puts +value+ under +key+ in this Tree.
-    #
-    def []=(key, value)
-      if @elements
-        if @elements.size < @width
-          @elements[key] = value
+      #
+      # Puts +value+ under +key+ in this Root.
+      #
+      def []=(key, value)
+        if @elements
+          if @elements.size < @width
+            @elements[key] = value
+          else
+            split!
+            subtree_for(key)[key] = value
+          end
         else
-          split!
           subtree_for(key)[key] = value
         end
-      else
-        subtree_for(key)[key] = value
+        return value
       end
-      return value
-    end
 
-    #
-    # Returns the value for +key+ in this Tree.
-    #
-    def [](key)
-      if @elements
-        return @elements[key]
-      else
-        return subtree_for(key)[key]
+      #
+      # Returns the value for +key+ in this Root.
+      #
+      def [](key)
+        if @elements
+          return @elements[key]
+        else
+          return subtree_for(key)[key]
+        end
       end
-    end
 
-    #
-    # Returns an Array containing +callable+.call(key, value) from all values in this Tree.
-    #
-    def collect(callable)
-      rval = []
-      self.each(Proc.new do |k,v|
-                  rval << callable.call(k,v)
-                end)
-      return rval
-    end
+      #
+      # Returns an Array containing +callable+.call(key, value) from all values in this Root.
+      #
+      def collect(callable)
+        rval = []
+        self.each(Proc.new do |k,v|
+                    rval << callable.call(k,v)
+                  end)
+        return rval
+      end
 
-    #
-    # Does +callable+.call(key, value) on all values in this Tree.
-    #
-    def each(callable)
-      if @elements
-        @elements.each do |key, value|
-          callable.call(key, value)
-        end
-      else
-        @subtrees.t_each do |tree_id, tree|
-          tree.each(callable)
+      #
+      # Does +callable+.call(key, value) on all values in this Root.
+      #
+      def each(callable)
+        if @elements
+          @elements.each do |key, value|
+            callable.call(key, value)
+          end
+        else
+          @subtrees.t_each do |tree_id, tree|
+            tree.each(callable)
+          end
+          nil
         end
-        nil
       end
-    end
 
-    #
-    # Clear everything from this Tree and destroy it.
-    #
-    def destroy
-      if @elements
-        @elements.each do |key, value|
-          value.destroy if value.respond_to?(:destroy)
+      #
+      # Clear everything from this Tree and destroy it.
+      #
+      def destroy
+        if @elements
+          @elements.each do |key, value|
+            value.destroy if value.respond_to?(:destroy)
+          end
+        else
+          @subtrees.each do |tree_id, tree|
+            tree.destroy
+          end
         end
-      else
-        @subtrees.each do |tree_id, tree|
-          tree.destroy
+        freeze
+        super
+      end
+
+      #
+      # Clear everything from this Root.
+      #
+      def clear
+        unless @elements
+          @subtrees.each do |tree_id, tree|
+            tree.clear
+          end
+          @subtrees = nil
         end
+        @elements = {}
       end
-      freeze
-      super
-    end
 
-    #
-    # Clear everything from this Tree.
-    #
-    def clear
-      unless @elements
+      private
+
+      #
+      # Finds the subtree responsible for +key+.
+      #
+      # Does it in this ugly way cause the nice way of just doing modulo gave
+      # really odd results since all hashes seem to give some modulo values
+      # a lot more often than expected.
+      #
+      def subtree_for(key)
+        key_id = Digest::SHA1.new("#{key.hash}#{self.record_id}").to_s
         @subtrees.each do |tree_id, tree|
-          tree.clear
+          return tree if tree_id > key_id
         end
-        @subtrees = nil
+        return @subtrees.values.first
       end
-      @elements = {}
-    end
-
-    private
 
-    #
-    # Finds the subtree responsible for +key+.
-    #
-    # Does it in this ugly way cause the nice way of just doing modulo gave
-    # really odd results since all hashes seem to give some modulo values
-    # a lot more often than expected.
-    #
-    def subtree_for(key)
-      key_id = Digest::SHA1.new("#{key.hash}#{self.record_id}").to_s
-      @subtrees.each do |tree_id, tree|
-        return tree if tree_id > key_id
+      #
+      # Split this Tree by creating @subtrees,
+      # then putting all @elements in them and then emptying @elements.
+      #
+      def split!
+        raise "Cant split twice!" unless @elements
+
+        @subtrees = RBTree.new
+        @subtrees.extend(Archipelago::Current::ThreadedCollection)
+        step = (1 << 160) / @width
+        0.upto(@width - 1) do |n|
+          @subtrees["%x" % (n * step)] = Root.get_instance(:width => @width)
+        end
+        @elements.each do |key, value|
+          subtree_for(key)[key] = value
+        end
+        @elements = nil
       end
-      return @subtrees.values.first
-    end
 
-    #
-    # Split this Tree by creating @subtrees,
-    # then putting all @elements in them and then emptying @elements.
-    #
-    def split!
-      raise "Cant split twice!" unless @elements
-
-      @subtrees = RBTree.new
-      @subtrees.extend(Archipelago::Current::ThreadedCollection)
-      step = (1 << 160) / @width
-      0.upto(@width - 1) do |n|
-        @subtrees["%x" % (n * step)] = Tree.get_instance(:width => @width)
-      end
-      @elements.each do |key, value|
-        subtree_for(key)[key] = value
-      end
-      @elements = nil
     end
 
   end

data/lib/hyperactive.rb

@@ -20,3 +20,4 @@ $: << File.dirname(__FILE__)
 require 'hyperactive/hooker'
 require 'hyperactive/record'
 require 'hyperactive/tree'
+require 'hyperactive/list'

data/tests/list_test.rb

@@ -0,0 +1,76 @@
+
+require File.join(File.dirname(__FILE__), 'test_helper')
+
+class ListTest < Test::Unit::TestCase
+  
+  def setup
+    @c = TestChest.new(:persistence_provider => Archipelago::Hashish::BerkeleyHashishProvider.new(Pathname.new(__FILE__).parent.join("chest.db")))
+    @c.publish!
+    @c2 = TestChest.new(:persistence_provider => Archipelago::Hashish::BerkeleyHashishProvider.new(Pathname.new(__FILE__).parent.join("chest2.db")))
+    @c2.publish!
+    @tm = TestManager.new(:persistence_provider => Archipelago::Hashish::BerkeleyHashishProvider.new(Pathname.new(__FILE__).parent.join("tranny1.db")))
+    @tm.publish!
+    Hyperactive::Record::CAPTAIN.setup(:chest_description => {:class => 'TestChest'},
+                               :tranny_description => {:class => 'TestManager'})
+    Hyperactive::Record::CAPTAIN.update_services!
+    assert_within(10) do
+      Hyperactive::Record::CAPTAIN.chests.keys.sort == [@c.service_id, @c2.service_id].sort
+    end
+    assert_within(10) do
+      Hyperactive::Record::CAPTAIN.trannies.keys == [@tm.service_id]
+    end
+  end
+
+  def teardown
+    @c.stop!
+    @c.persistence_provider.unlink
+    @c2.stop!
+    @c2.persistence_provider.unlink
+    @tm.stop!
+    @tm.persistence_provider.unlink
+    Archipelago::Disco::MC.clear!
+    Hyperactive::Record::CAPTAIN.update_services!
+    assert_within(10) do
+      Hyperactive::Record::CAPTAIN.chests.empty?
+    end
+    assert_within(10) do
+      Hyperactive::Record::CAPTAIN.trannies.empty?
+    end
+  end
+
+  def test_push_unshift_pop_shift
+    l = Hyperactive::List::Head.get_instance
+    assert_equal(0, l.size)
+    l << (r = Hyperactive::Record::Bass.get_instance)
+    assert_equal(1, l.size)
+    assert_equal(l.first, l.last)
+    assert_equal(r, l.first)
+    l << (r2 = Hyperactive::Record::Bass.get_instance)
+    assert_equal(2, l.size)
+    assert_equal(r2, l.last)
+    assert_equal(r, l.first)
+    assert_equal(r2, l.first_element.next.value)
+    l.unshift(r3 = Hyperactive::Record::Bass.get_instance)
+    assert_equal(3, l.size)
+    assert_equal(r3, l.first)
+    assert_equal(r2, l.last)
+    assert_equal(r, l.first_element.next.value)
+    assert_equal(r2, l.first_element.next.next.value)
+    assert_equal(r3, l.last_element.previous.previous.value)
+    r4 = l.shift
+    assert_equal(r3, r4)
+    assert_equal(2, l.size)
+    assert_equal(r, l.first)
+    assert_equal(r2, l.last)
+    r5 = l.pop
+    assert_equal(1, l.size)
+    assert_equal(r, l.first)
+    assert_equal(r, l.last)
+    assert_equal(r2, r5)
+    r6 = l.pop
+    assert_equal(0, l.size)
+    assert_equal(nil, l.first_element)
+    assert_equal(nil, l.last_element)
+  end
+
+end

data/tests/record_test.rb

@@ -1,7 +1,7 @@
 
 require File.join(File.dirname(__FILE__), 'test_helper')
 
-class MyRecord < Hyperactive::Record
+class MyRecord < Hyperactive::Record::Bass
   attr_accessor :bajs
 
   def self.save_hook(instance, &block)
@@ -35,14 +35,14 @@ class RecordTest < Test::Unit::TestCase
     @c2.publish!
     @tm = TestManager.new(:persistence_provider => Archipelago::Hashish::BerkeleyHashishProvider.new(Pathname.new(__FILE__).parent.join("tranny1.db")))
     @tm.publish!
-    Hyperactive::CAPTAIN.setup(:chest_description => {:class => 'TestChest'},
+    Hyperactive::Record::CAPTAIN.setup(:chest_description => {:class => 'TestChest'},
                                :tranny_description => {:class => 'TestManager'})
-    Hyperactive::CAPTAIN.update_services!
+    Hyperactive::Record::CAPTAIN.update_services!
     assert_within(10) do
-      Hyperactive::CAPTAIN.chests.keys.sort == [@c.service_id, @c2.service_id].sort
+      Hyperactive::Record::CAPTAIN.chests.keys.sort == [@c.service_id, @c2.service_id].sort
     end
     assert_within(10) do
-      Hyperactive::CAPTAIN.trannies.keys == [@tm.service_id]
+      Hyperactive::Record::CAPTAIN.trannies.keys == [@tm.service_id]
     end
     $BEFORE_SAVE = 0
     $AFTER_SAVE = 0
@@ -60,12 +60,12 @@ class RecordTest < Test::Unit::TestCase
     @tm.stop!
     @tm.persistence_provider.unlink
     Archipelago::Disco::MC.clear!
-    Hyperactive::CAPTAIN.update_services!
+    Hyperactive::Record::CAPTAIN.update_services!
     assert_within(10) do
-      Hyperactive::CAPTAIN.chests.empty?
+      Hyperactive::Record::CAPTAIN.chests.empty?
     end
     assert_within(10) do
-      Hyperactive::CAPTAIN.trannies.empty?
+      Hyperactive::Record::CAPTAIN.trannies.empty?
     end
   end
 
@@ -99,12 +99,12 @@ class RecordTest < Test::Unit::TestCase
 
   def test_select_reject
     MyRecord.class_eval do
-      select(:brunt, Proc.new do |r|
-               r.bajs == "brunt"
-             end)
-      reject(:not_brunt, Proc.new do |r|
-               r.bajs == "brunt"
-             end)
+      select :brunt do |record|
+        record.bajs == "brunt"
+      end
+      reject :not_brunt do |record|
+        record.bajs == "brunt"
+      end
     end
     r1 = MyRecord.get_instance
     r1.bajs = "brunt"
@@ -146,13 +146,13 @@ class RecordTest < Test::Unit::TestCase
     assert_equal(2, $BEFORE_SAVE)
     assert_equal(2, $AFTER_SAVE)
     assert_equal("brunt", r.bajs)
-    assert_equal("brunt", Hyperactive::CAPTAIN[r.record_id].bajs)
+    assert_equal("brunt", Hyperactive::Record::CAPTAIN[r.record_id].bajs)
     i = r.record_id
-    assert_equal(r, Hyperactive::CAPTAIN[i])
+    assert_equal(r, Hyperactive::Record::CAPTAIN[i])
     r.destroy
     assert_equal(1, $BEFORE_DESTROY)
     assert_equal(1, $AFTER_DESTROY)
-    assert_equal(nil, Hyperactive::CAPTAIN[i])
+    assert_equal(nil, Hyperactive::Record::CAPTAIN[i])
   end
 
 end

data/tests/tree_benchmark.rb

@@ -10,13 +10,13 @@ class TreeBenchmark < Test::Unit::TestCase
     @c2.publish!
     @tm = TestManager.new(:persistence_provider => Archipelago::Hashish::BerkeleyHashishProvider.new(Pathname.new(__FILE__).parent.join("tranny1.db")))
     @tm.publish!
-    Hyperactive::CAPTAIN.setup(:chest_description => {:class => 'TestChest'},
+    Hyperactive::Record::CAPTAIN.setup(:chest_description => {:class => 'TestChest'},
                                :tranny_description => {:class => 'TestManager'})
     assert_within(20) do
-      Set.new(Hyperactive::CAPTAIN.chests.keys) == Set.new([@c.service_id, @c2.service_id])
+      Set.new(Hyperactive::Record::CAPTAIN.chests.keys) == Set.new([@c.service_id, @c2.service_id])
     end
     assert_within(20) do
-      Hyperactive::CAPTAIN.trannies.keys == [@tm.service_id]
+      Hyperactive::Record::CAPTAIN.trannies.keys == [@tm.service_id]
     end
   end
 
@@ -30,15 +30,15 @@ class TreeBenchmark < Test::Unit::TestCase
   end
   
   def test_set_get
-    h = Hyperactive::Tree.get_instance
-    r = Hyperactive::Record.get_instance
+    h = Hyperactive::Tree::Root.get_instance
+    r = Hyperactive::Record::Bass.get_instance
     hash_test("Tree", h, r, 100)
   end
 
   def test_regular_hash_set_get
-    Hyperactive::CAPTAIN["h"] = {}
-    h = Hyperactive::CAPTAIN["h"]
-    r = Hyperactive::Record.get_instance
+    Hyperactive::Record::CAPTAIN["h"] = {}
+    h = Hyperactive::Record::CAPTAIN["h"]
+    r = Hyperactive::Record::Bass.get_instance
     hash_test("Hash", h, r, 100)
   end
 

data/tests/tree_test.rb

@@ -19,14 +19,14 @@ class TreeTest < Test::Unit::TestCase
     @c2.publish!
     @tm = TestManager.new(:persistence_provider => Archipelago::Hashish::BerkeleyHashishProvider.new(Pathname.new(__FILE__).parent.join("tranny1.db")))
     @tm.publish!
-    Hyperactive::CAPTAIN.setup(:chest_description => {:class => 'TestChest'},
+    Hyperactive::Record::CAPTAIN.setup(:chest_description => {:class => 'TestChest'},
                                :tranny_description => {:class => 'TestManager'})
-    Hyperactive::CAPTAIN.update_services!
+    Hyperactive::Record::CAPTAIN.update_services!
     assert_within(10) do
-      Hyperactive::CAPTAIN.chests.keys.sort == [@c.service_id, @c2.service_id].sort
+      Hyperactive::Record::CAPTAIN.chests.keys.sort == [@c.service_id, @c2.service_id].sort
     end
     assert_within(10) do
-      Hyperactive::CAPTAIN.trannies.keys == [@tm.service_id]
+      Hyperactive::Record::CAPTAIN.trannies.keys == [@tm.service_id]
     end
   end
 
@@ -38,19 +38,19 @@ class TreeTest < Test::Unit::TestCase
     @tm.stop!
     @tm.persistence_provider.unlink
     Archipelago::Disco::MC.clear!
-    Hyperactive::CAPTAIN.update_services!
+    Hyperactive::Record::CAPTAIN.update_services!
     assert_within(10) do
-      Hyperactive::CAPTAIN.chests.empty?
+      Hyperactive::Record::CAPTAIN.chests.empty?
     end
     assert_within(10) do
-      Hyperactive::CAPTAIN.trannies.empty?
+      Hyperactive::Record::CAPTAIN.trannies.empty?
     end
   end
 
   def test_select_reject
-    h = Hyperactive::Tree.get_instance
-    r1 = Hyperactive::Record.get_instance
-    r2 = Hyperactive::Record.get_instance
+    h = Hyperactive::Tree::Root.get_instance
+    r1 = Hyperactive::Record::Bass.get_instance
+    r2 = Hyperactive::Record::Bass.get_instance
     h[r1.record_id] = r1
     h[r2.record_id] = r2
     assert_equal(r1.record_id, h.select(RecordMatcher.new(r1.record_id)).first.first)
@@ -58,17 +58,17 @@ class TreeTest < Test::Unit::TestCase
   end
   
   def test_set_get
-    h = Hyperactive::Tree.get_instance
+    h = Hyperactive::Tree::Root.get_instance
     h2 = {}
     10.times do
-      r = Hyperactive::Record.get_instance
+      r = Hyperactive::Record::Bass.get_instance
       h[r.record_id] = r
       h2[r.record_id] = r
     end
 
     h2.each do |k,v|
       assert_equal(v, h[k])
-      assert_equal(v, Hyperactive::CAPTAIN[h.record_id][k])
+      assert_equal(v, Hyperactive::Record::CAPTAIN[h.record_id][k])
     end
   end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: hyperactive
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2006-11-27 00:00:00 +01:00
+  version: 0.2.2
+date: 2006-11-28 00:00:00 +01:00
 summary: A base class for persistent objects that uses archipelago for persistence. Useful for Ruby on Rails models for example.
 require_paths: 
 - lib
@@ -30,8 +30,10 @@ authors:
 files: 
 - lib/hyperactive.rb
 - lib/hyperactive/hooker.rb
+- lib/hyperactive/list.rb
 - lib/hyperactive/record.rb
 - lib/hyperactive/tree.rb
+- tests/list_test.rb
 - tests/record_test.rb
 - tests/test_helper.rb
 - tests/tree_benchmark.rb
@@ -39,6 +41,7 @@ files:
 - GPL-2
 - README
 test_files: 
+- tests/list_test.rb
 - tests/record_test.rb
 - tests/tree_test.rb
 - tests/test_helper.rb