dm-xml-adapter 0.54 → 0.55

data/lib/dm-xml-adapter.rb

@@ -160,31 +160,33 @@ module DataMapper::Adapters
       return query.filter_records(result_set)
     end
   	
-  	def get_all(model)
+    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
+        return []
       end
+      objects = []
       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))
+        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))
+        else
           #@@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}")
-          # the file was older than what we had so cache is fine
-          objects << @cache.get(model.to_s, file_to_id(filename))
+          @cache.set_mtime(filename, File.mtime(filename))
         end
       end
       return objects

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-xml-adapter
 version: !ruby/object:Gem::Version 
-  version: "0.54"
+  version: "0.55"
 platform: ruby
 authors: 
 - Joshua Harding
@@ -9,7 +9,7 @@ autorequire: dm-xml-adapter
 bindir: bin
 cert_chain: []
 
-date: 2009-12-29 00:00:00 -05:00
+date: 2010-01-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,10 +41,10 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- lib/dm-xml-adapter.rb
 - lib/ratecounter.rb
-- spec/dm-xml-adapter_spec.rb
+- lib/dm-xml-adapter.rb
 - spec/spec_helper.rb
+- spec/dm-xml-adapter_spec.rb
 - README
 has_rdoc: true
 homepage: 
@@ -75,5 +75,5 @@ signing_key:
 specification_version: 3
 summary: a XML adapter for DataMapper. this adapter allows you to use DataMapper with XML files as a backing store.
 test_files: 
-- spec/dm-xml-adapter_spec.rb
 - spec/spec_helper.rb
+- spec/dm-xml-adapter_spec.rb