senotrusov-ruby-xml-mapper 1.0.3 → 1.0.4

data/lib/ruby-xml-mapper.rb

@@ -12,13 +12,21 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
- 
 
-# TODO Эта библиотека требует рефакторинга. Стоит выделить маппинг в отдельные объекты, а не держать всё размазанным по исходному классу. Опять же, это сделает проще обратный маппинг - из объектов в XML
+
+# In fact, this is prototype to define requirements.
+#   TODO: refactoring
+#   TODO: Extract mapping to separate object
+#   TODO: More clear caching
+#   TODO: File loading with filesystem restrictions and current directory (based on parent xml directory)
+#   TODO: Use more libxml API 
 
 require 'libxml'
 
 module RubyXmlMapper
+  mattr_accessor :file_cache
+  self.file_cache = {}
+  
   def self.included model
     model.extend RubyXmlMapper::RubyXmlMapperClassMethods
     
@@ -34,22 +42,11 @@ module RubyXmlMapper
     model.xml_child_mappings = {}
   end
 
-  # Source loading is ugly
-  def initialize_from_xml node, load_source = true
+  def initialize_from_xml node
     initialize_from_xml_attr_mapping(node) if xml_attr_mappings.length
-
-    # TODO must not be a magic attribute
-    if @source && load_source
-      unless source_dir_path
-        raise "source_dir_path not defined in #{self.class.inspect}"
-      end
-
-      initialize_from_xml(self.class.parse_xml_file(File.expand_path_restricted(@source, source_dir_path)), false)
-    else
-      initialize_from_xml_child_mapping(node) if xml_child_mappings.length
-      initialize_from_xml_self_mapping(node) if xml_self_mapping
-      initialize_from_xml_content_mapping(node) if xml_content_mapping
-    end
+    initialize_from_xml_child_mapping(node) if xml_child_mappings.length
+    initialize_from_xml_self_mapping(node) if xml_self_mapping
+    initialize_from_xml_content_mapping(node) if xml_content_mapping
   end
   
   private
@@ -157,13 +154,21 @@ module RubyXmlMapper
     end
     
     def new_from_xml_file file_name
-      new_from_xml_node(parse_xml_file(file_name))
+      RubyXmlMapper.file_cache[file_name] ||= new_from_xml_node(parse_xml_file(file_name))
     end
 
     def new_from_xml_node node
-      allocated = allocate
-      allocated.initialize_from_xml node
-      allocated
+      if node.attributes["source"]
+        unless source_dir_path
+          raise "source_dir_path not defined in #{self.class.inspect}"
+        end
+        new_from_xml_file(File.expand_path_restricted(node.attributes["source"], source_dir_path))
+      else        
+        allocated = allocate
+        allocated.initialize_from_xml node
+        allocated.after_initialize if allocated.respond_to?(:after_initialize) 
+        allocated
+      end
     end
 
     def xml args
@@ -207,10 +212,10 @@ module RubyXmlMapper
     def register_self_mapping args
       if args[:type].kind_of?(Array)
         register_type_array(args)
-      elsif args[:type] == :self && self < RubyXmlMapper::HashOfStringAndNumeric
+      elsif args[:type] == :self && self < RubyXmlMapper::Hash
          
       else
-        raise(":type must be kind_of Array or :self with the following supported types: RubyXmlMapper::HashOfStringAndNumeric )")
+        raise(":type must be kind_of Array or :self with the following supported types: RubyXmlMapper::Hash )")
       end
 
       self.xml_self_mapping = args

data/lib/ruby-xml-mapper/basic_containers.rb

@@ -14,8 +14,6 @@
 #  limitations under the License.
  
 
-# TODO: Double check .strip - is it needed actually
-
 class String
   def self.new_from_xml_attr attr
     new(attr.value.strip.gsub(/\s*[\r\n]\s*/, "\n"))
@@ -66,22 +64,27 @@ class RubyXmlMapper::Boolean
   end
 end
 
-class RubyXmlMapper::HashOfStringAndNumeric < Hash
-  def self.new_from_xml_node node
-    created = new
-    created.initialize_from_xml_node node
-    created
-  end
+class RubyXmlMapper::Hash < Hash
 
   def initialize_from_xml_node node
     node.each_element do |child|
-      self[child.name.to_sym] = autocast_value(child.content)
+      next if xml_child_mappings.has_key?(child.name)
+      
+      self[child.name.to_sym] = if child.attributes["type"] && respond_to?(cast_method = "cast_to_#{child.attributes["type"]}")
+          __send__(cast_method, child.content)
+        else
+          autocast_value(child.content)
+        end
     end
+    
     node.each_attr do |attr|
+      next if xml_attr_mappings.has_key?(attr.name)
+      
       self[attr.name.to_sym] = autocast_value(attr.value)
     end
   end
 
+  # we're eating copypasta!
   def autocast_value value
       if value =~ /\A\s*-*\d+\.\d+\s*\z/
         value.to_f
@@ -103,6 +106,33 @@ class RubyXmlMapper::HashOfStringAndNumeric < Hash
         
       end
   end
+  
+  def cast_to_float value
+    value.to_f
+  end
+  
+  def cast_to_integer value
+    value.to_i
+  end
+  
+  def cast_to_range value
+    matchdata = value.match(/\A\s*(-*\d+)\s*\.\.\s*(-*\d+)\s*\z/)
+    Range.new(matchdata[1].to_i, matchdata[2].to_i)
+  end
+  
+  def cast_to_boolean value
+    if value =~ /\A\s*true\s*\z/i
+        true
+    elsif value =~ /\A\s*false\s*\z/i
+      false
+    else
+      nil
+    end
+  end
+  
+  def cast_to_string value
+    value.strip.gsub(/\s*[\r\n]\s*/, "\n").gsub(/\n\s*\n/, "\n")
+  end
 end
 
 require 'time'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: senotrusov-ruby-xml-mapper
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Stanislav Senotrusov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-27 00:00:00 -07:00
+date: 2009-07-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.3
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rails
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: senotrusov@gmail.com
 executables: []