aml 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ef62531f3a8d1ffdab780f12c1da037b17dc65c
-  data.tar.gz: 705a2d167d9afca4bc42f3867b69023688501b4e
+  metadata.gz: 99123f17f26debf93e4218deeaba35d2d22caeac
+  data.tar.gz: ef412c33d163c79d6e4a91d34563280062846a53
 SHA512:
-  metadata.gz: c125e8e7ef2937a39422b19b2179a0b7c97d38be8d396fa8294fb8222dc655bf5dd052f918b6b54218398fb658f0ec09cec02ff7643f3d84f791977f7f79832f
-  data.tar.gz: b4073acf76760b95276c020f6f93773b0732f9c1bc37ceb75f1ea0c3112609fe2b749c9551b058903bf97ce4e6de7774a017eef8f0f8cef0e587b5192e8370b6
+  metadata.gz: fc9d6ee0f6bfd5c4567f87bb58381d634bcad4057e5b494429a6d28f357f73b1ab743bba0a3d4c104bbe04818df5f79bf4ea88c1af847ae6bf2b175111a0e384
+  data.tar.gz: 3908079e214a5517704ac033acc20034851791cf41be7962f53c81f7b15eecdcebae7c55d78a15f0a2a4e96ae3d5c0bf5ce64c2ab2661fe60cd8adc833a2ddae

data/lib/aml-bundle.rb

@@ -1,4 +1,3 @@
-require "awesome_print"
 require 'fileutils'
 require 'aml/argument'
 module AbstractMarkupLanguage
@@ -10,18 +9,13 @@ module AbstractMarkupLanguage
 			#argument.create_action('update')
 			#argument.create_action('delete')
 			
-			
-			
+			argument.required('action','The required --generate argument has not been defined.')
 			argument.required('name','The required --name argument has not been defined.')
 			if argument.has_requirements?#and directory exists false?)
 				basePath = File.dirname('~')
 
 				argument.create_if_empty('--','bundle')
 
-				#aml-bundle install
-				#aml-bundle create
-				#aml-bundle 
-
 				argument.create_if_empty('method','')
 				argument.create_if_empty('mixin','')
 				argument.create_if_empty('partial','')

data/lib/aml/compile.rb

@@ -6,8 +6,17 @@ class Compile
 		error.compile(parse,definition,error)
 		if(error.count == 0)
 			prepare_line_variable(parse.file[:line],definition)
+			lines = []
+			parse.file[:line].each do |line|
+				lines << post_prepare_line_variable(line)
+			end
+
+			parse.file[:line] = lines
+
 			prepare_mixin_structure(parse.file[:line],definition)
 			prepare_partial_structure(parse.file[:line],definition)
+			prepare_method_structure(parse.file[:line],definition)
+			
 			structure = prepare_structure(parse.file[:line])
 			structure.each do |group|
 				recursive_close(group)
@@ -16,6 +25,17 @@ class Compile
 		end
 	end
 
+	def prepare_method_structure(lines,definition)
+		#Placeholder
+		lines.each_with_index do |line,index|
+			if line[:type] == :method
+				line[:type] = :string
+				line[:value] = "<aml bundle=\"#{line[:bundle]}\" method=\"#{line[:name]}\" />"
+			end
+		end
+		lines
+	end
+
 	def prepare_partial_structure(lines,definition)
 		definition_partial = definition.variables.clone
 		bundle = nil
@@ -57,7 +77,7 @@ class Compile
 				line = line_variable_replace(line,definition)
 			end
 		else
-			lines = line_variable_replace(lines,definition)		
+			lines = line_variable_replace(lines,definition)
 		end
 		check = 0
 		if lines.kind_of?(Array)
@@ -69,6 +89,43 @@ class Compile
 		lines
 	end
 
