rbexy 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de2d3389ec5f783be2e913921071bc0920baa342980360445e5756a8d6cd2d72
-  data.tar.gz: 7dfdd99aa0852253e491889010f87c5a2ca828a57b16fe8749d9231135c785a2
+  metadata.gz: ffe916002997f23b1aab2e81aaf94cf8bab0083d8e47bd72eee204d8058a871f
+  data.tar.gz: fb54d1d98b6272c716059b4dcde6bafdc02baaf1025e79bdf2590a6ebdef148d
 SHA512:
-  metadata.gz: a6e669a7babe4bb38c7a31be00c0a98d1035c1c7fec980b713a4bb17a2ba461c127745a7b7fee50f6419830eb7e26bf505243662c08245973fac4a3c0ce20dd4
-  data.tar.gz: 91c71f51bd42958d86a5584a85a0a634fb35306e95e4a022bc82508c2d5d7cb05df901197d276a870bbcab19b6d1d632a0de4a43518d39f2dd9b00b08559f316
+  metadata.gz: 0c6590b2796a338efdef40dd2c6fe21b324c8397f8d79e3f4b2535a1d2ae522942b41cecc71d753e98c4df1beb88731c104fd742d1a5adfe903c8b9701a8a031
+  data.tar.gz: a182b48b4cd539e96d502ea4579bac7c8204bf0e1a840d8b62f931b63ddc682d45afb01d50aa3d6140dfd1d7d9b4f70ca631b48f8861d813a1dd1fd70fd973eb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbexy (0.1.0)
+    rbexy (0.1.2)
       actionview (>= 5.0, < 7.0)
       activesupport (>= 5.0, < 7.0)
       railties (>= 5.0, < 7.0)

data/lib/rbexy/lexer.rb

@@ -115,7 +115,7 @@ module Rbexy
             expression_inner_single_quote
           elsif scanner.scan(Patterns.open_tag_def)
             potential_expression_inner_tag
-          elsif scanner.scan(Patterns.expression_content)
+          elsif expression_content?
             self.curr_expr += scanner.matched
           else
             raise SyntaxError, self
@@ -132,7 +132,7 @@ module Rbexy
             expression_inner_single_quote
           elsif scanner.scan(Patterns.open_tag_def)
             potential_expression_inner_tag
-          elsif scanner.scan(Patterns.expression_content)
+          elsif expression_content?
             self.curr_expr += scanner.matched
           else
             raise SyntaxError, self
@@ -237,6 +237,7 @@ module Rbexy
     end
 
     def potential_expression_inner_tag
+      # binding.pry
       if self.curr_expr =~ Patterns.expression_internal_tag_prefixes
         tokens << [:EXPRESSION_BODY, curr_expr]
         self.curr_expr = ""
@@ -275,5 +276,16 @@ module Rbexy
       self.curr_expr += scanner.getch
       stack.pop unless curr_expr.end_with?('\\')
     end
+
+    def expression_content?
+      # Patterns.expression_content ends at `<` characters, because we need to
+      # separately scan for allowed open_tag_defs within expressions. We should
+      # support any found open_tag_ends as expression content, as that means the
+      # open_tag_def was not considered allowed (or stack would be inside
+      # :tag_def instead of :expression) so we should thus also consider the
+      # open_tag_end to just be a part of the expression (maybe its in a string,
+      # etc).
+      scanner.scan(Patterns.expression_content) || scanner.scan(Patterns.open_tag_end)
+    end
   end
 end

data/lib/rbexy/version.rb

@@ -1,3 +1,3 @@
 module Rbexy
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbexy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nick Giancola
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport