aml 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d46123901065fe56b8a4c50b0f238a15ca7e59ff
-  data.tar.gz: 4a9a0cf2415bc9e6685aef3d7715c284b5051859
+  metadata.gz: 4af0b2c9bbd9723b035c8f29956a1ac9872ef2b1
+  data.tar.gz: 4f9c97308477ad6c0beff75c2b66a829c8e34751
 SHA512:
-  metadata.gz: 9c59f3a70af0b23062c3c5be6ece1d05661a330b64661a5decf137021f583d3ffaf66e25297f9626eb333d8dc1100a535819a58f7a30dbefb66e4413ea8b7a64
-  data.tar.gz: 1b90d8a2e4dd82266714ff9d526cdf67d7f2ae764d41d9a6e3058c9fe3f44e783512b365b7b275fef0ca779b7b924d0b7506f6e6e03ab81e25b87512b68d4fea
+  metadata.gz: 4a312f58c7c93767a29b67102814404f98c13f78ed6ae6770a32c9972acadd0eea01f8df59563db238563ec716b8d4b001d86654d9cedd7691958bdad13ac971
+  data.tar.gz: f098df54530764d179c90085318d2e65dd0793b330e8d10354f61f8aa0eec758bdfdcf89c767c952b1399fd658c07edd5e08c530c35b50dc14418acf50214ca0

data/lib/aml/argument.rb

@@ -46,7 +46,7 @@ class Argument
 	end
 	
 	def create(name,value)
-		@@argumental[name.to_sym] = value.strip if(value.length > 0)
+		@@argumental[name.to_sym] = value.strip #if(value.length > 0)
 	end
 
 	def create_if_empty(name,value)
@@ -57,6 +57,10 @@ class Argument
 		@@argumental[name.to_sym]
 	end
 
+	def defined(name)
+		@@argumental.select{|k,v| k.to_s == name}.count > 0
+	end
+
 	def update(name,value)
 		create(name,value)
 	end

data/lib/aml/compile.rb

@@ -19,21 +19,62 @@ class Compile
 			prepare_partial_structure(parse.file[:line],definition)
 			prepare_method_structure(parse.file[:line],definition)
 			
+			prepare_string_line_merge(parse.file[:line])
+
 			structure = prepare_structure(parse.file[:line])
+
+			recursive_merge_lines(structure)
+
 			structure.each do |group|
-				recursive_close(group,0,definition)
+				recursive_close(group,0,definition,0)
 			end
+
 			make = Make.new(@@structure)
 		end
 	end
 
+	def recursive_merge_lines(struct,count=0)
+	    struct.each_with_index do |group,struct_index|
+	        group.each_with_index do |line,gindex|
+	            if line.first == :line
+	                if line.last[:type] == :string and line.last[:merge]
+	                    next_line = struct[struct_index+1].first
+	                    if next_line.first == :line and next_line.last[:type] == :string
+	                        line.last[:value] += next_line.last[:value]
+	                        line.last[:merge] = next_line.last[:merge]
+	                        line.last[:merge] = struct_index+1 == struct.count ? false : line.last[:merge]
+	                        struct.delete_at struct_index+1
+	                    else
+	                       line.last[:merge] = false 
+	                    end
+	                    count +=1 if line.last[:merge]
+	                end
+	            else
+	                recursive_merge_lines(line.last)
+	            end
+	        end
+	    end
+	    recursive_merge_lines(struct) if count > 0
+	end
+
+	def prepare_string_line_merge(lines)
+		regex = /\%\+\+$/
+		lines.each_with_index do |line,index|
+			if(line[:type] == :string)
+				line[:merge] = line[:value].to_s.match(regex) != nil
+				line[:value] = line[:value].to_s.gsub(regex,'') if line[:merge]
+			end
+		end
+		lines
+	end
+
 	def prepare_method_structure(lines,definition)
 		lines.each_with_index do |line,index|
 			if line[:type] == :method
 				line[:type] = :string
 				bundle = line[:bundle]
 				bundle = "Core" if bundle == 'core'
-				line[:value] = AbstractMarkupLanguage::Base.const_get(bundle).method(line[:name]).call(line[:index],line[:attributes])
+				line[:value] = AbstractMarkupLanguage::Base.const_get(bundle).method(line[:name]).call(line[:index],line[:attributes]) + line[:value]
 			end
 		end
 		lines
@@ -94,10 +135,10 @@ class Compile
 
 	def post_prepare_line_variable(line)
 		types	=	{
-			:method			=>	LineType.new(/^(\s{1,})?::((?<bundle>[\w|\-]+)\.)?(?<name>[\w|\-]+)(\{(?<attributes>.+)\})?/),
+			:method			=>	LineType.new(/^(\s{1,})?::((?<bundle>[\w|\-]+)\.)?(?<name>[\w|\-]+)(\{(?<attributes>.+)\})?(?<value>.+)?/),
 			:mixin			=>	LineType.new(/^(\s{1,})?%\(((?<bundle>[\w|\-]+)\.)?(?<name>[^~][\w|\-]+)\)(\{(?<attributes>.+)\})?[^\{]?/),
 			:partial		=>	LineType.new(/^(\s{1,})?%\(\~((?<bundle>[\w|\-]+)\.)?(?<name>[\w|\-]+)\)(\{(?<attributes>.+)\}[^\{]?)?$/),
-			:tag			=>	LineType.new(/^(\s{1,})?(?<!%)%(?<close>\/{0,2})?(?<name>[\w|\-]+)(\#(?<id_first>[\w|\-]+))?(?<class>(\.[\w|\-]+)?{1,})?(\#(?<id_last>[\w|\-]+))?(\{(?<attributes>.+)\})?(?<text>.+)?/)
+			:tag			=>	LineType.new(/^(\s{1,})?(?<!%)%(?<close>\/{0,2})?(?<name>[\w|\-]+)(?<tab_reset>\*{1,})?(\#(?<id_first>(\@\(([\w|-]+\.)?)?[\w|\-]+(\))?))?(?<class>(\.[\w|\-]+)?{1,})?(\#(?<id_last>[\w|\-]+))?(\{(?<attributes>.+)\})?(?<text>.+)?/)
 		}
 		if line[:type] == :string
 			types.each do |type, line_type|
@@ -205,9 +246,9 @@ class Compile
 		pstruct[:children]
 	end
 
-	def recursive_close(struct,index=0,definition)
+	def recursive_close(struct,index=0,definition,index_reset)
 		next_index	=	struct.key?(:line) ? index+1 : index
-		tab_index	=	"\t" * index
+		tab_index	=	"\t" * (index-index_reset)
 		opening_tag_attributes = ""
 		opening_tag = ""
 		closing_tag = ""
@@ -237,10 +278,16 @@ class Compile
 		end
 		tag_text = struct[:line][:text]
 		if struct.key?(:children)
-			tag_text = "\r\n#{tab_index}\t#{tag_text}" if tag_text.to_s.length > 0
+			new_line = "\r\n"
+			
+			#testing * aka tab_reset
+			index_reset = struct[:line][:index]+1 if struct[:line][:tab_reset].to_s.length > 0
+
+			tag_text = "#{new_line}#{tab_index}\t#{tag_text}" if tag_text.to_s.length > 0
+
 			@@structure << "#{tab_index}#{opening_tag}#{tag_text}" if struct.key?(:line)
 			struct[:children].each do |struct_children|
-				recursive_close(struct_children,next_index,definition)
+				recursive_close(struct_children,next_index,definition,index_reset)
 			end
 			@@structure << "#{tab_index}#{closing_tag}" if struct.key?(:line)
 		else

data/lib/aml/core/method.rb

@@ -1,8 +1,6 @@
 class Core
-	
-	def self.loop(index=0, a={})
-		return "loop"
-	end
+
+	@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]
 	
 	def self.date(index=0, a={}, d={:format=>'%Y-%m-%d %H:%M:%S'})
 		a = d.merge(a)
@@ -14,11 +12,61 @@ class Core
 		return self.date(index,{:format=>'%Y'})
 	end
 
-	def self.ipsum(index=0, a={})
-		return "%p lorem ipsum sit amet dolor"
+	def self.lorem(index=0, a={}, d={:number=>5,:type=>'paragraph',:capitalize=>true})
+		#(en-us)
+		a = d.merge(a)
+		a[:number] = a[:number].to_i
+		string = ""
+		if a[:type] == 'paragraph'
+			string = self._random_paragraph(a[:number])
+		elsif a[:type] == 'sentence'
+			string = self._random_sentence(a[:number])
+		elsif a[:type] == 'word'
+			string = self._random_word(a[:capitalize])
+		elsif a[:type] == 'name'
+			string = self._random_word(true) + ' ' + self._random_word(a[:capitalize])[0] + '. ' + self._random_word(true)
+		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
+		elsif a[:type] == 'phone'
+			string = '('+ rand(100...999).to_s + ') ' + rand(100...999).to_s + '-' + rand(1000...9999).to_s
+		end
+		return string
 	end
 
-	def self.random(index=0, a={})
-		return "random"
+	def self._random_word(capitalize=false)
+		string = @words[rand(@words.count)]
+		string = string.capitalize if capitalize
+		string
 	end
+
+	def self._random_sentence(max_words=20)
+		count = rand(max_words)+3
+		count = max_words if count > max_words
+		string = []
+		until string.count == count 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
+		string = []
+		until string.count == count do
+			string << self._random_sentence
+		end
+		string.join(' ')
+	end
+
 end

data/lib/aml/line_type.rb

@@ -35,6 +35,9 @@ LineType = Struct.new(:regex) do
 		type = %w(tag self none)
 		type[match[:close].to_s.length]
 	end
+	def tab_reset(match)
+		match[:tab_reset].to_s
+	end
 	def stringHashToHash(string)
 		hash = {}
 		regex = /:(?<name>\w+)\s?=>\s?(?<hash>{(.+?)?}|(?<quote>'|")(?<value>.+?)??\k<quote>)/

data/lib/aml/parse.rb

@@ -13,16 +13,16 @@ class Parse
 		@regex	=	{
 			:attribute		=>	/@\(\:(?<name>[\w|\-]+)\)/,
 			:comment		=>	/%!--[^%]*--%$/,
-			:variable		=>	/\@\(((?<bundle>[\w|\-]+)\.)?(?<name>[\w|\-]+)\)/,
+			:variable		=>	/\@\(((?<bundle>[\w|\-]+)\.)?(?<name>[\w|\-]+)\)/
 		}
 		@types	=	{
-			:method			=>	LineType.new(/^(\s{1,})?::((?<bundle>[\w|\-]+)\.)?(?<name>[\w|\-]+)(\{(?<attributes>.+)\})?/),
+			:method			=>	LineType.new(/^(\s{1,})?::((?<bundle>[\w|\-]+)\.)?(?<name>[\w|\-]+)(\{(?<attributes>.+)\})?(?<value>.+)?/),
 			:variable_def	=>	LineType.new(/^(\s{1,})?\@((?<bundle>[\w|\-]+)\.)?(?<name>[\w|\-]+)\s?(\=)\s?(?<value>.+)?$/),
 			:mixin			=>	LineType.new(/^(\s{1,})?%\(((?<bundle>[\w|\-]+)\.)?(?<name>[^~][\w|\-]+)\)(\{(?<attributes>.+)\})?[^\{]?/),
 			:mixin_def		=>	LineType.new(/^%%(?<name>[\w|\-]+)(\((?<attributes>.+?)\))?{/),
 			:mixin_end		=> 	LineType.new(/^\}$/),
 			:partial		=>	LineType.new(/^(\s{1,})?%\(\~((?<bundle>[\w|\-]+)\.)?(?<name>[\w|\-]+)\)(\{(?<attributes>.+)\}[^\{]?)?$/),
-			:tag			=>	LineType.new(/^(\s{1,})?(?<!%)%(?<close>\/{0,2})?(?<name>[\w|\-]+)(\#(?<id_first>(\@\(([\w|-]+\.)?)?[\w|\-]+(\))?))?(?<class>(\.[\w|\-]+)?{1,})?(\#(?<id_last>[\w|\-]+))?(\{(?<attributes>.+)\})?(?<text>.+)?/),
+			:tag			=>	LineType.new(/^(\s{1,})?(?<!%)%(?<close>\/{0,2})?(?<name>[\w|\-]+)(?<tab_reset>\*{1,})?(\#(?<id_first>(\@\(([\w|-]+\.)?)?[\w|\-]+(\))?))?(?<class>(\.[\w|\-]+)?{1,})?(\#(?<id_last>[\w|\-]+))?(\{(?<attributes>.+)\})?(?<text>.+)?/),
 			:empty			=>	LineType.new(/^$/),
 			:eval			=>	LineType.new(/^(\s{1,})?==(\s{1,})(?<value>.+)?/),
 			:string			=>	LineType.new(/(\s{1,})?(?<value>.+)?/)

data/lib/aml/requirement.rb

@@ -1,4 +1,4 @@
-#require "awesome_print"
+require "awesome_print"
 require 'aml/error'
 require 'aml/argument'
 require 'aml/line_type'

data/lib/aml.rb

@@ -3,13 +3,11 @@ module AbstractMarkupLanguage
 	@basePath
 	@watchFile
 	@makeFile
-
 	class Base
 		def self.initialize(arguments, instance)
 			error = Error.new()
 			argument = Argument.new(arguments,error)
 			argument.required('watch','The required --watch argument has not been defined.')
-
 			if(argument.has_requirements? == false)
 				argument.clear_required
 				argument.required('build','The required --build argument has not been defined.')
@@ -21,7 +19,6 @@ module AbstractMarkupLanguage
 			else
 				argument.create('build','false')
 			end
-
 			if argument.has_requirements? and File.exist?(argument.read('watch'))
 				basePath = File.dirname(argument.read('watch'))
 				@basePath = basePath
@@ -35,10 +32,10 @@ module AbstractMarkupLanguage
 				argument.create_if_empty('basePath',basePath)
 				argument.create_if_empty('fileExtension','html')
 				argument.create_if_empty('fileOutput',"#{File.basename(argument.read('watch'), ".*")}.#{argument.read('fileExtension')}")
-				argument.create_if_empty('aml-watch-instance', "#{instance}")
-				
 				argument.create_if_empty('selfClosing',"area,base,basefont,bgsound,br,col,frame,hr,img,isindex,input,keygen,link,meta,param,source,track,wbr")
 
+				argument.create_if_empty('aml-watch-instance', "#{instance}")
+
 				parse = Parse.new(argument.read('basePath'), argument.read('watch'))
 				files = []
 
@@ -128,7 +125,11 @@ module AbstractMarkupLanguage
 					end	
 				end
 			else
-				puts argument.read('watch').to_s.length == 0 ? "Please define the --watch or --build argument." : "File not found."
+				if argument.defined('version')
+					puts Gem.loaded_specs['aml'].version.to_s
+				else
+					puts argument.read('watch').to_s.length == 0 ? "Please define the --watch or --build argument." : "File not found."
+				end
 			end
 		end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aml
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Daniel Esquivias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-04-15 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.
@@ -19,21 +19,21 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/aml-bundle
 - bin/aml
-- lib/aml.rb
-- lib/aml-bundle.rb
-- lib/aml/definition.rb
-- lib/aml/error.rb
+- bin/aml-bundle
+- lib/aml/argument.rb
+- lib/aml/compile.rb
 - lib/aml/core/method.rb
 - lib/aml/core/mixin.aml
-- lib/aml/parse.rb
-- lib/aml/argument.rb
+- lib/aml/definition.rb
+- lib/aml/error.rb
 - lib/aml/line_type.rb
 - lib/aml/make.rb
-- lib/aml/watch.rb
-- lib/aml/compile.rb
+- lib/aml/parse.rb
 - lib/aml/requirement.rb
+- lib/aml/watch.rb
+- lib/aml-bundle.rb
+- lib/aml.rb
 homepage: https://abstractmarkup.com
 licenses:
 - MIT
@@ -54,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Abstract Markup Language