cells-erb 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfcfcbf248e2459af3f2a141706c37ef174bea50
-  data.tar.gz: 2b929671c430d62bbf14bde528fd590802249d9a
+  metadata.gz: 129f1072e84921e3942d70ffdc5c7c941d9ea9b1
+  data.tar.gz: 67181a81d3d94dd675e5bb998f05937972ce593a
 SHA512:
-  metadata.gz: 53abfa93101530caf77ea1c7ada5b79f7897622cf36eb17e1aac5f49cd4dc1b1bab022a9e9fbd89497b072c4da46dfcfb0795bbebdba579094dcd46b348c73f0
-  data.tar.gz: 89974701d08f46cb4a28c92e9dbee52818ecf884c93f314783acf61f5e8af8f4b79a556a6838f48f794963fb67ae9eb0008dfbbbbd865c0cec3679604d6c9c05
+  metadata.gz: 039a26afbef0c6d0ae9b3931a28e3bbe69d6f83554c69469641808a257f39d3d57a2325f690e033a56670112de19046401cd9a8c80f032657af809a27055e9d5
+  data.tar.gz: 1c69b28d6fdc9fde537bcaee91c89553f1c5f49c2cc2b3cde494b66b942efc13cf6edf82775c6a10e02295b2f8c6ecd9646cf3a8e6c8a23586a51cc3c85b266f

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
   - 2.0.0
-  - 2.3.0
+  - 2.3.1
 gemfile:
   - gemfiles/rails_4.2-tilt-1.4.gemfile
   - gemfiles/rails_4.2-tilt-2.0.gemfile

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 0.1.0
+
+* The `concat` helper is not supported, anymore. Concatenate to a local string instead.
+
 # 0.0.9
 
 * Limit to erbse-0.0.x.

data/Gemfile

@@ -5,6 +5,6 @@ gemspec
 
 gem "railties", "~> 4.2.0"
 gem "activemodel"
-gem "minitest", "~> 5.2"
-gem "tilt", "~> 2.0"
-gem "cells", path: "../cells"
+# gem "cells", path: "../cells"
+# gem "erbse", path: "../erbse"
+gem "minitest-line"

data/README.md

@@ -1,6 +1,6 @@
 # Cells::Erb
 
