oga 0.3.4-java → 1.0.0-java

data/ext/c/lexer.rl

@@ -113,7 +113,6 @@ VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
     ID id_on_element_name     = rb_intern("on_element_name");
     ID id_on_element_ns       = rb_intern("on_element_ns");
     ID id_on_element_open_end = rb_intern("on_element_open_end");
-    ID id_on_element_start    = rb_intern("on_element_start");
     ID id_on_proc_ins_end     = rb_intern("on_proc_ins_end");
     ID id_on_proc_ins_name    = rb_intern("on_proc_ins_name");
     ID id_on_proc_ins_start   = rb_intern("on_proc_ins_start");

data/ext/java/org/liboga/xml/Lexer.java

@@ -421,7 +421,6 @@ static final int java_lexer_en_main = 34;
         String id_on_element_name     = "on_element_name";
         String id_on_element_ns       = "on_element_ns";
         String id_on_element_open_end = "on_element_open_end";
-        String id_on_element_start    = "on_element_start";
         String id_on_proc_ins_end     = "on_proc_ins_end";
         String id_on_proc_ins_name    = "on_proc_ins_name";
         String id_on_proc_ins_start   = "on_proc_ins_start";
@@ -434,7 +433,7 @@ static final int java_lexer_en_main = 34;
         String id_on_xml_decl_start   = "on_xml_decl_start";
 
         
-// line 438 "ext/java/org/liboga/xml/Lexer.java"
+// line 437 "ext/java/org/liboga/xml/Lexer.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -463,7 +462,7 @@ case 1:
 // line 1 "NONE"
 	{ts = p;}
 	break;
-// line 467 "ext/java/org/liboga/xml/Lexer.java"
+// line 466 "ext/java/org/liboga/xml/Lexer.java"
 		}
 	}
 
@@ -533,7 +532,7 @@ case 3:
     }
 	break;
 	case 1:
-// line 545 "ext/ragel/base_lexer.rl"
+// line 544 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
 	break;
 	case 4:
@@ -814,20 +813,20 @@ case 3:
 	{te = p;p--;}
 	break;
 	case 36:
-// line 387 "ext/ragel/base_lexer.rl"
+// line 386 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_element_ns, data, encoding, ts, te - 1);
         }}
 	break;
 	case 37:
-// line 391 "ext/ragel/base_lexer.rl"
+// line 390 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_element_name, data, encoding, ts, te);
             ( this.cs) = 76;
         }}
 	break;
 	case 38:
-// line 406 "ext/ragel/base_lexer.rl"
+// line 405 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             p--;
             ( this.cs) = 75;
@@ -841,7 +840,7 @@ case 3:
     }}
 	break;
 	case 40:
-// line 413 "ext/ragel/base_lexer.rl"
+// line 412 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback_simple(id_on_string_squote);
 
@@ -851,7 +850,7 @@ case 3:
         }}
 	break;
 	case 41:
-// line 429 "ext/ragel/base_lexer.rl"
+// line 428 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_squote);
 
@@ -859,7 +858,7 @@ case 3:
         }}
 	break;
 	case 42:
-// line 435 "ext/ragel/base_lexer.rl"
+// line 434 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_dquote);
 
@@ -880,13 +879,13 @@ case 3:
     }}
 	break;
 	case 45:
-// line 450 "ext/ragel/base_lexer.rl"
+// line 449 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_attribute_ns, data, encoding, ts, te - 1);
         }}
 	break;
 	case 46:
-// line 459 "ext/ragel/base_lexer.rl"
+// line 458 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             if ( html_p )
             {
@@ -899,7 +898,7 @@ case 3:
         }}
 	break;
 	case 47:
-// line 471 "ext/ragel/base_lexer.rl"
+// line 470 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_element_open_end);
 
@@ -918,14 +917,14 @@ case 3:
         }}
 	break;
 	case 48:
-// line 489 "ext/ragel/base_lexer.rl"
+// line 488 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_element_end);
             ( this.cs) = 34;
         }}
 	break;
 	case 49:
-// line 494 "ext/ragel/base_lexer.rl"
+// line 493 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	break;
 	case 50:
@@ -935,17 +934,17 @@ case 3:
     }}
 	break;
 	case 51:
-// line 454 "ext/ragel/base_lexer.rl"
+// line 453 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_attribute, data, encoding, ts, te);
         }}
 	break;
 	case 52:
-// line 494 "ext/ragel/base_lexer.rl"
+// line 493 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
 	break;
 	case 53:
-// line 531 "ext/ragel/base_lexer.rl"
+// line 530 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -960,7 +959,7 @@ case 3:
         }}
 	break;
 	case 54:
-// line 545 "ext/ragel/base_lexer.rl"
+// line 544 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, mark);
 
@@ -978,7 +977,7 @@ case 3:
         }}
 	break;
 	case 55:
-// line 531 "ext/ragel/base_lexer.rl"
+// line 530 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -993,7 +992,7 @@ case 3:
         }}
 	break;
 	case 56:
-// line 379 "ext/ragel/base_lexer.rl"
+// line 378 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
 
@@ -1001,7 +1000,7 @@ case 3:
     }}
 	break;
 	case 57:
-// line 519 "ext/ragel/base_lexer.rl"
+// line 518 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -1014,7 +1013,7 @@ case 3:
     }}
 	break;
 	case 58:
-// line 519 "ext/ragel/base_lexer.rl"
+// line 518 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -1027,7 +1026,7 @@ case 3:
     }}
 	break;
 	case 59:
-// line 379 "ext/ragel/base_lexer.rl"
+// line 378 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
 
@@ -1035,7 +1034,7 @@ case 3:
     }}
 	break;
 	case 60:
-// line 519 "ext/ragel/base_lexer.rl"
+// line 518 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -1048,7 +1047,7 @@ case 3:
     }}
 	break;
 	case 61:
-// line 519 "ext/ragel/base_lexer.rl"
+// line 518 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -1087,19 +1086,18 @@ case 3:
 	case 66:
 // line 369 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-        callback_simple(id_on_element_start);
         p--;
         ( this.cs) = 71;
     }}
 	break;
 	case 67:
-// line 375 "ext/ragel/base_lexer.rl"
+// line 374 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
     }}
 	break;
 	case 68:
-// line 505 "ext/ragel/base_lexer.rl"
+// line 504 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
         ( this.cs) = 80;
@@ -1130,14 +1128,14 @@ case 3:
     }}
 	break;
 	case 71:
-// line 505 "ext/ragel/base_lexer.rl"
+// line 504 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         p--;
         ( this.cs) = 80;
     }}
 	break;
 	case 72:
-// line 505 "ext/ragel/base_lexer.rl"
+// line 504 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         p--;
         ( this.cs) = 80;
@@ -1163,7 +1161,7 @@ case 3:
 	}
 	}
 	break;
-// line 1167 "ext/java/org/liboga/xml/Lexer.java"
+// line 1165 "ext/java/org/liboga/xml/Lexer.java"
 			}
 		}
 	}
@@ -1177,7 +1175,7 @@ case 2:
 // line 1 "NONE"
 	{ts = -1;}
 	break;
-// line 1181 "ext/java/org/liboga/xml/Lexer.java"
+// line 1179 "ext/java/org/liboga/xml/Lexer.java"
 		}
 	}
 
@@ -1204,7 +1202,7 @@ case 5:
 	break; }
 	}
 
-// line 137 "ext/java/org/liboga/xml/Lexer.rl"
+// line 136 "ext/java/org/liboga/xml/Lexer.rl"
 
         this.lines = lines;
 
@@ -1286,5 +1284,5 @@ case 5:
 }
 
 
-// line 224 "ext/java/org/liboga/xml/Lexer.rl"
+// line 223 "ext/java/org/liboga/xml/Lexer.rl"
 

data/ext/java/org/liboga/xml/Lexer.rl

