cells 4.0.0.beta6 → 4.0.0.rc1

data/cells.gemspec

@@ -21,12 +21,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "uber",        "~> 0.0.9"
   spec.add_dependency 'tilt', '>= 1.4', '< 3'
-  spec.add_dependency 'disposable', '~> 0.0.8'
-
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest-reporters"
   spec.add_development_dependency "capybara"
 
-  spec.add_development_dependency "cells-erb", ">= 0.0.2"
+  spec.add_development_dependency "cells-erb", ">= 0.0.4"
 end

data/lib/cell/caching.rb

@@ -43,6 +43,7 @@ module Cell
 
 
     def render_state(state, *args)
+      state = state.to_sym
       return super(state, *args) unless cache?(state, *args)
 
       key     = self.class.state_cache_key(state, self.class.version_procs[state].evaluate(self, *args))

data/lib/cell/rails.rb

@@ -34,6 +34,13 @@ module Cell
     module ViewModel
       extend ActiveSupport::Concern
 
+      # DISCUSS: who actually uses forgery protection with cells? it is not working since 4, anyway?
+      # include ActionController::RequestForgeryProtection
+      included do
+        extend Uber::Delegates
+        delegates :parent_controller, :session, :params, :request, :config, :env, :url_options
+      end
+
       def call(*)
         super.html_safe
       end

data/lib/cell/railtie.rb

@@ -11,10 +11,6 @@ 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
-
     # ruthlessly stolen from the zurb-foundation gem.
     initializer 'cells.update_asset_paths' do |app|
       Array(app.config.cells.with_assets).each do |cell_class|
@@ -38,7 +34,7 @@ module Cell
     end
 
     initializer "cells.include_default_helpers" do
-      #include assert helpers (image_path, font_path, ect)
+      # include asset helpers (image_path, font_path, ect)
       ViewModel.class_eval do
         include ActionView::Helpers::UrlHelper
         include ::Cell::RailsExtensions::HelpersAreShit
@@ -58,6 +54,7 @@ module Cell
       ViewModel.send(:include, Cell::Haml) if Cell.const_defined?(:Haml)
       ViewModel.send(:include, Cell::Slim) if Cell.const_defined?(:Slim)
     end
+    #   ViewModel.template_engine = app.config.app_generators.rails.fetch(:template_engine, 'erb').to_s
 
     initializer('cells.development') do |app|
       if Rails.env == "development"

data/lib/cell/version.rb

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

data/lib/cell/view_model.rb

@@ -1,9 +1,3 @@
-# no helper_method calls
-# no instance variables
-# no locals
-# options are automatically made instance methods via constructor.
-# call "helpers" in class
-
 # TODO: warn when using ::property but not passing in model in constructor.
 module Cell
   class ViewModel
@@ -36,29 +30,21 @@ module Cell
       @controller_path ||= util.underscore(name.sub(/Cell$/, ''))
     end
 
-    # FIXME: this is all rails-only.
-    # DISCUSS: who actually uses forgery protection with cells? it is not working since 4, anyway?
-    # include ActionController::RequestForgeryProtection
-    delegates :parent_controller, :session, :params, :request, :config, :env, :url_options
-
     attr_reader :model
 
 
     module Helpers
+      # Constantizes name, call builders and returns instance.
+      def cell(name, *args, &block) # classic Rails fuzzy API.
+        class_from_cell_name(name).(*args, &block)
+      end
+
+    private
       # Renders collection of cells.
-      def _collection(name, array, options) # private.
+      def render_collection(array, options) # private.
         method = options.delete(:method) || :show
         join   = options.delete(:collection_join)
-        array.collect { |model| cell_for(name, *[model, options]).call(method) }.join(join).html_safe
-      end
-
-      # Returns cell instance.
-      def cell(name, model=nil, options={}, &block) # classic Rails fuzzy API.
-        if model.is_a?(Hash) and array = model.delete(:collection)
-          return _collection(name, array, model.merge(options))
-        end
-
-        cell_for(name, model, options, &block)
+        array.collect { |model| build(*[model, options]).call(method) }.join(join).html_safe
       end
     end
     extend Helpers
@@ -71,18 +57,25 @@ module Cell
 
       include Helpers
 
-      # DISCUSS: introduce ::for which takes constant? rename ::build_cell to ::build?
+      # Public entry point. Use this to instantiate cells with builders.
+      #
+      #   SongCell.(@song)
+      #   SongCell.(collection: Song.all)
+      def call(model=nil, options={}, &block)
+        if model.is_a?(Hash) and array = model.delete(:collection)
+          return render_collection(array, model.merge(options))
+        end
 
-      def cell_for(name, *args)
-        class_from_cell_name(name).build_cell(*args)
+        build(model, options)
       end
 
-      def class_from_cell_name(name)
-        "#{name}_cell".classify.constantize
+      def build(*args) # semi-public.
+        class_builder.call(*args).new(*args) # Uber::Builder::class_builder.
       end
 
-      def build_cell(*args)
-        class_builder.call(*args).new(*args) # Uber::Builder::class_builder.
+    private
+      def class_from_cell_name(name)
+        "#{name}_cell".classify.constantize
       end
     end
 
@@ -185,10 +178,11 @@ module Cell
     module TemplateFor
       def find_template(options)
         template_options = template_options_for(options) # imported by Erb, Haml, etc.
+        # required options: :template_class, :suffix. everything else is passed to the template implementation.
 
         view      = options[:view]
         prefixes  = options[:prefixes]
-        suffix    = template_options[:suffix]
+        suffix    = template_options.delete(:suffix)
         view      = "#{view}.#{suffix}"
 
         template_for(prefixes, view, template_options) or raise TemplateMissingError.new(prefixes, view)

data/test/builder_test.rb

@@ -34,25 +34,28 @@ class BuilderTest < MiniTest::Spec
   end
 
   # the original class is used when no builder matches.
-  it { Cell::ViewModel.cell("builder_test/song", Song.new("Nation States"), {}).must_be_instance_of BuilderTest::SongCell }
+  it { SongCell.(Song.new("Nation States"), {}).must_be_instance_of SongCell }
 
   it do
-    cell = Cell::ViewModel.cell("builder_test/song", Hit.new("New York"), {})
-    cell.must_be_instance_of BuilderTest::HitCell
+    cell = SongCell.(Hit.new("New York"), {})
+    cell.must_be_instance_of HitCell
     cell.options.must_equal({})
   end
 
   it do
-    cell = Cell::ViewModel.cell("builder_test/song", Song.new("San Francisco"), evergreen: true)
-    cell.must_be_instance_of BuilderTest::EvergreenCell
+    cell = SongCell.(Song.new("San Francisco"), evergreen: true)
+    cell.must_be_instance_of EvergreenCell
     cell.options.must_equal({:evergreen=>true})
   end
 
+  # without arguments.
+  it { SongCell.(Hit.new("Frenzy")).must_be_instance_of HitCell }
+
   # with collection.
-  it { Cell::ViewModel.cell("builder_test/song", collection: [Song.new("Nation States"), Hit.new("New York")]).must_equal "* Nation States* **New York**" }
+  it { SongCell.(collection: [Song.new("Nation States"), Hit.new("New York")]).must_equal "* Nation States* **New York**" }
 
   # with Concept
   class Track < Cell::Concept
   end
-  it { Cell::Concept.cell("builder_test/track").must_be_instance_of Track }
+  it { Track.().must_be_instance_of Track }
 end

data/test/caching_test.rb

@@ -140,91 +140,98 @@ class CachingTest < MiniTest::Spec
   end
 
   # let (:cell) { DirectorCell.new(nil) }
-  def cellule(*args)
+  def director_cell(*args)
     DirectorCell.new(*args)
   end
 
   # no caching when turned off.
   it do
-    cellule.class.cache :show
+    director_cell.class.cache :show
     ActionController::Base.perform_caching = false
 
-    cellule(1).call.must_equal "1"
-    cellule(2).call.must_equal "2"
+    director_cell(1).call.must_equal "1"
+    director_cell(2).call.must_equal "2"
   end
 
   # cache forever when no options.
   it do
-    cellule.class.cache :show
-    cellule(1).call.must_equal "1"
-    cellule(2).call.must_equal "1"
+    director_cell.class.cache :show
+    director_cell(1).call.must_equal "1"
+    director_cell(2).call.must_equal "1"
+  end
+
+   # caches with string state name.
+  it do
+    director_cell.class.cache :show
+    director_cell(1).("show").must_equal "1"
+    director_cell(2).("show").must_equal "1"
   end
 
 
   # no caching when state not configured.
   it do
-    cellule.class.class_eval do
+    director_cell.class.class_eval do
       def dictate
         @counter
       end
     end
 
-    cellule(1).call(:dictate).must_equal "1"
-    cellule(2).call(:dictate).must_equal "2"
+    director_cell(1).call(:dictate).must_equal "1"
+    director_cell(2).call(:dictate).must_equal "2"
   end
 
   # compute key with cell properties from #initialize.
   it do
-    cellule.class.cache :show do
+    director_cell.class.cache :show do
       @counter < 3 ? {:count => "<"} : {:count => ">"}
     end
 
-    cellule(1).call.must_equal "1"
-    cellule(2).call.must_equal "1"
-    cellule(3).call.must_equal "3"
-    cellule(4).call.must_equal "3"
+    director_cell(1).call.must_equal "1"
+    director_cell(2).call.must_equal "1"
+    director_cell(3).call.must_equal "3"
+    director_cell(4).call.must_equal "3"
   end
 
   # compute key with instance method
   it do
-    cellule.class.cache :show, :version
-    cellule.class.class_eval do
+    director_cell.class.cache :show, :version
+    director_cell.class.class_eval do
       def version
         @counter < 3 ? {:count => "<"} : {:count => ">"}
       end
     end
 
