cells 3.10.1 → 3.11.0

data/test/app/cells/record/views/show.erb

@@ -0,0 +1 @@
+Party on, <%= model %>!

data/test/app/cells/record/views/song.erb

@@ -0,0 +1 @@
+Lalala

data/test/app/cells/song/scale.haml

@@ -0,0 +1 @@
+A Minor!

data/test/cell_module_test.rb

@@ -61,7 +61,7 @@ class CellModuleTest < MiniTest::Spec
       end
     end
 
-    describe "create_cell_for" do
+    describe "cell_for" do
       it "call the cell's builders, eventually returning a different class" do
         class DrummerCell < BassistCell
           build do
@@ -69,11 +69,11 @@ class CellModuleTest < MiniTest::Spec
           end
         end
 
-        assert_instance_of BassistCell, Cell::Rails.create_cell_for("cell_module_test/drummer", :play, @controller)
+        assert_instance_of BassistCell, Cell::Rails.cell_for("cell_module_test/drummer", :play, @controller)
       end
     end
 
-    describe "#create_cell_for with #build" do
+    describe "#cell_for with #build" do
       before do
         @controller.class_eval do
           attr_accessor :bassist
@@ -95,13 +95,13 @@ class CellModuleTest < MiniTest::Spec
 
       it "execute the block in controller describe" do
         @controller.bassist = true
-        assert_is_a BassistCell,  Cell::Rails.create_cell_for(:musician, @controller)
+        assert_is_a BassistCell,  Cell::Rails.cell_for(:musician, @controller)
       end
 
       it "limit the builder to the receiving class" do
-        assert_is_a PianistCell,   Cell::Rails.create_cell_for(:pianist, @controller)   # don't inherit anything.
+        assert_is_a PianistCell,   Cell::Rails.cell_for(:pianist, @controller)   # don't inherit anything.
         @controller.bassist = true
-        assert_is_a BassistCell,   Cell::Rails.create_cell_for(:musician, @controller)
+        assert_is_a BassistCell,   Cell::Rails.cell_for(:musician, @controller)
       end
 
       it "chain build blocks and execute them by ORing them in the same order" do
@@ -113,13 +113,13 @@ class CellModuleTest < MiniTest::Spec
           UnknownCell # it never be executed.
         end
 
-        assert_is_a PianistCell, Cell::Rails.create_cell_for(:musician, @controller)  # bassist is false.
+        assert_is_a PianistCell, Cell::Rails.cell_for(:musician, @controller)  # bassist is false.
         @controller.bassist = true
-        assert_is_a BassistCell, Cell::Rails.create_cell_for(:musician, @controller)
+        assert_is_a BassistCell, Cell::Rails.cell_for(:musician, @controller)
       end
 
       it "use the original cell if no builder matches" do
-        assert_is_a MusicianCell, Cell::Rails.create_cell_for(:musician, @controller)  # bassist is false.
+        assert_is_a MusicianCell, Cell::Rails.cell_for(:musician, @controller)  # bassist is false.
       end
 
       it "stop at the first builder returning a valid cell" do
@@ -130,12 +130,12 @@ class CellModuleTest < MiniTest::Spec
         BassistCell.build do |opts|
           SingerCell if opts[:sing_the_song]
         end
-        assert_kind_of BassistCell, Cell::Rails.create_cell_for(:bassist, @controller, {})
-        assert_kind_of SingerCell,  Cell::Rails.create_cell_for(:bassist, @controller, {:sing_the_song => true})
+        assert_kind_of BassistCell, Cell::Rails.cell_for(:bassist, @controller, {})
+        assert_kind_of SingerCell,  Cell::Rails.cell_for(:bassist, @controller, {:sing_the_song => true})
       end
 
       it "create the original target class if no block matches" do
-        assert_kind_of PianistCell, Cell::Rails.create_cell_for(:pianist, @controller)
+        assert_kind_of PianistCell, Cell::Rails.cell_for(:pianist, @controller)
       end
 
       it "builders it return an empty array per default" do
