glia 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbf015ba736749fad81608cd56993e52235f4e3c
-  data.tar.gz: 74bb89d646e2c577fed3379d1affa0c69185c410
+  metadata.gz: a7c365840fb404b696b34559a20de1fb19e0ade6
+  data.tar.gz: a8538ba3f88281dd85ccf16e7ea7264b1abd50ae
 SHA512:
-  metadata.gz: 10d970881a992c4a71ed02dd1970373e77aed1c46ca9fa8877db0c727f3d68af388092ba250180f7bafe2c878bcb89f7ed0f515a5454c8acdc8412c3f40178c9
-  data.tar.gz: 3456730ca644a468fd710ef65a526769d10bb3bb184c5c8d53e615da75b8c433c8a76257899489f3f937ed176358b516501a5ba7262016e0a5fb70ed1653a3a7
+  metadata.gz: ef536f5b333cd5a3db8098ffa736d993a8a3e824dc14202c9f87f93167ca284e9d6e839c81fb64fd5c8e72cf0a11896b936ccef47f57d71fe39daed52b0ff3b0
+  data.tar.gz: 96f03d9af2a0ee4f97f7e6f9cc998fb36806a4ce785348eaa8fc5ef55c30e30e9b4cbe3acb35cdcbfd37a1a7ad6f582b67971c5d4998585fc0286bbb4872b08d

data/README.md

@@ -139,12 +139,13 @@ root cell, being contained in its output.
   method. For example, the `'cake_details'` template file might have a call to `cell(:specifications).render` in a 
   specific place to render that specific child cell.
 * Any other parameters passed to `cell` will be passed through to the cell's constructor.
-* Anything in the block will operate on this cell. E.g. calling cell withing the block will create a child cell.
+* Anything in the block will operate on this cell. E.g. calling cell within the block will create a child cell.
   
 #### Reference
 
-The `reference` method refers to a cell that has been added in a previous handle. Anything parameter will overwrite the 
-same parameter defined in a previous handle. Any contents of the block will operate on the previously defined cell.
+The `reference` method refers to a cell that has been added in a previous (or subsequent) handle. 
+Any parameter will overwrite the same parameter defined in a previous handle. 
+Any contents of the block will operate on the previously defined cell.
 
 The technical difference from the cell method is that instead of requiring the `class` parameter, it disallows it, 
 and a reference without a matching cell would be ignored rather than creating a cell in the layout.
@@ -159,7 +160,7 @@ This method will run the specified method (with the given arguments) on the cell
 ### Areas 
 
 An 'area' is a distinct layout that is completely separate from another area. 
-For example many apps would have a `:frontend` area, and a `:backend` area.
+For example many apps would have a `:frontend` area, and an `:admin` area.
 
 If you app code is organised into modules, you may wish to keep a layout file in each module. 
 This way, the layout files can each place cells related to their own modules on any page of the app.
@@ -263,11 +264,16 @@ class Client::RenderingPolicy < Lotus::RenderingPolicy
   end
 
   def _render_action(action, response)
+    @area ||= @namespace.name.downcase.to_sym
     if successful?(response)
-      RequestStore.store[:action_exposures] = action.exposures
-      layout = Glia.layout(:frontend, action.handles)
-      layout.view_factory = ViewFactory.new
-      layout.cell(:root, action.exposures).render
+      if response[BODY].empty?
+        RequestStore.store[:action_exposures] = action.exposures
+        layout = Glia.layout(@area, action.handles)
+        layout.view_factory = ViewFactory.new
+        layout.cell(:root, action.exposures).render
+      else
+        Lotus::Views::NullView.new(response[BODY]).render(action.exposures)
+      end
     end
   end
 

data/lib/glia/cell.rb

@@ -1,10 +1,10 @@
 module Glia
   module Cell
-    attr_accessor :child_definitions, :layout
+    attr_accessor :child_definitions, :layout, :blocks
 
     # To be overloaded, but here to prevent errors if we don't define initialize
-    def initialize(config)
-    end
+    # def initialize(config)
+    # end
 
     def children
       @children ||= {}
@@ -22,5 +22,9 @@ module Glia
     def child_definitions
       @child_definitions ||= {}
     end
+
+    def blocks
+      @blocks ||= []
+    end
   end
 end

data/lib/glia/layout.rb

@@ -7,17 +7,19 @@ module Glia
       attr_accessor :layout_dir, :view_namespace
     end
 
-    def initialize(area, handles)
+    def initialize(area, handles, options = {})
+      @area = area
       @update = UpdateRegistry.area(area)
       @cells = {}
       @handles = handles
       @data = @update.merge(@handles)
+      @view_factory = options[:view_factory] unless options[:view_factory].nil?
     end
 
     def cell(name, *args)
       if @cells[name].nil?
         definition = @data[name]
-        raise Errors::MissingCellError, "Cell #{name} is missing from layout" if definition.nil?
+        raise Errors::MissingCellError, "Cell #{name} is missing from layout #{@area}" if definition.nil?
         code = definition.delete(:class)
         actions = definition.delete(:actions)
         children = definition.delete(:children)

data/lib/glia/version.rb

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

data/lib/glia.rb

@@ -12,7 +12,7 @@ module Glia
     UpdateRegistry.area(code, &blk)
   end
 
-  def self.layout(area, handles)
-    Layout.new(area, handles)
+  def self.layout(area, handles, options = {})
+    Layout.new(area, handles, options)
   end
 end

metadata

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