wlang 2.2.3 → 3.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: e82a5d9c33a44f4d44068433fc341ac105eb6b0abb5859315264fc9c9039af3b
+  data.tar.gz: a3ed2db115e809a220e1e0046e8b60178e7c093e03c3ba0eb558ef3e24c6c356
+SHA512:
+  metadata.gz: ccc8a54926e97ef4a4b4f8b49669f2ea3b1e2e4421900ebf4f4a05d1094b5121145f607b98d4e56ced1224e1c53f728df0028631058301bad315baab080ebce1
+  data.tar.gz: 95b57dc614446eddc46eb3eafec0a3b9470a3b440afdfd8ebf2c7c555aea3ae35ab34cdf6d4081e58b889a5c6057efc4d8767f694fd978a3b57fdd300559ceb0

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+# 3.0.1 / 2020-01-07
+
+* Resurect Tilt/Sinatra support 
+
+# 3.0.0 / 2020-12-29
+
+* Clean project to use a standard ruby-2.7 stack
+* Upgrade citrus to 3.x
+* Remove support for sinatra and tilt
+
+# 2.2.4 / 2014-07-29
+
+* Birthday of 2.2.3 :-)
+* Under sinatra all partials now use the app.settings base options. Specified
+  dialect is in particular reused accross partials.
+
 # 2.2.3 / 2013-07-29
 
 * Bump Temple dependency to "~> 0.6"

data/Gemfile

@@ -1,22 +1,2 @@
 source 'http://rubygems.org'
-
-group :runtime do
-  gem "citrus", "~> 2.4.1"
-  gem "temple", "~> 0.6"
-  gem "quickl", "~> 0.4.3"
-  gem "path", "~> 1.3"
-  gem "backports", "~> 2.6"
-end
-
-group :extra do
-  gem "awesome_print", "~> 1.0.2"
-end
-
-group :development do
-  gem "tilt", "~> 1.3"
-  gem "rake", "~> 0.9.2"
-  gem "bundler", "~> 1.0"
-  gem "rspec", "~> 2.10.0"
-  gem "sinatra", ">= 1.4"
-  gem "rack-test", "~> 0.6"
-end
+gemspec

data/Gemfile.lock

@@ -1,46 +1,56 @@
+PATH
+  remote: .
+  specs:
+    wlang (3.0.1)
+      citrus (~> 3.0)
+      path (~> 2.0)
+      quickl (~> 0.4.3)
+      temple (~> 0.6)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    awesome_print (1.0.2)
-    backports (2.8.2)
-    citrus (2.4.1)
-    diff-lcs (1.1.3)
-    path (1.3.1)
+    citrus (3.0.2)
+    diff-lcs (1.4.4)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    path (2.0.1)
     quickl (0.4.3)
-    rack (1.5.2)
-    rack-protection (1.5.0)
+    rack (2.2.3)
+    rack-protection (2.1.0)
       rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rake (0.9.6)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    sinatra (1.4.2)
-      rack (~> 1.5, >= 1.5.2)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    temple (0.6.5)
-    tilt (1.3.7)
+    rake (13.0.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.1)
+    ruby2_keywords (0.0.2)
+    sinatra (2.1.0)
+      mustermann (~> 1.0)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
+      tilt (~> 2.0)
+    temple (0.8.2)
+    tilt (2.0.10)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-15
 
 DEPENDENCIES
-  awesome_print (~> 1.0.2)
-  backports (~> 2.6)
-  bundler (~> 1.0)
-  citrus (~> 2.4.1)
-  path (~> 1.3)
-  quickl (~> 0.4.3)
-  rack-test (~> 0.6)
-  rake (~> 0.9.2)
-  rspec (~> 2.10.0)
-  sinatra (>= 1.4)
-  temple (~> 0.6)
-  tilt (~> 1.3)
+  rake (~> 13.0)
+  rspec (~> 3.0)
+  sinatra (~> 2.1)
+  tilt (~> 2.0, >= 2.0.10)
+  wlang!
+
+BUNDLED WITH
+   2.2.1

data/LICENCE.md

@@ -1,22 +1,20 @@
-# The MIT Licence
+Copyright (c) 2012-2021 - Bernard Lambeau, Louis Lambeau
 
