wlang 2.0.0.beta → 2.0.0

data/wlang.noespec

@@ -3,16 +3,13 @@ template-info:
   version: 1.7.4
   links:
     source: https://github.com/blambeau/noe
-  manifest:
-    lib/__lower__/loader.rb:
-      safe-override: false
 variables:
   lower: 
     wlang
   upper:
     WLang
   version:
-    2.0.0.beta
+    2.0.0
   summary: |-
     WLang is a powerful code generation and templating engine
   description: |-
@@ -31,16 +28,14 @@ variables:
     - http://blambeau.github.com/wlang
     - http://revision-zero.org/wlang
   dependencies:
-    - {name: citrus,    version: "~> 2.4.1",  groups: [runtime]}
-    - {name: temple,    version: "~> 0.4.0",  groups: [runtime]}
-    - {name: backports, version: "~> 2.6.1",  groups: [runtime]}
-    - {name: quickl,    version: "~> 0.4.3",  groups: [runtime]}
-    - {name: awesome_print, version: "~> 1.0.2",  groups: [runtime]}
-    - {name: ruby-prof, version: "~> 0.11.2", groups: [profiling]}
-    - {name: mustache,  version: "~> 0.99.4", groups: [profiling]}
-    - {name: rake,      version: "~> 0.9.2",  groups: [development]}
-    - {name: bundler,   version: "~> 1.0",    groups: [development]}
-    - {name: rspec,     version: "~> 2.10.0", groups: [development]}
-    - {name: epath,     version: "~> 0.1.0",  groups: [development]}
-    - {name: yard,      version: "~> 0.8.1",  groups: [development]}
-    - {name: bluecloth, version: "~> 2.2.0",  groups: [development]}
+    - {name: citrus,        version: "~> 2.4.1",   groups: [runtime]}
+    - {name: temple,        version: "~> 0.4.0",   groups: [runtime]}
+    - {name: quickl,        version: "~> 0.4.3",   groups: [runtime]}
+    - {name: awesome_print, version: "~> 1.0.2",   groups: [runtime]}
+    - {name: epath,         version: ">= 0.2",     groups: [runtime]}
+    - {name: tilt,          version: "~> 1.3",     groups: [development]}
+    - {name: rake,          version: "~> 0.9.2",   groups: [development]}
+    - {name: bundler,       version: "~> 1.0",     groups: [development]}
+    - {name: rspec,         version: "~> 2.10.0",  groups: [development]}
+    - {name: yard,          version: "~> 0.8.1",   groups: [development]}
+    - {name: bluecloth,     version: "~> 2.2.0",   groups: [development]}

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: wlang
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta
-  prerelease: 6
+  version: 2.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Bernard Lambeau
@@ -10,33 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-01 00:00:00.000000000Z
+date: 2012-06-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ruby-prof
-  requirement: &70335748964040 !ruby/object:Gem::Requirement
+  name: tilt
+  requirement: &70288043592580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70335748964040
-- !ruby/object:Gem::Dependency
-  name: mustache
-  requirement: &70335748962060 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.99.4
-  type: :development
-  prerelease: false
-  version_requirements: *70335748962060
+  version_requirements: *70288043592580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70335748960500 !ruby/object:Gem::Requirement
+  requirement: &70288043592080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +33,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70335748960500
+  version_requirements: *70288043592080
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70335748958700 !ruby/object:Gem::Requirement
+  requirement: &70288043591620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +44,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70335748958700
+  version_requirements: *70288043591620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70335748956940 !ruby/object:Gem::Requirement
+  requirement: &70288043591160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,21 +55,10 @@ dependencies:
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70335748956940
-- !ruby/object:Gem::Dependency
-  name: epath
-  requirement: &70335748940940 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :development
-  prerelease: false
-  version_requirements: *70335748940940
+  version_requirements: *70288043591160
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70335748940200 !ruby/object:Gem::Requirement
+  requirement: &70288043590700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +66,10 @@ dependencies:
         version: 0.8.1
   type: :development
   prerelease: false
