aml 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99123f17f26debf93e4218deeaba35d2d22caeac
-  data.tar.gz: ef412c33d163c79d6e4a91d34563280062846a53
+  metadata.gz: 269daf118df596cb722b1e749453e59a03c24fd7
+  data.tar.gz: 21f56707e802f9a1f8183b1abc65d3aee99f76b9
 SHA512:
-  metadata.gz: fc9d6ee0f6bfd5c4567f87bb58381d634bcad4057e5b494429a6d28f357f73b1ab743bba0a3d4c104bbe04818df5f79bf4ea88c1af847ae6bf2b175111a0e384
-  data.tar.gz: 3908079e214a5517704ac033acc20034851791cf41be7962f53c81f7b15eecdcebae7c55d78a15f0a2a4e96ae3d5c0bf5ce64c2ab2661fe60cd8adc833a2ddae
+  metadata.gz: 1d3fc6f980e8141150b6d496840d1e71c82287eb16506aca3192c401b09b808593658be1e2ec358473dfbae3d381fd01e503ae9319931d9a39ad8a716f2166dd
+  data.tar.gz: 1995da921b1f8e4822575c52b375ca5b535648a5421f140df37334c72ee6e231620a1cc6358696517a54e278b8ddae868f1abfccd1937b60ff87e178f9aa3fe5

data/lib/aml.rb

@@ -27,7 +27,7 @@ module AbstractMarkupLanguage
 				@basePath = basePath
 				watchFile = File.basename(argument.read('watch'))
 				@watchFile = watchFile
-				#AML Config Arguments
+				#Arguments from aml-config
 				configFile = File.join(basePath,'aml-config')
 				argument.parse(File.read(configFile)) if File.exist?(configFile)
 				#Arguments
@@ -35,20 +35,25 @@ 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('selfClosing',"area,base,basefont,bgsound,br,col,frame,hr,img,isindex,input,keygen,link,meta,param,source,track,wbr")
-				argument.create_if_empty('sortAttribute','true')
-				argument.create_if_empty('singleQuote','false')
-				argument.create_if_empty('errorLimit','5')
 				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")
 
 				parse = Parse.new(argument.read('basePath'), argument.read('watch'))
 				files = []
 
+				#Watch Partials
 				parse.watch.each do |this|
 					file = File.join(basePath, this[:bundle] ? File.join(this[:bundle],'partial') : this[:partial] ? 'partial' : '' , this[:file])
 					files << file
 				end
 
+				#Watch Mixins
+				parse.mixin.each do |this|
+					file = File.join(basePath, this[:bundle] ? File.join(this[:bundle]) : this[:partial] ? 'partial' : '' , this[:file]) if this[:bundle] != false
+					files << file if file != nil
+				end
+
 				#Define Core Bundle's Methods, Mixins, & Variables...
 				core_definition =  false
 				if(File.exists?(File.join(File.dirname(File.expand_path(__FILE__)),'aml','core','mixin.aml')))
@@ -58,6 +63,7 @@ module AbstractMarkupLanguage
 				else
 					error.log('core',false,'mixin.aml',false,'file does not exist')
 				end
+
 				if(File.exists?(File.join(File.dirname(File.expand_path(__FILE__)),'aml','core','method.rb')))
 				 	begin
 				 		class_eval File.read(File.join(File.dirname(File.expand_path(__FILE__)),'aml','core','method.rb'))
@@ -102,29 +108,27 @@ module AbstractMarkupLanguage
 					end
 				end
 
+				#Watch or Build
 				@makeFile = argument.read('fileOutput')
 				compile = Compile.new(parse,argument,definition,error)
-				if(error.count == 0)
-					error.log_delete
-					if argument.read('build') == 'false'
-						#print "\r\b\e[0K#{Gem.loaded_specs['aml'].summary.to_s} is watching #{files.count-1} partial instance#{files.count-1 != 1 ? "s" : ""}""... (#{argument.read('aml-watch-instance').to_i+1}) "
-						print "\r\b\e[0K#{Gem.loaded_specs['aml'].summary.to_s} is watching #{files.count-1} partial instance#{files.count-1 != 1 ? "s" : ""}""... (#{argument.read('aml-watch-instance').to_i+1}) "
-						watch = Watch.new(files, arguments, argument.read('aml-watch-instance').to_i+1, argument.read('build'))
+				error.log_delete if error.count == 0
+				error.log_create if error.count > 0	
+				if argument.read('build') == 'false'
+					if(error.count == 0)
+						print "\r\b\e[0KWatching #{files.count} file#{files.count != 1 ? "s" : ""}"" for updates... "
 					else
-						puts "Build complete..."
+						print "\r\b\e[0KPlease resolve all issues found in aml-error... "	
 					end
+					watch = Watch.new(files, arguments, argument.read('aml-watch-instance').to_i+1, argument.read('build'))
 				else
-					error_count = error.count == 1 ? "" : "s"
-					if error.count <=  argument.read('errorLimit').to_i
-						error.log_delete
-						puts error.output
+					if(error.count == 0)
+						puts "Build complete."
 					else
-						error.log_create
-						print "\r\n#{error.count} error#{error_count} occured, please see error.log for details.\r\n"
-					end
+						puts "Please resolve all issues found in aml-error."	
+					end	
 				end
 			else
-				puts "Please define the --watch or --build argument."
+				puts argument.read('watch').to_s.length == 0 ? "Please define the --watch or --build argument." : "File not found."
 			end
 		end
 

data/lib/aml/compile.rb

@@ -1,8 +1,10 @@
 class Compile
 
 	@@structure = []
-	
+	@@selfClosing = []
+
 	def initialize(parse,argument,definition,error)
+		@@selfClosing = argument.read('selfClosing').split(',')
 		error.compile(parse,definition,error)
 		if(error.count == 0)
 			prepare_line_variable(parse.file[:line],definition)
@@ -19,7 +21,7 @@ class Compile
 			
 			structure = prepare_structure(parse.file[:line])
 			structure.each do |group|
-				recursive_close(group)
+				recursive_close(group,0,definition)
 			end
 			make = Make.new(@@structure)
 		end
@@ -202,7 +204,7 @@ class Compile
 		pstruct[:children]
 	end
 
-	def recursive_close(struct,index=0)
+	def recursive_close(struct,index=0,definition)
 		next_index	=	struct.key?(:line) ? index+1 : index
 		tab_index	=	"\t" * index
 		opening_tag_attributes = ""
@@ -216,7 +218,10 @@ class Compile
 
 		#TAG
 		if(struct[:line][:type]==:tag)
-			opening_tag_attributes = tag_line_attributes(struct[:line])
+
+			struct[:line][:close] = 'self' if @@selfClosing.include? struct[:line][:name]
+
+			opening_tag_attributes = tag_line_attributes(struct[:line],"",definition)
 			opening_tag	=	"<#{struct[:line][:name]}#{opening_tag_attributes}>"
 			closing_tag =	"</#{struct[:line][:name]}>"
 			if struct.key?(:line)
@@ -234,7 +239,7 @@ class Compile
 			tag_text = "\r\n#{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)
+				recursive_close(struct_children,next_index,definition)
 			end
 			@@structure << "#{tab_index}#{closing_tag}" if struct.key?(:line)
 		else
@@ -243,23 +248,27 @@ class Compile
 
 	end
 
-	def tag_line_attributes(line,base="")
+	def tag_line_attributes(line,base="",definition)
 		if line[:type] == :tag
 			line[:attributes][:id] = line[:id] if line[:id].to_s.length > 0 and line[:attributes][:id].to_s.length == 0
 			line[:attributes][:class] = line[:class] if line[:class].to_s.length > 0 and line[:attributes][:class].to_s.length == 0
-			attributes = hash_to_attribute_build(line[:attributes])
+			attributes = hash_to_attribute_build(line[:attributes],"",definition,line)
 			attributes = " #{attributes}" if(attributes.length > 0)
 		end
 	end
 
-	def hash_to_attribute_build(hash,base="")
+	def hash_to_attribute_build(hash,base="",definition,line)
 		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}-")} "
+				string << "#{hash_to_attribute_build(value,"#{base}#{key}-",definition,line)} "
 			else
+				#if key == :id
+				#	regex = /\@\(((?<bundle>[\w|\-]+)\.)?(?<name>[\w|\-]+)\)/
+				#	value = value.to_s.gsub(regex){definition.variable($2,line[:number],$1.to_s.length > 0 ? $1 : false).to_s} if value.to_s.length > 0
+				#end
 				string << "#{base}#{key}=\"#{value}\" "
 			end
 		end

data/lib/aml/definition.rb

@@ -17,7 +17,7 @@ class Definition
 	end
 	def add(parse,scope=false,add_bundle=true,add_mixin=true,add_variable=true)
 		#define bundles
-		parse[:line].select{|k,v| k[:type] == :method or k[:type] == :partial}.each do |bundle|
+		parse[:line].select{|k,v| k[:type] == :method or k[:type] == :partial or k[:type] == :mixin}.each do |bundle|
 			@bundle[bundle[:bundle]] = camelCase(bundle[:bundle]) if @bundle.has_key?(bundle[:bundle]) == false and bundle[:bundle] != false
 		end if add_bundle
 		#define mixins

data/lib/aml/error.rb

@@ -1,29 +1,42 @@
 class Error
 	@errors
+	@warnings
 	def initialize
 		@errors = []
