dm-xml-adapter 0.571 → 0.572

data/lib/dm-xml-adapter.rb

@@ -9,25 +9,21 @@ require 'tempfile'
 require 'simple_memoize'
 require 'log4r'
 
-
+# 
 module DataMapper::Adapters
 	
 	class XmlAdapterCache
 		
 		def initialize
-		  #@@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}")
-      @mtimes[file] = mtime
+	    @mtimes[file] = mtime
 		end
 		
 		def delete_mtime(file)
-			#@@logger.info("deleting the following mtime: #{file}")
       @mtimes.delete(file)
 		end
 		
@@ -36,8 +32,7 @@ module DataMapper::Adapters
 		end
 		
 		def put(classname, id, object)
-      #@@logger.info("CACHE INSERT: #{classname} #{id} #{object.inspect}")
-			
+   		
       # check to see if we have a classname entry
       if (@classes[classname] == nil)
         @classes[classname] = Hash.new
@@ -45,26 +40,18 @@ module DataMapper::Adapters
 			
       hash = @classes[classname]
       hash[id.to_s] = object
-      # @@logger.info("the hash is: #{hash.inspect}")
-		end
+   	end
 		
 		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}")
       unless hash == nil
         hash.delete(id.to_s)
       end
-      #@@logger.info("the hash is: #{hash.inspect}")
-		end
+   	end
 		
 		def get(classname, id)
-      #@@logger.info("CACHE FETCH: #{classname} #{id}")
-      #@@logger.info("Master classes: #{@classes.inspect}")
       hash = @classes[classname]
-      #@@logger.info("the hash is: #{hash.inspect}")
       object = hash[id]
-      #@@logger.info("The object is: #{object}")
       return object
 		end
 	end
@@ -81,10 +68,7 @@ module DataMapper::Adapters
       @last_used_id = Hash.new
       
       @cache = XmlAdapterCache.new
-      
-      #@@logger = Log4r::Logger.new 'adapter'
-      #@@logger.outputters = Log4r::Outputter.stdout
-
+ 
     end
     
     def destroy_model_storage(repository, model)
@@ -110,12 +94,14 @@ module DataMapper::Adapters
     
     def delete(collection)
 	    collection.each do |result|
-        @last_used_id[result.class.to_s] = result.key.first
+        key = result.key.first
+        class_name = result.model.to_s
+        @last_used_id[class_name] = key
 		    xml_destroy(result)
 		    # also remove from cache
-		    @cache.delete(result.model.to_s, result.key.first)
+		    @cache.delete(class_name, key)
 		    # also remove from mtimes
-		    @cache.delete_mtime(class_name_to_file(result.model.to_s, result.key.first))
+		    @cache.delete_mtime(class_name_to_file(class_name, key))
 	    end
 	    return collection.size
     end
@@ -146,46 +132,34 @@ module DataMapper::Adapters
       # take an objects class and ID and figure
       # out what file it's in
       # and then remove that file
-      class_name = resource.class.to_s
-      id = resource.key.first
-      file = class_name_to_file(class_name, id)
-      File.unlink(file)
+      File.unlink class_name_to_file(resource.class.to_s, resource.key.first)
     end
 	
     def filter_result_set(objects, query)
-      #puts "before filter: #{objects.inspect}"
       result_set = objects.clone
-      result_set = query.filter_records(result_set)
-      #puts "After filter: #{result_set.inspect}"
       return query.filter_records(result_set)
     end
   	
     def get_all(model)
-      #@@logger.info("Trying to get all: #{model.to_s}")
-      directory = classname_to_dir(model.to_s)
+      model_name = model.to_s
+      directory = classname_to_dir(model_name)
       if ! File.exists?(directory)
-        #@@logger.error("The directory doesn't exist!")
         return []
       end
       objects = []
-      Dir.entries(directory).select {|f| f.match(/\.xml$/) }.each do |filename|
+      Dir.entries(directory).select {|file| file.match(/\.xml$/) }.each do |filename|
         filename = directory + "/" + filename
         # see if we have a nice cached version
         mtime = File.mtime(filename)
         cache_mtime = @cache.get_mtime(filename)
-        #puts "file mtime: #{mtime} cache mtime: #{@cache.get_mtime(filename)}"
-        if (mtime != nil and cache_mtime != nil) 
-          #puts "comparing! #{mtime < cache_mtime}"
-        end
-        if (mtime != nil  and cache_mtime != nil and mtime == cache_mtime)
-          # we hav ea nice cached object..
-          objects << @cache.get(model.to_s, file_to_id(filename))
+        if (mtime != nil and cache_mtime != nil and mtime == cache_mtime)
+          # we have a nice cached object..
+          objects << @cache.get(model_name, file_to_id(filename))
         else
-          #@@logger.info("CACHE MISS")
-          # the file's newer, so we gotta load it up
+          # the file's newer OR older (aha!!), so we gotta load it up
           object = file_to_object(filename, model)
           objects << object
-          @cache.put(model.to_s, object.key.first, object)
+          @cache.put(model_name, object.key.first, object)
           @cache.set_mtime(filename, File.mtime(filename))
         end
       end
@@ -204,13 +178,13 @@ module DataMapper::Adapters
     end
 	
     def file_to_object(file, model)
-		
+      model_name = model.to_s
       # allocate new object to receive these fields
-      if (model.to_s.match(/\:\:/))
-        modname, clazz = model.to_s.split("::")
+      if (model_name.match(/\:\:/))
+        modname, clazz = model_name.split("::")
         new_obj = Kernel.const_get(modname).const_get(clazz).new
       else
-        clazz = model.to_s
+        clazz = model_name
         new_obj = Kernel.const_get(clazz).new
       end
 		
@@ -268,27 +242,23 @@ module DataMapper::Adapters
     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))
+      resource_class = resource.class.to_s
+      resource_key = resource.key.first
+      @cache.delete(resource_class, resource_key)
+      @cache.delete_mtime(class_name_to_file(resource_class, resource_key))
 
-      # 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))
-        FileUtils.mkdir_p(classname_to_dir(resource.class.to_s))
+      if ! File.exists?(classname_to_dir(resource_class))
+        FileUtils.mkdir_p(classname_to_dir(resource_class))
       end
 
-      # puts resource.model.properties.inspect
-		
       # set up builder
       out_string = ""
       xml = Builder::XmlMarkup.new(:target => out_string, :indent => 1)
 		
       # iterate over the resource and figure out the fields
-      # class_name = resource.model.to_s.gsub(/\:/, "_")
       xml.tag!("RubyObject", :class => resource.model.to_s) do
         resource.model.properties.each do |property|
-          #puts "saving prop: #{property.name}"
-          #puts "primitive: #{property.primitive}"
           value = resource.instance_variable_get("@" + property.name.to_s)
           # special case for false
           if property.primitive == TrueClass and value == false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-xml-adapter
 version: !ruby/object:Gem::Version 
-  version: "0.571"
+  version: "0.572"
 platform: ruby
 authors: 
 - Joshua Harding
@@ -9,7 +9,7 @@ autorequire: dm-xml-adapter
 bindir: bin
 cert_chain: []
 
-date: 2010-02-09 00:00:00 -05:00
+date: 2010-02-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency