temple 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62248df85fb8bb676f19fbf68f2b91f5fd2ee88b
-  data.tar.gz: aad55078fc4f2d236b6573cb3a1f7dc1311c4a41
+  metadata.gz: ef295d25d34ef11abf1640d7240eedb8643e8107
+  data.tar.gz: a721340521044f953fec55f2b75b0d467b2bdab4
 SHA512:
-  metadata.gz: 359fd5b972b0a423f0f28d35f806e635126900ec9a17675d69d8e0a8d8aa502070e298871d68a41b6d041480cb763e2af1026e74b3f306b7c67cc57e67102017
-  data.tar.gz: 51706ada25d75c7de46cbc060d0930678efc6f98382eba2d60f65c868c59b7e7c93bcbcf7c98fba59dc5132825d37a289e053fbf12ca6c90bc53f69c59b3bfae
+  metadata.gz: e99dbeb234856873da69adb1460a123876f219e7c34d3c12bba379ee86fd60017cd56d17b5e5da6d2eff7d3e825135cfa57002232dc3e50d3676c59745b85dc9
+  data.tar.gz: 22c4e6d503c7a3272ba39a153b3e7cf0ea92cb0a4937c5e6e05121ac5fe1efdd3d0ca7e3650d4a6633358542bcf4322ea27e0638e119f991db44bf58cf779810

data/CHANGES