+		@warnings = []
 	end
-	def log(bundle,partial,file,line,message)
+	def warnings
+		@warnings
+	end
+	def log(bundle,partial,file,line,message,warning=false)
 		file = "partial/#{file}" if partial != false
 		file = "#{bundle}/#{file}" if bundle != false
 		line = line ? "::#{line}" : nil
-		@errors << "#{file}#{line} #{message}"
+		text = "#{file}#{line} #{message}"
+		if warning
+			@warnings << text
+		else
+			@errors << text
+		end
 	end
 	def count
 		@errors.count
 	end
 	def log_delete
 		begin
-			File.delete(File.join(AbstractMarkupLanguage::Base.basePath,'error.log'))
+			File.delete(File.join(AbstractMarkupLanguage::Base.basePath,'aml-log'))
 		rescue Exception => e
 		end
 	end
 	def log_create
 		error_output = ""
 		@errors.each do |error|
-			error_output += "#{error}\r\n"
+			error_output += "Error: #{error}\r\n"
+		end
+		@warnings.each do |warning|
+			error_output += "Warning: #{warning}\r\n"
 		end
-		File.write(File.join(AbstractMarkupLanguage::Base.basePath,'error.log'),error_output)
+		File.write(File.join(AbstractMarkupLanguage::Base.basePath,'aml-log'),error_output)
 	end
 	def output
 		@errors.each do |error|

data/lib/aml/make.rb

@@ -4,7 +4,7 @@ class Make
 		File.open(makeFile, 'w'){|file|
 			struct_count = structure.count-1
 			structure.each_with_index do |line,index|
-				new_line = (index < struct_count) ? "\r\n" : ""
+				new_line = (index < struct_count) ? $/ : ""
 				file.write(line+new_line) if line.strip.length > 0
 			end
 		}

data/lib/aml/parse.rb

@@ -5,6 +5,9 @@ class Parse
 	def watch
 		return @watch
 	end
+	def mixin
+		return @mixin
+	end
 	def initialize(path, file, partial=false, bundle=false)
 		@path	=	path
 		@regex	=	{
@@ -19,13 +22,14 @@ class Parse
 			: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|\-]+))?(?<class>(\.[\w|\-]+)?{1,})?(\#(?<id_last>[\w|\-]+))?(\{(?<attributes>.+)\})?(?<text>.+)?/),
+			:tag			=>	LineType.new(/^(\s{1,})?(?<!%)%(?<close>\/{0,2})?(?<name>[\w|\-]+)(\#(?<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>.+)?/)
 		}
 		@file	=	{}
 		@watch	=	[]
+		@mixin 	=	[]
 		read(file, partial, bundle)
 	end
 	def read(file, partial, bundle)
@@ -62,10 +66,16 @@ class Parse
 		@file = {:name => file, :line => line_struct}
 		@watch << {:file => file, :bundle => false, :partial => false}
 		partial_watch(line_struct)
+		mixin_watch(line_struct)
 	end
 	def partial_watch(struct)
 		struct.reject{|k,v| k[:type] != :partial}.each do |partial|
 			@watch << {:file => "#{partial[:name]}.aml", :bundle=> partial[:bundle], :partial => true}
 		end
 	end
+	def mixin_watch(struct)
+		struct.reject{|k,v| k[:type] != :mixin}.each do |partial|
+			@mixin << {:file => "mixin.aml", :bundle=> partial[:bundle], :partial => false} if partial[:bundle] != 'core'
+		end
+	end
 end

data/lib/aml/watch.rb

@@ -5,7 +5,7 @@ class Watch
 		filenames = [filenames] if(filenames.kind_of?String)
 		@last_mtimes = {}
 		filenames.each do |filename|
-			@last_mtimes[filename] = File.stat(filename).mtime
+			@last_mtimes[filename] = File.stat(filename).mtime if File.exists?(filename)
 		end
 		@filenames = filenames
 		watch
@@ -22,13 +22,15 @@ class Watch
 	end
 	def file_updated?
 		@filenames.each do |filename|
-			mtime = File.stat(filename).mtime
-			updated = @last_mtimes[filename] < mtime
-			@last_mtimes[filename] = mtime
-			if(updated)
-				exec("aml #{@arguments} --aml-watch-instance #{@instance}")
-				Kernel.exit!
-				return true
+			if File.exists?(filename)
+				mtime = File.stat(filename).mtime
+				updated = @last_mtimes[filename] < mtime
+				@last_mtimes[filename] = mtime
+				if(updated)
+					exec("aml #{@arguments} --aml-watch-instance #{@instance}")
+					Kernel.exit!
+					return true
+				end
 			end
 		end
 		return false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aml
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Daniel Esquivias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-01 00:00:00.000000000 Z
+date: 2014-02-27 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.