@@ -121,7 +121,6 @@ public class Lexer extends RubyObject
         String id_on_element_name     = "on_element_name";
         String id_on_element_ns       = "on_element_ns";
         String id_on_element_open_end = "on_element_open_end";
-        String id_on_element_start    = "on_element_start";
         String id_on_proc_ins_end     = "on_proc_ins_end";
         String id_on_proc_ins_name    = "on_proc_ins_name";
         String id_on_proc_ins_start   = "on_proc_ins_start";

data/ext/ragel/base_lexer.rl

@@ -367,7 +367,6 @@
     element_end   = '</' identifier (':' identifier)* '>';
 
     action start_element {
-        callback_simple(id_on_element_start);
         fhold;
         fnext element_name;
     }

data/lib/oga.rb

@@ -7,6 +7,8 @@ require_relative 'oga/version'
 require_relative 'oga/oga'
 require_relative 'oga/lru'
 require_relative 'oga/entity_decoder'
+require_relative 'oga/blacklist'
+require_relative 'oga/whitelist'
 
 # Load these first so that the native extensions don't have to define the
 # Oga::XML namespace.

data/lib/oga/blacklist.rb

@@ -0,0 +1,40 @@
+module Oga
+  ##
+  # @api private
+  #
+  class Blacklist
+    # @return [Set]
+    attr_reader :names
+
+    ##
+    # @param [Array] names
+    #
+    def initialize(names)
+      @names = Set.new(names + names.map(&:upcase))
+    end
+
+    ##
+    # @yieldparam [String]
+    #
+    def each
+      names.each do |value|
+        yield value
+      end
+    end
+
+    ##
+    # @return [TrueClass|FalseClass]
+    #
+    def allow?(name)
+      return !names.include?(name)
+    end
+
+    ##
+    # @param [Oga::Blacklist] other
+    # @return [Oga::Blacklist]
+    #
+    def +(other)
+      return self.class.new(names + other.names)
+    end
+  end # Blacklist
+end # Oga

data/lib/oga/css/lexer.rb

@@ -18,9 +18,11 @@ module Oga
     # multiple threads. However, no global state is used so you can use separate
     # instances in threads just fine.
     #
+    # @api private
+    #
     class Lexer
       
-# line 24 "lib/oga/css/lexer.rb"
+# line 26 "lib/oga/css/lexer.rb"
 class << self
 	attr_accessor :_css_lexer_trans_keys
 	private :_css_lexer_trans_keys, :_css_lexer_trans_keys=
@@ -266,7 +268,7 @@ end
 self.css_lexer_en_main = 13;
 
 
-# line 21 "lib/oga/css/lexer.rl"
+# line 23 "lib/oga/css/lexer.rl"
 
       # % fix highlight
 
@@ -327,7 +329,7 @@ self.css_lexer_en_main = 13;
         _css_lexer_trans_targs        = self.class.send(:_css_lexer_trans_targs)
 
         
-# line 331 "lib/oga/css/lexer.rb"
+# line 333 "lib/oga/css/lexer.rb"
 begin
 	testEof = false
 	_slen, _trans, _keys, _inds, _acts, _nacts = nil
@@ -355,7 +357,7 @@ begin
 		begin
 ts = p
 		end
-# line 359 "lib/oga/css/lexer.rb"
+# line 361 "lib/oga/css/lexer.rb"
 	end
 	_keys = cs << 1
 	_inds = _css_lexer_index_offsets[cs]
@@ -375,25 +377,25 @@ ts = p
 	if _css_lexer_trans_actions[_trans] != 0
 	case _css_lexer_trans_actions[_trans]
 	when 29 then
-# line 249 "lib/oga/css/lexer.rl"
+# line 251 "lib/oga/css/lexer.rl"
 		begin
 te = p+1
  begin  add_token(:T_NTH)  end
 		end
 	when 3 then
-# line 251 "lib/oga/css/lexer.rl"
+# line 253 "lib/oga/css/lexer.rl"
 		begin
 te = p+1
  begin  add_token(:T_ODD)  end
 		end
 	when 2 then
