wlang 2.2.0 → 2.2.1

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 2.2.1 / 2013-04-29
+
+* Enhanced Scope#to_s for readability of error messages.
+* Fix >{...} where the Html dialect is subclassed, the partial is not
+  correctly compiled with the subclass.
+* Fixed a bug when YAML front matter is empty in templates.
+
 # 2.2.0 / 2013-03-05
 
 * Added ATTR/VALUE pairs to the wlang command line tool, for passing data to templates

data/Gemfile

@@ -17,6 +17,6 @@ group :development do
   gem "rake", "~> 0.9.2"
   gem "bundler", "~> 1.0"
   gem "rspec", "~> 2.10.0"
-  gem "sinatra", :git => "git://github.com/sinatra/sinatra" #">= 1.4"
-  gem "rack-test", "~> 0.6.1"
+  gem "sinatra", ">= 1.4"
+  gem "rack-test", "~> 0.6"
 end

data/Gemfile.lock

@@ -1,27 +1,18 @@
-GIT
-  remote: git://github.com/sinatra/sinatra
-  revision: 8752085a05c33edd13d3ec8d3187d1406456d404
-  specs:
-    sinatra (1.4.0)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-
 GEM
   remote: http://rubygems.org/
   specs:
     awesome_print (1.0.2)
-    backports (2.6.1)
+    backports (2.8.2)
     citrus (2.4.1)
     diff-lcs (1.1.3)
     path (1.3.1)
     quickl (0.4.3)
-    rack (1.4.1)
-    rack-protection (1.2.0)
+    rack (1.5.2)
+    rack-protection (1.5.0)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rake (0.9.2.2)
+    rake (0.9.6)
     rspec (2.10.0)
       rspec-core (~> 2.10.0)
       rspec-expectations (~> 2.10.0)
@@ -30,8 +21,12 @@ GEM
     rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.10.1)
-    temple (0.4.0)
-    tilt (1.3.3)
+    sinatra (1.4.2)
+      rack (~> 1.5, >= 1.5.2)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    temple (0.4.1)
+    tilt (1.3.7)
 
 PLATFORMS
   ruby
@@ -43,9 +38,9 @@ DEPENDENCIES
   citrus (~> 2.4.1)
   path (~> 1.3)
   quickl (~> 0.4.3)
-  rack-test (~> 0.6.1)
+  rack-test (~> 0.6)
   rake (~> 0.9.2)
   rspec (~> 2.10.0)
-  sinatra!
+  sinatra (>= 1.4)
   temple (~> 0.4.0)
   tilt (~> 1.3)

data/README.md

@@ -4,8 +4,6 @@
 
 WLang is a powerful code generation and templating engine, implemented on top of [temple](https://github.com/judofyr/temple) and much inspired by the excellent [mustache](http://mustache.github.com/).
 
-**WLang2 is still work in progress**.
-
 ## Links
 
 * http://github.com/blambeau/wlang
@@ -31,7 +29,7 @@ WLang is a templating engine, written in ruby. In that, it is similar to ERB, Mu
 
 ```ruby
 WLang::Html.render 'Hello to ${who}!', who: 'you & the world'
-# => "Hello you & the world!"
+# => "Hello to you & the world!"
 ```
 
 To output HTML pages, WLang does not provides you with killer features or extraordinary shortcus. It supports escaping, as shown above, but many other templating engines do. For such HTML tasks, WLang does a pretty good job but many other engines perform faster and have nicer features. See the examples folder that documents WLang::Html.
@@ -76,7 +74,7 @@ Please note that you should require tilt first, then wlang. Otherwise, you'll ha
 
 # Sinatra integration
 
-WLang comes bundled with built-in support for [Sinatra](https://github.com/sinatra/sinatra). As usual in Sinatra, you can simply invoke wlang as follows:
+WLang comes bundled with built-in support for [Sinatra](https://github.com/sinatra/sinatra) >= 1.4 (release still in progress). As usual in Sinatra, you can simply invoke wlang as follows:
 
     get '/' do
       wlang :index, :locals => { ... }

data/lib/wlang/dialect.rb

@@ -186,7 +186,7 @@ module WLang
         catch(:fail) do
           return scope.evaluate(expr, self, *default, &bl)
         end
-        raise NameError, "Unable to find `#{expr}`"
+        raise NameError, "Unable to find `#{expr}` on #{scope}"
       else
         evaluate(render(expr), *default, &bl)
       end

data/lib/wlang/html.rb

@@ -71,7 +71,7 @@ module WLang
 
       def greater(buf, fn)
         val = evaluate(fn)
-        val = Html.compile(val) if String === val
+        val = self.class.compile(val) if String === val
         val = val.call if Proc === val and val.arity<=0
         render(val, nil, buf)
       end

data/lib/wlang/scope/object_scope.rb

@@ -26,10 +26,14 @@ module WLang
         safe_parent.fetch(key, dialect, unfound)
       end
 
+      def to_s
+        subj = subject.is_a?(Scope) ? subject.to_s : subject.class
+        "ObjectScope(#{subj})"
+      end
+
       def inspect
         "ObjectScope(#{subject.inspect})"
       end
-      alias :to_s :inspect
 
     end # class ProxyScope
   end # class Scope

data/lib/wlang/source/front_matter.rb

@@ -27,7 +27,7 @@ module WLang
             @locals, @template_content = {}, $'
 
             require 'yaml'
-            yaml = YAML::load($1)
+            yaml = YAML::load($1) || {}
 
             # append explicit locals
             @locals.merge!(yaml.delete("locals") || {})

data/lib/wlang/version.rb

@@ -3,7 +3,7 @@ module WLang
 
     MAJOR = 2
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
 
     def self.to_s
       [ MAJOR, MINOR, TINY ].join('.')

data/spec/unit/source/front_matter/test_locals.rb

@@ -12,6 +12,11 @@ module WLang
         it{ should eq({}) }
       end
 
+      context 'with an empty front matter' do
+        let(:source){ "---\n---\nHello world!" }
+        it{ should eq({}) }
+      end
+
       describe 'with a front matter' do
         let(:source){ "---\nlocals:\n  x: 2\n---\nHello world!" }
         specify 'it decode the YAML data' do

data/wlang.gemspec

@@ -129,7 +129,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("bundler", "~> 1.0")
   s.add_development_dependency("rspec", "~> 2.10.0")
   s.add_development_dependency("sinatra", ">= 1.4")
-  s.add_development_dependency("rack-test", "~> 0.6.1")
+  s.add_development_dependency("rack-test", "~> 0.6")
   s.add_dependency("citrus", "~> 2.4.1")
   s.add_dependency("temple", "~> 0.4.0")
   s.add_dependency("quickl", "~> 0.4.3")

data/wlang.noespec

@@ -12,7 +12,7 @@ variables:
   upper:
     WLang
   version:
-    2.2.0
+    2.2.1
   summary: |-
     WLang is a powerful code generation and templating engine
   description: |-
@@ -42,4 +42,4 @@ variables:
     - {name: bundler,       version: "~> 1.0",     groups: [development]}
     - {name: rspec,         version: "~> 2.10.0",  groups: [development]}
     - {name: sinatra,       version: ">= 1.4",     groups: [development]}
-    - {name: rack-test,     version: "~> 0.6.1",   groups: [development]}
+    - {name: rack-test,     version: "~> 0.6",     groups: [development]}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wlang
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -115,7 +115,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: citrus
   requirement: !ruby/object:Gem::Requirement
@@ -366,19 +366,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1035684278937019643
+      hash: 1908849138847270231
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1035684278937019643
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: WLang is a powerful code generation and templating engine