cells-erb 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 005beea2b9096c5a67fb46b5ca628b0311b18914
-  data.tar.gz: c06f9882697cf8817093305196e5e151d4726636
+  metadata.gz: 4bb2e8a877505bb6ec775dc3b2a9831da1c4788c
+  data.tar.gz: 46a65db846ce908de66f34fa9fc0f843dfd7a58c
 SHA512:
-  metadata.gz: f208dccb628772160dd64132d4c981c59bf4a8cfbb8d06e9cadf7797d2b531ba80f0ce1b4fff3ca9a71df809b8ee870617e024100c06e2b299392ab291c2190b
-  data.tar.gz: 9bc78f5239748dcaa02bc90a6d70df1f772687a7185004ea451fcce4ecf9679682225b4d3561d897c044851577479fa32a38926ad1e85c836713baf2a4099f2b
+  metadata.gz: 122cfd4eab5b6d53a0fa30c61f021b488223855d69a4cd27361a4986d6a7ef9ba9e8ecd7eec6dac2bd60ac85c309ee6c041590b41fc7b79398b442182a2af291
+  data.tar.gz: 16aac32c8f6d2e831e0fecfc1992976a58f932f27e2160b441e891019c75f3adb71be06cd3f13b37344ef3c04d5c3d2813962d681115d2f4c459335eea00b8ca

data/.travis.yml

@@ -1,4 +1,8 @@
+language: ruby
+rvm:
+  - 2.1
+
 gemfile:
-  - gemfiles/rails4.2-tilt-1.4.gemfile
-  - gemfiles/rails4.2-tilt-2.0.gemfile
-  - gemfiles/rails3.2-tilt-1.4.gemfile
+  - gemfiles/rails_4.2-tilt-1.4.gemfile
+  - gemfiles/rails_4.2-tilt-2.0.gemfile
+  - gemfiles/rails_3.2-tilt-1.4.gemfile

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 0.0.4
+
+* Fixed output_buffer issues and more.
+
 # 0.0.3
 
 * Added `#capture` helper that doesn't do escaping, in `Cell::Erb`.

data/Gemfile

@@ -2,9 +2,9 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in cells-erb.gemspec
 gemspec
-platforms :mri_20, :mri_21 do
-  gem 'pry-byebug'
-end
-gem 'cells', github: 'apotonick/cells'
-gem 'appraisal'
-gem 'minitest-reporters'
+
+gem "railties", "~> 4.2.0"
+gem "activemodel"
+gem "minitest", "~> 5.2"
+gem "tilt", "~> 2.0"
+gem "cells", path: "../cells"

data/README.md

@@ -29,7 +29,7 @@ class SongCell < Cell::ViewModel
 end
 ```
 
-If that doesn't work, [read the docs](http://trailblazerb.org/cells/gems/cells4.html#escaping).
+If that doesn't work, [read the docs](http://trailblazerb.org/gems/cells/cells4.html#html-escaping).
 
 ## Dependencies
 

data/cells-erb.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency "cells", "~> 4.0.0.beta3"
-  spec.add_runtime_dependency "erbse", ">= 0.0.2"
+  spec.add_dependency "cells", "~> 4.0.0.beta6"
+  spec.add_dependency "erbse", ">= 0.0.2"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/gemfiles/rails_3.2-tilt-1.4.gemfile

@@ -4,7 +4,6 @@ source "https://rubygems.org"
 
 # gem "cells", :github => "apotonick/cells"
 #gem "cells", path: "../../cells"
-gem "appraisal"
 gem "railties", "~> 3.2.0"
 gem "activemodel"
 gem "minitest", "~> 4.6"

data/gemfiles/rails_4.2-tilt-1.4.gemfile

@@ -4,7 +4,6 @@ source "https://rubygems.org"
 
 # gem "cells", :github => "apotonick/cells"
 #gem "cells", path: "../../cells"
-gem "appraisal"
 gem "railties", "~> 4.2.0"
 gem "activemodel"
 gem "minitest", "~> 5.2"

data/gemfiles/rails_4.2-tilt-2.0.gemfile

@@ -4,7 +4,6 @@ source "https://rubygems.org"
 
 #gem "cells", :github => "apotonick/cells"
 # gem "cells", path: "../../cells"
-gem "appraisal"
 gem "railties", "~> 4.2.0"
 gem "activemodel"
 gem "minitest", "~> 5.2"

data/gemfiles/rails_4.2-tilt-3.0.gemfile

@@ -4,7 +4,6 @@ source "https://rubygems.org"
 
 # gem "cells", :github => "apotonick/cells"
 #gem "cells", path: "../../cells"
-gem "appraisal"
 gem "railties", "~> 4.2.0"
 gem "activemodel"
 gem "minitest", "~> 5.2"

data/lib/cell/erb/template.rb

@@ -3,14 +3,46 @@ 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,
+        escape_html:    false,
+        escape_attrs:   false,
+        suffix:         "erb"
+      }
+    end
+
     # this is capture copied from AV:::CaptureHelper without doing escaping.
-    # TODO: re-implement capture and return content instead of the OB rubbish.
     def capture(*args)
       value = nil
       buffer = with_output_buffer { value = yield(*args) }
-      if string = buffer.presence || value and string.is_a?(String)
-        string
-      end
+
+      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
+    end
+
+    # Below:
+    # Rails specific helper fixes. I hate that. I can't tell you how much I hate those helpers,
+    # and their blind escaping for every possible string within the application.
+    def content_tag(name, content_or_options_with_block=nil, options=nil, escape=false, &block)
+      super
     end
 
     def form_tag_with_body(html_options, content)
@@ -33,21 +65,15 @@ module Cell
         require_template_library 'erbse'
       end
 
-      # :engine_class can be passed via
-      #
       #   Tilt.new("#{base}/#{prefix}/#{view}", engine_class: Erbse::Eruby)
       def prepare
-        engine_class = options.delete(:engine_class)
-        # engine_class = ::Erubis::EscapedEruby if options.delete(:escape_html)
-        @template = (engine_class || ::Erbse::Template).new(data, options)
+        @template = ::Erbse::Template.new(data, options)
       end
 
       def precompiled_template(locals)
+         # puts "@@@@@ #{@template.().inspect}"
         @template.call
       end
     end
   end
-end
-
-Tilt.register Cell::Erb::Template, "erb"
-# Tilt.prefer Cell::Erb::Template
+end

data/lib/cell/erb/version.rb

@@ -1,5 +1,5 @@
 module Cell
   module Erb
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

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

@@ -0,0 +1 @@
+<b>Questions: <%= render :render_in_render_2 %></b>

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

@@ -0,0 +1 @@
+Yes!

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

@@ -31,4 +31,8 @@ Weiter!
 <%= breadcrumbs %>
 
 <%= current_page %>
-<%= form_tag_with_body( {url: "/rails/escapes/too/much"}, %{<input type="button"/>}).html_safe %>
+<%= form_tag_with_body( {url: "/rails/escapes/too/much"}, %{<input type="button"/>}).html_safe %>
+
+<%= form_for OpenStruct.new, url: "/", as: "open" do |f| %>
+  <%= f.text_field :id %>
+<% end %>

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

@@ -4,6 +4,9 @@ class SongCell < Cell::ViewModel
   include ActionView::Helpers::FormHelper
   include Cell::Erb
 
+  def protect_against_forgery?
+  end
+
   def with_form_tag_and_content_tag
     render
   end
@@ -36,6 +39,10 @@ class SongCell < Cell::ViewModel
     render
   end
 
+  def render_in_render
+    render
+  end
+
 private
   def cap
     "yay, #{with_output_buffer { yield } }"

data/test/erb_test.rb

@@ -4,9 +4,12 @@ class ErbTest < MiniTest::Spec
   let (:controller) { ApplicationController.new.tap { |ctl| ctl.send("request=", ActionDispatch::Request.new({})) } }
   let (:song_cell) { SongCell.new(controller) }
 
+  # render in render
+  it { song_cell.(:render_in_render).must_equal "<b>Questions: Yes!</b>" }
 
   # URL helpers work in cell instance.
-  it { song_cell.songs_path.must_equal "/songs" }
+  # -- this is actually covered well enough in cells, and is unrelated to ERB.
+  # it { song_cell.songs_path.must_equal "/songs" }
 
   # content_tag { }
   it { song_cell.(:with_content_tag).must_equal "<div>Beachparty</div>" }
@@ -27,6 +30,12 @@ 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 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.
 
@@ -52,7 +61,9 @@ Weiter!
 <a href=\"/1\">1</a>+<a href=\"/2\">2</a>
 
 <b>No current page!<b>
-#{form_with_body_tag}}
+#{form_with_body_tag}
+
+#{form_for_tag}}
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cells-erb
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cells
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta3
+        version: 4.0.0.beta6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta3
+        version: 4.0.0.beta6
 - !ruby/object:Gem::Dependency
   name: erbse
   requirement: !ruby/object:Gem::Requirement
@@ -78,7 +78,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
-- Appraisals
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
@@ -93,6 +92,8 @@ files:
 - lib/cell/erb/version.rb
 - lib/cells-erb.rb
 - test/dummy/Rakefile
+- 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
 - test/dummy/app/cells/song/with_content_tag_and_content_tag.erb
 - test/dummy/app/cells/song/with_form_for_block.erb
@@ -134,6 +135,8 @@ specification_version: 4
 summary: Tilt binding for Erbse.
 test_files:
 - test/dummy/Rakefile
+- 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
 - test/dummy/app/cells/song/with_content_tag_and_content_tag.erb
 - test/dummy/app/cells/song/with_form_for_block.erb

data/Appraisals

@@ -1,23 +0,0 @@
-appraise 'rails-3.2' do
-    gem 'railties', '~> 3.2'
-    gem 'tzinfo'
-    gem 'minitest', '4.7.5'
-end
-
-appraise "rails-4.0" do
-    gem 'railties', '~> 4.0.0'
-    gem 'activemodel'
-    gem 'minitest', '4.7.5'
-end
-
-appraise "rails-4.1" do
-    gem 'railties', '~> 4.1.0'
-    gem 'activemodel'
-    gem 'minitest', '~> 5.2'
-end
-
-appraise "rails-4.2" do
-    gem 'railties', '~> 4.2.0'
-    gem 'activemodel'
-    gem 'minitest', '~> 5.2'
-end