bade 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f928ce45234b7edbf5fa3c8e3531688c8bf4bc11
-  data.tar.gz: 532eac47aa229d5a4b9a2d16740eef9f0e5e38d7
+  metadata.gz: ed7e7245f8cbc2101c82381279d924b8207f708d
+  data.tar.gz: f7cdf22720b27a64cf05cb3888960a0f1c309fea
 SHA512:
-  metadata.gz: 6a879c59dc4422f94d3190028a0636a0dd643b5af8f5172f0f0bfd119533015f706b55dafcb37bad13a6eb440c92ff7fda243641013d13b9ce6bb9ffc181d28f
-  data.tar.gz: 6949c8a7edfe07c552a4bc169d6b4dcfc439b8502fcf84dc839eb2248fc95916c9cfee8f897fc690f8c2e3931114f0efc4d6c01fa9979008927f8c6f9aa21239
+  metadata.gz: 5a953b1e7336bd05a52d1bf1b8a5ce8310128ac173639a0ef0f4c8b9c55104885a5d924f1aacf14ae79f63af3497e6f5ae7eb0b499e047e9f5f5e1e49aaf8195
+  data.tar.gz: 6516a22a30ba0c11655afb34217494cf69d5b28c6bcbd6354c9c8ce502a5391cd0b8de12df3a4f00f53cf6cbeebc2678ad005781ff71ecba19cec0ff011f69a0

data/lib/bade/parser/parser_ruby_code.rb

@@ -24,8 +24,9 @@ module Bade
                  /\A\s*[#{Regexp.escape outer_delimiters.to_s}]/
                end
       delimiters = []
+      string_start_quote_char = nil
 
-      until @line.empty? || (delimiters.count == 0 && @line =~ end_re)
+      until @line.empty? || (delimiters.empty? && @line =~ end_re)
         char = @line[0]
 
         # backslash escaped delimiter
@@ -39,9 +40,15 @@ module Bade
           if RUBY_NOT_NESTABLE_DELIMITERS.include?(char) && delimiters.last == char
             # end char of not nestable delimiter
             delimiters.pop
+            string_start_quote_char = nil
           else
-            # diving
-            delimiters << char
+            # diving into nestable delimiters
+            delimiters << char if string_start_quote_char.nil?
+
+            # mark start char of the not nestable delimiters, for example strings
+            if RUBY_NOT_NESTABLE_DELIMITERS.include?(char) && string_start_quote_char.nil?
+              string_start_quote_char = char
+            end
           end
 
         when RUBY_END_DELIMITERS_RE

data/lib/bade/renderer.rb

@@ -9,7 +9,7 @@ require_relative 'precompiled'
 
 module Bade
   class Renderer
-    class LoadError < ::LoadError
+    class LoadError < ::RuntimeError
       # @return [String]
       #
       attr_reader :loading_path
@@ -210,9 +210,11 @@ module Bade
     # @return [Bade::AST::Document]
     #
     def _parsed_document(content, file_path)
-      content = if file_path.nil? && content.nil?
-                  raise LoadError.new(nil, file_path, "Don't know what to do with nil values for both content and path")
-                elsif !file_path.nil? && content.nil?
+      if file_path.nil? && content.nil?
+        raise LoadError.new(nil, file_path, "Don't know what to do with nil values for both content and path")
+      end
+
+      content = if !file_path.nil? && content.nil?
                   File.read(file_path)
                 else
                   content

data/lib/bade/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bade
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.2.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bade
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Roman Kříž
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2016-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Minimalistic template engine for Ruby.