aml 0.1.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fb94d51490c626603a16de82a5b6888a4db7e7c
-  data.tar.gz: ebdc4038a88844f7b6fcffb7b8537cf787e64aec
+  metadata.gz: 4554e8086f2ded34322b99b7d29197f0d106d547
+  data.tar.gz: 6a46a20ef78e5888ffd391c960744d5f3382acce
 SHA512:
-  metadata.gz: 867280f2e16f2df3ddd8bdefec4550901d0710701db17fb65ee690dfce94606cbd1d89aca7f6690fd671325de7eb5f29ffddbd84195908b2c8127ba910e631e8
-  data.tar.gz: 97abab75dd2e85df2f753797a3909c653432a660faefabf20761877ef5ecbcc5efe13ca7402d76a2824d6d72760eaf7e0c693875fb0d75665a4febd278b2db86
+  metadata.gz: 984d81c03eecfc52d2bc73376837809fa7ddeb0abbc5dd0dd978df88160693b0cd367332b0ca3d096c367849fd75dcf1d3a69ef03defdf96e1426cb240ec3320
+  data.tar.gz: 30632d24ea907aa6884944f770c5c32b8a1308c9ea8d1ef1967a590a8b4fe3f3c41d938f8d6ad3e6474b2787340c94fdd92ba9b39da73d559283bf07108f3ce3

data/bin/aml

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 require 'aml'
-AbstractMarkupLanguage::Base.initialize(ARGV.join(' '),0)
+AbstractMarkupLanguage.new(ARGV.join(' '))

data/lib/aml.rb

@@ -1,148 +1,11 @@
-require 'aml/requirement'
-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.')
-				if(argument.has_requirements?)
-					argument.clear_required
-					argument.create('watch',argument.read('build'))
-					argument.create('build','true')
-				end
-			else
-				argument.create('build','false')
-			end
-			if argument.has_requirements? and File.exist?(argument.read('watch'))
-				basePath = File.dirname(argument.read('watch'))
-				@basePath = basePath
-				watchFile = File.basename(argument.read('watch'))
-				@watchFile = watchFile
-				#Arguments from aml-config
-				configFile = File.join(basePath,'aml-config')
-				argument.parse(File.read(configFile)) if File.exist?(configFile)
-				#Arguments
-				argument.create('watch',watchFile)
-				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('aml-watch-instance', "#{instance}")
-
-				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')))
-					bundle = Parse.new(File.join(File.dirname(File.expand_path(__FILE__)), 'aml','core'),'mixin.aml')
-					definition = Definition.new(bundle.file,"core",false,true,true)
-					core_definition = true
-				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'))
-				 	rescue Exception => e
-						x = e.message.match(error.match)
-						error.log('core',false,"method.rb",x[:line],x[:message])
-					end
-				else
-					error.log('core',false,'method.rb',false,'file does not exist')
-				end
-
-				#Define --watch Methods, Mixins, & Variables...
-				if core_definition
-					definition.add(parse.file,false,true,true,true)
-				else
-					definition = Definition.new(parse.file,false,true,true,true)
-				end
-
-				#Define Additional Bundle Methods & Mixins
-				definition.bundles.each do |directory,name|
-					if directory != 'core' then
-						if File.exists?(File.join(basePath,directory,'method.rb'))
-							begin
-								class_eval File.read(File.join(basePath,directory,'method.rb'))
-							rescue Exception => e
-								x = e.message.match(error.match)
-								error.log(directory,false,"method.rb",x[:line],x[:message])
-							end
-						else
-							error.log(directory,false,'method.rb',false,'file does not exist')
-						end
-						if File.exists?(File.join(basePath,directory,'mixin.aml'))
-							bundle = Parse.new(File.join(basePath,directory),'mixin.aml')
-							definition.add(bundle.file,directory,false,true,true)
-						else
-							error.log(directory,false,'mixin.aml',false,'file does not exist')
-						end
-						#Watch Additional Bundle Partials
-						Dir[File.join(basePath,directory,'partial','*.aml')].each do |partial|
-							files << partial
-						end
-					end
-				end
-
-				#Watch or Build
-				@makeFile = argument.read('fileOutput')
-				compile = Compile.new(parse,argument,definition,error)
-				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
-						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
-					if(error.count == 0)
-						puts "Build complete."
-					else
-						puts "Please resolve all issues found in aml-error."	
-					end	
-				end
-			else
-				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
-
-		def self.makeFile
-			@makeFile
-		end
-
-		def self.basePath
-			@basePath
-		end
-
-		def self.watchFile
-			@watchFile
+# Entry Point for Abstract Markup Language
+class AbstractMarkupLanguage
+	require "aml/Build"
+	def initialize(argument)
+		if ['--v', '--version', 'version'].include? argument.downcase
+			puts Gem.loaded_specs['aml'].version.to_s
+		else
+			@build = Build.new(argument)
 		end
 	end
 end

data/lib/aml/Argument.rb

@@ -0,0 +1,100 @@
+class Argument
+	def initialize(argument={})
+		@item = {}
+		@item_key = {}
+		argument.each do |argument|
+			initialize_add(argument)
+		end
+	end
+	def parse(argument)
+		arguments = argument.split('--')
+		if arguments.count == 1
+			arguments = []
+			io = argument.split(' ')
+			arguments << "build " + io[0] #input file
+			if io.count == 2
+				arguments << "path " + File.dirname(io[1]) #output path
+				arguments << "name " + File.basename(io[1],'.*') #output name
+				arguments << "extension " + File.extname(io[1])[1..-1] if io[1].split('.').count > 1 #output extension
+			end
+		end
+		arguments.each do |argument|
+			string = argument.split(' ')
+			set(string[0], string[1..string.count].join(' ').to_s) if argument.strip.length > 0
+		end
+	end
+	def define(name,value,usage,required=false)
+		regex = /\[(?<key>\w)\]/
+		keys = []
+		name = name.gsub(regex).each do |match|
+			match = match.match(regex)[:key]
+			keys << match
+			match
+		end
+		@item[name.to_sym] = {
+			:value => value,
+			:usage => usage,
+			:require => required
+		}
+		@item_key[keys.join.to_sym] = name.to_sym if keys.count > 0
+	end
+	def set(name, value=nil)
+		begin
+			@item[_name(name)][:value] = value.to_s
+		rescue
+		end
+	end
+	def get(name)
+		begin
+			@item[_name(name)][:value].to_s
+		rescue
+		end
+	end
+	def items
+		@item
+	end
+	def show_help?
+		@item.select{|k,v| k == :help and v[:value] != false}.count == 0 ? false : true
+	end
+	def show_help
+		pad = _pad(@item)
+		@item.each do |name,data|
+			value = data[:value].to_s
+			value = nil.to_s if name == :help
+			puts "--#{name.to_s.ljust(pad[:name]+1)}\t#{value.ljust(pad[:value]+1)}\t#{data[:usage].ljust(pad[:usage])}"
+		end
+	end
+	def has_requirements?
+		@item.select{|k,v| v[:require] == true and v[:value] == nil}.count == 0 ? true : false
+	end
+	def show_required
+		required = @item.select{|k,v| v[:require] == true and v[:value] == nil}
+		if required.count == 1
+			puts "Please define the --#{required.first.first} argument; #{required.first.last[:usage]}"
+		else
+			pad = _pad(required)
+			required.each do |name,data|
+				value = data[:value].to_s
+				value = nil.to_s if name == :help
+				puts "--#{name.to_s.ljust(pad[:name]+1)}\t#{value.ljust(pad[:value]+1)}\t#{data[:usage].ljust(pad[:usage])}"
+			end
+		end
+	end
+	private
+	def _name(name)
+		if @item.select{|k|k == name.to_sym}.count == 0
+			name = @item_key[name.to_sym]
+		else
+			name = name.to_sym
+		end
+	end
+	def _pad(items)
+		pad = {:name=>0,:value=>0,:usage=>0}
+		items.each do |name,data|
+			pad[:name] = name.to_s.length if name.to_s.length > pad[:name]
+			pad[:value] = data[:value].to_s.length if data[:value].to_s.length > pad[:value]
+			pad[:usage] = data[:usage].to_s.length if data[:usage].to_s.length > pad[:usage]
+		end
+		pad
+	end
+end

data/lib/aml/Build.rb

