ruby-xquery 0.1.1.270 → 0.2.0.296

data/README

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

data/Rakefile

@@ -12,9 +12,10 @@ Hen.lay! {{
   },
 
   :gem => {
-    :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
+    :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,
+    :dependencies => [['libxml-ruby', '>= 0.9.3']]
   }
 }}

data/lib/libxml/xquery.rb

@@ -32,6 +32,9 @@ end
 
 require 'libxml'
 
+raise "need libxml-ruby version >= 0.9.3, got #{LibXML::XML::VERSION}" \
+  unless LibXML::XML::VERSION >= '0.9.3'
+
 # Libxml's XPath support + plain ol' Ruby = XQuery (kind of... ;-)
 
 module LibXML::XML::XQuery

data/lib/libxml/xquery/enhanced_find.rb

@@ -24,26 +24,22 @@
 ###############################################################################
 #++
 
-module LibXML::XML::XQuery
+module LibXML::XML::XQuery::EnhancedFind
 
-  module EnhancedFind
-
-    def enhanced_find(xpath)
-      find(xpath.gsub(/\*\*/, 'descendant::node()'), namespaces)
-    end
-    alias_method :[], :enhanced_find
-
-    def /(xpath)
-      enhanced_find(xpath.to_s)
-    end
+  def enhanced_find(xpath)
+    find(xpath.gsub(/\*\*/, 'descendant::node()'), namespaces)
+  end
+  alias_method :[], :enhanced_find
 
-    def self.included(base)
-      # overwrite original methods
-      instance_methods.each { |method|
-        base.send(:define_method, method, instance_method(method))
-      }
-    end
+  def /(xpath)
+    enhanced_find(xpath.to_s)
+  end
 
+  def self.included(base)
+    # overwrite original methods
+    instance_methods.each { |method|
+      base.send(:define_method, method, instance_method(method))
+    }
   end
 
 end

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

@@ -24,6 +24,14 @@
 ###############################################################################
 #++
 
+class LibXML::XML::Attr
+
+  def to_s(sep = nil)
+    value.strip
+  end
+
+end
+
 class LibXML::XML::Node
 
   def to_s(sep = nil)
@@ -31,3 +39,11 @@ class LibXML::XML::Node
   end
 
 end
+
+class LibXML::XML::XPath::Object
+
+  def to_s(sep = ' | ')
+    map { |n| (c = n.to_s(sep)).empty? ? nil : c }.compact.join(sep)
+  end
+
+end

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

@@ -26,13 +26,13 @@
 
 require 'forwardable'
 
-class LibXML::XML::Node::Set
+module LibXML::XML::XQuery::Uniqueness
 
   extend Forwardable
 
-  def_delegators :to_a, :each, :length, :size
+  DELEGATORS = %w[to_a each length size]
 
-  alias_method :_xquery_original_to_a, :to_a
+  def_delegators *DELEGATORS
 
   def to_a
     if @_uniq
@@ -51,11 +51,11 @@ class LibXML::XML::Node::Set
   end
 
   def uniq
-    proxy = LibXML::XML::Node::Set.new.uniq!
+    proxy = self.class.new.uniq!
     proxy.instance_variable_set(:@_this, self)
 
     class << proxy
-      (instance_methods - %w[to_a each length size]).each { |method|
+      (instance_methods - DELEGATORS).each { |method|
         undef_method(method) unless method =~ /\A__/
       }
 
@@ -76,12 +76,19 @@ class LibXML::XML::Node::Set
     @_uniq
   end
 
-  def contents(sep = ' | ')
-    map { |n| (c = n.to_s(sep)).empty? ? nil : c }.compact
-  end
+  def self.included(base)
+    base.send(:alias_method, :_xquery_original_to_a, :to_a)
 
-  def to_s(sep = ' | ')
-    contents(sep).join(sep)
+    # overwrite original methods
+    instance_methods.each { |method|
+      base.send(:define_method, method, instance_method(method))
+    }
   end
 
 end
+
+class LibXML::XML::XPath::Object
+
+  include LibXML::XML::XQuery::Uniqueness
+
+end

data/lib/libxml/xquery/version.rb

@@ -7,8 +7,8 @@ module LibXML
       module Version
 
         MAJOR = 0
-        MINOR = 1
-        TINY  = 1
+        MINOR = 2
+        TINY  = 0
 
         class << self
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-xquery
 version: !ruby/object:Gem::Version 
-  version: 0.1.1.270
+  version: 0.2.0.296
 platform: ruby
 authors: 
 - Jens Wille
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-30 00:00:00 +02:00
+date: 2008-11-24 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: libxml-ruby
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.3
+    version: 
 description: Libxml's XPath support + plain ol' Ruby = XQuery (kind of... ;-)
 email: jens.wille@uni-koeln.de
 executables: []
@@ -24,12 +33,10 @@ extra_rdoc_files:
 - ChangeLog
 - README
 files: 
-- lib/libxml/xquery/node_set.rb
-- lib/libxml/xquery/xpath_object.rb
-- lib/libxml/xquery/attr.rb
+- lib/libxml/xquery/uniqueness.rb
 - lib/libxml/xquery/version.rb
+- lib/libxml/xquery/string_representation.rb
 - lib/libxml/xquery/enhanced_find.rb
-- lib/libxml/xquery/node.rb
 - lib/libxml/xquery.rb
 - lib/xml/xquery.rb
 - COPYING
@@ -43,14 +50,14 @@ homepage: http://prometheus.rubyforge.org/ruby-xquery
 post_install_message: 
 rdoc_options: 
 - --line-numbers
+- --main
+- README
+- --all
 - --inline-source
 - --title
 - ruby-xquery Application documentation
 - --charset
 - UTF-8
-- --main
-- README
-- --all
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -68,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: prometheus
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Libxml's XPath support + plain ol' Ruby = XQuery (kind of... ;-)

data/lib/libxml/xquery/attr.rb

@@ -1,33 +0,0 @@
-#--
-###############################################################################
-#                                                                             #
-# 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/>.               #
-#                                                                             #
-###############################################################################
-#++
-
-class LibXML::XML::Attr
-
-  def to_s(sep = nil)
-    value.strip
-  end
-
-end

data/lib/libxml/xquery/xpath_object.rb

@@ -1,45 +0,0 @@
-#--
-###############################################################################
-#                                                                             #
-# 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::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)
-  end
-
-end