@@ -143,11 +143,14 @@ class CellModuleTest < MiniTest::Spec
       end
     end
 
-    it "provide class_from_cell_name" do
-      assert_equal BassistCell, ::Cell::Rails.class_from_cell_name('bassist')
+    include ActiveSupport::Testing::Deprecation
+    it "deprecates class_from_cell_name" do
+      # assert_deprecated do
+        assert_equal BassistCell, ::Cell::Rails.send(:class_from_cell_name, 'bassist')
+      # end
     end
 
-    if Cell.rails3_0?
+    if Cell.rails_version.~("3.0")
       it "provide possible_paths_for_state" do
         assert_equal ["bad_guitarist/play", "bassist/play"], cell(:bad_guitarist).send(:possible_paths_for_state, :play)
       end
@@ -164,26 +167,4 @@ class CellModuleTest < MiniTest::Spec
       end
     end
   end
-
-  it "respond to #rails3_1_or_more?" do
-    if Rails::VERSION::MAJOR == 3
-      if Rails::VERSION::MINOR == 0
-        assert ! Cell.rails3_1_or_more?
-        assert Cell.rails3_0?
-      elsif Rails::VERSION::MINOR == 1
-        assert Cell.rails3_1_or_more?
-        assert ! Cell.rails3_0?
-      elsif Rails::VERSION::MINOR == 2
-        assert Cell.rails3_1_or_more?
-        assert ! Cell.rails3_0?
-      end
-    elsif Rails::VERSION::MAJOR == 4
-      if Rails::VERSION::MINOR == 0
-        assert ! Cell.rails3_1_or_more?
-        assert Cell.rails4_0?
-      elsif Rails::VERSION::MINOR == 1
-        assert Cell.rails4_1?
-      end
-    end
-  end
 end

data/test/cells_module_test.rb

@@ -16,7 +16,7 @@ class CellsModuleTest < MiniTest::Spec
           c.append_view_path "/road/to/nowhere"
         end
 
-        if Cell.rails3_2_or_more? or Cell.rails4_0? or Cell.rails4_1?
+        if Cell.rails_version >= ("3.2")
           assert_equal "/road/to/nowhere", Cell::Rails.view_paths.paths.last.to_s
         else
           assert_equal "/road/to/nowhere", Cell::Rails.view_paths.last.to_s

data/test/concept_generator_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+require 'generators/rails/concept_generator'
+
+class ConceptGeneratorTest < Rails::Generators::TestCase
+  destination File.join(Rails.root, "tmp")
+  setup :prepare_destination
+  tests ::Rails::Generators::ConceptGenerator
+
+  test "[erb] standard assets, show view" do
+    run_generator %w(Song)
+
+    assert_file "app/concepts/song/cell.rb", /class Song::Cell < Cell::Rails/
+    assert_file "app/concepts/song/cell.rb", /include Concept/
+    assert_file "app/concepts/song/cell.rb", /def show/
+    assert_file "app/concepts/song/views/show.erb", %r(app/concepts/song/views/show\.erb)
+  end
+
+  test "[haml] standard assets, show view" do
+    run_generator %w(Song -e haml)
+
+    assert_file "app/concepts/song/cell.rb", /class Song::Cell < Cell::Rails/
+    assert_file "app/concepts/song/cell.rb", /include Concept/
+    assert_file "app/concepts/song/cell.rb", /def show/
+    assert_file "app/concepts/song/views/show.haml", %r(app/concepts/song/views/show\.haml)
+  end
+end

data/test/concept_test.rb

@@ -0,0 +1,78 @@
+require 'test_helper'
+
+if Cell.rails_version >= 3.1
+  # Trailblazer style:
+  module Record
+    class Cell < Cell::Concept # cell("record")
+      def show
+        render # Party On, #{model}
+      end
+
+      # cell(:song, concept: :record)
+      class Song < self # cell("record/cell/song")
+        def show
+          render :view => :song#, :layout => "layout"
+          # TODO: test layout: .. in ViewModel
+        end
+
+        def show_with_layout
+          render :view => :song, :layout => "layout"
+        end
+      end
+
+      class Hit < ::Cell::Concept
+        inherit_views Record::Cell
+      end
+    end
+  end
+
+  # app/cells/comment/views
+  # app/cells/comment/form/views
+  # app/cells/comment/views/form inherit_views Comment::Cell, render form/show
+
+
+  class ConceptTest < MiniTest::Spec
+    include Cell::TestCase::TestMethods
+
+
+    describe "::controller_path" do
+      it { Record::Cell.new(@controller).controller_path.must_equal "record" }
+      it { Record::Cell::Song.new(@controller).controller_path.must_equal "record/song" }
+    end
+
+
+    describe "#_prefixes" do
+      it { Record::Cell.new(@controller)._prefixes.must_equal       ["record/views"] }
+      it { Record::Cell::Song.new(@controller)._prefixes.must_equal ["record/song/views", "record/views"] }
+      it { Record::Cell::Hit.new(@controller)._prefixes.must_equal  ["record/hit/views", "record/views"]  } # with inherit_views.
+    end
+
+    unless ::Cell.rails_version.~("3.0")
+      it { Record::Cell.new(@controller, "Wayne").render_state(:show).must_equal "Party on, Wayne!" }
+    end
+
+
+    describe "#cell" do
+      it { Cell::Concept.cell("record/cell", @controller).must_be_instance_of(      Record::Cell) }
+      it { Cell::Concept.cell("record/cell/song", @controller).must_be_instance_of  Record::Cell::Song }
+      # cell("song", concept: "record/compilation") # record/compilation/cell/song
+    end
+
+
+    describe "#render with :layout" do
+      it { Cell::Concept.cell("record/cell/song", @controller).show_with_layout.must_equal "<p>\nLalala\n</p>\n" }
+    end
+    describe "#render" do
+      it { Cell::Concept.cell("record/cell/song", @controller).show.must_equal "Lalala" }
+    end
+
+
+    # inheriting
+    it "inherit play.html.erb from BassistCell" do
+      BadGuitaristCell.class_eval do
+        def play; render; end
+      end
+      assert_equal "Doo", render_cell(:bad_guitarist, :play)
+    end
+  end
+end

data/test/dummy/Rakefile

@@ -4,4 +4,4 @@
 require File.expand_path('../config/application', __FILE__)
 require 'rake'
 
-Rails::Application.load_tasks
+Dummy::Application.load_tasks

data/test/dummy/app/assets/javascripts/application.js

@@ -0,0 +1,2 @@
+//= require album
+//= require songs

data/test/dummy/app/cells/album/assets/album.js

@@ -0,0 +1 @@
+var Album = {};

data/test/dummy/app/concepts/song/assets/songs.js

@@ -0,0 +1 @@
+var Songs = [];

data/test/dummy/config/application.rb

@@ -4,12 +4,8 @@ require "active_model/railtie"
 require "action_controller/railtie"
 require "action_view/railtie"
 
-Bundler.require
-
-
 require "cells"
-
-#require "rails_app"
+require "sprockets/railtie" if Cell.rails_version >= "3.1"
 
 module Dummy
   class Application < Rails::Application
@@ -17,7 +13,16 @@ module Dummy
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
-    
+
     config.cache_store = :memory_store
+    config.secret_token = "some secret phrase of at least 30 characters"
+
+    # enable asset pipeline as in development.
+    if Cell.rails_version >= "3.1"
+      config.assets.enabled = true
+      config.assets.compile = true
+
+      config.cells.with_assets = ["album", "song"]
+    end
   end
 end

data/test/dummy/label/label.gemspec

@@ -7,8 +7,8 @@ require "label/version"
 Gem::Specification.new do |s|
   s.name        = "label"
   s.version     = Label::VERSION
-  s.authors     = ["TODO: Your name"]
-  s.email       = ["TODO: Your email"]
+  s.authors     = ["Nick"]
+  s.email       = ["apotonick@gmail.com"]
   s.homepage    = "TODO"
   s.summary     = "TODO: Summary of Label."
   s.description = "TODO: Description of Label."

data/test/helper_test.rb

@@ -25,14 +25,14 @@ class HelperTest < MiniTest::Spec
       include ActionView::Helpers::AssetTagHelper
 
       def show
-        controller.config.relative_url_root = "" if Cell.rails3_0?
+        controller.config.relative_url_root = "" if Cell.rails_version.~("3.0")
         image_tag("no-more-the-meek.jpg")
       end
     end
 
     it "allows using helpers using #controller on instance level" do
       alt = "No-more-the-meek"
-      alt = "No more the meek" if Cell.rails4_0? or Cell.rails4_1?
+      alt = "No more the meek" if Cell.rails_version >= "4.0"
       assert_equal "<img alt=\"#{alt}\" src=\"/images/no-more-the-meek.jpg\" />", render_cell("helper_test/song", :show)
     end
   end

data/test/prefixes_test.rb

@@ -0,0 +1,75 @@
+require 'test_helper'
+
+class BassistCell::FenderCell < Cell::Rails
+end
+
+class BassistCell::IbanezCell < BassistCell
+end
+
+class PrefixesTest < MiniTest::Spec
+  include Cell::TestCase::TestMethods
+
+  class SingerCell < Cell::Base
+  end
+
+  class BackgroundVocalsCell < SingerCell
+  end
+
+  class ChorusCell < BackgroundVocalsCell
+  end
+
+  class GuitaristCell < SingerCell
+    def self._local_prefixes
+      ["stringer"]
+    end
+  end
+
+  class BassistCell < SingerCell
+    def self._local_prefixes
+      super + ["basser"]
+    end
+  end
+
+
+  describe "::controller_path" do
+    it { ::BassistCell.new(@controller).controller_path.must_equal "bassist" }
+    it { SingerCell.new(@controller).controller_path.must_equal "prefixes_test/singer" }
+  end
+
+  describe "#_prefixes" do
+    it { ::BassistCell.new(@controller)._prefixes.must_equal  ["bassist"] }
+    it { ::BassistCell::FenderCell.new(@controller)._prefixes.must_equal ["bassist_cell/fender"] }
+    it { ::BassistCell::IbanezCell.new(@controller)._prefixes.must_equal ["bassist_cell/ibanez", "bassist"] }
+
+    it { SingerCell.new(@controller)._prefixes.must_equal   ["prefixes_test/singer"] }
+    it { BackgroundVocalsCell.new(@controller)._prefixes.must_equal ["prefixes_test/background_vocals", "prefixes_test/singer"] }
+    it { ChorusCell.new(@controller)._prefixes.must_equal   ["prefixes_test/chorus", "prefixes_test/background_vocals", "prefixes_test/singer"] }
+
+    it { GuitaristCell.new(@controller)._prefixes.must_equal ["stringer", "prefixes_test/singer"] }
+    it { BassistCell.new(@controller)._prefixes.must_equal ["prefixes_test/bassist", "basser", "prefixes_test/singer"] }
+    # it { DrummerCell.new(@controller)._prefixes.must_equal ["drummer", "stringer", "prefixes_test/singer"] }
+  end
+
+  # it { Record::Cell.new(@controller).render_state(:show).must_equal "Rock on!" }
+end
+
+class InheritViewsTest < MiniTest::Spec
+  include Cell::TestCase::TestMethods
+
+  class SlapperCell < Cell::Rails
+    inherit_views ::BassistCell
+
+    def play
+      render
+    end
+  end
+
+  class FunkerCell < SlapperCell
+  end
+
+  unless ::Cell.rails_version.~("3.0")
+    # test if normal cells inherit views.
+    it { cell("inherit_views_test/slapper").render_state(:play).must_equal "Doo" }
+    it { cell("inherit_views_test/funker").render_state(:play).must_equal "Doo" }
+  end
+end

