libxml-ext 0.3.0 → 0.3.1

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to libxml-ext version 0.3.0
+This documentation refers to libxml-ext version 0.3.1
 
 
 == DESCRIPTION

data/lib/libxml/ext/find.rb

@@ -0,0 +1,6 @@
+require 'libxml'
+require 'libxml/ext/find_mixin'
+
+[LibXML::XML::Document, LibXML::XML::Node].each { |klass|
+  klass.send :include, LibXML::Ext::Find
+}

data/lib/libxml/ext/{enhanced_find.rb → find_mixin.rb}

@@ -24,20 +24,18 @@
 ###############################################################################
 #++
 
-require 'libxml'
-
 module LibXML
   module Ext
-    module EnhancedFind
+    module Find
 
-  def enhanced_find(xpath)
+  def xfind(xpath)
     find(xpath.gsub(/\*\*/, 'descendant::node()'), namespaces)
   end
 
-  alias_method :[], :enhanced_find
+  alias_method :[], :xfind
 
   def /(xpath)
-    enhanced_find(xpath.to_s)
+    xfind(xpath.to_s)
   end
 
   def self.included(base)
@@ -50,7 +48,3 @@ module LibXML
     end
   end
 end
-
-[LibXML::XML::Document, LibXML::XML::Node].each { |klass|
-  klass.send :include, LibXML::Ext::EnhancedFind
-}

data/lib/libxml/ext/namespaces.rb

@@ -1,73 +1,11 @@
-#--
-###############################################################################
-#                                                                             #
-# A component of libxml-ext, the LibXML extensions.                           #
-#                                                                             #
-# Copyright (C) 2007-2010 Jens Wille                                          #
-#                                                                             #
-# Authors:                                                                    #
-#     Jens Wille <jens.wille@uni-koeln.de>                                    #
-#                                                                             #
-# libxml-ext is free software; you can redistribute it and/or modify it       #
-# under the terms of the GNU General Public License as published by the Free  #
-# Software Foundation; either version 3 of the License, or (at your option)   #
-# any later version.                                                          #
-#                                                                             #
-# libxml-ext is distributed in the hope that it will be useful, but WITHOUT   #
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
-# more details.                                                               #
-#                                                                             #
-# You should have received a copy of the GNU General Public License along     #
-# with libxml-ext. If not, see <http://www.gnu.org/licenses/>.                #
-#                                                                             #
-###############################################################################
-#++
-
 require 'libxml'
-
-module LibXML
-  module Ext
-    module Namespaces
-
-  def namespaces
-    @namespaces ||= self.class::DEFAULT_NAMESPACES
-  end
-
-  def namespaces=(ns)
-    if url
-      @namespaces = self.class.namespaces[url] = ns
-    else
-      raise "can't set namespaces (document has no URL)"
-    end
-  end
-
-  def self.included(base)
-    base.const_set(:DEFAULT_NAMESPACES, [])
-
-    # container for XML::Node's access to its document's namespaces
-    base.instance_variable_set(
-      :@namespaces, Hash.new(base.const_get(:DEFAULT_NAMESPACES))
-    )
-
-    class << base; attr_reader :namespaces; end
-
-    # overwrite original methods
-    instance_methods.each { |method|
-      base.send(:define_method, method, instance_method(method))
-    }
-  end
-
-    end
-  end
-end
+require 'libxml/ext/namespaces_mixin'
 
 [LibXML::XML::Document].each { |klass|
   klass.send :include, LibXML::Ext::Namespaces
 }
 
 class LibXML::XML::Node
-
   def namespaces
     @namespaces ||= LibXML::XML::Document.namespaces[doc.url]
   end
@@ -75,5 +13,4 @@ class LibXML::XML::Node
   def namespaces=(ns)
     @namespaces = ns
   end
-
 end

data/lib/libxml/ext/namespaces_mixin.rb

@@ -0,0 +1,61 @@
+#--
+###############################################################################
+#                                                                             #
+# A component of libxml-ext, the LibXML extensions.                           #
+#                                                                             #
+# Copyright (C) 2007-2010 Jens Wille                                          #
+#                                                                             #
+# Authors:                                                                    #
+#     Jens Wille <jens.wille@uni-koeln.de>                                    #
+#                                                                             #
+# libxml-ext is free software; you can redistribute it and/or modify it       #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; either version 3 of the License, or (at your option)   #
+# any later version.                                                          #
+#                                                                             #
+# libxml-ext is distributed in the hope that it will be useful, but WITHOUT   #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with libxml-ext. If not, see <http://www.gnu.org/licenses/>.                #
+#                                                                             #
+###############################################################################
+#++
+
+module LibXML
+  module Ext
+    module Namespaces
+
+  def namespaces
+    @namespaces ||= self.class::DEFAULT_NAMESPACES
+  end
+
+  def namespaces=(ns)
+    if url
+      @namespaces = self.class.namespaces[url] = ns
+    else
+      raise "can't set namespaces (document has no URL)"
+    end
+  end
+
+  def self.included(base)
+    base.const_set(:DEFAULT_NAMESPACES, [])
+
+    # container for XML::Node's access to its document's namespaces
+    base.instance_variable_set(
+      :@namespaces, Hash.new(base.const_get(:DEFAULT_NAMESPACES))
+    )
+
+    class << base; attr_reader :namespaces; end
+
+    # overwrite original methods
+    instance_methods.each { |method|
+      base.send(:define_method, method, instance_method(method))
+    }
+  end
+
+    end
+  end
+end

data/lib/libxml/ext/uniq.rb

@@ -0,0 +1,6 @@
+require 'libxml'
+require 'libxml/ext/uniq_mixin'
+
+[LibXML::XML::XPath::Object].each { |klass|
+  klass.send :include, LibXML::Ext::Uniq
+}

data/lib/libxml/ext/{uniqueness.rb → uniq_mixin.rb}

@@ -24,17 +24,15 @@
 ###############################################################################
 #++
 
-require 'libxml'
 require 'forwardable'
 
 module LibXML
   module Ext
-    module Uniqueness
+    module Uniq
 
   extend Forwardable
 
-  DELEGATORS = %w[to_a each length size]
-
+  DELEGATORS = %w[to_a each length size] unless const_defined?(:DELEGATORS)
   def_delegators *DELEGATORS
 
   def to_a
@@ -91,7 +89,3 @@ module LibXML
     end
   end
 end
-
-[LibXML::XML::XPath::Object].each { |klass|
-  klass.send :include, LibXML::Ext::Uniqueness
-}

data/lib/libxml/ext/version.rb

@@ -6,7 +6,7 @@ module LibXML
 
       MAJOR = 0
       MINOR = 3
-      TINY  = 0
+      TINY  = 1
 
       class << self
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Jens Wille
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 +01:00
+date: 2010-03-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,11 +42,14 @@ extra_rdoc_files:
 - ChangeLog
 - README
 files: 
-- lib/libxml/ext/string_representation.rb
-- lib/libxml/ext/enhanced_find.rb
+- lib/libxml/ext/find.rb
+- lib/libxml/ext/namespaces_mixin.rb
 - lib/libxml/ext/version.rb
-- lib/libxml/ext/uniqueness.rb
+- lib/libxml/ext/find_mixin.rb
+- lib/libxml/ext/uniq_mixin.rb
 - lib/libxml/ext/namespaces.rb
+- lib/libxml/ext/string.rb
+- lib/libxml/ext/uniq.rb
 - lib/libxml/ext.rb
 - README
 - ChangeLog