dang 1.0.0 → 2.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OGEzZDEzZTAyNGY0MWNjNjUyNTYzMzNmMmQ1ZDA3YTQ3MjVkNWYzMA==
-  data.tar.gz: !binary |-
-    MDUyMzJmNGE1OGUzODI2YmE3ZThlNDM2ODA3ZmQ3MTI3YTBiOWNjZg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NTJjMGEzNzc2Y2FkYmYxNTExMDY4MGE1ZmYzOGI2MDZmYzIyYTdkMTJkMzNm
-    ODM4NTJiOGM3NjJlOTEwZGRjZjMwMzIyNDNhMjQzNjYxNmQ5NjkyOTQ3OGM2
-    YWQ3OTc3YmI4OWFmZWZlMDI4NTc5ODllYzA2N2QyOWVlMWUzZjQ=
-  data.tar.gz: !binary |-
-    ZGVhNjI5MGM5NTk2OTVlZDI5ODI5MmJmODAxMWM0YzkwYmU4N2QwMzhhNjM3
-    Nzg2MDU3MWI4ODkwNjJjOWVjMjVlNWE2OTY5NGJhZWI5OWE4NTgwNDI2ZjEz
-    ZDYxYjc0OTk0YzQ1ODZlZmZlMWZkMWQ3OWM1YzVkZmZjY2Y4NTQ=
+SHA1:
+  metadata.gz: c8392c3b94db03612f7a2ea518733d37540b7439
+  data.tar.gz: 2244fda90a145eb7fb343df496c1ea6f9ad9d28f
+SHA512:
+  metadata.gz: 612aa96b31e4e957fbda3f44ff4cb48a5ed3408b1ddb83c0af78b3d87b2684dec3dd63eb6b43e2bc47989f63980960cbff238b23b359d78397cb02bccad063b6
+  data.tar.gz: a03efa39aa4fe532c8390d84d19722dc49cf16e0763e36bdeef1bbee4e6b0d4dcc9386bd88d3a0dd06f1d3dbfbe5d97b51ba2f81523eec087ccc6ddfdd2b5ab0

data/Gemfile

@@ -1,5 +1,7 @@
 source "https://rubygems.org"
 
+gemspec
+
 # for developing
 gem "rake"
 gem "hoe"

data/Gemfile.lock

@@ -1,22 +1,31 @@
+PATH
+  remote: .
+  specs:
+    dang (1.0.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    hoe (3.6.2)
+    hoe (3.13.0)
       rake (>= 0.8, < 11.0)
     hoe-doofus (1.0.0)
-    hoe-git (1.5.0)
-      hoe (>= 2.2.0)
-    kpeg (0.10.0)
-    minitest (5.0.3)
-    rake (10.0.4)
+    hoe-git (1.6.0)
+    json (1.8.1)
+    kpeg (1.0.0)
+    minitest (5.4.3)
+    rake (10.3.2)
+    rdoc (3.12.2)
+      json (~> 1.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  dang!
   hoe
   hoe-doofus
   hoe-git
   kpeg
   minitest
   rake
+  rdoc (~> 3.10)

data/History.md

@@ -1,5 +1,34 @@
 # History
 
+## 2.0.0 / 2014-11-20
+
+### Major Features
+
+1. Fixed two major and obvious syntax mistakes.
+
+   `<- non-printing ruby ->` : As a syntax works great in a vaccum,
+   but not in Ruby 1.9 or higher because of the `->` stabby proc.
+   Duh. That's our bad. Sorry that we didn't catch it in our design
+   and testing.
+
+   `<= printing ruby =>` : Same goes for this. `=>` is used in hashes.
+   Double duh. Both of these should've never made it into the spec.
+
+   For 2.0, we've changed both of them to similar but different syntaxes.
+
+   * `<- non-printing ruby ->` becomes  `<: non-printing ruby :>`
+   * `<= printing ruby =>`     becomes  `<| printing ruby |>`
+
+   Our reason for using `<: :>` is because we were already using a similar
+   syntax for `filters`. `<:raw raw:>`, `<:markdown markdown:>`, etc.
+   Following this pattern, `<: :>` is the default filter and therefore
+   an alias/shorthand for `<:ruby ruby:>`.
+
+   `<| |>` was chosen for visual symmetry/balance and because pipes are
+   already used in Ruby, so they won't feel out of place in Ruby/Rals views.
+   We didn't want to introduce **another** symbol to the aesthic of views.
+
+
 ## 1.0.0 / 2013-09-18
 
 ### Major Features

data/Manifest.txt

@@ -1,7 +1,4 @@
-.autotest
-.gitignore
 .hoeignore
-.travis.yml
 Gemfile
 Gemfile.lock
 History.md
@@ -16,3 +13,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

data/README.md

@@ -5,7 +5,7 @@ https://github.com/veganstraightedge/dang
 
 ## Description
 
-Dang is a Ruby templating language
+Dang is a Ruby templating language.
 It uses angle brackets and CSS syntax.
 Somewhere between ERB and Haml.
 
@@ -33,8 +33,8 @@ Somewhere between ERB and Haml.
 * `<p.class lorem ipsum p>`
 * `<a[href=/] Home a>`
 * `<! html comment !>`
-* `<- non_printing(ruby) ->`
-* `<= printing(ruby) =>`
+* `<: non_printing(ruby) :>`
+* `<| printing(ruby) |>`
 * `!!!` doctype shorthand inspired by HAML
 
 
@@ -51,7 +51,7 @@ Or just a snippet of dang into html:
 
 ## Current Version
 
-1.0.0.rc6
+2.0.0
 
 
 ## Requirements
@@ -82,7 +82,7 @@ Or install it yourself as:
 gem install dang
 ```
 
-You may need to use`sudo` to install it manually.
+You may need to use `sudo` to install it manually.
 
 
 ## Developers

data/Rakefile

@@ -16,7 +16,7 @@ HOE = Hoe.spec "dang" do
 end
 
 task :parser do
-  sh "ruby -I../kpeg/lib ../kpeg/bin/kpeg -o lib/dang/parser.rb -f -n Dang::Parser -s lib/dang/parser.kpeg"
+  sh "kpeg -o lib/dang/parser.rb -f -n Dang::Parser -s lib/dang/parser.kpeg"
 end
 
 $:.unshift "."

data/bin/dang

@@ -5,7 +5,6 @@ require 'optparse'
 
 to_eval = nil
 path    = nil
-version = false
 
 opt = OptionParser.new do |o|
   o.banner = "Usage: dang [options] [input.dang] [output.html]"
@@ -16,7 +15,7 @@ opt = OptionParser.new do |o|
 
   o.on "-v", "--version", "Print the version of Dang" do
     puts "dang #{Dang::VERSION}, codename: #{Dang::CODENAME}"
-    version = true
+    exit
   end
 
   o.on "-h", "--help", "Print, well, this" do
@@ -34,7 +33,6 @@ else
   input = ARGV.shift
 
   if !input
-    exit if version
     puts opt
     exit 1
   end
@@ -46,7 +44,7 @@ else
       f.puts data
     end
 
-    puts "Wrote HTML to '#{output}'"
+    $stderr.puts "Wrote HTML to '#{output}'"
   else
     puts data
   end

data/dang.gemspec

@@ -1,37 +1,37 @@
 # -*- encoding: utf-8 -*-
+# stub: dang 2.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "dang"
-  s.version = "1.0.0"
+  s.version = "2.0.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  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 = "2013-08-09"
-  s.description = "Dang is a Ruby templating language\nIt uses angle brackets and CSS syntax.\nSomewhere between ERB and Haml."
+  s.date = "2014-11-20"
+  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 = ["Manifest.txt"]
+  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.homepage = "https://github.com/veganstraightedge/dang"
   s.licenses = ["PUBLIC DOMAIN", "CC0"]
   s.rdoc_options = ["--main", "README.md"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = "dang"
-  s.rubygems_version = "2.0.3"
-  s.summary = "Dang is a Ruby templating language It uses angle brackets and CSS syntax"
+  s.rubygems_version = "2.2.2"
+  s.summary = "Dang is a Ruby templating language"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
-      s.add_development_dependency(%q<hoe>, ["~> 3.5"])
+      s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.13"])
     else
-      s.add_dependency(%q<rdoc>, ["~> 3.10"])
-      s.add_dependency(%q<hoe>, ["~> 3.5"])
+      s.add_dependency(%q<rdoc>, ["~> 4.0"])
+      s.add_dependency(%q<hoe>, ["~> 3.13"])
     end
   else
-    s.add_dependency(%q<rdoc>, ["~> 3.10"])
-    s.add_dependency(%q<hoe>, ["~> 3.5"])
+    s.add_dependency(%q<rdoc>, ["~> 4.0"])
+    s.add_dependency(%q<hoe>, ["~> 3.13"])
   end
 end

data/lib/dang/dang.rb

@@ -3,8 +3,8 @@ require 'rubygems'
 require 'dang/parser'
 
 class Dang
-  VERSION  = '1.0.0'
-  CODENAME = 'Zoe'
+  VERSION  = '2.0.0'
+  CODENAME = 'Abigail'
 
   @filters = {}
 

data/lib/dang/parser.kpeg

@@ -166,14 +166,14 @@ doctype = "!!!" space* rest:r { @doctype = r.empty? ? "html" : r }
     end = name:n ">" { n }
   slash = - "/>"
 
- marker = start | "<!" | "<=" | "<-" | (- end)
+ marker = start | "<!" | "<|" | "<:" | (- end)
   chunk = < (!marker .)* > { text }
 
-rclose = "->"
-  ruby = "<-" < (!rclose .)* > rclose { code(text, false) }
+rclose = ":>"
+  ruby = "<:" bs+ < (!rclose .)* > rclose { code(text, false) }
 
-pclose = "=>"
-  puby = "<=" < (!pclose .)* > pclose { code(text) }
+pclose = "|>"
+  puby = "<|" < (!pclose .)* > pclose { code(text) }
 
    part = ruby | puby| filter | comment | tag | chunk
    body = part:p body:b { join(p,b) }

data/lib/dang/parser.rb

@@ -13,8 +13,7 @@ class Dang::Parser
     # Prepares for parsing +str+.  If you define a custom initialize you must
     # call this method before #parse
     def setup_parser(str, debug=false)
-      @string = str
-      @pos = 0
+      set_string str, 0
       @memoizations = Hash.new { |h,k| h[k] = {} }
       @result = nil
       @failed_rule = nil
@@ -27,7 +26,6 @@ class Dang::Parser
     attr_reader :failing_rule_offset
     attr_accessor :result, :pos
 
-    
     def current_column(target=pos)
       if c = string.rindex("\n", target-1)
         return target - c - 1
@@ -61,6 +59,13 @@ class Dang::Parser
       @string[start..@pos-1]
     end
 
+    # Sets the string and current parsing position for the parser.
+    def set_string string, pos
+      @string = string
+      @string_size = string ? string.size : 0
+      @pos = pos
+    end
+
     def show_pos
       width = 10
       if @pos < width
@@ -167,19 +172,19 @@ class Dang::Parser
       return nil
     end
 
-    if "".respond_to? :getbyte
+    if "".respond_to? :ord
       def get_byte
-        if @pos >= @string.size
+        if @pos >= @string_size
           return nil
         end
 
-        s = @string.getbyte @pos
+        s = @string[@pos].ord
         @pos += 1
         s
       end
     else
       def get_byte
-        if @pos >= @string.size
+        if @pos >= @string_size
           return nil
         end
 
@@ -228,8 +233,7 @@ class Dang::Parser
       old_pos = @pos
       old_string = @string
 
-      @pos = other.pos
-      @string = other.string
+      set_string other.string, other.pos
 
       begin
         if val = __send__(rule, *args)
@@ -240,8 +244,7 @@ class Dang::Parser
         end
         val
       ensure
-        @pos = old_pos
-        @string = old_string
+        set_string old_string, old_pos
       end
     end
 
@@ -860,7 +863,7 @@ class Dang::Parser
     return _tmp
   end
 
-  # marker = (start | "<!" | "<=" | "<-" | - end)
+  # marker = (start | "<!" | "<|" | "<:" | - end)
   def _marker
 
     _save = self.pos
@@ -871,10 +874,10 @@ class Dang::Parser
       _tmp = match_string("<!")
       break if _tmp
       self.pos = _save
-      _tmp = match_string("<=")
+      _tmp = match_string("<|")
       break if _tmp
       self.pos = _save
-      _tmp = match_string("<-")
+      _tmp = match_string("<:")
       break if _tmp
       self.pos = _save
 
@@ -948,19 +951,34 @@ class Dang::Parser
     return _tmp
   end
 
-  # rclose = "->"
+  # rclose = ":>"
   def _rclose
-    _tmp = match_string("->")
+    _tmp = match_string(":>")
     set_failed_rule :_rclose unless _tmp
     return _tmp
   end
 
-  # ruby = "<-" < (!rclose .)* > rclose { code(text, false) }
+  # ruby = "<:" bs+ < (!rclose .)* > rclose { code(text, false) }
   def _ruby
 
     _save = self.pos
     while true # sequence
-      _tmp = match_string("<-")
+      _tmp = match_string("<:")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _save1 = self.pos
+      _tmp = apply(:_bs)
+      if _tmp
+        while true
+          _tmp = apply(:_bs)
+          break unless _tmp
+        end
+        _tmp = true
+      else
+        self.pos = _save1
+      end
       unless _tmp
         self.pos = _save
         break
@@ -968,19 +986,19 @@ class Dang::Parser
       _text_start = self.pos
       while true
 
-        _save2 = self.pos
+        _save3 = self.pos
         while true # sequence
-          _save3 = self.pos
+          _save4 = self.pos
           _tmp = apply(:_rclose)
           _tmp = _tmp ? nil : true
-          self.pos = _save3
+          self.pos = _save4
           unless _tmp
-            self.pos = _save2
+            self.pos = _save3
             break
           end
           _tmp = get_byte
           unless _tmp
-            self.pos = _save2
+            self.pos = _save3
           end
           break
         end # end sequence
@@ -1012,19 +1030,19 @@ class Dang::Parser
     return _tmp
   end
 
-  # pclose = "=>"
+  # pclose = "|>"
   def _pclose
-    _tmp = match_string("=>")
+    _tmp = match_string("|>")
     set_failed_rule :_pclose unless _tmp
     return _tmp
   end
 
-  # puby = "<=" < (!pclose .)* > pclose { code(text) }
+  # puby = "<|" < (!pclose .)* > pclose { code(text) }
   def _puby
 
     _save = self.pos
     while true # sequence
-      _tmp = match_string("<=")
+      _tmp = match_string("<|")
       unless _tmp
         self.pos = _save
         break
@@ -2644,12 +2662,12 @@ 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) }")
-  Rules[:_pclose] = rule_info("pclose", "\"=>\"")
-  Rules[:_puby] = rule_info("puby", "\"<=\" < (!pclose .)* > pclose { code(text) }")
+  Rules[:_rclose] = rule_info("rclose", "\":>\"")
+  Rules[:_ruby] = rule_info("ruby", "\"<:\" bs+ < (!rclose .)* > rclose { code(text, false) }")
+  Rules[:_pclose] = rule_info("pclose", "\"|>\"")
+  Rules[:_puby] = rule_info("puby", "\"<|\" < (!pclose .)* > pclose { code(text) }")
   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 })")