cells-haml 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd4c38d60926730d8aaeefa655c4d664f54b36db
-  data.tar.gz: 26c520c2ecd3c86539c5e09173f97c2de9355296
+  metadata.gz: 6be9c331f0746213a42cbfbe16868e27142badf9
+  data.tar.gz: a11364d8b837ff886080aa92bc77a59d37cf58a3
 SHA512:
-  metadata.gz: 867a4ba00077cc2a18e90f28c3d6fd8d60bb5cd88b759c6c3ffeb66a78addba373de26e34cc078a90de62b263e30892fd4dcf00725b21c7335a2d19ce4f8c8b9
-  data.tar.gz: 0569e7d9142a1c7223e9ba613424611442fc3c5cc2c3f0eca4359824a6b916c6d448a5ba1f5c7535f682ed76240ba748e0dd1a2f569860055be1856ccd366f78
+  metadata.gz: da2226291a4b1f67efe15f6641f8cb13c53be1af636be6004c695666b600ec84ea74da126daa5c9995741db0853ec670ac7005a7a9b8914073f1f0abbee43172
+  data.tar.gz: 42dc9e4d36e24304c6915c4522c2208facfb409f1671536f0186915031b61b157bb8d4e1a0b0b7140e9d579078addf940e03820a49a2073afc51c6a9b1b2c0b1

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 0.0.6
+
+
+
 # 0.0.5
 
 * Remove Haml's buggy `#form_for` version until Haml 4.1 is out, which fixes this by simply not overriding the helper at all. Include `Cell::Haml` after including the form helpers.

data/Gemfile

@@ -2,13 +2,9 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in cells-haml.gemspec
 gemspec
-platforms :mri_20, :mri_21 do
-  gem 'pry-byebug'
-end
-gem 'cells', github: 'apotonick/cells'
+
+gem 'cells', path: "../cells"#github: 'apotonick/cells'
 gem 'railties'
 gem 'actionpack'
 gem 'actionview'
-gem 'appraisal'
-gem 'minitest-reporters'
-# gem "haml", github: "haml/haml" # we need 4.1.
+gem "haml", github:"haml/haml" #"4.1.0.beta1" #github: "haml/haml" # we need 4.1.

data/README.md

@@ -8,11 +8,11 @@ Add this line to your application's Gemfile:
 
 ```ruby
 gem 'cells-haml'
+gem "haml", github: "haml/haml"
 ```
 
-This will set `ViewModel.template_engine = :haml.
+This gem currently only works properly with Haml 4.1, which is not yet released.
 
-And that's all you need to do.
 
 ## HTML Escaping
 
@@ -31,19 +31,6 @@ end
 
 If that doesn't work, [read the docs](http://trailblazerb.org/gems/cells/cells4.html#html-escaping).
 
-## `form_for` Problems
-
-Haml < 4.1.0 overrides many Rails helpers and introduces bugs. They are fixed in Haml 4.1 (by simply removing the code). In case you're on 4.0.6 and `form_for` doesn't render properly, include `Cell::Haml`.
-
-```ruby
-class SongCell < Cell::ViewModel
-  include ActionView::Helpers::FormHelper
-  include Cell::Haml # include Haml _after_ AV helpers.
-
-  # ..
-end
-```
-
 ## 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-haml.gemspec

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

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

@@ -12,3 +12,5 @@ gem "tzinfo"
 # gem "haml", github: "haml/haml"
 
 gemspec :path => "../"
+
+gem "haml", github:"haml/haml"

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

@@ -10,3 +10,5 @@ gem "minitest", "~> 4.0"
 gem "tilt", "~> 1.4"
 
 gemspec :path => "../"
+
+gem "haml", github:"haml/haml"

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

@@ -10,3 +10,5 @@ gem "minitest", "~> 5.2"
 gem "tilt", "~> 1.4"
 
 gemspec :path => "../"
+
+gem "haml", github:"haml/haml"

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

@@ -11,3 +11,5 @@ gem "minitest", "~> 5.2"
 gem "tilt", "~> 2.0"
 
 gemspec :path => "../"
+
+gem "haml", github:"haml/haml"

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

@@ -10,3 +10,5 @@ gem "minitest", "~> 5.2"
 gem "tilt", "~> 3.0"
 
 gemspec :path => "../"
+
+gem "haml", github:"haml/haml"

data/lib/cell/haml.rb

@@ -2,6 +2,19 @@ require 'tilt/haml'
 
 module Cell
   module Haml
+    def template_options_for(options)
+      {
+        template_class: ::Tilt::HamlTemplate,
+        escape_html:    false,
+        escape_attrs:   false,
+        suffix:         "haml"
+      }
+    end
+
+    attr_writer :output_buffer
+
+    include ActionView::Helpers::FormHelper
+
     # From FormTagHelper. why do they escape every possible string? why?
     def form_tag_in_block(html_options, &block)
       content = capture(&block)
@@ -12,15 +25,17 @@ module Cell
       "#{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
+    # def form_tag_html(html_options)
+    #   extra_tags = extra_tags_for_form(html_options)
+    #   "#{tag(:form, html_options, true) + extra_tags}"
+    # end
 
-    def form_for(*args, &block) # TODO: remove this once Haml 4.1 is out. the form_for_with_haml is buggy.
-      form_for_without_haml(*args, &block)
-    end
-  end
+    # def form_for(*args, &block) # TODO: remove this once Haml 4.1 is out. the form_for_with_haml is buggy.
+    #   form_for_without_haml(*args, &block)
+    # end
 
-  ViewModel.template_engine = :haml
+    # def content_tag(name, content_or_options_with_block=nil, options=nil, escape=false, &block)
+    #   super
+    # end
+  end
 end

data/lib/cell/haml/version.rb

@@ -1,5 +1,5 @@
 module Cell
   module Haml
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

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

@@ -0,0 +1 @@
+%b Questions: #{render :render_in_render_2}

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

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

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

@@ -1,9 +1,13 @@
 class SongCell < Cell::ViewModel
   self.view_paths = ["test/dummy/app/cells"]
 
-  include ActionView::Helpers::FormHelper
+
   include Cell::Haml
 
+  def protect_against_forgery?
+    false
+  end
+
   def with_form_tag_and_content_tag
     render
   end
@@ -36,6 +40,10 @@ class SongCell < Cell::ViewModel
     render
   end
 
+  def render_in_render
+    render
+  end
+
 private
   def cap
     "yay, #{with_output_buffer { yield } }"

data/test/haml_test.rb

@@ -1,12 +1,11 @@
 require 'test_helper'
 
 class HamlTest < MiniTest::Spec
-  it { Cell::ViewModel.template_engine.must_equal :haml }
-
-
   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>\n" }
 
   # URL helpers work in cell instance.
   it { song_cell.songs_path.must_equal "/songs" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cells-haml
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 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: haml
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,8 @@ files:
 - lib/cells-haml.rb
 - test/cell_generator_test.rb
 - test/dummy/Rakefile
+- test/dummy/app/cells/song/render_in_render.haml
+- test/dummy/app/cells/song/render_in_render_2.haml
 - test/dummy/app/cells/song/with_content_tag.haml
 - test/dummy/app/cells/song/with_content_tag_and_content_tag.haml
 - test/dummy/app/cells/song/with_form_tag_and_content_tag.haml
@@ -136,6 +138,8 @@ summary: Haml integration for Cells
 test_files:
 - test/cell_generator_test.rb
 - test/dummy/Rakefile
+- test/dummy/app/cells/song/render_in_render.haml
+- test/dummy/app/cells/song/render_in_render_2.haml
 - test/dummy/app/cells/song/with_content_tag.haml
 - test/dummy/app/cells/song/with_content_tag_and_content_tag.haml
 - test/dummy/app/cells/song/with_form_tag_and_content_tag.haml