slim 0.7.3 → 0.7.4

data/README.md

@@ -29,7 +29,7 @@ Install Slim as a gem:
 
 Include Slim in your Gemfile:
 
-    gem 'slim', require: 'slim/rails'
+    gem 'slim', :require => 'slim/rails'
 
 That's it! Now, just use the .slim extension and you're good to go.
 
@@ -76,7 +76,7 @@ Here's a quick example to demonstrate what a Slim template looks like:
         #footer
           | Copyright © 2010 Andrew Stone
 
-        = render partial: 'tracking_code'
+        = render 'tracking_code'
 
         script
           | $(content).do_something();
@@ -90,9 +90,9 @@ Here's a quick example to demonstrate what a Slim template looks like:
 
 > The pipe tells Slim to just copy the line. It essentially escapes any processing.
 
-#### `` ` `` or `'`
+#### `'`
 
-> _Same as the pipe (`|`)._
+> The single quote tells Slim to copy the line (similar to |), but makes sure that a single trailing space is appended.
 
 #### `-`
 
@@ -120,7 +120,7 @@ Here's a quick example to demonstrate what a Slim template looks like:
   `end` is forbidden behind `-`. Blocks are defined only by indentation.
 
 #### Can put content on same line or nest it.
-  If you nest content (e.g. put it on the next line), start the line with a pipe (`|`) or a backtick (`` ` ``).
+  If you nest content (e.g. put it on the next line), start the line with a pipe (`|`) or a single quote (`` ' ``).
 
 #### Indentation matters, but it's not as strict as Haml.
   If you want to first indent 2 spaces, then 5 spaces, it's your choice. To nest markup you only need to indent by one space, the rest is gravy.
@@ -226,7 +226,7 @@ Here's a quick example to demonstrate what a Slim template looks like:
 
 ### Treat multiple lines of code as text that should bypass parsing
 
-  Use a pipe (`|`) or backtick (`` ` ``) to start the escape.
+  Use a pipe (`|`) or single quote (`` ' ``) to start the escape.
   Each following line that is indented greater than
   the backtick is copied over.
 
@@ -297,7 +297,7 @@ Here's a quick example to demonstrate what a Slim template looks like:
 [Google Group](http://groups.google.com/group/slim-template)
 
 ## Slim related projects
-  
+
 * [Textmate bundle](http://github.com/fredwu/ruby-slim-textmate-bundle)
 * [Rails 3 Generators](http://github.com/leogalmeida/slim-rails)
 * [Slim for Clojure](http://github.com/chaslemley/slim.clj)

data/lib/slim.rb

@@ -12,8 +12,3 @@ require 'slim/engine'
 require 'slim/template'
 require 'slim/version'
 
-module Slim
-  def self.version
-    VERSION
-  end
-end

data/lib/slim/command.rb

@@ -54,7 +54,7 @@ module Slim
       end
 
       opts.on_tail('-v', '--version', 'Print version') do
-        puts "Slim #{Slim.version}"
+        puts "Slim #{Slim::VERSION}"
         exit
       end
     end

data/lib/slim/compiler.rb

@@ -49,9 +49,6 @@ module Slim
         [:capture, tmp2,
          compile!(content)],
 
-        # Make sure that `yield` returns the output.
-        [:block, tmp2],
-
         # Close the block.
         [:block, 'end'],
 

data/lib/slim/embedded_engine.rb

@@ -14,17 +14,16 @@ module Slim
       engine.dup
     end
 
-    def on_slim_embedded(engine, *body)
-      EmbeddedEngine[engine].on_slim_embedded(engine, *body)
+    def on_slim_embedded(name, *body)
+      engine = EmbeddedEngine[name]
+      raise "Embedded engine #{name} is disabled" if (options[:enable_engines] && !options[:enable_engines].include?(name)) ||
+                                                     (options[:disable_engines] && options[:disable_engines].include?(name))
+      engine.on_slim_embedded(name, *body)
     end
 
     def collect_text(body)
       body.inject('') do |text, exp|
-        if exp[0] == :slim && exp[1] == :text
-          text << exp[2]
-        elsif exp[0] == :newline
-          text << "\n"
-        end
+        text << exp[2] if exp[0] == :slim && exp[1] == :text
         text
       end
     end

data/lib/slim/engine.rb

@@ -10,10 +10,11 @@ module Slim
     set_default_options :pretty => false,
                         :attr_wrapper => '"',
                         :format => :html5,
-                        :id_delimiter => nil
+                        :id_delimiter => nil,
+                        :generator => Temple::Generators::ArrayBuffer
 
-    use Slim::Parser, :file
-    use Slim::EmbeddedEngine
+    use Slim::Parser, :file, :tabsize
+    use Slim::EmbeddedEngine, :enable_engines, :disable_engines
     use Slim::Interpolation
     use Slim::Sections, :sections, :dictionary, :dictionary_access
     use Slim::EndInserter
@@ -23,6 +24,6 @@ module Slim
     filter :MultiFlattener
     filter :StaticMerger
     filter :DynamicInliner
-    generator :ArrayBuffer
+    chain << proc {|options| options[:generator].new }
   end
 end

data/lib/slim/parser.rb

@@ -109,6 +109,7 @@ module Slim
 
             if !in_comment
               # The indentation of first line of the text block determines the text base indentation.
+              newline = text_indent ? "\n" : ''
               text_indent ||= indent
 
               # The text block lines must be at least indented as deep as the first line.
@@ -116,8 +117,7 @@ module Slim
               syntax_error! 'Unexpected text indentation', line, lineno if offset < 0
 
               # Generate the additional spaces in front.
-              i = ' ' * offset
-              stacks.last << [:slim, :text, i + line]
+              stacks.last << [:slim, :text, newline + (' ' * offset) + line]
             end
 
             stacks.last << [:newline]
@@ -163,13 +163,13 @@ module Slim
         end
 
         case line[0]
-        when ?|, ?', ?`, ?/
+        when ?|, ?', ?/
           # Found a block.
 
           # We're now expecting the next line to be indented, so we'll need
           # to push a block to the stack.
           block = [:multi]
-          stacks.last << block
+          stacks.last << (line[0] == ?' ? [:multi, block, [:slim, :text, ' ']] : block)
           stacks << block
           block_indent = indent
 
@@ -187,7 +187,7 @@ module Slim
           stacks.last << [:slim, :control, broken_line, block]
           stacks << block
         when ?=
-          # Found a output bloc
+          # Found an output block.
           # We expect the line to be broken or the next line to be indented.
           block = [:multi]
           escape = line[1] != ?=

data/lib/slim/rails.rb

@@ -1,5 +1,7 @@
 require 'slim'
 
+Slim::Engine.default_options[:generator] = Temple::Generators::RailsOutputBuffer
+
 module ActionView
   module TemplateHandlers
     raise "Slim supports only Rails 3.x and greater, your Rails version is #{Rails::VERSION::STRING}" if Rails::VERSION::MAJOR < 3
@@ -16,7 +18,7 @@ module ActionView
     else
       # Slim handler for Rails 3.1 and greater
       class SlimHandler
-        def call(template)
+        def self.call(template)
           Slim::Engine.new.compile(template.source)
         end
       end

data/lib/slim/version.rb

@@ -1,3 +1,3 @@
 module Slim
-  VERSION = "0.7.3"
+  VERSION = '0.7.4'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 3
-  version: 0.7.3
+  - 4
+  version: 0.7.4
 platform: ruby
 authors: 
 - Andrew Stone
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 -05:00
+date: 2010-11-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,8 +30,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 5
-        version: 0.1.5
+        - 6
+        version: 0.1.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -77,7 +77,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: erubis
+  name: minitest
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -90,7 +90,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: rcov
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -103,7 +103,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: rdiscount
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -116,7 +116,7 @@ dependencies:
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rdiscount
+  name: liquid
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -129,7 +129,7 @@ dependencies:
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: liquid
+  name: yard
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -141,19 +141,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: yard
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id010
 description: Slim is a template language whose goal is reduce the syntax to the essential parts without becoming cryptic.
 email: 
 - andy@stonean.com
@@ -166,20 +153,8 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
-- .gitignore
-- Gemfile
-- Gemfile.lock
 - README.md
-- Rakefile
-- benchmarks/run.rb
-- benchmarks/src/complex.erb
-- benchmarks/src/complex.haml
-- benchmarks/src/complex.slim
-- benchmarks/src/complex_view.rb
 - bin/slim
-- extra/slim-mode.el
-- extra/slim.vim
-- extra/test.slim
 - lib/slim.rb
 - lib/slim/command.rb
 - lib/slim/compiler.rb
@@ -193,21 +168,6 @@ files:
 - lib/slim/sections.rb
 - lib/slim/template.rb
 - lib/slim/version.rb
-- slim.gemspec
-- test/helper.rb
-- test/slim/test_code_blocks.rb
-- test/slim/test_code_escaping.rb
-- test/slim/test_code_evaluation.rb
-- test/slim/test_code_output.rb
-- test/slim/test_code_structure.rb
-- test/slim/test_embedded_engines.rb
-- test/slim/test_html_escaping.rb
-- test/slim/test_html_structure.rb
-- test/slim/test_parser_errors.rb
-- test/slim/test_rails.rb
-- test/slim/test_ruby_errors.rb
-- test/slim/test_sections.rb
-- test/slim/test_slim_template.rb
 has_rdoc: true
 homepage: http://github.com/stonean/slim
 licenses: []

data/.gitignore

@@ -1,8 +0,0 @@
-*.swp
-pkg/*
-*.gem
-.bundle
-readme.html
-.yardoc/
-doc/
-coverage/

data/Gemfile

@@ -1,3 +0,0 @@
-source :rubygems
-
-gemspec

data/Gemfile.lock

@@ -1,38 +0,0 @@
-PATH
-  remote: .
-  specs:
-    slim (0.7.2)
-      temple (~> 0.1.5)
-      tilt (~> 1.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    haml (3.0.22)
-    liquid (2.2.2)
-    minitest (1.7.2)
-    rake (0.8.7)
-    rcov (0.9.9)
-    rdiscount (1.6.5)
-    temple (0.1.5)
-    tilt (1.1)
-    yard (0.6.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  erubis
-  haml
-  liquid
-  minitest
-  rake (>= 0.8.7)
-  rcov
-  rdiscount
-  slim!
-  temple (~> 0.1.5)
-  tilt (~> 1.1)
-  yard

data/Rakefile

@@ -1,47 +0,0 @@
-begin
-  require 'bundler'
-  Bundler::GemHelper.install_tasks
-rescue Exception => e
-end
-
-require 'rake/testtask'
-
-desc 'Run Slim benchmarks! (Default :iterations is 1000)'
-task :bench, :iterations, :slow do |t, args|
-  ruby("benchmarks/run.rb #{args[:slow]} #{args[:iterations]}")
-end
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib' << 'test'
-  t.pattern = 'test/**/test_*.rb'
-  t.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |t|
-    t.libs << 'lib' << 'test'
-    t.pattern = 'test/**/test_*.rb'
-    t.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: gem install rcov"
-  end
-end
-
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new do |t|
-    t.files = %w(lib/**/*.rb)
-  end
-rescue LoadError
-  task :yard do
-    abort "YARD is not available. In order to run yard, you must: gem install yard"
-  end
-end
-
-desc "Generate Documentation"
-task :doc => :yard
-
-task :default => 'test'

data/benchmarks/run.rb

@@ -1,96 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'), File.join(File.dirname(__FILE__), 'src'))
-
-require 'slim'
-require 'complex_view'
-
-require 'benchmark'
-require 'ostruct'
-require 'erubis'
-require 'erb'
-require 'haml'
-
-class SlimBenchmarks
-  def initialize(slow, iterations)
-    @iterations = (iterations || 1000).to_i
-    @benches    = []
-
-    tpl_erb  = File.read(File.dirname(__FILE__) + '/src/complex.erb')
-    tpl_haml = File.read(File.dirname(__FILE__) + '/src/complex.haml')
-    tpl_slim = File.read(File.dirname(__FILE__) + '/src/complex.slim')
-
-    view  = ComplexView.new
-    eview = OpenStruct.new(:header => view.header, :item => view.item).instance_eval{ binding }
-
-    erb         = ERB.new(tpl_erb)
-    erubis      = Erubis::Eruby.new(tpl_erb)
-    fast_erubis = Erubis::FastEruby.new(tpl_erb)
-    haml        = Haml::Engine.new(tpl_haml, :format => :html5)
-    haml_ugly   = Haml::Engine.new(tpl_haml, :format => :html5, :ugly => true)
-    slim        = Slim::Template.new { tpl_slim }
-
-    haml.def_method(view, :run_haml)
-    haml_ugly.def_method(view, :run_haml_ugly)
-    view.instance_eval %{
-      def run_erb; #{erb.src}; end
-      def run_erubis; #{erubis.src}; end
-      def run_fast_erubis; #{fast_erubis.src}; end
-      def run_slim; #{slim.precompiled_template}; end
-    }
-
-    if slow
-      bench('erb (1)')         { ERB.new(tpl_erb).result(eview) }
-      bench('erubis (1)')      { Erubis::Eruby.new(tpl_erb).result(eview) }
-      bench('fast erubis (1)') { Erubis::Eruby.new(tpl_erb).result(eview) }
-      bench('slim (1)')        { Slim::Template.new { tpl_slim }.render(view) }
-      bench('haml (1)')        { Haml::Engine.new(tpl_haml, :format => :html5).render(view) }
-      bench('haml ugly (1)')   { Haml::Engine.new(tpl_haml, :format => :html5, :ugly => true).render(view) }
-    end
-
-    bench('erb (2)')         { erb.result(eview) }
-    bench('erubis (2)')      { erubis.result(eview) }
-    bench('fast (2)')        { fast_erubis.result(eview) }
-    bench('slim (2)')        { slim.render(view) }
-    bench('haml (2)')        { haml.render(view) }
-    bench('haml (2)')        { haml_ugly.render(view) }
-
-    bench('erb (3)')         { view.run_erb }
-    bench('erubis (3)')      { view.run_erubis }
-    bench('fast erubis (3)') { view.run_fast_erubis }
-    bench('slim (3)')        { view.run_slim }
-    bench('haml (3)')        { view.run_haml }
-    bench('haml ugly (3)')   { view.run_haml_ugly }
-  end
-
-  def run
-    puts "#{@iterations} Iterations"
-    Benchmark.bmbm do |x|
-      @benches.each do |name, block|
-        x.report name.to_s do
-          @iterations.to_i.times { block.call }
-        end
-      end
-    end
-    puts "
-1. Uncached benchmark. Template is parsed every time.
-   Activate this benchmark with slow=1.
-
-2. Cached benchmark. Template is parsed before the benchmark.
-   The ruby code generated by the template engine might be evaluated every time.
-   This benchmark uses the standard API of the template engine.
-
-3. Compiled benchmark. Template is parsed before the benchmark and
-   generated ruby code is compiled into a method.
-   This is the fastest evaluation strategy because it benchmarks
-   pure execution speed of the generated ruby code.
-
-"
-  end
-
-  def bench(name, &block)
-    @benches.push([name, block])
-  end
-end
-
-SlimBenchmarks.new(ARGV[0], ARGV[1]).run