@@ -0,0 +1,203 @@
+class Build
+	require "aml/Argument"
+	require "aml/Compile"
+
+	@@structure = []
+	@@selfClosing = []
+
+	def initialize(attribute=nil)
+		@argument = Argument.new()
+		@argument.define('[b]uild', nil, 'input file path and name', true)
+		#@argument.define('[w]atch', false, 'watch for build updates')
+		@argument.define('[s]elf[c]losing', true, 'enable self closing tags')
+		@argument.define('[p]ath', nil, 'output file path')
+		@argument.define('[n]ame', nil, 'output file name')
+		@argument.define('[e]xtension', 'html', 'output file extension')
+		@argument.define('[o]utput', nil, 'output file path and name')
+		@argument.define('[h]elp', false, 'list all arguments')
+		@argument.parse(attribute)
+		if @argument.get('build') != nil.to_s
+			@argument.set('path', File.dirname(@argument.get('build'))) if @argument.get('path') == nil.to_s
+			@argument.set('name', File.basename(@argument.get('build'),'.*')) if @argument.get('name') == nil.to_s
+			if @argument.get('output') == nil.to_s
+				@argument.set('output', File.join(@argument.get('path'), @argument.get('name') + '.' + @argument.get('extension')))
+			else
+				@argument.set('path', File.dirname(@argument.get('output')))
+				@argument.set('name', File.basename(@argument.get('output'),'.*'))
+				@argument.set('extension', File.extname(@argument.get('output'))[1..-1])
+			end
+		end
+
+		if @argument.get('selfclosing').to_s.downcase == 'true'
+			@@selfClosing = %w[area base basefont bgsound br col frame hr img isindex input keygen link meta param source track wbr]
+		elsif @argument.get('selfclosing').to_s.downcase != 'false'
+			@@selfClosing = @argument.get('selfclosing').to_s.downcase.split(',')
+			@argument.set('selfclosing','custom')
+		end
+
+		if @argument.show_help?
+			@argument.show_help
+		elsif @argument.has_requirements?
+			@compile = Compile.new(@argument)
+			@compile.process
+			@compile.post_process
+			if @compile.log.select{|k|k[:fail]==true}.count == 0
+				console
+				process_complete
+			else
+				console
+			end
+		else
+			@argument.show_required
+		end
+	end
+
+	def console
+		@compile.log.each do |log|
+			line = log[:line] ? ":#{log[:line]}" : ""
+			puts "#{log[:file]}#{line} - #{log[:message]}"
+		end
+	end
+
+	def process_complete
+		structure = prepare_structure(prepare_string_line_merge(@compile.structure))
+		recursive_merge_lines(structure)
+		structure.each do |group|
+			recursive_close(group,0,0)
+		end
+		File.open(@argument.get('output'), 'w'){|file|
+			struct_count = @@structure.count-1
+			@@structure.each_with_index do |line,index|
+				new_line = (index < struct_count) ? $/ : ""
+				file.write(line+new_line) if line.strip.length > 0
+			end
+		}
+		puts "Build completed."
+	end
+	private
+
+	def recursive_close(struct,index=0,index_reset)
+		next_index	=	struct.key?(:line) ? index+1 : index
+		tab_index	=	"\t" * (index-index_reset)
+		opening_tag_attributes = ""
+		opening_tag = ""
+		closing_tag = ""
+		
+		#STRING
+		if(struct[:line][:type]==:string)
+			opening_tag = struct[:line][:value]
+		end
+
+		#TAG
+		if(struct[:line][:type]==:tag)
+			
+			struct[:line][:close] = :self if @@selfClosing.include? struct[:line][:name]
+
+			opening_tag_attributes = tag_line_attributes(struct[:line],"")
+			opening_tag	=	"<#{struct[:line][:name]}#{opening_tag_attributes}>"
+			closing_tag =	"</#{struct[:line][:name]}>"
+			if struct.key?(:line)
+				if struct[:line][:close] == :self
+					opening_tag	=	"<#{struct[:line][:name]}#{opening_tag_attributes} />"
+					closing_tag	=	""
+				end
+				if struct[:line][:close] == :none
+					closing_tag	=	""
+				end
+			end
+		end
+		tag_text = struct[:line][:text]
+		if struct.key?(:children)
+			new_line = "\r\n"
+			#Tab Reset
+			index_reset = struct[:line][:index]+1 if struct[:line][:reset]
+
+			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,index_reset)
+			end
+
+			@@structure << "#{tab_index}#{closing_tag}" if struct.key?(:line)
+		else
+			@@structure << "#{tab_index}#{opening_tag}#{tag_text}#{closing_tag}"
+		end
+	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
+	end
+
+	def hash_to_attribute_build(hash,base="",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}-",line)} "
+			else
+				string << "#{base}#{key}=\"#{value}\" " if value.to_s.length > 0
+			end
+		end
+		string.strip
+	end
+
+	def prepare_structure(struct,index=0,pstruct={:line=>false,:children=>[]})
+		parent_tags = struct.each_index.select{|i| struct[i][:index] == index}.compact
+		parent_struct = []
+		parent_tags.each_with_index do |struct_index,index|
+			last_struct_index = parent_tags.count > index+1 ? parent_tags[index+1]-1 : parent_tags[index]
+			last_struct_index = struct.count if(parent_tags.count == index+1)
+			parent_struct << struct[struct_index..last_struct_index]
+		end
+		parent_struct.each do |parent_structure|
+			index_struct = {}
+			index_struct[:line] = parent_structure[0]
+			c = prepare_structure(parent_structure,index+1)
+			index_struct[:children] = c if c.count > 0
+			pstruct[:children] << index_struct 
+		end
+		pstruct[:children]
+	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
+
+
+end