general 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa693f6a6d94f53eaedb644de5ee29cd920938da
-  data.tar.gz: f4a1798024ee0d8d67d3365e3ff2d4e6fb93b1f1
+  metadata.gz: 1ab656ffd2493215af70ca4cd3f055c124dd027a
+  data.tar.gz: 880637049b15f23f04b617dba41ca035463fd2c6
 SHA512:
-  metadata.gz: 7c77f1f3063b892d4a16e1ea4332d38e0a819bb5e8f488912458f3c1c8b2169dc17ce4c451f8079a2ca67dce895b2501e74a76cb9cf8a456ef4536c2e8879c0f
-  data.tar.gz: aa221f8c6f1ffab3c91a8b8ed266437f34c652f3c69e0723c030ff2c5056afb3b9a7e9cfad718ac34afccd5c63c10852c961049334d3a614b8453315f14f0d8c
+  metadata.gz: 18c45c45a642d87b926cdc987a6c243e6d7a36ef5e5deab67b75102669f39d414288fbda8f8dc66dde3594117a5b2992393a369358d2bb6bc4fa362260c5eccd
+  data.tar.gz: 06cce36678474a7e5482b714893d66796ca1bd0c85e86a07ae1fdb317022a368b5ee3ebc46fd1ad4bbf6ce2138621dea0c16fa47cbe401f3cf8e7fbabf6dca0a

data/lib/gtemplate.rb

@@ -28,7 +28,7 @@ module General
 		PLACEHOLDER = /@\((?<name>[a-zA-Z]\w*)\s*(\:\s*(?<default>.*?))?\s*(->\s*(?<operation>[a-zA-Z]\w*))?\)/
 
 		# Regular expression that matches array placeholders
-		ARRAY_PLACEHOLDER = /@\[(?<name>[a-zA-Z]\w*)\]\s*(?<text>.*?)\s*@\[(?<delimeter>.+)?\]/m
+		ARRAY_PLACEHOLDER = /@\[(?<name>[a-zA-Z]\w*)\]( |\n)?(?<text>.*?)( |\n)?@\[(?<delimeter>.+)?\]/m
 
 		# Operations that can be called on placeholder values
 		OPERATIONS = {
@@ -79,7 +79,7 @@ module General
 						if @array[key]
 							applied_parts[place[:index]] = place[:template].apply_all(value).join(place[:delimeter])
 						else
-							applied_parts[place[:index]] = place[:operation].call(value)			
+							applied_parts[place[:index]] = OPERATIONS[place[:operation]].call(value)			
 						end
 					end
 				else
@@ -121,37 +121,51 @@ module General
 		def parse_string 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
-					@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])
-
-					# Push place and array information
-					push_place name, {index: @parts.length - 1, template: template, delimeter: delimeter}
-					@array[name] = true
-				elsif PLACEHOLDER =~ string
-					# Split match and add parts
-					match = PLACEHOLDER.match string
-					@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
-					push_place name, {index: @parts.length - 1, operation: operation}
-					@defaults[name] = match[:default] unless @defaults.has_key? name
+				# Find locations of next placeholder and next array placeholder
+				next_p = PLACEHOLDER =~ string
+				next_a = ARRAY_PLACEHOLDER =~ string
+
+				# If found at least one
+				if !(next_a.nil? && next_p.nil?)
+
+					# If found only array placeholder (or if found array placeholder before placeholder)
+					# Process placeholder
+					if next_p.nil? && !next_a.nil? || !(next_a.nil? || next_p.nil?) && next_a < next_p
+						# Split match and add parts
+						match = ARRAY_PLACEHOLDER.match string
+						@parts << string[0...match.begin(0)] << match[:name].to_sym
+						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])
+
+						# Push place and array information
+						push_place name, {index: @parts.length - 1, template: template, delimeter: delimeter}
+						@array[name] = true
+
+					# If found only array placeholder (or if found array placeholder before placeholder)
+					# Process placeholder
+					elsif next_a.nil? && !next_p.nil? || !(next_a.nil? || next_p.nil?) && next_p < next_a
+						# Split match and add parts
+						match = PLACEHOLDER.match string
+						@parts << string[0...match.begin(0)] << match[:name].to_sym
+						string = string[match.end(0)..-1]
+
+						# Get name
+						name = match[:name].to_sym
+
+						# Get operation and arguments (if any)
+						operation = match[:operation].nil? ? :default : match[:operation].to_sym
+						
+						# Push place and default information
+						push_place name, {index: @parts.length - 1, operation: operation}
+						@defaults[name] = match[:default] unless @defaults.has_key? name
+
+					end
 				end
 			end
 			

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: general
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Anshul Kharbanda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -27,7 +27,7 @@ dependencies:
 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.
-  For more information, read the README for documentation."
+  For more information, visit the homepage"
 email: akanshul97@gmail.com
 executables: []
 extensions: []