lizarb 1.0.1 → 1.0.2

data/app/dev/commands/quadratic_command.rb

@@ -0,0 +1,66 @@
+class QuadraticCommand < NarrativeMethodCommand
+  class Error < Error; end
+
+  def self.quadratic(a, b, c)
+    d = b**2 - 4 * a * c
+    case
+    when d < 0
+      []
+    when d == 0
+      [-b / (2 * a)]
+    else
+      [(-b + Math.sqrt(d)) / (2 * a), (-b - Math.sqrt(d)) / (2 * a)].sort
+    end
+  end
+
+  # instance methods
+
+  def validate
+    log "Called #{self}.#{__method__}"
+    raise Invalid, "liza quadratic 0 0 0" if @args.size != 3
+
+    @a = @args[0].to_f
+    @b = @args[1].to_f
+    @c = @args[2].to_f
+
+    log "@a = #{@a}"
+    log "@b = #{@b}"
+    log "@c = #{@c}"
+
+    raise Invalid, "a can't be zero" if @a == 0
+  end
+
+  def perform
+    log "Called #{self}.#{__method__}"
+
+    @result = self.class.quadratic(@a, @b, @c)
+    log "RESULT: #{@result}"
+    log render "success.txt"
+  end
+
+end
+
+__END__
+
+# help.txt.erb
+
+NAME:
+
+  liza quadratic
+
+DESCRIPTION:
+
+  Calculates the result of a quadratic equation.
+
+USAGE:
+
+  liza quadratic <a> <b> <c>
+
+  where <a>, <b> and <c> are numbers.
+
+EXAMPLES:
+
+  liza quadratic 1 0 0
+  liza quadratic 1 0 1
+  liza quadratic 1 1 1
+  liza quadratic 1 2 1

data/app/dev/commands/quadratic_command_test.rb

@@ -0,0 +1,47 @@
+class QuadraticCommandTest < NarrativeMethodCommandTest
+
+  test :subject_class do
+    assert subject_class == QuadraticCommand
+  end
+
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
+  end
+
+  test :subject_class, :quadratic do
+    assert subject_class.quadratic(1, -11, 30) == [5, 6]
+    assert subject_class.quadratic(1, +11, 30) == [-6, -5]
+  end
+
+  test :validate, :valid do
+    subject = subject_class.new
+    subject.instance_variable_set :@args, ["1", "2", "3"]
+    subject.validate
+    assert subject.instance_variable_get(:@a) == 1
+    assert subject.instance_variable_get(:@b) == 2
+    assert subject.instance_variable_get(:@c) == 3
+  end
+
+  test :validate, :invalid do
+    subject = subject_class.new
+    subject.instance_variable_set :@args, ["0", "2", "3"]
+    begin
+      subject.validate
+      assert false
+    rescue QuadraticCommand::Invalid
+      assert true
+    else
+      assert false
+    end
+  end
+
+  test :perform do
+    subject = subject_class.new
+    subject.instance_variable_set :@args, ["1", "-11", "30"]
+    subject.validate
+    subject.perform
+    assert subject.instance_variable_get(:@result) == [5, 6]
+  end
+
+end

data/app/dev/generators/bench_generator/bench.rb.erb

@@ -0,0 +1,24 @@
+class <%= name.camelize %>Bench < AppBench
+  main_dsl
+
+  setup do
+    N = 1_000_000
+  end
+
+  mark "alternative 1" do
+    i = 0
+
+    while (i += 1) <= N
+      a = "1".to_sym
+    end
+  end
+
+  mark "alternative 2" do
+    i = 0
+
+    while (i += 1) <= N
+      a = :"1"
+    end
+  end
+
+end

data/app/dev/generators/bench_generator/bench_test.rb.erb

@@ -0,0 +1,12 @@
+class <%= name.camelize %>BenchTest < AppBenchTest
+
+  test :subject_class do
+    assert subject_class == <%= name.camelize %>Bench
+  end
+
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
+  end
+
+end

data/app/dev/generators/bench_generator.rb

@@ -6,62 +6,13 @@ class BenchGenerator < Liza::Generator
   generate :controller do
     folder FOLDER
     filename "#{name}_bench.rb"
-    content bench_content
+    content render "bench.rb"
   end
 
   generate :controller_test do
     folder FOLDER
     filename "#{name}_bench_test.rb"
-    content bench_test_content
-  end
-
-  # helper methods
-
-  def bench_content
-    <<~CODE
-class #{name.camelize}Bench < AppBench
-
-  main_dsl
-
-  setup do
-    N = 1_000_000
-  end
-
-  mark "alternative 1" do
-    i = 0
-
-    while (i += 1) <= N
-      a = "1".to_sym
-    end
-  end
-
-  mark "alternative 2" do
-    i = 0
-
-    while (i += 1) <= N
-      a = :"1"
-    end
-  end
-
-end
-    CODE
-  end
-
-  def bench_test_content
-    <<~CODE
-class #{name.camelize}BenchTest < Liza::BenchTest
-
-  test :subject_class do
-    assert subject_class == #{name.camelize}Bench
-  end
-
-  test :settings do
-    assert subject_class.log_level == :normal
-    assert subject_class.log_color == :green
-  end
-
-end
-    CODE
+    content render "bench_test.rb"
   end
 
 end

data/app/dev/generators/command_generator/command.rb.erb

@@ -0,0 +1,26 @@
+class <%= name.camelize %>Command < AppCommand
+
+  def self.call args
+    log :higher, "Called #{self}.#{__method__} with args #{args}"
+    new(args).call
+  end
+
+  def initialize args
+    @args = args
+  end
+
+  def call
+    log :higher, "Called #{self}.#{__method__}"
+
+    text = render "text.txt"
+
+    log :higher, "text: #{text}"
+  end
+
+end
+
+__END__
+
+# text.txt.erb
+Called <%%= self %>.<%%= __method__ %>
+@args: <%%= @args %>

data/app/dev/generators/command_generator/command_test.rb.erb

@@ -0,0 +1,12 @@
+class <%= name.camelize %>CommandTest < AppCommandTest
+
+  test :subject_class do
+    assert subject_class == <%= name.camelize %>Command
+  end
+
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
+  end
+
+end

data/app/dev/generators/command_generator.rb

@@ -6,46 +6,13 @@ class CommandGenerator < Liza::Generator
   generate :controller do
     folder FOLDER
     filename "#{name}_command.rb"
-    content command_content
+    content render "command.rb"
   end
 
   generate :controller_test do
     folder FOLDER
     filename "#{name}_command_test.rb"
-    content command_test_content
-  end
-
-  # helper methods
-
-  def command_content
-    <<~CODE
-class #{name.camelize}Command < Liza::Command
-
-  def self.call args
-    log :higher, "Called \#{self}.\#{__method__} with args \#{args}"
-
-    #
-  end
-
-end
-    CODE
-  end
-
-  def command_test_content
-    <<~CODE
-class #{name.camelize}CommandTest < Liza::CommandTest
-
-  test :subject_class do
-    assert subject_class == #{name.camelize}Command
-  end
-
-  test :settings do
-    assert subject_class.log_level == :normal
-    assert subject_class.log_color == :green
-  end
-
-end
-    CODE
+    content render "command_test.rb"
   end
 
 end

data/app/dev/generators/record_generator.rb

@@ -0,0 +1,46 @@
+class RecordGenerator < Liza::Generator
+  main_dsl
+
+  FOLDER = "app/net/records"
+
+  generate :controller do
+    folder FOLDER
+    filename "#{name}_record.rb"
+    content record_content name
+  end
+
+  generate :controller_test do
+    folder FOLDER
+    filename "#{name}_record_test.rb"
+    content record_test_content name
+  end
+
+  # helper methods
+
+  def record_content name
+    <<~CODE
+class #{name.camelize}Record < AppRecord
+  set :table, :#{name}s
+
+end
+    CODE
+  end
+
+  def record_test_content name
+    <<~CODE
+class #{name.camelize}RecordTest < Liza::RecordTest
+
+  test :subject_class do
+    assert subject_class == #{name.camelize}Record
+  end
+
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :red
+  end
+
+end
+    CODE
+  end
+
+end

data/app/dev/generators/{model_generator_test.rb → record_generator_test.rb}

@@ -1,7 +1,7 @@
-class ModelGeneratorTest < Liza::GeneratorTest
+class RecordGeneratorTest < Liza::GeneratorTest
 
   test :subject_class do
-    assert subject_class == ModelGenerator
+    assert subject_class == RecordGenerator
   end
 
   test :settings do

data/app/net/{models/app_model.rb → records/app_record.rb}

@@ -1,4 +1,4 @@
-class AppModel < Liza::Model
+class AppRecord < Liza::Record
   db :sqlite
 
   def self.create_tables!
@@ -18,3 +18,4 @@ SQLITE
   end
 
 end
+

data/app/net/{models/post_model_test.rb → records/app_record_test.rb}

@@ -1,7 +1,7 @@
-class PostModelTest < Liza::ModelTest
+class AppRecordTest < Liza::RecordTest
 
   test :subject_class do
-    assert subject_class == PostModel
+    assert subject_class == AppRecord
     assert subject_class.db == SqliteDb.current
   end
 

data/app/net/records/post_record.rb

@@ -0,0 +1,4 @@
+class PostRecord < AppRecord
+  set :table, :posts
+
+end

data/app/net/{models/app_model_test.rb → records/post_record_test.rb}

@@ -1,7 +1,7 @@
-class AppModelTest < Liza::ModelTest
+class PostRecordTest < Liza::RecordTest
 
   test :subject_class do
-    assert subject_class == AppModel
+    assert subject_class == PostRecord
     assert subject_class.db == SqliteDb.current
   end
 

data/app/net/records/user_record.rb

@@ -0,0 +1,4 @@
+class UserRecord < AppRecord
+  set :table, :users
+
+end

data/app/net/{models/user_model_test.rb → records/user_record_test.rb}

@@ -1,7 +1,7 @@
-class UserModelTest < Liza::ModelTest
+class UserRecordTest < Liza::RecordTest
 
   test :subject_class do
-    assert subject_class == UserModel
+    assert subject_class == UserRecord
     assert subject_class.db == SqliteDb.current
   end
 

data/app/web/requests/api_request.rb

@@ -31,31 +31,32 @@ class ApiRequest < AppRequest
       body = render_route_not_found env["LIZA_PATH"]
     end
 
-    log status
+    body = body.to_json
+
     [status, headers, [body]]
   end
 
   def self.render_route_api_auth_sign_up
-    "route: render_route_api_auth_sign_up"
+    {route: "render_route_api_auth_sign_up"}
   end
 
   def self.render_route_api_auth_sign_in
-    "route: render_route_api_auth_sign_in"
+    {route: "render_route_api_auth_sign_in"}
   end
 
   def self.render_route_api_auth_account
-    "route: render_route_api_auth_account"
+    {route: "render_route_api_auth_account"}
   end
 
   def self.render_route_api_auth_sign_out
-    "route: render_route_api_auth_sign_out"
+    {route: "render_route_api_auth_sign_out"}
   end
 
   def self.render_route_api_users
-    "route: render_route_api_users"
+    {route: "render_route_api_users"}
   end
 
   def self.render_route_not_found path
-    "route: render_route_not_found #{path}"
+    {route: "render_route_not_found #{path}"}
   end
 end

data/app/web/requests/assets_request.rb

@@ -10,33 +10,32 @@ class AssetsRequest < AppRequest
 
     #
 
-    @status = 200
-    @headers = {
+    status = 200
+    headers = {
       "Framework" => "Liza #{Lizarb::VERSION}"
     }
-    @body = ""
+    body = ""
 
-    render_action_admin_format_js  if action == :admin && format == :js
-    render_action_admin_format_css if action == :admin && format == :css
-    render_action_app_format_js    if action == :app   && format == :js
-    render_action_app_format_css   if action == :app   && format == :css
+    body = render_action_admin_format_js  if action == :admin && format == :js
+    body = render_action_admin_format_css if action == :admin && format == :css
+    body = render_action_app_format_js    if action == :app   && format == :js
+    body = render_action_app_format_css   if action == :app   && format == :css
 
-    log @status
-    [@status, @headers, [@body]]
+    [status, headers, [body]]
   end
 
   # helper methods
 
   def render_action_admin_format_js
-    @body = "alert('it works')"
+    "alert('it works')"
   end
 
   def render_action_admin_format_css
-    @body = "body { background: gray }"
+    "body { background: gray }"
   end
 
   def render_action_app_format_js
-    @body = <<-CODE
+    <<-CODE
 window.onload = () => {
   var h1 = document.createElement("h1");
   h1.setAttribute("style", "color: white");
@@ -47,7 +46,7 @@ window.onload = () => {
   end
 
   def render_action_app_format_css
-    @body = <<-CODE
+    <<-CODE
 body {
 background: ##{random_color};
 font-family: Roboto;

data/app/web/requests/root_request.rb

@@ -14,14 +14,13 @@ class RootRequest < AppRequest
 
     @body = ""
 
-    if action == "root"
-      render_action_root
+    if action == "index"
+      render_action_index
     else
       @status = 404
-      render_action_not_found
+      render_action_not_found action
     end
 
-    log @status
     [@status, @headers, [@body]]
   rescue => e
     @status = 500
@@ -31,7 +30,7 @@ class RootRequest < AppRequest
     [@status, @headers, [@body]]
   end
 
-  def self.render_action_root
+  def self.render_action_index
     h1 = "Ruby Works!"
 
     @body = <<~CODE
@@ -48,8 +47,8 @@ class RootRequest < AppRequest
     CODE
   end
 
-  def self.render_action_not_found
-    @body = "Ruby couldn't find your page!"
+  def self.render_action_not_found action
+    @body = "Ruby couldn't find your page! action: #{action}"
   end
 
 end

data/app/web/requests/root_request_test.rb

@@ -6,7 +6,7 @@ class RootRequestTest < AppRequestTest
 
   test :actions, :root do
     env = {
-      "LIZA_ACTION" => "root",
+      "LIZA_ACTION" => "index",
     }
 
     status, headers, body = subject_class.call env

data/app/web_box.rb

@@ -1,5 +1,13 @@
 class WebBox < Liza::WebBox
 
+  rack do
+    # Set up your rack panel per the DSL in http://guides.lizarb.org/panels/rack.html
+    
+    # set :files, App.root.join("web_files")
+    # set :host, "localhost"
+    # set :port, 3000
+  end
+
   requests do
     # Set up your request panel per the DSL in http://guides.lizarb.org/panels/request.html
 

data/app_new/Procfile

@@ -1,3 +1,3 @@
 # FOR HEROKU
 
-web: LIZA_MODE=demo bundle exec liza web h=0.0.0.0 p=$PORT
+web: LIZA_MODE=demo bundle exec liza rack h=0.0.0.0 p=$PORT

data/exe/lrb

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+load "#{__dir__}/lizarb"

data/lib/app.rb

@@ -11,6 +11,10 @@ module App
     puts s.bold
   end
 
+  def logv s
+    log s if $VERBOSE
+  end
+
   # called from "#{APP_DIR}/app"
   def call argv, &block
     instance_exec &block
@@ -48,8 +52,8 @@ module App
     loader.tag = Liza.to_s
 
     # ORDER MATTERS: IGNORE, COLLAPSE, PUSH
-    loader.collapse "#{fname_for Liza}/**/*"
-    loader.push_dir "#{fname_for Liza}", namespace: Liza
+    loader.collapse "#{Liza.source_location_radical}/**/*"
+    loader.push_dir "#{Liza.source_location_radical}", namespace: Liza
 
     loader.enable_reloading
     loader.setup
@@ -69,8 +73,8 @@ module App
 
     @systems.each do |k, klass|
       # ORDER MATTERS: IGNORE, COLLAPSE, PUSH
-      loader.collapse "#{fname_for klass}/**/*"
-      loader.push_dir "#{fname_for klass}", namespace: klass
+      loader.collapse "#{klass.source_location_radical}/**/*"
+      loader.push_dir "#{klass.source_location_radical}", namespace: klass
     end
 
     # ORDER MATTERS: IGNORE, COLLAPSE, PUSH
@@ -83,6 +87,8 @@ module App
     @systems.each do |k, klass|
       connect_system k, klass
     end
+
+    @systems.freeze
   end
 
   # loaders
@@ -133,7 +139,10 @@ module App
   end
 
   def self.require_system key
+    t = Time.now
+    logv "App.system :#{key}"
     require key
+    logv "App.system :#{key} takes #{t.diff}s"
   rescue LoadError => e
     def e.backtrace; []; end
     raise SystemNotFound, "FILE #{key}.rb not found on $LOAD_PATH", []
@@ -142,6 +151,10 @@ module App
   # parts
 
   def connect_part part_klass, key, system
+    t = Time.now
+    string = "CONNECTING PART #{part_klass.to_s.rjust 25}.part :#{key}"
+    logv string
+
     klass = if system.nil?
               Liza.const "#{key}_part"
             else
@@ -149,8 +162,6 @@ module App
                   .const "#{key}_part"
             end
 
-    log "CONNECTING PART #{part_klass.to_s.rjust 25}.part :#{key}" if $VERBOSE
-
     if klass.insertion
       part_klass.class_exec &klass.insertion
     end
@@ -159,6 +170,7 @@ module App
       klass.const_set :Extension, Class.new(Liza::PartExtension)
       klass::Extension.class_exec &klass.extension
     end
+    logv "#{string} takes #{t.diff}s"
   end
 
   # systems
@@ -189,12 +201,4 @@ module App
     log "CONNECTING SYSTEM - #{t.diff}s for #{color_system_klass} to connect to #{registrar_index} system parts"
   end
 
-  #
-
-  def fname_for klass
-    # /path/to/liza.rb
-    # /path/to/liza
-    Object.const_source_location(klass.name)[0][0..-4]
-  end
-
 end