-  version_requirements: *70335748940200
+  version_requirements: *70288043590700
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &70335748939300 !ruby/object:Gem::Requirement
+  requirement: &70288043590240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +77,10 @@ dependencies:
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *70335748939300
+  version_requirements: *70288043590240
 - !ruby/object:Gem::Dependency
   name: citrus
-  requirement: &70335748938360 !ruby/object:Gem::Requirement
+  requirement: &70288043589780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +88,10 @@ dependencies:
         version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70335748938360
+  version_requirements: *70288043589780
 - !ruby/object:Gem::Dependency
   name: temple
-  requirement: &70335748937360 !ruby/object:Gem::Requirement
+  requirement: &70288043609780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,47 +99,54 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70335748937360
+  version_requirements: *70288043609780
 - !ruby/object:Gem::Dependency
-  name: backports
-  requirement: &70335748936160 !ruby/object:Gem::Requirement
+  name: quickl
+  requirement: &70288043609320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70335748936160
+  version_requirements: *70288043609320
 - !ruby/object:Gem::Dependency
-  name: quickl
-  requirement: &70335748934880 !ruby/object:Gem::Requirement
+  name: awesome_print
+  requirement: &70288043608860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70335748934880
+  version_requirements: *70288043608860
 - !ruby/object:Gem::Dependency
-  name: awesome_print
-  requirement: &70335748933680 !ruby/object:Gem::Requirement
+  name: epath
+  requirement: &70288043608400 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70335748933680
-description: ! "WLang is a general-purpose *code generation*/*templating engine*.
-  It's main aim is to help you generating\nweb pages, sql queries, ruby code (that
-  is, generating code in general) without having to worry too much \nabout html entities
-  encoding, sql back quoting, string escaping and the like. WLang proposes a generic
-  \nengine that you can extend to fit your needs. It also proposes standard instantiations
-  of this engine \nfor common tasks such as creating SQL queries, instantiating web
-  pages, and so on."
+  version_requirements: *70288043608400
+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
+
+  easily extend to fit your needs. It also proposes standard instantiations of this
+
+  engine for common tasks such as rendering HTML web pages.'
 email:
 - blambeau@gmail.com
 - llambeau@gmail.com
@@ -191,20 +176,21 @@ files:
 - lib/wlang/compiler/to_ruby_abstraction.rb
 - lib/wlang/compiler/to_ruby_code.rb
 - lib/wlang/compiler.rb
-- lib/wlang/dialect/dispatching.rb
-- lib/wlang/dialect/evaluation.rb
-- lib/wlang/dialect/tags.rb
 - lib/wlang/dialect.rb
 - lib/wlang/dummy.rb
 - lib/wlang/html.rb
 - lib/wlang/loader.rb
-- lib/wlang/mustang.rb
 - lib/wlang/scope/binding_scope.rb
 - lib/wlang/scope/object_scope.rb
+- lib/wlang/scope/proc_scope.rb
 - lib/wlang/scope/proxy_scope.rb
 - lib/wlang/scope/root_scope.rb
 - lib/wlang/scope.rb
+- lib/wlang/source/front_matter.rb
+- lib/wlang/source.rb
 - lib/wlang/template.rb
+- lib/wlang/tilt/wlang_template.rb
+- lib/wlang/tilt.rb
 - lib/wlang/version.rb
 - lib/wlang.rb
 - LICENCE.md
@@ -213,11 +199,15 @@ files:
 - README.md
 - spec/fixtures/dialect/foobar.rb
 - spec/fixtures/dialect/upcasing.rb
-- spec/fixtures/templates/hello.tpl
-- spec/integration/examples/1-basics.txt
-- spec/integration/examples/2-imperative.txt
-- spec/integration/examples/3-partials.txt
-- spec/integration/examples/4-recursion.txt
+- spec/fixtures/templates/hello.wlang
+- spec/fixtures/templates/hello_with_data.wlang
+- spec/fixtures/templates/hello_with_explicit_locals.wlang
+- spec/fixtures/templates/hello_with_partials.wlang
+- spec/integration/examples/1-html-intro/1-basics.md
+- spec/integration/examples/1-html-intro/2-imperative.md
+- spec/integration/examples/1-html-intro/3-partials.md
+- spec/integration/examples/1-html-intro/4-recursion.md
+- spec/integration/examples/1-html-intro/5-polymorphism.md
 - spec/integration/html/test_ampersand.rb
 - spec/integration/html/test_bang.rb
 - spec/integration/html/test_caret.rb
