general 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a561694d495a4822d409b79ee059bed5a7aa2d70
-  data.tar.gz: 77160aa8d9d951cf91988cd482796c50b564ff72
+  metadata.gz: 6fc766e79d0ec1c3e71a07ac54fa1193b3b88c43
+  data.tar.gz: fa31d5069f16b9bcf189fcefd01d170d95cf5866
 SHA512:
-  metadata.gz: 9cf196acb87edb9afe1f21ed2dbc4754bef11395999d0776fe48563e6f491328ac347a0ad5a23e24221324abefdbb931de087df3dfcc39b4fe0aa54024c49b52
-  data.tar.gz: d6d2e2bd5869732dc2677f9176d6bd9796e0743d863c11aa097d3245923877e97e2b6a95683be8ab9219d045da70d72d6959d0f46a8639f95517c9b24b44b7b3
+  metadata.gz: b4075d13c08a615e5c2a8b98e25cefce84f4204cd934e89b1f69950d93b1584521b8b3a44513cbb7db94b3892834940463a53006c6ae8a34536c65a4eb54b9fc
+  data.tar.gz: 5e5d75fa9e38506bd9422f9a6879dcbdfa369c85857f20707b999c0e7b7cae0e5df0856453687b0369a50e7810d8c6b17f7cf1bd4e06d7010674d99a62810e5d

data/lib/gpartials.rb

@@ -29,8 +29,8 @@ module General
 		# Initializes the GPartialString with the given string
 		#
 		# Parameter: string - the string value of the GPartialString
-		def initialize(string)
-			@string = string
+		def initialize(string, match=nil)
+			@string = match ? string[0...match.begin(0)] : string
 		end
 		
 		# Returns the string
@@ -54,17 +54,19 @@ module General
 	# Created: 7 - 1 - 2016
 	class GPlaceholder
 		# Regular expression that matches placeholders
-		REGEX = /@\((?<name>[a-zA-Z]\w*)\s*(\:\s*(?<default>.*?))?\s*(->\s*(?<operation>[a-zA-Z]\w*))?\)/
+		REGEX = /@\((?<name>[a-zA-Z]\w*)\s*(\:\s*(?<default>.*?))?\s*(->\s*(?<operation>[\w+\s+]+))?\)/
 
 		# Read name
 		attr :name
 
 		# Initializes the GPlaceholder with the given match
 		#
-		# Parameter: match - the match data from the string being parsed
-		def initialize match
+		# Parameter: match    - the match data from the string being parsed
+		# Parameter: defaults - the hash of default data from the GTemplate
+		def initialize match, defaults
 			@name = match[:name].to_sym
 			@operation = match[:operation]
+			@defaults = defaults
 		end
 
 		# Returns the value of the placeholder in the given data 
@@ -75,11 +77,11 @@ module General
 		# Return: the value of the placeholder in the given data 
 		# 		  with the given operation performed on it
 		def apply data
-			if @operation
-				return General::GOperations.send(@operation, data[@name]).to_s
-			else
-				return data[@name].to_s
-			end
+			# Get value from either data or defaults
+			value = data[@name] || @defaults[@name]
+
+			# Return value (operation performed if one is defined)
+			return (@operation ? General::GOperations.send(@operation, value) : value).to_s
 		end
 
 		# Returns the string representation of the placeholder

data/lib/gtemplate.rb

@@ -31,9 +31,9 @@ module General
 		#
 		# Parameter: string - the string being converted to a template
 		def initialize string
-			# The string gets split into parts by placeholder and array template
-			@parts    		   = []
-			@defaults 		   = {}
+			# The string gets split into partials by placeholder and array template
+			@partials = []
+			@defaults = {}
 
 			parse_string string
 		end
@@ -41,7 +41,9 @@ module General
 		# Returns a string representation of the string
 		#
 		# Return: a string representation of the string
-		def to_s; @parts.collect(&:to_s).join; end
+		def to_s
+			return @partials.collect(&:to_s).join
+		end
 
 		# Applies the given data to the template and returns the generated string
 		#
@@ -49,11 +51,7 @@ module General
 		#
 		# Return: string of the template with the given data applied
 		def apply data={}
-			# Create applied data and parts
-			applied_data = @defaults.merge data.to_hash
-
-			# Apply each part
-			return @parts.inject("") { |string, part| string += part.apply(applied_data) }
+			return @partials.collect { |partial| partial.apply(data) }.join
 		end
 
 		# Applies each data structure in the array independently to the template
@@ -74,56 +72,53 @@ module General
 		# Parameter: string - the string to check for a placeholder
 		#
 		# Return: true if given string has a placeholder
-		def has_placeholder string
-			placeholder = General::GPlaceholder::REGEX =~ string
-			array_placeholder = General::GArrayPlaceholder::REGEX =~ string
-			return !placeholder.nil? && placeholder > -1 || !array_placeholder.nil? && array_placeholder > -1
+		def has_next string
+			next_p = General::GPlaceholder::REGEX      =~ string
+			next_a = General::GArrayPlaceholder::REGEX =~ string
+			return !((next_p.nil? || next_p < 0) && (next_a.nil? || next_a < 0))
+		end
+
+		# Returns true if the next placeholder is an aray placeholder
+		#
+		# Parameter: string - the string to check for an array placeholder
+		#
+		# Return: true if the next placeholder is an aray placeholder
+		def next_array_placeholder string
+			next_p = General::GPlaceholder::REGEX      =~ string
+			next_a = General::GArrayPlaceholder::REGEX =~ string
+			return !(next_a.nil? || next_p.nil?) && next_a < next_p
 		end
 
 		# Parses the string into General template data
 		#
 		# Parameter: string - the string to parse
 		def parse_string string
-			# While there is still a placeholder in string
-			while has_placeholder string
-				# Find locations of next placeholder and next array placeholder
-				next_p = General::GPlaceholder::REGEX =~ string
-				next_a = General::GArrayPlaceholder::REGEX =~ 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_a.nil? || next_p.nil?) && next_a < next_p || next_p.nil?
-						# Split match and add part
-						match = General::GArrayPlaceholder::REGEX.match string
-						@parts << General::GPartialString.new(string[0...match.begin(0)])
-
-						# Push array template
-						@parts << General::GArrayPlaceholder.new(match)
-
-					# If found only placeholder (or if found placeholder before array placeholder)
-					# Process placeholder
-					elsif !(next_a.nil? || next_p.nil?) && next_p < next_a || next_a.nil?
-						# Split match and add previous part
-						match = General::GPlaceholder::REGEX.match string
-						@parts << General::GPartialString.new(string[0...match.begin(0)])
-
-						# Add placeholder
-						@parts << General::GPlaceholder.new(match)
-						
-						# Push default information
-						@defaults[match[:name].to_sym] ||= match[:default]
-					end
-
-					# Trim string
-					string = string[match.end(0)..-1]
+			# While there is still a placeholder or array placeholder in string
+			while has_next string
+				# If next is array placeholder, process array placeholder
+				if next_array_placeholder string
+					# Split match and add partials
+					match = General::GArrayPlaceholder::REGEX.match string
+					@partials << General::GPartialString.new(string, match) \
+							  << General::GArrayPlaceholder.new(match)
+
+				# Else process placeholder
+				else
+					# Split match and add partials
+					match = General::GPlaceholder::REGEX.match string
+					@partials << General::GPartialString.new(string, match) \
+							  << General::GPlaceholder.new(match, @defaults)
+					
+					# Push default information
+					@defaults[match[:name].to_sym] ||= match[:default]
 				end
+
+				# Trim string
+				string = string[match.end(0)..-1]
 			end
 			
 			# Add end of string
-			@parts << General::GPartialString.new(string)
+			@partials << General::GPartialString.new(string)
 		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: general
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Anshul Kharbanda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec