Fix ArgumentError: wrong number of arguments for Cell::Testing

.github/workflows/ci.yml

@@ -0,0 +1,17 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
+        ruby: [2.5, 2.6, 2.7, '3.0', 3.1, 3.2, head]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - run: bundle exec rake

CHANGES.md

@@ -1,3 +1,11 @@
+## 4.5.0
+
+* Drop support for rubies prior 2.2.10
+
+## 4.1.8
+
+* Fix ruby warning with undefined instance variable in codebase
+
 ## 4.1.7
 
 * `Collection#join` can now be called without a block.

Gemfile

@@ -1,10 +1,14 @@
 source "https://rubygems.org"
 
-gem "minitest", "~> 5.2"
-gem "cells-erb"#, path: "../cells-erb"
 gem "benchmark-ips"
 gem "minitest-line"
 
 gemspec
 
-# gem "uber", path: "../uber"
+case ENV["GEMS_SOURCE"]
+  when "local"
+    gem "cells-erb", path: "../cells-erb"
+  # gem "erbse", path: "../erbse"
+  when "github"
+    gem "cells-erb", github: "trailblazer/cells-erb"
+end

README.md

@@ -2,23 +2,23 @@
 
 *View Components for Ruby and Rails.*
 
-[![Gitter Chat](https://badges.gitter.im/trailblazer/chat.svg)](https://gitter.im/trailblazer/chat)
-[![TRB Newsletter](https://img.shields.io/badge/TRB-newsletter-lightgrey.svg)](http://trailblazer.to/newsletter/)
+[![Zulip Chat](https://badges.gitter.im/trailblazer/chat.svg)](https://trailblazer.zulipchat.com/login/)
+[![TRB Newsletter](https://img.shields.io/badge/TRB-newsletter-lightgrey.svg)](https://trailblazer.to/2.0/newsletter.html)
 [![Build
-Status](https://travis-ci.org/apotonick/cells.svg)](https://travis-ci.org/apotonick/cells)
+Status](https://travis-ci.org/trailblazer/cells.svg)](https://travis-ci.org/trailblazer/cells)
 [![Gem Version](https://badge.fury.io/rb/cells.svg)](http://badge.fury.io/rb/cells)
 
 ## Overview
 
 Cells allow you to encapsulate parts of your UI into components into _view models_. View models, or cells, are simple ruby classes that can render templates.
 
-Nevertheless, a cell gives you more than just a template renderer. They allow proper OOP, polymorphic builders, [nesting](#nested-cells), view inheritance, using Rails helpers, [asset packaging](http://trailblazer.to/gems/cells/rails.html#asset-pipeline) to bundle JS, CSS or images, simple distribution via gems or Rails engines, encapsulated testing, [caching](#caching), and [integrate with Trailblazer](https://github.com/trailblazer/trailblazer-cells).
+Nevertheless, a cell gives you more than just a template renderer. They allow proper OOP, polymorphic builders, [nesting](#nested-cells), view inheritance, using Rails helpers, [asset packaging](https://trailblazer.to/2.1/docs/cells.html#cells-rails-asset-pipeline) to bundle JS, CSS or images, simple distribution via gems or Rails engines, encapsulated testing, [caching](#caching), and [integrate with Trailblazer](https://github.com/trailblazer/trailblazer-cells).
 
 ## Full Documentation
 
-Cells is part of the Trailblazer framework. [Full documentation](http://trailblazer.to/gems/cells) is available on the project site.
+Cells is part of the Trailblazer framework. [Full documentation](https://trailblazer.to/2.1/docs/cells.html) is available on the project site.
 
-Cells is completely decoupled from Rails. However, Rails-specific functionality is to be found [here](http://trailblazer.to/gems/cells/rails.html).
+Cells is completely decoupled from Rails. However, Rails-specific functionality is to be found [here](https://trailblazer.to/2.1/docs/cells.html#cells-rails).
 
 ## Rendering Cells
 
@@ -151,7 +151,7 @@ Capybara.string(html).must_have_css "h3"
 
 It is completely up to you how you test, whether it's RSpec, MiniTest or whatever. All the cell does is return HTML.
 
-[In Rails, there's support](http://trailblazer.to/gems/cells/testing.html) for TestUnit, MiniTest and RSpec available, along with Capybara integration.
+[In Rails, there's support](https://trailblazer.to/2.1/docs/cells.html#cells-testing) for TestUnit, MiniTest and RSpec available, along with Capybara integration.
 
 ## Properties
 
@@ -182,7 +182,7 @@ song.title                 #=> "<script>Dangerous</script>"
 Comment::Cell.(song).title #=> &lt;script&gt;Dangerous&lt;/script&gt;
 ```
 
-Properties and escaping are [documented here](http://trailblazer.to/gems/cells/api.html#html-escaping).
+Properties and escaping are [documented here](https://trailblazer.to/2.1/docs/cells.html#cells-api-html-escaping).
 
 ## Installation
 
@@ -270,7 +270,7 @@ end
 
 ## Asset Packaging
 
-Cells can easily ship with their own JavaScript, CSS and more and be part of Rails' asset pipeline. Bundling assets into a cell allows you to implement super encapsulated widgets that are stand-alone. Asset pipeline is [documented here](http://trailblazer.to/gems/cells/rails.html#asset-pipeline).
+Cells can easily ship with their own JavaScript, CSS and more and be part of Rails' asset pipeline. Bundling assets into a cell allows you to implement super encapsulated widgets that are stand-alone. Asset pipeline is [documented here](https://trailblazer.to/2.1/docs/cells.html#cells-rails-asset-pipeline).
 
 ## Render API
 
@@ -344,7 +344,7 @@ This works both in cell views and on the instance, in states.
 
 ## View Inheritance
 
-You can not only inherit code across cell classes, but also views. This is extremely helpful if you want to override parts of your UI, only. It's [documented here](http://trailblazer.to/gems/cells/api.html#view-inheritance).
+You can not only inherit code across cell classes, but also views. This is extremely helpful if you want to override parts of your UI, only. It's [documented here](https://trailblazer.to/2.1/docs/cells.html#cells-api-view-inheritance).
 
 ## Collections
 
@@ -357,7 +357,7 @@ cell(:comment, collection: comments).()
 
 This will invoke `cell(:comment, comment).()` three times and concatenate the rendered output automatically.
 
-Learn more [about collections here](http://trailblazer.to/gems/cells/api.html#collection).
+Learn more [about collections here](https://trailblazer.to/2.1/docs/cells.html#cells-api-collection).
 
 
 ## Builder
@@ -382,7 +382,7 @@ The `#cell` helper takes care of instantiating the right cell class for you.
 cell(:comment, Post.find(1)) #=> creates a PostCell.
 ```
 
-Learn more [about builders here](http://trailblazer.to/gems/cells/api.html#builder).
+Learn more [about builders here](https://trailblazer.to/2.1/docs/cells.html#cells-api-builder).
 
 ## Caching
 
@@ -401,7 +401,7 @@ The `::cache` method will forward options to the caching engine.
 cache :show, expires_in: 10.minutes
 ```
 
-You can also compute your own cache key, use dynamic keys, cache tags, and conditionals using `:if`. Caching is documented [here](http://trailblazer.to/gems/cells/api.html#caching) and in chapter 8 of the [Trailblazer book](http://leanpub.com/trailblazer).
+You can also compute your own cache key, use dynamic keys, cache tags, and conditionals using `:if`. Caching is documented [here](https://trailblazer.to/2.1/docs/cells.html#cells-api-caching) and in chapter 8 of the [Trailblazer book](http://leanpub.com/trailblazer).
 
 
 ## The Book
@@ -422,11 +422,11 @@ The book picks up where the README leaves off. Go grab a copy and support us - i
 
 ## This is not Cells 3.x!
 
-Temporary note: This is the README and API for Cells 4. Many things have improved. If you want to upgrade, [follow this guide](https://github.com/apotonick/cells/wiki/From-Cells-3-to-Cells-4---Upgrading-Guide). When in trouble, join the [Gitter channel](https://gitter.im/trailblazer/chat).
+Temporary note: This is the README and API for Cells 4. Many things have improved. If you want to upgrade, [follow this guide](https://github.com/apotonick/cells/wiki/From-Cells-3-to-Cells-4---Upgrading-Guide). When in trouble, join the [Zulip channel](https://trailblazer.zulipchat.com/login/).
 
 ## LICENSE
 
-Copyright (c) 2007-2015, Nick Sutterer
+Copyright (c) 2007-2020, Nick Sutterer
 
 Copyright (c) 2007-2008, Solide ICT by Peter Bex and Bob Leers
 

cells.gemspec

@@ -1,30 +1,36 @@
-lib = File.expand_path("../lib/", __FILE__)
-$:.unshift lib unless $:.include?(lib)
+# frozen_string_literal: true
 
-require "cell/version"
+require_relative 'lib/cell/version'
 
 Gem::Specification.new do |spec|
-  spec.name        = "cells"
+  spec.name        = 'cells'
   spec.version     = Cell::VERSION
-  spec.platform    = Gem::Platform::RUBY
-  spec.authors     = ["Nick Sutterer"]
-  spec.email       = ["[email protected]"]
-  spec.homepage    = "https://github.com/apotonick/cells"
-  spec.summary     = %q{View Models for Ruby and Rails.}
-  spec.description = %q{View Models for Ruby and Rails, replacing helpers and partials while giving you a clean view architecture with proper encapsulation.}
-  spec.license     = "MIT"
+  spec.authors     = ['Nick Sutterer']
+  spec.email       = ['[email protected]']
+  spec.homepage    = 'https://github.com/trailblazer/cells'
+  spec.summary     = 'View Models for Ruby and Rails.'
+  spec.description = 'View Models for Ruby and Rails, replacing helpers and partials while giving you a clean view architecture with proper encapsulation.'
+  spec.license     = 'MIT'
+
+  spec.metadata['bug_tracker_uri'] = "#{spec.homepage}/issues"
+  spec.metadata['changelog_uri'] = "#{spec.homepage}/blob/HEAD/CHANGES.md"
+  spec.metadata['documentation_uri'] = 'https://trailblazer.to/2.1/docs/cells'
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = spec.homepage
+  spec.metadata['wiki_uri'] = "#{spec.homepage}/wiki"
 
   spec.files         = `git ls-files`.split("\n")
   spec.test_files    = `git ls-files -- {test}/*`.split("\n")
-  spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.2.10'
 
-  spec.add_dependency "uber", "< 0.2.0"
-  spec.add_dependency "declarative-option", "< 0.2.0"
-  spec.add_dependency "declarative-builder", "< 0.2.0"
-  spec.add_dependency "tilt", ">= 1.4", "< 3"
+  spec.add_dependency 'declarative-builder', '~> 0.2.0'
+  spec.add_dependency 'tilt', '>= 1.4', '< 3'
+  spec.add_dependency 'trailblazer-option', '~> 0.1.0'
+  spec.add_dependency 'uber', '< 0.2.0'
 
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "capybara"
-  spec.add_development_dependency "cells-erb", ">= 0.0.4"
+  spec.add_development_dependency 'capybara'
+  spec.add_development_dependency 'cells-erb', '>= 0.1.0'
+  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'rake'
 end

lib/cell.rb

@@ -1,6 +1,5 @@
 require "tilt"
 require "uber/inheritable_attr"
-require "cell/version"
 
 module Cell
   autoload :Testing,  "cell/testing"
@@ -18,6 +17,7 @@ def initialize(prefixes, view)
 require "cell/templates"
 require "cell/abstract"
 require "cell/util"
+require "cell/inspect"
 require "cell/view_model"
 require "cell/concept"
 require "cell/escaped"

lib/cell/abstract.rb

@@ -4,6 +4,6 @@ def abstract!
   end
 
   def abstract?
-    @abstract
+    @abstract if defined?(@abstract)
   end
 end

lib/cell/caching.rb

@@ -1,4 +1,4 @@
-require "declarative/options"
+require "cell/option"
 
 module Cell
   module Caching
@@ -17,12 +17,10 @@ def self.included(includer)
     end
 
     module ClassMethods
-      def cache(state, *args, &block)
-        options = args.last.is_a?(Hash) ? args.pop : {} # I have to admit, Array#extract_options is a brilliant tool.
-
-        conditional_procs[state] = Declarative::Option(options.delete(:if) || true, instance_exec: true)
-        version_procs[state]     = Declarative::Option(args.first || block, instance_exec: true)
-        cache_options[state]     = Declarative::Options(options, instance_exec: true)
+      def cache(state, *args, **kws, &block)
+        conditional_procs[state] = Cell::Option(kws.delete(:if) || true)
+        version_procs[state]     = Cell::Option(args.first || block)
+        cache_options[state]     = Cell::Options(kws)
       end
 
       # Computes the complete, namespaced cache key for +state+.
@@ -41,22 +39,27 @@ def expand_cache_key(key)
       end
     end
 
-    def render_state(state, *args)
+    def render_state(state, *args, **kws)
       state = state.to_sym
-      return super(state, *args) unless cache?(state, *args)
 
-      key     = self.class.state_cache_key(state, self.class.version_procs[state].(self, *args))
-      options = self.class.cache_options[state].(self, *args)
+      # Before Ruby 3.0, this wasn't necessary, but since cache filters don't receive kwargs as per the "old" (existing cells version) implementation, we can make it one array.
+      cache_filter_args = args + [kws]
+
+      return super(state, *args, **kws) unless cache?(state, *cache_filter_args)
+
+
+      key     = self.class.state_cache_key(state, self.class.version_procs[state].(*cache_filter_args, exec_context: self))
+      options = self.class.cache_options[state].(*cache_filter_args, exec_context: self)
 
-      fetch_from_cache_for(key, options) { super(state, *args) }
+      fetch_from_cache_for(key, options) { super(state, *args, **kws) }
     end
 
     def cache_store  # we want to use DI to set a cache store in cell/rails.
       raise "No cache store has been set."
     end
 
     def cache?(state, *args)
-      perform_caching? and state_cached?(state) and self.class.conditional_procs[state].(self, *args)
+      perform_caching? and state_cached?(state) and self.class.conditional_procs[state].(*args, exec_context: self)
     end
 
   private