dm-xml-adapter 0.574 → 0.575

data/lib/dm-xml-adapter.rb

@@ -9,7 +9,8 @@ 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
@@ -31,8 +32,7 @@ module DataMapper::Adapters
 			return @mtimes[file]
 		end
 		
-		def put(classname, id, object)
-   		
+		def put(classname, id, object)	
       # check to see if we have a classname entry
       if (@classes[classname] == nil)
         @classes[classname] = Hash.new
@@ -51,8 +51,7 @@ module DataMapper::Adapters
 		
 		def get(classname, id)
       hash = @classes[classname]
-      object = hash[id]
-      return object
+      return hash[id]
 		end
 	end
 
@@ -80,10 +79,9 @@ module DataMapper::Adapters
     end
    
     def create(resources)
-      class_name = resources.first.class.to_s
       key = resources.first.model.key.first.name
       resources.each do |resource|
-        id = find_free_id_for(class_name)
+        id = find_free_id_for(resources.first.class.to_s)
         # find name of key attribute
         resource.attributes[key] = id
         resource.instance_variable_set("@" + key.to_s, id)
@@ -145,9 +143,9 @@ module DataMapper::Adapters
       if ! File.exists?(directory)
         return []
       end
+
       objects = []
-      Dir.entries(directory).select {|file| file.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)
@@ -179,12 +177,11 @@ module DataMapper::Adapters
     def file_to_object(file, model)
       model_name = model.to_s
       # allocate new object to receive these fields
-      if (model_name.match(/\:\:/))
-        modname, clazz = model_name.split("::")
+      if (model_name.match(/(.*)\:\:(.*)/))
+        modname, clazz = [$1, $2]
         new_obj = Kernel.const_get(modname).const_get(clazz).new
       else
-        clazz = model_name
-        new_obj = Kernel.const_get(clazz).new
+        new_obj = Kernel.const_get(model_name).new
       end
 		
       # iterate over children
@@ -253,19 +250,20 @@ module DataMapper::Adapters
       # iterate over the resource and figure out the fields
       xml.tag!("RubyObject", :class => resource.model.to_s) do
         resource.model.properties.each do |property|
-          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)
+				    xml.tag!(property_name, false, :class => FalseClass.to_s)
           elsif (property.primitive == BigDecimal and value != nil)
-				    xml.tag!(property.name.to_s, value.to_s("F"), :class => BigDecimal)
+				    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")
+      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

metadata

@@ -1,11 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-xml-adapter
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 574
-  version: "0.574"
+  version: "0.575"
 platform: ruby
 authors: 
 - Joshua Harding
@@ -13,57 +9,49 @@ autorequire: dm-xml-adapter
 bindir: bin
 cert_chain: []
 
-date: 2010-03-11 00:00:00 -05:00
+date: 2010-03-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: libxml-ruby
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: builder
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: simple_memoize
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id003
+    version: 
 - !ruby/object:Gem::Dependency 
   name: log4r
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id004
+    version: 
 description: 
 email: josh@statewidesoftware.com
 executables: []
@@ -91,20 +79,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.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.