dang 1.0.0.rc5 → 1.0.0.rc6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzI4YjVhN2ZhYzk1NjE4NTY2ZGZiYWUwODk5MTE4Nzc0ZGQ3ZTMzYQ==
+    OTEyMDBmOGNiZDAzYTI2ODc2ODFlM2RiMDA5ZTJmMDhiZjc5N2NiNg==
   data.tar.gz: !binary |-
-    Y2NkODI2OWY2YzUxNzQxMjhkNTZiNzllNTMyNjVlMjRkZGRkMjQ2Mw==
+    MTQ4NjczZDM4YTE3YjU5YWVlYTBmMDNiOGE2MDJkMzQ4ZTUwOWEzMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjUyNmM0NjRmNDVmOTJjZThjZTNkNjJhZDlmM2FlMTMyMjM0ZjBiYzc0NWYy
-    OGMzOGMxOWQ1YTBlMzBkNDkxY2M5NDhmNTQ3ZDQ2N2ZlMWU3N2ZmYmQ5OTk5
-    OGRiZmQzZDI1NWJkZWI3ODlkMmEwYjZmNmRkYzliN2M1MWU4NGU=
+    MDI5OTY1NGNiZjhmYjJmMjZiMDYwOTJlZjkzNjM1MWMwMmM4MDNiMmVlMmFh
+    MmYzMDIwZDYwMjJlYzM3ODVkYmQ2MWYxNzQwNDE1ZWVlZWEyNmZhNTEwYzY0
+    NWI5ZmRiM2Y1MmQwNzljYmNhNDQyMTJmYmViMjhkMTY0YTNlMTA=
   data.tar.gz: !binary |-
-    NTI4ZTk5OGEwYTBiODA2ZWQzN2Q0ZWU1MTBiMTQ5NjYyMTBiMWExZTcxNDdm
-    MzE4YzI1ZDFkMGYzNDE5NmFlMGMwZDAyZjRiMzllYzE5M2FkM2JmMjRlY2Jl
-    ZjRhOTU2NDgzNWI2ZWQ2ZTVmMmMxMzVmZDgwYTUxN2ZmNjk0ZjQ=
+    NmM2MmM2ZTZmYjQwOGM0OWQ3MzY1OGM4ZjkzNzU0NmJhYTBlMTFiMWJhMDI3
+    MThkMzRmZTJjOTVhMzgwNmFmNmNkMzdhOTQ1NmNlMTViM2Y3NTlmNjFkZmU1
+    YzZhYzAzZjZlZDM5ODc2ZmIyMTQ3OTg2MWU0M2JkY2VjZjRjY2U=

data/README.md

@@ -51,7 +51,7 @@ Or just a snippet of dang into html:
 
 ## Current Version
 
-1.0.0.rc5
+1.0.0.rc6
 
 
 ## Requirements

data/dang.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "dang"
-  s.version = "1.0.0.rc5"
+  s.version = "1.0.0.rc6"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shane Becker"]

data/lib/dang/dang.rb

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'dang/parser'
 
 class Dang
-  VERSION  = '1.0.0.rc5'
+  VERSION  = '1.0.0.rc6'
   CODENAME = 'Zoe'
 
   @filters = {}

data/lib/dang/parser.kpeg

@@ -164,7 +164,7 @@ doctype = "!!!" space* rest:r { @doctype = r.empty? ? "html" : r }
     end = name:n ">" { n }
   slash = - "/>"
 
- marker = start | "<!" | (- end)
+ marker = start | "<!" | "<=" | "<-" | (- end)
   chunk = < (!marker .)* > { text }
 
 rclose = "->"

data/lib/dang/parser.rb

@@ -391,7 +391,9 @@ class Dang::Parser
     DOC_TYPES[@doctype].dup
   end
 
-  def compile
+  def output(env=nil)
+    doctype = html_doctype
+
     strings = @output.flatten.map do |i|
       case i
       when Literal
@@ -407,13 +409,9 @@ class Dang::Parser
       end
     end
 
-    "_out = '';\n" + strings.join(";") + ";_out"
-  end
+    code = "_out = '';\n" + strings.join(";") + ";_out"
 
-  def output(env=nil)
-    out = eval(compile, env || binding).strip
-
-    doctype = html_doctype
+    out = eval(code, env || binding).strip
 
     if doctype.empty?
       str = out
@@ -860,7 +858,7 @@ class Dang::Parser
     return _tmp
   end
 
-  # marker = (start | "<!" | - end)
+  # marker = (start | "<!" | "<=" | "<-" | - end)
   def _marker
 
     _save = self.pos
@@ -871,6 +869,12 @@ class Dang::Parser
       _tmp = match_string("<!")
       break if _tmp
       self.pos = _save
+      _tmp = match_string("<=")
+      break if _tmp
+      self.pos = _save
+      _tmp = match_string("<-")
+      break if _tmp
+      self.pos = _save
 
       _save1 = self.pos
       while true # sequence
@@ -2638,7 +2642,7 @@ class Dang::Parser
   Rules[:_pts] = rule_info("pts", "(space+ { \"\" } | < eol bs* > { text })")
   Rules[:_end] = rule_info("end", "name:n \">\" { n }")
   Rules[:_slash] = rule_info("slash", "- \"/>\"")
-  Rules[:_marker] = rule_info("marker", "(start | \"<!\" | - end)")
+  Rules[:_marker] = rule_info("marker", "(start | \"<!\" | \"<=\" | \"<-\" | - end)")
   Rules[:_chunk] = rule_info("chunk", "< (!marker .)* > { text }")
   Rules[:_rclose] = rule_info("rclose", "\"->\"")
   Rules[:_ruby] = rule_info("ruby", "\"<-\" < (!rclose .)* > rclose { code(text, false) }")

data/lib/dang/rails.rb

@@ -32,8 +32,6 @@ class Dang
       # Always make sure we return a String in the default_internal
       dang.encode!
 
-      puts "== Compiling #{dang}"
-
       parser = Dang::Parser.new(dang, true)
       unless parser.parse
         io = StringIO.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dang
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc5
+  version: 1.0.0.rc6
 platform: ruby
 authors:
 - Shane Becker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false