flack 0.10.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d42fb9e277d3a8bf5bd978c8294c8d74986d9407
-  data.tar.gz: a37a1d7b1937a25b74d9cb082077142ecb7481a4
+  metadata.gz: 8f2ca07e71c90fdd19c0875131c9cda08d3ae33d
+  data.tar.gz: 72c65daabff31d1bdbce5d57ef811f821b13ac1b
 SHA512:
-  metadata.gz: 23e4d246558e0d857d98e972f3380c353d8cddea2aa3b5ab58cba4d10e69f9a7b8d9d63375545126cc97accca4974522ef5eb4dd36790dda573939fa2642c385
-  data.tar.gz: e8f2e007509dc2ca43d6097383d8372eb876cbf19d3cf7bd41b16495afe33020fb3b208ac6ab7133e1a7f149627ae5657b0c12ee170fb544fe4cc77353f2f36b
+  metadata.gz: 3d0e6ec432387fd794524a69b056913512666db33f3b0faa2ab8e6ff3ffca5b058769314f8029d3ed9da6a6b2c71f5f698dba54935f99bbd90925b5fe8bad5a5
+  data.tar.gz: 907862b56c9841faac7e617373d3324a9cbc0d9743d2c6d68435912ec7816769ac50930c6d5272d0f4dfd273aa70c36e5d79d2e2e39a288e622468d0a3aa157f

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 # flack CHANGELOG.md
 
 
+## flack 0.16.1  released 2019-02-05
+
+- Depend on Sequel 5 (Sequel 4 and 5 seem OK)
+- GET /executions/:domain
+- GET /executions/:domain*
+- GET /executions/:domain.*
+- GET /messages/:point
+- GET /messages/:exid/:point
+- GET /messages/:exid
+- GET /messages/:id
+- GET /executions/:exid
+- GET /executions/:id
+
+
+## flack 0.10.0  released 2017-03-03
+
 ## flack 0.10.0  released 2017-03-03
 
 - Flack::App#shutdown (@unit.shutdown)

data/Makefile

@@ -6,6 +6,9 @@ NAME = \
 VERSION = \
   $(shell ruby -e "s = eval(File.read(Dir['*.gemspec'][0])); puts s.version")
 
+PORT = 7007
+PID_FILE = tmp/$(NAME).pid
+
 count_lines:
 	find lib -name "*.rb" | xargs cat | ruby -e "p STDIN.readlines.count { |l| l = l.strip; l[0, 1] != '#' && l != '' }"
 cl: count_lines
@@ -41,11 +44,29 @@ migrate:
 ## flack tasks
 
 serve:
-	bundle exec rackup -p 7007
+	bundle exec rackup -p $(PORT)
 s: serve
 
 curl:
-	curl -s http://127.0.0.1:7007/ | \
+	curl -s http://127.0.0.1:$(PORT)/ | \
       $(RUBY) -e "require 'json'; puts JSON.pretty_generate(JSON.load(STDIN.read))"
 c: curl
 
+start:
+	@if [ ! -f $(PID_FILE) ]; then \
+      bundle exec rackup -p $(PORT) -P $(PID_FILE) -D; \
+      sleep 1; \
+      echo "listening on $(PORT), pid `cat $(PID_FILE)`"; \
+    else \
+      echo "already running at `cat $(PID_FILE)`"; \
+    fi
+
+stop:
+	@if [ -f $(PID_FILE) ]; then \
+      echo "stopping flack pid `cat $(PID_FILE)`"; \
+      kill `cat $(PID_FILE)`; \
+    fi
+
+restart:
+	@if [ -f $(PID_FILE) ]; then make -s stop; fi; make -s start
+

data/README.md

