cells 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 594c3ef475df5cd6314031f24fb23547dbfb83bd
-  data.tar.gz: 44c82d7a1ef65bee33d4f4ff5c6500e92c7fba17
+  metadata.gz: 564e33d0ca30ee7280dd4362eca2cf8f57298836
+  data.tar.gz: 3178f06f6211191be74553cf806ae98f5e3017b9
 SHA512:
-  metadata.gz: cfb07287f0368594d464bab2850e0bd750c5366cd5658e0f23ace4654a1971a2352d9344c91ff9d7024b772df9a25db65788a95f9bc8ff220a9d41b1ca7ecbb8
-  data.tar.gz: 126977b1b2887691aaa13863de4f53404f38f0819a518f5acb74c5d6eb6c2d98fb9100ffa47d4a8a42d255cf8d8f0cba24009902fc869315a7a5cde427a04643
+  metadata.gz: af0bdc4bf3a5c1b69e94ca1527cc476f836f309eff8d607645204f37cbabe86f612423ba25706328a3f7655dcee054fb575b96a9f9595ee7eada52fb61d4f569
+  data.tar.gz: 41098667ace56a3ce85bf588577c7ef7e7e3567804ea64d3df316d48d78b0855f3f32ef81774d075586c24c2ec9d23ddcce0e483708c83ddb9966a1d14a1b5d3

data/.travis.yml

@@ -1,10 +1,8 @@
 language: ruby
 rvm:
-  - ruby-head
-  # - 2.3
-  - 2.2
-  - 2.1
-  - 2.0
+  #- ruby-head
+  - 2.3.1
+  - 2.2.2
 
 sudo: false
 cache: bundler

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 4.1.2
+
+* Testing with Rails 5 now works, by removing code the last piece of Rails-code (I know, it sounds bizarre).
+
 ## 4.1.1
 
 * Fix rendering of `Collection` where in some environments (Rails), the overridden `#call` method wouldn't work and strings would be escaped.

data/README.md

@@ -149,7 +149,7 @@ It is completely up to you how you test, whether it's RSpec, MiniTest or whateve
 
 ## Properties
 
-The cell's model is available via the `model` reader. You can have automatic readers to the model's fields by uing `::property`.
+The cell's model is available via the `model` reader. You can have automatic readers to the model's fields by using `::property`.
 
 ```ruby
 class CommentCell < Cell::ViewModel
@@ -349,22 +349,14 @@ comments = Comment.all #=> three comments.
 cell(:comment, collection: comments).()
 ```
 
-This will invoke `cell(:comment, comment).()` three times and concatenate the rendered output automatically. In case you don't want `show` but another state rendered, pass the `:method` name to `call`.
+This will invoke `cell(:comment, comment).()` three times and concatenate the rendered output automatically.
 
