shadydb 0.1.0 → 0.2.0

data/README.markdown

@@ -43,7 +43,6 @@ anyone to spend the time to write their own ORM.
 * Add support for collection finders
 * Add support for conditional finders
 * Add simple indexing
-* Add defined fields a la Mongoid
 
 ## Note on Patches/Pull Requests
  

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/shadydb/attributes.rb

@@ -4,10 +4,21 @@ module ShadyDB
     
     def self.included(base)
       base.class_eval do
-        attr_accessor :id, :attributes
+        extend ClassMethods
+        
+        cattr_accessor :fields
+        self.fields = {}
+        
+        field :id
+        
+        attr_accessor :attributes
       end
     end
     
+    def id
+      self[:id]
+    end
+    
     def [](key)
       attributes[key.to_s]
     end
@@ -29,6 +40,14 @@ module ShadyDB
       end
     end
     
+    module ClassMethods
+      
+      def field(name, options = {})
+        self.fields[name.to_s] = options[:default]
+      end
+      
+    end
+    
   end
   
 end

data/lib/shadydb/document.rb

@@ -4,8 +4,8 @@ module ShadyDB
     extend ActiveModel::Callbacks
     include ActiveModel::Validations
     include ShadyDB::Attributes
-    include ShadyDB::Persistence
     include ShadyDB::Finders
+    include ShadyDB::Persistence
     
     before_save :validate
     
@@ -13,8 +13,8 @@ module ShadyDB
       @new_record = true
       @destroyed = false
       
-      self.attributes = {}
-      self.attributes = attribs.stringify_keys if attribs.kind_of?(Hash)
+      self.attributes = attribs.stringify_keys
+      self.attributes.reverse_merge!(self.class.fields)
     end
     
     def to_model

data/lib/shadydb/finders.rb

@@ -10,18 +10,21 @@ module ShadyDB
     
     module ClassMethods
       def find(id)
-        document = self.new
-        document.instance_variable_set('@id', id)
+        return false unless self.exists?(id)
         
-        return false unless File.exist?(document.path)
+        document = self.new :id => id
         storage = File.read(document.path)
         
         document.send(:restore!, storage)
         document.instance_variable_set('@new_record', false)
         document
       end
+      
+      def exists?(id)
+        document = self.new :id => id
+        File.exist?(document.path)
+      end
     end
-    
   end
   
 end

data/lib/shadydb/persistence.rb

@@ -60,7 +60,7 @@ module ShadyDB
     end
     
     def path
-      File.join(self.class.data_directory, @id)
+      File.join(self.class.data_directory, id)
     end
     
     protected
@@ -79,7 +79,7 @@ module ShadyDB
       
       def create        
         _run_create_callbacks do
-          @id = generate_id
+          generate_id
           persist!
           @new_record = false
           
@@ -107,9 +107,10 @@ module ShadyDB
         send(:"from_#{ShadyDB.configuration.format}" ,xml_or_json)
       end
       
-      # TODO: should check if ID is already taken
       def generate_id
-        ActiveSupport::SecureRandom.hex()
+        while(id.nil? || self.class.exists?(id)) do
+          self.id = ActiveSupport::SecureRandom.hex()
+        end
       end
       
   end

data/shadydb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shadydb}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jdpace"]
-  s.date = %q{2010-05-17}
+  s.date = %q{2010-05-19}
   s.description = %q{ORM that persists to file system using either XML or JSON with optional encryption layer.}
   s.email = %q{jared@codewordstudios.com}
   s.extra_rdoc_files = [

data/test/attributes_test.rb

@@ -1,5 +1,10 @@
 require 'helper'
 
+class SampleDocument < ShadyDB::Document
+  field :name
+  field :role, :default => 'developer'
+end
+
 class AttributesTest < Test::Unit::TestCase
   
   subject do
@@ -32,4 +37,22 @@ class AttributesTest < Test::Unit::TestCase
     end
   end
   
+  context 'Defined fields' do
+    should "allow defined fields which are always created" do
+      document = SampleDocument.new
+      assert document.attributes.key?('name')
+      assert document.name.nil?
+    end
+    
+    should "allow default values for defined fields" do
+      document = SampleDocument.new
+      assert document[:role] == 'developer'
+    end
+    
+    should "be able to override default values" do
+      document = SampleDocument.new :role => 'admin'
+      assert document[:role] == 'admin'
+    end
+  end
+  
 end

data/test/finders_test.rb

@@ -13,4 +13,18 @@ class FindersTest < Test::Unit::TestCase
     end
   end
   
+  context "Checking whether or not a Document exists" do
+    should "return true if a document is persited" do
+      document = ShadyDB::Document.create :name => 'Sawyer'
+      assert document.persisted?
+      assert ShadyDB::Document.exists?(document.id)
+    end
+    
+    should "return false if a document is not persited" do
+      document = ShadyDB::Document.new :id => 'fake-id', :name => 'Sawyer'
+      assert !document.persisted?
+      assert !ShadyDB::Document.exists?(document.id)
+    end
+  end
+  
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - jdpace
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-17 00:00:00 -04:00
+date: 2010-05-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency