hiroiyomi 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c40131f96944ffda2afcaf2c4a413e6719ab6997e0e0041420bb98abaf1954c
-  data.tar.gz: 7c20258c54e60515b3a32f9ff4faa15f52a14e0017cd0f2d3a15ab41c030c6c7
+  metadata.gz: '093ee4e6312f8b8ef777c12c4f2473d702df03b0779e701b5887ecdf32476317'
+  data.tar.gz: 7be8f26a39596b98a2c6c4852a5deff92745bdd12f88f914c900ae413aac8af1
 SHA512:
-  metadata.gz: adce8140b2ab4867340977c82dd6980212b0cd258f21d65be1394a17384982d39bd1a4a592fb0ead9cb95d5b4c3919a6bc6e6bf4ab592759aa450a0df1b5bc19
-  data.tar.gz: d4f40e1010658f0caffb481ae75bb53169e9bec4afe5e2e2b923ed749345d0e1351625c324e60a046f6382094fba1c8687e019db7ee06d2834210dcabafabf3b
+  metadata.gz: 86844f324ff5f2cb7f52559d83d994f51c8fc2ee14594d6d2ae51a1f99c9145588cc8a946d911209c035dec0b660df9de5f3c8200ea908aa90423ebf064f5f82
+  data.tar.gz: 10683cf58337624c22a5fbe455ec5048aeff9126e90a968ed5be211aa13570fbdb464c5f7133df9ea1b828d282b119fc8bbaf1c19cb2a2c0c1738c80ca137106

data/lib/hiroiyomi/html/attribute.rb

@@ -18,6 +18,7 @@ module Hiroiyomi
 
         private
 
+        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
         # name=value
         #   Check spaces and > whether value is end
         # name="value"
@@ -53,6 +54,7 @@ module Hiroiyomi
           end
           value
         end
+        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
       end
 
       def initialize(name, value = nil)

data/lib/hiroiyomi/html/dom_parser_helper.rb

@@ -5,8 +5,8 @@ module Hiroiyomi
     # DOMParserHelper
     class DOMParserHelper
       class << self
-        def cur_pos(file, c)
-          file.ungetc(c) # In order to get current position correctly
+        def cur_pos(file, char)
+          file.ungetc(char) # In order to get current position correctly
           cur_pos = file.pos
           file.getc # drop <
           cur_pos
@@ -21,6 +21,7 @@ module Hiroiyomi
           end
         end
 
+        # rubocop:disable Metrics/MethodLength
         # string of <.+ or ".+"
         def extract_string(file)
           skip_ignore_chars(file)
@@ -36,7 +37,9 @@ module Hiroiyomi
           end
           string.gsub(/[\t\r\n]/, '').strip
         end
+        # rubocop:enable Metrics/MethodLength
 
+        # rubocop:disable Metrics/MethodLength
         def extract_text_with_symbols(file, char_before_last_char = ']', last_char = '>')
           string = ''
           while (c = file.getc)
@@ -50,17 +53,22 @@ module Hiroiyomi
           end
           string
         end
+        # rubocop:enable Metrics/MethodLength
 
-        # after <!
-        def extract_bang_text(file)
+        # after <![
+        def extract_cddata(file)
           cur_pos = file.pos
-          case (c = file.getc)
-          when '[' # CDDATA
-            return "#{c}#{extract_text_with_symbols(file, ']')}"
-          when '-' # Comment
-            extract_text_with_symbols(file, '-')
-            return '' # Drop comments
-          end
+          c = file.getc
+          return "#{c}#{extract_text_with_symbols(file, ']')}" if c == '[' # CDDATA
+          file.pos = cur_pos
+          nil
+        end
+
+        # after <!-
+        def extract_comments(file)
+          cur_pos = file.pos
+          c = file.getc
+          return "#{c}#{extract_text_with_symbols(file, '-')}" if c == '-' # Comment
           file.pos = cur_pos
           nil
         end

data/lib/hiroiyomi/html/element.rb

@@ -6,6 +6,7 @@ require 'hiroiyomi/html/text'
 
 module Hiroiyomi
   module Html
