dm-xml-adapter 0.2 → 0.52

data/lib/dm-xml-adapter.rb

@@ -5,8 +5,70 @@ require 'dm-core/adapters/abstract_adapter'
 require 'pp'
 gem 'libxml-ruby', '>= 0.8.3'
 require 'xml'
+require 'tempfile'
+
+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
+		end
+		
+		def delete_mtime(file)
+			# @@logger.info("deleting the following mtime: #{file}")
+			@mtimes.delete(file)
+		end
+		
+		def get_mtime(file)
+			return @mtimes[file]
+		end
+		
+		def put(classname, id, object)
+			# @@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)
+				@classes[classname] = Hash.new
+			end
+			
+			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}")
+		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
 
   class XmlAdapter < AbstractAdapter      
 
@@ -18,6 +80,11 @@ module DataMapper::Adapters
       @options[:directory] ||= './db'         
    
       @last_used_id = Hash.new
+      
+      @cache = XmlAdapterCache.new
+      
+      # @@logger = Log4r::Logger.new 'adapter'
+      # @@logger.outputters = Log4r::Outputter.stdout
 
     end
     
@@ -30,22 +97,26 @@ module DataMapper::Adapters
     end
    
     def create(resources) 
-       resources.each do |resource|
-	       model = resource.model
-	       id = find_free_id_for(resource.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
+      resources.each do |resource|
+        model = resource.model
+        id = find_free_id_for(resource.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
     
     def delete(collection)
 	    collection.each do |result|
-                    @last_used_id[result.class.to_s] = result.key.first
+        @last_used_id[result.class.to_s] = result.key.first
 		    xml_destroy(result)
+		    # also remove from cache
+		    @cache.delete(result.model.to_s, result.key.first)
+		    # also remove from mtimes
+		    @cache.delete_mtime(class_name_to_file(result.model.to_s, result.key.first))
 	    end
 	    return collection.size
     end
@@ -63,155 +134,182 @@ module DataMapper::Adapters
 		    end
 		    save(obj)
 	    end
-            return collection
+      return collection
     end
    
     def read(query)
-            #puts "READING #{query.conditions}"
-            #puts query.conditions.operands.inspect
 	    return filter_result_set(get_all(query.model), query)
     end
   
-  private
+    private
   
   	def xml_destroy(resource)
-		# 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)
-	end
+      # 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)
+    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 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)
-		objects = Array.new
-		directory = classname_to_dir(model.to_s)
-		if ! File.exists?(directory)
-			return objects
-		end
-		Dir.glob(directory / "*.xml").each do |entry|
-			objects << file_to_object(entry, model)
-		end
-		return objects
-	end
- 
-        def is_integer?(number)
-            if number.class == String and number.match(/^\-*[0-9]+$/) 
-                return true 
-            end
-            return false
+      objects = Array.new
+      directory = classname_to_dir(model.to_s)
+      if ! File.exists?(directory)
+        return objects
+      end
+      Dir.glob(directory / "*.xml").each do |filename|
+        # TODO: caching at this point, based of mtime of files
+        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")
+          # 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))
         end
+      end
+      return objects
+    end
 	
-	def file_to_object(file, model)
+    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)
 		
-		# allocate new object to receive these fields
-                if (model.to_s.match(/\:\:/)) 
-                   modname, clazz = model.to_s.split("::")
-		   new_obj = Kernel.const_get(modname).const_get(clazz).new
-                else
-                   clazz = model.to_s
-                   new_obj = Kernel.const_get(clazz).new
-                end
+      # allocate new object to receive these fields
+      if (model.to_s.match(/\:\:/))
+        modname, clazz = model.to_s.split("::")
+        new_obj = Kernel.const_get(modname).const_get(clazz).new
+      else
+        clazz = model.to_s
+        new_obj = Kernel.const_get(clazz).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|
-			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 == "DateTime")
-					new_obj.instance_variable_set("@#{child.name}", DateTime.parse(child.content))
-				end
-			end
-		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|
+        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
+        end
+      end
 		
-		return new_obj
-	end
+      return new_obj
+    end
   	
    	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 1
-		end
-		directory = Dir.new(classname_to_dir(class_name))
-		if directory.entries.size == 0
-			return 1
-		end
-		id = @last_used_id[class_name] || 0
-		while true do
-			if ! File.exists?(File.join(directory.path, id.to_s + ".xml"))
-                                @last_used_id[class_name] = id
-				return id
-			end
-                        id += 1
-		end
-	end
+      # 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
+      end
+      directory = Dir.new(classname_to_dir(class_name))
+      if directory.entries.size == 0
+        return 0
+      end
+      id = @last_used_id[class_name] || 0
+      while true do
+        if ! File.exists?(File.join(directory.path, id.to_s + ".xml"))
+          @last_used_id[class_name] = id
+          return id
+        end
+        id += 1
+      end
+    end
   	
-        def save(resource)
-		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))
-		end
-		xmlfile = File.new(class_name_to_file(resource.class.to_s, resource.key.first), "w")
-		# puts resource.model.properties.inspect
+    def save(resource)
+      # 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))
+      end
+
+      # puts resource.model.properties.inspect
 		
-		# set up builder
-		outString = ""
-		xml = Builder::XmlMarkup.new(:target => outString, :indent => 1)
+      # 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
+      # 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
 				    xml.tag!(property.name.to_s, false, :class => FalseClass.to_s)
-				elsif (value != nil) 
+          elsif (value != nil and property.primitive == BigDecimal)
+				    xml.tag!(property.name.to_s, value.to_s("F"), :class => BigDecimal)
+          elsif (value != nil)
 				    xml.tag!(property.name.to_s, value, :class => property.primitive) 
-                                end
-			end
-		end
-		xmlfile.puts outString
-		xmlfile.close
-	end
+          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")
+      tempfile.puts out_string
+      tempfile.close
+      FileUtils.mv(tempfile.path,xmlfile.path)
+      return xmlfile
+    end
 
-	def classname_to_dir(class_name)
-		return File.join(@options[:directory], 
-                   class_name.gsub("/", "_").gsub(":", "_"))
-	end
-	
-	def class_name_to_file(class_name, id)
-		return File.join(classname_to_dir(class_name), id.to_s + ".xml")
-	end
+    def classname_to_dir(class_name)
+      return File.join(@options[:directory],
+        class_name.gsub("/", "_").gsub(":", "_"))
+    end
 	
+    def class_name_to_file(class_name, id)
+      return File.join(classname_to_dir(class_name), id.to_s + ".xml")
     end
+	
+  end
 end
 

data/spec/dm-xml-adapter_spec.rb

@@ -4,11 +4,11 @@ require 'pathname'
 require Pathname(__FILE__).dirname.expand_path + 'spec_helper'
 
 describe DataMapper::Adapters::XmlAdapter do
-  before(:all) do
+  before(:each) do
      @adapter = DataMapper.setup(:default, {:adapter => 'xml', :directory => 'db'})
   end
   
-  after(:all) do
+  after(:each) do
           XMLTest::User.all.each {|u| u.destroy }
           XMLTest::Post.all.each {|p| p.destroy }
           AutoQuote.all.each {|aq| aq.destroy }
@@ -112,6 +112,15 @@ describe DataMapper::Adapters::XmlAdapter do
 		     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
+    end
  
      describe "find not" do
              it "should find someone with a not clause" do

data/spec/spec_helper.rb

@@ -3,6 +3,19 @@ require 'dm-core'
 require 'pathname'
 require Pathname(__FILE__).dirname.parent.expand_path + 'lib/dm-xml-adapter'
 
+class Food
+    include DataMapper::Resource
+
+    property :food_id, Serial
+    property :name, String
+end
+
+class Drink
+    include DataMapper::Resource
+ 
+    property :drink_id, Serial
+    property :name, String
+end
 
 class AutoQuote
     include DataMapper::Resource
@@ -28,6 +41,7 @@ class User
   property :user_id, Serial
   property :name, String
   property :age, Integer
+  property :money, BigDecimal
   property :created, DateTime
   property :cool, Boolean
   property :content, String

metadata

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