wlang 2.3.0 → 2.3.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.3.1 / 2014-10-23
+
+* Fix bug (empty? not defined) when using an object as sinatra's locals
+
 # 2.3.0 / 2014-08-04
 
 * Allowed Citrus to 3.0

data/lib/wlang/template.rb

@@ -60,9 +60,14 @@ module WLang
       end
 
       def call_args_conventions(args)
+        # Ensure a buffer as lat argument
         args << '' unless args.last.respond_to?(:<<)
         buffer = args.pop
+
+        # puts locals if any
         args << self.locals unless self.locals.empty?
+
+        # create a scope now
         scope  = WLang::Scope.chain(args)
         [scope, buffer]
       end

data/lib/wlang/tilt/wlang_template.rb

@@ -34,8 +34,10 @@ module Tilt
       end
 
       def evaluate(scope, locals, &block)
-        locals[:yield] = block if block
-        @engine.render(scope, locals.empty? ? nil : locals)
+        args = [scope]
+        args << locals if locals && !(locals.respond_to?(:empty?) && locals.empty?)
+        args << { :yield => block } if block
+        @engine.render(*args)
       end
 
   end

data/lib/wlang/version.rb

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

data/wlang.noespec

@@ -12,7 +12,7 @@ variables:
   upper:
     WLang
   version:
-    2.3.0
+    2.3.1
   summary: |-
     WLang is a powerful code generation and templating engine
   description: |-

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: wlang
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
+  prerelease: 
 platform: ruby
 authors:
 - Bernard Lambeau
@@ -9,189 +10,220 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: citrus
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.4'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.4'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: temple
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: quickl
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: path
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
-description: |-
-  WLang is a general-purpose *code generation*/*templating engine*. It's main aim is to
-  help you generating web pages, sql queries, ruby code (that is, generating text in
+description: ! 'WLang is a general-purpose *code generation*/*templating engine*.
+  It''s main aim is to
+
+  help you generating web pages, sql queries, ruby code (that is, generating text
+  in
+
   general) without having to worry too much about html entities encoding, sql back
-  quoting, string escaping and the like. WLang proposes a generic engine that you can
+
+  quoting, string escaping and the like. WLang proposes a generic engine that you
+  can
+
   easily extend to fit your needs. It also proposes standard instantiations of this
-  engine for common tasks such as rendering HTML web pages.
+
+  engine for common tasks such as rendering HTML web pages.'
 email:
 - blambeau@gmail.com
 - llambeau@gmail.com
@@ -203,17 +235,13 @@ extra_rdoc_files:
 - CHANGELOG.md
 - LICENCE.md
 files:
+- wlang.gemspec
+- wlang.noespec
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
-- LICENCE.md
-- Manifest.txt
-- README.md
-- Rakefile
 - bin/wlang
-- lib/wlang.rb
 - lib/wlang/command.rb
-- lib/wlang/compiler.rb
 - lib/wlang/compiler/autospacing.rb
 - lib/wlang/compiler/dialect_enforcer.rb
 - lib/wlang/compiler/filter.rb
@@ -224,22 +252,28 @@ files:
 - lib/wlang/compiler/strconcat_flattener.rb
 - lib/wlang/compiler/to_ruby_abstraction.rb
 - lib/wlang/compiler/to_ruby_code.rb
+- lib/wlang/compiler.rb
 - lib/wlang/dialect.rb
 - lib/wlang/dummy.rb
 - lib/wlang/html.rb
 - lib/wlang/loader.rb
-- lib/wlang/scope.rb
 - lib/wlang/scope/binding_scope.rb
 - lib/wlang/scope/null_scope.rb
 - lib/wlang/scope/object_scope.rb
 - lib/wlang/scope/proc_scope.rb
 - lib/wlang/scope/sinatra_scope.rb
-- lib/wlang/source.rb
+- lib/wlang/scope.rb
 - lib/wlang/source/front_matter.rb
+- lib/wlang/source.rb
 - lib/wlang/template.rb
-- lib/wlang/tilt.rb
 - lib/wlang/tilt/wlang_template.rb
+- lib/wlang/tilt.rb
 - lib/wlang/version.rb
+- lib/wlang.rb
+- LICENCE.md
+- Manifest.txt
+- Rakefile
+- README.md
 - spec/assumptions/test_core.rb
 - spec/fixtures/dialect/foobar.rb
 - spec/fixtures/dialect/upcasing.rb
@@ -324,30 +358,32 @@ files:
 - tasks/spec_test.rake
 - tasks/unit_test.rake
 - tasks/yard.rake
-- wlang.gemspec
-- wlang.noespec
 homepage: http://github.com/blambeau/wlang
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3753041427578485044
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: WLang is a powerful code generation and templating engine
 test_files:
 - spec/assumptions/test_core.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 71039c878ff8645cc90bf2816c0eeca42beb706d
-  data.tar.gz: 95621510303a81919d9fe290b92247c7206828bd
-SHA512:
-  metadata.gz: 7a555793c51b2d25b26b4fe08ffd8758c28f937d942b25960883dca1e540bc9c4ca8bca745d0a9703cbcfed65971891d71a57206b352eb3a492fccee67182024
-  data.tar.gz: 99a375c1e46504dd7bfb2f161a3fbc384ffe7d8541302866fb341005ef7be0513df37cd9f2cd4c760f65658520e7c95afe6433773660d9b5db843b35ea827c06