aml 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 269daf118df596cb722b1e749453e59a03c24fd7
-  data.tar.gz: 21f56707e802f9a1f8183b1abc65d3aee99f76b9
+  metadata.gz: d46123901065fe56b8a4c50b0f238a15ca7e59ff
+  data.tar.gz: 4a9a0cf2415bc9e6685aef3d7715c284b5051859
 SHA512:
-  metadata.gz: 1d3fc6f980e8141150b6d496840d1e71c82287eb16506aca3192c401b09b808593658be1e2ec358473dfbae3d381fd01e503ae9319931d9a39ad8a716f2166dd
-  data.tar.gz: 1995da921b1f8e4822575c52b375ca5b535648a5421f140df37334c72ee6e231620a1cc6358696517a54e278b8ddae868f1abfccd1937b60ff87e178f9aa3fe5
+  metadata.gz: 9c59f3a70af0b23062c3c5be6ece1d05661a330b64661a5decf137021f583d3ffaf66e25297f9626eb333d8dc1100a535819a58f7a30dbefb66e4413ea8b7a64
+  data.tar.gz: 1b90d8a2e4dd82266714ff9d526cdf67d7f2ae764d41d9a6e3058c9fe3f44e783512b365b7b275fef0ca779b7b924d0b7506f6e6e03ab81e25b87512b68d4fea

data/lib/aml/compile.rb

@@ -28,11 +28,12 @@ class Compile
 	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]}\" />"
+				bundle = line[:bundle]
+				bundle = "Core" if bundle == 'core'
+				line[:value] = AbstractMarkupLanguage::Base.const_get(bundle).method(line[:name]).call(line[:index],line[:attributes])
 			end
 		end
 		lines

data/lib/aml/core/method.rb

@@ -1,19 +1,24 @@
 class Core
+	
 	def self.loop(index=0, a={})
 		return "loop"
 	end
-	def self.date(index=0, a={:format=>'%Y-%m-%d %H:%M:%S'})
+	
+	def self.date(index=0, a={}, d={:format=>'%Y-%m-%d %H:%M:%S'})
+		a = d.merge(a)
 		time = Time.new
 		return time.strftime(a[:format])
 	end
+	
+	def self.year(index=0, a={})
+		return self.date(index,{:format=>'%Y'})
+	end
+
 	def self.ipsum(index=0, a={})
 		return "%p lorem ipsum sit amet dolor"
 	end
+
 	def self.random(index=0, a={})
 		return "random"
 	end
-	def self.copyright(index=0, a={})
-		time = Time.new
-		return "%p © #{time.year}"
-	end
 end

data/lib/aml/line_type.rb

@@ -37,15 +37,15 @@ LineType = Struct.new(:regex) do
 	end
 	def stringHashToHash(string)
 		hash = {}
-		regex = /:(?<name>\w+)\s?=>\s?(?<hash>{(.+?)?}|(?<quote>'|")(?<value>.+?)?\k<quote>)/
+		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
+				if thisHash["hash"].to_s[0] == "{"
 					hash[thisHash["name"].to_sym] = stringHashToHash(thisHash["hash"])
+				else
+					hash[thisHash["name"].to_sym] = thisHash["value"].to_s
 				end
 			}
 		end

metadata

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