wlang 0.10.0 → 0.10.1

data/doc/specification/specification.wtpl

@@ -37,5 +37,6 @@
 		}
       </div>
     }
+    <<{analytics.wtpl}
   </body>
 </html>

data/doc/specification/specification.yml

@@ -1,6 +1,6 @@
 ---
 title: WLang
-version: 0.10.0
+version: 0.10.1
 sections:
   - identifier: about
     name: About

data/lib/wlang.rb

@@ -1,3 +1,4 @@
+require 'wlang/loader'
 require 'wlang/ext/string'
 require 'stringio'
 require 'wlang/rule'
@@ -20,7 +21,7 @@ require 'wlang/intelligent_buffer'
 module WLang
   
   # Current version of WLang
-  VERSION = "0.10.0".freeze
+  VERSION = "0.10.1".freeze
 
   ######################################################################## About files and extensions
   
@@ -285,7 +286,7 @@ module WLang
   def self.load_data(uri, extension=nil)
     check_file_extension(extension = extension.nil? ? File.extname(uri) : extension)
     loader = DATA_EXTENSIONS[extension]
-    raise ::WLang::Error("No data loader for #{extension}") if loader.nil?
+    raise ::WLang::Error, "No data loader for #{extension}" if loader.nil?
     loader.call(uri) 
   end
   

data/lib/wlang/parser.rb

@@ -209,7 +209,7 @@ module WLang
     # parsing on a '}')
     #
     def has_block?(offset)
-      self.source_text[offset,2]=='}{'
+      self.source_text[offset,2] == template.block_endstart
     end
   
     #

data/lib/wlang/template.rb

@@ -58,6 +58,11 @@ module WLang
           @source.to_s
       end
     end
+    
+    # Returns template's block endstart (typically '}{')
+    def block_endstart
+      @block_endstart ||= BLOCK_SYMBOLS[block_symbols].reverse.join
+    end
   
     # Instantiates the template, with optinal context and hosted language.
     def instantiate(context = {}, hosted = ::WLang::HostedLanguage.new)

data/{test/spec → spec}/basic_object.spec

@@ -1,4 +1,4 @@
-require "wlang"
+require File.expand_path('../spec_helper', __FILE__)
 describe "WLang's version of BasicObject" do
   
   class A 

data/{test/spec → spec}/coderay_dialect.spec

@@ -1,4 +1,4 @@
-require "wlang"
+require File.expand_path('../spec_helper', __FILE__)
 describe("WLang should support coderay encoder") do
   
   it("should support basic coderay encoding") {

data/{test/spec → spec}/hash_scope.spec

@@ -1,4 +1,4 @@
-require 'wlang'
+require File.expand_path('../spec_helper', __FILE__)
 require 'wlang/hash_scope'
 
 describe ::WLang::HashScope do

data/{test/spec → spec}/redcloth_dialect.spec

@@ -1,4 +1,4 @@
-require "wlang"
+require File.expand_path('../spec_helper', __FILE__)
 describe("WLang should support redcloth encoder") do
   
   it("should support basic redcloth encoding") {

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'wlang'

data/{test/spec → spec}/wlang.spec

@@ -1,4 +1,4 @@
-require 'wlang'
+require File.expand_path('../spec_helper', __FILE__)
 describe ::WLang do
   
   it("should allow easy use of encoders") {

data/spec/wlang_spec.rb

@@ -0,0 +1,8 @@
+require File.expand_path('../spec_helper', __FILE__)
+describe WLang do
+  
+  it "should have a version number" do
+    WLang.const_defined?(:VERSION).should be_true
+  end
+  
+end

data/{test/spec → spec}/xhtml_dialect.spec

@@ -1,5 +1,4 @@
-require "wlang"
-
+require File.expand_path('../spec_helper', __FILE__)
 describe "The wlang/xhtml dialect" do
   
   it("should provide helpers to create links") {

data/tasks/debug_mail.rake

@@ -0,0 +1,77 @@
+# Installs a rake task for debuging the announcement mail.
+#
+# This file installs the 'rake debug_mail' that flushes an announcement mail
+# for your library on the standard output. It is automatically generated 
+# by Noe from your .noespec file, and should therefore be configured there, 
+# under the variables/rake_tasks/debug_mail entry, as illustrated below:
+#
+# variables:
+#   rake_tasks:
+#     debug_mail:
+#       rx_changelog_sections: /^#/
+#       nb_changelog_sections: 1
+#       ...
+#
+# If you have specific needs requiring manual intervention on this file, 
+# don't forget to set safe-override to false in your noe specification:
+# 
+# template-info:
+#   manifest:
+#     tasks/debug_mail.rake:
+#       safe-override: false
+#
+# The mail template used can be found in debug_mail.txt. That file may be
+# changed to tune the mail you want to send. If you do so, don't forget to
+# add a manifest entry in your .noespec file to avoid overriding you 
+# changes. The mail template uses wlang, with parentheses for block 
+# delimiters.
+#
+# template-info:
+#   manifest:
+#     tasks/debug_mail.txt:
+#       safe-override: false
+#
+begin
+  require 'wlang'
+  require 'yaml'
+  
+  task :debug_mail do 
+    # Check that a .noespec file exists
+    noespec_file = File.expand_path('../../wlang.noespec', __FILE__)
+    unless File.exists?(noespec_file)
+      raise "Unable to find .noespec project file, sorry."
+    end
+    
+    # Load it as well as variables and options
+    noespec = YAML::load(File.read(noespec_file))
+    vars = noespec['variables'] || {}
+
+    # Changes are taken from CHANGELOG 
+    logs = Dir[File.expand_path("../../CHANGELOG.*", __FILE__)]
+    unless logs.size == 1
+      abort "Unable to find a changelog file"
+    end
+
+    # Load interesting changesets
+    changes, end_found = [], 0
+    File.readlines(logs.first).select{|line|
+      if line =~ /^#/
+        break if end_found >= 2
+        end_found += 1
+      end
+      changes << line
+    }
+    vars['changes'] = changes.join
+    
+    # WLang template
+    template = File.expand_path('../debug_mail.txt', __FILE__)
+    
+    # Let's go!
+    $stdout << WLang::file_instantiate(template, vars, "wlang/active-text")
+  end
+
+rescue LoadError 
+  task :debug_mail do
+    abort "wlang is not available. Try 'gem install wlang'"
+  end
+end

data/tasks/debug_mail.txt

@@ -0,0 +1,13 @@
+Subject: [ANN] !{lower} !{version} Released
+
+!{lower} version !{version} has been released!
+
+!{summary}
+
+*{links as l}{* <!{l}>}{!{"\n"}}
+
+!{description}
+
+Changes:
+
+!{changes}

data/tasks/gem.rake

@@ -0,0 +1,68 @@
+# Installs rake tasks for gemming and packaging
+#
+# This file installs the 'rake package', 'rake gem' tasks and associates 
+# (clobber_package, repackage, ...). It is automatically generated by Noe 
+# from your .noespec file, and should therefore be configured there, under 
+# the variables/rake_tasks/gem entry, as illustrated below:
+#
+# variables:
+#   rake_tasks:
+#     gem:
+#       package_dir: pkg
+#       need_tar: false
+#       need_tar_gz: false
+#       need_tar_bz2: false
+#       need_zip: false
+#       ...
+#
+# If you have specific needs requiring manual intervention on this file, 
+# don't forget to set safe-override to false in your noe specification:
+# 
+# template-info:
+#   manifest:
+#     tasks/gem.rake:
+#       safe-override: false
+#
+begin
+  require 'rubygems/package_task'
+  Gem::PackageTask.new($gemspec) do |t|
+
+    # Name of the package
+    t.name = $gemspec.name
+
+    # Version of the package
+    t.version = $gemspec.version
+    
+    # Directory used to store the package files
+    t.package_dir = "pkg"
+    
+    # True if a gzipped tar file (tgz) should be produced
+    t.need_tar = false
+    
+    # True if a gzipped tar file (tar.gz) should be produced
+    t.need_tar_gz = false
+    
+    # True if a bzip2'd tar file (tar.bz2) should be produced
+    t.need_tar_bz2 = false
+    
+    # True if a zip file should be produced (default is false)
+    t.need_zip = false
+    
+    # List of files to be included in the package.
+    t.package_files = $gemspec.files
+    
+    # Tar command for gzipped or bzip2ed archives.
+    t.tar_command = "tar"
+    
+    # Zip command for zipped archives.
+    t.zip_command = "zip"
+
+  end
+rescue LoadError
+  task :gem do
+    abort 'rubygems/package_task is not available. You should verify your rubygems installation'
+  end
+  task :package do
+    abort 'rubygems/package_task is not available. You should verify your rubygems installation'
+  end
+end

data/tasks/genspec.rake

@@ -0,0 +1,5 @@
+# Installs a rake task for generating the specification.
+desc "Generate doc/specification/specification.html"
+task :genspec do
+  Kernel.exec("ruby -Ilib bin/wlang --methodize --output doc/specification/specification.html doc/specification/specification.wtpl")
+end

data/tasks/spec_test.rake

@@ -0,0 +1,79 @@
+# Installs a rake task for for running examples written using rspec.
+#
+# This file installs the 'rake spec_test' (aliased as 'rake spec') as well as
+# extends 'rake test' to run spec tests, if any. It is automatically generated 
+# by Noe from your .noespec file, and should therefore be configured there, 
+# under the variables/rake_tasks/spec_test entry, as illustrated below:
+#
+# variables:
+#   rake_tasks:
+#     spec_test:
+#       pattern: spec/**/*_spec.rb
+#       verbose: true
+#       rspec_opts: [--color, --backtrace]
+#       ...
+#
+# If you have specific needs requiring manual intervention on this file, 
+# don't forget to set safe-override to false in your noe specification:
+# 
+# template-info:
+#   manifest:
+#     tasks/spec_test.rake:
+#       safe-override: false
+#
+# This file has been written to conform to RSpec v2.4.0. More information about 
+# rspec and options of the rake task defined below can be found on 
+# http://relishapp.com/rspec
+#
+begin
+  require "rspec/core/rake_task"
+  desc "Run RSpec code examples"
+  RSpec::Core::RakeTask.new(:spec_test) do |t|
+    # Glob pattern to match files.
+    t.pattern = "spec/*.spec"
+
+    # By default, if there is a Gemfile, the generated command will include
+    # 'bundle exec'. Set this to true to ignore the presence of a Gemfile, 
+    # and not add 'bundle exec' to the command.
+    t.skip_bundler = false
+
+    # Name of Gemfile to use
+    t.gemfile = "Gemfile"
+
+    # Whether or not to fail Rake when an error occurs (typically when 
+    # examples fail).
+    t.fail_on_error = true
+
+    # A message to print to stderr when there are failures.
+    t.failure_message = nil
+
+    # Use verbose output. If this is set to true, the task will print the
+    # executed spec command to stdout.
+    t.verbose = true
+
+    # Use rcov for code coverage?
+    t.rcov = false
+
+    # Path to rcov.
+    t.rcov_path = "rcov"
+
+    # Command line options to pass to rcov. See 'rcov --help' about this
+    t.rcov_opts = []
+
+    # Command line options to pass to ruby. See 'ruby --help' about this 
+    t.ruby_opts = []
+
+    # Path to rspec
+    t.rspec_path = "rspec"
+
+    # Command line options to pass to rspec. See 'rspec --help' about this
+    t.rspec_opts = ["--color", "--backtrace"]
+  end
+rescue LoadError => ex
+  task :spec_test do
+    abort 'rspec is not available. In order to run spec, you must: gem install rspec'
+  end
+ensure
+  task :spec => [:spec_test]
+  task :test => [:spec_test]
+end

data/tasks/unit_test.rake

@@ -0,0 +1,76 @@
+# Installs a rake task for for running unit tests.
+#
+# This file installs the 'rake unit_test' and extends 'rake test' to run unit 
+# tests, if any. It is automatically generated by Noe from your .noespec file, 
+# and should therefore be configured there, under the variables/rake_tasks/unit_test 
+# entry, as illustrated below:
+#
+# variables:
+#   rake_tasks:
+#     unit_test:
+#       pattern: test/test*.rb
+#       verbose: false
+#       warning: false
+#       ...
+#
+# If you have specific needs requiring manual intervention on this file, 
+# don't forget to set safe-override to false in your noe specification:
+# 
+# template-info:
+#   manifest:
+#     tasks/unit_test.rake:
+#       safe-override: false
+#
+# More info about the TestTask and its options can be found on 
+# http://rake.rubyforge.org/classes/Rake/TestTask.html
+#
+begin
+  desc "Lauches unit tests"
+  require 'rake/testtask'
+  Rake::TestTask.new(:unit_test) do |t|
+
+    # List of directories to added to $LOAD_PATH before running the
+    # tests. (default is 'lib')
+    t.libs = ["lib"]
+
+    # True if verbose test output desired. (default is false)
+    t.verbose = false
+
+    # Test options passed to the test suite.  An explicit TESTOPTS=opts 
+    # on the command line will override this. (default is NONE)
+    t.options = nil
+
+    # Request that the tests be run with the warning flag set.
+    # E.g. warning=true implies "ruby -w" used to run the tests.
+    t.warning = false
+
+    # Glob pattern to match test files. (default is 'test/test*.rb')
+    t.pattern = nil
+
+    # Style of test loader to use.  Options are:
+    #
+    # * :rake -- Rake provided test loading script (default).
+    # * :testrb -- Ruby provided test loading script.
+    # * :direct -- Load tests using command line loader.
+    # 
+    t.loader = :rake
+
+    # Array of commandline options to pass to ruby when running test 
+    # loader.
+    t.ruby_opts = []
+
+    # Explicitly define the list of test files to be included in a
+    # test.  +list+ is expected to be an array of file names (a
+    # FileList is acceptable).  If both +pattern+ and +test_files+ are
+    # used, then the list of test files is the union of the two.
+    t.test_files = ["test/unit/test_all.rb", "test/blackbox/test_all.rb", "test/standard_dialects/test_all.rb", "test/standard_dialects/**/*_test.rb"]
+
+  end
+rescue LoadError => ex
+  task :unit_test do
+    abort 'rspec is not available. In order to run spec, you must: gem install rspec'
+  end
+ensure
+  task :test => [:unit_test]
+end
+