dm-xml-adapter 0.52 → 0.53

data/lib/dm-xml-adapter.rb

@@ -15,19 +15,19 @@ module DataMapper::Adapters
 	class XmlAdapterCache
 		
 		def initialize
-			# @@logger = Log4r::Logger.new 'cache'
-			# @@logger.outputters = Log4r::Outputter.stdout
+		  #@@logger = Log4r::Logger.new 'cache'
+		  #@@logger.outputters = Log4r::Outputter.stdout
 			@mtimes = Hash.new()
 			@classes = Hash.new()
 		end
 		
 		def set_mtime(file, mtime)
-			# @@logger.info("Saved mtime, #{file} -> #{mtime}")
+		  #@@logger.info("Saved mtime, #{file} -> #{mtime}")
 			@mtimes[file] = mtime
 		end
 		
 		def delete_mtime(file)
-			# @@logger.info("deleting the following mtime: #{file}")
+			#@@logger.info("deleting the following mtime: #{file}")
 			@mtimes.delete(file)
 		end
 		
@@ -36,8 +36,8 @@ module DataMapper::Adapters
 		end
 		
 		def put(classname, id, object)
-			# @@logger.info("first one: #{@classes.inspect}")
-			# @@logger.info("CACHE INSERT: #{classname} #{id} #{object.inspect}")
+		  # @@logger.info("first one: #{@classes.inspect}")
+		  # @@logger.info("CACHE INSERT: #{classname} #{id} #{object.inspect}")
 			
 			# check to see if we have a classname entry
 			if (@classes[classname] == nil)
@@ -52,20 +52,20 @@ module DataMapper::Adapters
 		def delete(classname, id)
 			# @@logger.info("deleted the following from cache: #{classname} #{id.to_s}")
 			hash = @classes[classname]
-			# @@logger.info("the hash is: #{hash.inspect}")
+			#@@logger.info("the hash is: #{hash.inspect}")
 			unless hash == nil
 				hash.delete(id.to_s)
 			end
-			# @@logger.info("the hash is: #{hash.inspect}")
+			#@@logger.info("the hash is: #{hash.inspect}")
 		end
 		
 		def get(classname, id)
 			# @@logger.info("CACHE FETCH: #{classname} #{id}")
-			# @@logger.info("Master classes: #{@classes.inspect}")
+			#@@logger.info("Master classes: #{@classes.inspect}")
 			hash = @classes[classname]
-			# @@logger.info("the hash is: #{hash.inspect}")
+			#@@logger.info("the hash is: #{hash.inspect}")
 			object = hash[id]
-			# @@logger.info("The object is: #{object}")
+			#@@logger.info("The object is: #{object}")
 			return object
 		end
 	end
@@ -84,7 +84,7 @@ module DataMapper::Adapters
       @cache = XmlAdapterCache.new
       
       # @@logger = Log4r::Logger.new 'adapter'
-      # @@logger.outputters = Log4r::Outputter.stdout
+      #@@logger.outputters = Log4r::Outputter.stdout
 
     end
     
@@ -172,16 +172,16 @@ module DataMapper::Adapters
         file = File.new(filename)
         # see if we have a nice cached version
         if (@cache.get_mtime(filename) == nil or file.mtime > @cache.get_mtime(filename))
-          #@@logger.info("CACHE MISS")
+          # @@logger.info("CACHE MISS")
           # the file's newer, so we gotta load it up
           object = file_to_object(filename, model)
           objects << object
           @cache.put(model.to_s, object.key.first, object)
           @cache.set_mtime(filename, file.mtime)
         else
-				# @@logger.info("YES !!!")
-          #@@logger.info("CACHE HIT")
-          #@@logger.info("the file is: #{file}")
+          # @@logger.info("YES !!!")
+          # @@logger.info("CACHE HIT")
+          # @@logger.info("the file is: #{file}")
           # the file was older than what we had so cache is fine
           objects << @cache.get(model.to_s, file_to_id(filename))
         end
@@ -263,6 +263,11 @@ module DataMapper::Adapters
     end
   	
     def save(resource)
+
+      # since we're saving, purge the cache
+      @cache.delete(resource.class.to_s, resource.key.first)
+      @cache.delete_mtime(class_name_to_file(resource.class.to_s, resource.key.first))
+
       # file = File.join(class_name_to_file(resource.class.to_s, resource.key.first))
       # see if the directory exists, if it doesn't, we need to create it
       if ! File.exists?(classname_to_dir(resource.class.to_s))
