dm-xml-adapter 0.57 → 0.58

data/README

@@ -1 +1,2 @@
 This is an XML adapter.
+Set DataMapper::Adapters::XmlAdapter.threads = 2 or more in jruby...

data/lib/dm-xml-adapter.rb

@@ -9,25 +9,22 @@ require 'tempfile'
 require 'simple_memoize'
 require 'log4r'
 
-
+# the XML adapter is an adapter for DataMapper that allows you to store
+# data in XML files. beware, it's not transactionally safe.
 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
 		
@@ -35,9 +32,7 @@ module DataMapper::Adapters
 			return @mtimes[file]
 		end
 		
-		def put(classname, id, object)
-      #@@logger.info("CACHE INSERT: #{classname} #{id} #{object.inspect}")
-			
+		def put(classname, id, object)	
       # check to see if we have a classname entry
       if (@classes[classname] == nil)
         @classes[classname] = Hash.new
@@ -45,35 +40,31 @@ 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
+      return hash[id]
 		end
 	end
 
   class XmlAdapter < AbstractAdapter     
 
+    def self.threads=(count)
+      @@threadcount = count
+    end
+
     def initialize(name, options)
       super
 
+      @@threadcount = 1
       @options = Hash.new
       @options[:directory] = options[:directory]
       @options[:directory] ||= './db'         
@@ -81,10 +72,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)
@@ -95,27 +83,27 @@ module DataMapper::Adapters
 	    FileUtils.mkdir_p(classname_to_dir(model.to_s))
     end
    
-    def create(resources) 
+    def create(resources)
+      key = resources.first.model.key.first.name
       resources.each do |resource|
-        model = resource.model
-        id = find_free_id_for(resource.class.to_s)
+        id = find_free_id_for(resources.first.class.to_s)
         # find name of key attribute
-        key = model.key.first.name
         resource.attributes[key] = id
         resource.instance_variable_set("@" + key.to_s, id)
         save(resource)
-      end
-      return resources.size
+      end.size
     end
     
     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,116 +134,101 @@ 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|
-        filename = directory + "/" + filename
+      Dir[directory + "/*.xml"].each do |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 has_cached_version?(filename)
+          # 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
       return objects
     end
+
+    def has_cached_version?(filename)
+      mtime = File.mtime(filename)
+      cache_mtime = @cache.get_mtime(filename)
+      return true if (mtime != nil and cache_mtime != nil and mtime == cache_mtime)
+    end
 	
     def file_to_id(file)
       return file.match(/([0-9]+)\.xml/)[1]
     end
- 
-    def is_integer?(number)
-      if number.class == String and number.match(/^\-*[0-9]+$/)
-        return true
-      end
-      return false
-    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 = [$1, $2]
         new_obj = Kernel.const_get(modname).const_get(clazz).new
       else
-        clazz = model.to_s
-        new_obj = Kernel.const_get(clazz).new
+        new_obj = Kernel.const_get(model_name).new
       end
 		
-      # file is our XML file
-      string = IO.read(file)
-      parser = XML::Parser.string(string)
-      doc = parser.parse
-      root_node = doc.root
       # iterate over children
-      root_node.children.each do |child|
+      XML::Parser.string(IO.read(file)).parse.root.children.each do |child|
         child_class = child.attributes["class"]
         if child_class != nil
           # this means we have an attribute
-          if (child_class == "Integer")
-            new_obj.instance_variable_set("@#{child.name}", child.content.to_i)
-          elsif (child_class == "String")
-            new_obj.instance_variable_set("@#{child.name}", child.content)
-          elsif (child_class == "TrueClass")
-            new_obj.instance_variable_set("@#{child.name}", true)
-          elsif (child_class == "FalseClass")
-            new_obj.instance_variable_set("@#{child.name}", false)
-          elsif (child_class == "BigDecimal")
-            new_obj.instance_variable_set("@#{child.name}", BigDecimal.new(child.content))
-          elsif (child_class == "DateTime")
-            new_obj.instance_variable_set("@#{child.name}", DateTime.parse(child.content))
-          end
+          populate_instance(new_obj, child, child_class)
         end
       end
 		
       return new_obj
     end
