dm-xml-adapter 0.581 → 0.582

data/lib/dm-xml-adapter.rb

@@ -34,6 +34,7 @@ module DataMapper::Adapters
 		
 		def put(classname, id, object)	
       # check to see if we have a classname entry
+                #puts "putting a cache entry of id: #{id}"
       if (@classes[classname] == nil)
         @classes[classname] = Hash.new
       end
@@ -50,6 +51,7 @@ module DataMapper::Adapters
    	end
 		
 		def get(classname, id)
+                #puts "getting a cache entry for id: #{id}"
       hash = @classes[classname]
       return hash[id]
 		end
@@ -75,11 +77,11 @@ module DataMapper::Adapters
  
     end
     
-    def destroy_model_storage(repository, model)
+    def destroy_model_storage(model)
 	    FileUtils.rm_rf(classname_to_dir(model.to_s))
     end
     
-    def create_model_storage(repository, model)
+    def create_model_storage(model)
 	    FileUtils.mkdir_p(classname_to_dir(model.to_s))
     end
    
@@ -88,6 +90,7 @@ module DataMapper::Adapters
       resources.each do |resource|
         id = find_free_id_for(resources.first.class.to_s)
         # find name of key attribute
+        #puts "we are creating a new resource with id: #{id}"
         resource.attributes[key] = id
         resource.instance_variable_set("@" + key.to_s, id)
         save(resource)
@@ -159,7 +162,10 @@ module DataMapper::Adapters
           # the file's newer OR older (aha!!), so we gotta load it up
           object = file_to_object(filename, model)
           objects << object
-          @cache.put(model_name, object.key.first, object)
+          key = object.key
+          next if (key == nil)
+          key = object.key.first
+          @cache.put(model_name, key, object)
           @cache.set_mtime(filename, File.mtime(filename))
         end
       end
@@ -220,7 +226,9 @@ module DataMapper::Adapters
       # if there are no entries in the directory
       # or the directory doesn't exist
       # we need to create it...
+      #puts "trying to find a free id for #{class_name}"
       if ! File.exists?(classname_to_dir(class_name))
+        #puts "the directory doesn't exist"
         # default ID
         return 1
       end
@@ -230,10 +238,14 @@ module DataMapper::Adapters
       end
       id = @last_used_id[class_name] || 1
       while true do
-        if ! File.exists?(File.join(directory.path, id.to_s + ".xml"))
+        filename = File.join(directory.path, id.to_s + ".xml")
+        #puts "checking for the existence of #{filename}"
+        if ! File.exists?(filename)
           @last_used_id[class_name] = id
+          #puts "found free id: #{id}"
           return id
         end
+        #puts "the file existed..."
         id += 1
       end
     end
@@ -242,6 +254,7 @@ module DataMapper::Adapters
       # since we're saving, purge the cache
       resource_class = resource.class.to_s
       resource_key = resource.key.first
+      #puts "the key of the oject we are saving: #{resource_key}"
       @cache.delete(resource_class, resource_key)
       @cache.delete_mtime(class_name_to_file(resource_class, resource_key))
 
@@ -269,10 +282,13 @@ module DataMapper::Adapters
           end
         end
       end
-      
+       
+      #puts "the key is now: #{resource_key}" 
       xmlfile = File.new(class_name_to_file(resource_class, resource_key), "w")
+      #puts "saving to #{xmlfile.path}"
       tempfile = Tempfile.new("dm-xml-adapter", Dir.tmpdir())
       tempfile.puts out_string
+      #puts "the content is: #{out_string}"
       tempfile.close
       FileUtils.mv(tempfile.path,xmlfile.path)
       return xmlfile
@@ -288,9 +304,9 @@ module DataMapper::Adapters
       return File.join(classname_to_dir(class_name), id.to_s + ".xml")
     end
 
-    memoize(:file_to_id)
-    memoize(:classname_to_dir)
-    memoize(:class_name_to_file)
+    #memoize(:file_to_id)
+    #memoize(:classname_to_dir)
+    #memoize(:class_name_to_file)
 	
   end
 end

data/spec/dm-xml-adapter_spec.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'dm-core'
 require 'pathname'
+require 'dm-migrations'
 require Pathname(__FILE__).dirname.expand_path + 'spec_helper'
 
 DataMapper::Adapters::XmlAdapter.threads = 2
@@ -8,6 +9,7 @@ DataMapper::Adapters::XmlAdapter.threads = 2
 describe DataMapper::Adapters::XmlAdapter do
   before(:each) do
     @adapter = DataMapper.setup(:default, {:adapter => 'xml', :directory => 'db'})
+    DataMapper.auto_migrate!
     delete_all
   end
 
@@ -15,8 +17,8 @@ describe DataMapper::Adapters::XmlAdapter do
     XMLTest::User.all.each {|u| u.destroy }
     XMLTest::Post.all.each {|p| p.destroy }
     AutoQuote.all.each {|aq| aq.destroy }
-	  Food.all.each {|f| f.destroy }
-	  Drink.all.each {|d| d.destroy }
+    Food.all.each {|f| f.destroy }
+    Drink.all.each {|d| d.destroy }
   end
   
   after(:each) do
@@ -156,7 +158,8 @@ describe DataMapper::Adapters::XmlAdapter do
         100.times {|n| Drink.create(:name => "Drink#{n}") }
         # pick a random one
         ids = Drink.all.map {|d| d.drink_id }
-        drink = Drink.get(ids[rand(100).to_i])
+        random_key = ids[rand(100).to_i]
+        drink = Drink.get(random_key)
         drink.name = "Drinky drink!"
         drink.save
         Drink.first(:name => "Drinky drink!").should_not == nil

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'dm-core'
 require 'pathname'
-require Pathname(__FILE__).dirname.parent.expand_path + 'lib/dm-xml-adapter'
+require 'lib/dm-xml-adapter'
 
 class Food
     include DataMapper::Resource
@@ -41,7 +41,7 @@ class User
   property :user_id, Serial
   property :name, String
   property :age, Integer
-  property :money, BigDecimal
+  property :money, Decimal
   property :created, DateTime
   property :cool, Boolean
   property :content, String

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-xml-adapter
 version: !ruby/object:Gem::Version 
-  version: "0.581"
+  version: "0.582"
 platform: ruby
 authors: 
 - Joshua Harding
@@ -9,7 +9,7 @@ autorequire: dm-xml-adapter
 bindir: bin
 cert_chain: []
 
-date: 2010-07-01 00:00:00 -04:00
+date: 2010-07-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-core
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-migrations
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: josh@statewidesoftware.com
 executables: []