ninjudd-active_document 0.0.3 → 0.0.4

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 3
+:patch: 4
 :major: 0

data/lib/active_document/base.rb

@@ -3,7 +3,7 @@ class ActiveDocument::Base
     if path
       @path = path
     else
-      @path || (base_class? ? ActiveDocument::DEFAULT_PATH : super)
+      @path ||= (self == ActiveDocument::Base ? ActiveDocument::DEFAULT_PATH : ActiveDocument::Base.path)
     end
   end
 
@@ -12,20 +12,8 @@ class ActiveDocument::Base
       raise 'cannot modify database_name after db has been initialized' if @database_name
       @database_name = database_name
     else
-      return nil if self == ActiveDocument::Base
-      @database_name ||= base_class? ? name.underscore.gsub('/', '-').pluralize : super
-    end
-  end
-  
-  def self.base_class?
-    self == base_class
-  end
-
-  def self.base_class(klass = self)
-    if klass == ActiveDocument::Base or klass.superclass == ActiveDocument::Base
-      klass
-    else
-      base_class(klass.superclass)
+      return if self == ActiveDocument::Base 
+      @database_name ||= name.underscore.gsub('/', '-').pluralize
     end
   end
 
@@ -49,6 +37,8 @@ class ActiveDocument::Base
   end
 
   def self.primary_key(field_or_fields)    
+    databases[:primary_key] = ActiveDocument::Database.new(:model_class => self, :unique => true)
+
     field = define_field_accessor(field_or_fields)
     define_find_methods(field, :field => :primary_key) # find_by_field1_and_field2
     
@@ -74,7 +64,7 @@ class ActiveDocument::Base
   end
 
   def self.databases
-    @databases ||= { :primary_key => ActiveDocument::Database.new(:model_class => self, :unique => true) }
+    @databases ||= {}
   end      
 
   def self.open_database
@@ -99,9 +89,8 @@ class ActiveDocument::Base
     open_database # Make sure the database is open.
     field ||= :primary_key
     field = field.to_sym
-    database = databases[field]
-    database ||= base_class.database(field) unless base_class?
-    database
+    return if self == ActiveDocument::Base
+    databases[field] ||= super
   end
 
   def database(field = nil)
@@ -187,10 +176,12 @@ class ActiveDocument::Base
 
   def initialize(attributes = {})
     if attributes.kind_of?(String)
-      @attributes, @saved_attributes = Marshal.load(attributes)
+      @attributes, @saved_attributes = Marshal.load(attributes)      
     else
       @attributes = attributes
     end
+    @attributes       = HashWithIndifferentAccess.new(@attributes)       if @attributes
+    @saved_attributes = HashWithIndifferentAccess.new(@saved_attributes) if @saved_attributes
   end
 
   attr_reader :saved_attributes
@@ -199,6 +190,18 @@ class ActiveDocument::Base
     @attributes ||= Marshal.load(Marshal.dump(saved_attributes))
   end
 
+  def to_json(*fields)
+    if fields.empty?
+      attributes.to_json
+    else
+      slice = {}
+      fields.each do |field|
+        slice[field] = attributes[field]
+      end
+      slice.to_json
+    end
+  end
+
   def ==(other)
     return false if other.nil?
     attributes == other.attributes
@@ -246,7 +249,9 @@ class ActiveDocument::Base
   end
 
   def _dump(ignored)
-    Marshal.dump([@attributes, @saved_attributes])
+    attributes       = @attributes.to_hash       if @attributes
+    saved_attributes = @saved_attributes.to_hash if @saved_attributes
+    Marshal.dump([attributes, saved_attributes])
   end
 
   def self._load(data)

data/lib/active_document/database.rb

@@ -113,7 +113,11 @@ class ActiveDocument::Database
     flags = opts[:create] ? Bdb::DB_NOOVERWRITE : 0
     db.put(transaction, key, data, flags)
   rescue Bdb::DbError => e
-    raise ActiveDocument::DuplicatePrimaryKey, "primary key #{model.primary_key.inspect} already exists"
+    if e.message =~ /DB_KEYEXIST/
+      raise ActiveDocument::DuplicatePrimaryKey, "primary key #{model.primary_key.inspect} already exists"
+    else
+      raise e
+    end
   end
 
   def delete(model)
@@ -121,6 +125,11 @@ class ActiveDocument::Database
     db.del(transaction, key, 0)
   end
 
+  def truncate
+    # Delete all records in the database. Beware!
+    db.truncate(transaction)
+  end
+
   def open
     if @db.nil?
       @db = environment.db

data/lib/active_document.rb

@@ -7,6 +7,7 @@ end
 require 'bdb'
 require 'tuple'
 require 'active_support/inflector'
+require 'active_support/core_ext/hash/indifferent_access.rb'
 require 'active_document/database'
 require 'active_document/environment'
 require 'active_document/base'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ninjudd-active_document
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-24 00:00:00 -07:00
+date: 2009-08-25 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -33,7 +33,6 @@ files:
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/ninjudd/active_document
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --inline-source
@@ -55,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: TODO