-    cellule(1).call.must_equal "1"
-    cellule(2).call.must_equal "1"
-    cellule(3).call.must_equal "3"
-    cellule(4).call.must_equal "3"
+    director_cell(1).call.must_equal "1"
+    director_cell(2).call.must_equal "1"
+    director_cell(3).call.must_equal "3"
+    director_cell(4).call.must_equal "3"
   end
 
   # allow returning strings for key
   it do
-    cellule.class.cache :show do
+    director_cell.class.cache :show do
       @counter < 3 ? "<" : ">"
     end
 
-    cellule(1).call.must_equal "1"
-    cellule(2).call.must_equal "1"
-    cellule(3).call.must_equal "3"
-    cellule(4).call.must_equal "3"
+    director_cell(1).call.must_equal "1"
+    director_cell(2).call.must_equal "1"
+    director_cell(3).call.must_equal "3"
+    director_cell(4).call.must_equal "3"
   end
 
   # allows conditional ifs.
   it do
-    cellule.class.cache :show, if: lambda { @counter < 3 }
+    director_cell.class.cache :show, if: lambda { @counter < 3 }
 
-    cellule(1).call.must_equal "1"
-    cellule(2).call.must_equal "1"
-    cellule(3).call.must_equal "3"
-    cellule(4).call.must_equal "4"
+    director_cell(1).call.must_equal "1"
+    director_cell(2).call.must_equal "1"
+    director_cell(3).call.must_equal "3"
+    director_cell(4).call.must_equal "4"
   end
 
   # allows conditional ifs with instance method.
   it do
-    cellule.class.class_eval do
+    director_cell.class.class_eval do
       cache :show, if: :smaller?
 
       def smaller?
@@ -232,22 +239,22 @@ class CachingTest < MiniTest::Spec
       end
     end
 
-    cellule(1).call.must_equal "1"
-    cellule(2).call.must_equal "1"
-    cellule(3).call.must_equal "3"
-    cellule(4).call.must_equal "4"
+    director_cell(1).call.must_equal "1"
+    director_cell(2).call.must_equal "1"
+    director_cell(3).call.must_equal "3"
+    director_cell(4).call.must_equal "4"
   end
 
 
   unless ::ActionPack::VERSION::MAJOR == 3 and ::ActionPack::VERSION::MINOR >= 2 # bug in 3.2.
     describe "utf-8" do
       before do
-        @key = cellule.class.state_cache_key(:utf8)
+        @key = director_cell.class.state_cache_key(:utf8)
       end
 
       it "has the correct encoding when reading from cache" do
-        assert_equal "UTF-8", cellule.call(:utf8).encoding.to_s
-        assert_equal "UTF-8", cellule.cache_store.read(@key).encoding.to_s
+        assert_equal "UTF-8", director_cell.call(:utf8).encoding.to_s
+        assert_equal "UTF-8", director_cell.cache_store.read(@key).encoding.to_s
       end
     end
   end
@@ -264,7 +271,7 @@ class CachingTest < MiniTest::Spec
   end
 
   it do
-    cellule = self.cellule
+    cellule = self.director_cell
 
     cellule.instance_eval do
       def cache_store;

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

@@ -2,4 +2,11 @@ class SongCell < Cell::ViewModel
   def show
     "happy"
   end
+
+  # include ActionView::Helpers::AssetUrlHelper
+  # include Sprockets::Rails::Helper
+
+  # self.assets_prefix = Rails.application.config.assets.prefix
+  # self.assets_environment = Rails.application.assets
+  # self.digest_assets = Rails.application.config.assets[:digest]
 end

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

@@ -6,4 +6,12 @@ class SongsController < ApplicationController
   def index
     render text: cell(:song).()
   end
+
+  def new
+    render text: cell(:song).url_for(Song.new)
+  end
+
+  def edit
+    render text: cell(:song).video_path(1)
+  end
 end

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

@@ -2,6 +2,7 @@ require "test_helper"
 
 class FormForTestTest < MiniTest::Spec
   include Cell::Testing
+  controller SongsController # provides #url_options.
 
   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\" />

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

@@ -2,6 +2,7 @@ require "test_helper"
 
 class SimpleFormTest < MiniTest::Spec
   include Cell::Testing
+  controller SongsController # provides #url_options.
 
   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>

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

@@ -11,15 +11,26 @@ class UrlHelperTest < MiniTest::Spec
     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" }
+  it { song_cell.().must_equal "http://test.host/songs/1" }
 end
+
+
+class UrlTest < ActionDispatch::IntegrationTest
+  include ::Capybara::DSL
+
+  it do
+    visit "/songs/new" # cell.url_for(Song.new)
+    page.text.must_equal "http://www.example.com/songs/1"
+  end
+
+  # it do
+  #   visit "/songs/1/edit"
+  #   page.text.must_equal "http://www.example.com/songs/1"
+  # end
+end