-    Copyright (c) 2012 - Bernard Lambeau, Louis Lambeau
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,40 +1,50 @@
 # WLang
 
-[![Build Status](https://secure.travis-ci.org/blambeau/wlang.png?branch=wlang2)](http://travis-ci.org/blambeau/wlang)
+![](https://travis-ci.org/blambeau/wlang.svg?branch=master)
 
-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/).
+WLang is a powerful code generation and templating engine, implemented on top o
+[temple](https://github.com/judofyr/temple) and much inspired by the excellent
+[mustache](http://mustache.github.com/).
 
 ## Links
 
 * http://github.com/blambeau/wlang
-* http://blambeau.github.com/wlang
 * http://rubygems.org/gems/wlang
 * http://revision-zero.org/wlang
 
 ## Features
 
 * Tunable templating engine. You can define your own tags, and their behavior.
-* Powerful logic-less HTML concretization to render web pages à la Mustache with extra.
+* Powerful logic-less HTML concretization to render web pages à la Mustache
+  with extra.
 * Compiled templates for speedy generation.
-* [Tilt](https://github.com/rtomayko/tilt) and [Sinatra](https://github.com/sinatra/sinatra) integration.
 
-WLang 2.0 also has a few remaining issues.
+WLang 3.0 also has a few remaining issues.
 
-* It does not support rubinius so far, due to an incompatibility with the Citrus parser generator.
-* It has some issues with spacing; not a big issue for HTML rendering but might prevent certain generation tasks.
+* It has some issues with spacing; not a big issue for HTML rendering but might
+  prevent certain generation tasks.
 
 ## Tunable templating engine
 
-WLang is a templating engine, written in ruby. In that, it is similar to ERB, Mustache and the like:
+WLang is a templating engine, written in ruby. In that, it is similar to ERB,
+Mustache and the like:
 
 ```ruby
 WLang::Html.render 'Hello to ${who}!', who: '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.
+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.
 
-WLang is designed to help you for other uses cases, user-defined ones in particular, such as generating code or whatever text generation task for which other engines quickly become inappropriate. WLang helps there because it allows you to create your own _dialect_, that is, you can define your own tags and their behavior. For instance,
+WLang is designed to help you for other uses cases, user-defined ones in
+particular, such as generating code or whatever text generation task for
+which other engines quickly become inappropriate. WLang helps there because
+it allows you to create your own _dialect_, that is, you can define your own
+tags and their behavior. For instance,
 
 ```ruby
 class Highlighter < WLang::Dialect
@@ -47,11 +57,15 @@ class Highlighter < WLang::Dialect
 
   tag '$', :highlight
 end
-Highlighter.render('Hello ${who}!'), who: 'you & the world'
+Highlighter.render('Hello ${who}!', who: 'you & the world')
 # => "Hello YOU & THE WORLD !"
 ```
 
-WLang already provides a few useful dialects, such as WLang::Html (inspired by Mustache but a bit more powerful in my opinion). If they don't match your needs, it is up to you to define you own dialect for making your generation task easy. Have a look at the implementation of WLang's ones, it's pretty simple to get started!
+WLang already provides a few useful dialects, such as WLang::Html
+(inspired by Mustache but a bit more powerful in my opinion). If they don't
+match your needs, it is up to you to define you own dialect for making your
+generation task easy. Have a look at the implementation of WLang's ones, it's
+pretty simple to get started!
 
 # Tilt integration
 
@@ -76,29 +90,33 @@ Please note that you should require tilt first, then wlang. Otherwise, you'll ha
 
 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 => { ... }
-    end
+```ruby
+get '/' do
+  wlang :index, :locals => { ... }
+end
+```
 
 As wlang encourages logic-less templates, you should always use locals. However, there is specific support for layouts and partials, as the following example demonstrates:
 
-    get '/' do
-      wlang :index, :locals => {:who => "world"}
-    end
+```ruby
+get '/' do
+  wlang :index, :locals => {:who => "world"}
+end
 
-    __END__
+__END__
 
-    @@layout
-      <html>
-        >{yield}
-      </html>
+@@layout
+  <html>
+    >{yield}
+  </html>
 
-    @@index
-      Hello from a partial: >{partial}
+@@index
+  Hello from a partial: >{partial}
 
-    @@partial
-      yeah, a partial saying hello to '${who}'!
+@@partial
+  yeah, a partial saying hello to '${who}'!
 
 Returned body will be (ignoring carriage returns):
 
-    <html>Hello from a partial: yeah, a partial saying hello to 'world'!</html>
+<html>Hello from a partial: yeah, a partial saying hello to 'world'!</html>
+```

data/lib/wlang/compiler/grammar.citrus

@@ -2,7 +2,7 @@ grammar WLang::Grammar
 
   rule template
     (strconcat !.){
-      [:template, [:fn, strconcat.value]]
+      [:template, [:fn, capture(:strconcat).value]]
     }
   end
 
@@ -29,15 +29,15 @@ grammar WLang::Grammar
   rule block
     (fn_start strconcat fn_stop){
       [:strconcat,
-        [:static, captures[:fn_start].first.to_s],
-        captures[:strconcat].first.value,
-        [:static, captures[:fn_stop].first.to_s]]
+        [:static, capture(:fn_start).to_s],
+        capture(:strconcat).value,
+        [:static, capture(:fn_stop).to_s]]
     }
   end
 
   rule wlang
     (symbols functions){
-      [:wlang, symbols.to_s] + functions.value
+      [:wlang, capture(:symbols).to_s] + capture(:functions).value
     }
   end
 
@@ -47,7 +47,7 @@ grammar WLang::Grammar
 
   rule function
     (fn_start strconcat fn_stop){
-      strconcat.value
+      capture(:strconcat).value
     }
   end
 

data/lib/wlang/dialect.rb

@@ -161,7 +161,7 @@ module WLang
 
     # Returns the current rendering scope.
     def scope
-      @scope || Scope.null
+      @scope ||= Scope.null
     end
 
     # Yields the block with a scope branched with a sub-scope `x`.

data/lib/wlang/loader.rb

@@ -2,4 +2,3 @@ require "citrus"
 require "temple"
 require "quickl"
 require "path"
-require 'backports' if RUBY_VERSION < "1.9"

data/lib/wlang/scope/sinatra_scope.rb

@@ -27,7 +27,12 @@ module WLang
         find_files(views, key) do |file|
           if engine = Tilt[file]
             tpl = app.template_cache.fetch(file) do
-              engine.new(file.to_s, 1, {})
+              options = if app.settings.respond_to?(:wlang)
+                          app.settings.wlang
+                        else
+                          {}
+                        end
+              engine.new(file.to_s, 1, options)
             end
             return tpl
           end

data/lib/wlang/template.rb

@@ -48,24 +48,25 @@ module WLang
       scope, buffer = call_args_conventions(args)
       dialect_instance.dup.render compiled, scope, buffer
     end
+
     alias :render :call
 
-    private
+    attr_reader :source, :compiled, :dialect_instance
 
-      attr_reader :source, :compiled, :dialect_instance
+    private
 
-      def yaml_front_matter?
-        opt = options[:yaml_front_matter]
-        opt.nil? or opt
-      end
+    def yaml_front_matter?
+      opt = options[:yaml_front_matter]
+      opt.nil? or opt
+    end
 
-      def call_args_conventions(args)
-        args << '' unless args.last.respond_to?(:<<)
-        buffer = args.pop
-        args << self.locals unless self.locals.empty?
-        scope  = WLang::Scope.chain(args)
-        [scope, buffer]
-      end
+    def call_args_conventions(args)
+      args << '' unless args.last.respond_to?(:<<)
+      buffer = args.pop
+      args << self.locals unless self.locals.empty?
+      scope  = WLang::Scope.chain(args)
+      [scope, buffer]
+    end
 
   end # class Template
 end # module WLang

data/lib/wlang/tilt/wlang_template.rb

@@ -16,7 +16,8 @@ module Tilt
       end
 
       def default_options
-        (superclass.default_options rescue {}).merge(@default_options || {})
+        @default_options ||= {}
+        (superclass.default_options rescue {}).merge(@default_options)
       end
 
     end
@@ -40,4 +41,4 @@ module Tilt
 
   end
   register WLangTemplate, 'wlang'
-end
+end

data/lib/wlang/version.rb

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