dm-xml-adapter 0.584 → 0.587

data/lib/dm-xml-adapter.rb

@@ -7,8 +7,7 @@ require 'pp'
 gem 'libxml-ruby', '>= 0.8.3'
 require 'xml'
 require 'tempfile'
-require 'simple_memoize'
-require 'log4r'
+require 'logger'
 
 # http://redcorundum.blogspot.com/2006/05/kernelqualifiedconstget.html
 module Kernel
@@ -56,7 +55,6 @@ module DataMapper::Adapters
 
     def put(classname, id, object)
       # check to see if we have a classname entry
-      #puts "putting a cache entry of id: #{id}"
       if (@classes[classname] == nil)
         @classes[classname] = Hash.new
       end
@@ -73,25 +71,33 @@ module DataMapper::Adapters
     end
 
     def get(classname, id)
-      #puts "getting a cache entry for id: #{id}"
       hash = @classes[classname]
       return hash[id]
     end
   end
 
   class XmlAdapter < AbstractAdapter
-    def self.threads=(count)
-      @@threadcount = count
+    
+    def loglevel=(loglevel)
+      @options[:loglevel] = loglevel
+      @logger.level = loglevel
+    end
+    
+    def logger=(logger)
+      @options[:logger] = logger
+      @logger = logger
     end
 
     def initialize(name, options)
       super
 
-      @@threadcount = 1
-      @options = Hash.new
-      @options[:directory] = options[:directory]
+      @options = options
       @options[:directory] ||= './db'
-
+      @options[:loglevel] ||= Logger::FATAL
+      @options[:logger] ||= Logger.new(STDERR)
+      @logger = @options[:logger]
+      @logger.level = @options[:loglevel]
+      @logger.debug("DM-XML-Adapter Initialized!")
       @last_used_id = Hash.new
 
       @cache = XmlAdapterCache.new
@@ -100,10 +106,12 @@ module DataMapper::Adapters
 
     def destroy_model_storage(model)
       FileUtils.rm_rf(classname_to_dir(model.to_s))
+      @logger.debug("Removing model storage for #{model}")
     end
 
     def create_model_storage(model)
       FileUtils.mkdir_p(classname_to_dir(model.to_s))
+      @logger.debug("Creating model storage for: #{model}")
     end
 
     def create(resources)
@@ -111,7 +119,6 @@ module DataMapper::Adapters
       resources.each do |resource|
         id = find_free_id_for(resources.first.class.to_s)
         # find name of key attribute
-        #puts "we are creating a new resource with id: #{id}"
         resource.attributes[key] = id
         resource.instance_variable_set("@" + key.to_s, id)
         save(resource)
@@ -124,6 +131,7 @@ module DataMapper::Adapters
         class_name = result.model.to_s
         @last_used_id[class_name] = key
         xml_destroy(result)
+        @logger.debug("Destroying #{result}")
         # also remove from cache
         @cache.delete(class_name, key)
         # also remove from mtimes
@@ -142,6 +150,7 @@ module DataMapper::Adapters
           # first member is Property object
           # second member is the value
           obj.instance_variable_set("@" + attrib[0].name.to_s, attrib[1])
+          @logger.debug("Updating instance variable #{attrib[0].name.to_s} to #{attrib[1]}")
         end
         save(obj)
       end
@@ -168,6 +177,7 @@ module DataMapper::Adapters
 
     def get_all(model)
       model_name = model.to_s
+      @logger.debug("Getting all for model #{model_name}")
       directory = classname_to_dir(model_name)
       if ! File.exists?(directory)
         return []
@@ -250,9 +260,7 @@ module DataMapper::Adapters
       # if there are no entries in the directory
       # or the directory doesn't exist
       # we need to create it...
-      #puts "trying to find a free id for #{class_name}"
       if ! File.exists?(classname_to_dir(class_name))
-        #puts "the directory doesn't exist"
         # default ID
         return 1
       end
@@ -263,13 +271,10 @@ module DataMapper::Adapters
       id = @last_used_id[class_name] || 1
       while true do
         filename = File.join(directory.path, id.to_s + ".xml")
-        #puts "checking for the existence of #{filename}"
         if ! File.exists?(filename)
           @last_used_id[class_name] = id
-          #puts "found free id: #{id}"
           return id
         end
-        #puts "the file existed..."
         id += 1
       end
     end
@@ -278,7 +283,6 @@ module DataMapper::Adapters
       # since we're saving, purge the cache
       resource_class = resource.class.to_s
       resource_key = resource.key.first
-      #puts "the key of the oject we are saving: #{resource_key}"
       @cache.delete(resource_class, resource_key)
       @cache.delete_mtime(class_name_to_file(resource_class, resource_key))
 
@@ -307,14 +311,12 @@ module DataMapper::Adapters
         end
       end
 
-      #puts "the key is now: #{resource_key}"
       xmlfile = File.new(class_name_to_file(resource_class, resource_key), "w")
-      #puts "saving to #{xmlfile.path}"
       tempfile = Tempfile.new("dm-xml-adapter", Dir.tmpdir())
       tempfile.puts out_string
-      #puts "the content is: #{out_string}"
       tempfile.close
       FileUtils.mv(tempfile.path,xmlfile.path)
+      @logger.debug("Saved to: #{xmlfile.path}")
       return xmlfile
 
     end
@@ -328,10 +330,6 @@ module DataMapper::Adapters
       return File.join(classname_to_dir(class_name), id.to_s + ".xml")
     end
 
-    #memoize(:file_to_id)
-    #memoize(:classname_to_dir)
-    #memoize(:class_name_to_file)
-
   end
 end
 

data/spec/dm-xml-adapter_spec.rb

@@ -4,8 +4,6 @@ require 'pathname'
 require 'dm-migrations'
 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'})
@@ -174,6 +172,20 @@ describe DataMapper::Adapters::XmlAdapter do
       end
     end
 
+    describe "logging support" do      
+      it "should work with logging" do
+        @adapter.loglevel = Logger::DEBUG
+        @adapter.logger = Logger.new("/dev/null")
+        XMLTest::User.create(:name => "contentking", :content => "cool")
+        XMLTest::User.all.size.should == 1
+        DataMapper.repository.adapter.loglevel = Logger::DEBUG
+        DataMapper.repository.adapter.logger = Logger.new(STDOUT)
+        XMLTest::User.create(:name => "contentking", :content => "cool")
+        XMLTest::User.all.size.should == 2
+      end
+
+    end
+
   end
 
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dm-xml-adapter
 version: !ruby/object:Gem::Version 
-  hash: 1179
-  prerelease: false
+  hash: 1181
+  prerelease: 
   segments: 
   - 0
-  - 584
-  version: "0.584"
+  - 587
+  version: "0.587"
 platform: ruby
 authors: 
 - Joshua Harding
@@ -14,8 +14,7 @@ autorequire: dm-xml-adapter
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 -04:00
-default_executable: 
+date: 2012-02-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: libxml-ruby
@@ -46,7 +45,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: simple_memoize
+  name: dm-core
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,7 +59,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: log4r
+  name: dm-migrations
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -73,34 +72,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: dm-core
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: dm-migrations
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id006
 description: 
 email: josh@statewidesoftware.com
 executables: []
@@ -115,7 +86,6 @@ files:
 - spec/dm-xml-adapter_spec.rb
 - spec/spec_helper.rb
 - README
-has_rdoc: true
 homepage: 
 licenses: []
 
@@ -145,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 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.