testability-driver 1.0.3 → 1.0.4

data/lib/tdriver/util/xml/parsers/nokogiri/attribute.rb

@@ -27,32 +27,28 @@ module MobyUtil
 
         include Abstraction
 
+        # TODO: document me
         def value
 
           @xml.value
 
         end
 
-        def content
+        # TODO: document me
+        def value=( content )
 
-          @xml.content
+          @xml.value = content
 
         end
 
-        def name
+        # alias for value=
+        alias_method :content=, :value=
 
-          @xml.name
-
-        end
-
-        def to_s
-
-          @xml.value
-
-        end
+        # alias for value
+        alias_method :content, :value
 
         # enable hooking for performance measurement & debug logging
-        MobyUtil::Hooking.instance.hook_methods( self ) if defined?( MobyUtil::Hooking )
+        TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
 
       end      
 

data/lib/tdriver/util/xml/parsers/nokogiri/builder.rb

@@ -40,14 +40,20 @@ module MobyUtil
         # support all Nokogiri::XML::Builder class instance methods
         def method_missing( method, *args )
 
-          Kernel::raise NoMethodError.new( "Method '%s' is not supported by %s" % [ method, self.class ] ) unless @xml.respond_to?( method )
+          if @xml.respond_to?( method )
 
-          @xml.send( method.to_sym, *args )
+            @xml.send( method.to_sym, *args )
+
+          else
+
+            raise NoMethodError, "Method #{ method.to_s.inspect } is not supported by #{ self.class }" 
+
+          end
 
         end
 
         # enable hooking for performance measurement & debug logging
-        MobyUtil::Hooking.instance.hook_methods( self ) if defined?( MobyUtil::Hooking )
+        TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
 
       end # Document
 

data/lib/tdriver/util/xml/parsers/nokogiri/comment.rb

@@ -0,0 +1,39 @@
+############################################################################
+## 
+## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 
+## All rights reserved. 
+## Contact: Nokia Corporation (testabilitydriver@nokia.com) 
+## 
+## This file is part of Testability Driver. 
+## 
+## If you have questions regarding the use of this file, please contact 
+## Nokia at testabilitydriver@nokia.com . 
+## 
+## This library is free software; you can redistribute it and/or 
+## modify it under the terms of the GNU Lesser General Public 
+## License version 2.1 as published by the Free Software Foundation 
+## and appearing in the file LICENSE.LGPL included in the packaging 
+## of this file. 
+## 
+############################################################################
+
+module MobyUtil
+
+  module XML
+
+    module Nokogiri
+
+      module Comment # behaviour
+
+        include Node
+
+        # enable hooking for performance measurement & debug logging
+        TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
+
+      end # Comment
+
+    end # Nokogiri
+
+  end # XML
+
+end # MobyUtil

data/lib/tdriver/util/xml/parsers/nokogiri/document.rb

@@ -17,7 +17,6 @@
 ## 
 ############################################################################
 
-
 module MobyUtil
 
   module XML
@@ -26,28 +25,24 @@ module MobyUtil
 
       module Document # behaviour
 
-        include Abstraction 
+        include Node
 
+        # TODO: document me
         def parse( xml_string )
 
-          ::Nokogiri::XML.parse( xml_string, nil, 'UTF8', ::Nokogiri::XML::ParseOptions::STRICT )
+          ::Nokogiri::XML.parse( xml_string, nil, 'UTF-8', ::Nokogiri::XML::ParseOptions::STRICT )
 
         end
 
+        # TODO: document me
         def root
 
-          element_object( @xml.root )
-
-        end
-
-        def xpath( xpath_query, *args, &block )
-
-          nodeset_object( @xml.xpath( xpath_query ), *args, &block )
+          node_object( @xml.root )
 
         end
 
         # enable hooking for performance measurement & debug logging
-        MobyUtil::Hooking.instance.hook_methods( self ) if defined?( MobyUtil::Hooking )
+        TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
 
       end # Document
 

