aml 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a98badb3128b249e2d67f97138c00077cf9c29c9
-  data.tar.gz: ff741aa149c9b20fa610348db5ec7269f53d91f7
+  metadata.gz: 56b842efcba90148f5942d42734c201b2ad9a50f
+  data.tar.gz: 3fe39d419cc1b58aa15023ef03a63c66eeb9fce2
 SHA512:
-  metadata.gz: d63d25dfd2b9677de627606cc2695fb35a7ab79653471aa445fd5051a7d15244d0a974ec29d0e3dc203078779f5fbd4b22e48969965312a94d041507df23347e
-  data.tar.gz: ab2c457d4b293613ba8faf02e5dc7458d023cf5d3635f40d0352ab48ddc13181bace788cba48a8610c06461869d0cdb7838c9c594c6b28addda98b156f5c65b7
+  metadata.gz: 212d3cdc3ef4380fe682a7ae76ed1171858169bf226c87c34c898b554e432ab5cf6d289b90473bfd902c40dd97e4929fd3f98cc281a4b0fb0cd56d5984c7d8a3
+  data.tar.gz: f21a2425a47952923c091cdfd4b3438f930efe6ac77f302c422ad96049daa8a326b095602e3f5903a3cf8c4c0d611113a193e44ad04eb6b3a5bc7a9d8a71eaa4

data/lib/aml/compile.rb

@@ -7,6 +7,7 @@ class Compile
 		if(error.count == 0)
 			prepare_line_variable(parse.file[:line],definition)
 			prepare_mixin_structure(parse.file[:line],definition)
+			prepare_partial_structure(parse.file[:line],definition)
 			structure = prepare_structure(parse.file[:line])
 			structure.each do |group|
 				recursive_close(group)
@@ -15,6 +16,39 @@ class Compile
 		end
 	end
 
+	def prepare_partial_structure(lines,definition)
+		definition_partial = definition.variables.clone
+		bundle = nil
+		lines.each_with_index do |line,index|
+			if line[:type] == :partial
+				lines.delete_at index
+				bundle = line[:bundle]
+				directory = 'partial'
+				directory = File.join(line[:bundle],directory) if line[:bundle]
+				directory = File.join(AbstractMarkupLanguage::Base.basePath, directory)
+				variable = {}
+				definition.variables[line[:bundle]].each do |var,val|
+					value = val.count > 1 ? val.to_a.last[1] : val[1]
+					value = line[:attributes][var.to_sym] if line[:attributes].has_key?(var.to_sym)
+					variable[var] = {1 => value} if value != nil
+				end
+				partial = Parse.new(File.join(directory),"#{line[:name]}.aml",true, line[:bundle])
+				partial.file[:line].each_with_index do |pline,pindex|
+					pline[:index] += line[:index]
+					pline[:number] = line[:number]
+					lines.insert(index+pindex,pline)
+				end
+				definition_partial[line[:bundle]] = definition_partial[line[:bundle]].merge(variable)
+				vars = DefinitionVariable.new(definition_partial)
+				prepare_line_variable(lines,vars)
+				break
+			end
+		end
+		prepare_partial_structure(lines,definition) if(lines.select{|k|k[:type]==:partial}).count > 0
+		prepare_line_variable(lines,definition)
+		lines
+	end
+
 	def prepare_line_variable(lines,definition)
 		regex = /\@\(((?<bundle>[\w|\-]+)\.)?(?<name>[\w|\-]+)\)/
 		if lines.kind_of?(Array)
@@ -150,16 +184,17 @@ class Compile
 
 	end
 
-	def tag_line_attributes(line)
+	def tag_line_attributes(line,base="")
 		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 = ""
-			line[:attributes].each do |attribute,value|
-				attributes += " #{attribute.to_s}=\"#{value.to_s}\"" if(value.to_s.length) > 0 and value.to_s != 'nil'
-				attributes += " #{attribute.to_s}" if(value.to_s) == "nil"
+			line[:attributes].each do |key,value|
+				attributes << " #{key.to_s}=\"#{value.to_s}\"" if(value.to_s.length) > 0 and value.to_s != 'nil'
+				attributes << " #{key.to_s}" if(value.to_s) == "nil"
 			end
 			attributes
 		end
 	end
+
 end

data/lib/aml/definition.rb

@@ -1,3 +1,13 @@
+class DefinitionVariable
+	@variable = {}
+	def initialize(variable)
+		@variable = variable
+	end
+	def variable(name,line,bundle=false)
+		@variable[bundle].select{|variable| variable == name}.first[1].select{|line_number,value| line_number <= line}.values.last if (@variable.has_key?(bundle) and @variable[bundle].has_key?(name))
+	end
+end
+
 class Definition
 	def initialize(parse,scope=false,add_bundle=true,add_mixin=true,add_variable=true)
 		@bundle = {}

data/lib/aml/parse.rb

@@ -5,7 +5,7 @@ class Parse
 	def watch
 		return @watch
 	end
-	def initialize(path, file)
+	def initialize(path, file, partial=false, bundle=false)
 		@path	=	path
 		@regex	=	{
 			:attribute		=>	/@\(\:(?<name>[\w|\-]+)\)/,
@@ -26,9 +26,9 @@ class Parse
 		}
 		@file	=	{}
 		@watch	=	[]
-		read(file, false)
+		read(file, partial, bundle)
 	end
-	def read(file, partial)
+	def read(file, partial, bundle)
 		line_number = 0
 		line_struct = []
 		File.open(File.join(@path,file)).read.gsub(@regex[:comment],'').each_line do |line|
@@ -50,6 +50,8 @@ class Parse
 					struct[:bundle] = false if struct[:bundle].to_s.length == 0
 					#set undefined method bundle
 					struct[:bundle] = 'core' if struct[:type] == :method and !struct[:bundle]
+					
+					struct[:bundle] = bundle if bundle != false
 					struct[:id] = struct[:id_first].to_s.length > 0 ? struct[:id_first] : struct[:id_last]
 					struct.delete(:id_first)
 					struct.delete(:id_last)

data/lib/aml/requirement.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aml
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Daniel Esquivias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-12-10 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.