+
+    def populate_instance(new_obj, child, child_class)
+      if (child_class == "String")
+        new_obj.instance_variable_set("@#{child.name}", child.content)
+      elsif (child_class == "Integer")
+        new_obj.instance_variable_set("@#{child.name}", child.content.to_i)
+      elsif (child_class == "TrueClass")
+        new_obj.instance_variable_set("@#{child.name}", true)
+      elsif (child_class == "FalseClass")
+        new_obj.instance_variable_set("@#{child.name}", false)
+      elsif (child_class == "BigDecimal")
+        new_obj.instance_variable_set("@#{child.name}", BigDecimal.new(child.content))
+      elsif (child_class == "DateTime")
+        new_obj.instance_variable_set("@#{child.name}", DateTime.parse(child.content))
+      elsif (child_class == "Date")
+        new_obj.instance_variable_set("@#{child.name}", Date.parse(child.content))
+      end
+    end
   	
-   	def find_free_id_for(class_name)
+    def find_free_id_for(class_name)
       # if there are no entries in the directory
       # or the directory doesn't exist
       # we need to create it...
       if ! File.exists?(classname_to_dir(class_name))
         # default ID
-        return 0
+        return 1
       end
       directory = Dir.new(classname_to_dir(class_name))
       if directory.entries.size == 0
-        return 0
+        return 1
       end
-      id = @last_used_id[class_name] || 0
+      id = @last_used_id[class_name] || 1
       while true do
         if ! File.exists?(File.join(directory.path, id.to_s + ".xml"))
           @last_used_id[class_name] = id
@@ -266,43 +239,39 @@ 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))
+      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)
+          property_name = property.name.to_s
+          value = resource.instance_variable_get("@" + property_name)
           # special case for false
           if property.primitive == TrueClass and value == false
-				    xml.tag!(property.name.to_s, false, :class => FalseClass.to_s)
-          elsif (value != nil and property.primitive == BigDecimal)
-				    xml.tag!(property.name.to_s, value.to_s("F"), :class => BigDecimal)
+            xml.tag!(property_name, false, :class => FalseClass.to_s)
+          elsif (property.primitive == BigDecimal and value != nil)
+            xml.tag!(property_name, value.to_s("F"), :class => BigDecimal)
           elsif (value != nil)
-				    xml.tag!(property.name.to_s, value, :class => property.primitive) 
+            xml.tag!(property_name, value, :class => property.primitive)
           end
         end
       end
       
-      xmlfile = File.new(class_name_to_file(resource.class.to_s, resource.key.first), "w")
-      tempfile = Tempfile.new("dm-xml-adapter", "/tmp")
+      xmlfile = File.new(class_name_to_file(resource_class, resource_key), "w")
+      tempfile = Tempfile.new("dm-xml-adapter", Dir.tmpdir())
       tempfile.puts out_string
       tempfile.close
       FileUtils.mv(tempfile.path,xmlfile.path)

data/spec/dm-xml-adapter_spec.rb

@@ -3,6 +3,8 @@ require 'dm-core'
 require 'pathname'
 require Pathname(__FILE__).dirname.expand_path + 'spec_helper'
 
+DataMapper::Adapters::XmlAdapter.threads = 2
+
 describe DataMapper::Adapters::XmlAdapter do
   before(:each) do
     @adapter = DataMapper.setup(:default, {:adapter => 'xml', :directory => 'db'})
@@ -49,6 +51,17 @@ describe DataMapper::Adapters::XmlAdapter do
       end
     end
 
+     describe "date" do
+      it "should do date" do
+        u1 = XMLTest::User.new
+        u1.name = "cool!"
+        u1.date = Date.parse("01/01/2001")
+        u1.save
+        u2 = XMLTest::User.first(:name => "cool!")
+        u2.date.class.should == Date
+      end
+    end
+
     describe "boolean" do
       it "should be boolean" do
         u1 = XMLTest::User.new

data/spec/spec_helper.rb

@@ -45,6 +45,7 @@ class User
   property :created, DateTime
   property :cool, Boolean
   property :content, String
+  property :date, Date
   
   has n, :posts, :model => "Post"
 end

metadata

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