-```ruby
-cell(:comment, collection: comments).(:list)
-```
-Additional options are passed to every cell constructor.
+Learn more [about collections here](http://trailblazer.to/gems/cells/api.html#collection).
 
-```ruby
-cell(:comment, collection: comments, style: "awesome", volume: "loud").()
-```
 
 ## Builder
 
-Often, it is good practice to replace decider code from views or classes into separate sub-cells. Or in case you want to render a polymorphic collection, builders come in handy.
-
-Builders allow instantiating different cell classes for different models and options.
+Builders allow instantiating different cell classes for different models and options. They introduce polymorphism into cells.
 
 ```ruby
 class CommentCell < Cell::ViewModel
@@ -380,14 +372,7 @@ The `#cell` helper takes care of instantiating the right cell class for you.
 cell(:comment, Post.find(1)) #=> creates a PostCell.
 ```
 
-This also works with collections.
-
-```ruby
-cell(:comment, collection: [@post, @comment]) #=> renders PostCell, then CommentCell.
-```
-
-Multiple calls to `::builds` will be ORed. If no block returns a class, the original class will be used (`CommentCell`). Builders are inherited.
-
+Learn more [about builders here](http://trailblazer.to/gems/cells/api.html#builder).
 
 ## Caching
 

data/Rakefile

@@ -10,6 +10,10 @@ Rake::TestTask.new(:test) do |test|
   test.libs << 'test'
   test.pattern = 'test/*_test.rb'
   test.verbose = true
+  # Ruby built-in warnings contain way too much noise to be useful. Consider turning them on again when the following issues are accepted in ruby:
+  # * https://bugs.ruby-lang.org/issues/10967 (remove warning: private attribute?)
+  # * https://bugs.ruby-lang.org/issues/12299 (customized warning handling)
+  test.warning = false
 end
 
 # Rake::TestTask.new(:rails) do |test|
@@ -21,4 +25,4 @@ end
 # rails_task = Rake::Task["rails"]
 # test_task = Rake::Task["test"]
 # default_task.enhance { test_task.invoke }
-# default_task.enhance { rails_task.invoke }
+# default_task.enhance { rails_task.invoke }

data/lib/cell/collection.rb

@@ -2,25 +2,23 @@ module Cell
   class Collection
     def initialize(ary, options, cell_class)
       options.delete(:collection)
-      @method     = options.delete(:method)           # TODO: remove in 5.0.
-      @join       = options.delete(:collection_join)  # TODO: remove in 5.0.
+      set_deprecated_options(options) # TODO: remove in 5.0.
 
       @ary        = ary
       @options    = options
       @cell_class = cell_class
-
-      deprecate_options!
     end
 
-    def deprecate_options! # TODO: remove in 5.0.
-      warn "[Cells] The :method option is deprecated. Please use `call(method)` as documented here: http://trailblazer.to/gems/cells/api.html#collection" if @method
-      warn "[Cells] The :collection_join option is deprecated. Please use `join(\"<br>\")` as documented here: http://trailblazer.to/gems/cells/api.html#collection" if @collection_join
+    def set_deprecated_options(options) # TODO: remove in 5.0.
+      self.method = options.delete(:method)                   if options.include?(:method)
+      self.collection_join = options.delete(:collection_join) if options.include?(:collection_join)
     end
 
     module Call
       def call(state=:show)
-        join(@join) { |cell, i| cell.(@method || state) }
+        join(collection_join) { |cell, i| cell.(method || state) }
       end
+
     end
     include Call
 
@@ -48,6 +46,13 @@ module Cell
     end
     include Layout
 
+    # TODO: remove in 5.0.
+    private
+    attr_accessor :collection_join, :method
+
+    extend Gem::Deprecate
+    deprecate :method=, "`call(method)` as documented here: http://trailblazer.to/gems/cells/api.html#collection", 2016, 7
+    deprecate :collection_join=, "`join(\"<br>\")` as documented here: http://trailblazer.to/gems/cells/api.html#collection", 2016, 7
   end
 end
 

data/lib/cell/templates.rb

@@ -21,7 +21,7 @@ module Cell
 
     def create(prefix, view, options)
       # puts "...checking #{prefix}/#{view}"
-      return unless File.exists?("#{prefix}/#{view}") # DISCUSS: can we use Tilt.new here?
+      return unless File.exist?("#{prefix}/#{view}") # DISCUSS: can we use Tilt.new here?
 
       template_class = options.delete(:template_class)
       template_class.new("#{prefix}/#{view}", options) # Tilt.new()

data/lib/cell/testing.rb

@@ -46,17 +46,13 @@ module Cell
       end
     end
 
-
-    # Rails specific.
-    def controller_for(controller_class)
-      # TODO: test without controller.
-      return unless controller_class
-
-      controller_class.new.tap do |ctl|
-        ctl.request = ::ActionController::TestRequest.new
-        ctl.instance_variable_set :@routes, ::Rails.application.routes.url_helpers
+    module ControllerFor
+      # This method is provided by the cells-rails gem.
+      def controller_for(controller_class)
+        # raise "[Cells] Please install (or update?) the cells-rails gem."
       end
     end
+    include ControllerFor
 
     def controller # FIXME: this won't allow us using let(:controller) in MiniTest.
       controller_for(self.class.controller_class)
@@ -72,6 +68,5 @@ module Cell
         end
       end
     end
-
-  end
+  end # Testing
 end

data/lib/cell/util.rb

@@ -15,11 +15,11 @@ module Cell::Util
 
     # WARNING: this API might change.
     def self.constant_for(name)
-      constant = Object
-      name.split("/").each do |part|
-        constant = constant.const_get(part.split('_').collect(&:capitalize).join)
-      end
-      constant
+      class_name = name.split("/").collect do |part|
+        part.split('_').collect(&:capitalize).join
+      end.join('::')
+      
+      Object.const_get(class_name)
     end
   end
 end

data/lib/cell/version.rb

@@ -1,3 +1,3 @@
 module Cell
-  VERSION = "4.1.1"
+  VERSION = "4.1.2"
 end

data/test/concept_test.rb

@@ -79,7 +79,9 @@ class ConceptTest < MiniTest::Spec
     it { Cell::Concept.cell("record/cell", nil, context: { controller: Object }).cell("record/cell", nil).must_be_instance_of Record::Cell }
     it { Cell::Concept.cell("record/cell", nil, context: { controller: Object }).concept("record/cell", nil, tracks: 24).(:description).must_equal "A Tribute To Rancid, with 24 songs! [{:controller=>Object}]" }
     # concept(.., collection: ..)
-    it { Cell::Concept.cell("record/cell", nil, context: { controller: Object }).
-      concept("record/cell", collection: [1,2], tracks: 24, method: :description).().must_equal "A Tribute To Rancid, with 24 songs! [{:controller=>Object}]A Tribute To Rancid, with 24 songs! [{:controller=>Object}]" }
+    it do
+      Cell::Concept.cell("record/cell", nil, context: { controller: Object }).
+        concept("record/cell", collection: [1,2], tracks: 24).(:description).must_equal "A Tribute To Rancid, with 24 songs! [{:controller=>Object}]A Tribute To Rancid, with 24 songs! [{:controller=>Object}]" 
+    end
   end
 end

data/test/public_test.rb

@@ -34,15 +34,26 @@ class PublicTest < MiniTest::Spec
   # ViewModel.cell(collection: []) renders cells.
   it { Cell::ViewModel.cell("public_test/song", collection: [Object, Module]).to_s.must_equal '[Object, {}][Module, {}]' }
 
+  # DISCUSS: should cell.() be the default?
   # ViewModel.cell(collection: []) renders cells with custom join.
-  it { Cell::ViewModel.cell("public_test/song", collection: [Object, Module], collection_join: '<br/>').to_s.must_equal '[Object, {}]<br/>[Module, {}]' }
+  it do
+    Gem::Deprecate::skip_during do
+      Cell::ViewModel.cell("public_test/song", collection: [Object, Module]).join('<br/>') do |cell|
+          cell.()
+      end.must_equal '[Object, {}]<br/>[Module, {}]'
+    end
+  end
 
   # ViewModel.cell(collection: []) passes generic options to cell.
   it { Cell::ViewModel.cell("public_test/song", collection: [Object, Module], genre: 'Metal', context: { ready: true }).to_s.must_equal "[Object, {:genre=>\"Metal\", :context=>{:ready=>true}}][Module, {:genre=>\"Metal\", :context=>{:ready=>true}}]" }
 
   # ViewModel.cell(collection: [], method: :detail) invokes #detail instead of #show.
   # TODO: remove in 5.0.
-  it { Cell::ViewModel.cell("public_test/song", collection: [Object, Module], method: :detail).to_s.must_equal '* [Object, {}]* [Module, {}]' }
+  it do
+    Gem::Deprecate::skip_during do
+      Cell::ViewModel.cell("public_test/song", collection: [Object, Module], method: :detail).to_s.must_equal '* [Object, {}]* [Module, {}]'
+    end
+  end
 
   # ViewModel.cell(collection: []).() invokes #show.
   it { Cell::ViewModel.cell("public_test/song", collection: [Object, Module]).().must_equal '[Object, {}][Module, {}]' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cells
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-08 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber