Merge pull request #512 from trailblazer/trailblazer-option

Declarative option is replaced by trailblazer option

cells.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.5'
 
   spec.add_dependency 'declarative-builder', '~> 0.2.0'
+  spec.add_dependency "trailblazer-option", "~> 0.1.0"
   spec.add_dependency 'tilt', '>= 1.4', '< 3'
-  spec.add_dependency "declarative-option", "< 0.2.0"
   spec.add_dependency 'uber', '< 0.2.0'
 
   spec.add_development_dependency 'capybara'

lib/cell.rb

@@ -12,6 +12,7 @@ def initialize(prefixes, view)
   end # Error
 end
 
+require "cell/option"
 require "cell/caching"
 require "cell/prefixes"
 require "cell/layout"

lib/cell/caching.rb

@@ -1,5 +1,3 @@
-require "declarative/options"
-
 module Cell
   module Caching
     def self.included(includer)
@@ -20,9 +18,9 @@ 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)
+        conditional_procs[state] = Cell::Option(options.delete(:if) || true)
+        version_procs[state]     = Cell::Option(args.first || block)
+        cache_options[state]     = Cell::Options(options)
       end
 
       # Computes the complete, namespaced cache key for +state+.
@@ -45,8 +43,8 @@ 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].(self, *args))
-      options = self.class.cache_options[state].(self, *args)
+      key     = self.class.state_cache_key(state, self.class.version_procs[state].(*args, exec_context: self))
+      options = self.class.cache_options[state].(*args, exec_context: self)
 
       fetch_from_cache_for(key, options) { super(state, *args) }
     end
@@ -56,7 +54,7 @@ def cache_store  # we want to use DI to set a cache store in cell/rails.
     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

lib/cell/option.rb

@@ -0,0 +1,35 @@
+require "trailblazer/option"
+require "uber/callable"
+
+module Cell
+  # Extend `Trailblazer::Option` to make static values as callables too.
+  class Option < ::Trailblazer::Option
+    def self.build(value)
+      callable = case value
+                 when Proc, Symbol, Uber::Callable
+                   value
+                 else
+                   ->(*) { value } # Make non-callable value to callable.
+                 end
+
+      super(callable)
+    end
+  end
+
+  class Options < Hash
+    # Evaluates every element and returns a hash.  Accepts arbitrary arguments.
+    def call(*args, **options, &block)
+      Hash[ collect { |k,v| [k,v.(*args, **options, &block) ] } ]
+    end
+  end
+
+  def self.Option(value)
+    ::Cell::Option.build(value)
+  end
+
+  def self.Options(options)
+    Options.new.tap do |hsh|
+      options.each { |k,v| hsh[k] = Option(v) }
+    end
+  end
+end