general 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f610cd0c2d52fe794bdfe47dce873c4aa170818e
-  data.tar.gz: 8233a86e36c631edf9d030e7017c7177781013a2
+  metadata.gz: fe5d95a7df6e150f1f8e069f32441cd431ce67a7
+  data.tar.gz: 6b03033b692bcb99b057f840e85d1be6769d9d84
 SHA512:
-  metadata.gz: e283ae5ffec30b14e89410034c1aef4a7a902563db1459d26cccfafbc9cf244aa99610891afb859e1cfad22e2e4e7b48f36ebb0414574ce5cdb98b242eca9d89
-  data.tar.gz: dcb1a5a856a29e2acbb3dee59490d54b6d88bcfb346089129926ba7b9b19ab59506fb2763aaefb5d5cf4bf2b528196f1a754e9a6e56957fd36dbdc228f64916c
+  metadata.gz: 5538c80236bd37ec2b593a40bb91ae9bce7ddc7e884c1c90320ce3fcf2859a9bd40a282ce6d64d886727e7d81a42ca4dc45304d2559836da8c9b9b1eb0ab1c3c
+  data.tar.gz: 50a026344b8aaca7df99dbfbb4527499aa0f40a6395746a081da43a7675e915f5ba96470d71d9d81049a5afdb98999eb641eee41c06d29abf0bae7b867184d19

data/lib/gprepartials/gpretext.rb

@@ -28,6 +28,6 @@ module General
 	# Created: 1 - 30 - 2017
 	class GPretext < GPrePartial
 		# Regular expression matches GPretext
-		REGEX = /\A(?<text>.+?)(?=@@|\z)/m
+		REGEX = /\A(?<text>.+?)(?=(@@|\z))/m
 	end
 end

data/lib/gprepartials/gyield.rb

@@ -28,6 +28,6 @@ module General
 	# Created: 1 - 30 - 2017
 	class GYield < GPrePartial
 		# Regular expression matches GYield
-		REGEX = /\A@@yield\r?\n/
+		REGEX = /\A@@yield((\r?\n)|\z)/
 	end
 end

data/lib/gtemplates/gmeta.rb

@@ -61,7 +61,7 @@ module General
 			end
 
 			# Find an extend
-			extindex = preparts.index{ |prepart| prepart.is_a? General::GExtend }
+			extindex = preparts.index { |prepart| prepart.is_a? General::GExtend }
 
 			# Run extend algorithm (throw error if extend is found elsewhere)
 			if extindex == 0

data/lib/test.rb

@@ -0,0 +1,5 @@
+require_relative "general"
+
+general = General::GIO.load "source.general"
+puts
+puts general.instance_variable_get(:@partials).collect(&:inspect)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: general
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Anshul Kharbanda
@@ -25,8 +25,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.4'
 description: General is a simple templating system in ruby that allows you to create
-  templates from bothpure strings and files (with the extension .general), as well
-  as create new strings and fileswith these created objects. For more information,
+  templates from both pure strings and files (with the extension .general), as well
+  as create new strings and files with these created objects. For more information,
   visit the homepage
 email: akanshul97@gmail.com
 executables: []
@@ -84,6 +84,7 @@ files:
 - lib/gtemplates/gmeta.rb
 - lib/gtemplates/gtemplate.rb
 - lib/gtemplates/gtimeformat.rb
+- lib/test.rb
 - spec/gdothash_spec.rb
 - spec/goperations_spec.rb
 - spec/gpartial_garrayplaceholder_spec.rb