tofu 0.2.0 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21f9b04d012b4d3bb5bfffd94cd49bb634d1f9e6b450437722572e840ded33bb
-  data.tar.gz: 7cb4a203cc8cb6aad6838b335c31d26433593e353de4cb4d754da3572f0c5182
+  metadata.gz: 6c43ebdfd3a81da31a173dad8b6e7f51b78fdf9674cf965f2f01dcfc4c16ce05
+  data.tar.gz: f7655329fa596b9bff8efdfbc968cccf10ef116ca96a09548fccfde2f22a67e4
 SHA512:
-  metadata.gz: 16e316ac4a6fe4d78394f308dc8391ecfddda3508117b8956258e34f42169541ebaff59e11fd2376f2262ebb9b4aec3f0d0c13f5848022d7346ceed5a8834b8d
-  data.tar.gz: b25dabe154550c5d145544a0049657d3968155363139e71681737a89b21d280ea2af1756576a6c7ba5f8f28e3d2c0515c3bd7fa7fae5ed2fc5f04f834617dad8
+  metadata.gz: 78d2db1a810ce63f71c946c8c65e1be9264c306dad490ecf0b21f0b4d2cc30d89dbb47075cd5a0a13c32ee89019def32163ba4fd88203cb9c3f9a279948977a9
+  data.tar.gz: 28b6e8fbb2616e7ee13a5fc15129615511a89e912f1ceeec4e9df73ddd07f24aa7a7aae2b9b21eddf549677cc433fec414314cba97917714b6a296a9b05c4311

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 *~
+.DS_Store

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2009 Masatoshi SEKI
+
+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.

data/lib/tofu.rb

@@ -3,10 +3,10 @@ require "tofu/version"
 require 'erb'
 require 'drb/drb'
 require 'monitor'
-require 'digest/md5'
 require 'webrick'
 require 'webrick/cgi'
 require 'uri'
+require 'securerandom'
 
 module Tofu
   class Session
@@ -14,7 +14,7 @@ module Tofu
 
     def initialize(bartender, hint=nil)
       super()
-      @session_id = Digest::MD5.hexdigest(Time.now.to_s + __id__.to_s)
+      @session_id = SecureRandom.uuid
       @contents = {}
       @hint = hint
       renew
@@ -136,9 +136,9 @@ module Tofu
 
     def service(context)
       begin
-	session = retrieve_session(context)
-	catch(:tofu_done) { session.service(context) }
-	store_session(context, session)
+        session = retrieve_session(context)
+        catch(:tofu_done) { session.service(context) }
+        store_session(context, session)
       ensure
       end
     end
@@ -336,7 +336,7 @@ module Tofu
       end
       param = make_param(method_name, add_param)
       hidden = input_hidden(param)
-      %Q!<form action="#{action(context)}" method="post">\n! + hidden
+      %Q!<form action="#{action(context)}" method="post" enctype="multipart/form-data">\n! + hidden
     end
 
     def href(method_name, add_param, context)
@@ -365,7 +365,7 @@ module Tofu
 
   def reload_erb
     ObjectSpace.each_object(Class) do |o|
-      if o.ancestors.include?(Tofu::Tofu)
+      if o.ancestors.include?(::Tofu::Tofu)
 	      o.reload_erb
       end
     end
@@ -408,6 +408,7 @@ module Tofu
       value = WEBrick::HTTPUtils::escape(value)
       c = WEBrick::Cookie.new(name, value)
       c.expires = expires if expires
+      c.path = req_script_name.to_s
       @res.cookies.push(c)
     end
     
@@ -466,6 +467,16 @@ module Tofu
     def service(req, res)
       Context.new(req, res).service(@bartender)
     end
+
+    def start(env, stdin, stdout)
+      if env["SERVER_SOFTWARE"]
+        @config[:ServerSoftware] = env["SERVER_SOFTWARE"]
+      end
+      if %r{HTTP/(\d+\.\d+)} =~ env["SERVER_PROTOCOL"]
+        @config[:HTTPVersion] = $1
+      end
+      super(env, stdin, stdout)
+    end 
   end
 end
 
@@ -575,6 +586,45 @@ EOS
       throw(:tofu_done)
     end
   end
+
+  class ChunkedStream
+    def initialize(stream)
+      @data = nil
+      @cursor = 0
+      @stream = stream
+    end
+
+    def next_chunk
+      @stream.pop
+    rescue
+      raise EOFError
+    end
+
+    def close
+      @stream.close
+    end
+
+    def readpartial(size, buf='')
+      buf.clear
+      unless @data
+        @cursor = 0
+        @data = next_chunk
+        @data.force_encoding("ascii-8bit")
+      end
+      if @data.bytesize <= size
+        buf << @data
+        @data = nil
+      else
+        slice = @data.byteslice(@cursor, size)
+        @cursor += slice.bytesize
+        buf << slice
+        if @data.bytesize <= @cursor
+          @data = nil
+        end
+      end
+      buf
+    end
+  end
 end
 
 if __FILE__ == $0

data/lib/tofu/version.rb

@@ -1,3 +1,3 @@
 module Tofu
-  VERSION = "0.2.0"
+  VERSION = "0.3.4"
 end

data/sample/kd/base.erb

@@ -0,0 +1,8 @@
+<html>
+<head>
+<title>WikiR</title>
+</head>
+<body>
+<%= @wiki.to_html(context) %>
+</body>
+</html>

data/sample/kd/wiki.erb

@@ -0,0 +1,13 @@
+<script language="JavaScript">
+function open_edit(){
+document.getElementById('edit').style.display = "block";
+}
+</script>
+<%= page(context).html %>
+<a href='javascript:open_edit()'>[edit]</a>
+<div id='edit' style='display:none;'>
+<%=form('edit', {'name' => context.req_path_info}, context) %>
+<textarea name='text' rows="40" cols="50"><%=h page(context).src %></textarea>
+<input type='submit' name='ok' value='ok'/>
+</form>
+</div>

data/sample/kd/wikir.rb

@@ -0,0 +1,143 @@
+require 'tofu'
+require 'kramdown'
+require 'singleton'
+
+module WikiR
+  class Book
+    include Singleton
+
+    def initialize
+      @monitor = Monitor.new
+      @pages = {}
+    end
+
+    def [](name)
+      @pages[name] || Page.new(name)
+    end
+
+    def []=(name, src)
+      @monitor.synchronize do
+        page = self[name]
+        @pages[name] = page
+        page.src = src
+      end
+    end
+  end
+
+  class Page
+    def initialize(name)
+      @name = name
+      self.src = "# #{name}\n\nan empty page. edit me."
+    end
+    attr_reader :name, :src, :html, :warnings
+
+    def src=(text)
+      @src = text
+      document = Kramdown::Document.new(text)
+      @html = document.to_html
+      @warnings = document.warnings
+    end
+  end
+end
+
+class WikiRSession < Tofu::Session
+  def initialize(bartender, hint=nil)
+    super
+    @book = WikiR::Book.instance
+    @base = BaseTofu.new(self)
+  end
+  attr_reader :book
+
+  def lookup_view(context)
+    @base
+  end
+
+  def do_GET(context)
+    context.res_header('pragma', 'no-cache')
+    context.res_header('cache-control', 'no-cache')
+    context.res_header('expires', 'Thu, 01 Dec 1994 16:00:00 GMT')
+    super(context)
+  end
+end
+
+class BaseTofu < Tofu::Tofu
+  set_erb('base.erb')
+  
+  def initialize(session)
+    super(session)
+    @wiki = WikiTofu.new(session)
+  end
+end
+
+class WikiTofu < Tofu::Tofu
+  set_erb('wiki.erb')
+
+  def book
+    @session.book
+  end
+  
+  def do_edit(context, params)
+    text ,= params['text']
+    return if text.nil? || text.empty?
+    text = text.force_encoding('utf-8')
+    name ,= params['name']
+    return if name.nil? || name.empty?
+    name = name.force_encoding('utf-8')
+    book[name] = text
+  end
+
+  def page(context)
+    book[context.req_path_info]
+  end
+end
+
+module Tofu
+def reload_erb
+  p 1
+  ObjectSpace.each_object(Class) do |o|
+    if o.ancestors.include?(::Tofu::Tofu)
+      o.reload_erb
+    end
+  end
+end
+module_function :reload_erb
+end
+
+class MyTofulet < Tofu::CGITofulet
+  def [](key)
+    WikiR::Book.instance if key == 'book'
+  end
+
+  def reload_erb
+    Tofu::reload_erb
+  end
+end
+
+WEBrick::Daemon.start unless $DEBUG
+tofu = Tofu::Bartender.new(WikiRSession, 'wikir_8083')
+uri = ARGV.shift || 'druby://localhost:54322'
+DRb.start_service(uri, MyTofulet.new(tofu))
+s = WEBrick::HTTPServer.new(:Port => 8083)
+s.mount("/", Tofu::Tofulet, tofu)
+s.start
+
+=begin
+# dRuby & CGI style
+unless $DEBUG
+  exit!(0) if fork
+  Process.setsid
+  exit!(0) if fork
+end
+
+uri = ARGV.shift || 'druby://localhost:54322'
+tofu = Tofu::Bartender.new(WikiRSession, 'wikir_' + uri.split(':').last)
+DRb.start_service(uri, MyTofulet.new(tofu))
+
+unless $DEBUG
+  STDIN.reopen('/dev/null')
+  STDOUT.reopen('/dev/null', 'w')
+  STDERR.reopen('/dev/null', 'w')
+end
+
+DRb.thread.join
+=end

data/tofu.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", ">= 2.2.10"
+  spec.add_development_dependency "rake", "~> 12.3.3"
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: tofu
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.4
 platform: ruby
 authors:
 - Masatoshi SEKI
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-26 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 description: tiny web-ui framework for plain WEBrick lovers
 email:
 - seki@ruby-lang.org
@@ -47,6 +47,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - doc/Div.rd
@@ -62,6 +63,9 @@ files:
 - doc/yfd03.obj
 - lib/tofu.rb
 - lib/tofu/version.rb
+- sample/kd/base.erb
+- sample/kd/wiki.erb
+- sample/kd/wikir.rb
 - sample/koto/base.erb
 - sample/koto/enter.erb
 - sample/koto/koto.rb
@@ -86,8 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: tiny web-ui framework for me.