general 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7116b5cf6208b7332acd88c3f5f2d9a5fc7e3029
-  data.tar.gz: 7dcc9fc52866b7f27f176055fd4ffab9d6734dbf
+  metadata.gz: f3811fd53824c1198a6fda65a7cdcef373f25385
+  data.tar.gz: b74c9fffde42b92ec0ca6ca768689109852382e5
 SHA512:
-  metadata.gz: 1c17be95ef162c2ef46d3e2b5ee5b6106261cab92073ce5e3d9cd9600e141b06586ca70500b5039c0f8273cf3373af77af864d843c3686e3011fc18a32bc5990
-  data.tar.gz: f0de9474c076cbf105cd29546346292efcb8f5bfc9e86661500edbda853e295d1606d0291b8b98aabfc8486aaeb3016b0ba09cdd4886703debc656ff870ec6a4
+  metadata.gz: aa543b2e2d7ed4be03377a05609cccc99f384de309131e6fabe29ade150d3ee34780eea61d9f043c03b1ef67ff44471c83c41821fdadc2cff5921a6102ae1cbc
+  data.tar.gz: d904d520a54b247ad76935d8f4330b90de91c76f3833a44ded9f7fdec1c6b3fd71b70e48541a42bbaa2e8201155ff1075502578d527df2dc708e4d841e035d0b

data/lib/gpartials/gtext.rb

@@ -27,7 +27,7 @@ module General
 	# Created: 7 - 1 - 2016
 	class GText < GPartial
 		# Regular expression that matches text partials
-		REGEX = /\A[^@]+?(?=(@|\\@|\z))/m
+		REGEX = /\A[^@]+?(?=(@|\z))/m
 
 		# The partial name of a text
 		PTNAME = :__text

data/lib/gtemplates/gbasetemplate.rb

@@ -44,7 +44,7 @@ module General
 				partial = partials.find { |partial| m = partial::REGEX.match(string) }
 
 				# Raise error if no matching partial can be found
-				raise GError.new("Unmatched partial at #{(string.length <= 5 ? string : string[0..5] + "...").inspect}") if partial.nil?
+				raise GError.new("Unmatched character at #{(string.length <= 5 ? string : string[0..5] + "...").inspect}") if partial.nil?
 				
 				# Add the partial to the array
 				@partials << partial.new(m, @defaults)

data/lib/gtemplates/gio.rb

@@ -113,7 +113,11 @@ module General
 			Dir.chdir cwd
 
 			# Return new GIO
-			return self.new text, path
+			begin
+				return self.new text, path
+			rescue GError => e
+				raise GError.new "Error when parsing template file #{path}"
+			end
 		end
 
 		# Creates a GIO with the given template string and source filename

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: general
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Anshul Kharbanda