lizarb 1.0.2 → 1.0.3

data/lib/liza/base/box.rb

@@ -1,40 +1,85 @@
-module Liza
-  class Box < Unit
-    inherited_explicitly_sets_system
+class Liza::Box < Liza::Unit
+  inherited_explicitly_sets_system
 
-    def self.has_panel symbol, panel_name = symbol
-      system_klass = get :system
-      panel_class = system_klass.const "#{symbol}_panel"
+  # def self.has_panel symbol, panel_name = symbol
+  #   system_klass = get :system
+  #   panel_class = system_klass.const "#{symbol}_panel"
 
-      _has_panel_define panel_name, "get(:panels)[:#{panel_name}]"
+  #   _has_panel_define panel_name, "get(:panels)[:#{panel_name}]"
 
-      panel = panel_class.new panel_name
-      add :panels, panel_name, panel
+  #   panel = panel_class.new panel_name
+  #   add :panels, panel_name, panel
 
-      panel_class.on_connected self
-    end
+  #   panel_class.on_connected self
+  # end
 
-    def self.has_controller symbol, panel_name = symbol
-      system_klass = get :system
-      controller_class = system_klass.const symbol
+  # def self.has_controller symbol, panel_name = symbol
+  #   system_klass = get :system
+  #   controller_class = system_klass.const symbol
 
-      panel = public_send panel_name
+  #   panel = public_send panel_name
 
-      controller_class.on_connected self, panel
-    end
+  #   controller_class.on_connected self, panel
+  # end
+
+  # def self.method_missing symbol, *args, &block
+  #   if panels.has_key? symbol
+  #     panels[symbol]
+  #   else
+  #     super
+  #   end
+  # end
+
+  # def self.respond_to_missing? symbol, include_private = false
+  #   get(:panels).keys.include?(symbol) || super
+  # end
 
-    def self._has_panel_define name, resource
-      class_eval <<-CODE, __FILE__, __LINE__ + 1
+#     def self._has_panel_define name, resource
+#       class_eval <<-CODE, __FILE__, __LINE__ + 1
 
-def self.#{name} &block
-  if block_given?
-    #{resource}.instance_eval &block
-  else
-    #{resource}
+# def self.#{name} &block
+#   if block_given?
+#     #{resource}.instance_eval &block
+#   else
+#     #{resource}
+#   end
+# end
+
+#       CODE
+#     end
+
+  def self.panels
+    get :panels
+  end
+
+  def self.[] symbol
+    panels[symbol].started
   end
-end
 
-      CODE
+  def self.panel symbol, panel_class = nil, &block
+    raise ArgumentError, "block required" unless block_given?
+
+    system_class = get :system
+    panel_class ||= system_class.const "#{symbol}_panel"
+
+    if Hash(get :panels).has_key? symbol
+      panel = panels[symbol]
+    else
+      panel_class.on_connected self
+      panel = panel_class.new symbol
+      add :panels, symbol, panel
     end
+
+    panel.push block
   end
+
+  def self.has_controller symbol, panel_name = symbol
+    system_klass = get :system
+    controller_class = system_klass.const symbol
+
+    panel = self[panel_name]
+
+    controller_class.on_connected self, panel
+  end
+
 end

data/lib/liza/base/box_test.rb

@@ -1,12 +1,10 @@
-module Liza
-  class BoxTest < UnitTest
-    test :subject_class do
-      assert subject_class == Liza::Box
-    end
+class Liza::BoxTest < Liza::UnitTest
+  test :subject_class do
+    assert subject_class == Liza::Box
+  end
 
-    test :settings do
-      assert subject_class.log_level == :normal
-      assert subject_class.log_color == :white
-    end
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :white
   end
 end

data/lib/liza/base/controller.rb

@@ -1,29 +1,27 @@
-module Liza
-  class Controller < Unit
-    part :controller_renderer
+class Liza::Controller < Liza::Unit
+  part :controller_renderer
 
-    inherited_explicitly_sets_system
+  inherited_explicitly_sets_system
 
