dm-xml-adapter 0.53 → 0.54

data/lib/dm-xml-adapter.rb

@@ -23,12 +23,12 @@ module DataMapper::Adapters
 		
 		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)
+      @mtimes.delete(file)
 		end
 		
 		def get_mtime(file)
@@ -36,37 +36,36 @@ 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("CACHE INSERT: #{classname} #{id} #{object.inspect}")
 			
-			# check to see if we have a classname entry
-			if (@classes[classname] == nil)
-				@classes[classname] = Hash.new
-			end
+      # check to see if we have a classname entry
+      if (@classes[classname] == nil)
+        @classes[classname] = Hash.new
+      end
 			
-			hash = @classes[classname]
-			hash[id.to_s] = object
-			# @@logger.info("the hash is: #{hash.inspect}")
+      hash = @classes[classname]
+      hash[id.to_s] = object
+      # @@logger.info("the hash is: #{hash.inspect}")
 		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}")
+      #@@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
 		
 		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
+      #@@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
 
@@ -83,7 +82,7 @@ module DataMapper::Adapters
       
       @cache = XmlAdapterCache.new
       
-      # @@logger = Log4r::Logger.new 'adapter'
+      #@@logger = Log4r::Logger.new 'adapter'
       #@@logger.outputters = Log4r::Outputter.stdout
 
     end
@@ -162,17 +161,19 @@ module DataMapper::Adapters
     end
   	
   	def get_all(model)
+      #@@logger.info("Trying to get all: #{model.to_s}")
       objects = Array.new
       directory = classname_to_dir(model.to_s)
       if ! File.exists?(directory)
+        #@@logger.error("The directory doesn't exist!")
         return objects
       end
-      Dir.glob(directory / "*.xml").each do |filename|
-        # TODO: caching at this point, based of mtime of files
+      Dir.entries(directory).select {|f| f.match(/\.xml$/) }.each do |filename|
+        filename = directory + "/" + filename
         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
@@ -180,7 +181,7 @@ module DataMapper::Adapters
           @cache.set_mtime(filename, file.mtime)
         else
           # @@logger.info("YES !!!")
-          # @@logger.info("CACHE HIT")
+          #@@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))

metadata

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