@@ -231,9 +221,9 @@ files:
 - spec/integration/html/test_star.rb
 - spec/integration/test_dummy.rb
 - spec/integration/test_examples.rb
-- spec/integration/test_mustang.rb
 - spec/integration/test_readme.rb
 - spec/integration/test_upcasing.rb
+- spec/integration/tilt/test_wlang_template.rb
 - spec/spec_helper.rb
 - spec/test_wlang.rb
 - spec/unit/compiler/autospacing/test_right_strip.rb
@@ -246,19 +236,38 @@ files:
 - spec/unit/compiler/test_strconcat_flattener.rb
 - spec/unit/compiler/test_to_ruby_abstraction.rb
 - spec/unit/compiler/test_to_ruby_code.rb
+- spec/unit/compiler/test_to_ruby_proc.rb
 - spec/unit/dialect/test_compile.rb
-- spec/unit/dialect/test_dispatching.rb
 - spec/unit/dialect/test_evaluate.rb
+- spec/unit/dialect/test_new.rb
 - spec/unit/dialect/test_render.rb
-- spec/unit/dialect/test_tags.rb
+- spec/unit/dialect/test_tag.rb
+- spec/unit/dialect/test_tag_dispatching_name.rb
 - spec/unit/dialect/test_with_scope.rb
 - spec/unit/scope/test_binding_scope.rb
+- spec/unit/scope/test_chain.rb
 - spec/unit/scope/test_coerce.rb
 - spec/unit/scope/test_object_scope.rb
+- spec/unit/scope/test_proc_scope.rb
 - spec/unit/scope/test_proxy_scope.rb
 - spec/unit/scope/test_root_scope.rb
+- spec/unit/source/front_matter/test_locals.rb
+- spec/unit/source/front_matter/test_template_content.rb
+- spec/unit/source/test_locals.rb
+- spec/unit/source/test_path.rb
+- spec/unit/source/test_template_content.rb
+- spec/unit/source/test_with_front_matter.rb
+- spec/unit/template/test_call.rb
+- spec/unit/template/test_new.rb
+- spec/unit/template/test_path.rb
+- spec/unit/template/test_render.rb
+- spec/unit/template/test_to_ast.rb
+- spec/unit/template/test_to_ruby_code.rb
+- spec/unit/template/test_to_ruby_proc.rb
+- spec/unit/template/test_yaml_front_matter.rb
 - spec/unit/test_assumptions.rb
 - spec/unit/test_scope.rb
+- spec/unit/tilt/test_wlang_template.rb
 - tasks/debug_mail.rake
 - tasks/debug_mail.txt
 - tasks/gem.rake
@@ -280,9 +289,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -292,11 +301,15 @@ summary: WLang is a powerful code generation and templating engine
 test_files:
 - spec/fixtures/dialect/foobar.rb
 - spec/fixtures/dialect/upcasing.rb
-- spec/fixtures/templates/hello.tpl
-- spec/integration/examples/1-basics.txt
-- spec/integration/examples/2-imperative.txt
-- spec/integration/examples/3-partials.txt
-- spec/integration/examples/4-recursion.txt
+- spec/fixtures/templates/hello.wlang
+- spec/fixtures/templates/hello_with_data.wlang
+- spec/fixtures/templates/hello_with_explicit_locals.wlang
+- spec/fixtures/templates/hello_with_partials.wlang
+- spec/integration/examples/1-html-intro/1-basics.md
+- spec/integration/examples/1-html-intro/2-imperative.md
+- spec/integration/examples/1-html-intro/3-partials.md
+- spec/integration/examples/1-html-intro/4-recursion.md
+- spec/integration/examples/1-html-intro/5-polymorphism.md
 - spec/integration/html/test_ampersand.rb
 - spec/integration/html/test_bang.rb
 - spec/integration/html/test_caret.rb