-    def self.on_connected box_klass, panel
-      set :box, box_klass
-      set :panel, panel
-    end
-
-    def self.box
-      get :box
-    end
+  def self.on_connected box_klass, panel
+    set :box, box_klass
+    set :panel, panel
+  end
 
-    def self.panel
-      get :panel
-    end
+  def self.box
+    get :box
+  end
 
-    def box
-      self.class.box
-    end
+  def self.panel
+    get :panel
+  end
 
-    def panel
-      self.class.panel
-    end
+  def box
+    self.class.box
+  end
 
+  def panel
+    self.class.panel
   end
+
 end

data/lib/liza/base/controller_test.rb

@@ -1,12 +1,10 @@
-module Liza
-  class ControllerTest < UnitTest
-    test :subject_class do
-      assert subject_class == Liza::Controller
-    end
+class Liza::ControllerTest < Liza::UnitTest
+  test :subject_class do
+    assert subject_class == Liza::Controller
+  end
 
-    test :settings do
-      assert subject_class.log_level == :normal
-      assert subject_class.log_color == :white
-    end
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :white
   end
 end

data/lib/liza/base/panel.rb

@@ -1,39 +1,54 @@
-module Liza
-  class Panel < Unit
-    inherited_explicitly_sets_system
+class Liza::Panel < Liza::Unit
+  inherited_explicitly_sets_system
 
-    def self.on_connected box_klass
-      set :box, box_klass
-    end
+  def self.on_connected box_klass
+    set :box, box_klass
+  end
 
-    def self.box
-      get :box
-    end
+  def self.box
+    get :box
+  end
 
-    def box
-      self.class.box
-    end
+  def box
+    self.class.box
+  end
 
-    def initialize name
-      @name = name
-    end
+  def initialize key
+    @key = key
+    @blocks = []
+    @unstarted = true
+  end
 
-    def log log_level = :normal, string
-      raise "invalid log_level `#{log_level}`" unless LOG_LEVELS.keys.include? log_level
-      return unless log_level? log_level
+  def push block
+    @unstarted = true
+    @blocks.push block
+  end
 
-      source = box.to_s
+  def started
+    return self unless defined? @unstarted
+    remove_instance_variable :@unstarted
 
-      x = source.size
-      source = source.bold.colorize log_color
+    @blocks.each { |bl| instance_eval &bl }
+    @blocks.clear
 
-      y = source.size
-      source = "#{source}.#{@name}".ljust(LOG_JUST+y-x)
+    self
+  end
+  
+  def log log_level = :normal, string
+    raise "invalid log_level `#{log_level}`" unless LOG_LEVELS.keys.include? log_level
+    return unless log_level? log_level
+
+    source = box.to_s
 
-      string = "#{source} #{string}"
-      
-      DevBox.logs.call string
-    end
+    x = source.size
+    source = source.bold.colorize log_color
 
+    y = source.size
+    source = "#{source}[:#{@key}]".ljust(LOG_JUST+y-x)
+
+    string = "#{source} #{string}"
+    
+    DevBox[:log].call string
   end
+
 end

data/lib/liza/base/panel_test.rb

@@ -1,16 +1,14 @@
-module Liza
-  class PanelTest < UnitTest
-    test :subject_class do
-      assert subject_class == Liza::Panel
-    end
+class Liza::PanelTest < Liza::UnitTest
+  test :subject_class do
+    assert subject_class == Liza::Panel
+  end
 
-    def subject
-      subject_class.new "name"
-    end
+  def subject
+    subject_class.new "name"
+  end
 
-    test :settings do
-      assert subject_class.log_level == :normal
-      assert subject_class.log_color == :white
-    end
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :white
   end
 end

data/lib/liza/meta/part.rb

@@ -1,19 +1,17 @@
-module Liza
-  class Part < Unit
-    def self.insertion &block
-      if block_given?
-        @insertion = block
-      else
-        @insertion
-      end
+class Liza::Part < Liza::Unit
+  def self.insertion &block
+    if block_given?
+      @insertion = block
+    else
+      @insertion
     end
+  end
 
-    def self.extension &block
-      if block_given?
-        @extension = block
-      else
-        @extension
-      end
+  def self.extension &block
+    if block_given?
+      @extension = block
+    else
+      @extension
     end
   end
 end

data/lib/liza/meta/part_extension.rb

@@ -1,18 +1,16 @@
-module Liza
-  class PartExtension
-    def self.solder
-      @solder ||=
-        if first_namespace == "Liza"
-          Liza.const_get last_namespace[0..-12]
-        else
-          Object.const_get name[0..-12]
-        end
-    end
-
-    def initialize solder
-      @solder = solder
-    end
+class Liza::PartExtension
+  def self.solder
+    @solder ||=
+      if first_namespace == "Liza"
+        Liza.const_get last_namespace[0..-12]
+      else
+        Object.const_get name[0..-12]
+      end
+  end
 
-    attr_reader :solder
+  def initialize solder
+    @solder = solder
   end
-end
+
+  attr_reader :solder
+end

data/lib/liza/meta/part_test.rb

@@ -1,8 +1,6 @@
-module Liza
-  class PartTest < Test
-    test :subject_class do
-      assert subject_class == Liza::Part
-    end
-
+class Liza::PartTest < Liza::Test
+  test :subject_class do
+    assert subject_class == Liza::Part
   end
+
 end

data/lib/liza/meta/system.rb

@@ -1,20 +1,18 @@
-module Liza
-  class System < Unit
+class Liza::System < Liza::Unit
 
-    def self.const name
-      const_get name.to_s.camelize
-    end
+  def self.const name
+    const_get name.to_s.camelize
+  end
 
-    def self.insertion key, &block
-      if block_given?
-        registrar[:"insertion_#{key}"] = block
-      else
-        registrar[:"insertion_#{key}"]
-      end
+  def self.insertion key, &block
+    if block_given?
+      registrar[:"insertion_#{key}"] = block
+    else
+      registrar[:"insertion_#{key}"]
     end
+  end
 
-    def self.registrar
-      @registrar ||= {}
-    end
+  def self.registrar
+    @registrar ||= {}
   end
 end

data/lib/liza/meta/system_test.rb

@@ -1,13 +1,11 @@
-module Liza
-  class SystemTest < UnitTest
-    test :subject_class do
-      assert subject_class == Liza::System
-    end
-
-    test :settings do
-      assert subject_class.log_level == :normal
-      assert subject_class.log_color == :white
-    end
+class Liza::SystemTest < Liza::UnitTest
+  test :subject_class do
+    assert subject_class == Liza::System
+  end
 
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :white
   end
+
 end

data/lib/liza/ruby_test.rb

@@ -1,9 +1,7 @@
-module Liza
-  class RubyTest < Test
-
-    def self.subject_class
-      @subject_class ||= Object.const_get last_namespace[0..-5]
-    end
+class Liza::RubyTest < Liza::Test
 
+  def self.subject_class
+    @subject_class ||= Object.const_get last_namespace[0..-5]
   end
+
 end

data/lib/liza/ruby_tests/module_test.rb

@@ -7,7 +7,7 @@ class Liza::ModuleTest < Liza::RubyTest
   test :source_location do
     assert Object.source_location == []
 
-    assert Liza::Command.source_location[1] == 2
+    assert Liza::Command.source_location[1] == 1
     assert AppCommand.source_location[1] == 1
   end
 

data/lib/liza/test/test.rb

@@ -1,13 +1,10 @@
-module Liza
-  class Test < Unit
+class Liza::Test < Liza::Unit
 
-    part :test_assertions
-    part :test_assertions_advanced
-    part :test_dsl
-    part :test_log
-    part :test_subject
-    part :test_tree
+  part :test_assertions
+  part :test_assertions_advanced
+  part :test_dsl
+  part :test_log
+  part :test_subject
+  part :test_tree
 
-  end
 end
-