cells 4.1.4 → 4.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a86688cd5527e045dc5c369601748ad37bf23dee
-  data.tar.gz: 71f61f1b7b909f8eaa80673fef462e8c21f85fd9
+  metadata.gz: ac9cc75f99da78dcad2d164973de3e4258a5d79d
+  data.tar.gz: 8043f9990c1a7414fe80edac59664243f0aa1f76
 SHA512:
-  metadata.gz: 20509fd3dd471cfe6019b6f933d8aba0ae45b19268b765ba2c4c6dfa7cf81e8a916a0a00920619e5b0cb519a05bb24a4b33ae0dbd1739d64e8a7ec510fdb86a1
-  data.tar.gz: cd0e8ed5e41833f4110f949b0ae49b7c58dc270ae5e87c48186295663370e16c4899948a94cac0bf508e67e893e6556f834d046cf8f9526c8d924c1bc9004c09
+  metadata.gz: 11a8edb6918e0b4b3eb0436dd52a230d40642e362c8342dc000c04fd7a140d78e34debacc9b0e713ee662869e6d9d4a2a079fbc531e4e019456f514d80ace5b7
+  data.tar.gz: 71e754860b9534b399e342a47140bca8fdc86dc97208f11d2f82b33ff61ebf31f31d66da3838dbd51f7310ba9b59fd7e6251b555f043c189ce20a6fd18e7be9b

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 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.
+
 ## 4.1.4
 
 * Upgrading to Uber 0.1 which handles builders a bit differently.

data/lib/cell/collection.rb

@@ -5,7 +5,7 @@ module Cell
       set_deprecated_options(options) # TODO: remove in 5.0.
 
       @ary        = ary
-      @options    = options
+      @options    = options    # these options are "final" and will be identical for all collection cells.
       @cell_class = cell_class
     end
 

data/lib/cell/util.rb

@@ -19,7 +19,7 @@ module Cell::Util
         part.split('_').collect(&:capitalize).join
       end.join('::')
       
-      Object.const_get(class_name)
+      Object.const_get(class_name, false)
     end
   end
 end

data/lib/cell/version.rb

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

data/lib/cell/view_model.rb

@@ -60,6 +60,8 @@ module Cell
 
     # Build nested cell in instance.
     def cell(name, model=nil, options={})
+      context = Context[options[:context], self.context]
+
       self.class.cell(name, model, options.merge(context: context))
     end
 
@@ -67,10 +69,20 @@ module Cell
       setup!(model, options)
     end
 
-    def context # TODO: explicit test.
+    def context
       @options[:context]
     end
 
+    # DISCUSS: we could use the same mechanism as TRB::Skills here for speed at runtime?
+    class Context# < Hash
+      # Only dup&merge when :context was passed in parent.cell(context: ..)
+      # Otherwise we can simply pass on the old context.
+      def self.[](options, context)
+        return context unless options
+        context.dup.merge(options) # DISCUSS: should we create a real Context object here, to make it overridable?
+      end
+    end
+
     module Rendering
       # Invokes the passed method (defaults to :show) while respecting caching.
       # In Rails, the return value gets marked html_safe.

data/test/context_test.rb

@@ -15,19 +15,30 @@ class ContextTest < MiniTest::Spec
   let (:user) { Object.new }
   let (:controller) { Object.new }
 
-  it do
-    cell = ParentCell.(model, admin: true, context: { user: user, controller: controller })
-    # cell.extend(ParentController)
+  let (:parent) { ParentCell.(model, admin: true, context: { user: user, controller: controller }) }
 
-    cell.model.must_equal model
-    cell.controller.must_equal controller
-    cell.user.must_equal user
+  it do
+    parent.model.must_equal model
+    parent.controller.must_equal controller
+    parent.user.must_equal user
 
     # nested cell
-    child = cell.cell("context_test/parent", "")
+    child = parent.cell("context_test/parent", "")
 
     child.model.must_equal ""
     child.controller.must_equal controller
     child.user.must_equal user
   end
+
+  # child can add to context
+  it do
+    child = parent.cell(ParentCell, nil, context: { "is_child?" => true })
+
+    parent.context["is_child?"].must_equal nil
+
+    child.model.must_equal nil
+    child.controller.must_equal controller
+    child.user.must_equal user
+    child.context["is_child?"].must_equal true
+  end
 end

data/test/layout_test.rb

@@ -42,7 +42,7 @@ end
 class LayoutTest < MiniTest::Spec
   # render show.haml calling method.
   # same context as content view as layout call method.
-  it { SongWithLayoutCell.new(nil).show.must_equal "Merry Xmas, <b>Papertiger</b>\n" }
+  it { SongWithLayoutCell.new(nil).show.must_equal "Merry Xmas, <b>Papertiger</b>" }
 
   # raises exception when layout not found!
 
@@ -51,7 +51,7 @@ class LayoutTest < MiniTest::Spec
   it {  }
 
   # with ::layout.
-  it { SongWithLayoutOnClassCell.new(nil).show.must_equal "Merry Xmas, <b>Papertiger</b>\n" }
+  it { SongWithLayoutOnClassCell.new(nil).show.must_equal "Merry Xmas, <b>Papertiger</b>" }
 
   # with ::layout and :layout, :layout wins.
   it { SongWithLayoutOnClassCell.new(nil).show_with_layout.must_equal "Happy Friday!" }
@@ -75,17 +75,14 @@ end
 class ExternalLayoutTest < Minitest::Spec
   it do
     Comment::ShowCell.new(nil, layout: Comment::LayoutCell, context: { beer: true }).
-      ().must_equal "$layout.erb{$show.erb, {:beer=>true}\n$show.erb, {:beer=>true}\n, {:beer=>true}}\n"
+      ().must_equal "$layout.erb{$show.erb, {:beer=>true}$show.erb, {:beer=>true}, {:beer=>true}}
+"
   end
 
   # collection :layout
   it do
     Cell::ViewModel.cell("comment/show", collection: [Object, Module], layout: Comment::LayoutCell).().
-      must_equal "$layout.erb{$show.erb, nil
-$show.erb, nil
-$show.erb, nil
-$show.erb, nil
-, nil}
+      must_equal "$layout.erb{$show.erb, nil$show.erb, nil$show.erb, nil$show.erb, nil, nil}
 "
   end
 end

data/test/render_test.rb

@@ -59,19 +59,19 @@ end
 
 class RenderTest < MiniTest::Spec
   # render show.haml calling method, implicit render.
-  it { SongCell.new(nil).show.must_equal "Papertiger\n" }
+  it { SongCell.new(nil).show.must_equal "Papertiger" }
 
   # render ivar.haml using instance variable.
-  it { SongCell.new(nil).ivar.must_equal "Carnage\n" }
+  it { SongCell.new(nil).ivar.must_equal "Carnage" }
 
   # render string.
   it { SongCell.new(nil).string.must_equal "Right" }
 
   # #call renders :show
-  it { SongCell.new(nil).call.must_equal "Papertiger\n" }
+  it { SongCell.new(nil).call.must_equal "Papertiger" }
 
   # call(:form) renders :form
-  it { SongCell.new(nil).call(:with_view_name).must_equal "Man Of Steel\n" }
+  it { SongCell.new(nil).call(:with_view_name).must_equal "Man Of Steel" }
 
   # works with state called `send`
   it { SongCell.new(nil).call(:send).must_equal "send" }
@@ -83,10 +83,10 @@ class RenderTest < MiniTest::Spec
   end
 
   # allows locals
-  it { SongCell.new(nil).with_locals.must_equal "Shot Across The Bow\n280\n" }
+  it { SongCell.new(nil).with_locals.must_equal "Shot Across The Bow280" }
 
   # render :form is a shortcut.
-  it { SongCell.new(nil).with_view_name.must_equal "Man Of Steel\n" }
+  it { SongCell.new(nil).with_view_name.must_equal "Man Of Steel" }
 
   # :template_engine renders ERB.
   # it { SongCell.new(nil).with_erb.must_equal "ERB:\n<span>\n  Papertiger\n</span>" }
@@ -102,7 +102,7 @@ class RenderTest < MiniTest::Spec
   it { SongCell.new(nil).call(:with_html).must_equal "<p>Yew!</p>" }
 
   # render {} with block
-  it { SongCell.new(nil).with_block.must_equal "Yo! Clean Sheets<p>Yew!</p>\n" }
+  it { SongCell.new(nil).with_block.must_equal "Yo! Clean Sheets<p>Yew!</p>" }
 end
 
 # test inheritance

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cells
 version: !ruby/object:Gem::Version
-  version: 4.1.4
+  version: 4.1.5
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber