RubyGems - slim - Versions diffs - 0.2.0 → 0.3.0 - Mend

slim 0.2.0 → 0.3.0

Files changed (9) hide show

data/.gitignore CHANGED Viewed

@@ -1,3 +1,5 @@
 *.swp
 pkg
 readme.html
+.yardoc/
+doc/

data/lib/slim.rb CHANGED Viewed

@@ -8,7 +8,7 @@ require 'slim/engine'
 module Slim
   class << self
     def version
-      '0.2.0'
+      '0.3.0'
     end
   end
 end

data/lib/slim/compiler.rb CHANGED Viewed

@@ -1,13 +1,16 @@
 # encoding: utf-8
+require 'slim/optimizer'
 module Slim
   module Compiler
+    include Optimizer
     AUTOCLOSED = %w(meta img link br hr input area param col base)
     REGEX = /^(\s*)(!?`?-?=?\w*)(\s*\w*=".+")?(.*)/
     def compile
-      @compiled = "_buf = [];"
+      @_buffer = ["_buf = [];"]
       last_indent = -1; enders = []
@@ -49,7 +52,7 @@ module Slim
             if ender_indent >= indent
               unless ender == 'end;' && line_type == :control_code
-                @compiled << ender
+                @_buffer << ender
               end
             else
               enders << [ender, ender_indent]
@@ -63,41 +66,47 @@ module Slim
         case line_type
         when :markup
           if AUTOCLOSED.include?(marker)
-            @compiled << "_buf << \"<#{marker}#{attrs || ''}/>\";"
+            @_buffer << "_buf << \"<#{marker}#{attrs || ''}/>\";"
           else
             enders << ["_buf << \"</#{marker}>\";", indent]
-            @compiled << "_buf << \"<#{marker}#{attrs || ''}>\";"
+            @_buffer << "_buf << \"<#{marker}#{attrs || ''}>\";"
           end
           if string
             string.lstrip!
             if string =~ /^=(.*)/
-              @compiled << "_buf << #{$1.strip};"
+              @_buffer << "_buf << #{$1.strip};"
             else
-              @compiled << "_buf << \"#{string}\";"
+              @_buffer << "_buf << \"#{string}\";"
             end
           end
         when :text
-          @compiled << "_buf << \"#{string}\";"
+          @_buffer << "_buf << \"#{string}\";"
         when :control_code
           unless enders.detect{|e| e[0] == 'end;' && e[1] == indent}
             enders << ['end;', indent]
           end
-          @compiled << "#{string};"
+          @_buffer << "#{string};"
         when :output_code
-          @compiled << "_buf << #{string};"
+          @_buffer << "_buf << #{string};"
         when :declaration
-          @compiled << "_buf << \"<!#{string}>\";"
+          @_buffer << "_buf << \"<!#{string}>\";"
         else
           raise NotImplementedError.new("Don't know how to parse line: #{line}")
         end
       end # template iterator
       enders.reverse_each do |t|
-        @compiled << t[0].to_s
+        @_buffer << t[0].to_s
       end
-      @compiled << "_buf.join;"
+      @_buffer << "_buf.join;"
+      @compiled = @_buffer.join
+      optimize
+      return nil
     end
   end
 end

data/lib/slim/engine.rb CHANGED Viewed

@@ -3,6 +3,7 @@ module Slim
     include Compiler
     attr_reader :compiled
+    attr_reader :optimized
     # @param template The .slim template to convert
     # @return [Slim::Engine] instance of engine
@@ -12,7 +13,7 @@ module Slim
     end
     def render(scope = Object.new, locals = {})
-      scope.instance_eval(compiled)
+      scope.instance_eval(optimized)
     end
   end
 end

data/lib/slim/optimizer.rb ADDED Viewed

@@ -0,0 +1,70 @@
+module Slim
+  # Given the following example:
+  #   html
+  #     head
+  #       meta name="description" content="This is a Slim Test, that's all"
+  #       title Simple Test Title
+  #     body
+  #       - if logged_in?
+  #         p
+  #           ` Welcome!
+  #       - else
+  #         p
+  #           ` Please sign in.
+  #
+  # When compiling the above code to be eval'd, Slim produces a
+  # compiled string that looks like:
+  #
+  #     buf = [];
+  #     _buf << "<html>";
+  #     _buf << "<head>";
+  #     _buf << "<meta name=\"description\" content=\"This is a Slim Test, that's all\"/>";
+  #     _buf << "<title>";
+  #     _buf << "Simple Test Title";
+  #     _buf << "</title>";
+  #     _buf << "</head>";
+  #     _buf << "<body>";
+  #     if logged_in?;
+  #     _buf << "<p>";
+  #     _buf << "Welcome!";
+  #     _buf << "</p>";
+  #     else;
+  #     _buf << "<p>";
+  #     _buf << "Please sign in.";
+  #     _buf << "</p>";
+  #     end;
+  #     _buf << "</body>";
+  #     _buf << "</html>";
+  #     _buf.join;
+  #
+  # The optimized string after:
+  #
+  #     buf = [];
+  #     _buf << "<html><head><meta name=\"description\" content=\"This is a Slim Test, that's all\"/><title>Simple Test Title</title></head><body>";
+  #     if logged_in?;
+  #     _buf << "<p>Welcome!</p>";
+  #     else;
+  #     _buf << "<p>Please sign in.</p>";
+  #     end;
+  #     _buf << "</body></html>";
+  #     _buf.join;
+  module Optimizer
+    def optimize
+      @optimized = ""
+      string = nil
+      @_buffer.each do |line|
+        if line =~ /^_buf << "(.+)"/
+          string ||= ""
+          string << $1
+        else
+          if string
+            @optimized << "_buf << \"#{string}\";"
+          end
+          @optimized << line
+          string = nil
+        end
+      end
+      return nil
+    end
+  end # Optimizer
+end # Slim

data/lib/slim/rails.rb CHANGED Viewed

@@ -6,10 +6,12 @@ module ActionView
       include Compilable
       def compile(template)
-        return Slim::Engine.new(template.source).compiled
+        return Slim::Engine.new(template.source).optimized
       end
     end
   end
   Template.register_default_template_handler :slim, TemplateHandlers::SlimHandler
 end
+puts ">> Slim (v#{Slim.version})"

data/slim.gemspec CHANGED Viewed

@@ -5,7 +5,7 @@
 Gem::Specification.new do |s|
   s.name = %q{slim}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Stone"]
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
      "lib/slim.rb",
      "lib/slim/compiler.rb",
      "lib/slim/engine.rb",
+     "lib/slim/optimizer.rb",
      "lib/slim/rails.rb",
      "slim.gemspec",
      "test/helper.rb",

data/test/test_slim.rb CHANGED Viewed

@@ -1,7 +1,4 @@
 require 'helper'
 class TestSlim < MiniTest::Unit::TestCase
-  def test_version_is_current
-    assert_equal '0.1.0', Slim.version
-  end
 end

metadata CHANGED Viewed

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments:
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Andrew Stone
@@ -33,6 +33,7 @@ files:
 - lib/slim.rb
 - lib/slim/compiler.rb
 - lib/slim/engine.rb
+- lib/slim/optimizer.rb
 - lib/slim/rails.rb
 - slim.gemspec
 - test/helper.rb