cells-erb 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15a81cb8e550deade32a9dd5311062296927e306
-  data.tar.gz: ecbea4577de1b3059769b6d56cae6ded988eebfb
+  metadata.gz: 005beea2b9096c5a67fb46b5ca628b0311b18914
+  data.tar.gz: c06f9882697cf8817093305196e5e151d4726636
 SHA512:
-  metadata.gz: 553a21f3119347d5be6e0e18fd7e30d8b7cc8344cfe5f22c2ded2a9d21b86ebbfd536567d8384627997d9915b422c3b3b2515f52851b4998da57f92956144efa
-  data.tar.gz: 15322a3fe3e5dcc825723fc06806577d591f1657972117cc09053b06a1d002963dd47ac77b4c06b294899499d48d881861a4d34d835c3dc0ea5c242e84dd399a
+  metadata.gz: f208dccb628772160dd64132d4c981c59bf4a8cfbb8d06e9cadf7797d2b531ba80f0ce1b4fff3ca9a71df809b8ee870617e024100c06e2b299392ab291c2190b
+  data.tar.gz: 9bc78f5239748dcaa02bc90a6d70df1f772687a7185004ea451fcce4ecf9679682225b4d3561d897c044851577479fa32a38926ad1e85c836713baf2a4099f2b

data/CHANGES.md

@@ -0,0 +1,3 @@
+# 0.0.3
+
+* Added `#capture` helper that doesn't do escaping, in `Cell::Erb`.

data/README.md

@@ -14,6 +14,23 @@ This will register the `Erbse::Template` engine with Tilt for `.erb` files.
 
 And that's all you need to do.
 
+## 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.
+
+As a first step, try this and see if it helps.
+
+```ruby
+class SongCell < Cell::ViewModel
+  include ActionView::Helpers::FormHelper
+  include Cell::Erb # include Erb _after_ AV helpers.
+
+  # ..
+end
+```
+
+If that doesn't work, [read the docs](http://trailblazerb.org/cells/gems/cells4.html#escaping).
+
 ## Dependencies
 
 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

@@ -18,8 +18,7 @@ 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.beta"
-  spec.add_runtime_dependency "tilt", ">= 1.4", "< 3"
+  spec.add_runtime_dependency "cells", "~> 4.0.0.beta3"
   spec.add_runtime_dependency "erbse", ">= 0.0.2"
 
   spec.add_development_dependency "bundler"

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

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+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"
+gem "tilt", "~> 1.4"
+gem "tzinfo"
+
+gemspec :path => "../"
+
+# gem "erbse", path: "../../erbse"

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

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

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

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "cells", :github => "apotonick/cells"
-#gem "cells", path: "../../cells"
+#gem "cells", :github => "apotonick/cells"
+# gem "cells", path: "../../cells"
 gem "appraisal"
 gem "railties", "~> 4.2.0"
 gem "activemodel"

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

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

data/lib/cell/erb/template.rb

@@ -1,27 +1,50 @@
 require "erbse"
 
-module Cell::Erb
-  # 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
+module Cell
+  # Erb contains helpers that are messed up in Rails and do escaping.
+  module Erb
+    # 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
     end
 
-    def initialize_engine
-      require_template_library 'erbse'
+    def form_tag_with_body(html_options, content)
+      "#{form_tag_html(html_options)}" << content.to_s << "</form>"
     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)
+    def form_tag_html(html_options)
+      extra_tags = extra_tags_for_form(html_options)
+      "#{tag(:form, html_options, true) + extra_tags}"
     end
 
-    def precompiled_template(locals)
-      @template.call
+
+    # 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
+      end
+
+      def initialize_engine
+        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)
+      end
+
+      def precompiled_template(locals)
+        @template.call
+      end
     end
   end
 end

data/lib/cell/erb/version.rb

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

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

@@ -10,3 +10,25 @@ Word.
   <% end %>
 
 <% end %>