@@ -6,10 +6,23 @@
 
 Flack is a Rack app for the [flor](https://github.com/floraison/flor) workflow engine.
 
+
+## test ride
+
+```sh
+make migrate
+make start
+open http://localhost:7007/
+```
+
+Warning: this serves an API, not some fancy web interface.
+
+
 ## api
 
 Based on HAL ([spec](http://stateless.co/hal_specification.html) and [draft](https://tools.ietf.org/html/draft-kelly-json-hal-08)).
 
+
 ## license
 
 MIT, see [LICENSE.txt](LICENSE.txt)

data/flack.gemspec

@@ -21,16 +21,20 @@ A web front-end to the flor workflow engine
 
   #s.files = `git ls-files`.split("\n")
   s.files = Dir[
+    'README.{md,txt}',
+    'CHANGELOG.{md,txt}', 'CREDITS.{md,txt}', 'LICENSE.{md,txt}',
     'Makefile',
     'lib/**/*.rb', #'spec/**/*.rb', 'test/**/*.rb',
-    '*.gemspec', '*.txt', '*.rdoc', '*.md'
+    "#{s.name}.gemspec",
   ]
 
-  flor_version = s.version.to_s.split('.').take(2).join('.')
-  s.add_runtime_dependency 'flor', "~> #{flor_version}"
+  #flor_version = s.version.to_s.split('.').take(2).join('.')
+  #s.add_runtime_dependency 'flor', "~> #{flor_version}"
+  s.add_runtime_dependency 'flor'
 
   s.add_runtime_dependency 'rack', '~> 1.6'
-  s.add_runtime_dependency 'sequel', '~> 4'
+  s.add_runtime_dependency 'sequel', '~> 5'
+  s.add_runtime_dependency 'httpclient', '~> 2.8'
 
   s.add_development_dependency 'rspec', '~> 3'
 

data/lib/flack.rb

@@ -1,26 +1,3 @@
-#--
-# Copyright (c) 2016-2017, John Mettraux, jmettraux+flor@gmail.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Made in Japan.
-#++
 
 require 'rack'
 
@@ -29,7 +6,7 @@ require 'flor/unit'
 
 module Flack
 
-  VERSION = '0.10.0'
+  VERSION = '0.16.1'
 end
 
 require 'flack/app'

data/lib/flack/app.rb

@@ -1,26 +1,3 @@
-#--
-# Copyright (c) 2016-2017, John Mettraux, jmettraux+flor@gmail.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Made in Japan.
-#++
 
 require 'flack/app/helpers'
   #
@@ -28,6 +5,7 @@ require 'flack/app/index'
 require 'flack/app/static'
 require 'flack/app/message'
 require 'flack/app/executions'
+require 'flack/app/messages'
 
 
 class Flack::App
@@ -81,7 +59,7 @@ class Flack::App
       match = true
       args = []
 
-      for i in 0..flack_path_info.length - 1
+      for i in 0..(flack_path_info.length - 1)
 
         break unless match
 
@@ -95,8 +73,10 @@ class Flack::App
           args << pi.to_i
         elsif mi == 's'
           args << pi
+        elsif mi.is_a?(Regexp)
+          match = pi.match(mi)
         else
-          match = pi == mi
+          match = (pi == mi)
         end
       end
 
@@ -119,7 +99,13 @@ class Flack::App
     .collect(&:to_s)
     .select { |m| m.match(/\A(get|head|put|post|delete)_.+\z/) }
     .select { |m| instance_method(m).arity == 1 }
-    .collect { |m| s = m.split('_'); [ m, s.shift.upcase, s ] }
+    .collect { |m|
+      s = m.split('_')
+      if s.length == 3 && s[2] == 'suffix'
+        [ m, s.shift.upcase, [ /\.#{s[0]}\z/ ] ]
+      else
+        [ m, s.shift.upcase, s ]
+      end }
     .collect(&:freeze).freeze
 end
 

data/lib/flack/app/executions.rb

@@ -1,42 +1,80 @@
-#--
-# Copyright (c) 2016-2017, John Mettraux, jmettraux+flor@gmail.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Made in Japan.
-#++
-
 
 # /executions/*
 #
 class Flack::App
 
+  # GET /executions
+  #
   def get_executions(env)
 
 # TODO implement paging
+    env['flack.rel'] = 'flack:executions'
+
     respond(env, @unit.executions.all)
   end
 
+  # GET /executions/<id>
+  #
   def get_executions_i(env)
 
-# TODO
-    debug_respond(env)
+    env['flack.rel'] = 'flack:executions/id'
+
+    if exe = @unit.executions[env['flack.args'][0]]
+      respond(env, exe)
+    else
+      respond_not_found(env)
+    end
+  end
+
+  # GET /executions/<exid>
+  # GET /executions/<domain>
+  # GET /executions/<domain>*
+  # GET /executions/<domain>.*
+  #
+  def get_executions_s(env)
+
+    arg = env['flack.args'][0]
+
+    if arg.count('-') == 0
+      get_executions_by_domain(env, arg)
+    else
+      get_executions_by_exid(env, arg)
+    end
+  end
+
+  protected
+
+  def get_executions_by_exid(env, exid)
+
+    env['flack.rel'] = 'flack:executions/exid'
+
+    if exe = @unit.executions[exid: exid]
+      respond(env, exe)
+    else
+      respond_not_found(env)
+    end
+  end
+
+  def get_executions_by_domain(env, dom)
+
+    q = @unit.executions
+
+    if m = dom.match(/\A([^*]+)\*+\z/)
+      if m[1][-1, 1] == '.'
+        env['flack.rel'] = 'flack:executions/domain-dot-star'
+        q = q.where(Sequel.like(:domain, "#{m[1]}%"))
+      else
+        env['flack.rel'] = 'flack:executions/domain-star'
+        q = q.where(
+          Sequel[{ domain: m[1] }] |
+          Sequel.like(:domain, "#{m[1]}.%"))
+      end
+    else
+      env['flack.rel'] = 'flack:executions/domain'
+      q = q.where(domain: dom)
+    end
+
+    respond(env, q.all)
   end
 end
 

data/lib/flack/app/helpers.rb

@@ -1,27 +1,3 @@
-#--
-# Copyright (c) 2016-2017, John Mettraux, jmettraux+flor@gmail.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Made in Japan.
-#++
-
 
 # helpers
 #
@@ -38,7 +14,7 @@ class Flack::App
 
     o.is_a?(Array) &&
     o.length == 3 &&
-    o[0].is_a?(Fixnum) &&
+    o[0].is_a?(Integer) &&
     o[1].is_a?(Hash) &&
     o[2].is_a?(Array)
   end
@@ -98,7 +74,13 @@ class Flack::App
   def serialize_array(env, data, opts)
 
     { '_links' => links(env),
-      '_embedded' => data.collect { |e| serialize(env, e, opts) } }
+      '_embedded' => {
+        key(env) => data.collect { |e| serialize(env, e, opts) } } }
+  end
+
+  def key(env)
+
+    env['flack.rel'] || 'flack:unspecified-rel'
   end
 
   def determine_root_uri(env)
@@ -122,7 +104,15 @@ class Flack::App
 
   def link(env, h, type)
 
-    h["flack:#{type}"] = { href: rel(env, "/#{type}") }
+    l = { href: rel(env, "/#{type}") }
+    l[:templated] = true if type.index('{')
+
+    rel_right_part = type
+      .gsub(/[{}]/, '')
+      .gsub(/\./, '-dot')
+      .gsub(/\*/, '-star')
+
+    h["flack:#{rel_right_part}"] = l
   end
 
   def links(env)
@@ -139,7 +129,18 @@ class Flack::App
       href: 'https://github.com/floraison/flack/blob/master/doc/rels.md#{rel}',
       templated: true }]
 
-    link(env, h, :executions)
+    link(env, h, 'executions')
+    link(env, h, 'executions/{domain}')
+    link(env, h, 'executions/{domain}*')
+    link(env, h, 'executions/{domain}.*')
+    link(env, h, 'executions/{exid}')
+    link(env, h, 'executions/{id}')
+
+    link(env, h, 'messages')
+    link(env, h, 'messages/{point}')
+    link(env, h, 'messages/{exid}/{point}')
+    link(env, h, 'messages/{exid}')
+    link(env, h, 'messages/{id}')
 
     h
   end

data/lib/flack/app/index.rb

@@ -1,27 +1,3 @@
-#--
-# Copyright (c) 2016-2017, John Mettraux, jmettraux+flor@gmail.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Made in Japan.
-#++
-
 
 # /
 #

data/lib/flack/app/message.rb

@@ -1,27 +1,3 @@
-#--
-# Copyright (c) 2016-2017, John Mettraux, jmettraux+flor@gmail.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Made in Japan.
-#++
-
 
 # /message
 #
@@ -30,14 +6,13 @@ class Flack::App
   def post_message(env)
 
     msg = JSON.load(env['rack.input'].read)
-#pp msg
 
     pt = msg['point']
 
     return respond_bad_request(env, 'missing msg point') \
       unless pt
     return respond_bad_request(env, "bad msg point #{pt.inspect}") \
-      unless %w[ launch cancel ].include?(pt)
+      unless %w[ launch cancel reply ].include?(pt)
 
     r = self.send("queue_#{pt}", env, msg, { point: pt })
 
@@ -48,16 +23,18 @@ class Flack::App
 
   def queue_launch(env, msg, ret)
 
-    dom = msg['domain']
+    dom = msg['domain'] || 'domain0'
     src = msg['tree'] || msg['name']
+    vars = msg['vars'] || {}
+    fields = msg['fields'] || {}
 
-    return respond_bad_request(env, 'missing domain') \
-      unless dom
     return respond_bad_request(env, 'missing "tree" or "name" in launch msg') \
       unless src
 
     opts = {}
     opts[:domain] = dom
+    opts[:vars] = vars
+    opts[:fields] = fields
 
     r = @unit.launch(src, opts)
 
@@ -86,7 +63,35 @@ class Flack::App
     return respond_not_found(env, 'missing execution node') \
       unless exe.nodes[nid]
 
-    ret['xxx'] = @unit.queue({ 'point' => 'cancel', 'exid' => exid, 'nid' => nid })
+    ret['xxx'] = @unit.queue({ 'point' => 'cancel', 'exid' => exid, 'nid' => nid }) # FIXME change me
+
+    ret['_status'] = 202
+    ret['_location'] = rel(env, '/executions/' + exid)
+    ret['_links'] = { 'flack:execution' => { 'href' => ret['_location'] } }
+
+    ret
+  end
+
+  def queue_reply(env, msg, ret)
+
+    exid = msg['exid']
+    nid = msg['nid']
+    payload = msg['payload'] || {}
+
+    return respond_bad_request(env, 'missing exid') \
+      unless exid
+
+    return respond_bad_request(env, 'missing nid') \
+      unless nid
+
+    exe = @unit.executions[exid: exid]
+
+    return respond_not_found(env, 'missing execution') \
+      unless exe
+    return respond_not_found(env, 'missing execution node') \
+      unless exe.nodes[nid]
+
+    ret['xxx'] = @unit.queue({ 'point' => 'return', 'exid' => exid, 'nid' => nid, 'payload' => payload}) # FIXME change me
 
     ret['_status'] = 202
     ret['_location'] = rel(env, '/executions/' + exid)

data/lib/flack/app/messages.rb

@@ -0,0 +1,68 @@
+
+# /messages/*
+#
+class Flack::App
+
+  # GET /messages
+  def get_messages(env)
+
+# TODO implement paging
+    env['flack.rel'] = 'flack:messages'
+
+    respond(env, @unit.messages.all)
+  end
+
+  # GET /messages/<id>
+  def get_messages_i(env)
+
+    env['flack.rel'] = 'flack:messages'
+
+    if exe = @unit.messages[env['flack.args'][0]]
+      respond(env, exe)
+    else
+      respond_not_found(env)
+    end
+  end
+
+  # GET /messages/<exid>
+  def get_messages_s(env)
+
+# TODO implement paging
+    arg = env['flack.args'][0]
+
+    if Flor.point?(arg)
+      get_messages_by_point(env, arg)
+    else
+      get_messages_by_exid(env, arg)
+    end
+  end
+
+  # GET /messages/<exid>/<point>
+  def get_messages_s_s(env)
+
+    env['flack.rel'] = 'flack:messages/exid/point'
+
+    exid, point = env['flack.args']
+
+    respond(
+      env,
+      @unit.messages.where(exid: exid, point: point).all)
+  end
+
+  protected
+
+  def get_messages_by_exid(env, exid)
+
+    env['flack.rel'] = 'flack:messages/exid'
+
+    respond(env, @unit.messages.where(exid: exid).all)
+  end
+
+  def get_messages_by_point(env, point)
+
+    env['flack.rel'] = 'flack:messages/point'
+
+    respond(env, @unit.messages.where(point: point).all)
+  end
+end
+

data/lib/flack/app/static.rb

@@ -1,40 +1,22 @@
-#--
-# Copyright (c) 2016-2017, John Mettraux, jmettraux+flor@gmail.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Made in Japan.
-#++
-
 
-# /static/+
+# /*.html
+# /*.css
+# /*.js
 #
 class Flack::App
 
-  RACK_FILE = Rack::File.new(
+  STATIC_FILE = Rack::File.new(
     File.absolute_path(
       File.join(
-        File.dirname(__FILE__), '..')))
+        File.dirname(__FILE__), '..', 'static')))
 
-  def get_static_plus(env)
+  def serve_file(env)
 
-    RACK_FILE.call(env)
+    STATIC_FILE.call(env)
   end
+
+  alias get_html_suffix serve_file
+  alias get_css_suffix serve_file
+  alias get_js_suffix serve_file
 end
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: flack
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.16.1
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2019-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -77,8 +91,6 @@ files:
 - LICENSE.txt
 - Makefile
 - README.md
-- env.txt
-- env2.txt
 - flack.gemspec
 - lib/flack.rb
 - lib/flack/app.rb
@@ -86,8 +98,8 @@ files:
 - lib/flack/app/helpers.rb
 - lib/flack/app/index.rb
 - lib/flack/app/message.rb
+- lib/flack/app/messages.rb
 - lib/flack/app/static.rb
-- t.txt
 homepage: http://github.com/floraison
 licenses:
 - MIT
@@ -108,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.2
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: a web front-end to the flor workflow engine

data/env.txt

@@ -1,38 +0,0 @@
-
-GATEWAY_INTERFACE: "CGI/1.1"
-PATH_INFO: "/debug/77"
-QUERY_STRING: "a=b&c=d"
-REMOTE_ADDR: "::1"
-REMOTE_HOST: "localhost"
-REQUEST_METHOD: "GET"
-REQUEST_URI: "http://localhost:7007/debug/77?a=b&c=d"
-SCRIPT_NAME: ""
-SERVER_NAME: "localhost"
-SERVER_PORT: "7007"
-SERVER_PROTOCOL: "HTTP/1.1"
-SERVER_SOFTWARE: "WEBrick/1.3.1 (Ruby/1.9.3/2014-05-14)"
-HTTP_HOST: "localhost:7007"
-HTTP_CONNECTION: "keep-alive"
-HTTP_UPGRADE_INSECURE_REQUESTS: "1"
-HTTP_USER_AGENT: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Safari/537.36"
-HTTP_ACCEPT: "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8"
-HTTP_ACCEPT_ENCODING: "gzip, deflate, sdch"
-HTTP_ACCEPT_LANGUAGE: "ja,en-US;q=0.8,en;q=0.6,fr;q=0.4,de;q=0.2,it;q=0.2,zh-TW;q=0.2,zh;q=0.2"
-HTTP_COOKIE: "sg_dev=2ebdd63d694602c96834d5a261fc471732a2a44c37f40d6446c5cab1b724a263"
-rack.version: [1, 3]
-rack.input: #<Rack::Lint::InputWrapper:0x007fb27b230048 @input=#<StringIO:0x007fb27b238b30>>
-rack.errors: #<Rack::Lint::ErrorWrapper:0x007fb27b22fee0 @error=#<IO:<STDERR>>>
-rack.multithread: true
-rack.multiprocess: false
-rack.run_once: false
-rack.url_scheme: "http"
-rack.hijack?: true
-rack.hijack: #<Proc:0x007fb27b230ae8@/Users/jmettraux/.gem/ruby/1.9.3/gems/rack-1.6.4/lib/rack/lint.rb:525>
-rack.hijack_io: nil
-HTTP_VERSION: "HTTP/1.1"
-REQUEST_PATH: "/debug/77"
-rack.tempfiles: []
-flack.path_info: ["debug", "77"]
-flack.args: [77]
-flack.query_string: {"a"=>"b", "c"=>"d"}
-

