dm-xml-adapter 0.582 → 0.584

data/lib/dm-xml-adapter.rb

@@ -3,62 +3,83 @@ require 'dm-core'
 require 'builder'
 require 'dm-core/adapters/abstract_adapter'
 require 'pp'
+
 gem 'libxml-ruby', '>= 0.8.3'
 require 'xml'
 require 'tempfile'
 require 'simple_memoize'
 require 'log4r'
 
+# http://redcorundum.blogspot.com/2006/05/kernelqualifiedconstget.html
+module Kernel
+  def qualified_const_get(str)
+    path = str.to_s.split('::')
+    from_root = path[0].empty?
+    if from_root
+      from_root = []
+      path = path[1..-1]
+    else
+      start_ns = ((Class === self)||(Module === self)) ? self : self.class
+      from_root = start_ns.to_s.split('::')
+    end
+    until from_root.empty?
+      begin
+        return (from_root+path).inject(Object) { |ns,name| ns.const_get(name) }
+      rescue NameError
+        from_root.delete_at(-1)
+      end
+    end
+    path.inject(Object) { |ns,name| ns.const_get(name) }
+  end
+end
+
 # 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
-			@mtimes = Hash.new()
-			@classes = Hash.new()
-		end
-		
-		def set_mtime(file, mtime)
-	    @mtimes[file] = mtime
-		end
-		
-		def delete_mtime(file)
+  class XmlAdapterCache
+    def initialize
+      @mtimes = Hash.new()
+      @classes = Hash.new()
+    end
+
+    def set_mtime(file, mtime)
+      @mtimes[file] = mtime
+    end
+
+    def delete_mtime(file)
       @mtimes.delete(file)
-		end
-		
-		def get_mtime(file)
-			return @mtimes[file]
-		end
-		
-		def put(classname, id, object)	
+    end
+
+    def get_mtime(file)
+      return @mtimes[file]
+    end
+
+    def put(classname, id, object)
       # check to see if we have a classname entry
-                #puts "putting a cache entry of id: #{id}"
+      #puts "putting a cache entry of id: #{id}"
       if (@classes[classname] == nil)
         @classes[classname] = Hash.new
       end
-			
+
       hash = @classes[classname]
       hash[id.to_s] = object
-   	end
-		
-		def delete(classname, id)
+    end
+
+    def delete(classname, id)
       hash = @classes[classname]
       unless hash == nil
         hash.delete(id.to_s)
       end
-   	end
-		
-		def get(classname, id)
-                #puts "getting a cache entry for id: #{id}"
+    end
+
+    def get(classname, id)
+      #puts "getting a cache entry for id: #{id}"
       hash = @classes[classname]
       return hash[id]
-		end
-	end
-
-  class XmlAdapter < AbstractAdapter     
+    end
+  end
 
+  class XmlAdapter < AbstractAdapter
     def self.threads=(count)
       @@threadcount = count
     end
@@ -69,22 +90,22 @@ module DataMapper::Adapters
       @@threadcount = 1
       @options = Hash.new
       @options[:directory] = options[:directory]
-      @options[:directory] ||= './db'         
-   
+      @options[:directory] ||= './db'
+
       @last_used_id = Hash.new
-      
+
       @cache = XmlAdapterCache.new
- 
+
     end
-    
+
     def destroy_model_storage(model)
-	    FileUtils.rm_rf(classname_to_dir(model.to_s))
+      FileUtils.rm_rf(classname_to_dir(model.to_s))
     end
-    
+
     def create_model_storage(model)
-	    FileUtils.mkdir_p(classname_to_dir(model.to_s))
+      FileUtils.mkdir_p(classname_to_dir(model.to_s))
     end
-   
+
     def create(resources)
       key = resources.first.model.key.first.name
       resources.each do |resource|
@@ -96,55 +117,55 @@ module DataMapper::Adapters
         save(resource)
       end.size
     end
-    
+
     def delete(collection)
-	    collection.each do |result|
+      collection.each do |result|
         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(class_name, key)
-		    # also remove from mtimes
-		    @cache.delete_mtime(class_name_to_file(class_name, key))
-	    end
-	    return collection.size
+        xml_destroy(result)
+        # also remove from cache
+        @cache.delete(class_name, key)
+        # also remove from mtimes
+        @cache.delete_mtime(class_name_to_file(class_name, key))
+      end
+      return collection.size
     end
-    
+
     def update(attributes, collection)
-	    # ok, for each object found we have to update the attribs we found
-	    # first thing is figure out what class we are dealing with
-	    # iterate over every object in this set and set the given attributes
-	    collection.each do |obj|
-		    attributes.each do |attrib|
-			    # attrib is an array
-			    # first member is Property object
-			    # second member is the value
-			    obj.instance_variable_set("@" + attrib[0].name.to_s, attrib[1])
-		    end
-		    save(obj)
-	    end
+      # ok, for each object found we have to update the attribs we found
+      # first thing is figure out what class we are dealing with
+      # iterate over every object in this set and set the given attributes
+      collection.each do |obj|
+        attributes.each do |attrib|
+          # attrib is an array
+          # first member is Property object
+          # second member is the value
+          obj.instance_variable_set("@" + attrib[0].name.to_s, attrib[1])
+        end
+        save(obj)
+      end
       return collection
     end
-   
+
     def read(query)
-	    return filter_result_set(get_all(query.model), query)
+      return filter_result_set(get_all(query.model), query)
     end
-  
+
     private
-  
-  	def xml_destroy(resource)
+
+    def xml_destroy(resource)
       # take an objects class and ID and figure
       # out what file it's in
       # and then remove that file
       File.unlink class_name_to_file(resource.class.to_s, resource.key.first)
     end
-	
+
     def filter_result_set(objects, query)
       result_set = objects.clone
       return query.filter_records(result_set)
     end
-  	
+
     def get_all(model)
       model_name = model.to_s
       directory = classname_to_dir(model_name)
@@ -177,21 +198,24 @@ module DataMapper::Adapters
       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 get_instance(model_name)
+    end
+
     def file_to_object(file, model)
       model_name = model.to_s
       # allocate new object to receive these fields
       if (model_name.match(/(.*)\:\:(.*)/))
         modname, clazz = [$1, $2]
-        new_obj = Kernel.const_get(modname).const_get(clazz).new
+        new_obj = Kernel.qualified_const_get(model_name).new
       else
         new_obj = Kernel.const_get(model_name).new
       end
-		
+
       # iterate over children
       XML::Parser.string(IO.read(file)).parse.root.children.each do |child|
         child_class = child.attributes["class"]
@@ -200,7 +224,7 @@ module DataMapper::Adapters
           populate_instance(new_obj, child, child_class)
         end
       end
-		
+
       return new_obj
     end
 
@@ -221,7 +245,7 @@ module DataMapper::Adapters
         new_obj.instance_variable_set("@#{child.name}", Date.parse(child.content))
       end
     end
-  	
+
     def find_free_id_for(class_name)
       # if there are no entries in the directory
       # or the directory doesn't exist
@@ -249,7 +273,7 @@ module DataMapper::Adapters
         id += 1
       end
     end
-  	
+
     def save(resource)
       # since we're saving, purge the cache
       resource_class = resource.class.to_s
@@ -266,7 +290,7 @@ module DataMapper::Adapters
       # set up builder
       out_string = ""
       xml = Builder::XmlMarkup.new(:target => out_string, :indent => 1)
-		
+
       # iterate over the resource and figure out the fields
       xml.tag!("RubyObject", :class => resource.model.to_s) do
         resource.model.properties.each do |property|
@@ -282,8 +306,8 @@ module DataMapper::Adapters
           end
         end
       end
-       
-      #puts "the key is now: #{resource_key}" 
+
+      #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())
@@ -292,14 +316,14 @@ module DataMapper::Adapters
       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(":", "_"))
+      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
@@ -307,7 +331,7 @@ module DataMapper::Adapters
     #memoize(:file_to_id)
     #memoize(:classname_to_dir)
     #memoize(:class_name_to_file)
-	
+
   end
 end
 

data/spec/dm-xml-adapter_spec.rb

@@ -19,12 +19,12 @@ describe DataMapper::Adapters::XmlAdapter do
     AutoQuote.all.each {|aq| aq.destroy }
     Food.all.each {|f| f.destroy }
     Drink.all.each {|d| d.destroy }
+    Three::Level::Test::IsFun.all.each {|d| d.destroy }
   end
-  
+
   after(:each) do
     delete_all
   end
-  
 
   describe "CRUD" do
 
@@ -34,14 +34,14 @@ describe DataMapper::Adapters::XmlAdapter do
         AutoQuote.all.size.should == 1
       end
     end
-  
+
     describe "content attribute" do
       it "should be able to handle a content attribute" do
         XMLTest::User.create(:name => "contentking", :content => "cool")
         XMLTest::User.all.size.should == 1
       end
     end
-   
+
     describe "datetime" do
       it "should do datetime" do
         u1 = XMLTest::User.new
