wlang 2.1.2 → 2.2.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2.2.0 / 2013-03-05
+
+* Added ATTR/VALUE pairs to the wlang command line tool, for passing data to templates
+  in an easy way.
+
 # 2.1.2 / 2012-01-15
 
 * Add backquote as supported tag symbol

data/Gemfile

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

data/Gemfile.lock

@@ -12,7 +12,6 @@ GEM
   specs:
     awesome_print (1.0.2)
     backports (2.6.1)
-    bluecloth (2.2.0)
     citrus (2.4.1)
     diff-lcs (1.1.3)
     path (1.3.1)
@@ -33,7 +32,6 @@ GEM
     rspec-mocks (2.10.1)
     temple (0.4.0)
     tilt (1.3.3)
-    yard (0.8.1)
 
 PLATFORMS
   ruby
@@ -41,7 +39,6 @@ PLATFORMS
 DEPENDENCIES
   awesome_print (~> 1.0.2)
   backports (~> 2.6)
-  bluecloth (~> 2.2.0)
   bundler (~> 1.0)
   citrus (~> 2.4.1)
   path (~> 1.3)
@@ -52,4 +49,3 @@ DEPENDENCIES
   sinatra!
   temple (~> 0.4.0)
   tilt (~> 1.3)
-  yard (~> 0.8.1)

data/lib/wlang/command.rb

@@ -5,32 +5,50 @@ module WLang
   # wlang -- templating engine
   #
   # SYNOPSIS
-  #   Usage: wlang [options] TEMPLATE
+  #   Usage: wlang [options] TEMPLATE [ATTR1 VALUE1 ATTR2 VALUE2]
   #
   # OPTIONS:
   # #{summarized_options}
   #
   # DESCRIPTION
-  #   This command invokes the wlang templating engine on TEMPLATE
-  #   and flushes the rendering result on standard output.
+  #   This command invokes the wlang templating engine on TEMPLATE and flushes the
+  #   rendering result on standard output.
+  #
+  #   Commandline template data can be passed through ATTR and VALUE arguments.
   #
   class Command < Quickl::Command(__FILE__, __LINE__)
 
-    options do |opt|
+    attr_reader :output
+    attr_reader :yaml_front_matter
+    attr_reader :ast
+    attr_reader :compiling_options
+    attr_reader :context
+    attr_reader :dialect
+    attr_reader :tpl_file
+    attr_reader :template
+
+    def initialize(*args)
+      require 'wlang/html'
+      super
       @output = nil
+      @yaml_front_matter = true
+      @ast = false
+      @compiling_options = {}
+      @context = {}
+      @dialect = WLang::Html
+    end
+
+    options do |opt|
       opt.on('--output=FILE', 'Render output in FILE') do |file|
         @output = file
       end
-      @yaml_front_matter = true
       opt.on("--[no-]yaml-front-matter",
              "Enable/disable YAML front mater (defaults to true)") do |val|
         @yaml_front_matter = val
       end
-      @ast = false
       opt.on('--ast', "Debugs the AST") do
         @ast = true
       end
-      @compiling_options = {}
       opt.on('--[no-]auto-spacing') do |val|
         @compiling_options[:autospacing] = val
       end
@@ -63,20 +81,20 @@ module WLang
     private
 
     def install(argv)
-      raise Quickl::Help unless argv.size == 1
+      raise Quickl::Help unless (argv.size % 2) == 1
 
       # template file
-      unless File.file?(@tpl_file = argv.first)
+      unless (@tpl_file = Path(argv.shift)).exist?
         raise Quickl::Exit, "No such template #{tpl_file}"
       end
 
-      # dialect
-      require 'wlang/html'
-      @dialect       = WLang::Html
+      # context
+      argv.each_slice(2) do |(k,v)|
+        @context[k] = v
+      end
 
       # template and context
-      @template      = Template.new(File.read(@tpl_file), @compiling_options)
-      @context       = {}
+      @template = Template.new(@tpl_file, @compiling_options)
     end
 
     def with_output(&proc)

data/lib/wlang/version.rb

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

data/spec/unit/command/test_install.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+require 'wlang/command'
+module WLang
+  describe Command, 'install' do
+
+    class Command
+      public :install
+    end
+
+    let(:cmd){ Command.new }
+
+    subject{
+      cmd.install(argv)
+    }
+    
+    context 'with empty ARGV' do
+      let(:argv){ [] }
+
+      it 'raises an error' do
+        lambda{
+          subject
+        }.should raise_error
+      end
+    end
+
+    context 'with a single unexisting file' do
+      let(:argv){ [ "foo" ] }
+
+      it 'raises an error' do
+        lambda{
+          subject
+        }.should raise_error
+      end
+    end
+
+    context 'with a single existing file' do
+      let(:argv){ [ __FILE__ ] }
+
+      it 'sets the file correctly' do
+        subject
+        cmd.tpl_file.should eq(Path(__FILE__))
+      end
+    end
+
+    context 'with an existing file and key/value pairs' do
+      let(:argv){ [ __FILE__, "foo", "bar", "name", "wlang" ] }
+
+      it 'sets the file correctly' do
+        subject
+        cmd.tpl_file.should eq(Path(__FILE__))
+      end
+
+      it 'sets the context correctly' do
+        subject
+        cmd.context.should eq("foo" => "bar", "name" => "wlang")
+      end
+    end
+
+  end
+end

data/wlang.gemspec

@@ -128,8 +128,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rake", "~> 0.9.2")
   s.add_development_dependency("bundler", "~> 1.0")
   s.add_development_dependency("rspec", "~> 2.10.0")
-  s.add_development_dependency("yard", "~> 0.8.1")
-  s.add_development_dependency("bluecloth", "~> 2.2.0")
   s.add_development_dependency("sinatra", ">= 1.4")
   s.add_development_dependency("rack-test", "~> 0.6.1")
   s.add_dependency("citrus", "~> 2.4.1")

data/wlang.noespec

@@ -1,6 +1,6 @@
 template-info:
   name: "rubygem.noe"
-  version: 1.7.4
+  version: 2.0.0
   links:
     source: https://github.com/blambeau/noe
   manifest:
@@ -12,7 +12,7 @@ variables:
   upper:
     WLang
   version:
-    2.1.2
+    2.2.0
   summary: |-
     WLang is a powerful code generation and templating engine
   description: |-
@@ -41,7 +41,5 @@ variables:
     - {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]}
     - {name: sinatra,       version: ">= 1.4",     groups: [development]}
     - {name: rack-test,     version: "~> 0.6.1",   groups: [development]}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wlang
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -92,38 +92,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.10.0
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-- !ruby/object:Gem::Dependency
-  name: bluecloth
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -332,6 +300,7 @@ files:
 - spec/integration/tilt/test_wlang_template.rb
 - spec/spec_helper.rb
 - spec/test_wlang.rb
+- spec/unit/command/test_install.rb
 - spec/unit/compiler/autospacing/test_right_strip.rb
 - spec/unit/compiler/autospacing/test_unindent.rb
 - spec/unit/compiler/test_dialect_enforcer.rb
@@ -397,7 +366,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1886081471166054842
+      hash: 1035684278937019643
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -406,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1886081471166054842
+      hash: 1035684278937019643
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -446,6 +415,7 @@ test_files:
 - spec/integration/tilt/test_wlang_template.rb
 - spec/spec_helper.rb
 - spec/test_wlang.rb
+- spec/unit/command/test_install.rb
 - spec/unit/compiler/autospacing/test_right_strip.rb
 - spec/unit/compiler/autospacing/test_unindent.rb
 - spec/unit/compiler/test_dialect_enforcer.rb