cells 4.1.5 → 4.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac9cc75f99da78dcad2d164973de3e4258a5d79d
-  data.tar.gz: 8043f9990c1a7414fe80edac59664243f0aa1f76
+  metadata.gz: b0cd2efb3cdf312f2c529647f9188b4e7e6639bd
+  data.tar.gz: 756d7e0d6e612d62d8750fb152f0ddfb238f6e47
 SHA512:
-  metadata.gz: 11a8edb6918e0b4b3eb0436dd52a230d40642e362c8342dc000c04fd7a140d78e34debacc9b0e713ee662869e6d9d4a2a079fbc531e4e019456f514d80ace5b7
-  data.tar.gz: 71e754860b9534b399e342a47140bca8fdc86dc97208f11d2f82b33ff61ebf31f31d66da3838dbd51f7310ba9b59fd7e6251b555f043c189ce20a6fd18e7be9b
+  metadata.gz: 7fd5589f420bf75a25d03fd8c9e986cc4566cfd332457b58213f07a7f21b29087d0224bfb79977ebaae003bd998ff086edec71552bafb8ebb58973f71a9bf4a8
+  data.tar.gz: 00d6fab903c9a92c29fb8c0398185f663ee9f6bc6c0235d56816b11115bedda4d9f20eae629d6aded51b11a458ee0e83172f3950312abd8cbb3b937bd4ac32d2

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 4.1.6
+
+* Use `Declarative::Option` and `Declarative::Builder` instead of `uber`'s. This allows removing the `uber` version restriction.
+
 ## 4.1.5
 
 * Fix a bug where nested calls of `cell(name, context: {...})` would ignore the new context elements, resulting in the old context being passed on. By adding `Context::[]` the new elements are now properly merged into a **new context hash**. This means that adding elements to the child context won't leak up into the parent context anymore.

data/Gemfile

@@ -6,3 +6,5 @@ gem "benchmark-ips"
 gem "minitest-line"
 
 gemspec
+
+# gem "uber", path: "../uber"

data/README.md

@@ -360,9 +360,13 @@ Builders allow instantiating different cell classes for different models and opt
 
 ```ruby
 class CommentCell < Cell::ViewModel
+  include ::Cell::Builder
+
   builds do |model, options|
-    PostCell       if model.is_a?(Post)
-    CommentCell    if model.is_a?(Comment)
+    case model
+    when Post; PostCell
+    when Comment; CommentCell
+    end
   end
 ```
 

data/cells.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.email       = ["apotonick@gmail.com"]
   spec.homepage    = "https://github.com/apotonick/cells"
   spec.summary     = %q{View Models for Ruby and Rails.}
-  spec.description = %q{Cells replaces partials and helpers with OOP view models, giving you proper encapsulation, inheritance, testability and a cleaner view architecture.}
+  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.files         = `git ls-files`.split("\n")
@@ -19,7 +19,9 @@ Gem::Specification.new do |spec|
   spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "uber", ">= 0.1.0", "< 0.2.0"
+  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_development_dependency "rake"

data/lib/cell.rb

@@ -1,6 +1,5 @@
 require "tilt"
 require "uber/inheritable_attr"
-require "uber/delegates"
 require "cell/version"
 
 module Cell

data/lib/cell/builder.rb

@@ -1,15 +1,15 @@
-require "uber/builder"
+require "declarative/builder"
 
 module Cell
   module Builder
     def self.included(base)
-      base.send :include, Uber::Builder
+      base.send :include, Declarative::Builder
       base.extend ClassMethods
     end
 
     module ClassMethods
       def build(*args)
-        build!(self, *args).new(*args) # Uber::Builder#build!.
+        build!(self, *args).new(*args) # Declarative::Builder#build!.
       end
     end
   end

data/lib/cell/caching.rb

@@ -1,4 +1,4 @@
-require 'uber/options'
+require "declarative/options"
 
 module Cell
   module Caching
@@ -10,19 +10,19 @@ module Cell
         inheritable_attr :conditional_procs
         inheritable_attr :cache_options
 
-        self.version_procs = {}
+        self.version_procs     = {}
         self.conditional_procs = {}
-        self.cache_options = Uber::Options.new({})
+        self.cache_options     = {}
       end
     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 brillant tool.
+        options = args.last.is_a?(Hash) ? args.pop : {} # I have to admit, Array#extract_options is a brilliant tool.
 
-        self.conditional_procs[state] = Uber::Options::Value.new(options.delete(:if) || true)
-        self.version_procs[state] = Uber::Options::Value.new(args.first || block)
-        self.cache_options[state] = Uber::Options.new(options)
+        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)
       end
 
       # Computes the complete, namespaced cache key for +state+.
@@ -37,17 +37,16 @@ module Cell
     private
 
       def expand_cache_key(key)
-        key.join("/") # TODO: test me!
+        key.join("/")
       end
     end
 
-
     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))
-      options = self.class.cache_options.eval(state, self, *args)
+      key     = self.class.state_cache_key(state, self.class.version_procs[state].(self, *args))
+      options = self.class.cache_options[state].(self, *args)
 
       fetch_from_cache_for(key, options) { super(state, *args) }
     end
@@ -57,7 +56,7 @@ module Cell
     end
 
     def cache?(state, *args)
-      perform_caching? and state_cached?(state) and self.class.conditional_procs[state].evaluate(self, *args)
+      perform_caching? and state_cached?(state) and self.class.conditional_procs[state].(self, *args)
     end
 
   private
@@ -66,10 +65,8 @@ module Cell
       true
     end
 
-    def fetch_from_cache_for(key, options)
-      cache_store.fetch(key, options) do
-        yield
-      end
+    def fetch_from_cache_for(key, options, &block)
+      cache_store.fetch(key, options, &block)
     end
 
     def state_cached?(state)

data/lib/cell/version.rb

@@ -1,3 +1,3 @@
 module Cell
-  VERSION = "4.1.5"
+  VERSION = "4.1.6"
 end

data/lib/cell/view_model.rb

@@ -1,3 +1,5 @@
+require "uber/delegates"
+
 module Cell
   class ViewModel
     extend Abstract

data/test/cache_test.rb

@@ -0,0 +1,32 @@
+require "test_helper"
+
+# TODO: test caching without rails
+
+class CacheTest < Minitest::Spec
+  STORE = Class.new(Hash) do
+    def fetch(key, options, &block)
+      self[key] || self[key] = yield
+    end
+  end.new
+
+  module Cache
+    def show
+      "#{@model}"
+    end
+
+    def cache_store
+      STORE
+    end
+  end
+
+  class Index < Cell::ViewModel
+    cache :show
+    include Cache
+  end
+
+  it do
+    Index.new(1).().must_equal("1")
+    Index.new(2).().must_equal("1")
+  end
+end
+

metadata

@@ -1,22 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: cells
 version: !ruby/object:Gem::Version
-  version: 4.1.5
+  version: 4.1.6
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2017-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: declarative-option
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.2.0
@@ -24,9 +35,20 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: declarative-builder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.2.0
@@ -92,8 +114,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.4
-description: Cells replaces partials and helpers with OOP view models, giving you
-  proper encapsulation, inheritance, testability and a cleaner view architecture.
+description: View Models for Ruby and Rails, replacing helpers and partials while
+  giving you a clean view architecture with proper encapsulation.
 email:
 - apotonick@gmail.com
 executables: []
@@ -131,6 +153,7 @@ files:
 - lib/cells.rb
 - lib/tasks/cells.rake
 - test/builder_test.rb
+- test/cache_test.rb
 - test/cell_benchmark.rb
 - test/cell_test.rb
 - test/concept_test.rb