-Proper ERB support for Cells using [Erbse](https://github.com/apotonick/erbse).
+ERB support for Cells using [Erbse](https://github.com/apotonick/erbse).
 
 ## Installation
 
@@ -10,10 +10,60 @@ Add this line to your application's Gemfile:
 gem 'cells-erb'
 ```
 
-This will register the `Erbse::Template` engine with Tilt for `.erb` files.
+This will register `Erbse::Engine` with Tilt for `.erb` files.
 
 And that's all you need to do.
 
+## Erbse
+
+[Erbse](https://github.com/apotonick/erbse) is the next-generation implementation of ERB that comes with some nice new semantics and explicit code. It does not use instance variables for output buffering.
+
+You should read its docs to learn what you can and can't do with Erbse.
+
+## Concat
+
+The global `#concat` helper is not supported in Cells-ERB. Erbse uses local variables as output buffers, hence this global state helper does not work. Please use explicit string concatenation instead.
+
+Instead of
+
+```ruby
+concat content_tag(:p, "Good")
+concat "Morning!"
+```
+
+you can do
+
+```ruby
+content_tag(:p, "Good") + "Morning!"
+```
+
+## Block Yielding
+
+With Erbse, you can actually [capture blocks](https://github.com/apotonick/erbse#block-yielding), pass them to other cells and `yield` them. This will simply return whatever the block returns, no weird buffer magic will be happening in the background.
+
+## Capture
+
+The `capture` implementation in Cells-ERB is literally a `yield`.
+
+```ruby
+def capture(&block)
+  yield
+end
+```
+
+If you want to capture a block of code without outputting it, you need to use Erbse's `<%@ %>` tag.
+
+```erb
+<%@ content = capture do %>
+  <h1>Hi!</h1>
+  It's <%= Time.new %>'o clock.
+<% end %>
+```
+
+The `content` variable will now contain the string `<h1>Hi!</h1>\nIt's 23:37'o clock.`.
+
+Use `c@pture` as a mnemonic for the correct tag, should you need this mechanic. `capture` is usually a smell of bad view design and should be avoided.
+
 ## HTML Escaping
 
 Cells doesn't escape except when you tell it to do. However, you may run into problems when using Rails helpers. Internally, those helpers often blindly escape. This is not Cells' fault but a design flaw in Rails.
@@ -33,4 +83,4 @@ If that doesn't work, [read the docs](http://trailblazerb.org/gems/cells/cells4.
 
 ## Dependencies
 
-This gem works with Tilt 1.4 and 2.0, and hence allows you to use it from Rails 3.2 upwards.
+This gem works with Tilt 1.4 and 2.0, and hence allows you to use it from Rails 3.2 upwards.

data/cells-erb.gemspec

@@ -1,7 +1,6 @@
 lib = File.expand_path('../lib/', __FILE__)
 $:.unshift lib unless $:.include?(lib)
 
-
 require 'cell/erb/version'
 
 Gem::Specification.new do |spec|
@@ -19,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency "cells", "~> 4.0"
-  spec.add_dependency "erbse", ">= 0.0.2", "< 0.1.0"
+  spec.add_dependency "erbse", ">= 0.1.1"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/cell/erb/template.rb

@@ -3,15 +3,6 @@ require "erbse"
 module Cell
   # Erb contains helpers that are messed up in Rails and do escaping.
   module Erb
-    # This is to prevent multiple renders to share the same output_buffer.
-    # I am still trying to find a way to avoid output buffers.
-    def render_template(*)
-      old_output_buffer = @output_buffer
-      super
-    ensure
-      @output_buffer = old_output_buffer
-    end
-
     def template_options_for(options)
       {
         template_class: ::Cell::Erb::Template,
@@ -19,21 +10,8 @@ module Cell
       }
     end
 
-    # this is capture copied from AV:::CaptureHelper without doing escaping.
     def capture(*args)
-      value = nil
-      buffer = with_output_buffer { value = yield(*args) }
-
-      return buffer.to_s if buffer.size > 0
-      value # this applies for "Beachparty" string-only statements.
-    end
-
-    def with_output_buffer(block_buffer=ViewModel::OutputBuffer.new)
-      @output_buffer, old_buffer = block_buffer, @output_buffer
-      yield
-      @output_buffer = old_buffer
-
-      block_buffer
+      yield(*args)
     end
 
     # Below:
@@ -59,29 +37,29 @@ module Cell
     end
 
     def concat(string)
-      @output_buffer << string
+      raise "[Cells-ERB] The #concat helper uses global state and is not supported anymore.
+Please change your code to simple `+` String concatenation or tell the gem authors to remove #concat usage."
     end
 
 
     # Erbse-Tilt binding. This should be bundled with tilt. # 1.4. OR should be tilt-erbse.
     class Template < Tilt::Template
       def self.engine_initialized?
-        defined? ::Erbse::Template
+        defined? ::Erbse::Engine
       end
 
       def initialize_engine
-        require_template_library 'erbse'
+        require_template_library "erbse"
       end
 
-      #   Tilt.new("#{base}/#{prefix}/#{view}", engine_class: Erbse::Eruby)
       def prepare
-        @template = ::Erbse::Template.new(data, options)
+        @template = ::Erbse::Engine.new # we also have #options here.
       end
 
       def precompiled_template(locals)
-         # puts "@@@@@ #{@template.().inspect}"
-        @template.call
+        # puts @template.call(data)
+        @template.call(data)
       end
     end
   end
-end
+end

data/lib/cell/erb/version.rb

@@ -1,5 +1,5 @@
 module Cell
   module Erb
-    VERSION = "0.0.9"
+    VERSION = "0.1.0"
   end
 end

data/test/dummy/app/cells/erbse/show.erb

@@ -0,0 +1,21 @@
+bla
+<h1>Welcome!</h1>
+
+<%= self.class %>
+<% invoke = true %>
+<% if invoke %>
+  invoke!
+<% else %>
+  no invoke at all!
+<% end %>
+<% unless invoke %>
+  !unless invoke!
+<% else %>
+  !unless invoke, #not!
+<% end %>
+
+<%= form do %>
+  captured
+<% end %>
+line
+<%= render_block %>

data/test/dummy/app/cells/erbse_cell.rb

@@ -0,0 +1,13 @@
+class ErbseCell < Cell::ViewModel
+  include Cell::Erb
+  self.view_paths = ["test/dummy/app/cells"]
+
+  def form(&block)
+    @block = block
+    nil
+  end
+
+  def render_block
+    @block.call
+  end
+end

data/test/dummy/app/cells/song/with_form_tag_and_content_tag.erb

@@ -14,9 +14,9 @@ Word.
 
 <% end %>
 
-<%- answer = "<script>oui!</script>" %>
+<% answer = "<script>oui!</script>" %>
 
-<%- content = capture do %>
+<%@ content = capture do %>
   Bonjour!
   <%= link_to "Coffee?", "/coffee" %>
   <b>Yes please!</b>
@@ -27,8 +27,8 @@ Weiter!
 
 <%= content %>
 
-<%- breadcrumbs = capture do %>
-  <%- [link_to("1", "/1"), link_to("2", "/2")].join("+") %>
+<%@ breadcrumbs = capture do %>
+  <%= [link_to("1", "/1"), link_to("2", "/2")].join("+") %>
 <% end %>
 
 <%= breadcrumbs %>
@@ -40,4 +40,4 @@ Weiter!
   <%= f.text_field :id %>
 <% end %>
 
-<%= concatting %>
+<%= concatting %>

data/test/dummy/app/cells/song_cell.rb

@@ -57,8 +57,10 @@ private
 
   def concatting
     content_tag :div do
-      concat content_tag :p, "Concat!"
-      concat "Whoo"
+      # concat content_tag :p, "Concat!"
+      # concat "Whoo"
+      content_tag(:p, "Concat!") +
+      "Whoo"
     end
   end
-end
+end

data/test/erb_test.rb

@@ -15,13 +15,22 @@ class ErbTest < MiniTest::Spec
   it { song_cell.(:with_content_tag).must_equal "<div>Beachparty</div>" }
 
   # content_tag { content_tag { } }
-  it do song_cell.(:with_content_tag_and_content_tag).must_equal %{<span>
-    Title:
-    <div>
-        Still Knee Deep
-</div></span>}
+  it do song_cell.(:with_content_tag_and_content_tag).must_equal %{<span>    Title:
+    <div>        Still Knee Deep
+    </div></span>}
   end
 
+  # describe "benchmarking" do
+  #   it do
+  #     require "benchmark"
+  #     t = Benchmark.measure do
+  #       10000.times { |i| song_cell.(:with_content_tag_and_content_tag) }
+  #     end
+
+  #     puts "@@@@@ #{t}"
+  #   end
+  # end
+
   # form_tag { content_tag { } }
   it do
     form_tag = "<form action=\"/erubis/is/horribly/outdated\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" />"
@@ -30,45 +39,36 @@ class ErbTest < MiniTest::Spec
     form_with_body_tag = "<form url=\"/rails/escapes/too/much\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"button\"/></form>"
     form_with_body_tag = "<form method=\"post\" url=\"/rails/escapes/too/much\"><div style=\"margin:0;padding:0;display:inline\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /></div><input type=\"button\"/></form>" if ActionPack::VERSION::MAJOR == 3
 
-    form_for_tag = "<form class=\"new_open\" id=\"new_open\" action=\"/\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" />
-  <input type=\"text\" name=\"open[id]\" id=\"open_id\" />
-</form>"
+    form_for_tag = "<form class=\"new_open\" id=\"new_open\" action=\"/\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"text\" name=\"open[id]\" id=\"open_id\" /></form>"
     form_for_tag = "<form accept-charset=\"UTF-8\" action=\"/\" class=\"new_open\" id=\"new_open\" method=\"post\"><div style=\"margin:0;padding:0;display:inline\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /></div>
   <input id=\"open_id\" name=\"open[id]\" size=\"30\" type=\"text\" />
 </form>" if ActionPack::VERSION::MAJOR == 3
 
     song_cell.(:with_form_tag_and_content_tag).must_equal %{Word.
 
-#{form_tag}
-  <a href=\"/rails/sucks\">
-    hallo
+#{form_tag}<a href=\"/rails/sucks\">    hallo
     <div class="row">
       Cool
     </div>
-</a>
-  <ul data-x="{&quot;a&quot;:&quot;1&quot;}">
-   Hallo
-</ul>
-</form>
-
-
-Weiter!
+  </a><ul data-x="{&quot;a&quot;:&quot;1&quot;}">   Hallo
+  </ul></form>Weiter!
 
   Bonjour!
-  <a href=\"/coffee\">Coffee?</a>
-  <b>Yes please!</b>
-  <script>oui!</script>
-
-
-
-<a href=\"/1\">1</a>+<a href=\"/2\">2</a>
-
-<b>No current page!<b>
-#{form_with_body_tag}
+  <a href=\"/coffee\">Coffee?</a>  <b>Yes please!</b>
+  <script>oui!</script><a href=\"/1\">1</a>+<a href=\"/2\">2</a><b>No current page!<b>#{form_with_body_tag}#{form_for_tag}<div><p>Concat!</p>Whoo</div>}
+  end
 
-#{form_for_tag}
-<div><p>Concat!</p>Whoo</div>}
+  it do
+    # puts ErbseCell.new.()
+    ErbseCell.new.().must_equal %{bla
+<h1>Welcome!</h1>
+
+ErbseCell  invoke!
+  !unless invoke, #not!
+line
+  captured
+}
   end
 end
 
-# start with content_tag and block (or capture) and find out how sinatra handles that. goal is NOT to use those hacks in haml's action_view_extensions.
+# start with content_tag and block (or capture) and find out how sinatra handles that. goal is NOT to use those hacks in haml's action_view_extensions.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cells-erb
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cells
@@ -31,20 +31,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -98,6 +92,8 @@ files:
 - lib/cell/erb/version.rb
 - lib/cells-erb.rb
 - test/dummy/Rakefile
+- test/dummy/app/cells/erbse/show.erb
+- test/dummy/app/cells/erbse_cell.rb
 - test/dummy/app/cells/song/render_in_render.erb
 - test/dummy/app/cells/song/render_in_render_2.erb
 - test/dummy/app/cells/song/with_content_tag.erb
@@ -135,12 +131,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Tilt binding for Erbse.
 test_files:
 - test/dummy/Rakefile
+- test/dummy/app/cells/erbse/show.erb
+- test/dummy/app/cells/erbse_cell.rb
 - test/dummy/app/cells/song/render_in_render.erb
 - test/dummy/app/cells/song/render_in_render_2.erb
 - test/dummy/app/cells/song/with_content_tag.erb