cells-slim 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e942ee4f1aee1b46e930d8fe4665c3a475bb1acd
-  data.tar.gz: 4029e004141cddfb8d9be7a2d17316f749bb2e14
+  metadata.gz: f150ba4af0b1d9be44e276ef2082d325632a0e78
+  data.tar.gz: 4a856b33b8fa00d1e9407b77bbf0154121a269a5
 SHA512:
-  metadata.gz: e58707694c81c24c9e7c8d4cf7694cf371a8306eb0501fe2687fc1d4221e6ed2af7ea257cdbffd7a8438769d63ae5970256fb40cd25ae58a32c19c7793781a1f
-  data.tar.gz: c3a96fd82394b2ce37e226438468ed52b2ff1f28bb71bcf38a8c23bf373ae2091a2550e66ab65d4d6400ab4b4735d8ee3cf003911d46ec0ee20dbc07b3ac022f
+  metadata.gz: 32f23e27d4f67d50314d41656a4f189304445d14223753ec64de2e2e1245e273dc4143a7cfa7ae984a09aa04e03c81b75bd4ba037bef8cce2139a26a7f6c96a8
+  data.tar.gz: 85b7e71eedc1b18c8164cbaeaadf2a81da8d44a5852b9146154d56aa09fd58d92fb2a6d2e14c2d31410251e4de6f102b19b68a2851268cac343582ad2efeac51

data/CHANGES.md

@@ -0,0 +1,3 @@
+# 0.0.2
+
+* Updates for Cells 4: Fixes output_buffer.

data/Gemfile

@@ -3,7 +3,9 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in cells-slim.gemspec
 gemspec
 
-gem 'pry-byebug'  , platforms: [:mri_20, :mri_21]
-gem 'appraisal'
-gem 'minitest-reporters'
-gem 'cells', github: 'apotonick/cells', branch: 'cells-4'
+
+gem "railties", "~> 4.2.0"
+gem "activemodel"
+gem "minitest", "~> 5.2"
+
+gem 'cells', path: "../cells"

data/README.md

@@ -1,6 +1,6 @@
 # Cells::Slim
 
-TODO: Write a gem description
+Support for Slim templates with Cells.
 
 ## Installation
 
@@ -10,22 +10,15 @@ Add this line to your application's Gemfile:
 gem 'cells-slim'
 ```
 
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install cells-slim
-
 ## Usage
 
-TODO: Write usage instructions here
+Outside of Rails, you need to include `Cell::Erb` in your cell.
+
+```ruby
+class CommentCell < Cell::ViewModel
+  include Cell::Slim
+```
 
-## Contributing
+## Documentation
 
-1. Fork it ( https://github.com/trailblazer/cells-slim/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
+[More documentation](http://trailblazerb.org/gems/cells/templates.html) can be found on the Trailblazer page.

data/cells-slim.gemspec

@@ -1,13 +1,15 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
+require 'cell/slim/version'
+
+
 Gem::Specification.new do |spec|
   spec.name          = 'cells-slim'
-  spec.version       = '0.0.1'
+  spec.version       = Cell::Slim::VERSION
   spec.authors       = ['Abdelkader Boudih', 'Nick Sutterer']
   spec.email         = %w(terminale@gmail.com apotonick@gmail.com)
-  spec.summary       = 'Slim integration for cells 4'
+  spec.summary       = 'Slim integration for Cells.'
   spec.description   = spec.summary
   spec.homepage      = 'https://github.com/trailblazer/cells-slim'
   spec.license       = 'MIT'
@@ -16,9 +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.alpha1'
+  spec.add_runtime_dependency 'cells', '~> 4.0.0.beta6'
   spec.add_runtime_dependency 'slim', '~> 3.0'
-  spec.add_runtime_dependency 'tilt', '>= 1.4.1'
-  spec.add_development_dependency 'bundler', '>= 1.6'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
 end

data/gemfiles/rails4.1.gemfile

@@ -2,11 +2,11 @@
 
 source "https://rubygems.org"
 
+gem "pry-byebug", :platforms => [:mri_20, :mri_21]
 gem "appraisal"
 gem "minitest-reporters"
-gem 'cells', github: 'apotonick/cells', branch: 'cells-4'
-gem "railties", :github => "rails/rails", :branch => "4-1-stable"
-gem "activemodel", :github => "rails/rails", :branch => "4-1-stable"
+gem "cells", :github => "apotonick/cells", :branch => "cells-4"
+gem "railties", "~> 4.1.0"
 gem "minitest", "~> 5.2"
 
 gemspec :path => "../"

data/gemfiles/rails4.2.gemfile

@@ -2,11 +2,11 @@
 
 source "https://rubygems.org"
 
+gem "pry-byebug", :platforms => [:mri_20, :mri_21]
 gem "appraisal"
 gem "minitest-reporters"
-gem 'cells', github: 'apotonick/cells', branch: 'cells-4'
-gem "railties", :github => "rails/rails", :branch => "4-2-stable"
-gem "activemodel", :github => "rails/rails", :branch => "4-2-stable"
+gem "cells", :github => "apotonick/cells", :branch => "cells-4"
+gem "railties", "~> 4.2.0"
 gem "minitest", "~> 5.2"
 
 gemspec :path => "../"

data/lib/cell/slim.rb

@@ -0,0 +1,66 @@
+require "slim"
+require "cells"
+
+module Cell
+  module Slim
+    def render_template(*)
+      old_output_buffer = @output_buffer
+      super
+    ensure
+      @output_buffer = old_output_buffer
+    end
+
+    def template_options_for(options)
+      {
+        template_class: ::Slim::Template,
+        suffix:         "slim",
+        disable_escape: true,
+        escape_code:    false,
+        use_html_safe:  false,
+        buffer:         "@output_buffer"
+      }
+    end
+
+    include ActionView::Helpers::FormHelper
+
+    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
+
+    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
+
+    # 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
+  end
+end

data/lib/cell/slim/version.rb

@@ -0,0 +1,5 @@
+module Cell
+  module Slim
+    VERSION = "0.0.2"
+  end
+end

data/lib/cells-slim.rb

@@ -0,0 +1 @@
+require "cell/slim"

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

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

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

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

data/test/dummy/app/cells/song/with_content_tag.slim

@@ -0,0 +1 @@
+= content_tag(:div) { "Beachparty" }

data/test/dummy/app/cells/song/with_content_tag_and_content_tag.slim

@@ -0,0 +1,4 @@
+= content_tag :span
+  | Title:
+  = content_tag :div 
+    | Still Knee Deep

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

@@ -0,0 +1,34 @@
+| Word.
+
+= form_tag "/erubis/is/horribly/outdated"
+  = text_field_tag :id
+  = link_to "/rails/sucks"
+    | hallo
+
+  = content_tag(:ul)
+    | Hallo
+
+- answer = "<script>oui!</script>"
+
+/ test content rendering in capture.
+- content = capture do
+  | Bonjour!
+  = link_to "Coffee?", "/coffee"
+  b Yes please!
+  == answer
+
+| Weiter!
+
+== 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"/>})
+
+
+= form_for OpenStruct.new, url: "/", as: "open" do |f|
+  = f.text_field :id

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

@@ -0,0 +1,58 @@
+class SongCell < Cell::ViewModel
+  self.view_paths = ["test/dummy/app/cells"]
+
+
+  include Cell::Slim
+
+  def protect_against_forgery?
+    false
+  end
+
+  def with_form_tag_and_content_tag
+    render
+  end
+
+  def with_content_tag_and_content_tag
+    render
+  end
+
+  def with_content_tag
+    render
+  end
+
+  def with_block
+    render
+  end
+
+  def with_capture
+    render
+  end
+
+  def with_form_tag
+    form_tag("/songs") + content_tag(:span) + "</form>"
+  end
+
+  def with_link_to
+    render
+  end
+
+  def with_form_for_block
+    render
+  end
+
+  def render_in_render
+    render
+  end
+
+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/dummy/config/boot.rb

@@ -1,10 +1,5 @@
 require 'rubygems'
-gemfile = File.expand_path('../../../../Gemfile', __FILE__)
-
-if File.exist?(gemfile)
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
-  Bundler.setup
-end
+require 'bundler'
+Bundler.setup
 
 $:.unshift File.expand_path('../../../../lib', __FILE__)

data/test/dummy/config/routes.rb

@@ -1,3 +1,3 @@
 Dummy::Application.routes.draw do
-  resources :drugs
+  resources :songs
 end

data/test/slim_test.rb

@@ -1,9 +1,52 @@
 require 'test_helper'
 
-class SlimTest < MiniTest::Test
+class SlimTest < MiniTest::Spec
+  let (:controller) { ApplicationController.new.tap { |ctl| ctl.send("request=", ActionDispatch::Request.new({})) } }
+  let (:song_cell) { SongCell.new(controller) }
 
-  def test_template_engine
-   assert_equal 'slim', Cell::ViewModel.template_engine
+  # render in render
+  it("bla") { song_cell.(:render_in_render).must_equal "<b>Questions: Yes!</b>" }
+
+  # content_tag { }
+  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>}
+  end
+
+  # form_tag { content_tag { } }
+  it( "xxx") 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
+
+    input_tag = %{<input type="text" name="id" id="id" />}
+    input_tag = "<input id=\"id\" name=\"id\" type=\"text\" />" 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
+
+    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_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\" />" if ActionPack::VERSION::MAJOR == 3
+
+    song_cell.(:with_form_tag_and_content_tag).must_equal %{Word.
+#{form_tag}
+  #{input_tag}
+  <a href=\"/rails/sucks\">hallo
+  </a>
+  <ul>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}
+#{form_for_tag}
+</form>
+}.gsub("\n", "").gsub("  ", "")
   end
 
 end

data/test/test_helper.rb

@@ -1,15 +1,11 @@
-begin
-  require 'byebug'
-rescue LoadError
-end
 require 'minitest/autorun'
 
-require 'minitest/reporters'
-Minitest::Reporters.use! [Minitest::Reporters::ProgressReporter.new]
-
 ENV['RAILS_ENV'] = 'test'
 
-require 'cells/slim'
 require_relative 'dummy/config/environment'
 require "rails/test_help" # adds stuff like @routes, etc.
 
+require "cell/railtie"
+require 'cell/slim'
+
+# Cell::ViewModel.send :include, Cell::Slim

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cells-slim
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-06-05 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.alpha1
+        version: 4.0.0.beta6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.alpha1
+        version: 4.0.0.beta6
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -39,49 +39,35 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
-description: Slim integration for cells 4
+        version: '0'
+description: Slim integration for Cells.
 email:
 - terminale@gmail.com
 - apotonick@gmail.com
@@ -91,7 +77,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
-- Appraisals
+- CHANGES.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -99,8 +85,16 @@ files:
 - cells-slim.gemspec
 - gemfiles/rails4.1.gemfile
 - gemfiles/rails4.2.gemfile
-- lib/cells/slim.rb
+- lib/cell/slim.rb
+- lib/cell/slim/version.rb
+- lib/cells-slim.rb
 - test/dummy/Rakefile
+- test/dummy/app/cells/song/render_in_render.slim
+- test/dummy/app/cells/song/render_in_render_2.slim
+- test/dummy/app/cells/song/with_content_tag.slim
+- test/dummy/app/cells/song/with_content_tag_and_content_tag.slim
+- test/dummy/app/cells/song/with_form_tag_and_content_tag.slim
+- test/dummy/app/cells/song_cell.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
@@ -130,12 +124,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Slim integration for cells 4
+summary: Slim integration for Cells.
 test_files:
 - test/dummy/Rakefile
+- test/dummy/app/cells/song/render_in_render.slim
+- test/dummy/app/cells/song/render_in_render_2.slim
+- test/dummy/app/cells/song/with_content_tag.slim
+- test/dummy/app/cells/song/with_content_tag_and_content_tag.slim
+- test/dummy/app/cells/song/with_form_tag_and_content_tag.slim
+- test/dummy/app/cells/song_cell.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
@@ -145,4 +145,3 @@ test_files:
 - test/dummy/script/rails
 - test/slim_test.rb
 - test/test_helper.rb
-has_rdoc: 

data/Appraisals

@@ -1,9 +0,0 @@
-appraise "rails4.1" do
-    gem 'railties', github: 'rails/rails', branch: '4-1-stable'
-    gem 'minitest', '~> 5.2'
-end
-
-appraise "rails4.2" do
-    gem 'railties', github: 'rails/rails', branch: '4-2-stable'
-    gem 'minitest', '~> 5.2'
-end

data/lib/cells/slim.rb

@@ -1,55 +0,0 @@
-require 'slim'
-require 'cells'
-
-Tilt.register 'Slim::Template', 'slim', 'slim'
-
-module Cell
-  module Slim
-    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
-
-    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_html(html_options)}" << content << "</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 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
-  end
-
-  ViewModel.class_eval do
-    include Slim
-  end
-
-  ViewModel.template_engine = :slim
-end