@@ -1,3 +1,10 @@
+0.6.5
+
+  * Added Filters::CodeMerger
+  * Added Filters::Encoding
+  * Added Filters::RemoveBOM
+  * Added Generators::ERB
+
 0.6.4
 
   * Check for ActionView instead of Rails (#72)

data/lib/temple.rb

@@ -3,8 +3,7 @@ require 'temple/version'
 module Temple
   autoload :InvalidExpression,    'temple/exceptions'
   autoload :FilterError,          'temple/exceptions'
-  autoload :Generator,            'temple/generators'
-  autoload :Generators,           'temple/generators'
+  autoload :Generator,            'temple/generator'
   autoload :Parser,               'temple/parser'
   autoload :Engine,               'temple/engine'
   autoload :Utils,                'temple/utils'
@@ -32,7 +31,16 @@ module Temple
     autoload :Template,           'temple/erb/template'
   end
 
+  module Generators
+    autoload :ERB,                'temple/generators/erb'
+    autoload :Array,              'temple/generators/array'
+    autoload :ArrayBuffer,        'temple/generators/array_buffer'
+    autoload :StringBuffer,       'temple/generators/string_buffer'
+    autoload :RailsOutputBuffer,  'temple/generators/rails_output_buffer'
+  end
+
   module Filters
+    autoload :CodeMerger,         'temple/filters/code_merger'
     autoload :ControlFlow,        'temple/filters/control_flow'
     autoload :MultiFlattener,     'temple/filters/multi_flattener'
     autoload :StaticMerger,       'temple/filters/static_merger'
@@ -40,6 +48,8 @@ module Temple
     autoload :Escapable,          'temple/filters/escapable'
     autoload :Eraser,             'temple/filters/eraser'
     autoload :Validator,          'temple/filters/validator'
+    autoload :Encoding,           'temple/filters/encoding'
+    autoload :RemoveBOM,          'temple/filters/remove_bom'
   end
 
   module HTML

data/lib/temple/filters/code_merger.rb

@@ -0,0 +1,30 @@
+module Temple
+  module Filters
+    # @api public
+    class CodeMerger < Filter
+      def on_multi(*exps)
+        result = [:multi]
+        code = nil
+
+        exps.each do |exp|
+          if exp.first == :code
+            if code
+              code << '; ' unless code =~ /\n\Z/
+              code << exp.last
+            else
+              code = exp.last.dup
+              result << [:code, code]
+            end
+          elsif code && exp.first == :newline
+            code << "\n"
+          else
+            result << compile(exp)
+            code = nil
+          end
+        end
+
+        result.size == 2 ? result[1] : result
+      end
+    end
+  end
+end

data/lib/temple/filters/encoding.rb

@@ -0,0 +1,24 @@
+module Temple
+  module Filters
+    # Try to encode input string
+    #
+    # @api public
+    class Encoding < Parser
+      define_options :encoding
+
+      def call(s)
+        if options[:encoding] && s.respond_to?(:encoding)
+          old_enc = s.encoding
+          s = s.dup if s.frozen?
+          s.force_encoding(options[:encoding])
+          # Fall back to old encoding if new encoding is invalid
+          unless s.valid_encoding?
+            s.force_encoding(old_enc)
+            s.force_encoding(::Encoding::BINARY) unless s.valid_encoding?
+          end
+        end
+        s
+      end
+    end
+  end
+end

data/lib/temple/filters/remove_bom.rb

@@ -0,0 +1,20 @@
+module Temple
+  module Filters
+    # Remove BOM from input string
+    #
+    # @api public
+    class RemoveBOM < Parser
+      def call(s)
+        if s.respond_to?(:encoding)
+          if s.encoding.name =~ /^UTF-(8|16|32)(BE|LE)?/
+            s.gsub(Regexp.new("\\A\uFEFF".encode(s.encoding.name)), '')
+          else
+            s
+          end
+        else
+          s.gsub(/\A\xEF\xBB\xBF/, '')
+        end
+      end
+    end
+  end
+end

data/lib/temple/generator.rb

@@ -0,0 +1,62 @@
+module Temple
+  # Abstract generator base class
+  # Generators should inherit this class and
+  # compile the Core Abstraction to ruby code.
+  #
+  # @api public
+  class Generator
+    include Mixins::CompiledDispatcher
+    include Mixins::Options
+
+    define_options :capture_generator => 'StringBuffer',
+                   :buffer => '_buf'
+
+    def call(exp)
+      [preamble, compile(exp), postamble].join('; ')
+    end
+
+    def on(*exp)
+      raise InvalidExpression, "Generator supports only core expressions - found #{exp.inspect}"
+    end
+
+    def on_multi(*exp)
+      exp.map {|e| compile(e) }.join('; ')
+    end
+
+    def on_newline
+      "\n"
+    end
+
+    def on_capture(name, exp)
+      capture_generator.new(:buffer => name).call(exp)
+    end
+
+    def on_static(text)
+      concat(text.inspect)
+    end
+
+    def on_dynamic(code)
+      concat(code)
+    end
+
+    def on_code(code)
+      code
+    end
+
+    protected
+
+    def buffer
+      options[:buffer]
+    end
+
+    def capture_generator
+      @capture_generator ||= Class === options[:capture_generator] ?
+      options[:capture_generator] :
+        Generators.const_get(options[:capture_generator])
+    end
+
+    def concat(str)
+      "#{buffer} << (#{str})"
+    end
+  end
+end

data/lib/temple/generators/array.rb

@@ -0,0 +1,21 @@
+module Temple
+  module Generators
+    # Implements an array buffer.
+    #
+    #   _buf = []
+    #   _buf << "static"
+    #   _buf << dynamic
+    #   _buf
+    #
+    # @api public
+    class Array < Generator
+      def preamble
+        "#{buffer} = []"
+      end
+
+      def postamble
+        buffer
+      end
+    end
+  end
+end

data/lib/temple/generators/array_buffer.rb

@@ -0,0 +1,28 @@
+module Temple
+  module Generators
+    # Just like Array, but calls #join on the array.
+    #
+    #   _buf = []
+    #   _buf << "static"
+    #   _buf << dynamic
+    #   _buf.join
+    #
+    # @api public
+    class ArrayBuffer < Array
+      def call(exp)
+        case exp.first
+        when :static
+          "#{buffer} = #{exp.last.inspect}"
+        when :dynamic
+          "#{buffer} = (#{exp.last}).to_s"
+        else
+          super
+        end
+      end
+
+      def postamble
+        "#{buffer} = #{buffer}.join"
+      end
+    end
+  end
+end

data/lib/temple/generators/erb.rb

@@ -0,0 +1,36 @@
+module Temple
+  module Generators
+    # Implements an ERB generator.
+    #
+    # @api public
+    class ERB < Generator
+      def call(exp)
+        compile(exp)
+      end
+
+      def on_multi(*exp)
+        exp.map {|e| compile(e) }.join
+      end
+
+      def on_capture(name, exp)
+        on_code(super)
+      end
+
+      def on_static(text)
+        text
+      end
+
+      def on_newline
+        "<%\n%>"
+      end
+
+      def on_dynamic(code)
+        "<%= #{code} %>"
+      end
+
+      def on_code(code)
+        "<% #{code} %>"
+      end
+    end
+  end
+end

data/lib/temple/generators/rails_output_buffer.rb

@@ -0,0 +1,35 @@
+module Temple
+  module Generators
+    # Implements a rails output buffer.
+    #
+    #   @output_buffer = ActiveSupport::SafeBuffer
+    #   @output_buffer.safe_concat "static"
+    #   @output_buffer.safe_concat dynamic.to_s
+    #   @output_buffer
+    #
+    # @api public
+    class RailsOutputBuffer < StringBuffer
+      define_options :streaming,
+                     :buffer_class => 'ActiveSupport::SafeBuffer',
+                     :buffer => '@output_buffer',
+                     # output_buffer is needed for Rails 3.1 Streaming support
+                     :capture_generator => RailsOutputBuffer
+
+      def call(exp)
+        [preamble, compile(exp), postamble].join('; ')
+      end
+
+      def preamble
+        if options[:streaming] && options[:buffer] == '@output_buffer'
+          "#{buffer} = output_buffer || #{options[:buffer_class]}.new"
+        else
+          "#{buffer} = #{options[:buffer_class]}.new"
+        end
+      end
+
+      def concat(str)
+        "#{buffer}.safe_concat((#{str}))"
+      end
+    end
+  end
+end

data/lib/temple/generators/string_buffer.rb

@@ -0,0 +1,25 @@
+module Temple
+  module Generators
+    # Implements a string buffer.
+    #
+    #   _buf = ''
+    #   _buf << "static"
+    #   _buf << dynamic.to_s
+    #   _buf
+    #
+    # @api public
+    class StringBuffer < ArrayBuffer
+      def preamble
+        "#{buffer} = ''"
+      end
+
+      def postamble
+        buffer
+      end
+
+      def on_dynamic(code)
+        concat("(#{code}).to_s")
+      end
+    end
+  end
+end

data/lib/temple/version.rb

@@ -1,3 +1,3 @@
 module Temple
-  VERSION = '0.6.4'
+  VERSION = '0.6.5'
 end

data/test/filters/test_code_merger.rb

@@ -0,0 +1,38 @@
+require 'helper'
+
+describe Temple::Filters::CodeMerger do
+  before do
+    @filter = Temple::Filters::CodeMerger.new
+  end
+
+  it 'should merge serveral codes' do
+    @filter.call([:multi,
+      [:code, "a"],
+      [:code, "b"],
+      [:code, "c"]
+    ]).should.equal [:code, "a; b; c"]
+  end
+
+  it 'should merge serveral codes around static' do
+    @filter.call([:multi,
+      [:code, "a"],
+      [:code, "b"],
+      [:static, "123"],
+      [:code, "a"],
+      [:code, "b"]
+    ]).should.equal [:multi,
+      [:code, "a; b"],
+      [:static, "123"],
+      [:code, "a; b"]
+    ]
+  end
+
+  it 'should merge serveral codes with newlines' do
+    @filter.call([:multi,
+      [:code, "a"],
+      [:code, "b"],
+      [:newline],
+      [:code, "c"]
+    ]).should.equal [:code, "a; b\nc"]
+  end
+end

data/test/test_generator.rb

@@ -111,6 +111,18 @@ describe Temple::Generators::StringBuffer do
   end
 end
 
+describe Temple::Generators::ERB do
+  it 'should compile simple expressions' do
+    gen = Temple::Generators::ERB.new
+    gen.call([:static,  'test']).should.equal 'test'
+    gen.call([:dynamic, 'test']).should.equal '<%= test %>'
+    gen.call([:code,    'test']).should.equal '<% test %>'
+
+    gen.call([:multi, [:static, 'a'], [:static,  'b']]).should.equal 'ab'
+    gen.call([:multi, [:static, 'a'], [:dynamic, 'b']]).should.equal 'a<%= b %>'
+  end
+end
+
 describe Temple::Generators::RailsOutputBuffer do
   it 'should compile simple expressions' do
     gen = Temple::Generators::RailsOutputBuffer.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: temple
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Magnus Holm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -79,14 +79,22 @@ files:
 - lib/temple/erb/trimming.rb
 - lib/temple/exceptions.rb
 - lib/temple/filter.rb
+- lib/temple/filters/code_merger.rb
 - lib/temple/filters/control_flow.rb
 - lib/temple/filters/dynamic_inliner.rb
+- lib/temple/filters/encoding.rb
 - lib/temple/filters/eraser.rb
 - lib/temple/filters/escapable.rb
 - lib/temple/filters/multi_flattener.rb
+- lib/temple/filters/remove_bom.rb
 - lib/temple/filters/static_merger.rb
 - lib/temple/filters/validator.rb
-- lib/temple/generators.rb
+- lib/temple/generator.rb
+- lib/temple/generators/array.rb
+- lib/temple/generators/array_buffer.rb
+- lib/temple/generators/erb.rb
+- lib/temple/generators/rails_output_buffer.rb
+- lib/temple/generators/string_buffer.rb
 - lib/temple/grammar.rb
 - lib/temple/hash.rb
 - lib/temple/html/attribute_merger.rb
@@ -108,6 +116,7 @@ files:
 - lib/temple/utils.rb
 - lib/temple/version.rb
 - temple.gemspec
+- test/filters/test_code_merger.rb
 - test/filters/test_control_flow.rb
 - test/filters/test_dynamic_inliner.rb
 - test/filters/test_eraser.rb
@@ -153,6 +162,7 @@ signing_key:
 specification_version: 4
 summary: Template compilation framework in Ruby
 test_files:
+- test/filters/test_code_merger.rb
 - test/filters/test_control_flow.rb
 - test/filters/test_dynamic_inliner.rb
 - test/filters/test_eraser.rb

data/lib/temple/generators.rb

@@ -1,163 +0,0 @@
-module Temple
-  # Exception raised if invalid temple expression is found
-  #
-  # @api public
-  class InvalidExpression < RuntimeError
-  end
-
-  # Abstract generator base class
-  # Generators should inherit this class and
-  # compile the Core Abstraction to ruby code.
-  #
-  # @api public
-  class Generator
-    include Mixins::CompiledDispatcher
-    include Mixins::Options
-
-    define_options :capture_generator,
-                   :buffer => '_buf'
-
-    def call(exp)
-      [preamble, compile(exp), postamble].join('; ')
-    end
-
-    def on(*exp)
-      raise InvalidExpression, "Generator supports only core expressions - found #{exp.inspect}"
-    end
-
-    def on_multi(*exp)
-      exp.map {|e| compile(e) }.join('; ')
-    end
-
-    def on_newline
-      "\n"
-    end
-
-    def on_capture(name, exp)
-      options[:capture_generator].new(:buffer => name).call(exp)
-    end
-
-    def on_static(text)
-      concat(text.inspect)
-    end
-
-    def on_dynamic(code)
-      concat(code)
-    end
-
-    def on_code(code)
-      code
-    end
-
-    protected
-
-    def buffer
-      options[:buffer]
-    end
-
-    def concat(str)
-      "#{buffer} << (#{str})"
-    end
-  end
-
-  module Generators
-    # Implements an array buffer.
-    #
-    #   _buf = []
-    #   _buf << "static"
-    #   _buf << dynamic
-    #   _buf
-    #
-    # @api public
-    class Array < Generator
-      def preamble
-        "#{buffer} = []"
-      end
-
-      def postamble
-        buffer
-      end
-    end
-
-    # Just like Array, but calls #join on the array.
-    #
-    #   _buf = []
-    #   _buf << "static"
-    #   _buf << dynamic
-    #   _buf.join
-    #
-    # @api public
-    class ArrayBuffer < Array
-      def call(exp)
-        case exp.first
-        when :static
-          "#{buffer} = #{exp.last.inspect}"
-        when :dynamic
-          "#{buffer} = (#{exp.last}).to_s"
-        else
-          super
-        end
-      end
-
-      def postamble
-        "#{buffer} = #{buffer}.join"
-      end
-    end
-
-    # Implements a string buffer.
-    #
-    #   _buf = ''
-    #   _buf << "static"
-    #   _buf << dynamic.to_s
-    #   _buf
-    #
-    # @api public
-    class StringBuffer < ArrayBuffer
-      def preamble
-        "#{buffer} = ''"
-      end
-
-      def postamble
-        buffer
-      end
-
-      def on_dynamic(code)
-        concat("(#{code}).to_s")
-      end
-    end
-
-    # Implements a rails output buffer.
-    #
-    #   @output_buffer = ActiveSupport::SafeBuffer
-    #   @output_buffer.safe_concat "static"
-    #   @output_buffer.safe_concat dynamic.to_s
-    #   @output_buffer
-    #
-    # @api public
-    class RailsOutputBuffer < StringBuffer
-      define_options :streaming,
-                     :buffer_class => 'ActiveSupport::SafeBuffer',
-                     :buffer => '@output_buffer',
-                     # output_buffer is needed for Rails 3.1 Streaming support
-                     :capture_generator => RailsOutputBuffer
-
-      def call(exp)
-        [preamble, compile(exp), postamble].join('; ')
-      end
-
-      def preamble
-        if options[:streaming] && options[:buffer] == '@output_buffer'
-          "#{buffer} = output_buffer || #{options[:buffer_class]}.new"
-        else
-          "#{buffer} = #{options[:buffer_class]}.new"
-        end
-      end
-
-      def concat(str)
-        "#{buffer}.safe_concat((#{str}))"
-      end
-    end
-  end
-
-  Generator.default_options[:capture_generator] = Generators::StringBuffer
-end