data/env2.txt

@@ -1,33 +0,0 @@
-GATEWAY_INTERFACE:CGI/1.1
-PATH_INFO:/debug
-QUERY_STRING:
-REMOTE_ADDR:127.0.0.1
-REMOTE_HOST:localhost
-REQUEST_METHOD:GET
-REQUEST_URI:http://127.0.0.1:7007/flack/debug
-SCRIPT_NAME:/flack
-SERVER_NAME:127.0.0.1
-SERVER_PORT:7007
-SERVER_PROTOCOL:HTTP/1.1
-SERVER_SOFTWARE:WEBrick/1.3.1 (Ruby/1.9.3/2014-05-14)
-HTTP_HOST:127.0.0.1:7007
-HTTP_USER_AGENT:curl/7.43.0
-HTTP_ACCEPT:*/*
-rack.version:[1
-3]
-rack.input:#<Rack::Lint::InputWrapper:0x007ff6baa373a8>
-rack.errors:#<Rack::Lint::ErrorWrapper:0x007ff6baa37290>
-rack.multithread:true
-rack.multiprocess:false
-rack.run_once:false
-rack.url_scheme:http
-rack.hijack?:true
-rack.hijack:#<Proc:0x007ff6baa38208@/Users/jmettraux/.gem/ruby/1.9.3/gems/rack-1.6.4/lib/rack/lint.rb:525>
-rack.hijack_io:null
-HTTP_VERSION:HTTP/1.1
-REQUEST_PATH:/flack/debug
-rack.tempfiles:[]
-flack.path_info:[debug]
-flack.args:[]
-flack.query_string:{}
-flack.root_uri:http://127.0.0.1:7007

data/t.txt

@@ -1,7 +0,0 @@
-
-https://git.io/viDSd
-https://goo.gl/xuOZcu
-http://tiny.cc/flack
-
-http://lambda.io/flack
-