@@ -53,7 +53,7 @@ describe DataMapper::Adapters::XmlAdapter do
       end
     end
 
-     describe "date" do
+    describe "date" do
       it "should do date" do
         u1 = XMLTest::User.new
         u1.name = "cool!"
@@ -82,7 +82,7 @@ describe DataMapper::Adapters::XmlAdapter do
         u2.cool.class.should == FalseClass
       end
     end
- 
+
     describe "associations" do
       it "should have associations" do
         u1 = XMLTest::User.new
@@ -101,14 +101,14 @@ describe DataMapper::Adapters::XmlAdapter do
         u3.posts.size.should == 2
       end
     end
-  
+
     describe "get all" do
       it "should get all" do
         XMLTest::User.create(:name => :yeah)
         XMLTest::User.all.should_not == nil
       end
     end
- 
+
     describe "update" do
       it "should update" do
         u1 = XMLTest::User.new
@@ -127,7 +127,7 @@ describe DataMapper::Adapters::XmlAdapter do
         u.user_id.should_not == nil
       end
     end
-     
+
     describe "delete" do
       it "should delete someone" do
         user = XMLTest::User.create
@@ -143,7 +143,7 @@ describe DataMapper::Adapters::XmlAdapter do
         user1.money.class.should == BigDecimal
       end
     end
- 
+
     describe "find not" do
       it "should find someone with a not clause" do
         user1 = XMLTest::User.create(:name => "joe")
@@ -165,9 +165,16 @@ describe DataMapper::Adapters::XmlAdapter do
         Drink.first(:name => "Drinky drink!").should_not == nil
       end
     end
- 
+
+    describe "complex class name" do
+      it "should be able to persist" do
+        fun = Three::Level::Test::IsFun.new
+        fun.superfun = true
+        fun.save
+      end
+    end
+
   end
-  
 
 end
 

data/spec/spec_helper.rb

@@ -4,49 +4,61 @@ require 'pathname'
 require 'lib/dm-xml-adapter'
 
 class Food
-    include DataMapper::Resource
+  include DataMapper::Resource
 
-    property :food_id, Serial
-    property :name, String
+  property :food_id, Serial
+  property :name, String
 end
 
 class Drink
-    include DataMapper::Resource
- 
-    property :drink_id, Serial
-    property :name, String
+  include DataMapper::Resource
+
+  property :drink_id, Serial
+  property :name, String
 end
 
 class AutoQuote
-    include DataMapper::Resource
- 
-    property :quote_id, Serial
-    property :fullname, String
+  include DataMapper::Resource
+
+  property :quote_id, Serial
+  property :fullname, String
 end
 
 module XMLTest
-class Post
-  include DataMapper::Resource
- 
-  property :post_id, Serial
-  property :title, String
-  property :created, DateTime
-  
-  belongs_to :user, :model => "User"
-end
- 
-class User
-  include DataMapper::Resource
-  
-  property :user_id, Serial
-  property :name, String
-  property :age, Integer
-  property :money, Decimal
-  property :created, DateTime
-  property :cool, Boolean
-  property :content, String
-  property :date, Date
-  
-  has n, :posts, :model => "Post"
+  class Post
+    include DataMapper::Resource
+
+    property :post_id, Serial
+    property :title, String
+    property :created, DateTime
+
+    belongs_to :user, :model => "User"
+  end
+
+  class User
+    include DataMapper::Resource
+
+    property :user_id, Serial
+    property :name, String
+    property :age, Integer
+    property :money, Decimal
+    property :created, DateTime
+    property :cool, Boolean
+    property :content, String
+    property :date, Date
+
+    has n, :posts, :model => "Post"
+  end
 end
+
+module Three
+  module Level
+    module Test
+      class IsFun
+        include DataMapper::Resource
+        property :fun_id, Serial
+        property :superfun, Boolean
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dm-xml-adapter
 version: !ruby/object:Gem::Version 
-  version: "0.582"
+  hash: 1179
+  prerelease: false
+  segments: 
+  - 0
+  - 584
+  version: "0.584"
 platform: ruby
 authors: 
 - Joshua Harding
@@ -9,69 +14,93 @@ autorequire: dm-xml-adapter
 bindir: bin
 cert_chain: []
 
-date: 2010-07-27 00:00:00 -04:00
+date: 2011-07-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: libxml-ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: builder
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: simple_memoize
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: log4r
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: dm-migrations
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id006
 description: 
 email: josh@statewidesoftware.com
 executables: []
@@ -96,21 +125,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 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.