aml 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4554e8086f2ded34322b99b7d29197f0d106d547
-  data.tar.gz: 6a46a20ef78e5888ffd391c960744d5f3382acce
+  metadata.gz: 96b4862d968beca0ef77a6a40a76ba5046a4374f
+  data.tar.gz: fc95c860a87e77d54407072679d06dedf1855fb0
 SHA512:
-  metadata.gz: 984d81c03eecfc52d2bc73376837809fa7ddeb0abbc5dd0dd978df88160693b0cd367332b0ca3d096c367849fd75dcf1d3a69ef03defdf96e1426cb240ec3320
-  data.tar.gz: 30632d24ea907aa6884944f770c5c32b8a1308c9ea8d1ef1967a590a8b4fe3f3c41d938f8d6ad3e6474b2787340c94fdd92ba9b39da73d559283bf07108f3ce3
+  metadata.gz: a6308cbf0bf762ebe2ba84cc3f17bf688cbf832b4d2398ab34d2bd2988e0acaace746b95727ddca18aa125b9b6a3b1b85f67dd622f4909a2a0ce4663bb2068d3
+  data.tar.gz: 6f19b512a26009fbe4c44d3db5155d49ccf42abbe7e45d4a23bd8bb9138757636a2da9b5aae41ee89a790b36cce421291f0e9ee7fc15c16a94b2a36ff5f561ea

data/lib/aml.rb

@@ -1,4 +1,5 @@
 # Entry Point for Abstract Markup Language
+require "awesome_print"
 class AbstractMarkupLanguage
 	require "aml/Build"
 	def initialize(argument)

data/lib/aml/Build.rb

@@ -1,7 +1,7 @@
 class Build
 	require "aml/Argument"
 	require "aml/Compile"
-
+	
 	@@structure = []
 	@@selfClosing = []
 
@@ -126,24 +126,22 @@ class Build
 	end
 
 	def tag_line_attributes(line,base="")
-		if line[:type] == :tag
-			attributes = hash_to_attribute_build(line[:attribute],"",line)
-			attributes = " #{attributes}" if(attributes.length > 0)
-		end
+		attributes = hash_to_attribute_build(line[:attribute],"").strip
+		attributes = ' ' + attributes if(attributes.length > 0)
 	end
 
-	def hash_to_attribute_build(hash,base="",line)
+	def hash_to_attribute_build(hash,base="")
 		hash = hash.sort_by{|key, value| key}
 		string = ""
 		hash.each do |key, value|
 			if(value.is_a?(Hash))
 				value.sort_by{|key, value| key}
-				string << "#{hash_to_attribute_build(value,"#{base}#{key}-",line)} "
+				string << hash_to_attribute_build(value,"#{base}#{key}-")
 			else
 				string << "#{base}#{key}=\"#{value}\" " if value.to_s.length > 0
 			end
 		end
-		string.strip
+		string
 	end
 
 	def prepare_structure(struct,index=0,pstruct={:line=>false,:children=>[]})

data/lib/aml/Cluster.rb

@@ -68,6 +68,19 @@ class Cluster
 		definition.self[:hash] = process_conditional_block(definition, _get_conditionals(definition.self[:hash]), definition.self[:hash], 'loop')
 		definition.self[:hash] = process_conditional_block(definition, _get_conditionals(definition.self[:hash]), definition.self[:hash], 'if')
 	end
+
+	def recursive_attribute_replace(attributes,find,replace)
+		attributes.each do |attribute, value|
+			if value.is_a? Hash
+				value = recursive_attribute_replace(value,find,replace)
+			else
+				value = value.to_s.gsub(find,replace)
+			end
+			attributes[attribute] = value
+		end
+		attributes
+	end
+
 	# Process Conditional Block
 	def process_conditional_block(definition, conditionals, lines, type)
 		conditional = conditionals.select{|k|k[:name].downcase == type}.sort_by{|k|k[:index]}.reverse
@@ -83,28 +96,33 @@ class Cluster
 						loop_line = Marshal.load(Marshal.dump(lines.select{|k|k[:c_index] > conditional[:c_index] and k[:c_index] < conditional[:end][:c_index]}))
 						loop_line.each do |line|
 							line[:index] = line[:index]-1
-							line[:text] = line[:text].gsub(/@@/,value) if line[:text] != nil
-							line[:value] = line[:value].gsub(/@@/,value) if line[:value] != nil
+							[:text,:value].each do |name|
+								line[name] = line[name].gsub(/@\(\:index\)/, value) if line[name] != nil
+								line[name] = line[name].gsub(/@\(\:zero\-index\)/, ((value.to_i)-1).to_s) if line[name] != nil
+							end
 							if line[:attribute] != nil
-								line[:attribute].each do |attribute|
-									line[:attribute][attribute[0]] = attribute[1].gsub(/@@/,value) if attribute[1] != nil
-								end
+								line[:attribute] = recursive_attribute_replace(line[:attribute],/@\(\:index\)/, value)
+								line[:attribute] = recursive_attribute_replace(line[:attribute],/@\(\:zero\-index\)/, ((value.to_i)-1).to_s)
 							end
 							conditional_lines << line
 						end
 					end
 				else
-					conditional[:value].split(',').each do |value|
+					conditional[:value].split(',').each_with_index do |value, index|
 						value = value.strip
+						index = index
 						loop_line = Marshal.load(Marshal.dump(lines.select{|k|k[:c_index] > conditional[:c_index] and k[:c_index] < conditional[:end][:c_index]}))
 						loop_line.each do |line|
 							line[:index] = line[:index]-1
-							line[:text] = line[:text].gsub(/@@/,value) if line[:text] != nil
-							line[:value] = line[:value].gsub(/@@/,value) if line[:value] != nil
+							[:text,:value].each do |name|
+								line[name] = line[name].gsub(/@\(\:value\-index\)/, value) if line[name] != nil
+								line[name] = line[name].gsub(/@\(\:index\)/, (index+1).to_s) if line[name] != nil
+								line[name] = line[name].gsub(/@\(\:zero\-index\)/, index.to_s) if line[name] != nil
+							end
 							if line[:attribute] != nil
-								line[:attribute].each do |attribute|
-									line[:attribute][attribute[0]] = attribute[1].gsub(/@@/,value) if attribute[1] != nil
-								end
+								line[:attribute] = recursive_attribute_replace(line[:attribute],/@\(\:value\-index\)/, value)
+								line[:attribute] = recursive_attribute_replace(line[:attribute],/@\(\:index\)/, (index+1).to_s)
+								line[:attribute] = recursive_attribute_replace(line[:attribute],/@\(\:zero\-index\)/, index.to_s)
 							end
 							conditional_lines << line
 						end

data/lib/aml/Compile.rb

@@ -66,6 +66,19 @@ class Compile
 		definition.self[:hash][index] = process_variable_line(line, definition)
 		definition.self[:hash][index] = process_method_line(line, definition) if methods
 	end
+
+	def recursive_attribute_replace_variable(attributes, line, definition)
+		attributes.each do |attribute, value|
+			if value.is_a? Hash
+				value = recursive_attribute_replace_variable(value, line, definition)
+			else
+				value = process_variable_find(value.to_s, line, definition)
+			end
+			attributes[attribute] = value
+		end
+		attributes
+	end
+
 	def process_variable_line(line, definition)
 		if line[:type] == :string
 			line[:value] = process_variable_find(line[:value], line, definition)
@@ -74,14 +87,25 @@ class Compile
 		else
 			line[:text] = process_variable_find(line[:text], line, definition)
 			line[:value] = process_variable_find(line[:value], line, definition)
-			if line.key? :attribute != nil
-				line[:attribute].each do|k,v|
-					line[:attribute][k] = process_variable_find(v, line, definition)
-				end
+			if line.key? :attribute and line[:attribute].count > 0
+				line[:attribute] = recursive_attribute_replace_variable(line[:attribute], line, definition)
 			end
 		end
 		line
 	end
+
+	def recursive_attribute_replace_method(attributes, line)
+		attributes.each do |attribute, value|
+			if value.is_a? Hash
+				value = recursive_attribute_replace_method(value, line)
+			else
+				value = process_method_find(value.to_s, line)
+			end
+			attributes[attribute] = value
+		end
+		attributes
+	end
+
 	def process_method_line(line, definition)
 		if line[:type] == :string
 			line[:value] = process_method_find(line[:value], line)
@@ -89,10 +113,8 @@ class Compile
 			line = parse.line("#{"\t" * line[:index]}#{line[:value]}",line[:number])
 		else
 			line[:text] = process_method_find(line[:text], line)
-			if line.key? :attribute != nil
-				line[:attribute].each do|k,v|
-					line[:attribute][k] = process_method_find(v, line)
-				end
+			if line.key? :attribute and line[:attribute].count > 0
+				line[:attribute] = recursive_attribute_replace_method(line[:attribute],line)
 			end
 		end
 		line
@@ -167,19 +189,31 @@ class Compile
 			return false
 		end
 	end
+
+	def recursive_attribute_replace_attribute(attributes, mixin)
+		attributes.each do |attribute, value|
+			if value.is_a? Hash
+				value = recursive_attribute_replace_attribute(value, mixin)
+			else
+				value = process_attribute_find(value.to_s, mixin)
+			end
+			attributes[attribute] = value
+		end
+		attributes
+	end
+
 	def process_attribute(line, mixin)
 		if line[:type] == :string
 			line[:value] = process_attribute_find(line[:value], mixin[:attribute])
 		else
 			line[:text] = process_attribute_find(line[:text], mixin[:attribute])
 			if line[:attribute] != nil
-				line[:attribute].each do|k,v|
-					line[:attribute][k] = process_attribute_find(v, mixin[:attribute])
-				end
+				line[:attribute] = recursive_attribute_replace_attribute(line[:attribute],mixin[:attribute])
 			end
 		end
 		line
 	end
+
 	def process_attribute_find(string, attribute)
 		regex = @inline.select{|k|k[:type] == :attribute}[0][:regex]
 		string = string.to_s.gsub(regex).each do
@@ -206,7 +240,7 @@ class Compile
 		partial = Definition.new(File.join(@argument.get('path'),path,line[:name]+'.aml'), line[:type].to_s, line[:bundle])
 		partial.self[:hash].each_with_index do |line, index|
 			line[:number] = partial_number
-			line = process_attribute(line, {:attribute=>patrial_attribute})
+			line = process_attribute(line, {:attribute=>patrial_attribute}) if patrial_attribute.count > 0
 			line = process_variable_line(line, definition)
 		end
 		partial.self[:hash].each do|line|

data/lib/aml/Definition.rb

@@ -13,7 +13,7 @@ class Definition
 		begin
 			parse = Parse.new(bundle)
 			# Remove Comment Line(s)
-			File.open(file).read.gsub(/%!--[^%]*--%$/,'').each_line do |line|
+			File.open(file).read.gsub(/%!--[^%]*--%$|[^%]\/\/.*$/,'').each_line do |line|
 				number+=1
 				# Remove Empty Lines
 				add_line(parse.line(line,number))

data/lib/aml/Line.rb

@@ -39,11 +39,12 @@ class Line
 			line[:bundle] = 'core' if line[:bundle] == false
 		end
 		# class
-		if line.key? :class
+		if line.key? :class and line[:class].length > 0
 			line[:class] = '.' + line[:class]
 			line[:attribute][:class] = line[:class].split('.').join(' ').strip!
 			line.delete(:class)
 		end
+		
 		# close 
 		line[:close] = %w(tag self none)[line[:close].to_s.length].to_sym if line.key? :close
 		# id
@@ -67,7 +68,7 @@ class Line
 		if string != nil
 			string.scan(regex){|match|
 				thisHash = Hash[names.zip(match)]
-				if thisHash["hash"].to_s[0] == "{"
+				if thisHash["hash"].to_s.strip[0] == '{'
 					hash[thisHash["name"].to_sym] = recursive_string_to_hash(thisHash["hash"])
 				else
 					hash[thisHash["name"].to_sym] = thisHash["value"].to_s.strip

data/lib/aml/Parse.rb

@@ -8,7 +8,7 @@ class Parse
 		@line << Line.new(bundle, :mixin_end, /^\}$/)
 		@line << Line.new(bundle, :partial, /^(\s{1,})?%\(\~((?<bundle>[\w|\-]+)\.)?(?<name>[\w|\-]+)\)(\{(?<attribute>.+)\}[^\{]?)?$/)
 		@line << Line.new(bundle, :tag, /^(\s{1,})?(?<!%)%(?<close>\/{0,2})?(?<name>[\w|\-]+)(\#(?<id_first>[\w|\-]+))?(\.(?<class>[\w|\-|\.]+))?(\#(?<id_last>[\w|\-]+))?(?<reset>\*{1,})?(\{(?<attribute>.+)\})?(?<text>.+)?$/)
-		@line << Line.new(bundle, :tag_shorthand, /^(\s{1,})?(?=[#|\.|\/])(?<close>\/{0,2})?(\#(?<id_first>[\w|\-]+))?(\.(?<class>[\w|\-|\.]+))?(\#(?<id_last>[\w|\-]+))?(?<reset>\*{1,})?(\{(?<attribute>.+)\})?(?<text>.+)?$/)
+		@line << Line.new(bundle, :tag_shorthand, /^(\s{1,})?(?=[#|\.|\/])(\#(?<id_first>[\w|\-]+))?(\.(?<class>[\w|\-|\.]+))?(\#(?<id_last>[\w|\-]+))?(?<reset>\*{1,})?(?<close>\/{0,2})?(\{(?<attribute>.+)\})?(?<text>.+)?$/)
 		@line << Line.new(bundle, :conditional, /^(\s{1,})?-\s?(?<name>if|loop|end)(\s(?<value>.+))?$/)
 		@line << Line.new(bundle, :empty, /^$/)
 		@line << Line.new(bundle, :eval, /^(\s{1,})?==(\s{1,})(?<value>.+)?/)

data/lib/aml/core/method.rb

@@ -1,6 +1,11 @@
 class Core
 
-	@words = %w[a ac accumsan adipiscing aenean aliquam aliquet amet ante arcu at auctor augue bibendum blandit commodo condimentum congue consectetur consequat convallis cras curabitur cursus dapibus diam dictum dictumst dignissim dis dolor donec dui duis egestas eget eleifend elementum elit enim erat eros est et etiam eu euismod facilisi facilisis fames faucibus felis fermentum feugiat fringilla fusce gravida habitasse hac hendrerit iaculis id imperdiet in integer interdum ipsum justo lacinia lacus laoreet lectus leo libero ligula lobortis lorem luctus maecenas magna magnis malesuada massa mattis mauris metus mi molestie mollis montes morbi mus nam nascetur natoque nec neque nibh nisi nisl non nulla nullam nunc odio orci ornare parturient pellentesque penatibus pharetra phasellus placerat platea porta porttitor posuere potenti praesent pretium primis proin pulvinar purus quam quis quisque rhoncus ridiculus risus rutrum sagittis sapien scelerisque sed sem semper sit sociis sodales sollicitudin suscipit suspendisse tellus tempor tempus tincidunt tortor tristique turpis ullamcorper ultrices ultricies urna ut varius vehicula vel velit venenatis vestibulum vitae vivamus viverra volutpat vulputate]
+	@words = %w[a ac accumsan adipiscing aenean aliquam aliquet amet ante arcu at auctor augue bibendum blandit commodo condimentum congue consectetur consequat convallis cras curabitur cursus dapibus diam dictum dictumst dignissim dis dolor donec dui duis egestas eget eleifend elementum elit enim erat eros est et etiam eu euismod facilisi facilisis fames faucibus felis fermentum feugiat fringilla fusce gravida habitasse hac hendrerit iaculis id imperdiet in integer interdum ipsum justo lacinia lacus laoreet lectus leo libero ligula lobortis lorem luctus maecenas magna magnis malesuada massa mattis mauris metus mi molestie mollis montes morbi mus nam nascetur natoque nec neque nibh nisi nisl non nulla nullam nunc odio orci ornare parturient pellentesque penatibus pharetra phasellus placerat platea porta porttitor posuere potenti praesent pretium primis proin pulvinar purus quam quis quisque rhoncus risus rutrum sagittis sapien scelerisque sed sem semper sit sociis sodales sollicitudin suscipit suspendisse tellus tempor tempus tincidunt tortor tristique turpis ullamcorper ultrices ultricies urna ut varius vehicula vel velit venenatis vestibulum vitae vivamus viverra volutpat vulputate werumensium xiphias]
+
+	def self.rand(index=0, a={}, d={:min=>'1', :max=>'10'})
+		offset = 1 if a[:min] == 0
+		return rand(a[:max]+offset)+a[:min]
+	end
 
 	def self.date(index=0, a={}, d={:format=>'%Y-%m-%d %H:%M:%S'})
 		a = d.merge(a)
@@ -22,38 +27,28 @@ class Core
 		return self.date(index,{:format=>'%Y'})
 	end
 
-	def self.lorem(index=0, a={}, d={:number=>5,:type=>'paragraph',:capitalize=>true})
-		#(en-us)
+	def self.lorem(index=0, a={}, d={:paragraphs=>6, :words=>8, :type=>'paragraph',:capitalize=>true})
+		#Generate random copy based on en-us formats.
 		a = d.merge(a)
-		a[:number] = a[:number].to_i
+		a[:paragraphs] = a[:paragraphs].to_i
+		a[:words] = a[:words].to_i
 		string = ""
-		if a[:type] == 'paragraph'
-			string = self._random_paragraph(a[:number])
+		if a[:type] == 'word'
+			string = self._random_word(a[:capitalize])
 		elsif a[:type] == 'sentence'
-			string = self._random_sentence(a[:number])
+			string = self._random_sentence(a[:words])
+		elsif a[:type] == 'paragraph'
+			string = self._random_paragraph(a[:paragraphs], a[:words])
 		elsif a[:type] == 'title'
-			for i in 1..rand(a[:number]-1)+1
-				string += self._random_word(a[:capitalize]) + " "
-			end
-			string.strip!
-		elsif a[:type] == 'word'
-			string = self._random_word(a[:capitalize])
+			string = self._random_title(a[:words])
 		elsif a[:type] == 'name'
-			string = self._random_word(true) + ' ' + self._random_word(a[:capitalize])[0] + '. ' + self._random_word(true)
+			string = self._random_name
 		elsif a[:type] == 'address'
-			address = []
-			count = rand(2)+2
-			until address.count == count do
-				address << self._random_word(true)
-			end
-			city = []
-			count = rand(1)+1
-			until city.count == count do
-				city << self._random_word(true)
-			end
-			string = (rand(5000)+100).to_s + ' ' + address.join(' ') + ', ' + city.join(' ') + ', ' + self._random_word(a[:capitalize])[0] +  self._random_word(a[:capitalize])[0] + ' ' + rand(10000...99999).to_s
+			string = self._random_address
 		elsif a[:type] == 'phone'
-			string = '('+ rand(100...999).to_s + ') ' + rand(100...999).to_s + '-' + rand(1000...9999).to_s
+			string = self._random_phone
+		elsif a[:type] == 'email'
+			string = self._random_email
 		end
 		return string
 	end
@@ -64,24 +59,63 @@ class Core
 		string
 	end
 
-	def self._random_sentence(max_words=20)
-		count = rand(max_words)+3
-		count = max_words if count > max_words
+	def self._random_sentence(number)
+		words = rand(number)
+		words = number if words == 0
+		words = words <= (number/2) ? number/2+rand(0..1) : words
 		string = []
-		until string.count == count do
+		until string.count == words do
 			string << self._random_word(string.count==0)
 		end
 		string.join(' ') + '.'
 	end
 
-	def self._random_paragraph(max_sentences=10)
-		count = rand(max_sentences)+3
-		count = max_sentences if count > max_sentences
+	def self._random_paragraph(number, words)
+		paragraphs = rand(number)
+		paragraphs = number if paragraphs == 0
+		paragraphs = paragraphs <= (number/2) ? number/2+rand(0..1) : paragraphs
+		string = []
+		until string.count == paragraphs do
+			string << self._random_sentence(words)
+		end
+		string.join(' ')
+	end
+
+	def self._random_title(number)
+		words = rand(number)
+		words = number if words == 0
+		words = words <= (number/2) ? number/2+rand(0..1) : words
 		string = []
-		until string.count == count do
-			string << self._random_sentence
+		until string.count == words do
+			string << self._random_word(true)
 		end
 		string.join(' ')
 	end
 
+	def self._random_name
+		self._random_word(true) + ' ' + self._random_word(true)[0] + '. ' + self._random_word(true)
+	end
+
+	def self._random_phone
+		'('+ rand(100...999).to_s + ') ' + rand(100...999).to_s + '-' + rand(1000...9999).to_s
+	end
+
+	def self._random_address
+		address = []
+		count = rand(2..4)
+		until address.count == count do
+			address << self._random_word(true)
+		end
+		city = []
+		count = rand(1..2)
+		until city.count == count do
+			city << self._random_word(true)
+		end
+		rand(100..5000).to_s + ' ' + address.join(' ') + ', ' + city.join(' ') + ', ' + self._random_word(true)[0].upcase + self._random_word(true)[0].upcase + ' ' + rand(10000...99999).to_s
+	end
+
+	def self._random_email
+		self._random_word + '@' + self._random_word + '.' + self._random_word[0..3]
+	end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aml
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Daniel Esquivias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-08 00:00:00.000000000 Z
+date: 2014-06-21 00:00:00.000000000 Z
 dependencies: []
 description: Abstract Markup Language is a robust and feature rich markup language
   designed to avoid repetition and promote clear, well-indented markup.