glia 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a50686cc03676e699d74a01655c296020b723bb
-  data.tar.gz: 4ba937471d4071c387dec39827bb2f5ed0b480e4
+  metadata.gz: bbf015ba736749fad81608cd56993e52235f4e3c
+  data.tar.gz: 74bb89d646e2c577fed3379d1affa0c69185c410
 SHA512:
-  metadata.gz: bcdd053ca3266f8747da57001154d65c31201bffb43c988d1b63db6277e3dcaf5f5c60732953de6648eb998f9a88e888827903db0a4d20df71249a7f8e1902a8
-  data.tar.gz: 8e15f7300f86449b0853e6deff45a87d0ef0998a456399c78fe1b9904c9ef3374da2301808482086878cb409e8c44a150aa54e5bae7b5d40863c1f70b2f6b937
+  metadata.gz: 10d970881a992c4a71ed02dd1970373e77aed1c46ca9fa8877db0c727f3d68af388092ba250180f7bafe2c878bcb89f7ed0f515a5454c8acdc8412c3f40178c9
+  data.tar.gz: 3456730ca644a468fd710ef65a526769d10bb3bb184c5c8d53e615da75b8c433c8a76257899489f3f937ed176358b516501a5ba7262016e0a5fb70ed1653a3a7

data/README.md

@@ -61,7 +61,7 @@ Glia.area(:frontend) do
       end
     end
   end
-  handle :pavlova_view do
+  handle :pavlova_view, :new_view do
     reference name: :specifications do
       remove name: :cake_specs
     end

data/lib/glia/cell.rb

@@ -18,5 +18,9 @@ module Glia
       raise Errors::MissingCellError, "No child cell in position #{code}" if name.nil?
       @children[code] ||= layout.cell(name, *args)
     end
+
+    def child_definitions
+      @child_definitions ||= {}
+    end
   end
 end

data/lib/glia/update_builder.rb

@@ -11,14 +11,16 @@ module Glia
       self
     end
 
-    def handle(key, &blk)
-      begin
-        @current_scope = @data[key] ||= {}
-        @current_cell = nil
-        instance_eval &blk
-      ensure
-        @current_scope = nil
-        @current_cell = nil
+    def handle(*keys, &blk)
+      keys.each do |key|
+        begin
+          @current_scope = @data[key] ||= {}
+          @current_cell = nil
+          instance_eval &blk
+        ensure
+          @current_scope = nil
+          @current_cell = nil
+        end
       end
       self
     end
@@ -32,7 +34,7 @@ module Glia
     end
 
     def remove(definition)
-      @current_scope[definition.delete(:name)] = nil
+      _cell(definition.merge({_removed: true}))
     end
 
     def reference(definition, &blk)
@@ -52,9 +54,16 @@ module Glia
 
     def merge(handles)
       _data = {}
+
+      # Merge all of the handles together
       merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
       handles.each{|h| _data = _data.merge(@data[h].clone, &merger) unless @data[h].nil?}
-      _data.delete_if{|k, v|  v.nil? || v[:class].nil?}.each_with_object({}) do |(name, definition), hash|
+
+      # Remove orphan references, or deleted cells
+      _data = _data.delete_if{|k, v|  v.nil? || v[:class].nil? || v[:_removed]}
+
+      # Tidy up child references for deleted children, empty child lists
+      _data.each_with_object({}) do |(name, definition), hash|
         d = definition.clone
         d[:children].delete_if{|position, n| _data[n].nil?}
         d.delete(:children) if d[:children].empty?
@@ -70,7 +79,7 @@ module Glia
         name = definition.delete(:name)
         position = definition.delete(:position) || name
         old_cell = @current_cell
-        @current_cell = @current_scope[name] = {children: {}}.merge(definition)
+        @current_cell = (@current_scope[name] ||= {children: {}}).merge!(definition)
         unless old_cell.nil?
           old_cell[:children][position] = name
         end

data/lib/glia/version.rb

@@ -1,3 +1,3 @@
 module Glia
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/unit/update_builder_test.rb

@@ -5,16 +5,27 @@ class Glia::UpdateBuilder::Test < UnitTest
 
     def test_cell
       builder.handle :test do
+        reference name: :defined_later do
+          cell name: :defined_later_sub_cell, class: :template, position: :here
+        end
         cell name: :root, class: :html, template_name: 'root' do
           action name: :compile, args: ['javascript', 'css']
           cell name: :header, class: :template, template_name: 'header'
         end
       end
+      builder.handle :test, :other_handle do
+        cell name: :defined_later, class: :list
+      end
       expected_output = {
           test: {
               root: {class: :html, template_name: 'root',
                      children: {header: :header}, actions: [{name: :compile, args: ['javascript', 'css']}]},
-              header: {class: :template, template_name: 'header', children: {}}
+              header: {class: :template, template_name: 'header', children: {}},
+              defined_later: {children: {here: :defined_later_sub_cell}, class: :list},
+              defined_later_sub_cell: {children: {}, class: :template}
+          },
+          other_handle: {
+              defined_later: {children: {}, class: :list},
           }
       }
       assert_equal expected_output, builder.to_h
@@ -25,6 +36,7 @@ class Glia::UpdateBuilder::Test < UnitTest
 
     def test_merge
       builder.handle :default do
+        remove name: :defined_later
         cell name: :root, class: :html, template_name: 'root' do
           action name: :compile, args: ['javascript', 'css']
           cell name: :header, class: :template, template_name: 'header'
@@ -36,6 +48,7 @@ class Glia::UpdateBuilder::Test < UnitTest
         reference name: :footer, template_name: 'new_footer' do
           cell name: :copyright, class: :template, template_name: 'copyright', position: :footer_bottom
         end
+        cell name: :defined_later, class: :list
       end
       expected_output = {
           root: {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glia
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dane Lowe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-02 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler