cells 4.0.0.beta5 → 4.0.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3732dd6583b86eaee3a97d864d066cfe8f4268f3
-  data.tar.gz: 95c3e9832728d606d3118b723904276e4a58c958
+  metadata.gz: a5c2400e9d14760d1546557317bc9e98f97bb3b7
+  data.tar.gz: 4d7de6cd09957c5c12b7bd8b7030ebb119d5c5d5
 SHA512:
-  metadata.gz: e7e422083ff700c7a9ddd1a5d4d8e2a53833d6b8b55b88042aa5d858210363f331495622c03c264cc1d846ed91f2007a0405755122fb2669108251a524f67910
-  data.tar.gz: 7d691187b2b8123cfc131e58803bf9b5f280ce568486d0449ab86ac1ce704f96db48ea1647c79033c6d22a3c50895119d24079d75d39f2b0818a8a3d953538c7
+  metadata.gz: 2cc1c784ecb8a5e5838650b1e31beac41a03c92d5df45205b7811342d6acaba8a5a4dabeabf8eb752bfa0480fa784bda88a914e08ee14de9ce0ba7d7d7d8d123
+  data.tar.gz: a9c00ab7bcb2ab01132202756e1227cf50a6a976e3de7d69e9d9c74960874b7e910403cec640b12b63665e641acb850e0be3382a2d641d986f11b7b47e2dbef3

data/CHANGES.md

@@ -18,6 +18,9 @@
 
 * When using HAML, we do not use any of HAML's helper hacks to "fix" ActionView and XSS. While you might not note this, it removes tons of code from our stack.
 
+## 4.0.0.beta6
+
+* Removed `ViewModel::template_engine`. This is now done explicitly by including `Cell::Erb`, etc. and happens automatically in a Rails environment.
 
 ## 4.0.0.beta5
 

data/lib/cell.rb

@@ -12,8 +12,8 @@ module Cell
   end
 
   class TemplateMissingError < RuntimeError
-    def initialize(prefixes, view, engine, formats)
-      super("Template missing: view: `#{view.to_s}.#{engine}` prefixes: #{prefixes.inspect}")
+    def initialize(prefixes, view)
+      super("Template missing: view: `#{view.to_s}` prefixes: #{prefixes.inspect}")
     end
   end # Error
 end

data/lib/cell/rails.rb

@@ -52,5 +52,38 @@ module Cell
         end
       end
     end
+
+    # In Rails, there are about 10 different implementations of #url_for. Rails doesn't like the idea of objects, so they
+    # have helpers in modules. Those module are now included sequentially into other modules and/or classes. While they
+    # get included, they might or might not include methods, depending on the including module/class
+    # (example here: https://github.com/rails/rails/blob/cad20f720c4c6e04584253cd0a23f22b3d43ab0f/actionpack/lib/action_dispatch/routing/url_for.rb#L87).
+    #
+    # The outcome is that several module override #url_for, and if you're lucky, this works. If you're not, then #url_for breaks
+    # due to a raise in one of its basic implementations, introduced in 3.x, fixed in 4.0 and then re-introduced in 4.2
+    #
+    # This is extremely frustrating as no one in Rails core seems to tackle this problem and introduces a url object instead
+    # of this module madness. I have to constantly test and fix it in Cells. With the module below, I'll stop doing this.
+    #
+    # Either Rails works with Cells and we fix this in form of a URL object that gets passed into the cell (I'm happy with
+    # a global object here, too! Wow!) or URL helpers will stop working in Cells and a lot of people will be unhappy.
+    #
+    # Anyway, this is the reason we need this patch module. If you have trouble with URLs in Cells, then please ask Rails to
+    # fix their implementation. Thank you.
+    module HelpersAreShit
+      def url_for(options = nil) # from ActionDispatch:R:UrlFor.
+        case options
+          when nil
+            _routes.url_for(url_options.symbolize_keys)
+          when Hash
+            _routes.url_for(options.symbolize_keys.reverse_merge!(url_options))
+          when String
+            options
+          when Array
+            polymorphic_url(options, options.extract_options!)
+          else
+            polymorphic_url(options)
+        end
+      end
+    end
   end
 end

data/lib/cell/railtie.rb

@@ -11,9 +11,9 @@ module Cell
       end
     end
 
-    initializer 'cells.template_engine' do |app|
-      ViewModel.template_engine = app.config.app_generators.rails.fetch(:template_engine, 'erb').to_s
-    end
+    # initializer 'cells.template_engine' do |app|
+    #   ViewModel.template_engine = app.config.app_generators.rails.fetch(:template_engine, 'erb').to_s
+    # end
 
     # ruthlessly stolen from the zurb-foundation gem.
     initializer 'cells.update_asset_paths' do |app|
@@ -23,7 +23,7 @@ module Cell
       end
     end
 
-    initializer('cells.rails_extensions') do |app|
+    initializer "cells.rails_extensions" do |app|
       ActiveSupport.on_load(:action_controller) do
         self.class_eval do
           include ::Cell::RailsExtensions::ActionController
@@ -34,21 +34,29 @@ module Cell
         self.class_eval do
           include ::Cell::RailsExtensions::ActionView
         end
+      end
+    end
 
-        #include assert helpers (image_path, font_path, ect)
-        ViewModel.class_eval do
-          include ActionView::Helpers::AssetTagHelper
-        end
+    initializer "cells.include_default_helpers" do
+      #include assert helpers (image_path, font_path, ect)
+      ViewModel.class_eval do
+        include ActionView::Helpers::UrlHelper
+        include ::Cell::RailsExtensions::HelpersAreShit
+
+        include ActionView::Helpers::AssetTagHelper
+        include ActionView::Helpers::FormTagHelper
       end
 
       # set VM#cache_store, etc.
       ViewModel.send(:include, RailsExtensions::ViewModel)
+    end
 
-      if defined?(ActionView)
-        # always include those helpers so we can override the shitty parts.
-        ViewModel.send(:include, ActionView::Helpers::UrlHelper)
-        ViewModel.send(:include, ActionView::Helpers::FormTagHelper)
-      end
+    # TODO: allow to turn off this.
+    initializer "cells.include_template_module", after: "cells.include_default_helpers" do
+      # yepp, this is happening. saves me a lot of coding in each extension.
+      ViewModel.send(:include, Cell::Erb) if Cell.const_defined?(:Erb)
+      ViewModel.send(:include, Cell::Haml) if Cell.const_defined?(:Haml)
+      ViewModel.send(:include, Cell::Slim) if Cell.const_defined?(:Slim)
     end
 
     initializer('cells.development') do |app|

data/lib/cell/templates.rb

@@ -2,10 +2,8 @@ module Cell
   # Gets cached in production.
   class Templates
     # prefixes could be instance variable as they will never change.
-    def [](prefixes, view, engine, formats=nil)
-      view = "#{view}.#{engine}"
-
-      find_template(prefixes, view, engine)
+    def [](prefixes, view, options)
+      find_template(prefixes, view, options)
     end
 
   private
@@ -14,17 +12,19 @@ module Cell
       @cache ||= Cache.new
     end
 
-    def find_template(prefixes, view, engine)
+    def find_template(prefixes, view, options) # options is not considered in cache key.
       cache.fetch(prefixes, view) do |prefix|
         # this block is run once per cell class per process, for each prefix/view tuple.
-        create(prefix, view)
+        create(prefix, view, options)
       end
     end
 
-    def create(prefix, view)
+    def create(prefix, view, options)
       # puts "...checking #{prefix}/#{view}"
       return unless File.exists?("#{prefix}/#{view}") # DISCUSS: can we use Tilt.new here?
-      Tilt.new("#{prefix}/#{view}", escape_html: false, escape_attrs: false)
+
+      template_class = options.delete(:template_class)
+      template_class.new("#{prefix}/#{view}", options) # Tilt.new()
     end
 
     # {["comment/row/views", comment/views"][show.haml] => "Tpl:comment/view/show.haml"}

data/lib/cell/version.rb

@@ -1,3 +1,3 @@
 module Cell
-  VERSION = "4.0.0.beta5"
+  VERSION = "4.0.0.beta6"
 end

data/lib/cell/view_model.rb

@@ -21,9 +21,6 @@ module Cell
     inheritable_attr :view_paths
     self.view_paths = ["app/cells"]
 
-    inheritable_attr :template_engine
-    self.template_engine = "erb"
-
     class << self
       def templates
         @templates ||= Templates.new # note: this is shared in subclasses. do we really want this?
@@ -74,6 +71,7 @@ module Cell
 
       include Helpers
 
+      # DISCUSS: introduce ::for which takes constant? rename ::build_cell to ::build?
 
       def cell_for(name, *args)
         class_from_cell_name(name).build_cell(*args)
@@ -115,16 +113,17 @@ module Cell
         content.to_s
       end
 
-    private
       # render :show
       def render(options={})
         options = normalize_options(options, caller) # TODO: call render methods with call(:show), call(:comments) instead of directly #comments?
         render_to_string(options)
       end
 
+    private
       def render_to_string(options)
-        template = template_for(options) # TODO: cache template with path/lookup keys.
-        content  = template.render(self, options[:locals])
+        template = find_template(options) # TODO: cache template with path/lookup keys.
+
+        content  = render_template(template, options)
 
         # TODO: allow other (global) layout dirs.
         with_layout(options, content)
@@ -133,6 +132,18 @@ module Cell
       def render_state(*args)
         send(*args)
       end
+
+      def with_layout(options, content)
+        return content unless layout = options[:layout]
+
+        template = find_template(options.merge :view => layout) # we could also allow a different layout engine, etc.
+
+        render_template(template, options) { content }
+      end
+
+      def render_template(template, options, &block)
+        template.render(self, options[:locals], &block) # DISCUSS: hand locals to layout?
+      end
     end
 
     include Rendering
@@ -167,30 +178,30 @@ module Cell
       end
     end
     def output_buffer # called from the precompiled template. FIXME: this is currently not used in Haml.
-      OutputBuffer.new # don't cache output_buffer, for every render call we get a fresh one.
+      OutputBuffer.new # don't cache output_buffer, for every #render call we get a fresh one.
     end
-    attr_writer :output_buffer # FIXME: where is that used? definitely not in Erbse.
-    # TODO: remove output_buffer in favor or returning the string.
 
 
     module TemplateFor
-      def template_for(options)
+      def find_template(options)
+        template_options = template_options_for(options) # imported by Erb, Haml, etc.
+
         view      = options[:view]
-        engine    = options[:template_engine]
         prefixes  = options[:prefixes]
+        suffix    = template_options[:suffix]
+        view      = "#{view}.#{suffix}"
 
+        template_for(prefixes, view, template_options) or raise TemplateMissingError.new(prefixes, view)
+      end
+
+      def template_for(prefixes, view, options)
         # we could also pass _prefixes when creating class.templates, because prefixes are never gonna change per instance. not too sure if i'm just assuming this or if people need that.
-        self.class.templates[prefixes, view, engine] or raise TemplateMissingError.new(prefixes, view, engine, nil)
+        # Note: options here is the template-relevant options, only.
+        self.class.templates[prefixes, view, options]
       end
     end
     include TemplateFor
 
-    def with_layout(options, content)
-      return content unless layout = options[:layout]
-
-      template = template_for(options.merge :view => layout) # we could also allow a different layout engine, etc.
-      template.render(self) { content }
-    end
 
     def normalize_options(options, caller) # TODO: rename to #setup_options! to be inline with Trb.
       options = if options.is_a?(Hash)
@@ -200,8 +211,7 @@ module Cell
         {:view => options.to_s}
       end
 
-      options[:template_engine] ||= self.class.template_engine # DISCUSS: in separate method?
-      options[:prefixes]        ||= _prefixes
+      options[:prefixes] ||= _prefixes
 
       process_options!(options)
       options

data/lib/rails/generators/test_unit/cell/templates/unit_test.rb.erb

@@ -3,8 +3,8 @@ require 'test_helper'
 class <%= class_name %>CellTest < Cell::TestCase
 <% states.each do |state| -%>
   test "<%= state %>" do
-    invoke :<%= state %>
-    assert_select 'p'
+    html = cell("<%= file_name %>").(:<%= state %>)
+    assert html.match /<p>/
   end
 
 <% end %>

data/lib/rails/generators/test_unit/concept/templates/unit_test.rb.erb

@@ -3,9 +3,9 @@ require 'test_helper'
 class <%= class_name %>ConceptTest < Cell::TestCase
 <% states.each do |state| -%>
   test "<%= state %>" do
-    invoke :<%= state %>
-    assert_select 'p'
+    html = concept("<%= file_name %>/cell").(:<%= state %>)
+    assert html.match /<p>/
   end
-  
+
 <% end %>
 end

data/test/cell_generator_test.rb

@@ -69,7 +69,10 @@ class CellGeneratorTest < Rails::Generators::TestCase
   test 'create test_unit assets with -t test_unit' do
     run_generator %w(Blog post latest -t test_unit)
 
+    # file is there.
     assert_file 'test/cells/blog_cell_test.rb'
+    # file contains #cell(..) call.
+    assert_file 'test/cells/blog_cell_test.rb', /cell\("blog"\).\(:post\)/
   end
 
   test 'work with namespace and test_unit' do

data/test/concept_generator_test.rb

@@ -15,6 +15,13 @@ class ConceptGeneratorTest < Rails::Generators::TestCase
     assert_file 'app/concepts/song/views/show.erb', %r{app/concepts/song/views/show\.erb}
   end
 
+  test "test unit test" do
+    run_generator %w(song -t test_unit)
+
+    # file contains #concept(..) call.
+    assert_file 'test/concepts/song/cell_test.rb', /concept\("song\/cell"\).\(:show\)/
+  end
+
   test '[haml] standard assets, show view' do
     run_generator %w(song -e haml)
 

data/test/concept_test.rb

@@ -7,7 +7,7 @@ end
 # Trailblazer style:
 module Record
   class Cell < Cell::Concept # cell("record")
-    self.template_engine = "erb"
+    include ::Cell::Erb
 
     def show
       render # Party On, #{model}

data/test/layout_test.rb

@@ -2,6 +2,7 @@ require 'test_helper'
 
 class SongWithLayoutCell < Cell::ViewModel
   self.view_paths = ['test/fixtures']
+  # include Cell::Erb
 
   def show
     render layout: :merry

data/test/partial_test.rb

@@ -4,7 +4,7 @@ require "cell/partial"
 class PartialTest < MiniTest::Spec
   class WithPartial < Cell::ViewModel
     self.view_paths = ['test/fixtures'] # doesn't exist.
-    self.template_engine = :erb
+    include ::Cell::Erb
 
     include Partial
 

data/test/prefixes_test.rb

@@ -84,6 +84,7 @@ end
 class InheritViewsTest < MiniTest::Spec
   class SlapperCell < Cell::ViewModel
     self.view_paths = ['test/fixtures'] # todo: REMOVE!
+    include Cell::Erb
 
     inherit_views ::BassistCell
 
@@ -106,6 +107,7 @@ class InheritViewsTest < MiniTest::Spec
   # TapperCell
   class TapperCell < Cell::ViewModel
     self.view_paths = ['test/fixtures']
+    # include Cell::Erb
 
     def play
       render

data/test/rails4.2/Gemfile

@@ -13,4 +13,6 @@ group :development, :test do
 end
 
 gem "cells", path: "../../"
-gem "cells-erb"
+gem "cells-erb", path: "../../../cells-erb"
+gem "simple_form"
+gem "formtastic"

data/test/rails4.2/app/assets/stylesheets/{application.css → application.css.erb}

@@ -15,3 +15,5 @@
  *= require user
  *= require song
  */
+<%# capture do %>
+<%# end %>

data/test/rails4.2/app/cells/form_for/show.erb

@@ -0,0 +1,7 @@
+<%= form_for Song.new do |f| %>
+  First
+  <%= f.text_field :id %>
+  <%= f.fields_for :artist do |a| %>
+    <%= a.text_field :id %>
+  <% end %>
+<% end %>

data/test/rails4.2/app/cells/form_for_cell.rb

@@ -0,0 +1,12 @@
+class FormForCell < Cell::ViewModel
+  include ActionView::RecordIdentifier
+  include ActionView::Helpers::FormHelper
+
+  def protect_against_forgery?
+    false
+  end
+
+  def show
+    render
+  end
+end

data/test/rails4.2/app/cells/formtastic/show.erb

@@ -0,0 +1,12 @@
+<%= semantic_form_for Song.new do |f| %>
+  First
+  <%= f.input :id %>
+  <%= f.semantic_fields_for :artist do |a| %>
+    <%= a.input :id %>
+  <% end %>
+
+  <%= f.actions do %>
+    <%= f.submit 'Go!', as: :button, class: 'btn btn-primary' %>
+  <% end %>
+
+<% end %>

data/test/rails4.2/app/cells/formtastic_cell.rb

@@ -0,0 +1,13 @@
+class FormtasticCell < Cell::ViewModel
+  include ActionView::RecordIdentifier
+  include ActionView::Helpers::FormHelper
+  include Formtastic::Helpers::FormHelper
+
+  def protect_against_forgery?
+    false
+  end
+
+  def show
+    render
+  end
+end

data/test/rails4.2/app/cells/simple_form/show.erb

@@ -0,0 +1,7 @@
+<%= simple_form_for Song.new do |f| %>
+  First
+  <%= f.input :id %>
+  <%= f.fields_for :artist do |a| %>
+    <%= a.input :id %>
+  <% end %>
+<% end %>

data/test/rails4.2/app/cells/simple_form_cell.rb

@@ -0,0 +1,16 @@
+class SimpleFormCell < Cell::ViewModel
+  include ActionView::RecordIdentifier
+  include ActionView::Helpers::FormHelper
+  include SimpleForm::ActionViewExtensions::FormHelper
+
+  # include ActiveSupport::Configurable
+  # include ActionController::RequestForgeryProtection # FIXME: this does NOT activate any protection.
+
+  def protect_against_forgery?
+    false
+  end
+
+  def show
+    render
+  end
+end

data/test/rails4.2/app/cells/song_cell.rb

@@ -1,2 +1,5 @@
 class SongCell < Cell::ViewModel
+  def show
+    "happy"
+  end
 end

data/test/rails4.2/app/controllers/songs_controller.rb

@@ -0,0 +1,9 @@
+class SongsController < ApplicationController
+  def show
+    # renders show.html.haml
+  end
+
+  def index
+    render text: cell(:song).()
+  end
+end

data/test/rails4.2/app/models/artist.rb

@@ -0,0 +1,25 @@
+class Artist
+  require "active_model"
+  include ActiveModel::Conversion
+  include ActiveModel::Naming
+
+  def persisted?
+    true
+  end
+
+  def parents
+    []
+  end
+
+  def name
+    "artist"
+  end
+
+  def id
+    1
+  end
+
+  # def artist
+  #   Artist.new
+  # end
+end

data/test/rails4.2/app/models/song.rb

@@ -0,0 +1,25 @@
+class Song
+  require "active_model"
+  include ActiveModel::Conversion
+  extend ActiveModel::Naming
+
+  def persisted?
+    true
+  end
+
+  def parents
+    []
+  end
+
+  def name
+    "song"
+  end
+
+  def id
+    1
+  end
+
+  def artist
+    Artist.new
+  end
+end

data/test/rails4.2/app/views/songs/show.html.erb

@@ -0,0 +1 @@
+<%= cell(:form_for) %>

data/test/rails4.2/config/routes.rb

@@ -1,4 +1,6 @@
 Rails.application.routes.draw do
   mount MyEngine::Engine => "/"
   root to: "index#index"
+
+  resources :songs
 end

data/test/rails4.2/engines/my_engine/my_engine.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]
 
   s.add_dependency "rails", "~> 4.2.1"
-  s.add_dependency "cells", "4.0.0.beta4"
+  s.add_dependency "cells", ">= 4.0.0.beta5"
   s.add_dependency "cells-erb"
 
   s.add_development_dependency "sqlite3"

data/test/rails4.2/test/integration/controller_test.rb

@@ -0,0 +1,12 @@
+require "test_helper"
+
+class ControllerTest < ActionController::TestCase
+  tests SongsController
+
+  # TODO: test url stuff in Song#show.
+  it do
+    get :index
+    response.body.must_equal "happy"
+  end
+
+end

data/test/rails4.2/test/integration/form_for_test.rb

@@ -0,0 +1,10 @@
+require "test_helper"
+
+class FormForTestTest < MiniTest::Spec
+  include Cell::Testing
+
+  it do
+    cell("form_for").().gsub(/\s\s/, "").must_equal %{<form class=\"edit_song\" id=\"edit_song_1\" action=\"/songs/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /> First <input type=\"text\" value=\"1\" name=\"song[id]\" id=\"song_id\" /><input type=\"text\" name=\"song[artist][id]\" id=\"song_artist_id\" />
+</form>}
+  end
+end

data/test/rails4.2/test/integration/formtastic_test.rb

@@ -0,0 +1,11 @@
+require "test_helper"
+
+class FormForTestTest < MiniTest::Spec
+  include Cell::Testing
+
+  it do
+    cell("formtastic").().gsub(/\s\s/, "").must_equal %{<form novalidate=\"novalidate\" class=\"formtastic song\" id=\"edit_song_1\" action=\"/songs/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /> First <li class=\"string input required stringish\" id=\"song_id_input\"><label for=\"song_id\" class=\"label\">Id<abbr title=\"required\">*</abbr></label><input id=\"song_id\" type=\"text\" value=\"1\" name=\"song[id]\" /></li><li class=\"string input required stringish\" id=\"song_artist_id_input\"><label for=\"song_artist_id\" class=\"label\">Id<abbr title=\"required\">*</abbr></label><input id=\"song_artist_id\" type=\"text\" name=\"song[artist][id]\" /></li><fieldset class=\"actions\"><ol> <input type=\"submit\" name=\"commit\" value=\"Go!\" as=\"button\" class=\"btn btn-primary\" />
+</ol></fieldset>
+</form>}
+  end
+end

data/test/rails4.2/test/integration/simple_form_test.rb

@@ -0,0 +1,10 @@
+require "test_helper"
+
+class SimpleFormTest < MiniTest::Spec
+  include Cell::Testing
+
+  it do
+    cell("simple_form").().gsub(/\s\s/, "").must_equal %{<form class=\"simple_form edit_song\" id=\"edit_song_1\" action=\"/songs/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /> First <div class=\"input string required song_id\"><label class=\"string required\" for=\"song_id\"><abbr title=\"required\">*</abbr> Id</label><input class=\"string required\" required=\"required\" aria-required=\"true\" type=\"text\" value=\"1\" name=\"song[id]\" id=\"song_id\" /></div><div class=\"input string required song_artist_id\"><label class=\"string required\" for=\"song_artist_id\"><abbr title=\"required\">*</abbr> Id</label><input class=\"string required\" required=\"required\" aria-required=\"true\" type=\"text\" name=\"song[artist][id]\" id=\"song_artist_id\" /></div>
+</form>}
+  end
+end

data/test/rails4.2/test/integration/url_helper_test.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+
+class MusiciansController < ApplicationController
+end
+
+class UrlHelperTest < MiniTest::Spec
+  include Cell::Testing
+  controller MusiciansController
+
+  class Cell < Cell::ViewModel
+    def show
+      url_for(model)
+    end
+
+    def default_url_options
+      {host: "rails.sucks"}
+    end
+  end
+
+  let (:song_cell) { Cell.new(Song.new, controller: controller) }
+
+  # path helpers work in cell instance.
+  it { song_cell.songs_path.must_equal "/songs" }
+  it { song_cell.().must_equal "http://rails.sucks/songs/1" }
+end

data/test/render_test.rb

@@ -2,6 +2,7 @@ require 'test_helper'
 
 class SongCell < Cell::ViewModel
   self.view_paths = ['test/fixtures']
+  # include ::Cell::Erb
 
   def show
     render

data/test/templates_test.rb

@@ -5,10 +5,10 @@ class TemplatesTest < MiniTest::Spec
   Templates = Cell::Templates
 
   # existing.
-  it { Templates.new[['test/fixtures/bassist'], 'play', 'erb'].file.must_equal 'test/fixtures/bassist/play.erb' }
+  it { Templates.new[['test/fixtures/bassist'], 'play.erb', {template_class: Tilt}].file.must_equal 'test/fixtures/bassist/play.erb' }
 
   # not existing.
-  it { Templates.new[['test/fixtures/bassist'], 'not-here', 'erb'].must_equal nil }
+  it { Templates.new[['test/fixtures/bassist'], 'not-here.erb', {}].must_equal nil }
 
 
   # different caches for different classes
@@ -21,6 +21,7 @@ end
 class TemplatesCachingTest < MiniTest::Spec
   class SongCell < Cell::ViewModel
     self.view_paths = ['test/fixtures']
+    # include Cell::Erb
 
     def show
       render

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cells
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta5
+  version: 4.0.0.beta6
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber
@@ -230,18 +230,28 @@ files:
 - test/rails4.2/README.rdoc
 - test/rails4.2/Rakefile
 - test/rails4.2/app/assets/images/.keep
-- test/rails4.2/app/assets/stylesheets/application.css
+- test/rails4.2/app/assets/stylesheets/application.css.erb
+- test/rails4.2/app/cells/form_for/show.erb
+- test/rails4.2/app/cells/form_for_cell.rb
+- test/rails4.2/app/cells/formtastic/show.erb
+- test/rails4.2/app/cells/formtastic_cell.rb
+- test/rails4.2/app/cells/simple_form/show.erb
+- test/rails4.2/app/cells/simple_form_cell.rb
 - test/rails4.2/app/cells/song/song.css
 - test/rails4.2/app/cells/song_cell.rb
 - test/rails4.2/app/controllers/application_controller.rb
 - test/rails4.2/app/controllers/concerns/.keep
 - test/rails4.2/app/controllers/index_controller.rb
+- test/rails4.2/app/controllers/songs_controller.rb
 - test/rails4.2/app/helpers/application_helper.rb
 - test/rails4.2/app/mailers/.keep
 - test/rails4.2/app/models/.keep
+- test/rails4.2/app/models/artist.rb
 - test/rails4.2/app/models/concerns/.keep
+- test/rails4.2/app/models/song.rb
 - test/rails4.2/app/views/index/index.html.erb
 - test/rails4.2/app/views/layouts/application.html.erb
+- test/rails4.2/app/views/songs/show.html.erb
 - test/rails4.2/bin/bundle
 - test/rails4.2/bin/rails
 - test/rails4.2/bin/rake
@@ -299,6 +309,11 @@ files:
 - test/rails4.2/public/favicon.ico
 - test/rails4.2/public/robots.txt
 - test/rails4.2/test/integration/asset_pipeline_test.rb
+- test/rails4.2/test/integration/controller_test.rb
+- test/rails4.2/test/integration/form_for_test.rb
+- test/rails4.2/test/integration/formtastic_test.rb
+- test/rails4.2/test/integration/simple_form_test.rb
+- test/rails4.2/test/integration/url_helper_test.rb
 - test/rails4.2/test/test_helper.rb
 - test/rails4.2/vendor/assets/stylesheets/.keep
 - test/rails_extensions_test.rb
@@ -307,7 +322,6 @@ files:
 - test/test_case_test.rb
 - test/test_helper.rb
 - test/twin_test.rb
-- test/url_helper_test.rb
 homepage: https://github.com/apotonick/cells
 licenses:
 - MIT

data/test/url_helper_test.rb

@@ -1,16 +0,0 @@
-require 'test_helper'
-
-class MusiciansController < ApplicationController
-end
-
-class UrlHelperTest < MiniTest::Spec
-  controller MusiciansController
-
-  let (:song_cell) { SongCell.new(nil, controller: controller) }
-
-  class SongCell < Cell::ViewModel
-  end
-
-  # URL helpers work in cell instance.
-  it { song_cell.songs_path.must_equal "/songs" }
-end