ruby-xquery 0.0.8.227 → 0.1.0.269

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to ruby-xquery version 0.0.8
+This documentation refers to ruby-xquery version 0.1.0
 
 
 == DESCRIPTION

data/Rakefile

@@ -4,7 +4,7 @@ rescue LoadError
   abort "Please install the 'hen' gem first."
 end
 
-require 'lib/xml/xquery/version'
+require 'lib/libxml/xquery/version'
 
 Hen.lay! {{
   :rubyforge => {
@@ -12,7 +12,7 @@ Hen.lay! {{
   },
 
   :gem => {
-    :version     => XML::XQuery::VERSION,
+    :version     => LibXML::XML::XQuery::VERSION,
     :summary     => "Libxml's XPath support + plain ol' Ruby = XQuery (kind of... ;-)",
     :files       => FileList['lib/**/*.rb'].to_a,
     :extra_files => FileList['[A-Z]*', 'specs/*.rb', 'test_data/*'].to_a

data/lib/{xml/xquery/node_set.rb → libxml/xquery.rb}

@@ -1,7 +1,8 @@
 #--
 ###############################################################################
 #                                                                             #
-# A component of ruby-xquery, mimicking XQuery in Ruby.                       #
+# ruby-xquery -- Libxml's XPath support + plain ol' Ruby = XQuery (kind of... #
+# ;-)                                                                         #
 #                                                                             #
 # Copyright (C) 2007-2008 Jens Wille                                          #
 #                                                                             #
@@ -24,43 +25,18 @@
 ###############################################################################
 #++
 
-require 'forwardable'
-
-class XML::Node::Set
-
-  # Object#dup gives a segmentation fault on #to_a (via Enumerable)!!
-  def dup
-    xpath.set
-  end
-
-  def uniq
-    dup.uniq!
-  end
-
-  def uniq!
-    # return unique when asked for array
-    @to_a = to_a.uniq
-
-    class << self
-
-      extend Forwardable
-
-      attr_reader :to_a
-
-      # forward to unique array
-      def_delegators :@to_a, :each, :length, :size
-
-    end
-
-    self
-  end
+begin
+  require 'rubygems'
+rescue LoadError
+end
 
-  def contents(sep = ' | ')
-    map { |n| (c = n.to_s(sep)).empty? ? nil : c }.compact
-  end
+require 'libxml'
 
-  def to_s(sep = ' | ')
-    contents(sep).join(sep)
-  end
+# Libxml's XPath support + plain ol' Ruby = XQuery (kind of... ;-)
 
+module LibXML::XML::XQuery
 end
+
+Dir[File.join(File.dirname(__FILE__), 'xquery', '**', '*.rb')].each { |rb|
+  require rb
+}

data/lib/{xml → libxml}/xquery/attr.rb

@@ -24,7 +24,7 @@
 ###############################################################################
 #++
 
-class XML::Attr
+class LibXML::XML::Attr
 
   def to_s(sep = nil)
     value.strip

data/lib/{xml → libxml}/xquery/enhanced_find.rb

@@ -24,7 +24,7 @@
 ###############################################################################
 #++
 
-module XML::XQuery
+module LibXML::XML::XQuery
 
   module EnhancedFind
 
@@ -48,9 +48,9 @@ module XML::XQuery
 
 end
 
-class XML::Document
+class LibXML::XML::Document
 
-  include XML::XQuery::EnhancedFind
+  include LibXML::XML::XQuery::EnhancedFind
 
   DEFAULT_NAMESPACES = []
 
@@ -71,12 +71,12 @@ class XML::Document
 
 end
 
-class XML::Node
+class LibXML::XML::Node
 
-  include XML::XQuery::EnhancedFind
+  include LibXML::XML::XQuery::EnhancedFind
 
   def namespaces
-    XML::Document.namespaces[doc.url]
+    LibXML::XML::Document.namespaces[doc.url]
   end
 
 end

data/lib/{xml → libxml}/xquery/node.rb

@@ -24,7 +24,7 @@
 ###############################################################################
 #++
 
-class XML::Node
+class LibXML::XML::Node
 
   def to_s(sep = nil)
     content.strip

data/lib/libxml/xquery/node_set.rb

@@ -0,0 +1,87 @@
+#--
+###############################################################################
+#                                                                             #
+# A component of ruby-xquery, mimicking XQuery in Ruby.                       #
+#                                                                             #
+# Copyright (C) 2007-2008 Jens Wille                                          #
+#                                                                             #
+# Authors:                                                                    #
+#     Jens Wille <jens.wille@uni-koeln.de>                                    #
+#                                                                             #
+# ruby-xquery 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.                                                          #
+#                                                                             #
+# ruby-xquery 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 ruby-xquery. If not, see <http://www.gnu.org/licenses/>.               #
+#                                                                             #
+###############################################################################
+#++
+
+require 'forwardable'
+
+class LibXML::XML::Node::Set
+
+  extend Forwardable
+
+  def_delegators :to_a, :each, :length, :size
+
+  alias_method :_xquery_original_to_a, :to_a
+
+  def to_a
+    if @_uniq
+      # return unique nodes according to their #to_s
+      seen = Hash.new { |h, k| h[k] = true; false }
+      uniq = []
+
+      _xquery_original_to_a.each { |n|
+        uniq << n unless seen[n.to_s]
+      }
+
+      uniq
+    else
+      _xquery_original_to_a
+    end
+  end
+
+  def uniq
+    proxy = LibXML::XML::Node::Set.new.uniq!
+    proxy.instance_variable_set(:@_this, self)
+
+    class << proxy
+      (instance_methods - %w[to_a each length size]).each { |method|
+        undef_method(method) unless method =~ /\A__/
+      }
+
+      def method_missing(*args)
+        block_given? ? @_this.send(*args) { |a| yield a } : @_this.send(*args)
+      end
+    end
+
+    proxy
+  end
+
+  def uniq!
+    @_uniq = true
+    self
+  end
+
+  def uniq?
+    @_uniq
+  end
+
+  def contents(sep = ' | ')
+    map { |n| (c = n.to_s(sep)).empty? ? nil : c }.compact
+  end
+
+  def to_s(sep = ' | ')
+    contents(sep).join(sep)
+  end
+
+end

data/lib/libxml/xquery/version.rb

@@ -0,0 +1,35 @@
+module LibXML
+
+  module XML
+
+    module XQuery
+
+      module Version
+
+        MAJOR = 0
+        MINOR = 1
+        TINY  = 0
+
+        class << self
+
+          # Returns array representation.
+          def to_a
+            [MAJOR, MINOR, TINY]
+          end
+
+          # Short-cut for version string.
+          def to_s
+            to_a.join('.')
+          end
+
+        end
+
+      end
+
+      VERSION = Version.to_s
+
+    end
+
+  end
+
+end

data/lib/{xml → libxml}/xquery/xpath_object.rb

@@ -24,7 +24,19 @@
 ###############################################################################
 #++
 
-class XML::XPath::Object
+require 'forwardable'
+
+class LibXML::XML::XPath::Object
+
+  extend Forwardable
+
+  def_delegators :set, :to_a, :each, :length, :size, :uniq, :uniq!, :uniq?
+
+  alias_method :_xquery_original_set, :set
+
+  def set
+    @set ||= _xquery_original_set
+  end
 
   def to_s(sep = ' | ')
     set.to_s(sep)

data/lib/xml/xquery.rb

@@ -1,37 +1,2 @@
-#--
-###############################################################################
-#                                                                             #
-# ruby-xquery -- Libxml's XPath support + plain ol' Ruby = XQuery (kind of... #
-# ;-)                                                                         #
-#                                                                             #
-# Copyright (C) 2007-2008 Jens Wille                                          #
-#                                                                             #
-# Authors:                                                                    #
-#     Jens Wille <jens.wille@uni-koeln.de>                                    #
-#                                                                             #
-# ruby-xquery 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.                                                          #
-#                                                                             #
-# ruby-xquery 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 ruby-xquery. If not, see <http://www.gnu.org/licenses/>.               #
-#                                                                             #
-###############################################################################
-#++
-
-require 'xml/libxml'
-
-# Libxml's XPath support + plain ol' Ruby = XQuery (kind of... ;-)
-
-module XML::XQuery
-end
-
-Dir[File.join(File.dirname(__FILE__), 'xquery', '**', '*.rb')].each { |rb|
-  require rb
-}
+# for backwards-compatibility
+require 'libxml/xquery'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-xquery
 version: !ruby/object:Gem::Version 
-  version: 0.0.8.227
+  version: 0.1.0.269
 platform: ruby
 authors: 
 - Jens Wille
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-29 00:00:00 +01:00
+date: 2008-07-30 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -24,12 +24,13 @@ extra_rdoc_files:
 - ChangeLog
 - README
 files: 
-- lib/xml/xquery/node_set.rb
-- lib/xml/xquery/xpath_object.rb
-- lib/xml/xquery/attr.rb
-- lib/xml/xquery/version.rb
-- lib/xml/xquery/enhanced_find.rb
-- lib/xml/xquery/node.rb
+- lib/libxml/xquery/node_set.rb
+- lib/libxml/xquery/xpath_object.rb
+- lib/libxml/xquery/attr.rb
+- lib/libxml/xquery/version.rb
+- lib/libxml/xquery/enhanced_find.rb
+- lib/libxml/xquery/node.rb
+- lib/libxml/xquery.rb
 - lib/xml/xquery.rb
 - COPYING
 - README
@@ -41,14 +42,14 @@ has_rdoc: true
 homepage: http://prometheus.rubyforge.org/ruby-xquery
 post_install_message: 
 rdoc_options: 
+- --line-numbers
 - --inline-source
-- --charset
-- UTF-8
 - --title
 - ruby-xquery Application documentation
+- --charset
+- UTF-8
 - --main
 - README
-- --line-numbers
 - --all
 require_paths: 
 - lib
@@ -67,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: prometheus
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Libxml's XPath support + plain ol' Ruby = XQuery (kind of... ;-)

data/lib/xml/xquery/version.rb

@@ -1,31 +0,0 @@
-module XML
-
-  module XQuery
-
-    module Version
-
-      MAJOR = 0
-      MINOR = 0
-      TINY  = 8
-
-      class << self
-
-        # Returns array representation.
-        def to_a
-          [MAJOR, MINOR, TINY]
-        end
-
-        # Short-cut for version string.
-        def to_s
-          to_a.join('.')
-        end
-
-      end
-
-    end
-
-    VERSION = Version.to_s
-
-  end
-
-end