data/lib/tdriver/util/xml/parsers/nokogiri/element.rb

@@ -25,130 +25,10 @@ module MobyUtil
 
       module Element # behaviour
 
-        include Abstraction
-
-        def <=>( object )
-
-          @xml <=> object.xml
-
-        end
-
-        def []( value )
-
-          @xml.attributes[ value ]
-
-        end
-
-        def attributes
-
-          # return hash of attributes
-          Hash[ @xml.attributes.collect{ | key, value | [ key, value.to_s ] }]
-
-        end
-
-        def attribute( attr_name )
-
-          unless ( value = @xml.attribute( attr_name ) ).nil?
-
-            value.to_s
-
-          end
-
-        end
-
-
-        def children
-
-          nodeset_object( @xml.children )
-
-        end
-
-        def content
-
-          unless @xml.nil?
-
-            @xml.content.to_s
-
-          end
-
-        end
-
-        def each( &block )
-
-          @xml.each{ | element | 
-
-            yield( element_object( element ) ) 
-
-          }
-
-          nil
-
-        end        
-
-        def eql?( object )
-
-          @xml.content == object.xml.content
-
-        end
-
-        def empty?
-
-          @xml.nil?
-
-        end
-
-        def inner_xml
-
-          @xml.inner_html.to_s
-
-        end
-
-        def xpath( xpath_query, *args, &block )
-
-          nodeset_object( 
-
-            @xml.xpath( xpath_query, *args, &block ) 
-
-          )
-
-        end
-
-        def at_xpath( xpath_query, *args, &block )
-
-          node_object( @xml.at_xpath( xpath_query, *args, &block ) )
-
-        end
-
-        def replace( other )
-
-          @xml.replace( other.xml )
-
-          self
-
-        end
-
-        def add_previous_sibling( other )
-
-          @xml.add_previous_sibling( other.xml )
-
-        end
-
-        def remove
-
-          @xml.remove
-
-          self
-
-        end
-
-        def parent
-        
-          element_object( @xml.parent )
-        
-        end
+        include Node
 
         # enable hooking for performance measurement & debug logging
-        MobyUtil::Hooking.instance.hook_methods( self ) if defined?( MobyUtil::Hooking )
+        TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
 
       end # Element
 

data/lib/tdriver/util/xml/parsers/nokogiri/loader.rb

@@ -23,26 +23,36 @@ require 'nokogiri'
 # for utf-8/unicode support
 require 'kconv'
 
-# abstraction for document, nodeset and element
-require File.expand_path( File.join( File.dirname( __FILE__ ), 'abstraction.rb' ) )
+[ 
 
-# nokogiri parser wrapper
-require File.expand_path( File.join( File.dirname( __FILE__ ), 'document.rb' ) )
+  # abstraction for document, nodeset and element
+  'abstraction.rb', 
 
-# nokogiri parser wrapper
-require File.expand_path( File.join( File.dirname( __FILE__ ), 'nodeset.rb' ) )
+  'node.rb',
 
-# nokogiri parser wrapper
-require File.expand_path( File.join( File.dirname( __FILE__ ), 'element.rb' ) )
+  # nokogiri parser wrapper
+  'comment.rb', 
 
-# nokogiri parser wrapper
-require File.expand_path( File.join( File.dirname( __FILE__ ), 'text.rb' ) )
+  # nokogiri parser wrapper
+  'document.rb', 
 
-# nokogiri parser wrapper
-require File.expand_path( File.join( File.dirname( __FILE__ ), 'attribute.rb' ) )
+  # nokogiri parser wrapper
+  'nodeset.rb', 
 
-# nokogiri parser wrapper
-require File.expand_path( File.join( File.dirname( __FILE__ ), 'builder.rb' ) )
+  # nokogiri parser wrapper
+  'element.rb', 
 
-# nokogiri parser wrapper
-#require File.expand_path( File.join( File.dirname( __FILE__ ), 'attribute.rb' ) )
+  # nokogiri parser wrapper
+  'text.rb', 
+
+  # nokogiri parser wrapper
+  'attribute.rb', 
+
+  # nokogiri parser wrapper
+  'builder.rb', 
+
+].each{ | filename |
+
+  require File.expand_path( File.join( File.dirname( __FILE__ ), filename ) )
+
+}

data/lib/tdriver/util/xml/parsers/nokogiri/node.rb

@@ -0,0 +1,203 @@
+############################################################################
+## 
+## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 
+## All rights reserved. 
+## Contact: Nokia Corporation (testabilitydriver@nokia.com) 
+## 
+## This file is part of Testability Driver. 
+## 
+## If you have questions regarding the use of this file, please contact 
+## Nokia at testabilitydriver@nokia.com . 
+## 
+## This library is free software; you can redistribute it and/or 
+## modify it under the terms of the GNU Lesser General Public 
+## License version 2.1 as published by the Free Software Foundation 
+## and appearing in the file LICENSE.LGPL included in the packaging 
+## of this file. 
+## 
+############################################################################
+
+module MobyUtil
+
+  module XML
+
+    module Nokogiri
+
+      module Node # behaviour
+
+        include Abstraction 
+
+        # TODO: document me
+        def []( value )
+
+          @xml[ value ]
+
+        end
+
+        # TODO: document me
+        def []=( name, value )
+
+          @xml[ name ] = value
+
+        end
+
+        # TODO: document me
+        def ==( object )
+
+          @xml.content == object.xml.content
+
+        end
+
+        # aliases for ==
+        alias_method :eql?, :==
+
+        # TODO: document me
+        def <=>( object )
+
+          @xml <=> object.xml
+
+        end
+
+        # TODO: document me
+        def add_previous_sibling( other )
+
+          @xml.add_previous_sibling( other.xml )
+
+        end
+
+        # TODO: document me
+        def attribute( attr_name )
+
+          unless ( value = @xml.attribute( attr_name ) ).nil?
+
+            value.to_s
+
+          end
+
+        end
+
+        # TODO: document me
+        def attributes
+
+          # return hash of attributes
+          Hash[ @xml.attribute_nodes.collect{ | node | 
+
+            [ node.node_name, node.value.to_s ] }
+
+          ]
+
+        end
+
+        # TODO: document me
+        def blank?
+
+          @xml.blank?
+
+        end
+
+        # TODO: document me
+        def children
+
+          node_object( @xml.children )
+
+        end
+
+        # TODO: document me
+        def content
+
+          @xml.content
+
+        end
+
+        # aliases for text
+        alias_method :text, :content
+        alias_method :inner_text, :content
+
+        # TODO: document me
+        def each( &block )
+
+          # iterate each attribute
+          @xml.each{ | element | 
+
+            yield( node_object( element ) ) 
+
+          }
+
+          nil
+
+        end        
+
+        # TODO: document me
+        def inner_html
+
+          @xml.inner_html
+
+        end
+
+        # aliases for inner_html
+        alias_method :inner_xml, :inner_html
+
+        # TODO: document me
+        def to_s
+  
+          @xml.to_s
+
+        end
+
+        # TODO: document me
+        def parent
+        
+          node_object( @xml.parent )
+        
+        end
+
+        # TODO: document me
+        def remove
+
+          @xml.remove
+
+          self
+
+        end
+
+        # TODO: document me
+        def replace( other )
+
+          @xml.replace( other.xml )
+
+          self
+
+        end
+
+        # TODO: document me
+        def xpath( xpath_query, *args, &block )
+
+          node_object( 
+
+            @xml.xpath( xpath_query, *args, &block ) 
+
+          )
+
+        end
+
+        # TODO: document me
+        def at_xpath( xpath_query, *args, &block )
+
+          node_object( 
+
+            @xml.at_xpath( xpath_query, *args, &block ) 
+
+          )
+
+        end
+
+        # enable hooking for performance measurement & debug logging
+        TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
+
+      end # Element
+
+    end # Nokogiri
+
+  end # XML
+
+end # MobyUtil