+
+<%- answer = "<script>oui!</script>" %>
+
+<%- content = capture do %>
+  Bonjour!
+  <%= link_to "Coffee?", "/coffee" %>
+  <b>Yes please!</b>
+  <%= answer.html_safe %>
+<% end %>
+
+Weiter!
+
+<%= content %>
+
+<%- breadcrumbs = capture do %>
+  <%- [link_to("1", "/1"), link_to("2", "/2")].join("+") %>
+<% end %>
+
+<%= breadcrumbs %>
+
+<%= current_page %>
+<%= form_tag_with_body( {url: "/rails/escapes/too/much"}, %{<input type="button"/>}).html_safe %>

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

@@ -2,6 +2,7 @@ class SongCell < Cell::ViewModel
   self.view_paths = ["test/dummy/app/cells"]
 
   include ActionView::Helpers::FormHelper
+  include Cell::Erb
 
   def with_form_tag_and_content_tag
     render
@@ -35,8 +36,15 @@ class SongCell < Cell::ViewModel
     render
   end
 
-  private
+private
   def cap
     "yay, #{with_output_buffer { yield } }"
   end
+
+  def current_page
+    capture do
+      #[link_to("1", "/1"), link_to("2", "/2")].join("+") # this breaks, too!
+      "<b>No current page!<b>"
+    end
+  end
 end

data/test/erb_test.rb

@@ -20,10 +20,14 @@ class ErbTest < MiniTest::Spec
   end
 
   # form_tag { content_tag { } }
-  it( "xxx") do
+  it do
     form_tag = "<form action=\"/erubis/is/horribly/outdated\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" />"
     form_tag = "<form accept-charset=\"UTF-8\" action=\"/erubis/is/horribly/outdated\" method=\"post\"><div style=\"margin:0;padding:0;display:inline\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /></div>" if ActionPack::VERSION::MAJOR == 3
 
+    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
+
+
     song_cell.(:with_form_tag_and_content_tag).must_equal %{Word.
 
 #{form_tag}
@@ -33,33 +37,23 @@ class ErbTest < MiniTest::Spec
   <ul>
    Hallo
 </ul>
-</form>}
-end
-    # song_cell.(:with_form_tag_and_content_tag).must_equal_xml_structure "<form><div><input/></div><label/><input/><ul><li/></ul></form>" }
-
-
-
-  #
-  # # form_tag with block in block work.
-  # it { cellule.edit.must_equal "<form><div><input/></div><label/><input/><ul><li/></ul></form>" }
-  #
-  # # form_tag, no block
-  # it { cellule.with_form_tag.must_equal "<form><div><input/></div><span/></form>" }
-  #
-  # # form_for with block in ERB.
-  # it { cellule.with_form_for_block.must_equal "<form><div><input/></div><input/></form>" }
-  #
-  # # when using yield, haml breaks it (but doesn't escape HTML)
-  # it { cellule.with_block.must_equal "Nice!\nyay, <b>yeah</b>\n" }
-  #
-  # # capture
-  # it { cellule.with_capture.must_equal "Nice!\n<b>Great!</b>\n" }
-  #
-  # # there's again escaping happening where it shouldn't be in link_to and rails <= 3.2.
-  # if Cell.rails_version >= Gem::Version.new('4.0')
-  #   # link_to with block and img_tag
-  #   it { cellule.with_link_to.must_equal "<a href=\"/songs\"><img alt=\"All\" src=\"/images/all.png\" />\n</a>\n" }
-  # end
+</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}}
+  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.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cells-erb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-25 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cells
@@ -17,34 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta
+        version: 4.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: 4.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: erbse
   requirement: !ruby/object:Gem::Requirement
@@ -99,11 +79,13 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Appraisals
+- CHANGES.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - cells-erb.gemspec
+- gemfiles/rails_3.2-tilt-1.4.gemfile
 - gemfiles/rails_4.2-tilt-1.4.gemfile
 - gemfiles/rails_4.2-tilt-2.0.gemfile
 - gemfiles/rails_4.2-tilt-3.0.gemfile