shadydb 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/shadydb/attributes.rb

@@ -11,7 +11,7 @@ module ShadyDB
         
         field :id
         
-        attr_accessor :attributes
+        attr_accessor :attributes, :raw
       end
     end
     

data/lib/shadydb/finders.rb

@@ -13,9 +13,7 @@ module ShadyDB
         return false unless self.exists?(id)
         
         document = self.new :id => id
-        storage = File.read(document.path)
-        
-        document.send(:restore!, storage)
+        document.send(:restore!)
         document.instance_variable_set('@new_record', false)
         document
       end

data/lib/shadydb/persistence.rb

@@ -7,9 +7,11 @@ module ShadyDB
     
     def self.included(base)
       base.class_eval do
-        define_model_callbacks :save, :create, :update, :destroy
+        define_model_callbacks :save, :create, :update, :destroy, :persist, :restore
         
-        before_create :ensure_data_directory_exists
+        before_persist :_set_raw
+        before_restore :_get_raw
+        before_create :_ensure_data_directory_exists
         
         extend ClassMethods
       end
@@ -65,7 +67,7 @@ module ShadyDB
     
     protected
     
-      def ensure_data_directory_exists
+      def _ensure_data_directory_exists
         self.class.data_directory.split('/').inject do |base, dir_name|
           dir = File.join(base, dir_name)
           Dir.mkdir(dir) unless File.exist?(dir)
@@ -89,22 +91,31 @@ module ShadyDB
       
       def update
         _run_update_callbacks do
-          File.open(path,'w') do |storage|
-            storage << self.to_xml
-          end
-          
+          persist!          
           true
         end
       end
       
       def persist!
-        File.open(path,'w') do |storage|
-          storage << self.send(:"to_#{ShadyDB.configuration.format}")
+        _run_persist_callbacks do
+          File.open(path,'w') do |storage|
+            storage << @raw
+          end
         end
       end
       
-      def restore!(xml_or_json)
-        send(:"from_#{ShadyDB.configuration.format}" ,xml_or_json)
+      def restore!
+        _run_restore_callbacks do
+          send(:"from_#{ShadyDB.configuration.format}" ,@raw)
+        end
+      end
+      
+      def _set_raw
+        @raw = self.send(:"to_#{ShadyDB.configuration.format}")
+      end
+      
+      def _get_raw
+        @raw = File.read(path)
       end
       
       def generate_id

data/shadydb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shadydb}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jdpace"]
-  s.date = %q{2010-05-19}
+  s.date = %q{2010-05-20}
   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 = [

metadata

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