oga 0.1.1 → 0.1.2

data/lib/oga/xml/sax_parser.rb

@@ -0,0 +1,63 @@
+module Oga
+  module XML
+    ##
+    # The SaxParser class provides the basic interface for writing custom SAX
+    # parsers. All callback methods defined in {Oga::XML::Parser} are delegated
+    # to a dedicated handler class.
+    #
+    # To write a custom handler for the SAX parser, create a class that
+    # implements one (or many) of the following callback methods:
+    #
+    # * `on_document`
+    # * `on_doctype`
+    # * `on_cdata`
+    # * `on_comment`
+    # * `on_proc_ins`
+    # * `on_xml_decl`
+    # * `on_text`
+    # * `on_element`
+    # * `on_element_children`
+    # * `after_element`
+    #
+    # For example:
+    #
+    #     class SaxHandler
+    #       def on_element(namespace, name, attrs = {})
+    #         puts name
+    #       end
+    #     end
+    #
+    # You can then use it as following:
+    #
+    #     handler = SaxHandler.new
+    #     parser  = Oga::XML::SaxParser.new(handler, '<foo />')
+    #
+    #     parser.parse
+    #
+    # For information on the callback arguments see the documentation of the
+    # corresponding methods in {Oga::XML::Parser}.
+    #
+    class SaxParser < Parser
+      ##
+      # @param [Object] handler The SAX handler to delegate callbacks to.
+      # @see [Oga::XML::Parser#initialize]
+      #
+      def initialize(handler, *args)
+        @handler = handler
+
+        super(*args)
+      end
+
+      # Delegate all callbacks to the handler object.
+      instance_methods.grep(/^(on_|after_)/).each do |method|
+        eval <<-EOF, nil, __FILE__, __LINE__ + 1
+        def #{method}(*args)
+          @handler.#{method}(*args) if @handler.respond_to?(:#{method})
+
+          return
+        end
+        EOF
+      end
+    end # SaxParser
+  end # XML
+end # Oga

data/lib/oga/xml/text.rb

@@ -5,12 +5,7 @@ module Oga
     # have any children, attributes and the likes; just text.
     #
     class Text < CharacterNode
-      ##
-      # @return [Symbol]
-      #
-      def node_type
-        return :text
-      end
+
     end # Text
   end # XML
 end # Oga

data/lib/oga/xml/xml_declaration.rb

@@ -64,13 +64,6 @@ module Oga
 
         return "XmlDeclaration(#{segments.join(' ')})"
       end
-
-      ##
-      # @return [Symbol]
-      #
-      def node_type
-        return :xml_decl
-      end
     end # XmlDeclaration
   end # XML
 end # Oga

data/lib/oga/xpath/evaluator.rb

@@ -131,7 +131,8 @@ module Oga
           context = XML::NodeSet.new([@document])
         end
 
-        return on_path(ast_node, context)
+        # If the expression is just "/" we'll just return the current context.
+        return ast_node.children.empty? ? context : on_path(ast_node, context)
       end
 
       ##
@@ -1188,7 +1189,7 @@ module Oga
       # This function call returns the substring of the 1st argument that occurs
       # after the string given in the 2nd argument. For example:
       #
-      #     substring-before("2014-08-25", "-")
+      #     substring-after("2014-08-25", "-")
       #
       # This would return "08-25" as it occurs after the first "-".
       #

data/lib/oga/xpath/lexer.rb

@@ -1588,7 +1588,7 @@ ts = p
 		begin
  add_token(:T_SLASH) 		end
 	when 33 then
-# line 294 "lib/oga/xpath/lexer.rl"
+# line 296 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_ADD) 		end
 	when 12 then
@@ -1597,32 +1597,20 @@ ts = p
 te = p+1
 		end
 	when 11 then
-# line 361 "lib/oga/xpath/lexer.rl"
+# line 368 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
 		end
 	when 8 then
-# line 342 "lib/oga/xpath/lexer.rl"
+# line 349 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
  begin 
           emit(:T_TYPE_TEST, ts, te - 2)
          end
 		end
-	when 20 then
-# line 365 "lib/oga/xpath/lexer.rl"
-		begin
-te = p+1
- begin  add_token(:T_LBRACK)  end
-		end
-	when 21 then
-# line 366 "lib/oga/xpath/lexer.rl"
-		begin
-te = p+1
- begin  add_token(:T_RBRACK)  end
-		end
 	when 2 then
-# line 236 "lib/oga/xpath/lexer.rl"
+# line 238 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
  begin 
@@ -1630,7 +1618,7 @@ te = p+1
          end
 		end
 	when 7 then
-# line 258 "lib/oga/xpath/lexer.rl"
+# line 260 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
  begin 
@@ -1638,7 +1626,7 @@ te = p+1
          end
 		end
 	when 19 then
-# line 270 "lib/oga/xpath/lexer.rl"
+# line 272 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
  begin 
@@ -1659,12 +1647,12 @@ te = p+1
          end
 		end
 	when 22 then
-# line 361 "lib/oga/xpath/lexer.rl"
+# line 368 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 30 then
-# line 355 "lib/oga/xpath/lexer.rl"
+# line 362 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1672,7 +1660,7 @@ p = p - 1; begin
          end
 		end
 	when 35 then
-# line 211 "lib/oga/xpath/lexer.rl"
+# line 213 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1682,7 +1670,7 @@ p = p - 1; begin
          end
 		end
 	when 36 then
-# line 217 "lib/oga/xpath/lexer.rl"
+# line 219 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1692,7 +1680,7 @@ p = p - 1; begin
          end
 		end
 	when 37 then