@@ -310,9 +323,9 @@ test_files:
 - spec/integration/html/test_star.rb
 - spec/integration/test_dummy.rb
 - spec/integration/test_examples.rb
-- spec/integration/test_mustang.rb
 - spec/integration/test_readme.rb
 - spec/integration/test_upcasing.rb
+- spec/integration/tilt/test_wlang_template.rb
 - spec/spec_helper.rb
 - spec/test_wlang.rb
 - spec/unit/compiler/autospacing/test_right_strip.rb
@@ -325,16 +338,35 @@ test_files:
 - spec/unit/compiler/test_strconcat_flattener.rb
 - spec/unit/compiler/test_to_ruby_abstraction.rb
 - spec/unit/compiler/test_to_ruby_code.rb
+- spec/unit/compiler/test_to_ruby_proc.rb
 - spec/unit/dialect/test_compile.rb
-- spec/unit/dialect/test_dispatching.rb
 - spec/unit/dialect/test_evaluate.rb
+- spec/unit/dialect/test_new.rb
 - spec/unit/dialect/test_render.rb
-- spec/unit/dialect/test_tags.rb
+- spec/unit/dialect/test_tag.rb
+- spec/unit/dialect/test_tag_dispatching_name.rb
 - spec/unit/dialect/test_with_scope.rb
 - spec/unit/scope/test_binding_scope.rb
+- spec/unit/scope/test_chain.rb
 - spec/unit/scope/test_coerce.rb
 - spec/unit/scope/test_object_scope.rb
+- spec/unit/scope/test_proc_scope.rb
 - spec/unit/scope/test_proxy_scope.rb
 - spec/unit/scope/test_root_scope.rb
+- spec/unit/source/front_matter/test_locals.rb
+- spec/unit/source/front_matter/test_template_content.rb
+- spec/unit/source/test_locals.rb
+- spec/unit/source/test_path.rb
+- spec/unit/source/test_template_content.rb
+- spec/unit/source/test_with_front_matter.rb
+- spec/unit/template/test_call.rb
+- spec/unit/template/test_new.rb
+- spec/unit/template/test_path.rb
+- spec/unit/template/test_render.rb
+- spec/unit/template/test_to_ast.rb
+- spec/unit/template/test_to_ruby_code.rb
+- spec/unit/template/test_to_ruby_proc.rb
+- spec/unit/template/test_yaml_front_matter.rb
 - spec/unit/test_assumptions.rb
 - spec/unit/test_scope.rb
+- spec/unit/tilt/test_wlang_template.rb

data/lib/wlang/dialect/dispatching.rb

@@ -1,51 +0,0 @@
-module WLang
-  class Dialect
-    module Dispatching
-
-      module ClassMethods
-
-        def tag_dispatching_name(symbols, prefix = "_tag")
-          symbols = symbols.chars unless symbols.is_a?(Array)
-          chars   = symbols.map{|s| s.ord}.join("_")
-          "#{prefix}_#{chars}".to_sym
-        end
-
-        private
-
-        def define_tag_method(symbols, dialects, code)
-          rulename = tag_dispatching_name(symbols, "_tag")
-          case code
-          when Symbol
-            module_eval %Q{ alias :#{rulename} #{code} }
-          when Proc
-            define_method(rulename, code)
-          else
-            raise "Unable to use #{code} for a tag"
-          end
-          dialects_info_name = tag_dispatching_name(symbols, "_diatag")
-          define_method(dialects_info_name) do dialects end
-        end
-
-      end # module ClassMethods
-
-      module InstanceMethods
-
-        def dialects_for(symbols)
-          info = Dialect.tag_dispatching_name(symbols, "_diatag")
-          if respond_to?(info)
-            send(info)
-          else
-            raise ArgumentError, "No tag for #{symbols}"
-          end
-        end
-
-      end # module InstanceMethods
-
-      def self.included(mod)
-        mod.instance_eval{ include(Dispatching::InstanceMethods) }
-        mod.extend(ClassMethods)
-      end
-
-    end # module Dispatching
-  end # class Dialect
-end # module WLang