data/test/rails/asset_pipeline_test.rb

@@ -0,0 +1,20 @@
+require "test_helper"
+require "capybara/rails"
+
+# This blog post helped so much: http://rakeroutes.com/blog/write-a-gem-for-the-rails-asset-pipeline/
+# Thanks, Stephen!!! :)
+
+if Cell.rails_version >= 3.1
+
+  class AssetPipelineTest < MiniTest::Spec
+    include Capybara::DSL
+    register_spec_type(/integration$/, self)
+
+    it "what" do
+      visit "assets/application.js"
+      page.text.must_include 'var Album = {};'
+      page.text.must_include 'var Songs = [];'
+    end
+  end
+
+end

data/test/rails/caching_test.rb

@@ -38,7 +38,7 @@ class CachingUnitTest < MiniTest::Spec
     end
 
     it "accept hash as key parts" do
-      if Cell.rails4_0? or Cell.rails4_1?
+      if Cell.rails_version >= ("4.0")
         assert_equal "cells/director/count/b/2/a/1", @class.state_cache_key(:count, :b=>2, :a=>1)
       else
         assert_equal "cells/director/count/a=1&b=2", @class.state_cache_key(:count, :b=>2, :a=>1)
@@ -149,14 +149,6 @@ class CachingUnitTest < MiniTest::Spec
       assert_equal "1", @class.cache_store.read(@key)
       assert_not ::Cell::Rails.cache_store.read(key)
     end
-
-    include ActiveSupport::Testing::Deprecation
-    it "raise a deprecation notice when passing in a :symbol" do
-      assert_deprecated do
-        MusicianController.new.expire_cell_state(:director, :tock)
-      end
-      assert_not @class.cache_store.read(@key)
-    end
   end
 end
 

data/test/rails/cells_test.rb

@@ -47,21 +47,6 @@ class RailsCellsTest < MiniTest::Spec
 
 
   describe "A rails cell" do
-    it "respond to DEFAULT_VIEW_PATHS" do
-      assert_equal ["app/cells"], Cell::Rails::DEFAULT_VIEW_PATHS
-    end
-
-    it "respond to .setup_view_paths!" do
-      swap( Cell::Rails, :view_paths => [])  do
-        Cell::Rails.setup_view_paths!
-        if Cell.rails3_2_or_more? or Cell.rails4_0? or Cell.rails4_1?
-          assert_equal ActionView::PathSet.new(Cell::Rails::DEFAULT_VIEW_PATHS).paths, Cell::Rails.view_paths.paths
-        else
-          assert_equal ActionView::PathSet.new(Cell::Rails::DEFAULT_VIEW_PATHS), Cell::Rails.view_paths
-        end
-      end
-    end
-
     it "respond to view_paths" do
       assert_kind_of ActionView::PathSet, Cell::Rails.view_paths, "must be a PathSet for proper template caching/reloading (see issue#2)"
     end
@@ -81,7 +66,7 @@ class RailsCellsTest < MiniTest::Spec
     end
 
 
-    if Cell.rails3_0?
+    if Cell.rails_version.~("3.0")
       describe "invoking find_family_view_for_state" do
         it "raise an error when a template is missing" do
           assert_raises ActionView::MissingTemplate do
@@ -118,7 +103,7 @@ class RailsCellsTest < MiniTest::Spec
 
       it "respond to session" do
         session_kind = Hash
-        session_kind = ActionController::TestSession if Cell.rails4_0? or Cell.rails4_1?
+        session_kind = ActionController::TestSession if Cell.rails_version >= ("4.0")
         assert_kind_of session_kind, @cell.session
       end