adhd 0.1.0 → 0.1.1

data/README.rdoc

@@ -1,12 +1,16 @@
 = adhd
 
-Adhd is an asynchronous, distributed hard drive.  Actually we're not sure if it's really asynchronous or even what asynchronicity would mean in the context of a hard drive, but it is definitely distributed.  Adhd is essentially a management layer (written using Ruby and eventmachine) which controls clusters of CouchDB databases to replicate files across disparate machines.  Unlike most clustering storage solutions, adhd assumes that machines in the cluster may have different amounts of bandwidth available and is designed to work both inside and outside the data centre.
+Adhd is an asynchronous, distributed hard drive.  Actually we're not sure if it's really asynchronous or even what asynchronicity would mean in the context of a hard drive, but it is definitely distributed.  Adhd is essentially a management layer (written using Ruby and eventmachine) which controls clusters of CouchDB databases to replicate files across disparate machines.  Unlike most clustering storage solutions, adhd assumes that machines in the cluster may have different capabilities and is designed to work both inside and outside the data centre.
 
 == Installation
 
 Don't use this software yet.  It is experimental and may eat your mother.
 
-Having said that, <pre>sudo gem install adhd</pre> may do the job.
+Having said that,
+
+ sudo gem install adhd
+
+may do the job.
 
 == How it works
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/adhd.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{adhd}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dave.hrycyszyn@headlondon.com"]
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
      "lib/adhd/config.yml",
      "lib/adhd/models/content_doc.rb",
      "lib/adhd/models/content_shard.rb",
+     "lib/adhd/models/node_db.rb",
      "lib/adhd/models/node_doc.rb",
      "lib/adhd/models/shard_range.rb",
      "lib/adhd/node_manager.rb",
@@ -57,7 +58,9 @@ Gem::Specification.new do |s|
      "lib/views/index.erb",
      "lib/views/layout.erb",
      "test/helper.rb",
-     "test/test_adhd.rb"
+     "test/test_adhd.rb",
+     "test/unit/test_content_doc.rb",
+     "test/unit/test_node.rb"
   ]
   s.homepage = %q{http://github.com/futurechimp/adhd}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -65,7 +68,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{An experiment in distributed file replication using CouchDB}
   s.test_files = [
-    "test/helper.rb",
+    "test/unit/test_content_doc.rb",
+     "test/unit/test_node.rb",
+     "test/helper.rb",
      "test/test_adhd.rb"
   ]
 

data/lib/adhd/adhd_rest_server.rb

@@ -3,6 +3,7 @@ require 'uri'
 require 'net/http'
 require 'webrick'  
 
+
  module ProxyToServer
   # This implements the connection that proxies an incoming file to to the 
   # respective CouchDB instance, as an attachment.
@@ -64,8 +65,15 @@ require 'webrick'
         # Detected end of headers
         header_data = @buffer[0...($~.begin(0))]
        
+       @web_config = WEBrick::Config::HTTP.clone
+       @web_config[:HTTPVersion] = WEBrick::HTTPVersion.new("1.0")
+       
         # Try the webrick parser
-        @req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
+        @req = WEBrick::HTTPRequest.new(@web_config)
+        @res = WEBrick::HTTPResponse.new(@web_config)
+        
+        
+        puts @res.to_s
 
         StringIO.open(header_data, 'rb') do |socket|
           @req.parse(socket)

data/lib/adhd/models/node_db.rb

@@ -0,0 +1,62 @@
+class NodeDB
+
+  attr_accessor :local_node_db, :our_node
+
+  def initialize(our_nodev)
+    @our_node = our_nodev
+
+    # Get the address of the CDB from the node
+    @local_node_db = our_nodev.get_node_db
+  end
+
+  # Syncs this management node with other existing management nodes by looping
+  # through all known management nodes.
+  #
+  # If replication to or from any management node fails, the method breaks
+  # and continues replicating to other management nodes until all management
+  # nodes have been tried.
+  #
+  # NOTE: randomize the order for load balancing here
+  #
+  # NOTE2: How to build skynet (TODO)
+  #        -------------------
+  #        If length of management is zero, then chose 3 different random
+  #        nodes at each sync, and sync with them in node_name order.
+  #        This guarantees that any updates on nodes are communicated in
+  #        O(log N) ephocs, at the cost of O(3 * N) connections per epoch.
+  #        It also guarantees any new management servers are discovered in
+  #        this O(log N) time, creating "jelly fish" or "partition proof"
+  #        availability.
+  def sync
+    # We replicate our state to the management node(s)
+    management_nodes = Node.by_is_management.reverse
+
+    management_nodes.each do |mng_node|
+      remote_db = mng_node.get_node_db
+      from_success = @our_node.replicate_from(local_node_db, mng_node, remote_db)
+      to_success = @our_node.replicate_to(local_node_db, mng_node, remote_db)
+      if from_success && to_success && !our_node.is_management
+         break
+      end
+    end
+  end
+
+  # Returns all nodes marked as available
+  #
+  def available_node_list
+    all_nodes = Node.by_name
+    return all_nodes.select {|node| node.status == "RUNNING"}
+  end
+
+  # Returns the first RUNNING management node.  There is no real dependency on
+  # any specific node, this is just a way for all nodes to agree on the same
+  # node to do the job of the head management node.
+  #
+  def head_management_node
+    management_nodes = Node.by_is_management.reverse
+    hmn = management_nodes.find {|node| node.status == "RUNNING"}
+    return hmn
+  end
+
+end
+

data/lib/adhd/models/node_doc.rb

@@ -1,63 +1,5 @@
-## Key Restrictions ok internal_IDs: must only contain [a-z0-9-]
-
-class NodeDB
-  
-  attr_accessor :local_node_db, :our_node
-  
-  def initialize(our_nodev)
-    @our_node = our_nodev
-    
-    # Get the address of the CDB from the node
-    @local_node_db = our_nodev.get_node_db
-  end
-  
-  def sync
-    # We replicate our state to the management node(s)
-    management_nodes = Node.by_is_management.reverse
-    # NOTE: randomize the order for load balancing here
-
-    # NOTE2: How to build skynet (TODO)
-    #        -------------------
-    #        If length of management is zero, then chose 3 different random
-    #        nodes at each sync, and sync with them in node_name order.
-    #        This guarantees that any updates on nodes are communicated in
-    #        O(log N) ephocs, at the cost of O(3 * N) connections per epoch.
-    #        It also guarantees any new management servers are discovered in
-    #        this O(log N) time, creating "jelly fish" or "partition proof"
-    #        availability. 
-    
-    management_nodes.each do |mng_node|
-      remote_db = mng_node.get_node_db
-      bool_from = @our_node.replicate_from(local_node_db, mng_node, remote_db)
-      bool_to = @our_node.replicate_to(local_node_db, mng_node, remote_db)
-      if bool_from && bool_to && !our_node.is_management
-         #puts "Pushed to management"
-         break
-      end       
-      #puts "Did not push to management"
-    end
-  end 
-
-  def available_node_list
-    # Returns all nodes marked as available
-    all_nodes = Node.by_name
-    return all_nodes.select {|node| node.status == "RUNNING"}
-  end
-
-  def head_management_node
-    management_nodes = Node.by_is_management.reverse
-    hmn = management_nodes.find {|node| node.status == "RUNNING"}
-    return hmn
-  end
-    
-end
 
 class Node  < CouchRest::ExtendedDocument
-  #NODESERVER = CouchRest.new("#{ARGV[1]}")
-  #NODESERVER.default_database = "#{ARGV[0]}_node_db"
-
-  #use_database NODESERVER.default_database
-
   unique_id :name
 
   property :name
@@ -75,23 +17,17 @@ class Node  < CouchRest::ExtendedDocument
   def get_node_db
     server = CouchRest.new("#{url}")
     db = server.database!("#{name}_node_db")
-    # puts "Open db #{db}"
-    db
   end
 
   def get_shard_db
     server = CouchRest.new("#{url}")
     db = server.database!("#{name}_shard_db")
-    # puts "Open db #{db}"
-    db
-  end  
-  
+  end
+
   def get_content_db(shard_db_name)
     server = CouchRest.new("#{url}")
     db = server.database!("#{name}_#{shard_db_name}_content_db")
-    # puts "Open db #{db}"
-    db
-  end  
+  end
 
   # Replicating databases and marking nodes as unavailable
   # In the future we should hook these into a "replication manager"
@@ -99,32 +35,33 @@ class Node  < CouchRest::ExtendedDocument
   # databases, and only do a replication after some time lapses.
 
   def replicate_to(local_db, other_node, remote_db)
-    # Do not try to contact unavailable nodes
-    return false if other_node.status == "UNAVAILABLE"
-    # No point replicating to ourselves    
-    return false if (name == other_node.name)
-    
-    begin  
-      # Replicate to other node is possible
-      local_db.replicate_to(remote_db)
-      return true
-    rescue Exception => e
-      # Other node turns out to be unavailable
-      other_node.status = "UNAVAILABLE"
-      other_node.save
-      return false
-    end
-  end   
-  
+    replicate_to_or_from(local_db, other_node, remote_db, true)
+  end
+
   def replicate_from(local_db, other_node, remote_db)
+    replicate_to_or_from(local_db, other_node, remote_db, false)
+  end
+
+  private
+
+  # Replicates to or from a management node database.  The direction of
+  # replication is controlled by a boolean property.
+  #
+  # Returns true if replication succeeds, false if not.
+  #
+  def replicate_to_or_from(local_db, other_node, remote_db, to = true)
     # Do not try to contact unavailable nodes
     return false if other_node.status == "UNAVAILABLE"
-    # No point replicating to ourselves    
+    # No point replicating to ourselves
     return false if (name == other_node.name)
-    
-    begin  
+
+    begin
       # Replicate to other node is possible
-      local_db.replicate_from(remote_db)
+      if to
+        local_db.replicate_to(remote_db)
+      else
+        local_db.replicate_from(remote_db)
+      end
       return true
     rescue Exception => e
       # Other node turns out to be unavailable
@@ -135,5 +72,6 @@ class Node  < CouchRest::ExtendedDocument
 
   end
 
+
 end
 

data/lib/adhd/node_manager.rb

@@ -1,8 +1,8 @@
 require 'rubygems'
 require 'couchrest'
 require 'ruby-debug'
-# require File.dirname(__FILE__) + '/models'
 require File.dirname(__FILE__) + '/models/node_doc'
+require File.dirname(__FILE__) + '/models/node_db'
 require File.dirname(__FILE__) + '/models/content_doc'
 require File.dirname(__FILE__) + '/models/shard_range'
 require File.dirname(__FILE__) + '/models/content_shard'
@@ -79,7 +79,7 @@ module Adhd
     def build_node_admin_databases
       @conn_manager = ConnectionBank.new
 
-      # Lets build a nice NodeDB
+      # Let's build a nice NodeDB
       @ndb = NodeDB.new(@our_node)
       conn_node = UpdateNotifierConnection.new(@config.node_url,
                                         @config.couchdb_server_port,
@@ -101,12 +101,16 @@ module Adhd
 
     end
 
+    # A node changed status (became available, or became unavailable).
+    #
+    # If we are the admin, when a node joins we should allocate some shards to
+    # it.
+    #
+    # Only the head management node deals with node changes.
+    #
+    #  XXXX doc question: what does it mean to be 'the admin'?
+    #
     def handle_node_update update
-      # Added, removed or changed the status of a node
-      # If we are the admin, when a node joins we should allocate to it
-      # some shards.
-
-      # Only the head management node deals with node changes
       return if @ndb.head_management_node && ! (@ndb.head_management_node.name == @our_node.name)
 
       # Given the shard_db and the node_db we should work out a new allocation
@@ -118,8 +122,9 @@ module Adhd
     end
 
 
+    # Build content shard databases.
+    #
     def build_node_content_databases
-      # Get all content shard databases
       # NOTE: we will have to refresh those then we are re-assigned shards
       @contentdbs = {} if !@contentdbs
       current_shards = @srdb.get_content_shards
@@ -150,19 +155,21 @@ module Adhd
       end
     end
 
+    # Kills the connection listening for updates on this shard
+    #
+    # TODO: test if the sync happened
+    # content_shard.this_shard_db.delete!
+    # TODO: run a sync with the current master to ensure that
+    #       any changes have been pushed. The DELETE the database
+    #       to save space
     def remove_content_shard content_shard, connection
-      # Kill the connection listening for updates on this shard
       connection.kill
       content_shard.sync
-      # TODO: test if the sync happened
-      # content_shard.this_shard_db.delete!
-      # TODO: run a sync with the current master to ensure that
-      #       any changes have been pushed. The DELETE the database
-      #       to save space
     end
 
+    # Enters the eventmachine loop
+    #
     def run
-      # Enters the event machine loop
       @conn_manager.run_all
     end
 
@@ -201,10 +208,10 @@ module Adhd
       end
     end
 
-  def sync_admin
-      @ndb.sync # SYNC
-      @srdb.sync # SYNC
-  end
+    def sync_admin
+        @ndb.sync # SYNC
+        @srdb.sync # SYNC
+    end
 
   end
 end
@@ -213,21 +220,22 @@ end
 
 require 'md5'
 
+# This is an automatic way to allocate shards to nodes that just
+# arrive in the networks, as well as re-allocate shards if nodes
+# become unavailable or leave the network.
+#
+# NOTE: How to build skynet (Part III)
+#
+#       The invariant we try to impose on the list of nodes part of a shard
+#       is that there should be at least replication_factor available nodes
+#       in it. At the same time we try to keep the list stable over nodes
+#       joining and leaving. To achieve this we hash in sequence the name of
+#       each node with the name of the shard. We sort this list by hash, and
+#       choose the first n nodes such that at least replication_factor nodes
+#       are available. Then we chose the first available node as the master
+#       for that shard.
+#
 def assign_nodes_to_shards(node_list, shard_range_list, replication_factor)
-  # This is an automatic way to allocate shards to nodes that just
-  # arrive in the networks, as well as re-allocate shards if nodes
-  # become unavailable or leave the network.
-
-  # NOTE: How to build skynet (Part III)
-  #
-  #       The invarient we try to impost on the list of nodes part of a shard
-  #       is that there should be at least replication_factor available nodes
-  #       in it. At the same time we try to keep the list stable over nodes
-  #       joining and leaving. To achieve this we hash in sequence the name of
-  #       each node with the name of the shard. We sort this list by hash, and
-  #       choose the first n nodes such that at least replication_factor nodes
-  #       are available. Then we chose the first available node as the master
-  #       for that shard.
 
   shard_range_list.each do |shard_range|
     # Sort all nodes using consistent hashing

data/lib/adhd/reactor.rb

@@ -54,10 +54,10 @@ module  Adhd
 
     # Shoots update notifications from CouchDB to the @conn.
     #
-    def receive_data data      
+    def receive_data data
       # puts "received_data: #{data}"
       # puts "||#{data}||length=#{data.length}||#{data.dump}||"
-      
+
       @buffer += data # Add the data to the current buffer
       updates = []
       if @buffer =~ /(\{[^\n]+\}\n)/
@@ -65,7 +65,7 @@ module  Adhd
         # Trim the buffer to $_.end(0)
         @buffer = @buffer[$~.end(0)..-1]
       end
-      
+
       # Regexp for JSON updates is /\{[\n]\}+/
       updates.each do |json_event|
         @conn_obj.event_handler(json_event) unless data == "\n"
@@ -88,9 +88,9 @@ module  Adhd
   #       predicate is false we can simply close the connection. For example upon
   #       being given control of a different content shard, or a different master
   #       for the shard.
-
+  #
   # In practice we will have two types of connections: Replicate and Notify.
-
+  #
   class UpdateNotifierConnection
     attr_accessor :db_name, :base_url, :connection_inside, :name
 
@@ -102,42 +102,41 @@ module  Adhd
       @status = "NOTRUNNING"
       @base_url = "http://#{@node_url}:#{@couchdb_server_port}"
       @name = @base_url +"/"+ @db_name
-      @keep_alive = true      
+      @keep_alive = true
     end
-    
+
     def kill
       @keep_alive = false
     end
 
     def start
-      puts "Register the connection for #{@db_name}"
+      puts "Registering the connection for: #{@db_name}"
       EM.connect @node_url, @couchdb_server_port, Adhd::DbUpdateNotifier, @db_name, self
       @status = "RUNNING"
     end
 
     def event_handler data
-      # puts "||#{data}||nn"
-      puts "Run a crazy sync on db #{@db_name}"
-      #@db_obj_for_sync.sync
+      puts "Run a crazy sync on db: #{@db_name}"
       @sync_block.call(data)
     end
 
     def close_handler
-      puts "Closed abnormally #{reason}"
+      puts "Closed abnormally: #{reason}"
       @status = "NOTRUNNING"
     end
 
     def down_for_good(reason)
       if reason
-        puts "Closed for good #{reason}"
+        puts "Closed for good: #{reason}"
       end
     end
 
+    # Returns the truth value of the predicate
+    #
     def keep_alive?
-      # Returns the truth value of the predicate
       @keep_alive
     end
-    
+
     def keep_alive_or_kill!
       if ! keep_alive?
         # Schedule this connection for close
@@ -154,18 +153,9 @@ module  Adhd
       (@status == "NOTRUNNING")
     end
 
-
   end
 
   class Connection
-    #def on_teardown(&block)
-    #  # Set the handler to be called then a connection is dead
-    #  block(self) # Run the teardown handler
-    #end
-    
-    def initialize
-    
-    end
 
     def should_start?
       !(@status == "RUNNING")
@@ -177,21 +167,25 @@ module  Adhd
 
   end
 
+  # Manage a bunch of connections for us
+  #
   class ConnectionBank
-    # Manage a bunch of connections for us
+
     def initialize
       @our_connections = []
     end
 
+    # Add a connection to the ConnectionBank, making sure we have no duplicates.
+    #
     def add_connection(conn)
-      # Make sure we have no duplicates
       @our_connections.each do |c|
         if conn.name == c.name
           return
         end
-      end      
-    
-      # If it is happy to run, add it to the list and start it!      
+      end
+
+      # If it is happy to run, add it to the list and start it!
+      #
       if conn.keep_alive?
           @our_connections << conn
           # Register the teardown handler for when the end comes...
@@ -199,9 +193,10 @@ module  Adhd
       end
     end
 
+    # When a connection is down, we check to see if it wants to be kept
+    # alive, and restart it; otherwise we remove it from the list.
+    #
     def rerun(conn)
-      # When a connection is down, we check to see if it wants to be kept
-      # alive, and restart it otherwise we remove it from the list.
       if conn.keep_alive?
         begin
           conn.start
@@ -210,7 +205,7 @@ module  Adhd
         end
       else
         # It seems we have died of natural causes
-        # XXX: is it true that Ruby does not throw and exception for EOF?
+        # XXX: is it true that Ruby does not throw an exception for EOF?
         #      Otherwise we will never see this
         conn.keep_alive_or_kill!
         @our_connections.delete(conn)
@@ -219,14 +214,13 @@ module  Adhd
 
     end
 
+    # Go through all connections and run them all
+    # Run within EM.run loop
+    #
     def run_all
-      # Go through all connections and run them all
-      # Run within EM.run loop
-      # puts "Connection bank runs all... (#{@our_connections.length} connections)"
       @our_connections.each do |c|
         if c.is_closed? or !c.keep_alive?
           puts "Actually rerun #{c.db_name}..."
-          
           rerun(c)
         end
       end

data/test/test_adhd.rb

@@ -1,8 +1,7 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
-require 'adhd'
-require File.dirname(__FILE__) + '/../models'
+#require File.dirname(__FILE__) + '/../models'
 
 class TestAdhd <  Test::Unit::TestCase
 
@@ -11,7 +10,7 @@ class TestAdhd <  Test::Unit::TestCase
 
       setup do
         assert_nothing_raised do
-          NODESERVER = CouchRest.new("http://192.168.1.104:5984")
+          NODESERVER = CouchRest.new("http://192.168.1.93:5984")
           NODESERVER.default_database = "node_db"
           @node_db = CouchRest::Database.new(NODESERVER, "node_db")
         end
@@ -71,3 +70,4 @@ class TestAdhd <  Test::Unit::TestCase
   private
 
 end
+

data/test/unit/test_node.rb

@@ -0,0 +1,138 @@
+require 'rubygems'
+require 'test/unit'
+require 'shoulda'
+require 'couchrest'
+require File.dirname(__FILE__) + '/../../lib/adhd/models/node_doc'
+
+# A db that always pretents to copy a db
+module FakeDb
+  def get_target
+    @target
+  end
+
+  def replicate_to t
+    @target = t
+  end
+
+  def replicate_from target
+    @target = t
+  end
+end
+
+# A db that always throws a replication exception
+module BlowDb
+  def get_target
+    @target
+  end
+
+  def replicate_to t
+    throw Exception.new
+  end
+
+  def replicate_from target
+    @target = t
+  end
+
+end
+
+class TestAdhd <  Test::Unit::TestCase
+
+  context "The Node model" do
+    setup do
+      @node = Node.new
+    end
+
+    should "have a name property" do
+      assert @node.respond_to? "name"
+    end
+
+    should "have a url property" do
+      assert @node.respond_to? "url"
+    end
+
+    should "have have an is_store property" do
+      assert @node.respond_to? "is_store"
+    end
+
+    should "have an is_management property" do
+      assert @node.respond_to? "is_management"
+    end
+
+    should "have an is_directory property" do
+      assert @node.respond_to? "is_directory"
+    end
+
+    should "have a status property" do
+      assert @node.respond_to? "status"
+    end
+
+    should "have timestamp properties" do
+      assert @node.respond_to? "created_at"
+      assert @node.respond_to? "updated_at"
+    end
+
+    should "have methods to replicate to and from other DBs" do
+      assert @node.respond_to? "replicate_to"
+      assert @node.respond_to? "replicate_from"
+    end
+
+    context "replication" do
+
+      setup do
+        @other_node = Node.new
+
+        # Simulate a DB class
+        local_db_klass = Class.new do
+          include FakeDb
+        end
+        local_blow_db_klass = Class.new do
+          include BlowDb
+        end
+
+        @node.name = "Node1"
+        @other_node.name = "Node2"
+        @local_db = local_db_klass.new
+        @local_blow_db = local_blow_db_klass.new
+      end
+
+      should "copy databases across" do
+        @node.replicate_to(@local_db, @other_node, "TARGET")
+        assert @local_db.get_target && @local_db.get_target == "TARGET"
+      end
+
+      should "not copy to same node" do
+        assert !@node.replicate_to(@local_db, @node, "TARGET")
+        assert !@local_db.get_target # Has not copied anything indeed
+      end
+
+      should "not copy to same node" do
+        assert !@node.replicate_to(@local_db, @node, "TARGET")
+        assert !@local_db.get_target # Has not copied anything indeed
+      end
+
+      should "not copy to unavailable nodes" do
+        @other_node.status = "UNAVAILABLE"
+        assert !@node.replicate_to(@local_db, @other_node, "TARGET")
+        assert !@local_db.get_target # Has not copied anything indeed
+      end
+
+      should "tag unavailable nodes" do
+        fake_node_klass = Class.new do
+          attr_accessor :status, :saved, :name
+          def initialize
+            @name = "Node2"
+          end
+          def save
+            @saved = true
+          end
+        end
+        fake_node = fake_node_klass.new
+
+        assert !@node.replicate_to(@local_blow_db, fake_node, "TARGET")
+        assert fake_node.status == "UNAVAILABLE"
+        assert fake_node.saved
+      end
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: adhd
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - dave.hrycyszyn@headlondon.com
@@ -87,6 +87,7 @@ files:
 - lib/adhd/config.yml
 - lib/adhd/models/content_doc.rb
 - lib/adhd/models/content_shard.rb
+- lib/adhd/models/node_db.rb
 - lib/adhd/models/node_doc.rb
 - lib/adhd/models/shard_range.rb
 - lib/adhd/node_manager.rb
@@ -113,6 +114,8 @@ files:
 - lib/views/layout.erb
 - test/helper.rb
 - test/test_adhd.rb
+- test/unit/test_content_doc.rb
+- test/unit/test_node.rb
 has_rdoc: true
 homepage: http://github.com/futurechimp/adhd
 licenses: []
@@ -142,5 +145,7 @@ signing_key:
 specification_version: 3
 summary: An experiment in distributed file replication using CouchDB
 test_files: 
+- test/unit/test_content_doc.rb
+- test/unit/test_node.rb
 - test/helper.rb
 - test/test_adhd.rb