@@ -292,13 +297,14 @@ module DataMapper::Adapters
           end
         end
       end
-      xmlfile = File.new(class_name_to_file(resource.class.to_s, resource.key.first), "w")
       
+      xmlfile = File.new(class_name_to_file(resource.class.to_s, resource.key.first), "w")
       tempfile = Tempfile.new("dm-xml-adapter", "/tmp")
       tempfile.puts out_string
       tempfile.close
       FileUtils.mv(tempfile.path,xmlfile.path)
       return xmlfile
+      
     end
 
     def classname_to_dir(class_name)

data/spec/dm-xml-adapter_spec.rb

@@ -5,131 +5,150 @@ require Pathname(__FILE__).dirname.expand_path + 'spec_helper'
 
 describe DataMapper::Adapters::XmlAdapter do
   before(:each) do
-     @adapter = DataMapper.setup(:default, {:adapter => 'xml', :directory => 'db'})
+    @adapter = DataMapper.setup(:default, {:adapter => 'xml', :directory => 'db'})
+    delete_all
+  end
+
+  def delete_all()
+    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 }
   end
   
   after(:each) do
-          XMLTest::User.all.each {|u| u.destroy }
-          XMLTest::Post.all.each {|p| p.destroy }
-          AutoQuote.all.each {|aq| aq.destroy }
+    delete_all
   end
   
 
   describe "CRUD" do
 
-     describe "non-namedspaced class" do
-        it "should be able to persist" do
-            AutoQuote.create(:fullname => "Joshua Harding") 
-            AutoQuote.all.size.should == 1
-        end
-     end
+    describe "non-namedspaced class" do
+      it "should be able to persist" do
+        AutoQuote.create(:fullname => "Joshua Harding")
+        AutoQuote.all.size.should == 1
+      end
+    end
   
-     describe "content attribute" do
-        it "should be able to handle a content attribute" do
-           XMLTest::User.create(:name => "contentking", :content => "cool")
-           XMLTest::User.all.size.should == 1
-        end
-     end
+    describe "content attribute" do
+      it "should be able to handle a content attribute" do
+        XMLTest::User.create(:name => "contentking", :content => "cool")
+        XMLTest::User.all.size.should == 1
+      end
+    end
    
-     describe "datetime" do
-        it "should do datetime" do
-           u1 = XMLTest::User.new
-           u1.name = "cool!"
-           u1.created = DateTime.now
-           u1.save
-           u2 = XMLTest::User.first(:name => "cool!")           
-           u2.created.class.should == DateTime
-        end
-     end
+    describe "datetime" do
+      it "should do datetime" do
+        u1 = XMLTest::User.new
+        u1.name = "cool!"
+        u1.created = DateTime.now
+        u1.save
+        u2 = XMLTest::User.first(:name => "cool!")
+        u2.created.class.should == DateTime
+      end
+    end
 
-     describe "boolean" do
-         it "should be boolean" do 
-            u1 = XMLTest::User.new
-            u1.name = "yes"
-            u1.cool = true 
-            u1.save
-            u2 = XMLTest::User.first(:name => "yes")
-            u2.cool.class.should == TrueClass
-         end
-         it "falso thing" do
-            u1 = XMLTest::User.new
-            u1.name = "yes2"
-            u1.cool = false
-	    u1.save
-            u2 = XMLTest::User.first(:name => "yes2")
-            u2.cool.class.should == FalseClass 
-         end
-     end
+    describe "boolean" do
+      it "should be boolean" do
+        u1 = XMLTest::User.new
+        u1.name = "yes"
+        u1.cool = true
+        u1.save
+        u2 = XMLTest::User.first(:name => "yes")
+        u2.cool.class.should == TrueClass
+      end
+      it "falso thing" do
+        u1 = XMLTest::User.new
+        u1.name = "yes2"
+        u1.cool = false
+        u1.save
+        u2 = XMLTest::User.first(:name => "yes2")
+        u2.cool.class.should == FalseClass
+      end
+    end
  
