hyperactive 0.2.5 → 0.3.0

data/README

@@ -2,6 +2,9 @@
 
 It uses archipelago for persistence, and is meaningful only in an environment where the server process doesnt restart at each request. This means that cgi environment is not really an option.
 
+== Dependencies:
+archipelago
+
 == Sub packages:
 
 Hyperactive::Record:: The base class package itself, providing you with cached selectors and rejectors, along with cached finders for any number of attributes.

data/TODO

@@ -1,4 +1,4 @@
 
  * Create a validation framework for Hyperactive::Record::Bass
 
- * Create a sorted data structure, for example AA trees: http://www.eternallyconfuzzled.com/tuts/andersson.html
+ * Create a sorted data structure, for example AA trees: http://www.eternallyconfuzzled.com/tuts/datastructures/jsw_tut_andersson.aspx

data/lib/hyperactive.rb

@@ -15,12 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+require 'rubygems'
+require 'fastthread'
 $: << File.dirname(__FILE__)
 
-require 'hyperactive/hooker'
-require 'hyperactive/index'
-require 'hyperactive/transactions'
-require 'hyperactive/cleaner'
-require 'hyperactive/record'
-require 'hyperactive/hash'
-require 'hyperactive/list'

data/lib/hyperactive/hash.rb

@@ -17,14 +17,16 @@
 
 
 require 'rubygems'
-require 'archipelago'
+require 'archipelago/pirate'
+require 'hyperactive/list'
+require 'hyperactive/cleaner'
 require 'digest/sha1'
 
 module Hyperactive
 
   #
-  # The package containing the Hash class that provides any
-  # kind of index for your Hyperactive classes.
+  # The package containing the Hash class that provides unsorted
+  # indices for your Hyperactive classes.
   #
   # Is supposed to be constantly scaling, but preliminary benchmarks show some
   # problems with that assumption?
@@ -108,7 +110,7 @@ module Hyperactive
       # Insert +value+ under +key+ in this Hash.
       # 
       def []=(key, value)
-        self.list = Hyperactive::List::Head.get_instance_with_transaction(@transaction) unless self.list
+        self.list ||= Hyperactive::List::Head.get_instance_with_transaction(@transaction)
 
         if (element = Archipelago::Pirate::BLACKBEARD[my_key_for(key), @transaction])
           element.value = value
@@ -124,7 +126,7 @@ module Hyperactive
       # Delete +key+ from this Hash.
       # 
       def delete(key)
-        self.list = Hyperactive::List::Head.get_instance_with_transaction(@transaction) unless self.list
+        self.list ||= Hyperactive::List::Head.get_instance_with_transaction(@transaction)
 
         return_value = nil
 
@@ -175,7 +177,7 @@ module Hyperactive
       # Get my private key for a given +key+.
       #
       def my_key_for(key)
-        Digest::SHA1.hexdigest("#{Marshal.dump(key)}#{self.record_id}")
+        Digest::SHA1.hexdigest("Hyperactive::Hash::Head:#{self.record_id}:#{Marshal.dump(key)}")
       end
       
     end

data/lib/hyperactive/index.rb

@@ -15,6 +15,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+require 'hyperactive/hash'
+require 'hyperactive/tree'
+require 'hyperactive/hooker'
+
 module Hyperactive
 
   #
@@ -139,7 +143,7 @@ module Hyperactive
         super
         base.class_eval do
           #
-          # We depend on lots of hooks.
+          # We depend on hooks.
           #
           include(Hyperactive::Hooker::Pimp)
         end

data/lib/hyperactive/list.rb

@@ -15,9 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-
-require 'rubygems'
-require 'archipelago'
+require 'hyperactive/record'
+require 'archipelago/current'
 
 module Hyperactive
 
@@ -102,6 +101,7 @@ module Hyperactive
         end
         self.size -= 1
         element.destroy!
+        return nil
       end
 
       #

data/lib/hyperactive/record.rb

@@ -15,9 +15,17 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+module Hyperactive
+  module Record
+    class Bass
+    end
+  end
+end
 
 require 'rubygems'
-require 'archipelago'
+require 'archipelago/pirate'
+require 'hyperactive/index'
+require 'hyperactive/transactions'
 
 #
 # A utility module to provide the functionality required for example
@@ -57,6 +65,10 @@ module Hyperactive
           # The transaction we are currently in.
           #
           attr_reader :transaction
+          #
+          # We depend on hooks.
+          #
+          include(Hyperactive::Hooker::Pimp)
         end
 
         base.extend(ClassMethods)
