general 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 929452f8cde579e0045081d3ddbeabd63a117a46
-  data.tar.gz: 3c13f4e3084ac383b16434dd788d79859ed3b322
+  metadata.gz: 477f5e34b1b64b4e0e4741a246208dfdf64ed532
+  data.tar.gz: 100cee4dc93bbf2e150dcddfd066bcf4043c2cc6
 SHA512:
-  metadata.gz: c9c8f0eab3929e4a86a686664805aa10757dcc18056502064cd798b31bd3a50998cd0810375d6ac4ed172818131020ddac379b56993734502b8e11f4dc9616d2
-  data.tar.gz: daf2f6d3e3bd8098082e5d49419b2020cd78e517fdb315a6a540ed4ae743b765dcd7b23fc1fac765592583acae692d5a28057132be1551c288f6570b94721169
+  metadata.gz: e92fc67acd37263609750d28aa79f9d92ad310c167132e1d7d68cd878846919ba3ade7d1736af8bea06fab1df145e38e21d4a62c9014d3646b49ca075367fda5
+  data.tar.gz: e4df59bce6f7190975c9f7ff31737e67979406380e74bad6fbe26bb3a628b39afbffeea886b785c1e18a574731f5af6958f69eb615c3648dac3f932e42f485cf

data/lib/gtemplate.rb

@@ -65,28 +65,45 @@ module General
 		# Return: a string representation of the string
 		def to_s; @parts.join; end
 
-		# Returns the template with the given data applied
+		# Applies the given data to the template and returns the generated string
 		#
-		# Parameter: data - the data to be applied (merges with defaults)
+		# Parameter: data - the data to be applied (as a hash. merges with defaults)
 		#
-		# Return: the template with the given data applied
+		# Return: string of the template with the given data applied
 		def apply data={}
 			applied_data = @defaults.merge data.to_hash
 			applied_parts = @parts.clone
 			applied_data.each do |key, value|
-				if @array[key]
+				if @places.has_key? key
 					@places[key].each do |place|
-						applied_parts[place[:index]] = value.collect {|subvalue| place[:template].apply subvalue}.join(place[:delimeter])
+						if @array[key]
+							applied_parts[place[:index]] = place[:template].apply_all(value).join(place[:delimeter])
+						else
+							applied_parts[place[:index]] = place[:operation].call(value)			
+						end
 					end
 				else
-					@places[key].each do |place|
-						applied_parts[place[:index]] = place[:operation].call(value)			
-					end
+					throw "Placeholder is not defined in template: @(#{key})"
 				end
 			end
 			return applied_parts.join
 		end
 
+		# Applies each data structure in the array independently to the template
+		# and returns an array of the generated strings
+		#
+		# Parameter: data_array - the array of data to be applied 
+		# 						  (each data hash will be merged with defaults)
+		#
+		# Return: array of strings generated from the template with the given data applied
+		def apply_all data_array
+			string_array = []
+			data_array.each do |data|
+				string_array << apply(data)
+			end
+			return string_array
+		end
+
 		private
 
 		# Returns true if given string has a placeholder
@@ -102,15 +119,17 @@ module General
 		#
 		# Parameter: string - the string to parse
 		def parse_string string
-			# While match remains in string
+			# While there is still a placeholder in string
 			while has_placeholder string
 				if ARRAY_PLACEHOLDER =~ string
 					# Split match and add parts
 					match = ARRAY_PLACEHOLDER.match string
-					name = match[:name].to_sym
-					@parts << string[0...match.begin(0)] << name
+					@parts << string[0...match.begin(0)] << match
 					string = string[match.end(0)..-1]
 
+					# Get name
+					name = match[:name].to_sym
+
 					# Get delimeter (if any) and parse array template
 					delimeter = match[:delimeter].nil? ? " " : match[:delimeter]
 					template = GTemplate.new(match[:text])
@@ -121,10 +140,13 @@ module General
 				elsif PLACEHOLDER =~ string
 					# Split match and add parts
 					match = PLACEHOLDER.match string
-					name = match[:name].to_sym
-					@parts << string[0...match.begin(0)] << name
+					@parts << string[0...match.begin(0)] << match
 					string = string[match.end(0)..-1]
 
+					# Get name
+					name = match[:name].to_sym
+
+					# Get operation and arguments (if any)
 					operation = match[:operation].nil? ? OPERATIONS[:default] : OPERATIONS[match[:operation].to_sym]
 					
 					# Push place and default information
@@ -149,4 +171,7 @@ module General
 			end
 		end
 	end
-end
+end
+
+tem = General::GTemplate.new "There once was a dog named @(name: dog -> capitalize). @(name -> capitalize) earned @(amount -> dollars) last week."
+puts tem

data/spec/gfile_spec.rb

@@ -1,6 +1,6 @@
 require "spec_require"
 
-describe Generic::GFile do
+describe General::GFile do
 	before :all do
 		@filepath = "tmp"
 		@filename = "sample.txt"
@@ -12,12 +12,12 @@ describe Generic::GFile do
 	end
 
 	before :each do
-		@file = Generic::GFile.new (@filepath + "/" + @filename + Generic::GFile::EXTENTION)
+		@file = General::GFile.new (@filepath + "/" + @filename + General::GFile::EXTENTION)
 	end
 
 	describe "#new" do
 		it "Creates a new GFile with the given filename" do
-			expect(@file).to be_an_instance_of Generic::GFile
+			expect(@file).to be_an_instance_of General::GFile
 			expect(@file.target).to eql (@filepath + "/" + @filename)
 		end
 	end

data/spec/gtemplate_spec.rb

@@ -1,8 +1,8 @@
 require "spec_require"
 
-describe Generic::GTemplate do
+describe General::GTemplate do
 	before :all do
-		@template1 = Generic::GTemplate.new "There once was a man named @(name: Gordon Ramsay). @(name) loved @(food: Cat Food)!"
+		@template1 = General::GTemplate.new "There once was a man named @(name: Gordon Ramsay). @(name) loved @(food: Cat Food)!"
 		@default_text      = "There once was a man named Gordon Ramsay. Gordon Ramsay loved Cat Food!"
 		@all_applied_text  = "There once was a man named Joe. Joe loved Joe's Shmoes!"
 		@name_applied_text = "There once was a man named Dog. Dog loved Cat Food!"
@@ -11,7 +11,7 @@ describe Generic::GTemplate do
 		@name = "Dog"
 		@food = "Denny's Fennies"
 
-		@template2 = Generic::GTemplate.new "@[greetings] Hello, @(name)! How is the @(pet)? @[\n]"
+		@template2 = General::GTemplate.new "@[greetings] Hello, @(name)! How is the @(pet)? @[\n]"
 		@data2 = {greetings: [
 			{name: "Joe", pet: "cat"},
 			{name: "Ben", pet: "dog"}, 
@@ -19,16 +19,16 @@ describe Generic::GTemplate do
 		]}
 		@applied_text2 = "Hello, Joe! How is the cat?\nHello, Ben! How is the dog?\nHello, Ken! How is the plant?"
 
-		@template3 = Generic::GTemplate.new "There once was a dog named @(name: dog -> capitalize). @(name -> capitalize) earned @(amount -> dollars) last week."
+		@template3 = General::GTemplate.new "There once was a dog named @(name: dog -> capitalize). @(name -> capitalize) earned @(amount -> dollars) last week."
 		@data3 = {name: "cat", amount: 19999}
 		@applied_text3 = "There once was a dog named Cat. Cat earned $199.99 last week."
 	end
 
 	describe "#new" do
 		it "Creates a new GTemplate with the given template string" do
-			expect(@template1).to be_an_instance_of Generic::GTemplate
-			expect(@template2).to be_an_instance_of Generic::GTemplate
-			expect(@template3).to be_an_instance_of Generic::GTemplate
+			expect(@template1).to be_an_instance_of General::GTemplate
+			expect(@template2).to be_an_instance_of General::GTemplate
+			expect(@template3).to be_an_instance_of General::GTemplate
 		end
 	end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: general
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Anshul Kharbanda
@@ -9,7 +9,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2016-05-26 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 description: "General is a simple templating system in ruby that allows you to create
   templates from both \t\t\t\t\t\tpure strings and files (with the extension .general),
   as well as create new strings and files \t\t\t\t\t\twith these created objects.