cells-slim 0.0.6 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0b5b27149489ac1f463ca7aafd322561c88edaca5dcf89c1449cc560c1d9c3e
-  data.tar.gz: 9ef5b16f43aade60de28631ec83b085fa8c834266d52c29ed51261aca4c8acb0
+  metadata.gz: 52e735835b5f077cbf10973bc7fc0fe799dce188dc0cb8cfd8c9d11c8a4c2745
+  data.tar.gz: 775acbf19e08c7a559bcdb18be0550ff59d6f63f12e6e7de5d5e5902d5964242
 SHA512:
-  metadata.gz: 6faa7c49ae0948e26b1cbbe4add6d53ebb12a6d35c75e8dd8c39af967d0d33780510730659c9b0dba096fd6e460bb6f685c32345026820b6408a6ee9bb5ed044
-  data.tar.gz: 40112c9d040e15a4144f676af28f204f5c831979381c1690730b90a87b0b6037be763216b758570ac2f0df2d4d308bbfa83ef236820f9a55fc47e4d73d8d0d4e
+  metadata.gz: 628e6589d7854a1dbb7f2d0d612cff8a47dc1579c7b77a0d0a9f7688bfc1ae34573147df58b32245d197857075a28fa81b756e731bd0b65b994e915c0523573d
+  data.tar.gz: 5177e37e484a3e9758a23b4986f621d3a349f8fed4dd1dec285de21aecadd8ac4c586b59cf02504b58b8849f2917056c864c4e871f7c51751c614504f2d17bfd

data/.gitignore

@@ -13,3 +13,4 @@
 *.o
 *.a
 mkmf.log
+*.gem

data/.travis.yml

@@ -1,13 +1,11 @@
 language: ruby
 rvm:
-  - 2.4.1
-  - 2.3.3
+  - 2.5.1
+  - 2.4.4
+  - 2.3.7
   - 2.2
-  - 2.1
 
 sudo: false
 
-bundler_args: '--without local_development --jobs 3 --retry 3'
-
 script: bundle exec rake
 

data/CHANGES.md

@@ -1,3 +1,11 @@
+# 0.1.1
+
+* Support `slim` 4.0 and up, too.
+
+# 0.1.0
+* Drop all rails hacks , add 'cells-rails' for all the rails witchcraft.
+* Introduce ViewModelSlim
+
 # 0.0.6
 
 * Rails 5.1 compatibility

data/Gemfile

@@ -1,11 +1,9 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in cells-slim.gemspec
+source "https://rubygems.org"
 gemspec
 
-
-gem "railties", "~> 4.2.0"
-gem "activemodel"
-gem "minitest", "~> 5.2"
-
-# gem 'cells', path: "../cells"
+case ENV["GEMS_SOURCE"]
+  when "local"
+    gem "cells", path: "../cells"
+  when "github"
+    gem "cells", github: "trailblazer/cells"
+end

data/README.md

@@ -12,11 +12,8 @@ gem 'cells-slim'
 
 ## Usage
 
-Outside of Rails, you need to include `Cell::Slim` in your cell.
-
 ```ruby
-class CommentCell < Cell::ViewModel
-  include Cell::Slim
+class CommentCell < Cell::ViewModelSlim
 ```
 
 ## Important

data/cells-slim.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "cells", ">= 4.0.1", "< 6.0.0"
-  spec.add_runtime_dependency "slim", "~> 3.0"
+  spec.add_runtime_dependency "slim", ">= 3.0"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
 end

data/lib/cell/slim.rb

@@ -10,7 +10,7 @@ module Cell
       @output_buffer = old_output_buffer
     end
 
-    def template_options_for(options)
+    def template_options_for(_options)
       {
         template_class: ::Slim::Template,
         suffix:         "slim",
@@ -20,10 +20,9 @@ module Cell
         buffer:         "@output_buffer"
       }
     end
+  end
 
-    if Object.const_defined?(:ActionView)
-      require "cell/slim/rails"
-      include Cell::Slim::Rails
-    end
+  class ViewModelSlim < ViewModel
+    include Cell::Slim
   end
 end

data/lib/cell/slim/version.rb

@@ -1,5 +1,5 @@
 module Cell
   module Slim
-    VERSION = "0.0.6"
+    VERSION = "0.1.1".freeze
   end
 end

data/lib/cells-slim.rb

@@ -1,2 +1 @@
-require "cells"
 require "cell/slim"

data/test/cells/song/render_in_render_2.slim

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

data/test/cells/song_cell.rb

@@ -0,0 +1,7 @@
+class SongCell < Cell::ViewModelSlim
+  self.view_paths = ["test/cells"]
+
+  def render_in_render
+    render
+  end
+end

data/test/slim_test.rb

@@ -1,67 +1,9 @@
-require 'test_helper'
+require "test_helper"
 
 class SlimTest < MiniTest::Spec
-  let (:controller) { ApplicationController.new.tap { |ctl| ctl.send("request=", ActionDispatch::Request.new({})) } }
-  let (:song_cell) { SongCell.new(controller) }
+  let(:song_cell) { SongCell.new }
 
-  # 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>}
+  it("render nested cells") do
+    assert_equal "<b>Questions: <strong>Yes!</strong></b>", song_cell.(:render_in_render)
   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
-  <div class="row">Cool</div>
-  </a>
-  <ul data-x="{&quot;a&quot;:&quot;1&quot;}">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>
-<div><p>Concat!</p>Whoo</div>
-}.gsub("\n", "").gsub("  ", "")
-  end
-
-  it 'allows concatenation chains' do
-    song_cell.capture do
-      song_cell.concat('Lorem').concat('ipsum')
-    end
-  end
-
-  describe "block capture" do
-    it do
-      song_cell.(:with_capture).must_equal %{Hallo<p>More</p>Hidden!}
-    end
-  end
-
 end

data/test/test_helper.rb

@@ -1,10 +1,3 @@
-require 'minitest/autorun'
-
-ENV['RAILS_ENV'] = 'test'
-
-require_relative 'dummy/config/environment'
-require "rails/test_help" # adds stuff like @routes, etc.
-
-require 'cell/slim'
-
-# Cell::ViewModel.send :include, Cell::Slim
+require "minitest/autorun"
+require "cells-slim"
+require_relative "cells/song_cell"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cells-slim
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.1
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2020-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cells
@@ -35,14 +35,14 @@ dependencies:
   name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
@@ -73,6 +73,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Slim integration for Cells.
 email:
 - terminale@gmail.com
@@ -89,26 +103,12 @@ files:
 - README.md
 - Rakefile
 - cells-slim.gemspec
-- gemfiles/rails4.2.gemfile
 - lib/cell/slim.rb
-- lib/cell/slim/rails.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_capture.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
-- test/dummy/config/boot.rb
-- test/dummy/config/environment.rb
-- test/dummy/config/routes.rb
-- test/dummy/script/rails
+- test/cells/song/render_in_render.slim
+- test/cells/song/render_in_render_2.slim
+- test/cells/song_cell.rb
 - test/slim_test.rb
 - test/test_helper.rb
 homepage: https://github.com/trailblazer/cells-slim
@@ -136,20 +136,8 @@ signing_key:
 specification_version: 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_capture.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
-- test/dummy/config/boot.rb
-- test/dummy/config/environment.rb
-- test/dummy/config/routes.rb
-- test/dummy/script/rails
+- test/cells/song/render_in_render.slim
+- test/cells/song/render_in_render_2.slim
+- test/cells/song_cell.rb
 - test/slim_test.rb
 - test/test_helper.rb

data/gemfiles/rails4.2.gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gem "railties", "~> 4.2.0"
-gem "minitest", "~> 5.2"
-
-gemspec path: "../"

data/lib/cell/slim/rails.rb

@@ -1,54 +0,0 @@
-module Cell
-  module Slim::Rails
-    def self.included(includer)
-      includer.send :include, ActionView::Helpers::FormHelper
-      includer.send :include, ::Cell::Slim::Rails::Helpers
-    end
-
-    module Helpers # include after AV helpers to override.
-      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
-
-      def tag(name = nil, options = nil, open = false, escape = true)
-        super(name, options, open, true)
-      end
-
-      def content_tag(name, content_or_options_with_block = nil, options = nil, escape = true, &block)
-        super(name, content_or_options_with_block, options, false, &block)
-      end
-
-      def concat(string)
-        @output_buffer << string
-        self
-      end
-    end
-  end
-end

data/test/dummy/Rakefile

@@ -1,7 +0,0 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require File.expand_path('../config/application', __FILE__)
-require 'rake'
-
-Dummy::Application.load_tasks

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

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

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

@@ -1,11 +0,0 @@
-| Hallo
-
-- bla = 1
-
-- hidden = capture do
-  | Hidden!
-
-p
-  | More
-
-= hidden

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

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

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

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

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

@@ -1,39 +0,0 @@
-| Word.
-
-= form_tag "/erubis/is/horribly/outdated"
-  = text_field_tag :id
-  = link_to "/rails/sucks" do
-    | hallo
-    .row
-      | Cool
-
-
-  = content_tag(:ul, "data-x" => '{"a":"1"}')
-    | 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
-
-= concatting

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

@@ -1,69 +0,0 @@
-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
-
-  def with_capture
-    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
-
-  def concatting
-    content_tag :div do
-      concat content_tag :p, "Concat!"
-      concat "Whoo"
-    end
-  end
-end

data/test/dummy/app/controllers/application_controller.rb

@@ -1,2 +0,0 @@
-class ApplicationController < ActionController::Base
-end

data/test/dummy/config.ru

@@ -1,4 +0,0 @@
-# This file is used by Rack-based servers to start the application.
-
-require ::File.expand_path('../config/environment',  __FILE__)
-run Dummy::Application

data/test/dummy/config/application.rb

@@ -1,37 +0,0 @@
-require File.expand_path('../boot', __FILE__)
-
-require "action_controller/railtie"
-require "action_view/railtie"
-
-module Dummy
-  class Application < Rails::Application
-    config.encoding = "utf-8"
-    config.i18n.enforce_available_locales = false
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    config.cache_store = :memory_store
-    config.secret_token = SecureRandom.uuid
-    config.secret_key_base = SecureRandom.uuid
-
-    # enable asset pipeline as in development.
-    config.assets.enabled = true
-    config.assets.compile = true
-    config.cache_classes = true
-
-    # Show full error reports and disable caching
-    config.consider_all_requests_local       = true
-    config.action_controller.perform_caching = false
-
-    # Raise exceptions instead of rendering exception templates
-    config.action_dispatch.show_exceptions = false
-
-    # Disable request forgery protection in test environment
-    config.action_controller.allow_forgery_protection    = false
-    config.active_support.deprecation = :stderr
-
-    config.eager_load = false
-    config.active_support.test_order = :random
-  end
-end

data/test/dummy/config/boot.rb

@@ -1,5 +0,0 @@
-require 'rubygems'
-require 'bundler'
-Bundler.setup
-
-$:.unshift File.expand_path('../../../../lib', __FILE__)

data/test/dummy/config/environment.rb

@@ -1,5 +0,0 @@
-# Load the rails application
-require File.expand_path('../application', __FILE__)
-
-# Initialize the rails application
-Dummy::Application.initialize!

data/test/dummy/config/routes.rb

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

data/test/dummy/script/rails

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
-require 'rails/commands'