z4app 0.1.3 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04efb929103f5a4edd790b1c25fc41765890630a1807754cc5e15d6110dc6984
-  data.tar.gz: 34d1d5ede05a7c934318d285fefbc3c686d61b74599acbf4e896664493d5ebe7
+  metadata.gz: 8aef9eea56d6c25507a813a577ff075e5e3ff79700cdfba5cb43b82fed2e3d31
+  data.tar.gz: 055a7302586c350cf558d58f3949a30fec43e54efd215f706b53ad16489dc96a
 SHA512:
-  metadata.gz: e2f26afc4485a9cf288e4cbfed192c89ab12386df51c9e6ffaf3230ab8516e3418b3fb822804d1488cca1e1c57026e5fa6351f65fbf614ac9a1ac270584765cb
-  data.tar.gz: 6c690217d2c9966a5a85b6c84e182d4f03ad5bf41fac7f07dfa82f97ca8ffed4cf69e3c56d57728aeae2f77cbbaf58b90fdb4cd699a0de4bd28451da37802561
+  metadata.gz: 8dd0fe9c4371415a341e82df5571ef0d998f55715b6b27d4d46d952a2cb20a044348134417d4313485baef302c37d29b38d0b1d6e65191e11b146ebf4e29aadd
+  data.tar.gz: a8039199eb7b9ec226c1ca1e8c6a7d98b54b6eca873ccc00dce7a38fbae3c2834afb74491f17fc215985aba25797e42155eaf8398ffb85fd66e7629b96467d4d

data/lib/z4app/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Z4app
-  VERSION = "0.1.3"
+  VERSION = "0.1.6"
   COMMIT = `git log --format="%H" -n 1`.strip
 end

data/lib/z4app.rb

@@ -13,6 +13,104 @@ require_relative "z4app/version"
 module Z4app
   class Error < StandardError; end
 
+  class Embed
+    def initialize script
+      @o = []
+      self.instance_eval script
+    end
+    def result params={}
+      a = [
+        %[<div id='embed'>],
+        @o.join(""),
+        %[</div>]
+      ]
+      return ERB.new(a.join("")).result(binding)
+    end
+    # insert param into embed.
+    def param key
+      return %[<%= params[:#{key}] %>]
+    end
+    # insert text input.
+    def input key, h={}
+      hh = { pattern: '.*', title: 'required.' }.merge(h)
+      @o << %[<h1 class='e'><input name="embed[#{key}]" pattern='#{hh[:pattern]}' title='#{hh[:title]}' placeholder="#{key}"></h1>]
+    end
+    # insert email field.
+    def email k
+      @o << %[<h1 class='e'><input type='email' name='embed[#{k}]' placeholder='#{k}' pattern='.+@.+' title='valid email.'></h1>]
+    end
+    # insert url field.
+    def url k
+      @o << %[<h1 class='e'><input type='url' name='embed[#{k}] placeholder='#{k}' pattern='https://.*' title='valid url.'></h1>]
+    end
+    # insert phone field.
+    def tel k
+      @o << %[<h1 class='e'><input type='tel' name='embed[#{k}] placeholder='#{k}' pattern='\d{10}' title='valid phone number.'></h1>]
+    end
+    # insert textarea.
+    def textarea key, h={}
+      hh = { placeholder: '', value: ''}.merge(h)
+      @o << %[<textarea name='embed[#{key}]' placeholder='#{hh[:placeholder]}'>#{hh[:value]}</textarea>]
+    end
+    # insert color.
+    def color k
+      @o << %[<h1 class='e'><input type='color' id='e_#{e}' name='embed[#{k}]'><label for='e_#{k}'>#{k}</label></h1>]
+    end
+    # insert date.
+    def date k
+      @o << %[<h1 class='e'><input type='date' name='embed[#{k}]'></h1>]
+    end
+    # insert time.
+    def time k
+      @o << %[<h1 class='e'><input type='datetime-local' name='embed[#{k}]'></h1>]
+    end
+    # insert radio button.
+    def radio k
+      @o << %[<h1 class='e'><input type="radio" id="e_#{k}" name="embed[#{k}]" value="true"><label for="e_#{k}">#{k}</label></h1>]
+    end
+    # insert checkbox.
+    def check k
+      @o << %[<h1 class='e'><input type="checkbox" id="e_#{k}" name="embed[#{k}]" value="true"><label for="e_#{k}">#{k}</label></h1>]
+    end
+    # insert selector.
+    def select k, *opts
+      o = []
+      [opts].flatten.each {|e| o << %[<option value="#{e}">#{e}</option>] }
+      @o << %[<h1 class='e'><select name="embed[#{k}]">#{o.join("")}</select></h1>]
+    end
+    # insert number field.
+    def number k, h={}
+      hh = { min: 0, max: 100, value: 1 }.merge(h)
+      @o << %[<h1 class='e'><input type="number" name="embed[#{k}]" value='#{hh[:value]}' min='#{hh[:min]}' max='#{hh[:max]}' placeholder='#{k}'></h1>]
+    end
+    # insert plain text.
+    def text t
+      @o << %[<h2 class='e'>#{t}</h2>]
+    end
+    # set goto field.
+    def goto g, h={}
+      a = []; h.each_pair { |k,v| a << %[#{k}=#{v}] }
+      @o << %[<input type='hidden' name='goto' value='/#{g}?#{a.join("&")}'>]
+    end
+    # add submit button.
+    def submit p
+      @o << %[<h1 class='e'><button id='send'>#{p}</button></h1>]
+    end
+    # set stack push object.
+    def stack c, o
+      @o << %[<input type='hidden' name='action' value='#{c}'>]
+      @o << %[<input type='hidden' name='push' value='#{o}'>]
+    end
+  end
+
+  ##
+  # generate html content.
+  def self.embed s, h={}
+    Embed.new(s).result(h)
+  end
+
+  ##
+  # overwrite event handlers
   def self.on t, k, &b
     @@APP[t][k] = b
   end
@@ -21,7 +119,9 @@ module Z4app
     obj: Hash.new { |h,k| h[k] = lambda { |*a| puts %[[z4app][obj] #{a}]; { time: Time.now.to_s }; } },
     get: Hash.new { |h,k| h[k] = lambda { |*a| puts %[[z4app][get] #{a}]; { time: Time.now.to_s }; } },
     post: Hash.new { |h,k| h[k] = lambda { |*a| puts %[[z4app][post] #{a}]; { time: Time.now.to_s }; } }
-  } 
+  }
+
+  # The web-app server 
   class APP < Sinatra::Base
     include Z4app
     configure do
@@ -33,10 +133,15 @@ module Z4app
     end
 
     on_start { puts "[z4app] OK." }
+
+    def die!
+      Process.kill('TERM', Process.pid)
+    end
     
     # handle dumb shit
     ['robots.txt', 'favicon.ico'].each { |e| get("/#{e}") {}}
-    
+
+    # pwa requirement
     get('/manifest.webmanifest') {
       content_type 'application/manifest+json'
       h = {
@@ -48,6 +153,7 @@ module Z4app
       return JSON.generate(h)
     }
 
+    # pwa requirement
     get('/service-worker.js') {
       content_type 'application/javascript'
       erb :service_worker, layout: false
@@ -70,7 +176,8 @@ module Z4app
       content_type "application/json"
       return JSON.generate(@@APP[:obj][params[:o].to_sym].call(params[:i].to_sym, request))
     }
-    
+
+    # handle form post
     post('/:v') {
       @here = @@APP[:post][params[:v].to_sym].call(params, request)
       if params.has_key? :goto
@@ -80,24 +187,21 @@ module Z4app
       end
     }
     
-    # handle post
+    # handle json post
     post('/') {
       content_type = 'application/json'
       return JSON.generate(@@APP[:post][:index].call(params, request))
     }
   end
-
+  
+  # start server
   def self.init!
-    @@PROC = Process.detach(fork { APP.run! { puts "[z4app][init] OK." } })
-  end
-  def self.proc
-    @@PROC
-  end
-  def self.app
-    @@APP
+    Signal.trap('INT') { APP.die!; exit!; }
+    Process.detach(fork { APP.run! { puts "[z4app][init] OK." } })
   end
 end
 
+# load app script if available
 if File.exist? 'app.rb'
   load 'app.rb'
   puts "[z4app][config] app."
@@ -105,4 +209,3 @@ else
   puts "[z4app][config] default."
 end
 
-Z4app.init!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: z4app
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.6
 platform: ruby
 authors:
 - Erik Olson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-21 00:00:00.000000000 Z
+date: 2023-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webrick