+    # rubocop:disable Metrics/ClassLength
     # Element
     class Element
       include Enumerable
@@ -16,6 +17,7 @@ module Hiroiyomi
       class << self
         EXCEPTIONAL_ELEMENT_NAME_LIST = %w[script style].freeze
 
+        # rubocop:disable Metrics/MethodLength
         def value_of(file, parent_element = nil)
           # name
           name = extract_element_name(file)
@@ -44,14 +46,16 @@ module Hiroiyomi
           Text.add_text_to_element_or_parse(file, element)
 
           # close check. move element children to parent element if not closed. e.g. <img ...>
-          element.move_children_to(parent_element) unless validate_closing_element?(element, file)
+          element.move_children_to(parent_element) unless validate_closing_element?(file, element)
 
           parent_element
         end
+        # rubocop:enable Metrics/MethodLength
 
         private
 
-        def validate_closing_element?(element, file)
+        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+        def validate_closing_element?(file, element)
           open = false
 
           while (c = file.getc)
@@ -77,6 +81,7 @@ module Hiroiyomi
               file.pos = cur_pos
               return false
             elsif c == '<' # case of </
+              Text.add_text_to_element_or_parse(file, element)
               open = true
             elsif open
               file.ungetc(c)
@@ -85,8 +90,10 @@ module Hiroiyomi
           end
           false
         end
+        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
 
-        # Start from > after attributes
+        # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        # For script, style. First char must be > after attributes
         def extract_exceptional_element_text(file, name)
           DOMParserHelper.skip_ignore_chars(file)
           file.getc # drop >
@@ -106,17 +113,23 @@ module Hiroiyomi
           return Text.new(string) unless string.empty?
           nil
         end
+        # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+
+        def skip_comments(file)
+          cur_pos = file.pos
+          if file.getc == '!'
+            # Skip like <!document html>, <!--
+            DOMParserHelper.extract_comments(file)
+            return true
+          end
+          file.pos = cur_pos
+          false
+        end
 
         def extract_element_name(file)
           while (c = file.getc)
             next unless c == '<'
-            cur_pos = file.pos
-            if file.getc == '!'
-              # Skip like <!document html>, <!--
-              DOMParserHelper.extract_bang_text(file)
-              next
-            end
-            file.pos = cur_pos
+            next if skip_comments(file)
             return DOMParserHelper.extract_string(file)
           end
           ''
@@ -184,5 +197,6 @@ module Hiroiyomi
         "<#{name}#{attrs}>#{inner_html}</#{name}>"
       end
     end
+    # rubocop:enable Metrics/ClassLength
   end
 end

data/lib/hiroiyomi/html/text.rb

@@ -11,6 +11,8 @@ module Hiroiyomi
       attr_accessor :value
 
       class << self
+        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+
         # Start from > after attributes
         def add_text_to_element_or_parse(file, element)
           close = false
@@ -44,14 +46,19 @@ module Hiroiyomi
             when '<'
               cur_pos = DOMParserHelper.cur_pos(file, c)
               next_c = file.getc
+              # rubocop:disable Metrics/BlockNesting
               if next_c == '!'
-                bang_string = DOMParserHelper.extract_bang_text(file)
-                unless bang_string.nil?
-                  # empty if comment
-                  add_text_to_element.call "#{c}#{next_c}#{bang_string}" unless bang_string.empty?
+                cddata = DOMParserHelper.extract_cddata(file)
+                unless cddata.nil?
+                  add_text_to_element.call "#{c}#{next_c}#{cddata}" unless cddata.empty?
                   next
                 end
+                # Drop comment
+                comment = DOMParserHelper.extract_comments(file)
+                next unless comment.nil?
               end
+              # rubocop:enable Metrics/BlockNesting
+
               file.pos = cur_pos
 
               add_text_to_element.call
@@ -71,6 +78,7 @@ module Hiroiyomi
           element
         end
       end
+      # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
 
       def initialize(value)
         @value = value

data/lib/hiroiyomi/version.rb

@@ -2,5 +2,5 @@
 
 # Hiroiyomi
 module Hiroiyomi
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiroiyomi
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Tomonori Murakami