-# line 252 "lib/oga/css/lexer.rl"
+# line 254 "lib/oga/css/lexer.rl"
 		begin
 te = p+1
  begin  add_token(:T_EVEN)  end
 		end
 	when 26 then
-# line 233 "lib/oga/css/lexer.rl"
+# line 235 "lib/oga/css/lexer.rl"
 		begin
 te = p+1
  begin 
@@ -403,7 +405,7 @@ te = p+1
          end
 		end
 	when 27 then
-# line 160 "lib/oga/css/lexer.rl"
+# line 162 "lib/oga/css/lexer.rl"
 		begin
 te = p+1
  begin 
@@ -411,18 +413,18 @@ te = p+1
          end
 		end
 	when 30 then
-# line 244 "lib/oga/css/lexer.rl"
+# line 246 "lib/oga/css/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 32 then
-# line 250 "lib/oga/css/lexer.rl"
+# line 252 "lib/oga/css/lexer.rl"
 		begin
 te = p
 p = p - 1; begin  add_token(:T_MINUS)  end
 		end
 	when 31 then
-# line 193 "lib/oga/css/lexer.rl"
+# line 195 "lib/oga/css/lexer.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -432,7 +434,7 @@ p = p - 1; begin
          end
 		end
 	when 33 then
-# line 160 "lib/oga/css/lexer.rl"
+# line 162 "lib/oga/css/lexer.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -456,43 +458,43 @@ end
 end 
 			end
 	when 34 then
-# line 290 "lib/oga/css/lexer.rl"
+# line 292 "lib/oga/css/lexer.rl"
 		begin
 te = p+1
  begin  add_token(:T_EQ)  end
 		end
 	when 8 then
-# line 291 "lib/oga/css/lexer.rl"
+# line 293 "lib/oga/css/lexer.rl"
 		begin
 te = p+1
  begin  add_token(:T_SPACE_IN)  end
 		end
 	when 6 then
-# line 292 "lib/oga/css/lexer.rl"
+# line 294 "lib/oga/css/lexer.rl"
 		begin
 te = p+1
  begin  add_token(:T_STARTS_WITH)  end
 		end
 	when 5 then
-# line 293 "lib/oga/css/lexer.rl"
+# line 295 "lib/oga/css/lexer.rl"
 		begin
 te = p+1
  begin  add_token(:T_ENDS_WITH)  end
 		end
 	when 38 then
-# line 294 "lib/oga/css/lexer.rl"
+# line 296 "lib/oga/css/lexer.rl"
 		begin
 te = p+1
  begin  add_token(:T_IN)  end
 		end
 	when 7 then
-# line 295 "lib/oga/css/lexer.rl"
+# line 297 "lib/oga/css/lexer.rl"
 		begin
 te = p+1
  begin  add_token(:T_HYPHEN_IN)  end
 		end
 	when 35 then
-# line 272 "lib/oga/css/lexer.rl"
+# line 274 "lib/oga/css/lexer.rl"
 		begin
 te = p+1
  begin 
@@ -502,7 +504,7 @@ te = p+1
          end
 		end
 	when 4 then
-# line 212 "lib/oga/css/lexer.rl"
+# line 214 "lib/oga/css/lexer.rl"
 		begin
 te = p+1
  begin 
@@ -510,12 +512,12 @@ te = p+1
          end
 		end
 	when 36 then
-# line 280 "lib/oga/css/lexer.rl"
+# line 282 "lib/oga/css/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 37 then
-# line 160 "lib/oga/css/lexer.rl"
+# line 162 "lib/oga/css/lexer.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -523,7 +525,7 @@ p = p - 1; begin
          end
 		end
 	when 14 then
-# line 266 "lib/oga/css/lexer.rl"
+# line 268 "lib/oga/css/lexer.rl"
 		begin
 te = p+1
  begin 
@@ -533,7 +535,7 @@ te = p+1
          end
 		end
 	when 15 then
-# line 145 "lib/oga/css/lexer.rl"
+# line 147 "lib/oga/css/lexer.rl"
 		begin
 te = p+1
  begin 
@@ -541,7 +543,7 @@ te = p+1
          end
 		end
 	when 12 then
-# line 227 "lib/oga/css/lexer.rl"
+# line 229 "lib/oga/css/lexer.rl"
 		begin
 te = p+1
  begin 
@@ -551,7 +553,7 @@ te = p+1
          end
 		end
 	when 13 then
-# line 160 "lib/oga/css/lexer.rl"
+# line 162 "lib/oga/css/lexer.rl"
 		begin
 te = p+1
  begin 
@@ -559,30 +561,30 @@ te = p+1
          end
 		end
 	when 11 then
-# line 315 "lib/oga/css/lexer.rl"
+# line 317 "lib/oga/css/lexer.rl"
 		begin
 te = p+1
 		end
 	when 22 then
-# line 304 "lib/oga/css/lexer.rl"
+# line 306 "lib/oga/css/lexer.rl"
 		begin
 te = p
 p = p - 1; begin  add_token(:T_GREATER)  end
 		end
 	when 19 then
-# line 305 "lib/oga/css/lexer.rl"
+# line 307 "lib/oga/css/lexer.rl"
 		begin
 te = p
 p = p - 1; begin  add_token(:T_PLUS)  end
 		end
 	when 24 then
-# line 306 "lib/oga/css/lexer.rl"
+# line 308 "lib/oga/css/lexer.rl"
 		begin
 te = p
 p = p - 1; begin  add_token(:T_TILDE)  end
 		end
 	when 17 then
-# line 149 "lib/oga/css/lexer.rl"
+# line 151 "lib/oga/css/lexer.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -590,7 +592,7 @@ p = p - 1; begin
          end
 		end
 	when 16 then
-# line 135 "lib/oga/css/lexer.rl"
+# line 137 "lib/oga/css/lexer.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -598,7 +600,7 @@ p = p - 1; begin
          end
 		end
 	when 23 then
-# line 160 "lib/oga/css/lexer.rl"
+# line 162 "lib/oga/css/lexer.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -606,26 +608,26 @@ p = p - 1; begin
          end
 		end
 	when 18 then
-# line 139 "lib/oga/css/lexer.rl"
+# line 141 "lib/oga/css/lexer.rl"
 		begin
  add_token(:T_HASH) 		end
-# line 302 "lib/oga/css/lexer.rl"
+# line 304 "lib/oga/css/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 20 then
-# line 140 "lib/oga/css/lexer.rl"
+# line 142 "lib/oga/css/lexer.rl"
 		begin
  add_token(:T_DOT) 		end
-# line 302 "lib/oga/css/lexer.rl"
+# line 304 "lib/oga/css/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 21 then
-# line 141 "lib/oga/css/lexer.rl"
+# line 143 "lib/oga/css/lexer.rl"
 		begin
  add_token(:T_COLON) 		end
-# line 302 "lib/oga/css/lexer.rl"
+# line 304 "lib/oga/css/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
@@ -634,10 +636,10 @@ p = p - 1;		end
 		begin
 te = p+1
 		end
-# line 250 "lib/oga/css/lexer.rl"
+# line 252 "lib/oga/css/lexer.rl"
 		begin
 act = 3;		end
-# line 641 "lib/oga/css/lexer.rb"
+# line 643 "lib/oga/css/lexer.rb"
 	end
 	end
 	end
@@ -655,7 +657,7 @@ ts = nil;		end
 		begin
 act = 0
 		end
-# line 659 "lib/oga/css/lexer.rb"
+# line 661 "lib/oga/css/lexer.rb"
 	end
 
 	if cs == 0
@@ -684,7 +686,7 @@ act = 0
 end
 	end
 
-# line 81 "lib/oga/css/lexer.rl"
+# line 83 "lib/oga/css/lexer.rl"
 
         # % fix highlight
       ensure
@@ -735,7 +737,7 @@ end
       end
 
       
-# line 317 "lib/oga/css/lexer.rl"
+# line 319 "lib/oga/css/lexer.rl"
 
     end # Lexer
   end # CSS