lizarb 1.0.2 → 1.0.3

data/lib/net_system/dev/net_command.rb

@@ -1,14 +1,13 @@
-class NetSystem
-  class NetCommand < Liza::Command
+class NetSystem::NetCommand < Liza::Command
 
-    def self.call args
-      log :higher, "Called #{self} with args #{args}"
+  def self.call args
+    log :higher, "Called #{self} with args #{args}"
 
-      ruby_time   = Time.now
-      redis_time  = ::NetBox.databases.redis.now
-      sqlite_time = ::NetBox.databases.sqlite.now
-      # redis_time  = ::RedisDb.current.now
-      # sqlite_time = ::SqliteDb.current.now
+    ruby_time   = Time.now
+    redis_time  = ::NetBox.databases.redis.now
+    sqlite_time = ::NetBox.databases.sqlite.now
+    # redis_time  = ::RedisDb.current.now
+    # sqlite_time = ::SqliteDb.current.now
 
       puts <<-OUTPUT.bold
 
@@ -17,8 +16,7 @@ class NetSystem
           Time for Sqlite:  #{sqlite_time.to_s.light_red}
 
       OUTPUT
-      Liza::DevCommand.call []
-    end
-
+    Liza::DevCommand.call []
   end
+
 end

data/lib/net_system/net/controllers/client/redis_client.rb

@@ -1,28 +1,26 @@
-class NetSystem
-  class RedisClient < Client
+class NetSystem::RedisClient < NetSystem::Client
 
-    # https://redis.io/
-    # https://github.com/redis/redis-rb
-    def initialize *args
-      args = [url: Liza.const(:net_box).clients.get(:redis_url)] if args.empty?
-      log "Connecting to #{args}"
-      @conn = Redis.new *args
-    end
-
-    attr_reader :conn
+  # https://redis.io/
+  # https://github.com/redis/redis-rb
+  def initialize *args
+    args = [url: NetBox[:client].get(:redis_url)] if args.empty?
+    log "Connecting to #{args}"
+    @conn = Redis.new *args
+  end
 
-    def call cmd_name, *args
-      t = Time.now
-      result = @conn.send cmd_name, *args
+  attr_reader :conn
 
-      result
-    ensure
-      log "#{t.diff}s | #{cmd_name} | #{args}"
-    end
+  def call cmd_name, *args
+    t = Time.now
+    result = @conn.send cmd_name, *args
 
-    def now
-      call :time
-    end
+    result
+  ensure
+    log "#{t.diff}s | #{cmd_name} | #{args}"
+  end
 
+  def now
+    call :time
   end
+
 end

data/lib/net_system/net/controllers/client/redis_client_test.rb

@@ -1,29 +1,27 @@
-class NetSystem
-  class RedisClientTest < ClientTest
+class NetSystem::RedisClientTest < NetSystem::ClientTest
 
-    def subject
-      @subject ||= subject_class.new
-    end
-
-    test :subject_class do
-      assert subject_class == Liza::RedisClient
-    end
+  def subject
+    @subject ||= subject_class.new
+  end
 
-    test :subject do
-      assert subject.conn.class == Redis
-    end
+  test :subject_class do
+    assert subject_class == NetSystem::RedisClient
+  end
 
-    test :call do
-      result = subject.call :keys
-      assert result.class == Array
-      assert result.count == 0
-    end
+  test :subject do
+    assert subject.conn.class == Redis
+  end
 
-    test :now do
-      result = subject.now
-      assert result.class == Array
-      assert result.map(&:class) == [Integer, Integer]
-    end
+  test :call do
+    result = subject.call :keys
+    assert result.class == Array
+    assert result.count == 0
+  end
 
+  test :now do
+    result = subject.now
+    assert result.class == Array
+    assert result.map(&:class) == [Integer, Integer]
   end
+
 end

data/lib/net_system/net/controllers/client/sqlite_client.rb

@@ -1,28 +1,26 @@
-class NetSystem
-  class SqliteClient < Client
+class NetSystem::SqliteClient < NetSystem::Client
 
-    # https://www.sqlite.org/
-    # https://github.com/sparklemotion/sqlite3-ruby
-    def initialize *args
-      args = [Liza.const(:net_box).clients.get(:sqlite)] if args.empty?
-      log "Connecting to #{args}"
-      @conn = SQLite3::Database.new *args
-    end
-
-    attr_reader :conn
+  # https://www.sqlite.org/
+  # https://github.com/sparklemotion/sqlite3-ruby
+  def initialize *args
+    args = [NetBox[:client].get(:sqlite_path)] if args.empty?
+    log "Connecting to #{args}"
+    @conn = SQLite3::Database.new *args
+  end
 
-    def call sql, *args
-      t = Time.now
-      result = @conn.execute2 sql, *args
+  attr_reader :conn
 
-      result
-    ensure
-      log "#{t.diff}s | #{sql} | #{args}"
-    end
+  def call sql, *args
+    t = Time.now
+    result = @conn.execute2 sql, *args
 
-    def now
-      call "SELECT strftime('%Y-%m-%dT%H:%M:%S.%f', 'now', 'localtime');"
-    end
+    result
+  ensure
+    log "#{t.diff}s | #{sql} | #{args}"
+  end
 
+  def now
+    call "SELECT strftime('%Y-%m-%dT%H:%M:%S.%f', 'now', 'localtime');"
   end
+
 end

data/lib/net_system/net/controllers/client/sqlite_client_test.rb

@@ -1,29 +1,27 @@
-class NetSystem
-  class SqliteClientTest < ClientTest
+class NetSystem::SqliteClientTest < NetSystem::ClientTest
 
-    def subject
-      @subject ||= subject_class.new ":memory:"
-    end
-
-    test :subject_class do
-      assert subject_class == Liza::SqliteClient
-    end
+  def subject
+    @subject ||= subject_class.new ":memory:"
+  end
 
-    test :subject do
-      assert subject.conn.class == SQLite3::Database
-    end
+  test :subject_class do
+    assert subject_class == NetSystem::SqliteClient
+  end
 
-    test :call do
-      result = subject.call "SELECT name, sql FROM sqlite_master WHERE type = 'table';"
-      assert result == [["name", "sql"]]
-    end
+  test :subject do
+    assert subject.conn.class == SQLite3::Database
+  end
 
-    test :now do
-      result = subject.now
-      assert result.class == Array
-      assert result[0] == ["strftime('%Y-%m-%dT%H:%M:%S.%f', 'now', 'localtime')"]
-      assert result[1][0].class == String
-    end
+  test :call do
+    result = subject.call "SELECT name, sql FROM sqlite_master WHERE type = 'table';"
+    assert result == [["name", "sql"]]
+  end
 
+  test :now do
+    result = subject.now
+    assert result.class == Array
+    assert result[0] == ["strftime('%Y-%m-%dT%H:%M:%S.%f', 'now', 'localtime')"]
+    assert result[1][0].class == String
   end
+
 end

data/lib/net_system/net/controllers/client.rb

@@ -1,5 +1,3 @@
-class NetSystem
-  class Client < Liza::Controller
+class NetSystem::Client < Liza::Controller
 
-  end
 end

data/lib/net_system/net/controllers/client_test.rb

@@ -1,14 +1,12 @@
-class NetSystem
-  class ClientTest < Liza::ControllerTest
+class NetSystem::ClientTest < Liza::ControllerTest
 
-    test :subject_class do
-      assert subject_class == NetSystem::Client
-    end
-
-    test :settings do
-      assert subject_class.log_level == :normal
-      assert subject_class.log_color == :red
-    end
+  test :subject_class do
+    assert subject_class == NetSystem::Client
+  end
 
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :red
   end
+
 end

data/lib/net_system/net/controllers/database/redis_db.rb

@@ -1,11 +1,9 @@
-class NetSystem
-  class RedisDb < Database
-    set_client :redis
-
-    def now
-      array = client.now
-      Time.at array[0]
-    end
+class NetSystem::RedisDb < NetSystem::Database
+  set_client :redis
 
+  def now
+    array = client.now
+    Time.at array[0]
   end
+
 end

data/lib/net_system/net/controllers/database/redis_db_test.rb

@@ -1,23 +1,21 @@
-class NetSystem
-  class RedisDbTest < DatabaseTest
+class NetSystem::RedisDbTest < NetSystem::DatabaseTest
 
-    test :subject_class do
-      assert subject_class == NetSystem::RedisDb
-    end
+  test :subject_class do
+    assert subject_class == NetSystem::RedisDb
+  end
 
-    test :subject do
-      assert subject.client.class == NetSystem::RedisClient
-    end
+  test :subject do
+    assert subject.client.class == NetSystem::RedisClient
+  end
 
-    test :now do
-      t = subject.now
-      assert! t.is_a? Time
-      assert t.yday == Time.now.yday
-    end
+  test :now do
+    t = subject.now
+    assert! t.is_a? Time
+    assert t.yday == Time.now.yday
+  end
 
-    # test :call do
-    #   todo "write this"
-    # end
+  # test :call do
+  #   todo "write this"
+  # end
 
-  end
 end

data/lib/net_system/net/controllers/database/sqlite_db.rb

@@ -1,11 +1,9 @@
-class NetSystem
-  class SqliteDb < Database
-    set_client :sqlite
-
-    def now
-      array = client.now
-      Time.parse array[1][0]
-    end
+class NetSystem::SqliteDb < NetSystem::Database
+  set_client :sqlite
 
+  def now
+    array = client.now
+    Time.parse array[1][0]
   end
+
 end

data/lib/net_system/net/controllers/database/sqlite_db_test.rb

@@ -1,23 +1,21 @@
-class NetSystem
-  class SqliteDbTest < DatabaseTest
+class NetSystem::SqliteDbTest < NetSystem::DatabaseTest
 
-    test :subject_class do
-      assert subject_class == NetSystem::SqliteDb
-    end
+  test :subject_class do
+    assert subject_class == NetSystem::SqliteDb
+  end
 
-    test :subject do
-      assert subject.client.class == NetSystem::SqliteClient
-    end
+  test :subject do
+    assert subject.client.class == NetSystem::SqliteClient
+  end
 
-    test :now do
-      t = subject.now
-      assert! t.is_a? Time
-      assert t.yday == Time.now.yday
-    end
+  test :now do
+    t = subject.now
+    assert! t.is_a? Time
+    assert t.yday == Time.now.yday
+  end
 
-    # test :call do
-    #   todo "write this"
-    # end
+  # test :call do
+  #   todo "write this"
+  # end
 
-  end
 end

data/lib/net_system/net/controllers/database.rb

@@ -1,33 +1,31 @@
-class NetSystem
-  class Database < Liza::Controller
+class NetSystem::Database < Liza::Controller
 
-    def self.inherited sub
-      super
+  def self.inherited sub
+    super
 
-      return if sub.name.nil?
-      return if sub.name.end_with? "Db"
-      raise "please rename #{sub.name} to #{sub.name}Db"
-    end
+    return if sub.name.nil?
+    return if sub.name.end_with? "Db"
+    raise "please rename #{sub.name} to #{sub.name}Db"
+  end
 
-    attr_reader :client
+  attr_reader :client
 
-    def initialize client: get(:client).new
-      @client = client
-    end
+  def initialize client: get(:client).new
+    @client = client
+  end
 
-    def self.set_client client_id
-      set :client, Liza.const("#{client_id}_client")
-    end
+  def self.set_client client_id
+    set :client, Liza.const("#{client_id}_client")
+  end
 
-    def self.current
-      Thread.current[last_namespace] ||= begin
-        log "Connecting to #{last_namespace}"
-        new
-      end
+  def self.current
+    Thread.current[last_namespace] ||= begin
+      log "Connecting to #{last_namespace}"
+      new
     end
+  end
 
-    def self.call(...); current.call(...); end
-    def call(...); @client.call(...); end
+  def self.call(...); current.call(...); end
+  def call(...); @client.call(...); end
 
-  end
 end

data/lib/net_system/net/controllers/database_test.rb

@@ -1,14 +1,12 @@
-class NetSystem
-  class DatabaseTest < Liza::ControllerTest
+class NetSystem::DatabaseTest < Liza::ControllerTest
 
-    test :subject_class do
-      assert subject_class == NetSystem::Database
-    end
-
-    test :settings do
-      assert subject_class.log_level == :normal
-      assert subject_class.log_color == :red
-    end
+  test :subject_class do
+    assert subject_class == NetSystem::Database
+  end
 
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :red
   end
+
 end

data/lib/net_system/net/controllers/record.rb

@@ -1,31 +1,29 @@
-class NetSystem
-  class Record < Liza::Controller
+class NetSystem::Record < Liza::Controller
 
-    def self.inherited sub
-      super
+  def self.inherited sub
+    super
 
-      return if sub.name.nil?
-      return if sub.name.end_with? "Record"
-      raise "please rename #{sub.name} to #{sub.name}Record"
-    end
+    return if sub.name.nil?
+    return if sub.name.end_with? "Record"
+    raise "please rename #{sub.name} to #{sub.name}Record"
+  end
 
-    def self.db database_id = nil
-      if database_id.nil?
-        db = get :db
-        if db
-          Liza.const(:NetBox).databases.get db
-        else
-          raise "please set a db to record #{self}"
-        end
+  def self.db database_id = nil
+    if database_id.nil?
+      db = get :db
+      if db
+        NetBox[:database].get(db)
+      else
+        raise "please set a db to record #{self}"
+      end
+    else
+      valid = NetBox[:database].settings.keys
+      if valid.include? database_id
+        set :db, database_id
       else
-        valid = Liza.const(:NetBox).databases.settings.keys
-        if valid.include? database_id
-          set :db, database_id
-        else
-          raise "invalid db `#{database_id}`, valid options are #{valid}"
-        end
+        raise "invalid db `#{database_id}`, valid options are #{valid}"
       end
     end
-
   end
+
 end

data/lib/net_system/net/controllers/record_test.rb

@@ -1,14 +1,12 @@
-class NetSystem
-  class RecordTest < Liza::ControllerTest
+class NetSystem::RecordTest < Liza::ControllerTest
 
-    test :subject_class do
-      assert subject_class == NetSystem::Record
-    end
-
-    test :settings do
-      assert subject_class.log_level == :normal
-      assert subject_class.log_color == :red
-    end
+  test :subject_class do
+    assert subject_class == NetSystem::Record
+  end
 
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :red
   end
+
 end

data/lib/net_system/net/net_box.rb

@@ -1,20 +1,15 @@
-class NetSystem
-  class NetBox < Liza::Box
-    has_panel :client, :clients
-    has_controller :client, :clients
+class NetSystem::NetBox < Liza::Box
 
-    # Set up your client panel per the DSL in http://guides.lizarb.org/panels/client.html
-    clients do
-      # set :log_level, ENV["net.client.log_level"]
-    end
-
-    has_panel :database, :databases
-    has_controller :database, :databases
-
-    # Set up your database panel per the DSL in http://guides.lizarb.org/panels/database.html
-    databases do
-      # set :log_level, ENV["net.database.log_level"]
-    end
+  # Set up your client panel per the DSL in http://guides.lizarb.org/panels/client.html
+  panel :client do
+    # set :log_level, ENV["net.client.log_level"]
+  end
 
+  # Set up your database panel per the DSL in http://guides.lizarb.org/panels/database.html
+  panel :database do
+    # set :log_level, ENV["net.database.log_level"]
   end
+
+  has_controller :client, :client
+  has_controller :database, :database
 end

data/lib/net_system/net/net_box_test.rb

@@ -1,19 +1,17 @@
-class NetSystem
-  class NetBoxTest < Liza::BoxTest
+class NetSystem::NetBoxTest < Liza::BoxTest
 
-    test :subject_class do
-      assert subject_class == NetSystem::NetBox
-    end
-
-    test :settings do
-      assert subject_class.log_level == :normal
-      assert subject_class.log_color == :red
-    end
+  test :subject_class do
+    assert subject_class == NetSystem::NetBox
+  end
 
-    test :panels do
-      assert subject_class.clients.is_a? ClientPanel
-      assert subject_class.databases.is_a? DatabasePanel
-    end
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :red
+  end
 
+  test :panels do
+    assert subject_class[:client].is_a? NetSystem::ClientPanel
+    assert subject_class[:database].is_a? NetSystem::DatabasePanel
   end
+
 end

data/lib/net_system/net/panels/client_panel.rb

@@ -1,5 +1,3 @@
-class NetSystem
-  class ClientPanel < Liza::Panel
+class NetSystem::ClientPanel < Liza::Panel
 
-  end
 end

data/lib/net_system/net/panels/client_panel_test.rb

@@ -1,18 +1,16 @@
-class NetSystem
-  class ClientPanelTest < Liza::PanelTest
+class NetSystem::ClientPanelTest < Liza::PanelTest
 
-    test :subject_class do
-      assert subject_class == NetSystem::ClientPanel
-    end
+  test :subject_class do
+    assert subject_class == NetSystem::ClientPanel
+  end
 
-    test :settings do
-      assert subject_class.log_level == :normal
-      assert subject_class.log_color == :red
-    end
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :red
+  end
 
-    # test :call do
-    #   todo "write this"
-    # end
+  # test :call do
+  #   todo "write this"
+  # end
 
-  end
 end

data/lib/net_system/net/panels/database_panel.rb

@@ -1,12 +1,10 @@
-class NetSystem
-  class DatabasePanel < Liza::Panel
+class NetSystem::DatabasePanel < Liza::Panel
 
-    def define key, instance
-      set key, instance
-      define_singleton_method key do
-        get key
-      end
+  def define key, instance
+    set key, instance
+    define_singleton_method key do
+      get key
     end
-
   end
+
 end