dm-xml-adapter 0.573 → 0.574

data/lib/dm-xml-adapter.rb

@@ -79,17 +79,16 @@ module DataMapper::Adapters
 	    FileUtils.mkdir_p(classname_to_dir(model.to_s))
     end
    
-    def create(resources) 
+    def create(resources)
+      class_name = resources.first.class.to_s
+      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(class_name)
         # 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)
@@ -188,20 +187,15 @@ module DataMapper::Adapters
         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|
+      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")
+          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")
@@ -271,7 +265,7 @@ module DataMapper::Adapters
         end
       end
       
-      xmlfile = File.new(class_name_to_file(resource_class, resource_key), "w")
+      xmlfile = File.new(class_name_to_file(resource.class.to_s, resource.key.first), "w")
       tempfile = Tempfile.new("dm-xml-adapter", Dir.tmpdir())
       tempfile.puts out_string
       tempfile.close

metadata

@@ -1,7 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: dm-xml-adapter
 version: !ruby/object:Gem::Version 
-  version: "0.573"
+  prerelease: false
+  segments: 
+  - 0
+  - 574
+  version: "0.574"
 platform: ruby
 authors: 
 - Joshua Harding
@@ -9,39 +13,57 @@ autorequire: dm-xml-adapter
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 -05:00
+date: 2010-03-11 00:00:00 -05: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 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        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 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: simple_memoize
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: log4r
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id004
 description: 
 email: josh@statewidesoftware.com
 executables: []
@@ -51,10 +73,10 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- lib/dm-xml-adapter.rb
 - lib/ratecounter.rb
-- spec/dm-xml-adapter_spec.rb
+- lib/dm-xml-adapter.rb
 - spec/spec_helper.rb
+- spec/dm-xml-adapter_spec.rb
 - README
 has_rdoc: true
 homepage: 
@@ -69,21 +91,23 @@ 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.5
+rubygems_version: 1.3.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.
 test_files: 
-- spec/dm-xml-adapter_spec.rb
 - spec/spec_helper.rb
+- spec/dm-xml-adapter_spec.rb