-# line 270 "lib/oga/xpath/lexer.rl"
+# line 272 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1713,7 +1701,7 @@ p = p - 1; begin
          end
 		end
 	when 31 then
-# line 197 "lib/oga/xpath/lexer.rl"
+# line 199 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1721,12 +1709,12 @@ p = p - 1; begin
          end
 		end
 	when 1 then
-# line 361 "lib/oga/xpath/lexer.rl"
+# line 368 "lib/oga/xpath/lexer.rl"
 		begin
  begin p = ((te))-1; end
 		end
 	when 6 then
-# line 197 "lib/oga/xpath/lexer.rl"
+# line 199 "lib/oga/xpath/lexer.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -1744,14 +1732,14 @@ p = p - 1; begin
 		next
 	end
 end
-	when 8 then
+	when 6 then
 	begin begin p = ((te))-1; end
 
           value = slice_input(ts, te).to_i
 
           add_token(:T_INT, value)
         end
-	when 9 then
+	when 7 then
 	begin begin p = ((te))-1; end
 
           value = slice_input(ts, te).to_f
@@ -1767,7 +1755,7 @@ end
 # line 185 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_LPAREN) 		end
-# line 361 "lib/oga/xpath/lexer.rl"
+# line 368 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
 		end
@@ -1775,7 +1763,7 @@ te = p+1
 # line 186 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_RPAREN) 		end
-# line 361 "lib/oga/xpath/lexer.rl"
+# line 368 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
 		end
@@ -1783,7 +1771,7 @@ te = p+1
 # line 187 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_COMMA) 		end
-# line 361 "lib/oga/xpath/lexer.rl"
+# line 368 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
 		end
@@ -1791,119 +1779,135 @@ te = p+1
 # line 188 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_COLON) 		end
-# line 361 "lib/oga/xpath/lexer.rl"
+# line 368 "lib/oga/xpath/lexer.rl"
+		begin
+te = p+1
+		end
+	when 20 then
+# line 189 "lib/oga/xpath/lexer.rl"
+		begin
+ add_token(:T_LBRACK) 		end
+# line 368 "lib/oga/xpath/lexer.rl"
+		begin
+te = p+1
+		end
+	when 21 then
+# line 190 "lib/oga/xpath/lexer.rl"
+		begin
+ add_token(:T_RBRACK) 		end
+# line 368 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
 		end
 	when 43 then
-# line 293 "lib/oga/xpath/lexer.rl"
+# line 295 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_PIPE) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 32 then
-# line 294 "lib/oga/xpath/lexer.rl"
+# line 296 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_ADD) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 40 then
-# line 295 "lib/oga/xpath/lexer.rl"
+# line 297 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_EQ) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 29 then
-# line 296 "lib/oga/xpath/lexer.rl"
+# line 298 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_NEQ) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 38 then
-# line 297 "lib/oga/xpath/lexer.rl"
+# line 299 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_LT) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 41 then
-# line 298 "lib/oga/xpath/lexer.rl"
+# line 300 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_GT) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 39 then
-# line 299 "lib/oga/xpath/lexer.rl"
+# line 301 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_LTE) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 42 then
-# line 300 "lib/oga/xpath/lexer.rl"
+# line 302 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_GTE) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 25 then
-# line 310 "lib/oga/xpath/lexer.rl"
+# line 312 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_AND) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 28 then
-# line 311 "lib/oga/xpath/lexer.rl"
+# line 313 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_OR) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 26 then
-# line 312 "lib/oga/xpath/lexer.rl"
+# line 314 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_DIV) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 27 then
-# line 313 "lib/oga/xpath/lexer.rl"
+# line 315 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_MOD) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 23 then
-# line 314 "lib/oga/xpath/lexer.rl"
+# line 316 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_MUL) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 24 then
-# line 315 "lib/oga/xpath/lexer.rl"
+# line 317 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_SUB) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
@@ -1912,7 +1916,7 @@ p = p - 1;		end
 		begin
 te = p+1
 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 act = 1;		end
 	when 4 then
@@ -1920,29 +1924,29 @@ act = 1;		end
 		begin
 te = p+1
 		end
-# line 211 "lib/oga/xpath/lexer.rl"
+# line 213 "lib/oga/xpath/lexer.rl"
 		begin
-act = 8;		end
+act = 6;		end
 	when 5 then
 # line 1 "NONE"
 		begin
 te = p+1
 		end
-# line 217 "lib/oga/xpath/lexer.rl"
+# line 219 "lib/oga/xpath/lexer.rl"
 		begin
-act = 9;		end
+act = 7;		end
 	when 34 then
 # line 1 "NONE"
 		begin
 te = p+1
 		end
-# line 294 "lib/oga/xpath/lexer.rl"
+# line 296 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_ADD) 		end
-# line 211 "lib/oga/xpath/lexer.rl"
+# line 213 "lib/oga/xpath/lexer.rl"
 		begin
-act = 8;		end
-# line 1945 "lib/oga/xpath/lexer.rb"
+act = 6;		end
+# line 1949 "lib/oga/xpath/lexer.rb"
 	end
 	end
 	end
@@ -1956,7 +1960,7 @@ ts = nil;		end
 		begin
 act = 0
 		end
-# line 1959 "lib/oga/xpath/lexer.rb"
+# line 1963 "lib/oga/xpath/lexer.rb"
 	end
 
 	if cs == 0
@@ -2036,7 +2040,7 @@ end
       end
 
       
-# line 376 "lib/oga/xpath/lexer.rl"
+# line 379 "lib/oga/xpath/lexer.rl"
 
     end # Lexer
   end # XPath