cells-haml 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afb505222abec10007aa42aba06dc1471e13bd35
-  data.tar.gz: d6cf9966745815f0831df6b914757f42c91791d1
+  metadata.gz: 1cdad224d97c15e3ca642dcea8d9449b2b1298ae
+  data.tar.gz: f665747209ac4d5d7cff32d680677b811be68a87
 SHA512:
-  metadata.gz: bfdf392451a738e1de7266b25c36f0707463cbc412d61f574da61258d3e89d1b33c2d25ff919796d9dff08ad043f6f51e0f5c4661fd26c1e673cef013aa28ddb
-  data.tar.gz: 4b2c625bd551d555979a71b632cf0f522343d4c4ebb7c200dc6c644ae9fd8736247451b8c09e4f70e161f386337709de508df655657609bec94f94aac34a2302
+  metadata.gz: 6d3d433ac40e0cf825f3bca8a058739faa9bab14ed28f78fa48ff4a35ea38aed4bf7490ec7231367e3ae3135630c1e2f63811c9ef483bdfc87174b82fca5a6ef
+  data.tar.gz: 33413f055c224c4157fe835f97820b59d24caec46c4e7fbf2b7be2bcdf7ad0f1687dc49f378e996174f826aa8a3afe3fb888558608a2cb0a0918e074637330ae

data/CHANGES.md

@@ -0,0 +1,3 @@
+# 0.0.4
+
+* Added `capture` helper to override Rails escaping.

data/README.md

@@ -1,6 +1,6 @@
 # Cells::Haml
 
-TODO: Write a gem description
+Haml support for Cells.
 
 ## Installation
 
@@ -10,22 +10,27 @@ Add this line to your application's Gemfile:
 gem 'cells-haml'
 ```
 
-And then execute:
+This will set `ViewModel.template_engine = :haml.
 
-    $ bundle
+And that's all you need to do.
 
-Or install it yourself as:
+## HTML Escaping
 
-    $ gem install cells-haml
+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.
 
-## Usage
+As a first step, try this and see if it helps.
 
-TODO: Write usage instructions here
+```ruby
+class SongCell < Cell::ViewModel
+  include ActionView::Helpers::FormHelper
+  include Cell::Haml # include Haml _after_ AV helpers.
+
+  # ..
+end
+```
+
+If that doesn't work, [read the docs](http://trailblazerb.org/cells/gems/cells4.html#escaping).
 
-## Contributing
+## Dependencies
 
-1. Fork it ( https://github.com/trailblazer/cells-haml/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+This gem works with Tilt 1.4 and 2.0, and hence allows you to use it from Rails 3.2 upwards.

data/cells-haml.gemspec

@@ -17,8 +17,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.beta'
-  spec.add_runtime_dependency 'haml', '~> 4.0'
+  spec.add_dependency 'cells', '~> 4.0.0.beta3'
+  spec.add_dependency 'haml', '~> 4.0'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
 end

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

@@ -3,8 +3,7 @@
 source "https://rubygems.org"
 
 #gem "cells", :github => "apotonick/cells"
-gem "cells", path: "../../cells"
-gem "appraisal"
+# gem "cells", path: "../../cells"
 gem "railties", "~> 3.2.0"
 gem "activemodel"
 gem "minitest", "~> 4.0"
@@ -12,5 +11,3 @@ gem "tilt", "~> 1.4"
 gem "tzinfo"
 
 gemspec :path => "../"
-
-# gem "erbse", path: "../../erbse"

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

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+#gem "cells", :github => "apotonick/cells"
+# gem "cells", path: "../../cells"
+gem "railties", "~> 4.0.0"
+gem "activemodel"
+gem "minitest", "~> 4.0"
+gem "tilt", "~> 1.4"
+
+gemspec :path => "../"

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

@@ -2,14 +2,11 @@
 
 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"
 gem "activemodel"
 gem "minitest", "~> 5.2"
 gem "tilt", "~> 1.4"
 
 gemspec :path => "../"
-
-# gem "erbse", path: "../../erbse"

data/gemfiles/rails_4.2-tilt-2.0-rails-haml-0.9.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+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"
+gem "tilt", "~> 2.0"
+gem "haml-rails", "~> 0.9.0"
+
+gemspec :path => "../"

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

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

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

@@ -2,9 +2,8 @@
 
 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"
 gem "activemodel"
 gem "minitest", "~> 5.2"

data/lib/cell/haml/version.rb

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

data/lib/cell/haml.rb

@@ -2,87 +2,21 @@ require 'tilt/haml'
 
 module Cell
   module Haml
-  #   def output_buffer_with_haml
-  #     return haml_buffer.buffer if is_haml?
-  #     output_buffer_without_haml
-  #   end
-
-  #   def set_output_buffer_with_haml(new_buffer)
-  #     if is_haml?
-  #       if ::Haml::Util.rails_xss_safe? && new_buffer.is_a?(ActiveSupport::SafeBuffer)
-  #         new_buffer = String.new(new_buffer)
-  #       end
-  #       haml_buffer.buffer = new_buffer
-  #     else
-  #       set_output_buffer_without_haml new_buffer
-  #     end
-  #   end
-
-
-  #   def self.included(base)
-  #     base.class_eval do
-  #       alias_method :output_buffer_without_haml, :output_buffer
-  #       alias_method :output_buffer, :output_buffer_with_haml
-
-  #       alias_method :set_output_buffer_without_haml, :output_buffer=
-  #       alias_method :output_buffer=, :set_output_buffer_with_haml
-  #     end
-  #   end
-
-  #   # TODO: remove the concept of output buffers and just return block's result!
-  #   class OutputBuffer < String
-  #   end
-
-
-  #   def with_output_buffer(buf = nil)
-  #     unless buf
-  #       buf = OutputBuffer.new
-  #     end
-  #     self.output_buffer, old_buffer = buf, output_buffer
-  #     yield
-  #     output_buffer
-  #   ensure
-  #     self.output_buffer = old_buffer
-  #   end
-
-
-  #   # generic ERB HAML HELPERS>>>>>>
-  #   def capture(*args,&block)
-  #     value = nil
-  #     buffer = with_output_buffer() { value = yield(*args) }
-  #     if string = buffer.presence || value and string.is_a?(String)
-  #       return string
-  #     end
-  #   end
-
-  #   # From FormTagHelper. why do they escape every possible string? why?
-  #   def form_tag_in_block(html_options, &block)
-  #     content = capture(&block)
-  #     form_tag_with_body(html_options, content)
-  #   end
-
-  #   def form_tag_with_body(html_options, content)
-  #     "#{form_tag_html(html_options)}" << content.to_s << "</form>"
-  #   end
-
-  #   def form_tag_html(html_options)
-  #     extra_tags = extra_tags_for_form(html_options)
-  #     "#{tag(:form, html_options, true) + extra_tags}"
-  #   end
-
-  #   # Rails 4.0, TagHelper.
-  #   def tag_option(key, value, escape)
-  #     super(key, value, false)
-  #   end
-
-  #   def content_tag_string(name, content, options, escape=true)
-  #     super(name, content, options, false)
-  #   end
+    # From FormTagHelper. why do they escape every possible string? why?
+    def form_tag_in_block(html_options, &block)
+      content = capture(&block)
+      form_tag_with_body(html_options, content)
+    end
+
+    def form_tag_with_body(html_options, content)
+      "#{form_tag_html(html_options)}" << content.to_s << "</form>"
+    end
+
+    def form_tag_html(html_options)
+      extra_tags = extra_tags_for_form(html_options)
+      "#{tag(:form, html_options, true) + extra_tags}"
+    end
   end
 
-  # ViewModel.class_eval do
-  #   include Haml
-  # end
-
   ViewModel.template_engine = :haml
 end

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

@@ -4,12 +4,26 @@ Word.
   = link_to "/rails/sucks" do
     hallo
 
-  = content_tag( :ul) do
+  = content_tag(:ul) do
     Hallo
 
+- answer = "<script>oui!</script>"
+
+-# test content rendering in capture.
 - content = capture do
   Bonjour!
+  = link_to "Coffee?", "/coffee"
+  <b>Yes please!</b>
+  = answer
 
 Weiter!
 
-= content
+= content
+
+- breadcrumbs = capture do
+  - [link_to("1", "/1"), link_to("2", "/2")].join("+")
+
+= breadcrumbs
+
+= current_page
+= form_tag_with_body( {url: "/rails/escapes/too/much"}, %{<input type="button"/>})

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::Haml
 
   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 # FIXME: this escapes!
+      #[link_to("1", "/1"), link_to("2", "/2")].join("+") # this breaks, too!
+      "<b>No current page!<b>".html_safe
+    end
+  end
 end

data/test/haml_test.rb

@@ -27,6 +27,9 @@ class HamlTest < MiniTest::Spec
     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}
   <a href=\"/rails/sucks\">hallo
@@ -36,7 +39,13 @@ class HamlTest < MiniTest::Spec
 </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
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cells-haml
 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-25 00:00:00.000000000 Z
+date: 2015-05-26 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.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
+        version: 4.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -77,13 +77,16 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGES.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - cells-haml.gemspec
 - gemfiles/rails_3.2-tilt-1.4.gemfile
+- gemfiles/rails_4.0-tilt-1.4.gemfile
 - gemfiles/rails_4.2-tilt-1.4.gemfile
+- gemfiles/rails_4.2-tilt-2.0-rails-haml-0.9.gemfile
 - gemfiles/rails_4.2-tilt-2.0.gemfile
 - gemfiles/rails_4.2-tilt-3.0.gemfile
 - lib/cell/haml.rb