dang 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8392c3b94db03612f7a2ea518733d37540b7439
-  data.tar.gz: 2244fda90a145eb7fb343df496c1ea6f9ad9d28f
+  metadata.gz: d7de06baa99ae1e305941525514814cfed5206f2
+  data.tar.gz: 30763edb48c45e9242a76a27ad9f090d89025a50
 SHA512:
-  metadata.gz: 612aa96b31e4e957fbda3f44ff4cb48a5ed3408b1ddb83c0af78b3d87b2684dec3dd63eb6b43e2bc47989f63980960cbff238b23b359d78397cb02bccad063b6
-  data.tar.gz: a03efa39aa4fe532c8390d84d19722dc49cf16e0763e36bdeef1bbee4e6b0d4dcc9386bd88d3a0dd06f1d3dbfbe5d97b51ba2f81523eec087ccc6ddfdd2b5ab0
+  metadata.gz: a8ca0079ed5a497a796bdf81f88f134f3f09d2b6f96670aef9cf20a83630418dd1a4a87199700a5a74a72afa3da9f1d97adaf0fbbafd35d3966e40645dac62c7
+  data.tar.gz: 8470423a9c391400fd10cfcf8c1671fe7f232e5d58286a36cc1e6b90f1592385d1a3a39576b86856dfea917f4914ff18be48d84066056013a332228cd9a4f406

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dang (1.0.0)
+    dang (2.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -14,7 +14,7 @@ GEM
     kpeg (1.0.0)
     minitest (5.4.3)
     rake (10.3.2)
-    rdoc (3.12.2)
+    rdoc (4.1.2)
       json (~> 1.4)
 
 PLATFORMS
@@ -28,4 +28,4 @@ DEPENDENCIES
   kpeg
   minitest
   rake
-  rdoc (~> 3.10)
+  rdoc (~> 4.0)

data/History.md

@@ -1,5 +1,15 @@
 # History
 
+## 2.1.0 / 2015-02-11
+
+### Minor Feature
+
+1. Added interpolation in tag attributes
+
+   ```dang
+   <time[datetime=<| Time.now.strftime(%Y-%m-%d) |>] <| Time.now |> time>
+   ```
+
 ## 2.0.0 / 2014-11-20
 
 ### Major Features

data/Manifest.txt

@@ -5,7 +5,6 @@ History.md
 Manifest.txt
 README.md
 Rakefile
-TODO.md
 bin/dang
 dang.gemspec
 lib/dang.rb
@@ -13,27 +12,27 @@ lib/dang/dang.rb
 lib/dang/parser.kpeg
 lib/dang/parser.rb
 lib/dang/rails.rb
-spectory/attribute_spec.rb
-spectory/comment_spec.rb
-spectory/conditional_comment_spec.rb
-spectory/data_attribute_spec.rb
-spectory/doctype_spec.rb
-spectory/embedded_ruby_spec.rb
-spectory/file_spec.rb
-spectory/files/iamshane-com.html
-spectory/files/iamshane-com.html.dang
-spectory/filter_spec.rb
-spectory/helper.rb
-spectory/sanity_spec.rb
-spectory/script_spec.rb
-spectory/selector_spec.rb
-spectory/style_spec.rb
-spectory/tag_spec.rb
-spectory/v2/array_classes_spec.rb
-spectory/v2/filters/markdown_spec.rb
-spectory/v2/hash_attribute_spec.rb
-spectory/v2/interpolation_spec.rb
-spectory/v2/script_exception_spec.rb
-spectory/v2/style_exception_spec.rb
-spectory/well_formedness_spec.rb
-spectory/whitespace_spec.rb
+specs/attribute_spec.rb
+specs/comment_spec.rb
+specs/conditional_comment_spec.rb
+specs/data_attribute_spec.rb
+specs/doctype_spec.rb
+specs/embedded_ruby_spec.rb
+specs/file_spec.rb
+specs/filter_spec.rb
+specs/helper.rb
+specs/interpolation_spec.rb
+specs/sanity_spec.rb
+specs/script_spec.rb
+specs/selector_spec.rb
+specs/style_spec.rb
+specs/tag_spec.rb
+specs/well_formedness_spec.rb
+specs/whitespace_spec.rb
+specs/experiments/array_classes_spec.rb
+specs/experiments/filters/markdown_spec.rb
+specs/experiments/hash_attribute_spec.rb
+specs/experiments/script_exception_spec.rb
+specs/experiments/style_exception_spec.rb
+specs/files/iamshane-com.html
+specs/files/iamshane-com.html.dang

data/README.md

@@ -51,7 +51,7 @@ Or just a snippet of dang into html:
 
 ## Current Version
 
-2.0.0
+2.1.0
 
 
 ## Requirements
@@ -98,8 +98,8 @@ This will install any missing dependencies.
 
 ## Authors
 
-  * Shane Becker / [@veganstraightedge](https://github.com/veganstraightedge)
-  * Evan Phoenix / [@evanphx](https://github.com/evanphx)
+* Shane Becker / [@veganstraightedge](https://github.com/veganstraightedge)
+* Evan Phoenix / [@evanphx](https://github.com/evanphx)
 
 
 ## Contributing

data/Rakefile

@@ -25,16 +25,16 @@ $:.unshift "./lib"
 task :default => :spec
 
 task :spec do
-  Dir[File.dirname(__FILE__) + "/spectory/**/*_spec.rb"].each do |path|
+  Dir[File.dirname(__FILE__) + "/specs/**/*_spec.rb"].each do |path|
     require path
   end
 
   Minitest.autorun
 end
 
-file "#{HOE.spec.name}.gemspec" => ['Rakefile', "lib/dang/dang.rb"] do |t|
+file "#{HOE.spec.name}.gemspec" => ["Rakefile", "lib/dang/dang.rb"] do |t|
   puts "Generating #{t.name}"
-  File.open(t.name, 'wb') { |f| f.write HOE.spec.to_ruby }
+  File.open(t.name, "wb") { |f| f.write HOE.spec.to_ruby }
 end
 
 desc "Generate or update the standalone gemspec file for the project"

data/dang.gemspec

@@ -1,19 +1,19 @@
 # -*- encoding: utf-8 -*-
-# stub: dang 2.0.0 ruby lib
+# stub: dang 2.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "dang"
-  s.version = "2.0.0"
+  s.version = "2.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Shane Becker"]
-  s.date = "2014-11-20"
+  s.date = "2015-02-12"
   s.description = "Dang is a Ruby templating language.\nIt uses angle brackets and CSS syntax.\nSomewhere between ERB and Haml."
   s.email = ["veganstraightedge@gmail.com"]
   s.executables = ["dang"]
-  s.extra_rdoc_files = ["History.md", "Manifest.txt", "README.md", "TODO.md"]
-  s.files = [".autotest", ".gitignore", ".hoeignore", ".travis.yml", "Gemfile", "Gemfile.lock", "History.md", "Manifest.txt", "README.md", "Rakefile", "TODO.md", "bin/dang", "dang.gemspec", "lib/dang.rb", "lib/dang/dang.rb", "lib/dang/parser.kpeg", "lib/dang/parser.rb", "lib/dang/rails.rb"]
+  s.extra_rdoc_files = ["History.md", "Manifest.txt", "README.md"]
+  s.files = [".hoeignore", "Gemfile", "Gemfile.lock", "History.md", "Manifest.txt", "README.md", "Rakefile", "bin/dang", "dang.gemspec", "lib/dang.rb", "lib/dang/dang.rb", "lib/dang/parser.kpeg", "lib/dang/parser.rb", "lib/dang/rails.rb", "specs/attribute_spec.rb", "specs/comment_spec.rb", "specs/conditional_comment_spec.rb", "specs/data_attribute_spec.rb", "specs/doctype_spec.rb", "specs/embedded_ruby_spec.rb", "specs/experiments/array_classes_spec.rb", "specs/experiments/filters/markdown_spec.rb", "specs/experiments/hash_attribute_spec.rb", "specs/experiments/script_exception_spec.rb", "specs/experiments/style_exception_spec.rb", "specs/file_spec.rb", "specs/files/iamshane-com.html", "specs/files/iamshane-com.html.dang", "specs/filter_spec.rb", "specs/helper.rb", "specs/interpolation_spec.rb", "specs/sanity_spec.rb", "specs/script_spec.rb", "specs/selector_spec.rb", "specs/style_spec.rb", "specs/tag_spec.rb", "specs/well_formedness_spec.rb", "specs/whitespace_spec.rb"]
   s.homepage = "https://github.com/veganstraightedge/dang"
   s.licenses = ["PUBLIC DOMAIN", "CC0"]
   s.rdoc_options = ["--main", "README.md"]
@@ -25,13 +25,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
-      s.add_development_dependency(%q<hoe>, ["~> 3.13"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.12"])
     else
       s.add_dependency(%q<rdoc>, ["~> 4.0"])
-      s.add_dependency(%q<hoe>, ["~> 3.13"])
+      s.add_dependency(%q<hoe>, ["~> 3.12"])
     end
   else
     s.add_dependency(%q<rdoc>, ["~> 4.0"])
-    s.add_dependency(%q<hoe>, ["~> 3.13"])
+    s.add_dependency(%q<hoe>, ["~> 3.12"])
   end
 end

data/lib/dang/dang.rb

@@ -1,10 +1,10 @@
-require 'stringio'
-require 'rubygems'
-require 'dang/parser'
+require "stringio"
+require "rubygems"
+require "dang/parser"
 
 class Dang
-  VERSION  = '2.0.0'
-  CODENAME = 'Abigail'
+  VERSION  = "2.1.0"
+  CODENAME = "Kira"
 
   @filters = {}
 
@@ -28,7 +28,7 @@ class Dang
       if filter = @filters[name]
         return filter[text]
       else
-        raise "Unknown filter: \"#{name}\""
+        raise "Unknown filter: '#{name}'"
       end
     end
   end

data/lib/dang/parser.kpeg

@@ -80,21 +80,47 @@
     out = []
     classes = []
 
-    (at+sel).each do |key,val|
+    (at+sel).flatten.each do |pair|
+      key = pair.key
+      val = pair.value
+
       if key == "class"
+        val = val.str if val.kind_of? Literal
         classes.unshift val
       elsif val == true
         out << "#{key}"
+        out << " "
       else
-        out << "#{key}='#{val}'"
+        out << "#{key}='"
+        out << val
+        out << "'"
+        out << " "
       end
     end
 
     unless classes.empty?
-      out.unshift "class='#{classes.join(' ')}'"
+      expanded = ["class='"]
+      classes.each do |c|
+        expanded << c
+        expanded << " "
+      end
+
+      expanded[-1] = "'"
+
+      classes = expanded
+
+      if out.empty?
+        return classes
+      end
+
+      out = classes + [" "] + out
+    end
+
+    if out.last == " "
+      out.pop
     end
 
-    out.join(' ')
+    out
   end
 
   class Literal
@@ -124,7 +150,7 @@
   end
 
   def joinm(*elems)
-    elems.map do |i|
+    elems.flatten.map do |i|
       if i.kind_of? String
         Literal.new(i)
       else
@@ -133,6 +159,8 @@
     end
   end
 
+  Pair = Struct.new(:key, :value)
+
   def join(f,b)
     f = Literal.new(f) if f.kind_of? String
     b = Literal.new(b) if b.kind_of? String
@@ -182,16 +210,22 @@ pclose = "|>"
     key = name
         | "'" < /[^'\n]*/ > "'" { text }
 
+ valsrt = "]" | "<|"
+ valchk = < (!valsrt .)* > { text }
+ valprt = puby | valchk
+ valraw = valprt:p valraw:b { join(p,b) }
+        | valprt
+
     val = "'" < /[^'\n]*/ > "'" { text }
-        | < (!"]" .)* > { text }
+        | valraw
 
-  dattr = "[" key:k "=" val:v "]" { "data-#{k}='#{v}'" }
- dattrs = dattr:a dattrs:l { "#{a} #{l}" }
-        | dattr
+  dattr = "[" key:k "=" val:v "]" { Pair.new("data-#{k}", v) }
+ dattrs = dattr:a dattrs:l { [a] + l }
+        | dattr:a { [a] }
 
-   attr = "[data" dattrs:t "]" { [t,true] }
-        | "[" key:k "=" val:v "]" { [k, v] }
-        | "[" key:k "]" { [k,true] }
+   attr = "[data" dattrs:t "]" { t }
+        | "[" key:k "=" val:v "]" { Pair.new(k, v) }
+        | "[" key:k "]" { Pair.new(k,true) }
   attrs = attr:a attrs:l { [a] + l }
         | attr:a { [a] }
 
@@ -205,8 +239,8 @@ comment = "<!" space+ < "[" space* cc_if (!"]" .)* "]" > space+ "!>"
           { "<!--#{text}-->" }
 
  simple = /[a-zA-Z0-9_\-]+/
- select = "#" < simple > { ["id", text] }
-        | "." < simple > { ["class", text] }
+ select = "#" < simple > { Pair.new("id", text) }
+        | "." < simple > { Pair.new("class", text) }
 
 selects = select:s selects:t { [s] + t }
         | select:s { [s] }
@@ -219,23 +253,23 @@ filter = "<:" name:n bs* < (!end_filter(n) .)* > end_filter(n)
     tag = start:l slash { "<#{l} />" }
         | start:l space+ end:r { "<#{l}></#{r}>" }
         | start:l attrs:a slash
-          { "<#{l} #{attrs(a)} />" }
+          { joinm "<#{l} ", attrs(a), " />" }
         | start:l selects:t slash
-          { "<#{l} #{attrs(t)} />" }
+          { joinm "<#{l} ",  attrs(t), " />" }
         | start:l selects:t attrs:a slash
-          { "<#{l} #{attrs(t,a)} />" }
+          { joinm "<#{l} ", attrs(t,a), " />" }
         | start:l attrs:a space+ end:r
-          { "<#{l} #{attrs(a)}></#{r}>" }
+          { joinm "<#{l} ", attrs(a), "></#{r}>" }
         | start:l selects:t space+ end:r
-          { "<#{l} #{attrs(t)}></#{r}>" }
+          { joinm "<#{l} ", attrs(t), "></#{r}>" }
         | start:l selects:t attrs:a space+ end:r
-          { "<#{l} #{attrs(t,a)}></#{r}>" }
+          { joinm "<#{l} ", attrs(t,a), "></#{r}>" }
         | start:l selects:t attrs:a pts body:b pts:es end:r
-          { joinm "<#{l} #{attrs(a,t)}>",b,es,"</#{r}>" }
+          { joinm "<#{l} ", attrs(a,t), ">",b,es,"</#{r}>" }
         | start:l attrs:a pts body:b pts:es end:r
-          { joinm "<#{l} #{attrs(a)}>", b, es, "</#{r}>" }
+          { joinm "<#{l} ", attrs(a), ">", b, es, "</#{r}>" }
         | start:l selects:t pts:s body:b pts:es end:r
-          { joinm "<#{l} #{attrs(t)}>",s, b, es, "</#{r}>" }
+          { joinm "<#{l} ", attrs(t), ">",s, b, es, "</#{r}>" }
         | start:l pts:s body:b pts:es end:r
           { joinm "<#{l}>", s, b, es, "</#{r}>" }
 

data/lib/dang/parser.rb

@@ -435,21 +435,47 @@ class Dang::Parser
     out = []
     classes = []
 
-    (at+sel).each do |key,val|
+    (at+sel).flatten.each do |pair|
+      key = pair.key
+      val = pair.value
+
       if key == "class"
+        val = val.str if val.kind_of? Literal
         classes.unshift val
       elsif val == true
         out << "#{key}"
+        out << " "
       else
-        out << "#{key}='#{val}'"
+        out << "#{key}='"
+        out << val
+        out << "'"
+        out << " "
       end
     end
 
     unless classes.empty?
-      out.unshift "class='#{classes.join(' ')}'"
+      expanded = ["class='"]
+      classes.each do |c|
+        expanded << c
+        expanded << " "
+      end
+
+      expanded[-1] = "'"
+
+      classes = expanded
+
+      if out.empty?
+        return classes
+      end
+
+      out = classes + [" "] + out
     end
 
-    out.join(' ')
+    if out.last == " "
+      out.pop
+    end
+
+    out
   end
 
   class Literal
@@ -479,7 +505,7 @@ class Dang::Parser
   end
 
   def joinm(*elems)
-    elems.map do |i|
+    elems.flatten.map do |i|
       if i.kind_of? String
         Literal.new(i)
       else
@@ -488,6 +514,8 @@ class Dang::Parser
     end
   end
 
+  Pair = Struct.new(:key, :value)
+
   def join(f,b)
     f = Literal.new(f) if f.kind_of? String
     b = Literal.new(b) if b.kind_of? String
@@ -1211,34 +1239,110 @@ class Dang::Parser
     return _tmp
   end
 
-  # val = ("'" < /[^'\n]*/ > "'" { text } | < (!"]" .)* > { text })
-  def _val
+  # valsrt = ("]" | "<|")
+  def _valsrt
+
+    _save = self.pos
+    while true # choice
+      _tmp = match_string("]")
+      break if _tmp
+      self.pos = _save
+      _tmp = match_string("<|")
+      break if _tmp
+      self.pos = _save
+      break
+    end # end choice
+
+    set_failed_rule :_valsrt unless _tmp
+    return _tmp
+  end
+
+  # valchk = < (!valsrt .)* > { text }
+  def _valchk
+
+    _save = self.pos
+    while true # sequence
+      _text_start = self.pos
+      while true
+
+        _save2 = self.pos
+        while true # sequence
+          _save3 = self.pos
+          _tmp = apply(:_valsrt)
+          _tmp = _tmp ? nil : true
+          self.pos = _save3
+          unless _tmp
+            self.pos = _save2
+            break
+          end
+          _tmp = get_byte
+          unless _tmp
+            self.pos = _save2
+          end
+          break
+        end # end sequence
+
+        break unless _tmp
+      end
+      _tmp = true
+      if _tmp
+        text = get_text(_text_start)
+      end
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  text ; end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
+
+    set_failed_rule :_valchk unless _tmp
+    return _tmp
+  end
+
+  # valprt = (puby | valchk)
+  def _valprt
+
+    _save = self.pos
+    while true # choice
+      _tmp = apply(:_puby)
+      break if _tmp
+      self.pos = _save
+      _tmp = apply(:_valchk)
+      break if _tmp
+      self.pos = _save
+      break
+    end # end choice
+
+    set_failed_rule :_valprt unless _tmp
+    return _tmp
+  end
+
+  # valraw = (valprt:p valraw:b { join(p,b) } | valprt)
+  def _valraw
 
     _save = self.pos
     while true # choice
 
       _save1 = self.pos
       while true # sequence
-        _tmp = match_string("'")
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _text_start = self.pos
-        _tmp = scan(/\A(?-mix:[^'\n]*)/)
-        if _tmp
-          text = get_text(_text_start)
-        end
+        _tmp = apply(:_valprt)
+        p = @result
         unless _tmp
           self.pos = _save1
           break
         end
-        _tmp = match_string("'")
+        _tmp = apply(:_valraw)
+        b = @result
         unless _tmp
           self.pos = _save1
           break
         end
-        @result = begin;  text ; end
+        @result = begin;  join(p,b) ; end
         _tmp = true
         unless _tmp
           self.pos = _save1
@@ -1248,47 +1352,54 @@ class Dang::Parser
 
       break if _tmp
       self.pos = _save
+      _tmp = apply(:_valprt)
+      break if _tmp
+      self.pos = _save
+      break
+    end # end choice
 
-      _save2 = self.pos
-      while true # sequence
-        _text_start = self.pos
-        while true
+    set_failed_rule :_valraw unless _tmp
+    return _tmp
+  end
 
-          _save4 = self.pos
-          while true # sequence
-            _save5 = self.pos
-            _tmp = match_string("]")
-            _tmp = _tmp ? nil : true
-            self.pos = _save5
-            unless _tmp
-              self.pos = _save4
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save4
-            end
-            break
-          end # end sequence
+  # val = ("'" < /[^'\n]*/ > "'" { text } | valraw)
+  def _val
 
-          break unless _tmp
+    _save = self.pos
+    while true # choice
+
+      _save1 = self.pos
+      while true # sequence
+        _tmp = match_string("'")
+        unless _tmp
+          self.pos = _save1
+          break
         end
-        _tmp = true
+        _text_start = self.pos
+        _tmp = scan(/\A(?-mix:[^'\n]*)/)
         if _tmp
           text = get_text(_text_start)
         end
         unless _tmp
-          self.pos = _save2
+          self.pos = _save1
+          break
+        end
+        _tmp = match_string("'")
+        unless _tmp
+          self.pos = _save1
           break
         end
         @result = begin;  text ; end
         _tmp = true
         unless _tmp
-          self.pos = _save2
+          self.pos = _save1
         end
         break
       end # end sequence
 
+      break if _tmp
+      self.pos = _save
+      _tmp = apply(:_valraw)
       break if _tmp
       self.pos = _save
       break
@@ -1298,7 +1409,7 @@ class Dang::Parser
     return _tmp
   end
 
-  # dattr = "[" key:k "=" val:v "]" { "data-#{k}='#{v}'" }
+  # dattr = "[" key:k "=" val:v "]" { Pair.new("data-#{k}", v) }
   def _dattr
 
     _save = self.pos
@@ -1330,7 +1441,7 @@ class Dang::Parser
         self.pos = _save
         break
       end
-      @result = begin;  "data-#{k}='#{v}'" ; end
+      @result = begin;  Pair.new("data-#{k}", v) ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -1342,7 +1453,7 @@ class Dang::Parser
     return _tmp
   end
 
-  # dattrs = (dattr:a dattrs:l { "#{a} #{l}" } | dattr)
+  # dattrs = (dattr:a dattrs:l { [a] + l } | dattr:a { [a] })
   def _dattrs
 
     _save = self.pos
@@ -1362,7 +1473,7 @@ class Dang::Parser
           self.pos = _save1
           break
         end
-        @result = begin;  "#{a} #{l}" ; end
+        @result = begin;  [a] + l ; end
         _tmp = true
         unless _tmp
           self.pos = _save1
@@ -1372,7 +1483,23 @@ class Dang::Parser
 
       break if _tmp
       self.pos = _save
-      _tmp = apply(:_dattr)
+
+      _save2 = self.pos
+      while true # sequence
+        _tmp = apply(:_dattr)
+        a = @result
+        unless _tmp
+          self.pos = _save2
+          break
+        end
+        @result = begin;  [a] ; end
+        _tmp = true
+        unless _tmp
+          self.pos = _save2
+        end
+        break
+      end # end sequence
+
       break if _tmp
       self.pos = _save
       break
@@ -1382,7 +1509,7 @@ class Dang::Parser
     return _tmp
   end
 
-  # attr = ("[data" dattrs:t "]" { [t,true] } | "[" key:k "=" val:v "]" { [k, v] } | "[" key:k "]" { [k,true] })
+  # attr = ("[data" dattrs:t "]" { t } | "[" key:k "=" val:v "]" { Pair.new(k, v) } | "[" key:k "]" { Pair.new(k,true) })
   def _attr
 
     _save = self.pos
@@ -1406,7 +1533,7 @@ class Dang::Parser
           self.pos = _save1
           break
         end
-        @result = begin;  [t,true] ; end
+        @result = begin;  t ; end
         _tmp = true
         unless _tmp
           self.pos = _save1
@@ -1446,7 +1573,7 @@ class Dang::Parser
           self.pos = _save2
           break
         end
-        @result = begin;  [k, v] ; end
+        @result = begin;  Pair.new(k, v) ; end
         _tmp = true
         unless _tmp
           self.pos = _save2
@@ -1475,7 +1602,7 @@ class Dang::Parser
           self.pos = _save3
           break
         end
-        @result = begin;  [k,true] ; end
+        @result = begin;  Pair.new(k,true) ; end
         _tmp = true
         unless _tmp
           self.pos = _save3
@@ -1866,7 +1993,7 @@ class Dang::Parser
     return _tmp
   end
 
-  # select = ("#" < simple > { ["id", text] } | "." < simple > { ["class", text] })
+  # select = ("#" < simple > { Pair.new("id", text) } | "." < simple > { Pair.new("class", text) })
   def _select
 
     _save = self.pos
@@ -1888,7 +2015,7 @@ class Dang::Parser
           self.pos = _save1
           break
         end
-        @result = begin;  ["id", text] ; end
+        @result = begin;  Pair.new("id", text) ; end
         _tmp = true
         unless _tmp
           self.pos = _save1
@@ -1915,7 +2042,7 @@ class Dang::Parser
           self.pos = _save2
           break
         end
-        @result = begin;  ["class", text] ; end
+        @result = begin;  Pair.new("class", text) ; end
         _tmp = true
         unless _tmp
           self.pos = _save2
@@ -2101,7 +2228,7 @@ class Dang::Parser
     return _tmp
   end
 
-  # tag = (start:l slash { "<#{l} />" } | start:l space+ end:r { "<#{l}></#{r}>" } | start:l attrs:a slash { "<#{l} #{attrs(a)} />" } | start:l selects:t slash { "<#{l} #{attrs(t)} />" } | start:l selects:t attrs:a slash { "<#{l} #{attrs(t,a)} />" } | start:l attrs:a space+ end:r { "<#{l} #{attrs(a)}></#{r}>" } | start:l selects:t space+ end:r { "<#{l} #{attrs(t)}></#{r}>" } | start:l selects:t attrs:a space+ end:r { "<#{l} #{attrs(t,a)}></#{r}>" } | start:l selects:t attrs:a pts body:b pts:es end:r { joinm "<#{l} #{attrs(a,t)}>",b,es,"</#{r}>" } | start:l attrs:a pts body:b pts:es end:r { joinm "<#{l} #{attrs(a)}>", b, es, "</#{r}>" } | start:l selects:t pts:s body:b pts:es end:r { joinm "<#{l} #{attrs(t)}>",s, b, es, "</#{r}>" } | start:l pts:s body:b pts:es end:r { joinm "<#{l}>", s, b, es, "</#{r}>" })
+  # tag = (start:l slash { "<#{l} />" } | start:l space+ end:r { "<#{l}></#{r}>" } | start:l attrs:a slash { joinm "<#{l} ", attrs(a), " />" } | start:l selects:t slash { joinm "<#{l} ",  attrs(t), " />" } | start:l selects:t attrs:a slash { joinm "<#{l} ", attrs(t,a), " />" } | start:l attrs:a space+ end:r { joinm "<#{l} ", attrs(a), "></#{r}>" } | start:l selects:t space+ end:r { joinm "<#{l} ", attrs(t), "></#{r}>" } | start:l selects:t attrs:a space+ end:r { joinm "<#{l} ", attrs(t,a), "></#{r}>" } | start:l selects:t attrs:a pts body:b pts:es end:r { joinm "<#{l} ", attrs(a,t), ">",b,es,"</#{r}>" } | start:l attrs:a pts body:b pts:es end:r { joinm "<#{l} ", attrs(a), ">", b, es, "</#{r}>" } | start:l selects:t pts:s body:b pts:es end:r { joinm "<#{l} ", attrs(t), ">",s, b, es, "</#{r}>" } | start:l pts:s body:b pts:es end:r { joinm "<#{l}>", s, b, es, "</#{r}>" })
   def _tag
 
     _save = self.pos
@@ -2190,7 +2317,7 @@ class Dang::Parser
           self.pos = _save4
           break
         end
-        @result = begin;  "<#{l} #{attrs(a)} />" ; end
+        @result = begin;  joinm "<#{l} ", attrs(a), " />" ; end
         _tmp = true
         unless _tmp
           self.pos = _save4
@@ -2220,7 +2347,7 @@ class Dang::Parser
           self.pos = _save5
           break
         end
-        @result = begin;  "<#{l} #{attrs(t)} />" ; end
+        @result = begin;  joinm "<#{l} ",  attrs(t), " />" ; end
         _tmp = true
         unless _tmp
           self.pos = _save5
@@ -2256,7 +2383,7 @@ class Dang::Parser
           self.pos = _save6
           break
         end
-        @result = begin;  "<#{l} #{attrs(t,a)} />" ; end
+        @result = begin;  joinm "<#{l} ", attrs(t,a), " />" ; end
         _tmp = true
         unless _tmp
           self.pos = _save6
@@ -2302,7 +2429,7 @@ class Dang::Parser
           self.pos = _save7
           break
         end
-        @result = begin;  "<#{l} #{attrs(a)}></#{r}>" ; end
+        @result = begin;  joinm "<#{l} ", attrs(a), "></#{r}>" ; end
         _tmp = true
         unless _tmp
           self.pos = _save7
@@ -2348,7 +2475,7 @@ class Dang::Parser
           self.pos = _save9
           break
         end
-        @result = begin;  "<#{l} #{attrs(t)}></#{r}>" ; end
+        @result = begin;  joinm "<#{l} ", attrs(t), "></#{r}>" ; end
         _tmp = true
         unless _tmp
           self.pos = _save9
@@ -2400,7 +2527,7 @@ class Dang::Parser
           self.pos = _save11
           break
         end
-        @result = begin;  "<#{l} #{attrs(t,a)}></#{r}>" ; end
+        @result = begin;  joinm "<#{l} ", attrs(t,a), "></#{r}>" ; end
         _tmp = true
         unless _tmp
           self.pos = _save11
@@ -2454,7 +2581,7 @@ class Dang::Parser
           self.pos = _save13
           break
         end
-        @result = begin;  joinm "<#{l} #{attrs(a,t)}>",b,es,"</#{r}>" ; end
+        @result = begin;  joinm "<#{l} ", attrs(a,t), ">",b,es,"</#{r}>" ; end
         _tmp = true
         unless _tmp
           self.pos = _save13
@@ -2502,7 +2629,7 @@ class Dang::Parser
           self.pos = _save14
           break
         end
-        @result = begin;  joinm "<#{l} #{attrs(a)}>", b, es, "</#{r}>" ; end
+        @result = begin;  joinm "<#{l} ", attrs(a), ">", b, es, "</#{r}>" ; end
         _tmp = true
         unless _tmp
           self.pos = _save14
@@ -2551,7 +2678,7 @@ class Dang::Parser
           self.pos = _save15
           break
         end
-        @result = begin;  joinm "<#{l} #{attrs(t)}>",s, b, es, "</#{r}>" ; end
+        @result = begin;  joinm "<#{l} ", attrs(t), ">",s, b, es, "</#{r}>" ; end
         _tmp = true
         unless _tmp
           self.pos = _save15
@@ -2671,20 +2798,24 @@ class Dang::Parser
   Rules[:_part] = rule_info("part", "(ruby | puby | filter | comment | tag | chunk)")
   Rules[:_body] = rule_info("body", "(part:p body:b { join(p,b) } | part)")
   Rules[:_key] = rule_info("key", "(name | \"'\" < /[^'\\n]*/ > \"'\" { text })")
-  Rules[:_val] = rule_info("val", "(\"'\" < /[^'\\n]*/ > \"'\" { text } | < (!\"]\" .)* > { text })")
-  Rules[:_dattr] = rule_info("dattr", "\"[\" key:k \"=\" val:v \"]\" { \"data-\#{k}='\#{v}'\" }")
-  Rules[:_dattrs] = rule_info("dattrs", "(dattr:a dattrs:l { \"\#{a} \#{l}\" } | dattr)")
-  Rules[:_attr] = rule_info("attr", "(\"[data\" dattrs:t \"]\" { [t,true] } | \"[\" key:k \"=\" val:v \"]\" { [k, v] } | \"[\" key:k \"]\" { [k,true] })")
+  Rules[:_valsrt] = rule_info("valsrt", "(\"]\" | \"<|\")")
+  Rules[:_valchk] = rule_info("valchk", "< (!valsrt .)* > { text }")
+  Rules[:_valprt] = rule_info("valprt", "(puby | valchk)")
+  Rules[:_valraw] = rule_info("valraw", "(valprt:p valraw:b { join(p,b) } | valprt)")
+  Rules[:_val] = rule_info("val", "(\"'\" < /[^'\\n]*/ > \"'\" { text } | valraw)")
+  Rules[:_dattr] = rule_info("dattr", "\"[\" key:k \"=\" val:v \"]\" { Pair.new(\"data-\#{k}\", v) }")
+  Rules[:_dattrs] = rule_info("dattrs", "(dattr:a dattrs:l { [a] + l } | dattr:a { [a] })")
+  Rules[:_attr] = rule_info("attr", "(\"[data\" dattrs:t \"]\" { t } | \"[\" key:k \"=\" val:v \"]\" { Pair.new(k, v) } | \"[\" key:k \"]\" { Pair.new(k,true) })")
   Rules[:_attrs] = rule_info("attrs", "(attr:a attrs:l { [a] + l } | attr:a { [a] })")
   Rules[:_cc_if] = rule_info("cc_if", "/[iI][fF]/")
   Rules[:_cc_end] = rule_info("cc_end", "/[eE][nN][dD][iI][fF]/")
   Rules[:_comment] = rule_info("comment", "(\"<!\" space+ < \"[\" space* cc_if (!\"]\" .)* \"]\" > space+ \"!>\" { \"<!--\#{text}>\" } | \"<!\" space+ < \"[\" space* cc_end (!\"]\" .)* \"]\" > space+ \"!>\" { \"<!\#{text}-->\" } | \"<!\" < (!\"!>\" .)* > \"!>\" { \"<!--\#{text}-->\" })")
   Rules[:_simple] = rule_info("simple", "/[a-zA-Z0-9_\\-]+/")
-  Rules[:_select] = rule_info("select", "(\"\#\" < simple > { [\"id\", text] } | \".\" < simple > { [\"class\", text] })")
+  Rules[:_select] = rule_info("select", "(\"\#\" < simple > { Pair.new(\"id\", text) } | \".\" < simple > { Pair.new(\"class\", text) })")
   Rules[:_selects] = rule_info("selects", "(select:s selects:t { [s] + t } | select:s { [s] })")
   Rules[:_end_filter] = rule_info("end_filter", "bs* < /[a-zA-Z]+/ > &{ n == text } \":>\"")
   Rules[:_filter] = rule_info("filter", "\"<:\" name:n bs* < (!end_filter(n) .)* > end_filter(n) { Filter.new(n, text) }")
-  Rules[:_tag] = rule_info("tag", "(start:l slash { \"<\#{l} />\" } | start:l space+ end:r { \"<\#{l}></\#{r}>\" } | start:l attrs:a slash { \"<\#{l} \#{attrs(a)} />\" } | start:l selects:t slash { \"<\#{l} \#{attrs(t)} />\" } | start:l selects:t attrs:a slash { \"<\#{l} \#{attrs(t,a)} />\" } | start:l attrs:a space+ end:r { \"<\#{l} \#{attrs(a)}></\#{r}>\" } | start:l selects:t space+ end:r { \"<\#{l} \#{attrs(t)}></\#{r}>\" } | start:l selects:t attrs:a space+ end:r { \"<\#{l} \#{attrs(t,a)}></\#{r}>\" } | start:l selects:t attrs:a pts body:b pts:es end:r { joinm \"<\#{l} \#{attrs(a,t)}>\",b,es,\"</\#{r}>\" } | start:l attrs:a pts body:b pts:es end:r { joinm \"<\#{l} \#{attrs(a)}>\", b, es, \"</\#{r}>\" } | start:l selects:t pts:s body:b pts:es end:r { joinm \"<\#{l} \#{attrs(t)}>\",s, b, es, \"</\#{r}>\" } | start:l pts:s body:b pts:es end:r { joinm \"<\#{l}>\", s, b, es, \"</\#{r}>\" })")
+  Rules[:_tag] = rule_info("tag", "(start:l slash { \"<\#{l} />\" } | start:l space+ end:r { \"<\#{l}></\#{r}>\" } | start:l attrs:a slash { joinm \"<\#{l} \", attrs(a), \" />\" } | start:l selects:t slash { joinm \"<\#{l} \",  attrs(t), \" />\" } | start:l selects:t attrs:a slash { joinm \"<\#{l} \", attrs(t,a), \" />\" } | start:l attrs:a space+ end:r { joinm \"<\#{l} \", attrs(a), \"></\#{r}>\" } | start:l selects:t space+ end:r { joinm \"<\#{l} \", attrs(t), \"></\#{r}>\" } | start:l selects:t attrs:a space+ end:r { joinm \"<\#{l} \", attrs(t,a), \"></\#{r}>\" } | start:l selects:t attrs:a pts body:b pts:es end:r { joinm \"<\#{l} \", attrs(a,t), \">\",b,es,\"</\#{r}>\" } | start:l attrs:a pts body:b pts:es end:r { joinm \"<\#{l} \", attrs(a), \">\", b, es, \"</\#{r}>\" } | start:l selects:t pts:s body:b pts:es end:r { joinm \"<\#{l} \", attrs(t), \">\",s, b, es, \"</\#{r}>\" } | start:l pts:s body:b pts:es end:r { joinm \"<\#{l}>\", s, b, es, \"</\#{r}>\" })")
   Rules[:_root] = rule_info("root", "doctype? body:b eof { @output = join(b,\"\") }")
   # :startdoc:
 end

data/{spectory → specs}/attribute_spec.rb

@@ -1,4 +1,4 @@
-require "spectory/helper"
+require "specs/helper"
 
 describe "attributes" do
   it "transforms Dang tag[attr=value] into HTML tag with an attribute and value" do

data/{spectory → specs}/comment_spec.rb

@@ -1,4 +1,4 @@
-require "spectory/helper"
+require "specs/helper"
 
 describe "comments" do
   it "transforms Dang <! comment !> comments into html comments" do

data/{spectory → specs}/conditional_comment_spec.rb

@@ -1,4 +1,4 @@
-require "spectory/helper"
+require "specs/helper"
 
 # from
 # <! [if IE] !>

data/{spectory → specs}/data_attribute_spec.rb

@@ -1,4 +1,4 @@
-require "spectory/helper"
+require "specs/helper"
 
 describe "data attributes" do
   it "transforms normal data attributes comments" do

data/{spectory → specs}/doctype_spec.rb

@@ -1,4 +1,4 @@
-require "spectory/helper"
+require "specs/helper"
 
 describe "doctypes" do
   # based largely on HAML's doctype with a minor variation

data/{spectory → specs}/embedded_ruby_spec.rb

@@ -1,4 +1,4 @@
-require "spectory/helper"
+require "specs/helper"
 
 describe "embedded ruby" do
   it "farms out to Ruby for and does not return any output" do

data/{spectory/v2 → specs/experiments}/array_classes_spec.rb

@@ -1,4 +1,4 @@
-require "spectory/helper"
+require "specs/helper"
 
 # TODO experimental
 # for v2

data/{spectory/v2 → specs/experiments}/filters/markdown_spec.rb

@@ -1,4 +1,4 @@
-require "spectory/helper"
+require "specs/helper"
 
 # filters
 #   <:markdown

data/{spectory/v2 → specs/experiments}/hash_attribute_spec.rb

@@ -1,4 +1,4 @@
-require "spectory/helper"
+require "specs/helper"
 
 # TODO experimental
 # for v2
@@ -12,7 +12,7 @@ require "spectory/helper"
 #     # <body[foo=#{bar}]{attrs, attrs}
 #     # <body{ hidden }
 #     # <body#id.class.class2{ attrs }
-#     # <body#id.class.class2<= attrs =>
+#     # <body#id.class.class2<| attrs |>
 # 
 #     # TODO experimental
 # 

data/{spectory/v2 → specs/experiments}/script_exception_spec.rb

@@ -1,4 +1,4 @@
-require "spectory/helper"
+require "specs/helper"
 
 # describe "script tags" do
 #   it "skips js that looks like a closing dang tag" do

data/{spectory/v2 → specs/experiments}/style_exception_spec.rb

@@ -1,4 +1,4 @@
-require "spectory/helper"
+require "specs/helper"
 
 # describe "style tags" do
 #   it "skips css that looks like a closing dang tag" do

data/{spectory → specs}/file_spec.rb

@@ -1,4 +1,4 @@
-require "spectory/helper"
+require "specs/helper"
 
 describe "files" do
   it "can transform a whole document" do

data/{spectory → specs}/filter_spec.rb

@@ -1,4 +1,4 @@
-require "spectory/helper"
+require "specs/helper"
 
 # filters
 #   <:markdown

data/specs/interpolation_spec.rb

@@ -0,0 +1,12 @@
+require "specs/helper"
+
+describe "interpolation" do
+  # it "should allow ruby interpolation in ids"
+  # it "should allow ruby interpolation in classes"
+
+  it "should interpolate in attributes" do
+    foo = "bar"
+
+    Dang.it("<time[name=<| foo |>-<| foo |>] <| foo |> time>", binding).must_equal "<time name='bar-bar'>bar</time>"
+  end
+end

data/{spectory → specs}/sanity_spec.rb

@@ -1,4 +1,4 @@
-require "spectory/helper"
+require "specs/helper"
 
 describe "sanity" do
   before do

data/{spectory → specs}/script_spec.rb

@@ -1,4 +1,4 @@
-require "spectory/helper"
+require "specs/helper"
 
 describe "script tags" do
   it "treats script tag special" do

data/{spectory → specs}/selector_spec.rb

@@ -1,4 +1,4 @@
-require "spectory/helper"
+require "specs/helper"
 
 describe "selectors" do
   it "transforms Dang tag#id into HTML tag with an id attribute" do

data/{spectory → specs}/style_spec.rb

@@ -1,4 +1,4 @@
-require "spectory/helper"
+require "specs/helper"
 
 describe "style tags" do
   it "treats style tags special" do

data/{spectory → specs}/tag_spec.rb

@@ -1,4 +1,4 @@
-require "spectory/helper"
+require "specs/helper"
 
 describe "tags" do
   it "transforms Dang tag to HTML tag with no content" do

data/{spectory → specs}/well_formedness_spec.rb

@@ -1,4 +1,4 @@
-require "spectory/helper"
+require "specs/helper"
 
 # TODO experimental
 

data/{spectory → specs}/whitespace_spec.rb

@@ -1,4 +1,4 @@
-require "spectory/helper"
+require "specs/helper"
 
 # something like HAML's aligator operator
 # http://haml-lang.com/docs/yardoc/file.HAML_REFERENCE.html#whitespace_removal__and_

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dang
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Shane Becker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.12'
 description: |-
   Dang is a Ruby templating language.
   It uses angle brackets and CSS syntax.
@@ -51,7 +51,6 @@ extra_rdoc_files:
 - History.md
 - Manifest.txt
 - README.md
-- TODO.md
 files:
 - ".hoeignore"
 - Gemfile
@@ -60,7 +59,6 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
-- TODO.md
 - bin/dang
 - dang.gemspec
 - lib/dang.rb
@@ -68,30 +66,30 @@ files:
 - lib/dang/parser.kpeg
 - lib/dang/parser.rb
 - lib/dang/rails.rb
-- spectory/attribute_spec.rb
-- spectory/comment_spec.rb
-- spectory/conditional_comment_spec.rb
-- spectory/data_attribute_spec.rb
-- spectory/doctype_spec.rb
-- spectory/embedded_ruby_spec.rb
-- spectory/file_spec.rb
-- spectory/files/iamshane-com.html
-- spectory/files/iamshane-com.html.dang
-- spectory/filter_spec.rb
-- spectory/helper.rb
-- spectory/sanity_spec.rb
-- spectory/script_spec.rb
-- spectory/selector_spec.rb
-- spectory/style_spec.rb
-- spectory/tag_spec.rb
-- spectory/v2/array_classes_spec.rb
-- spectory/v2/filters/markdown_spec.rb
-- spectory/v2/hash_attribute_spec.rb
-- spectory/v2/interpolation_spec.rb
-- spectory/v2/script_exception_spec.rb
-- spectory/v2/style_exception_spec.rb
-- spectory/well_formedness_spec.rb
-- spectory/whitespace_spec.rb
+- specs/attribute_spec.rb
+- specs/comment_spec.rb
+- specs/conditional_comment_spec.rb
+- specs/data_attribute_spec.rb
+- specs/doctype_spec.rb
+- specs/embedded_ruby_spec.rb
+- specs/experiments/array_classes_spec.rb
+- specs/experiments/filters/markdown_spec.rb
+- specs/experiments/hash_attribute_spec.rb
+- specs/experiments/script_exception_spec.rb
+- specs/experiments/style_exception_spec.rb
+- specs/file_spec.rb
+- specs/files/iamshane-com.html
+- specs/files/iamshane-com.html.dang
+- specs/filter_spec.rb
+- specs/helper.rb
+- specs/interpolation_spec.rb
+- specs/sanity_spec.rb
+- specs/script_spec.rb
+- specs/selector_spec.rb
+- specs/style_spec.rb
+- specs/tag_spec.rb
+- specs/well_formedness_spec.rb
+- specs/whitespace_spec.rb
 homepage: https://github.com/veganstraightedge/dang
 licenses:
 - PUBLIC DOMAIN

data/spectory/v2/interpolation_spec.rb

@@ -1,11 +0,0 @@
-require "spectory/helper"
-
-# TODO experimental
-# for v2
-
-# describe "interpolation" do
-#   it "should allow ruby interpolation in ids"
-#   it "should allow ruby interpolation in classes"
-#   it "should allow ruby interpolation in attributes"
-#   it "should allow ruby interpolation in values"
-# end