dm-xml-adapter 0.575 → 0.576

data/lib/dm-xml-adapter.rb

@@ -147,9 +147,7 @@ module DataMapper::Adapters
       objects = []
       Dir[directory + "/*.xml"].each do |filename|
         # see if we have a nice cached version
-        mtime = File.mtime(filename)
-        cache_mtime = @cache.get_mtime(filename)
-        if (mtime != nil and cache_mtime != nil and mtime == cache_mtime)
+        if has_cached_version?(filename)
           # we have a nice cached object..
           objects << @cache.get(model_name, file_to_id(filename))
         else
@@ -162,17 +160,16 @@ module DataMapper::Adapters
       end
       return objects
     end
+
+    def has_cached_version?(filename)
+      mtime = File.mtime(filename)
+      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 is_integer?(number)
-      if number.class == String and number.match(/^\-*[0-9]+$/)
-        return true
-      end
-      return false
-    end
 	
     def file_to_object(file, model)
       model_name = model.to_s
@@ -189,26 +186,30 @@ module DataMapper::Adapters
         child_class = child.attributes["class"]
         if child_class != nil
           # this means we have an attribute
-          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")
-            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
+          populate_instance(new_obj, child, child_class)
         end
       end
 		
       return new_obj
     end
+
+    def populate_instance(new_obj, child, child_class)
+      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")
+        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
   	
-   	def find_free_id_for(class_name)
+    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...
@@ -231,7 +232,6 @@ module DataMapper::Adapters
     end
   	
     def save(resource)
-
       # since we're saving, purge the cache
       resource_class = resource.class.to_s
       resource_key = resource.key.first
@@ -254,11 +254,11 @@ module DataMapper::Adapters
           value = resource.instance_variable_get("@" + property_name)
           # special case for false
           if property.primitive == TrueClass and value == false
-				    xml.tag!(property_name, 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, value.to_s("F"), :class => BigDecimal)
+            xml.tag!(property_name, value.to_s("F"), :class => BigDecimal)
           elsif (value != nil)
-				    xml.tag!(property_name, value, :class => property.primitive)
+            xml.tag!(property_name, value, :class => property.primitive)
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-xml-adapter
 version: !ruby/object:Gem::Version 
-  version: "0.575"
+  version: "0.576"
 platform: ruby
 authors: 
 - Joshua Harding