html-conditional-comment 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97464ae2f23046328299365a0878be4c2bf866b0
-  data.tar.gz: b880bdd1eec80c11a7dd857b2da142b3fea68e2c
+  metadata.gz: 6eb0c6ec8e092042adb1eafc23fc9ab72545cd73
+  data.tar.gz: 34c5fb07c9da858757ae6c4779783836027a0c38
 SHA512:
-  metadata.gz: 0f47fb2ed347cd31dd7ebcc1757354a87297dc2798e71190412fc7da2f9af085295d952bf7cbc70fe37a6498fc23686bc03080d7cf2dc33d9083b57e555d8ba8
-  data.tar.gz: 5893de286574f16909c83a85829bcb87fad5765005957798a92dd8e143cdaf5a9be5d7ea84e9fde20757e7e785caf0767f7d220353410727268a6e8a47b3f591
+  metadata.gz: 7936397b2ad5346ef1ee50ea656535330e30984a896568819c98a38edc0a7660f36d7c3e1cb51eb876db1635cd6d2052f61a35459b5684b6da89a721948f4088
+  data.tar.gz: c89ac16b04a87d9361367c2cfb8ef2dd5cdbfdb0092a672a802ee9676779dc8a41fc707afe198f746c1aec9342da468daf7b0a35575f84a3cbac58c9610af288

data/lib/html-conditional-comment/lexer.rb

@@ -1,7 +1,7 @@
 module HtmlConditionalComment
   class TokenError < StandardError
     def initialize(rest)
-      super("Invalid token \"#{rest.slice(0, 25)}\"")
+      super("Invalid token \"#{rest.to_s.slice(0, 25)}\"")
     end
   end
 
@@ -24,9 +24,10 @@ module HtmlConditionalComment
     IF_STATEMENT = /if/i
     ENDIF_STATEMENT = /endif/i
     #Opening statement plus positive look ahead to avoid conflicts with other
-    #comments
-    OPEN = /<!(\-\-)?\s*\[(?=(end)?if)/
-    CLOSE = /\]\s*(\-\-)?>/
+    #comments, could also have additional comments before "if"
+    OPEN = /<!(\-\-)?[^>]*?\[(?=(end)?if)/
+    #Closing statement with additional comments after "endif"
+    CLOSE = /\].*?(\-\-)?>/
     WHITE_SPACE = /\s+/
     FEATURE = /[a-z]+/i
     VERSION_VECTOR = /\d+(\.[\d]+)?/

data/lib/html-conditional-comment/parser.rb

@@ -1,7 +1,7 @@
 module HtmlConditionalComment
   class ParseError < StandardError
     def initialize(msg, example)
-      super("#{msg} at \"#{example.slice(0, 25)}\"")
+      super("#{msg} at \"#{example.to_s.slice(0, 25)}\"")
     end
   end
 
@@ -22,6 +22,9 @@ module HtmlConditionalComment
   #browser = feature [ version_vector ]
   #
   class Parser
+    OPEN = /\-\->$/
+    CLOSE = /<!\-\-$/
+
     def initialize(tokens)
       @symbol = nil
       @tokens = tokens
@@ -153,13 +156,23 @@ protected
       expect(:open)
       expect(:if)
       node.left = expression()
+
+      #TODO Goofy confirmation of non-closing HTML comment
+      if current(:close)
+        error() if @value =~ OPEN
+      end
       expect(:close)
 
       unless current(:open) && peek(:endif)
         node.right = template()
       end
 
+      #TODO More goofyness
+      if current(:open)
+        error() if @value =~ CLOSE
+      end
       expect(:open)
+
       expect(:endif)
       expect(:close)
 

data/lib/html-conditional-comment/version.rb

@@ -1,3 +1,3 @@
 module HtmlConditionalComment
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html-conditional-comment
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Carson Reinke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-21 00:00:00.000000000 Z
+date: 2017-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler