gammo 0.2.0 → 0.3.0

data/lib/gammo/tokenizer.rb

@@ -62,7 +62,7 @@ module Gammo
         if pos < (scanner.pos - 2)
           scanner.pos -= 2
           buffer = buffer.slice(0, buffer.length - 2)
-          return text_token(buffer)
+          return character_token(buffer)
         end
         case byte
         when %r{[a-zA-Z]}
@@ -71,7 +71,7 @@ module Gammo
         when ?!           then return scan_markup_declaration
         when ??           then return comment_token(?? + scan_until_close_angle)
         when ?/
-          return text_token(buffer) if scanner.eos?
+          return character_token(buffer) if scanner.eos?
           # "</>" does not generate a token at all. treat this as empty comment token.
           return comment_token('') if scan(/>/)
           # Expects chars like "</a"
@@ -89,7 +89,7 @@ module Gammo
           next
         end
       end
-      return text_token(buffer) if pos < scanner.pos
+      return character_token(buffer) if pos < scanner.pos
       EOS
     end
 
@@ -106,7 +106,7 @@ module Gammo
           scan_raw_or_rcdata
         else
           @raw = true
-          text_token(scan_until(/\z/) || '')
+          character_token(scan_until(/\z/) || '')
         end
       if token && scanner.pos > pos
         @convert_null      = true
@@ -145,11 +145,11 @@ module Gammo
       end
       @raw = raw_tag != 'textarea' && raw_tag != 'title'
       @raw_tag = ''
-      text_token(buffer) unless buffer.empty?
+      character_token(buffer) unless buffer.empty?
     end
 
     def scan_script
-      text_token(ScriptScanner.new(scanner, raw_tag: raw_tag).scan)
+      character_token(ScriptScanner.new(scanner, raw_tag: raw_tag).scan)
     end
 
     def scan_start_tag
@@ -325,7 +325,7 @@ module Gammo
       buffer = ''
       loop do
         byte = scanner.get_byte
-        return text_token(buffer) unless byte
+        return character_token(buffer) unless byte
         buffer << byte
         case byte
         when ?]
@@ -340,7 +340,7 @@ module Gammo
           brackets = 0
         end
       end
-      text_token(buffer)
+      character_token(buffer)
     end
 
     RAW_TAGS = ['iframe', 'noembed', 'noframes', 'noscript', 'plaintext', 'script', 'style', 'textarea', 'title', 'xmp'].freeze
@@ -350,8 +350,8 @@ module Gammo
       RAW_TAGS.include?(name)
     end
 
-    def text_token(text)
-      TextToken.new(text, raw: raw, convert_null: convert_null)
+    def character_token(text)
+      CharacterToken.new(text, raw: raw, convert_null: convert_null)
     end
 
     def error_token(pos)

data/lib/gammo/version.rb

@@ -1,3 +1,3 @@
 module Gammo
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/gammo/xpath/ast/axis.rb

@@ -1,5 +1,5 @@
 require 'gammo/xpath/node_set'
-require 'gammo/xpath/ast/subclassify'
+require 'gammo/modules/subclassify'
 require 'gammo/tags'
 
 module Gammo

data/lib/gammo/xpath/ast/expression.rb

@@ -1,3 +1,4 @@
+require 'set'
 require 'gammo/xpath/ast/value'
 
 module Gammo
@@ -62,6 +63,7 @@ module Gammo
                 return true if compare(context, ls, string_from_node(rnode))
               end
             end
+            return false
           end
           if value.number?
             node_set.each do |node|

data/lib/gammo/xpath/ast/function.rb

@@ -1,4 +1,4 @@
-require 'gammo/xpath/ast/subclassify'
+require 'gammo/modules/subclassify'
 require 'gammo/xpath/ast/value'
 
 module Gammo

data/lib/gammo/xpath/ast/node_test.rb

@@ -1,4 +1,4 @@
-require 'gammo/xpath/ast/subclassify'
+require 'gammo/modules/subclassify'
 require 'gammo/xpath/errors'
 
 module Gammo

data/lib/gammo/xpath/ast/path.rb

@@ -1,3 +1,4 @@
+require 'set'
 require 'gammo/xpath/node_set'
 
 module Gammo

data/lib/gammo/xpath.rb

@@ -24,7 +24,7 @@ module Gammo
       # @param [String] expr
       # @param [Integer] result_type
       # @!visibility private
-      def initialize(expr:, result_type:)
+      def initialize(expr, result_type)
         @expr = expr
         @result_type = result_type
       end
@@ -65,10 +65,9 @@ module Gammo
     # @param [Gammo::Node] context_node
     # @return [String, Integer, TrueClass, FalseClass, Gammo::XPath::NodeSet]
     def xpath(expr, variables: {}, result_type: UNORDERED_NODE_ITERATOR_TYPE, context_node: self)
-      Traverser.new(
-        expr: expr,
-        result_type: result_type,
-      ).evaluate(Context.new(node: context_node, variables: variables))
+      Traverser.new(expr, result_type).evaluate(
+        Context.new(node: context_node, variables: variables)
+      )
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gammo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - namusyaka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-15 00:00:00.000000000 Z
+date: 2021-10-24 00:00:00.000000000 Z
 dependencies: []
 description: Gammo is an implementation of the HTML5 parsing algorithm which conforms
   the WHATWG specification with pure Ruby.
@@ -18,8 +18,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -29,7 +29,21 @@ files:
 - lib/gammo.rb
 - lib/gammo/attribute.rb
 - lib/gammo/attributes.rb
+- lib/gammo/css_selector.rb
+- lib/gammo/css_selector/ast/combinator.rb
+- lib/gammo/css_selector/ast/selector.rb
+- lib/gammo/css_selector/ast/selector/attrib_selector.rb
+- lib/gammo/css_selector/ast/selector/class_selector.rb
+- lib/gammo/css_selector/ast/selector/id_selector.rb
+- lib/gammo/css_selector/ast/selector/negation.rb
+- lib/gammo/css_selector/ast/selector/pseudo_class.rb
+- lib/gammo/css_selector/context.rb
+- lib/gammo/css_selector/errors.rb
+- lib/gammo/css_selector/node_set.rb
+- lib/gammo/css_selector/parser.rb
+- lib/gammo/css_selector/parser.y
 - lib/gammo/fragment_parser.rb
+- lib/gammo/modules/subclassify.rb
 - lib/gammo/node.rb
 - lib/gammo/parser.rb
 - lib/gammo/parser/constants.rb
@@ -74,7 +88,6 @@ files:
 - lib/gammo/xpath/ast/function.rb
 - lib/gammo/xpath/ast/node_test.rb
 - lib/gammo/xpath/ast/path.rb
-- lib/gammo/xpath/ast/subclassify.rb
 - lib/gammo/xpath/ast/value.rb
 - lib/gammo/xpath/context.rb
 - lib/gammo/xpath/errors.rb

data/.travis.yml

@@ -1,6 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.7.0
-before_install: gem install bundler -v 2.1.2

data/lib/gammo/xpath/ast/subclassify.rb

@@ -1,35 +0,0 @@
-require 'gammo/xpath/errors'
-
-module Gammo
-  module XPath
-    module AST
-      # Class for making subclass declarable/fetchable
-      # @!visibility private
-      module Subclassify
-        # @!visibility private
-        def map
-          @map ||= {}
-        end
-
-        # @!visibility private
-        def declare(key)
-          look_for_superclass.map[key] = self
-        end
-
-        # @!visibility private
-        def fetch(key)
-          fail NotFoundError, "%s not found" % key unless klass = map[key.to_sym]
-          klass
-        end
-
-        private
-
-        # @!visibility private
-        def look_for_superclass
-          klass = superclass
-          ancestors.find { |ancestor| ancestor == klass }
-        end
-      end
-    end
-  end
-end