general 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3811fd53824c1198a6fda65a7cdcef373f25385
-  data.tar.gz: b74c9fffde42b92ec0ca6ca768689109852382e5
+  metadata.gz: f610cd0c2d52fe794bdfe47dce873c4aa170818e
+  data.tar.gz: 8233a86e36c631edf9d030e7017c7177781013a2
 SHA512:
-  metadata.gz: aa543b2e2d7ed4be03377a05609cccc99f384de309131e6fabe29ade150d3ee34780eea61d9f043c03b1ef67ff44471c83c41821fdadc2cff5921a6102ae1cbc
-  data.tar.gz: d904d520a54b247ad76935d8f4330b90de91c76f3833a44ded9f7fdec1c6b3fd71b70e48541a42bbaa2e8201155ff1075502578d527df2dc708e4d841e035d0b
+  metadata.gz: e283ae5ffec30b14e89410034c1aef4a7a902563db1459d26cccfafbc9cf244aa99610891afb859e1cfad22e2e4e7b48f36ebb0414574ce5cdb98b242eca9d89
+  data.tar.gz: dcb1a5a856a29e2acbb3dee59490d54b6d88bcfb346089129926ba7b9b19ab59506fb2763aaefb5d5cf4bf2b528196f1a754e9a6e56957fd36dbdc228f64916c

data/exp/expected/applied4.txt

@@ -0,0 +1,3 @@
+There once was a bloke named Joe, who hated Joe's Schmoes. He didn't go to Kentucky.
+
+Joe drove to the store to get some Joe's Schmoes.

data/exp/expected/applied5.txt

@@ -0,0 +1,11 @@
+General Super Layout
+
+Open
+
+Sublayout
+
+Joe drove to the department store.
+
+End of Sublayout
+
+Close

data/exp/expected/default4.txt

@@ -0,0 +1,3 @@
+There once was a bloke named Richard Hammond, who hated beets. He didn't go to Virginia.
+
+Richard Hammond drove to the store to get some beets.

data/exp/expected/default5.txt

@@ -0,0 +1,11 @@
+General Super Layout
+
+Open
+
+Sublayout
+
+Mark Zuckerberg drove to the department store.
+
+End of Sublayout
+
+Close

data/exp/out/sample4.txt

@@ -0,0 +1,3 @@
+There once was a bloke named Joe, who hated Joe's Schmoes. He didn't go to Kentucky.
+
+Joe drove to the store to get some Joe's Schmoes.

data/exp/out/sample5.txt

@@ -0,0 +1,11 @@
+General Super Layout
+
+Open
+
+Sublayout
+
+Joe drove to the department store.
+
+End of Sublayout
+
+Close

data/exp/templates/sample0a.general

@@ -0,0 +1,7 @@
+@@extend sample0
+
+Sublayout
+
+@@yield
+
+End of Sublayout

data/exp/templates/sample4.general

@@ -0,0 +1,3 @@
+@@include sub/sample_base
+
+@(name -> capitalize all) drove to the store to get some @(food).

data/exp/templates/sample5.general

@@ -0,0 +1,3 @@
+@@extend sample0a
+
+@(name: mark zuckerberg -> capitalize all) drove to the department store.

data/exp/templates/sub/sample_base.general

@@ -0,0 +1 @@
+There once was a bloke named @(name: richard hammond -> capitalize all), who hated @(food: beets). He didn't go to @(place -> capitalize).

data/lib/gprepartials/gextend.rb

@@ -29,7 +29,7 @@ module General
 	# Created: 1 - 30 - 2017
 	class GExtend < GPrePartial
 		# Regular expression matches GExtend
-		REGEX = /\A@@extend\s+(?<filename>\w+)\r?\n/
+		REGEX = /\A@@extend\s+(?<filename>\w+(\/\w+)*?)(\r?\n)+/
 
 		# Read filename
 		attr :filename

data/lib/gprepartials/ginclude.rb

@@ -29,7 +29,7 @@ module General
 	# Created: 1 - 30 - 2017
 	class GInclude < GPrePartial
 		# Regular expression matches GInclude
-		REGEX = /\A@@include\s+(?<filename>\w+)\r?\n/
+		REGEX = /\A@@include\s+(?<filename>\w+(\/\w+)*?)\r?\n/
 
 		# Creates a new GInclude
 		#

data/lib/gtemplates/gmeta.rb

@@ -26,9 +26,9 @@ module General
 	# Author: Anshul Kharbanda
 	# Created: 1 - 31 - 2016
 	class GMeta < GTemplate
-		def self.load filename
+		def self.load path
 			# Read file
-			string = IO.read filename
+			string = IO.read path
 
 			# Prepartial types
 			ptypes = [
@@ -46,7 +46,9 @@ module General
 				prepart = ptypes.find { |ptype| m = ptype::REGEX.match(string) }
 
 				# Raise error if no matching prepart can be found
-				raise GError.new("Unmatched prepartial at #{(string.length <= 5 ? string : string[0..5] + "...").inspect}") if prepart.nil?
+				if prepart.nil?
+					raise GError.new "Unmatched prepartial at #{(string.length <= 5 ? string : string[0..5] + "...").inspect}"
+				end
 
 				# Add the partial to the array
 				preparts << prepart.new(m)
@@ -63,23 +65,25 @@ module General
 
 			# Run extend algorithm (throw error if extend is found elsewhere)
 			if extindex == 0
-				GMeta.load(extindex.filename).gextend(preparts)
+				preparts = GMeta.load(preparts[extindex].filename+General::GIO::EXTENSION).gextend(preparts[1..-1])
 			elsif !extindex.nil? && extindex > 0
 				raise GError.new "@@extend prepartial needs to be at beginning of template."
 			end
 
 			# Check for multiple yields
 			yields = preparts.find_all{ |prepart| prepart.is_a? General::GYield  }
-			raise GError.new "@@yield prepartial can only appear ONCE!" if yields.length > 1
+			if yields.length > 1
+				raise GError.new "@@yield prepartial can only appear ONCE!"
+			end
 
 			# Find the yield
 			yindex = preparts.index{ |prepart| prepart.is_a? General::GYield }
 
 			# Return a new meta file if yield is found. Else default is end.
 			unless yindex.nil?
-				return self.new preparts[0...yindex], preparts[(yindex + 1)..-1], filename
+				return self.new preparts[0...yindex], preparts[(yindex + 1)..-1], path
 			else
-				return self.new preparts, [], filename
+				return self.new preparts, [], path
 			end
 		end
 

data/spec/gtemplate_gio_spec.rb

@@ -30,19 +30,27 @@ describe General::GIO do
 		@gio1 = General::GIO.load("exp/templates/sample1" + General::GIO::EXTENSION)
 		@gio2 = General::GIO.load("exp/templates/sample2" + General::GIO::EXTENSION)
 		@gio3 = General::GIO.load("exp/templates/sample3" + General::GIO::EXTENSION)
+		@gio4 = General::GIO.load("exp/templates/sample4" + General::GIO::EXTENSION)
+		@gio5 = General::GIO.load("exp/templates/sample5" + General::GIO::EXTENSION)
 
 		@out1 = "exp/out/sample1.txt"
 		@out2 = "exp/out/sample2.txt"
 		@out3 = "exp/out/sample3.txt"
+		@out4 = "exp/out/sample4.txt"
+		@out5 = "exp/out/sample5.txt"
 		@outF = 3
 
 		@default_text1 = IO.read "exp/expected/default1.txt"
 		@default_text2 = IO.read "exp/expected/default2.txt"
 		@default_text3 = IO.read "exp/expected/default3.txt"
+		@default_text4 = IO.read "exp/expected/default4.txt"
+		@default_text5 = IO.read "exp/expected/default5.txt"
 
 		@applied_text1 = IO.read "exp/expected/applied1.txt"
 		@applied_text2 = IO.read "exp/expected/applied2.txt"
-		@applied_text3 = IO.read "exp/expected/applied3.txt"		
+		@applied_text3 = IO.read "exp/expected/applied3.txt"
+		@applied_text4 = IO.read "exp/expected/applied4.txt"
+		@applied_text5 = IO.read "exp/expected/applied5.txt"
 	end
 
 	# Describe General::GIO::load
@@ -57,6 +65,8 @@ describe General::GIO do
 			expect(@gio1).to be_an_instance_of General::GIO
 			expect(@gio2).to be_an_instance_of General::GIO
 			expect(@gio3).to be_an_instance_of General::GIO
+			expect(@gio4).to be_an_instance_of General::GIO
+			expect(@gio5).to be_an_instance_of General::GIO
 		end
 
 		it "cannot load GMeta file (with @@yield defined)" do
@@ -91,26 +101,36 @@ describe General::GIO do
 				@gio1.write @out1, @default_data
 				@gio2.write @out2, @default_data
 				@gio3.write @out3, @default_data
+				@gio4.write @out4, @default_data
+				@gio5.write @out5, @default_data
 
 				expect(IO.read @out1).to eql @default_text1
 				expect(IO.read @out2).to eql @default_text2
 				expect(IO.read @out3).to eql @default_text3
+				expect(IO.read @out4).to eql @default_text4
+				expect(IO.read @out5).to eql @default_text5
 			end
 
 			it "writes the default data to the given file io" do
 				File.open(@out1, "w+") { |ios| @gio1.write ios, @default_data }
 				File.open(@out2, "w+") { |ios| @gio2.write ios, @default_data }
 				File.open(@out3, "w+") { |ios| @gio3.write ios, @default_data }
+				File.open(@out4, "w+") { |ios| @gio4.write ios, @default_data }
+				File.open(@out5, "w+") { |ios| @gio5.write ios, @default_data }
 
 				expect(IO.read @out1).to eql @default_text1
 				expect(IO.read @out2).to eql @default_text2
 				expect(IO.read @out3).to eql @default_text3
+				expect(IO.read @out4).to eql @default_text4
+				expect(IO.read @out5).to eql @default_text5
 			end
 
 			it "raises TypeError if target is not string or io" do
 				expect{ @gio1.write @outF, @default_data }.to raise_error TypeError
 				expect{ @gio2.write @outF, @default_data }.to raise_error TypeError
 				expect{ @gio3.write @outF, @default_data }.to raise_error TypeError
+				expect{ @gio4.write @outF, @default_data }.to raise_error TypeError
+				expect{ @gio5.write @outF, @default_data }.to raise_error TypeError
 			end
 		end
 
@@ -121,26 +141,36 @@ describe General::GIO do
 				@gio1.write @out1, @applied_data
 				@gio2.write @out2, @applied_data
 				@gio3.write @out3, @applied_data
+				@gio4.write @out4, @applied_data
+				@gio5.write @out5, @applied_data
 
 				expect(IO.read @out1).to eql @applied_text1
 				expect(IO.read @out2).to eql @applied_text2
 				expect(IO.read @out3).to eql @applied_text3
+				expect(IO.read @out4).to eql @applied_text4
+				expect(IO.read @out4).to eql @applied_text4
 			end
 
 			it "writes the given data to the given file io" do
 				File.open(@out1, "w+") { |ios| @gio1.write ios, @applied_data }
 				File.open(@out2, "w+") { |ios| @gio2.write ios, @applied_data }
 				File.open(@out3, "w+") { |ios| @gio3.write ios, @applied_data }
+				File.open(@out4, "w+") { |ios| @gio4.write ios, @applied_data }
+				File.open(@out5, "w+") { |ios| @gio5.write ios, @applied_data }
 
 				expect(IO.read @out1).to eql @applied_text1
 				expect(IO.read @out2).to eql @applied_text2
 				expect(IO.read @out3).to eql @applied_text3
+				expect(IO.read @out4).to eql @applied_text4
+				expect(IO.read @out5).to eql @applied_text5
 			end
 
 			it "raises TypeError if target is not string or io" do
 				expect{ @gio1.write @outF, @applied_data }.to raise_error TypeError
 				expect{ @gio2.write @outF, @applied_data }.to raise_error TypeError
 				expect{ @gio3.write @outF, @applied_data }.to raise_error TypeError
+				expect{ @gio4.write @outF, @applied_data }.to raise_error TypeError
+				expect{ @gio5.write @outF, @applied_data }.to raise_error TypeError
 			end
 		end
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: general
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Anshul Kharbanda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -39,20 +39,30 @@ files:
 - exp/expected/applied1.txt
 - exp/expected/applied2.txt
 - exp/expected/applied3.txt
+- exp/expected/applied4.txt
+- exp/expected/applied5.txt
 - exp/expected/default1.txt
 - exp/expected/default2.txt
 - exp/expected/default3.txt
+- exp/expected/default4.txt
+- exp/expected/default5.txt
 - exp/out/sample1.txt
 - exp/out/sample2.txt
 - exp/out/sample3.txt
+- exp/out/sample4.txt
+- exp/out/sample5.txt
 - exp/templates/sample0.general
+- exp/templates/sample0a.general
 - exp/templates/sample1.general
 - exp/templates/sample2.general
 - exp/templates/sample3.general
+- exp/templates/sample4.general
+- exp/templates/sample5.general
 - exp/templates/sampleE0.general
 - exp/templates/sampleE1.general
 - exp/templates/sampleE2.general
 - exp/templates/sampleE3.general
+- exp/templates/sub/sample_base.general
 - lib/gdothash.rb
 - lib/general.rb
 - lib/gerror.rb