+	def post_prepare_line_variable(line)
+		types	=	{
+			:method			=>	LineType.new(/^(\s{1,})?::((?<bundle>[\w|\-]+)\.)?(?<name>[\w|\-]+)(\{(?<attributes>.+)\})?/),
+			: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>.+)?/)
+		}
+		if line[:type] == :string
+			types.each do |type, line_type|
+				if match = line_type.match?(line[:value])
+					struct = Hash[match.names.zip(match.captures)]
+					struct = Hash[struct.map{|(k,v)| [k.to_sym,v]}]
+					struct[:index] = line[:index]
+					struct[:number] = line[:number]
+					struct[:type] = type
+					match.names.each do |name|
+						struct[name.to_sym] = line_type.send(name.to_s, match)
+					end
+					if struct[:name].to_s[0,1] == '.'
+						#set undefined bundle
+						struct[:bundle] = 'core'
+						struct[:name] = struct[:name][1,struct[:name].length] 
+					end
+					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[:id] = struct[:id_first].to_s.length > 0 ? struct[:id_first] : struct[:id_last]
+					struct.delete(:id_first)
+					struct.delete(:id_last)
+					line = struct
+					break
+				end
+			end
+		end
+		line
+	end
+
 	def line_variable_replace(line,definition)
 		regex = /\@\(((?<bundle>[\w|\-]+)\.)?(?<name>[\w|\-]+)\)/
 		%w"text value".each do |key|
@@ -79,10 +136,11 @@ class Compile
 		end
 		if line.has_key?(:attributes) and line[:attributes].count > 0
 			line[:attributes].each do |k,v|
-				line[:attributes][k] = line[:attributes][k].to_s.gsub(regex){definition.variable($2,line[:number],$1.to_s.length > 0 ? $1 : false).to_s} if v.to_s.length > 0
+				if v.is_a?(Hash) == false
+					line[:attributes][k] = line[:attributes][k].to_s.gsub(regex){definition.variable($2,line[:number],$1.to_s.length > 0 ? $1 : false).to_s} if v.to_s.length > 0
+				end
 			end
 		end
-		line
 	end
 
 	def line_attribute_replace(line,default_attributes,mixin_attributes)
@@ -189,13 +247,22 @@ class Compile
 		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 |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
+			attributes = hash_to_attribute_build(line[:attributes])
+			attributes = " #{attributes}" if(attributes.length > 0)
 		end
 	end
 
+	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}-")} "
+			else
+				string << "#{base}#{key}=\"#{value}\" "
+			end
+		end
+		string.strip
+	end
 end

data/lib/aml/core/mixin.aml

@@ -64,7 +64,7 @@
 %!-- HELPERS ---%
 
 %%css(:href=>'', :media=>'screen'){
-	%/link{:href=>'@(:href)',:media=>'@(:media)', :rel=>'stylesheet'}
+	%/link{:href=>'@(:href)', :media=>'@(:media)', :rel=>'stylesheet'}
 }
 %%js(:src=>''){
 	%script{:type=>'text/javascript', :src=>'@(:src)'}

data/lib/aml/line_type.rb

@@ -4,7 +4,7 @@ LineType = Struct.new(:regex) do
 	end
 	def attributes(match)
 		begin
-			eval("{#{match[:attributes].to_s}}")
+			stringHashToHash(match[:attributes])
 		rescue Exception => e
 			{:abstract_markup_language_exception=>true}
 		end
@@ -35,4 +35,20 @@ LineType = Struct.new(:regex) do
 		type = %w(tag self none)
 		type[match[:close].to_s.length]
 	end
+	def stringHashToHash(string)
+		hash = {}
+		regex = /:(?<name>\w+)\s?=>\s?(?<hash>{(.+?)?}|(?<quote>'|")(?<value>.+?)?\k<quote>)/
+		names = regex.names
+		if string != nil
+			string.scan(regex){|match|
+				thisHash = Hash[names.zip(match)]
+				if thisHash["value"] != nil
+					hash[thisHash["name"].to_sym] = thisHash["value"].to_s
+				else
+					hash[thisHash["name"].to_sym] = stringHashToHash(thisHash["hash"])
+				end
+			}
+		end
+		hash
+	end
 end

data/lib/aml/parse.rb

@@ -50,7 +50,6 @@ 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)

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: aml
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Daniel Esquivias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-02-01 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.
-email: daniel@aml-info.org
+email: daniel@abstractmarkup.com
 executables:
 - aml
 - aml-bundle
@@ -34,7 +34,7 @@ files:
 - lib/aml/watch.rb
 - lib/aml/compile.rb
 - lib/aml/requirement.rb
-homepage: https://aml-info.org/
+homepage: https://abstractmarkup.com
 licenses:
 - MIT
 metadata: {}