-     describe "associations" do
-        it "should have associations" do
-           u1 = XMLTest::User.new
- 	   u1.name = "bob"
-           u1.save 
-           p1 = XMLTest::Post.new
-           p1.title = "title o' post"
-           u1.posts << p1
-           p1.save
-           p2 = XMLTest::Post.new
-	   p2.title = "title of the second post"
-           u1.posts << p2
-           p2.save
-	   u1.posts.size.should == 2
-           u3 = XMLTest::User.first(:name => "bob")
-           u3.posts.size.should == 2
-        end
-     end
+    describe "associations" do
+      it "should have associations" do
+        u1 = XMLTest::User.new
+        u1.name = "bob"
+        u1.save
+        p1 = XMLTest::Post.new
+        p1.title = "title o' post"
+        u1.posts << p1
+        p1.save
+        p2 = XMLTest::Post.new
+        p2.title = "title of the second post"
+        u1.posts << p2
+        p2.save
+        u1.posts.size.should == 2
+        u3 = XMLTest::User.first(:name => "bob")
+        u3.posts.size.should == 2
+      end
+    end
   
-     describe "get all" do
-        it "should get all" do
-           XMLTest::User.create(:name => :yeah)
-           XMLTest::User.all.should_not == nil
-        end
-     end
+    describe "get all" do
+      it "should get all" do
+        XMLTest::User.create(:name => :yeah)
+        XMLTest::User.all.should_not == nil
+      end
+    end
  
-     describe "update" do
-        it "should update" do
-         u1 = XMLTest::User.new
-         u1.name = "bob"
-         u1.save 
-         u1.name = "steve"
-         u1.save
-         u1.name.should_not == "bob"
-        end
-     end
+    describe "update" do
+      it "should update" do
+        u1 = XMLTest::User.new
+        u1.name = "bob"
+        u1.save
+        u1.name = "steve"
+        u1.save
+        u1.name.should_not == "bob"
+      end
+    end
 
-     describe "create" do
-        it "should create" do
-           u = XMLTest::User.new
-           u.save
-           u.user_id.should_not == nil
-        end 
-     end
+    describe "create" do
+      it "should create" do
+        u = XMLTest::User.new
+        u.save
+        u.user_id.should_not == nil
+      end
+    end
      
-     describe "delete" do 
-	     it "should delete someone" do
-		     user = XMLTest::User.create
-		     user.destroy.should == true
-     	     end     
-     end
+    describe "delete" do
+      it "should delete someone" do
+        user = XMLTest::User.create
+        user.destroy.should == true
+      end
+    end
 
-     describe "BigDecimal Support" do
-		it "should support bigdecimals" do
-			user1 = XMLTest::User.create(:name => "Richie Rich", :money => BigDecimal.new("100000000000000.51"))
-			user1.save
-			user1.reload	
-			user1.money.class.should == BigDecimal
-		end
+    describe "BigDecimal Support" do
+      it "should support bigdecimals" do
+        user1 = XMLTest::User.create(:name => "Richie Rich", :money => BigDecimal.new("100000000000000.51"))
+        user1.save
+        user1.reload
+        user1.money.class.should == BigDecimal
+      end
     end
  
-     describe "find not" do
-             it "should find someone with a not clause" do
-                     user1 = XMLTest::User.create(:name => "joe")
-                     user2 = XMLTest::User.create(:name => "bob")
-                     users = XMLTest::User.all(:user_id.not => user1.user_id) 
-                     users.first.user_id.should_not == user1.user_id 
-             end
-     end
+    describe "find not" do
+      it "should find someone with a not clause" do
+        user1 = XMLTest::User.create(:name => "joe")
+        user2 = XMLTest::User.create(:name => "bob")
+        users = XMLTest::User.all(:user_id.not => user1.user_id)
+        users.first.user_id.should_not == user1.user_id
+      end
+    end
+
+    describe "more updating" do
+      it "should do a really quick update" 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])
+        drink.name = "Drinky drink!"
+        drink.save
+        Drink.first(:name => "Drinky drink!").should_not == nil
+      end
+    end
  
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-xml-adapter
 version: !ruby/object:Gem::Version 
-  version: "0.52"
+  version: "0.53"
 platform: ruby
 authors: 
 - Joshua Harding
@@ -9,7 +9,7 @@ autorequire: dm-xml-adapter
 bindir: bin
 cert_chain: []
 
-date: 2009-12-14 00:00:00 -05:00
+date: 2009-12-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency