dang 1.0.0.rc3 → 1.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 921e16bc25d57d7d9bb54ca3549bfa22eeca70c4
-  data.tar.gz: 65e62f8ea4bc62059bf6e0ab9eb170b6c080b8b4
+  metadata.gz: 3cdcb2f62d81a1f8314380d5f288cdd3f68891a3
+  data.tar.gz: d5384936dce8d468b9ad34123df0c7b082fb690d
 SHA512: 
-  metadata.gz: e10eab2a35238fb1afad8806e6d27a51ba360f1eb2aa4869f50f67f90a8477f9c460db15529f7bca14a583379ef41e03b5d741fc250f50b0b553931c697392f6
-  data.tar.gz: 601b1c03479ccad637c39dc65ca59a0d4157f095136d2ef25cf3cc8d8ee155eb979c6c5fbd220ecf426f80af0df99cc8a77a22f7909ddd6b548de3b26c5bafab
+  metadata.gz: 65cbe439dede9b19747e5e13c56a52db56b6777b5872c8267cebb45b62c562fed859ae8a5827b44f0306da6eb3df650db74282c063d462155de4781f44c4e21d
+  data.tar.gz: cb8e43201252121c97169f76c295c22128a1c8388ef92f41dcc93e41fad0fd8515a398af06dc3649158f338da415dfd080962c31c017a0e6bec330ab8d5ff030

data/.gitignore

@@ -0,0 +1,9 @@
+.bundle
+db/*.sqlite3
+log/*.log
+tmp/
+.sass-cache/
+.DS_Store
+.rvmrc
+*.dat
+pkg

data/.hoeignore

@@ -0,0 +1,2 @@
+.git/
+spectory/

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - rbx-18mode
+  - rbx-19mode
+  - jruby-18mode
+  - jruby-19mode

data/Manifest.txt

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

data/README.md

@@ -2,35 +2,43 @@
 
 https://github.com/veganstraightedge/dang
 
+
 ## Description
 
-Another dang templating language.
+Dang is a Ruby templating language
+It uses angle brackets and CSS syntax.
+Somewhere between ERB and Haml.
+
 
 ## Build Status
 
 [![Build Status](https://travis-ci.org/veganstraightedge/dang.png?branch=master)](https://travis-ci.org/veganstraightedge/dang)
 
+
 ## Features
 
-* CSS selectors for HTML tags
+* CSS selectors for HTML tags + attributes
 * Not as noisy syntax than ERB
-* Not quite as elegant as [HAML](http://haml.info)
+* Not quite as elegant as [Haml](http://haml.info)
 * No %s in your code
-* More closers than HAML
-* A lot is based on / inspired by [HAML](http://haml.info)
+* More closers than Haml
+* A lot is based on / inspired by [Haml](http://haml.info)
+
 
 ## Synopsis
+### Syntax
 
-* **Syntax**: `<tag content tag>`
-* **Syntax**: `<tag#id content tag>`
-* **Syntax**: `<tag#class content tag>`
-* **Syntax**: `<tag[attr=value] content tag>`
-* **Syntax**: `<! html comment !>`
-* **Syntax**: Embedded non-printing ruby (<- if logged_in? ->)
-* **Syntax**: Embedded printing ruby (<= @user.name =>)
-* **Syntax**: `!!!` doctype shorthand inspired by HAML
+* `<b a simple bold tag b>`
+* `<div#id div with an id div>`
+* `<p.class lorem ipsum p>`
+* `<a[href=/] Home a>`
+* `<! html comment !>`
+* `<- non_printing(ruby) ->`
+* `<= printing(ruby) =>`
+* `!!!` doctype shorthand inspired by HAML
 
-## Synopsis
+
+## Usage
 
 From the command line, transform a file of dang into html:
 
@@ -40,17 +48,22 @@ Or just a snippet of dang into html:
 
 `dang -e "<i snippet i>"`
 
+
 ## Current Version
 
-1.0.0.rc3
+1.0.0.rc4
+
 
 ## Requirements
 
+For development:
+
 * [rake](https://github.com/jimweirich/rake)
 * [kpeg](https://github.com/evanphx/kpeg)
 * [hoe](https://github.com/seattlerb/hoe)
 * [minitest](https://github.com/seattlerb/minitest)
 
+
 ## Installation
 
 ### Gemfile
@@ -69,7 +82,8 @@ 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
 
@@ -81,11 +95,13 @@ bundle
 
 This task will install any missing dependencies, run the tests/specs, and generate the RDoc.
 
+
 ## Authors
 
   * Shane Becker / [@veganstraightedge](https://github.com/veganstraightedge)
   * Evan Phoenix / [@evanphx](https://github.com/evanphx)
 
+
 ## Contributing
 
 1. Fork it
@@ -99,6 +115,7 @@ This task will install any missing dependencies, run the tests/specs, and genera
 If you find bugs, have feature requests or questions, please
 [file an issue](https://github.com/veganstraightedge/dang).
 
+
 ## License
 
 **PUBLIC DOMAIN**

data/Rakefile

@@ -3,13 +3,16 @@ require "hoe"
 
 Hoe.plugins.delete :rubyforge
 Hoe.plugin :doofus, :git
+Hoe.plugin :ignore
 
-Hoe.spec "dang" do
+HOE = Hoe.spec "dang" do
   developer "Shane Becker", "veganstraightedge@gmail.com"
 
-  self.extra_rdoc_files = Dir["*.rdoc"]
-  self.history_file     = "History.md"
-  self.readme_file      = "README.md"
+  self.extra_rdoc_files =  Dir["*.rdoc"]
+  self.history_file     =  "History.md"
+  self.readme_file      =  "README.md"
+  self.licenses         << "PUBLIC DOMAIN"
+  self.licenses         << "CC0"
 end
 
 task :parser do
@@ -28,3 +31,11 @@ task :spec do
 
   Minitest.autorun
 end
+
+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 }
+end
+
+desc "Generate or update the standalone gemspec file for the project"
+task :gemspec => ["#{HOE.spec.name}.gemspec"]

data/bin/dang

@@ -4,12 +4,25 @@ require 'dang'
 require 'optparse'
 
 to_eval = nil
-path = nil
+path    = nil
+version = false
 
 opt = OptionParser.new do |o|
+  o.banner = "Usage: dang [options] [input.dang] [output.html]"
+
   o.on "-e STR", "Evaluate the string as Dang" do |s|
     to_eval = s
   end
+
+  o.on "-v", "--version", "Print the version of Dang" do
+    puts "dang #{Dang::VERSION}, codename: #{Dang::CODENAME}"
+    version = true
+  end
+
+  o.on "-h", "--help", "Print, well, this" do
+    puts opt
+    exit
+  end
 end
 
 opt.parse! ARGV
@@ -18,9 +31,23 @@ if to_eval
   puts Dang.it(to_eval)
 
 else
-  path = ARGV.shift
-  if !path
-    raise "Specify -e or a path to a file"
+  input = ARGV.shift
+
+  if !input
+    exit if version
+    puts opt
+    exit 1
+  end
+
+  data = Dang.it(File.read(input))
+
+  if output = ARGV.shift
+    File.open output, "w" do |f|
+      f.puts data
+    end
+
+    puts "Wrote HTML to '#{output}'"
+  else
+    puts data
   end
-  puts Dang.it(File.read(path))
 end

data/dang.gemspec

@@ -0,0 +1,37 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "dang"
+  s.version = "1.0.0.rc4"
+
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  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.email = ["veganstraightedge@gmail.com"]
+  s.executables = ["dang"]
+  s.extra_rdoc_files = ["Manifest.txt"]
+  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"
+
+  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"])
+    else
+      s.add_dependency(%q<rdoc>, ["~> 3.10"])
+      s.add_dependency(%q<hoe>, ["~> 3.5"])
+    end
+  else
+    s.add_dependency(%q<rdoc>, ["~> 3.10"])
+    s.add_dependency(%q<hoe>, ["~> 3.5"])
+  end
+end

data/lib/dang.rb

@@ -2,3 +2,4 @@ class Dang
 end
 
 require 'dang/dang'
+require 'dang/rails' if defined?(Rails)

data/lib/dang/dang.rb

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

data/lib/dang/parser.rb

@@ -391,7 +391,7 @@ class Dang::Parser
     DOC_TYPES[@doctype].dup
   end
 
-  def output(env=nil)
+  def compile
     doctype = html_doctype
 
     strings = @output.flatten.map do |i|
@@ -409,9 +409,11 @@ class Dang::Parser
       end
     end
 
-    code = "_out = '';\n" + strings.join(";") + ";_out"
+    "_out = '';\n" + strings.join(";") + ";_out"
+  end
 
-    out = eval(code, env || binding).strip
+  def output(env=nil)
+    out = eval(compile, env || binding).strip
 
     if doctype.empty?
       str = out

data/lib/dang/rails.rb

@@ -0,0 +1,49 @@
+class Dang
+  class View
+    def handles_encoding?
+      true
+    end
+
+    def valid_encoding(string, encoding)
+      # If a magic encoding comment was found, tag the
+      # String with this encoding. This is for a case
+      # where the original String was assumed to be,
+      # for instance, UTF-8, but a magic comment
+      # proved otherwise
+      string.force_encoding(encoding) if encoding
+
+      # If the String is valid, return the encoding we found
+      return string.encoding if string.valid_encoding?
+
+      # Otherwise, raise an exception
+      raise ActionView::WrongEncodingError.new(string, string.encoding)
+    end
+
+    ENCODING_TAG = Regexp.new("\\A(<-\\s*#{ActionView::ENCODING_FLAG}\\s*->)[ \\t]*")
+
+    def call(template)
+      template_source = template.source.dup.force_encoding(Encoding::ASCII_8BIT)
+
+      dang = template_source.gsub(ENCODING_TAG, '')
+      encoding = $2
+
+      dang.force_encoding valid_encoding(template.source.dup, encoding)
+
+      # 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
+        parser.show_error(io)
+        raise io.string
+      end
+
+      parser.compile
+    end
+  end
+
+  ActionView::Template.register_template_handler :dang, View.new
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dang
 version: !ruby/object:Gem::Version 
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
 platform: ruby
 authors: 
 - Shane Becker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-20 00:00:00 Z
+date: 2013-08-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdoc
@@ -18,7 +18,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "4.0"
+        version: "3.10"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -28,10 +28,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "3.6"
+        version: "3.5"
   type: :development
   version_requirements: *id002
-description: Another dang templating language.
+description: |-
+  Dang is a Ruby templating language
+  It uses angle brackets and CSS syntax.
+  Somewhere between ERB and Haml.
 email: 
 - veganstraightedge@gmail.com
 executables: 
@@ -39,12 +42,12 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- History.md
 - Manifest.txt
-- README.md
-- TODO.md
 files: 
 - .autotest
+- .gitignore
+- .hoeignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - History.md
@@ -53,13 +56,16 @@ files:
 - 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
 homepage: https://github.com/veganstraightedge/dang
-licenses: []
-
+licenses: 
+- PUBLIC DOMAIN
+- CC0
 metadata: {}
 
 post_install_message: 
@@ -84,6 +90,6 @@ rubyforge_project: dang
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Another dang templating language.
+summary: Dang is a Ruby templating language It uses angle brackets and CSS syntax
 test_files: []