@@ -78,11 +90,12 @@ module Hyperactive
       # See Hyperactive::List::Head and Hyperactive::Hash::Head for examples of this behaviour.
       #
       def with_transaction(transaction, &block)
+        old_transaction = @transaction if defined?(@transaction)
         @transaction = transaction
         begin
           return yield
         ensure
-          @transaction = nil
+          @transaction = old_transaction
         end
       end
 
@@ -125,6 +138,7 @@ module Hyperactive
           Archipelago::Pirate::BLACKBEARD.delete(@record_id, @transaction)
           self.freeze
         end
+        return nil
       end
       
       module ClassMethods
@@ -167,9 +181,19 @@ module Hyperactive
     # which is not what you usually want. Every other time you fetch it using a select or other
     # method you will instead receive a proxy object to the database. This means that nothing you
     # do to it at that point will be persistent or even necessarily have a defined result. 
-    # Therefore: do not use the instantiated object, instead call <b>my_instance.save</b>
+    # Therefore: do not use the instantiated object, instead call <b>my_instance.create</b> or <b>MyClass.get_instance</b>
     # to get a proxy to the object stored into the database.
     #
+    # NB: When a subclass is created with <b>get_instance</b>, <b>initialize</b> is called
+    # and then <b>create</b> is called and its return value returned.
+    # If you instead use <b>get_instance_with_transaction</b>, <b>initialize</b> will be called (like before)
+    # and then <b>create</b> with the given transaction. This means that you can not use transactions in
+    # <b>initialize</b> and at the same time make <b>get_instance_with_transaction</b> work, since
+    # the <b>initialize</b> method wont know about the transaction sent to <b>get_instance_with_transaction</b>.
+    # Of course, this can be avoided using varying degrees of ugly hack, but a simpler way is to try and
+    # make initialize <i>not</i> do transaction-dependant stuff, like create new Hyperactive::Record::Bass
+    # instances, but instead do that in (for example) <i>create_hooks</i> (See Hyperactive::Hooker::Pimp).
+    #
     class Bass
 
       include Hyperactive::Record::Persistent

data/lib/hyperactive/tree.rb

@@ -0,0 +1,115 @@
+# Archipelago - a distributed computing toolkit for ruby
+# Copyright (C) 2006  Martin Kihlgren <zond at troja dot ath dot cx>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+
+require 'rubygems'
+require 'archipelago/pirate'
+require 'hyperactive/record'
+require 'digest/sha1'
+
+module Hyperactive
+
+  #
+  # The package containing the Tree class that provides sorted
+  # indices for your Hyperactive classes.
+  #
+  # Is supposed to be logarithmically scaling.
+  #
+  module Tree
+    
+    class Node < Hyperactive::Record::Bass
+
+      @@nil_node = nil
+      @@nil_node_record_id = nil
+
+      include Hyperactive::Cleaner::Accessors
+
+      attr_accessor :right, :left, :level, :value, :key
+
+      def initialize(options = {})
+        super()
+        self.right = options[:right] || self.class.nil_node
+        self.right = self if self.right == :self
+        self.left = options[:left] || self.class.nil_node
+        self.left = self if self.left == :self
+        self.level = options[:level] || 1
+        self.value = options[:value]
+        self.key = options[:key]
+      end
+
+      def insert(key, value)
+        if self.nil_node?
+          return Node.get_instance_with_transaction(transaction, :key => key, :value => value)
+        else
+          side = :left
+          side = :right if self.key < key
+          self.send("#{side}=", self.send(side).insert(key, value))
+          rval = self.skew
+          rval = rval.split
+          return rval
+        end
+      end
+
+      def skew
+      end
+
+      def split
+      end
+
+      def nil_node?
+        self.record_id == self.class.nil_node_record_id
+      end
+
+      def self.nil_node_record_id
+        @@nil_node_record_id ||= self.nil_node.record_id
+      end
+      
+      def self.nil_node
+        nil_node_key = Digest::SHA1.hexdigest("Hyperactive::Tree::Node::nil_node")
+        @@nil_node ||= if (existing_element = Archipelago::Pirate::BLACKBEARD[nil_node_key])
+                         existing_element
+                       else
+                         rval = Node.get_instance(:left => :self, 
+                                                  :right => :self, 
+                                                  :level => 0)
+                         Archipelago::Pirate::BLACKBEARD[nil_node_key] = rval
+                         rval
+                       end
+      end
+
+    end
+
+    class Root < Hyperactive::Record::Bass
+
+      include Hyperactive::Cleaner::Accessors
+
+      attr_accessor :root
+
+      def initialize
+        super
+        self.root = Node.nil_node
+      end
+
+      def []=(key, value)
+        self.root = root.insert(key, value)
+      end
+
+    end
+
+  end
+
+end

data/tests/hash_benchmark.rb

@@ -3,32 +3,6 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 
 class HashBenchmark < 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!
-    Archipelago::Pirate::BLACKBEARD.setup(:chest_description => {:class => 'TestChest'},
-                               :tranny_description => {:class => 'TestManager'})
-    assert_within(20) do
-      Set.new(Archipelago::Pirate::BLACKBEARD.chests.keys) == Set.new([@c.service_id, @c2.service_id])
-    end
-    assert_within(20) do
-      Archipelago::Pirate::BLACKBEARD.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!
-  end
-  
   def test_set_get
     h = Hyperactive::Hash::Head.get_instance
     r = Hyperactive::Record::Bass.get_instance

data/tests/hash_test.rb

@@ -11,33 +11,6 @@ class RecordMatcher
 end
 
 class HashTest < 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!
-    Archipelago::Pirate::BLACKBEARD.setup(:chest_description => {:class => 'TestChest'},
-                               :tranny_description => {:class => 'TestManager'})
-    Archipelago::Pirate::BLACKBEARD.update_services!
-    assert_within(10) do
-      Archipelago::Pirate::BLACKBEARD.chests.keys.sort == [@c.service_id, @c2.service_id].sort
-    end
-    assert_within(10) do
-      Archipelago::Pirate::BLACKBEARD.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!
-  end
 
   def test_select_reject
     h = Hyperactive::Hash::Head.get_instance

data/tests/list_benchmark.rb

@@ -3,32 +3,6 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 
 class ListBenchmark < 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!
-    Archipelago::Pirate::BLACKBEARD.setup(:chest_description => {:class => 'TestChest'},
-                               :tranny_description => {:class => 'TestManager'})
-    assert_within(20) do
-      Set.new(Archipelago::Pirate::BLACKBEARD.chests.keys) == Set.new([@c.service_id, @c2.service_id])
-    end
-    assert_within(20) do
-      Archipelago::Pirate::BLACKBEARD.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!
-  end
-  
   def test_set_get
     l = Hyperactive::List::Head.get_instance
     r = Hyperactive::Record::Bass.get_instance

data/tests/list_test.rb

@@ -11,33 +11,6 @@ end
 
 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!
-    Archipelago::Pirate::BLACKBEARD.setup(:chest_description => {:class => 'TestChest'},
-                               :tranny_description => {:class => 'TestManager'})
-    Archipelago::Pirate::BLACKBEARD.update_services!
-    assert_within(10) do
-      Archipelago::Pirate::BLACKBEARD.chests.keys.sort == [@c.service_id, @c2.service_id].sort
-    end
-    assert_within(10) do
-      Archipelago::Pirate::BLACKBEARD.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!
-  end
-
   def test_clear
     l = Hyperactive::List::Head.get_instance
     l << (r = Hyperactive::Record::Bass.get_instance)

data/tests/record_test.rb

@@ -31,21 +31,7 @@ end
 class RecordTest < 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!
-    Archipelago::Pirate::BLACKBEARD.setup(:chest_description => {:class => 'TestChest'},
-                               :tranny_description => {:class => 'TestManager'})
-    Archipelago::Pirate::BLACKBEARD.update_services!
-    assert_within(10) do
-      Archipelago::Pirate::BLACKBEARD.chests.keys.sort == [@c.service_id, @c2.service_id].sort
-    end
-    assert_within(10) do
-      Archipelago::Pirate::BLACKBEARD.trannies.keys == [@tm.service_id]
-    end
+    super
     $BEFORE_SAVE = 0
     $AFTER_SAVE = 0
     $BEFORE_DESTROY = 0
@@ -54,15 +40,6 @@ class RecordTest < Test::Unit::TestCase
     $AFTER_CREATE = 0
   end
 
-  def teardown
-    @c.stop!
-    @c.persistence_provider.unlink!
-    @c2.stop!
-    @c2.persistence_provider.unlink!
-    @tm.stop!
-    @tm.persistence_provider.unlink!
-  end
-
   def test_index_find
     MyRecord.class_eval do
       index_by :bajs
@@ -75,7 +52,6 @@ class RecordTest < Test::Unit::TestCase
     r3.bajs = "gult"
     r4 = MyRecord.get_instance
     r4.bajs = "beige"
-
     assert_equal(Set.new([r2.record_id,r1.record_id]), Set.new(MyRecord.find_by_bajs("brunt").t_collect(Proc.new do |k,v|
                                                                                                           v.record_id
                                                                                                         end)))

data/tests/test_helper.rb

@@ -1,8 +1,15 @@
 
+BLACKBEARD_OPTIONS = {
+  :chest_description => {:class => 'TestChest'},
+  :tranny_description => {:class => 'TestManager'},
+  :initial_lookup_timeout => 0
+}
+
 home = File.expand_path(File.dirname(__FILE__))
 $: << File.join(home, "..", "lib")
 
 require 'hyperactive'
+require 'hyperactive/record'
 require 'pp'
 require 'test/unit'
 require 'benchmark'
@@ -30,6 +37,8 @@ class TestManager < Archipelago::Tranny::Manager
   end
 end
 
+Archipelago::Treasure::Dubloon.debug_callable = (Proc.new do |m| puts m end)
+
 class TestJockey < Archipelago::Disco::Jockey
   attr_reader :remote_services, :local_services
 end
@@ -63,4 +72,32 @@ class Test::Unit::TestCase
     assert(rval)
   end
 
+  def setup
+    Archipelago::Pirate::BLACKBEARD.setup(:chest_description => {:class => 'TestChest'},
+                                          :tranny_description => {:class => 'TestManager'})
+    @c = TestChest.new(:persistence_directory => Pathname.new(__FILE__).parent.join("chest.db"))
+    @c.publish!
+    @c2 = TestChest.new(:persistence_directory => Pathname.new(__FILE__).parent.join("chest2.db"))
+    @c2.publish!
+    @tm = TestManager.new(:persistence_directory => Pathname.new(__FILE__).parent.join("tranny1.db"))
+    @tm.publish!
+    assert_within(10) do
+      Archipelago::Pirate::BLACKBEARD.update_services!
+      Archipelago::Pirate::BLACKBEARD.chests.keys.sort == [@c.service_id, @c2.service_id].sort
+    end
+    assert_within(10) do
+      Archipelago::Pirate::BLACKBEARD.update_services!
+      Archipelago::Pirate::BLACKBEARD.trannies.keys == [@tm.service_id]
+    end
+  end
+
+  def teardown
+    @c.close!
+    @c.persistence_provider.unlink!
+    @c2.close!
+    @c2.persistence_provider.unlink!
+    @tm.close!
+    @tm.persistence_provider.unlink!
+  end
+
 end

data/tests/tree_test.rb

@@ -0,0 +1,15 @@
+
+require File.join(File.dirname(__FILE__), 'test_helper')
+
+class TreeTest < Test::Unit::TestCase
+  
+  def test_insert
+    t = Hyperactive::Tree::Root.get_instance
+    assert(t.root.nil_node?)
+    t["epa"] = "apa"
+    assert_equal("apa", t.root.value)
+    assert(t.root.left.nil_node?)
+    assert(t.root.right.nil_node?)
+  end
+
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: hyperactive
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
-date: 2006-12-20 00:00:00 +01:00
+  version: 0.3.0
+date: 2007-06-07 00:00:00 +02:00
 summary: A base class for persistent objects that uses archipelago for persistence. Useful for Ruby on Rails models for example.
 require_paths: 
 - lib
@@ -25,30 +25,34 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Martin Kihlgren
 files: 
 - lib/hyperactive.rb
-- lib/hyperactive/cleaner.rb
 - lib/hyperactive/hash.rb
 - lib/hyperactive/hooker.rb
 - lib/hyperactive/index.rb
+- lib/hyperactive/transactions.rb
+- lib/hyperactive/cleaner.rb
+- lib/hyperactive/tree.rb
 - lib/hyperactive/list.rb
 - lib/hyperactive/record.rb
-- lib/hyperactive/transactions.rb
-- tests/hash_benchmark.rb
-- tests/hash_test.rb
-- tests/list_benchmark.rb
 - tests/list_test.rb
+- tests/hash_test.rb
 - tests/record_test.rb
 - tests/test_helper.rb
+- tests/tree_test.rb
+- tests/hash_benchmark.rb
+- tests/list_benchmark.rb
 - GPL-2
 - TODO
 - README
 test_files: 
-- tests/hash_test.rb
 - tests/list_test.rb
+- tests/hash_test.rb
 - tests/record_test.rb
+- tests/tree_test.rb
 - tests/test_helper.rb
 rdoc_options: 
 - --line-numbers
@@ -69,5 +73,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: 0.3.0
     version: