browser_app_base 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63c1acfb3f65ae7519a6f74b1a0b2b138fd04f129585070c11e4211850c0a880
-  data.tar.gz: df7982ee9fe63c7442ac7f53404921aec97bd83fce49a36888df10b6dd58be8b
+  metadata.gz: c4b88262d08f7de37833b5e1fafb1051947ff7f0d7eb4c62c11fc906d5869ede
+  data.tar.gz: ca22c6db6f9788d0c098edffc25fabbdde4fcbfa43d15032f6a2a2ec72b16aec
 SHA512:
-  metadata.gz: 9610604a065b31f377798eb211b13ac92b50770d353058d7ad9a969b4b2071c82e9f927725ca3c76fe494b09edb6842ff98323991a126f50ca2dfe51fda2aa3d
-  data.tar.gz: 4db1d41f410dc0f546d4db93895118821530d955cb0b098506b823c2906538c6a131460afea3b156773253e8ca6c8c98bd3564e5ed8a952b2dffefbc7fd3b56d
+  metadata.gz: 2c761441fa372ee9c4dfb924991852d706348685315b30704865c70e28fb728586f3509b55d28cc951849879a3f39f6b67bb9abe49d73f3261f79449459b5202
+  data.tar.gz: 1c02f7dcd2e3b6225762ae66182b4de6d4a1923f6918a19f962337b961e659cced031a714cbdf9949daef94a9c9a7a01262ae0a37a95af68f1e73e2ac7786eca

data/.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    // IntelliSense を使用して利用可能な属性を学べます。
+    // 既存の属性の説明をホバーして表示します。
+    // 詳細情報は次を確認してください: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Debug Local File",
+            "type": "Ruby",
+            "request": "launch",
+            "cwd": "${workspaceRoot}/lib/template/",
+            "program": "${workspaceRoot}/lib/template/start.rb"
+        }
+    ]
+}

data/README.md

@@ -24,16 +24,41 @@ Or install it yourself as:
 
     create_browser_app [options]
      -d, --dir dir_name               application directory
+     -a, --app app_name               application name
      -h, --help                       command help
 
 
-create app templat
+## Create app templat
 
-    $ create_browser_app -d ~/test/
+    $ create_browser_app -d ~/test/ -a MyApp
 
-start application
+## add application code
+    $ cd ~/test/
+    $ vi my_app.rb
 
-    $ cd ~/test/app
+```ruby
+    class MyApp < AppMainBase
+        def start(argv)
+            super
+            # add application code
+        end
+
+        def stop()
+            super
+            # add application code
+        end
+    end
+```
+
+ui application sample
+
+    index.html
+    css/index.css
+    js/main.js
+
+## Start application
+
+    $ cd ~/test/
     $ ruby start.rb
 
 ## Development

data/bin/create_browser_app.rb

@@ -7,6 +7,7 @@ require "optparse"
 opt = OptionParser.new
 o = {}
 opt.on("-d dir_name", "--dir dir_name", "application directory") { |v| o[:dir] = v }
+opt.on("-a app_name", "--app app_name", "application name") { |v| o[:app] = v }
 opt.on("-h", "--help", "command help") { puts opt; exit }
 begin
   opt.parse!(ARGV)
@@ -20,4 +21,4 @@ if o[:dir] == nil
   exit
 end
 
-BrowserAppBase.create o[:dir]
+BrowserAppBase.create o

data/lib/browser_app_base/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BrowserAppBase
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/browser_app_base.rb

@@ -1,20 +1,51 @@
 # frozen_string_literal: true
 
 require_relative "browser_app_base/version"
-
 require "fileutils"
 
 module BrowserAppBase
   class Error < StandardError; end
 
-  # Your code goes here...
+  def self.get_app_file(app)
+    app_file_name = ""
+    app.each_char do |s|
+      if s =~ /[A-Z]/
+        app_file_name += "_" if app_file_name.size != 0
+        app_file_name += s.downcase
+      else
+        app_file_name += s
+      end
+    end
+    return app_file_name + ".rb"
+  end
 
-  def self.create(dir)
+  def self.create(arg)
+    dir = arg[:dir]
+    app = arg[:app]
     puts "create application base #{dir}"
 
     FileUtils.mkdir_p dir
 
     path = File.dirname(File.expand_path(__FILE__))
-    FileUtils.cp_r "#{path}/template", "#{dir}/app"
+    Dir.glob("#{path}/template/*") do |f|
+      puts "#{f} => #{dir}"
+      FileUtils.cp_r f, "#{dir}/"
+    end
+
+    if app
+      app_file = get_app_file(app)
+
+      load_app = <<"EOS"
+      require '#{app_file}'
+      $app = MyApp.new
+EOS
+
+      File.open("#{dir}/app_load.rb", "w") do |f|
+        f.write load_app
+      end
+
+      puts "create #{app_file}"
+      FileUtils.cp "#{dir}/my_app_sample.rb", "#{dir}/#{app_file}"
+    end
   end
 end

data/lib/template/app_load.rb

@@ -0,0 +1,2 @@
+require "my_app_sample.rb"
+$app = MyApp.new

data/lib/template/config.ru

@@ -46,6 +46,6 @@ configure do
 
 end
 
-#\ --port 61820
+#\ --port 62857
 
 run Sinatra::Application

data/lib/template/css/index.css

@@ -50,3 +50,28 @@ textarea.long {
     height: 50vh;
 }
 
+.ui-autocomplete {
+    max-height: 200px;
+    max-width: 500px;
+    overflow-y: auto;
+    overflow-x: hidden;
+    padding-right: 20px;
+}
+#jquery-ui-autocomplete label {
+    float: left;
+    margin-right: 0.5em;
+    color: black;
+    font-size: 15px;
+}
+
+.ui-dialog {
+	position: absolute;
+	top: 0;
+	left: 0;
+	padding: .2em;
+	outline: 0;
+}
+
+.long {
+    width: 90%;
+}

data/lib/template/index.html

@@ -11,8 +11,8 @@
   <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
   <link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/smoothness/jquery-ui.css">
 
-  <script src="http://localhost:61820/js/main.js"></script>
-  <link rel="stylesheet" href="http://localhost:61820/css/index.css" type="text/css">
+  <script src="http://localhost:62857/js/main.js"></script>
+  <link rel="stylesheet" href="http://localhost:62857/css/index.css" type="text/css">
 </head>
 
 <body>
@@ -28,11 +28,28 @@
       </td>
     </tr>
   </table>
-  <input class="inarea" type="text" value="ファイル名を入力" name="search_str" id="search_str">
-  <input class="inarea" type="file" id="upFile" name="upFile" value="upFile"><br>
-  <input type="button" value="確認" onclick="dispFile()">
 
-  <textarea name="log" id="log" class="outarea"></textarea><br/>
+  <div id="dialog1" style="display:none;">
+    <input class="inarea" type="text" name="search_str" id="search_str">
+  </div>
+  <table>
+    <tr>
+      <td class="long"><input class="inarea" type="text" id="upFile" name="upFile"></td>
+      <td><input type="button" id="select_file" value="ファイル選択" /></td>
+    </tr>
+  </table>
+
+  <div id="dialog2" style="display:none;">
+    <input class="inarea" type="text" name="search_str2" id="search_str2">
+  </div>
+  <table>
+    <tr>
+      <td class="long"><input class="inarea" type="text" id="upDir" name="upDir"></td>
+      <td><input type="button" id="select_dir" value="フォルダ選択" /></td>
+    </tr>
+  </table>
+
+  <textarea name="log" id="log" class="outarea"></textarea><br />
 
 </body>
 

data/lib/template/js/main.js

@@ -13,9 +13,6 @@ function server_connect(url) {
         if (evt.data.match(/^startup:/)) {
             file_name = evt.data.replace(/^startup:/, "");
             //alert(file_name);
-            var fs = new ActiveXObject("Scripting.FileSystemObject");
-            var file = fs.CreateTextFile(file_name);
-            file.Close();
         } else {
             var log = $('#log').val() + evt.data + "\n";
             $('#log').val(log);
@@ -24,7 +21,7 @@ function server_connect(url) {
                 psconsole[0].scrollHeight - psconsole.height()
             );
         }
-        
+
     };
     ws.onclose = function () {
         alert("アプリケーションが終了しました!!");
@@ -41,11 +38,20 @@ function send_message(msg) {
     }
 }
 
-function autocomp(id, url) {
+function autocomp(id, file_kind) {
     $("#" + id).autocomplete({
+        autoFocus: true,
+        minLength: 0,
+        delay: 0,
+        select: function (event, ui) {
+            console.log(ui.item.value);
+            jQuery("#" + id).val(ui.item.value);
+            //jQuery(this).autocomplete("search", "");
+            $(this).keydown();
+        },
         source: function (req, resp) {
             $.ajax({
-                url: url(),
+                url: "http://localhost:62857/search?path=" + $("#" + id).val() + "&kind=" + file_kind,
                 type: "GET",
                 cache: false,
                 dataType: "json",
@@ -61,6 +67,42 @@ function autocomp(id, url) {
             });
 
         }
+    }).focus(function () {
+        console.log("forcus");
+        //jQuery(this).autocomplete("search", "");
+        $(this).keydown();
+    });
+}
+
+function select_file_dialog(search_id, file_kind, dialog_id, select_file, file_name) {
+    console.log("select_file_dialog select_file=" + select_file);
+    $("#" + select_file).click(function () {
+        autocomp(search_id, file_kind);
+        console.log("open dialog dialog_id=", dialog_id);
+        $(".ui-autocomplete").css("z-index", 1000);
+        $("#" + search_id).val("/");
+        $("#" + dialog_id).dialog({
+            modal: true
+            , show: "slide"         //表示時のアニメーション
+            , hide: "explode"       //閉じた時のアニメーション
+            , title: "Select File"   //ダイアログのタイトル
+            , width: 580            //ダイアログの横幅
+            , height: 400           //ダイアログの高さ
+            , resizable: false      //リサイズ不可
+            , closeOnEscape: false  //[ESC]キーで閉じられなくする
+            , draggable: false      //ダイアログの移動を不可に
+            , buttons: {
+                "OK": function () {  //OKボタン
+                    $("#" + file_name).val($("#" + search_id).val());
+                    $(this).dialog("close");
+                    $("#" + search_id).autocomplete("destroy");
+                },
+                "Cancel": function () {  //Cancelボタン
+                    $(this).dialog("close");
+                    $("#" + search_id).autocomplete("destroy");
+                }
+            }
+        });
     });
 }
 
@@ -72,22 +114,6 @@ function get_dirname(path) {
     return result.replace(/\//g, "\\");
 }
 
-function select_file(id) {
-    var file = $("#" + id).val();
-    var dir = get_dirname(file);
-    if (dir != "") {
-        dir = dir + "\\*.*";
-    } else {
-        dir = "c:\\*.*";
-    }
-    var path = "";
-    //alert(dir);
-    //path = HtmlDlgHelper.openfiledlg(dir,"*.db","database(*.db)|*.db|all(*.*)|*.*|Text file(*.txt)|*.txt|");
-    path = HtmlDlgHelper.openfiledlg(dir, "", "all(*.*)|*.*|Text file(*.txt)|*.txt|");
-    $("#" + id).val(path);
-    return (path);
-}
-
 function dispFile() {
     var fName = $("#upFile").val();
     alert('選択したファイルの値は' + fName + 'です');
@@ -96,10 +122,10 @@ function dispFile() {
 // 起動時の処理
 $(document).ready(function () {
     // サーバに接続
-    server_connect("ws://localhost:61820/wsserver")
+    server_connect("ws://localhost:62857/wsserver")
     // ウインドウサイズ
-    var width = 600;
-    var height = 700;
+    var width = 800;
+    var height = 600;
     // ウインドウの位置
     $(function () {
         window.resizeTo(width, height);
@@ -107,23 +133,18 @@ $(document).ready(function () {
         //window.moveTo(0,0);
     });
 
-    // オートコンプリート設定
-    var getUrl = function () {
-        var url = "http://localhost:61820/search?path=" + $("#search_str").val();
-        return url;
-    };
-    autocomp("search_str", getUrl);
-
     // ハンドラ登録
-    $("#file").click(function () {
-        select_file("search_str");
+    $("#stop").click(function () {
+        send_message("stop");
     });
+
     $("#exec").click(function () {
         send_message("exec:" + $("#upFile").val());
     });
-    $("#stop").click(function () {
-        send_message("stop");
-    });
+
+    select_file_dialog("search_str", "file", "dialog1", "select_file", "upFile");
+
+    select_file_dialog("search_str2", "dir", "dialog2", "select_dir", "upDir");
 
 });
 

data/lib/template/{server_app.rb → my_app_sample.rb}

@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
-class AppMain
-  def initialize
-    @aboet = false
-  end
+require "server_app_base.rb"
 
-  def start(file)
+class MyApp < AppMainBase
+  def start(argv)
+    super
     begin
       @abort = false
-      puts file
+      puts argv
+      argv.each do |v|
+        yield v if block_given?
+      end
       while true
         yield Time.now.to_s if block_given?
         sleep 1
@@ -20,6 +22,6 @@ class AppMain
   end
 
   def stop()
-    @abort = true
+    super
   end
 end

data/lib/template/server.rb

@@ -1,9 +1,9 @@
-require 'json'
-require 'kconv'
+require "json"
+require "kconv"
 
 class Search < Sinatra::Base
   helpers Sinatra::Streaming
-  get '' do
+  get "" do
     q_hash = {}
     puts request.query_string
     request.query_string.split("&").each do |q|
@@ -14,27 +14,44 @@ class Search < Sinatra::Base
         q_hash[work[0]] = ""
       end
     end
-    str = q_hash["path"].gsub(/\\/,"/")
+    str = q_hash["path"].gsub(/\\/, "/")
     puts "str=#{str}"
+    kind = q_hash["kind"].gsub(/\\/, "/")
+    puts "kind=#{kind}"
     res = []
     str = str.gsub(/\\/, "/")
     dir = File.dirname(str)
-    dir = "c:/" if dir == nil
     file = File.basename(str)
-    file = "/" if file == nil
+    puts "dir=#{dir}"
+    puts "file=#{file}"
+
+    kernel = Facter.value(:kernel)
+    if kernel == "windows"
+      dir = "c:/" if dir == nil
+      dir = "c:/" if dir == "/"
+    elsif kernel == "Linux"
+      dir = "/" if dir == nil
+    else
+      dir = "c:/" if dir == nil
+      dir = "c:/" if dir == "/"
+    end
+
     path = "#{dir}/#{file}"
-    if File.exists?(path)
+    if File.directory?(path)
       path = path + "/*"
     else
       path = path + "*"
     end
+    path.gsub!(/[\/]+/, "/")
     puts path
-    Dir.glob(path).each do |file|
+    Dir.glob(path, File::FNM_DOTMATCH).each do |file|
       data = {}
-      data["label"] = File.basename(file)
-      data["value"] = file 
+      next if File.basename(file) == "."
+      next if kind == "dir" and !File.directory?(file)
+      data["label"] = File.expand_path(file)
+      data["value"] = File.expand_path(file)
       res.push data
     end
-    JSON.generate res
+    JSON.generate res.sort { |a, b| a["value"] <=> b["value"] }
   end
 end

data/lib/template/server_app_base.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+class AppMainBase
+  def initialize
+    @aboet = false
+    @exec = false
+    @suspend = false
+  end
+
+  def start(argv)
+    @exec = true
+  end
+
+  def stop()
+    @abort = true
+    @exec = false
+  end
+
+  def suspend()
+    @suspend = true
+  end
+
+  def resume()
+    @suspend = false
+  end
+end
+
+require "app_load.rb"

data/lib/template/start.rb

@@ -22,19 +22,19 @@ port = get_unused_port
 puts "port=#{port}"
 
 # config.ruの編集
-buf = File.read("config.ru").toutf8
+buf = File.binread("config.ru").toutf8
 buf.gsub!(/port [0-9]+/, "port #{port}")
-File.write("config.ru", buf)
+File.binwrite("config.ru", buf)
 
 # main.jsの編集
-buf = File.read("js/main.js").toutf8
+buf = File.binread("js/main.js").toutf8
 buf.gsub!(/localhost:[0-9]+\//, "localhost:#{port}/")
-File.write("js/main.js", buf)
+File.binwrite("js/main.js", buf)
 
 # index.htaの編集
-buf = File.read("index.html").toutf8
+buf = File.binread("index.html").toutf8
 buf.gsub!(/localhost:[0-9]+\//, "localhost:#{port}/")
-File.write("index.html", buf)
+File.binwrite("index.html", buf)
 
 Thread.start {
   puts "start browser"

data/lib/template/wsserver.rb

@@ -1,5 +1,4 @@
-require "./server_app"
-$app = AppMain.new
+require "./server_app_base"
 
 class WsServer < Sinatra::Base
   $ws_list = []
@@ -15,9 +14,9 @@ class WsServer < Sinatra::Base
         ws.onmessage do |msg|
           puts msg
           if msg =~ /^exec:/
-            fname = msg.gsub(/^exec:/, "")
+            argv = msg.gsub(/^exec:/, "")
             Thread.new {
-              $app.start fname do |out|
+              $app.start(argv.split(",")) do |out|
                 ws.send(out)
               end
             }
@@ -25,6 +24,13 @@ class WsServer < Sinatra::Base
           if msg =~ /^stop/
             $app.stop
           end
+          if msg =~ /^suspend/
+            $app.suspend
+          end
+          if msg =~ /^resume/
+            $app.resume
+          end
+
           if msg == "exit"
             unless ENV["OCRA"] == "true"
               halt

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browser_app_base
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - masataka kuwayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-15 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -104,6 +104,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".vscode/launch.json"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -112,13 +113,15 @@ files:
 - browser_app_base.gemspec
 - lib/browser_app_base.rb
 - lib/browser_app_base/version.rb
+- lib/template/app_load.rb
 - lib/template/config.ru
 - lib/template/config/browser.json
 - lib/template/css/index.css
 - lib/template/index.html
 - lib/template/js/main.js
+- lib/template/my_app_sample.rb
 - lib/template/server.rb
-- lib/template/server_app.rb
+- lib/template/server_app_base.rb
 - lib/template/start.rb
 - lib/template/wsserver.rb
 homepage: https://github.com/kuwayama1971/BrowserAppBase