tight-engine 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9af08abd886546c991e706361e0a40872e0e6ca
-  data.tar.gz: b9e8bb833bf96cfbc027ff4f446c41b085930b1c
+  metadata.gz: 3a7c72ad41e773091a87b4257678b4e48e1cd055
+  data.tar.gz: 2cd27ab7a61123d1fcab734509020852f82138c1
 SHA512:
-  metadata.gz: da17884b6953ce5babcb31c05a577f114c56f16ae41dde952840a849c0d6f70ea297d92c33025da579b3a491ded507a523d1d810a827cb66b3db962da1280aab
-  data.tar.gz: 1e6484ce7ec08c592a25c9fb9575f853b8826986ca8868883ad3eab2a94d4a95d639bed33d8f7f024ef47573aa8c60b3ff649261ad85cf2120f790457c49d618
+  metadata.gz: 758b33c34d40baf909cb4d3fb92a84656b7e9d1007c2e985f1dd23614edb9c78df44abab527064261c3fdbbd8ef4441dc1d8309942b9fe0d8e564dd93d50e7ea
+  data.tar.gz: 6c9b265399026b068af2473b2c5d55489675535c1d93574301a3381d474e44eb5279e43f2bb1c1ba1972b7aaf0a790805253a0f1732bb3f546fc771ffc0528c8

data/lib/tight-engine/defer.rb

@@ -5,23 +5,28 @@ module Tight
         @placeholders ||= {}
       end
 
-      def defer_element( name, args, opts )
-        return unless settings.deferred_elements.include?(name)
-        placeholders[name] = [ name, args, opts ]
-        "%{placeholder[:#{name}]}"
+      def defer_element(name, args, opts)
+        if settings.respond_to?(:deferred_elements) && settings.deferred_elements.include?(name)
+          placeholders[name] = [ name, args, opts ]
+          "%{placeholder[:#{name}]}"
+        else
+          process_element(name, args, opts)
+        end
       end
 
       def process_deferred_elements( text )
         text.to_str.gsub /(\s*)\%\{placeholder\[\:([^\]]+)\]\}/ do
           if deferred = placeholders[$2]
-            output = process_element *deferred
+            output = process_element(*deferred)
             if engine.pretty?
-              $1+output.gsub(/\r|\n|\r\n/, $1)+$1
+              # $/ is magic for CR/LF/CRLF
+              indent = $/ + $1
+              $1 + output.gsub(/\r|\n|\r\n/, indent) + indent
             else
               output
             end  
           else
-           ''
+            "#{$1}%{placeholder[:#{$2}]}"
           end
         end
       end

data/lib/tight-engine/version.rb

@@ -1,5 +1,5 @@
 module Tight
   module Engine
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/test/helper.rb

@@ -0,0 +1,15 @@
+ENV['RACK_ENV'] = 'test'
+
+require 'minitest/autorun'
+require 'sinatra/base'
+require 'ostruct'
+
+class MiniTest::Spec
+  def settings
+    @settings ||= OpenStruct.new
+  end
+
+  def engine
+    @engine ||= OpenStruct.new
+  end
+end

data/test/test_defer.rb

@@ -0,0 +1,65 @@
+require 'helper'
+require 'tight-engine/defer'
+
+describe Tight::Engine::Defer do
+  include Tight::Engine::Defer
+
+  def process_element(*args)
+    "block test\n" + args.inspect + @iteration
+  end
+
+  def args
+    ['Block', [1, 3], :false => true]
+  end
+
+  before do
+    @iteration = '1'
+    settings.clear
+    placeholders.clear
+    engine.clear
+  end
+
+  it 'should have no initial placeholders' do
+    assert_equal({}, placeholders)
+  end
+
+  it 'should defer elements set to be deferred' do
+    settings[:deferred_elements] = ['Block']
+
+    text = defer_element(*args)
+
+    assert_equal({'Block' => args}, placeholders)
+    assert_equal "%{placeholder[:Block]}", text
+  end
+
+  it 'should process deferred elements' do
+    settings[:deferred_elements] = ['Block']
+
+    text = defer_element(*args)
+    @iteration = '2'
+    result = process_deferred_elements('before' + text + 'after')
+
+    assert_equal("beforeblock test\n" + args.inspect + '2after', result)
+  end
+
+  it 'should not defer any elements by default and process them right away' do
+    text = defer_element(*args)
+    @iteration = '2'
+    result = process_deferred_elements('before' + text + 'after')
+
+    assert_equal({}, placeholders)
+    assert_equal("block test\n" + args.inspect + '1', text)
+    assert_equal("beforeblock test\n" + args.inspect + '1after', result)
+  end
+
+  it 'should be able to be pretty' do
+    settings[:deferred_elements] = ['Block']
+    engine[:pretty?] = true
+
+    text = defer_element(*args)
+    @iteration = '2'
+    result = process_deferred_elements('  ' + text)
+
+    assert_equal("  block test\n  " + args.inspect + "2\n  ", result)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tight-engine
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Igor Bochkariov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-05 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,6 +87,8 @@ files:
 - lib/tight-engine/url.rb
 - lib/tight-engine/utils.rb
 - lib/tight-engine/version.rb
+- test/helper.rb
+- test/test_defer.rb
 - tight-engine.gemspec
 homepage: https://github.com/ujifgc/tight-engine
 licenses:
@@ -112,5 +114,7 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A tight engine for a swift content management system
-test_files: []
+test_files:
+- test/helper.rb
+- test/test_defer.rb
 has_rdoc: