zorglub 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abcf28ed3f097126ca87285fb4e856139ea4cd3ee410d3ff294604d5becca95f
-  data.tar.gz: ecd7ad7f09153e4e847652f448284d559404f6c5682bfd15fcc05a72fe9ffb72
+  metadata.gz: be6b53fccd29ce596c15253af31b7c4b7470e1a55075aa34cd541edd54144f57
+  data.tar.gz: cda16f4674a73d6ce3659db5e5cf7f51eea5fe0779324990b406046a341b6a04
 SHA512:
-  metadata.gz: eb190cc7abd3bf94341d807491b8432c323674e49ed9d52bf151b926ec8f31efd6f61f9c27bfab17e6d1e27f3f4f6d0c1b63e7263340d5dab9edda97c98ad8e2
-  data.tar.gz: 52e826f544530e6cdadb65b53fda7ec771ed72621a51a72565507515b931da49b3ac5b1c1af93d35c93596db0b0d00be10cf51054acd935a6be1949c35536a27
+  metadata.gz: 10c3739c48de2eed8c53c32d703f198ec5fc4a752ce32a36de12c5964664d057ad04f81eeb6ce95b16bd4ae0236e4cd4f02d00c27327372a4479078b1c822e28
+  data.tar.gz: 109e27aa1526edff83bd67681f61aced077b2f55a23e13d3b3aaa8ec0962ccf61a8218e0f6f0bcd405cd4c3680e3e370e515ce46718b7d758f86f0322fc1e0bc

data/Changelog

@@ -1,3 +1,16 @@
+2024-10-01 Jérémy Zurcher <jeremy@asynk.ch>
+	* release 0.1.7
+	* debug to stdout
+	* simplify static code path
+	* fix error404 msg
+	* use keyword arguments
+
+
+2024-08-20 Jérémy Zurcher <jeremy@asynk.ch>
+	* release 0.1.6
+	* fix specs
+	* fix Node#error404
+
 2024-08-14 Jérémy Zurcher <jeremy@asynk.ch>
 	* release 0.1.5
 	* fix Node#redirect

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zorglub (0.1.5)
+    zorglub (0.1.7)
 
 GEM
   remote: http://rubygems.org/

data/lib/zorglub/node.rb

@@ -154,7 +154,7 @@ module Zorglub
       status = options[:status] || 302
       body   = options[:body] || redirect_body(target)
       header = response.headers.merge('Location' => target.to_s)
-      throw :stop_realize, Rack::Response.new(body, status, header, &block).finish
+      throw :stop_realize, Rack::Response.new(body, status, header, &block)
     end
 
     def redirect_body(target)
@@ -229,7 +229,7 @@ module Zorglub
       def call(env)
         meth, *args =  env['PATH_INFO'].sub(%r{^/+}, '').split(%r{/})
         meth ||= 'index'
-        $stderr << "=> #{meth}(#{args.join ','})\n" if app.opt :debug
+        $stdout << "=> #{meth}(#{args.join ','})\n" if app.opt :debug
         node = new(env, meth, args)
         return error404 node, meth unless node.respond_to? meth
 
@@ -237,26 +237,26 @@ module Zorglub
       end
 
       def partial(env, meth, *args)
-        node = new env, meth.to_s, args, true
+        node = new(env, meth.to_s, args, partial: true)
         return error404 node, meth unless node.respond_to? meth
 
-        node.feed! env[:no_hooks]
+        node.feed!(no_hooks: env[:no_hooks])
         node.content
       end
 
       def error404(node, meth)
-        $stderr << " !! #{node.class.name}::#{meth} not found\n" if app.opt :debug
+        $stdout << " !! #{node.class.name}::#{meth} not found\n" if app.opt :debug
         resp = node.response
         resp.status = 404
         resp['content-type'] = 'text/plain'
-        resp.write "%<node.class.name>s mapped at %<node.map>p can't respond to : %<node.meth>p"
-        resp
+        resp.write "#{node.class.name} mapped at #{node.map} can't respond to : #{node.meth}"
+        resp.finish
       end
     end
 
     attr_reader :request, :response, :content, :mime, :state, :engine, :meth, :args
 
-    def initialize(env, meth, args, partial = false)
+    def initialize(env, meth, args, partial: false)
       @meth = meth
       @args = args
       @partial = partial
@@ -277,20 +277,19 @@ module Zorglub
         feed!
         response.write @content
         response.headers['content-type'] ||= @mime || 'text/html'
-        response.finish
-      end
+        response
+      end.finish
     end
 
-    def feed!(no_hooks = false)
+    def feed!(no_hooks: false)
       @state = :pre_cb
       self.class.call_before_hooks self unless no_hooks
       @state = :meth
       @content = send @meth, *@args
-      static_path = static
-      if static_path.nil?
-        compile_page!
-      else
+      if (static_path = static)
         static_page! static_path
+      else
+        compile_page!
       end
       @state = :post_cb
       self.class.call_after_hooks self unless no_hooks
@@ -301,7 +300,7 @@ module Zorglub
     def static_page!(path)
       if File.exist?(path) && (@cache_lifetime.nil? || @cache_lifetime.zero? ||
           (Time.now - File.stat(path).mtime) < @cache_lifetime)
-        $stderr << " * use cache file : #{path}\n" if @debug
+        $stdout << " * use cache file : #{path}\n" if @debug
         content = File.read(path)
         @content = content.sub(/^@mime:(.*)\n/, '')
         @mime = ::Regexp.last_match(1)
@@ -309,7 +308,7 @@ module Zorglub
         compile_page!
         FileUtils.mkdir_p File.dirname(path)
         File.open(path, 'w') { |f| f.write("@mime:#{@mime}\n#{@content}") }
-        $stderr << " * cache file created : #{path}\n" if @debug
+        $stdout << " * cache file created : #{path}\n" if @debug
       end
     end
 
@@ -318,9 +317,9 @@ module Zorglub
       v = view
       l = layout
       if @debug
-        $stderr << " * #{e ? 'use engine' : 'no engine '} : #{e ? e.to_s : ''}\n"
-        $stderr << " * #{l && File.exist?(l) ? 'use layout' : 'no layout '} : #{l || ''}\n"
-        $stderr << " * #{v && File.exist?(v) ? 'use view  ' : 'no view   '} : #{v || ''}\n"
+        $stdout << " * #{e ? 'use engine' : 'no engine '} : #{e ? e.to_s : ''}\n"
+        $stdout << " * #{l && File.exist?(l) ? 'use layout' : 'no layout '} : #{l || ''}\n"
+        $stdout << " * #{v && File.exist?(v) ? 'use view  ' : 'no view   '} : #{v || ''}\n"
       end
       @state = @partial ? :partial : :view
       @content, mime = e.call(v, self) if e && v && File.exist?(v)

data/lib/zorglub.rb

@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 
 module Zorglub
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.1.7'.freeze
 end
 
 require 'zorglub/node'

data/spec/node_spec.rb

@@ -49,25 +49,26 @@ describe Zorglub do
 
     it 'instance level map should work' do
       r = Node0.my_call '/with_2args/1/2'
-      h = YAML.load r.body[0]
+      h = YAML.load r[2][0]
       expect(h[:map]).to eq '/node0'
     end
 
     it 'should return err404 response when no method found' do
       expect(Node0.respond_to?('noresponse')).to be_falsey
       r = Node0.my_call '/noresponse'
-      expect(r.status).to eq 404
+      expect(r[2][0]).to eq "Node0 mapped at /node0 can't respond to : noresponse"
+      expect(r[0]).to eq 404
     end
 
     it 'simple method should respond' do
       r = Node0.my_call '/hello'
-      expect(r.status).to eq 200
-      expect(r.body[0]).to eq 'world'
+      expect(r[0]).to eq 200
+      expect(r[2][0]).to eq 'world'
     end
 
     it 'instance level args should work' do
       r = Node0.my_call '/with_2args/1/2'
-      h = YAML.load r.body[0]
+      h = YAML.load r[2][0]
       expect(h[:args][0]).to eq '1'
       expect(h[:args][1]).to eq '2'
     end
@@ -78,8 +79,8 @@ describe Zorglub do
 
     it 'layout proc, method level layout and engine definitions should work' do
       r = Node0.my_call '/index'
-      expect(r.status).to eq 200
-      h = YAML.load r.body[0]
+      expect(r[0]).to eq 200
+      h = YAML.load r[2][0]
       ly = File.join Node0.app.layout_base_path, Node0.layout
       vu = File.join Node0.app.view_base_path, Node0.r, 'index'
       expect(h[:path]).to eq ly
@@ -89,8 +90,8 @@ describe Zorglub do
 
     it 'layout proc, method level layout and engine definitions should work' do
       r = Node1.my_call '/index'
-      expect(r.status).to eq 200
-      h = YAML.load r.body[0]
+      expect(r[0]).to eq 200
+      h = YAML.load r[2][0]
       ly = File.join Node1.app.layout_base_path, 'main.spec'
       vu = File.join Node1.app.view_base_path, Node1.r, 'index.spec'
       expect(h[:path]).to eq ly
@@ -148,23 +149,23 @@ describe Zorglub do
 
     it 'should find view and layout and render them' do
       r = Node0.my_call '/do_render'
-      expect(r.status).to eq 200
-      expect(r.body[0]).to eq 'layout_start view_content layout_end'
+      expect(r[0]).to eq 200
+      expect(r[2][0]).to eq 'layout_start view_content layout_end'
     end
 
     it 'default mime-type should be text/html' do
       r = Node0.my_call '/index'
-      expect(r.headers['Content-type']).to eq 'text/html'
+      expect(r[1]['Content-type']).to eq 'text/html'
     end
 
     it 'should be able to override mime-type' do
       r = Node0.my_call '/do_render'
-      expect(r.headers['Content-type']).to eq 'text/view'
+      expect(r[1]['Content-type']).to eq 'text/view'
     end
 
     it 'should be able to override through rack response mime-type' do
       r = Node0.my_call '/do_content_type'
-      expect(r.headers['Content-type']).to eq 'text/mine'
+      expect(r[1]['Content-type']).to eq 'text/mine'
     end
 
     it 'partial should render correctly' do
@@ -193,31 +194,31 @@ describe Zorglub do
 
     it 'static pages should be generated' do
       r = Node6.my_call '/do_static'
-      expect(r.body[0]).to eq 'VAL 1'
-      expect(r.headers['Content-type']).to eq 'text/static'
+      expect(r[2][0]).to eq 'VAL 1'
+      expect(r[1]['Content-type']).to eq 'text/static'
       r = Node6.my_call '/do_static'
-      expect(r.body[0]).to eq 'VAL 1'
-      expect(r.headers['Content-type']).to eq 'text/static'
+      expect(r[2][0]).to eq 'VAL 1'
+      expect(r[1]['Content-type']).to eq 'text/static'
       r = Node6.my_call '/do_static'
-      expect(r.body[0]).to eq 'VAL 1'
-      expect(r.headers['Content-type']).to eq 'text/static'
+      expect(r[2][0]).to eq 'VAL 1'
+      expect(r[1]['Content-type']).to eq 'text/static'
       r = Node6.my_call '/no_static'
-      expect(r.body[0]).to eq 'VAL 4'
-      expect(r.headers['Content-type']).to eq 'text/static'
+      expect(r[2][0]).to eq 'VAL 4'
+      expect(r[1]['Content-type']).to eq 'text/static'
       r = Node6.my_call '/do_static'
-      expect(r.body[0]).to eq 'VAL 1'
-      expect(r.headers['Content-type']).to eq 'text/static'
+      expect(r[2][0]).to eq 'VAL 1'
+      expect(r[1]['Content-type']).to eq 'text/static'
       Node6.static! true, 0.000001
       sleep 0.0001
       r = Node6.my_call '/do_static'
-      expect(r.body[0]).to eq 'VAL 6'
-      expect(r.headers['Content-type']).to eq 'text/static'
+      expect(r[2][0]).to eq 'VAL 6'
+      expect(r[1]['Content-type']).to eq 'text/static'
     end
 
     it 'redirect should work' do
       r = Node0.my_call '/do_redirect'
-      expect(r.status).to eq 302
-      expect(r.headers['location']).to eq Node0.r(:do_partial, 1, 2, 3)
+      expect(r[0]).to eq 302
+      expect(r[1]['location']).to eq Node0.r(:do_partial, 1, 2, 3)
     end
 
     it 'no_layout! should be inherited' do
@@ -226,84 +227,84 @@ describe Zorglub do
 
     it 'cli_vals should be inherited and extended' do
       r = Node5.my_call '/index'
-      vars = YAML.load r.body[0]
+      vars = YAML.load r[2][0]
       expect(vars).to eq %w[js0 js1 js3 jsx css0 css1 css2]
       expect(vars[7]).to be_nil
     end
 
     it 'cli_vals should be extended at method level' do
       r = Node4.my_call '/more'
-      vars = YAML.load r.body[0]
+      vars = YAML.load r[2][0]
       expect(vars).to eq %w[js0 js1 js2]
       expect(vars[3]).to be_nil
     end
 
     it 'cli_vals should be untouched' do
       r = Node4.my_call '/index'
-      vars = YAML.load r.body[0]
+      vars = YAML.load r[2][0]
       expect(vars).to eq %w[js0 js1]
       expect(vars[2]).to be_nil
       r = Node5.my_call '/index'
-      vars = YAML.load r.body[0]
+      vars = YAML.load r[2][0]
       expect(vars).to eq %w[js0 js1 js3 jsx css0 css1 css2]
       expect(vars[7]).to be_nil
     end
 
     it 'ext definition and file engine should work' do
       r = Node0.my_call '/xml_file'
-      expect(r.body[0]).to eq "<xml>file<\/xml>\n"
-      expect(r.headers['Content-type']).to eq 'application/xml'
+      expect(r[2][0]).to eq "<xml>file<\/xml>\n"
+      expect(r[1]['Content-type']).to eq 'application/xml'
       r = Node0.my_call '/plain_file'
-      expect(r.body[0]).to eq "plain file\n"
-      expect(r.headers['Content-type']).to eq 'text/plain'
+      expect(r[2][0]).to eq "plain file\n"
+      expect(r[1]['Content-type']).to eq 'text/plain'
     end
 
     it 'no view no layout should work as well' do
       r = Node0.my_call '/no_view_no_layout'
-      expect(r.body[0]).to eq 'hello world'
+      expect(r[2][0]).to eq 'hello world'
     end
 
     it 'haml engine should work' do
       Node0.app.opt! :engines_cache_enabled, false
       r = Node0.my_call '/engines/haml'
-      expect(r.body[0]).to eq "<h1>Hello <i>world</i></h1>\n"
+      expect(r[2][0]).to eq "<h1>Hello <i>world</i></h1>\n"
       Node0.app.opt! :engines_cache_enabled, true
       r = Node0.my_call '/engines/haml'
-      expect(r.body[0]).to eq "<h1>Hello <i>world</i></h1>\n"
+      expect(r[2][0]).to eq "<h1>Hello <i>world</i></h1>\n"
     end
 
     it 'sass engine should work' do
       Node0.app.opt! :engines_cache_enabled, true
       r = Node0.my_call '/engines/sass'
-      expect(r.body[0]).to eq "vbar{width:80%;height:23px}vbar ul{list-style-type:none}vbar li{float:left}vbar li a{font-weight:bold}\n"
+      expect(r[2][0]).to eq "vbar{width:80%;height:23px}vbar ul{list-style-type:none}vbar li{float:left}vbar li a{font-weight:bold}\n"
       Node0.app.opt! :engines_cache_enabled, false
       r = Node0.my_call '/engines/sass'
-      expect(r.body[0]).to eq "vbar{width:80%;height:23px}vbar ul{list-style-type:none}vbar li{float:left}vbar li a{font-weight:bold}\n"
+      expect(r[2][0]).to eq "vbar{width:80%;height:23px}vbar ul{list-style-type:none}vbar li{float:left}vbar li a{font-weight:bold}\n"
     end
 
     it 'view_base_path! should work' do
       r = Node7.my_call '/view_path'
-      h = YAML.load r.body[0]
+      h = YAML.load r[2][0]
       expect(h[:view]).to eq File.join(Node7.app.opt(:root), 'alt', 'do_render')
     end
 
     it 'layout_base_path! should work' do
       r = Node7.my_call '/view_path'
-      h = YAML.load r.body[0]
+      h = YAML.load r[2][0]
       expect(h[:layout]).to eq File.join(Node7.app.opt(:root), 'alt', 'layout', 'default')
     end
 
     it 'debug out should work' do
-      stderr0 = $stderr.dup
-      stderrs = StringIO.new
-      $stderr = stderrs
+      stdout0 = $stdout.dup
+      stdouts = StringIO.new
+      $stdout = stdouts
       begin
         APP.opt! :debug, true
         Node0.my_call '/hello'
       ensure
-        $stderr = stderr0
+        $stdout = stdout0
       end
-      expect(stderrs.string.include?('spec/data/view/node0/hello')).to be true
+      expect(stdouts.string.include?('spec/data/view/node0/hello')).to be true
     end
   end
 end

data/spec/spec_helper.rb

@@ -46,7 +46,7 @@ class Zorglub::Node
   end
 
   def self.my_call_i(uri)
-    call({ 'PATH_INFO' => uri }).body[0].to_i
+    call({ 'PATH_INFO' => uri })[2][0].to_i
   end
 end
 

data/zorglub.gemspec

@@ -1,26 +1,23 @@
 #! /usr/bin/env ruby
-# -*- coding: UTF-8 -*-
 
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path("../lib", __FILE__)
 
 begin
-    require 'zorglub'
+  require 'zorglub'
 rescue LoadError
 end
 
 Gem::Specification.new do |s|
-    s.name = "zorglub"
-    s.version = Zorglub::VERSION
-    s.authors = ["Jérémy Zurcher"]
-    s.email = ["jeremy@asynk.ch"]
-    s.homepage = "http://github.com/jeremyz/zorglub"
-    s.summary = %q{a nano web application framework based on rack }
-    s.description = %q{This is a very stripped down version of innate.}
+  s.name = 'zorglub'
+  s.version = Zorglub::VERSION
+  s.authors = ['Jérémy Zurcher']
+  s.email = ['jeremy@asynk.ch']
+  s.homepage = 'http://github.com/jeremyz/zorglub'
+  s.summary = %s(a rack based nano web application framework)
+  s.description = %s(A very stripped down version of innate.)
 
-    s.files = `git ls-files`.split("\n")
-    s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-    s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-    s.require_paths = ["lib"]
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
 end
-
-# EOF

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: zorglub
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Jérémy Zurcher
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-14 00:00:00.000000000 Z
+date: 2024-10-01 00:00:00.000000000 Z
 dependencies: []
-description: This is a very stripped down version of innate.
+description: A very stripped down version of innate.
 email:
 - jeremy@asynk.ch
 executables: []
@@ -77,7 +77,7 @@ requirements: []
 rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
-summary: a nano web application framework based on rack
+summary: a rack based nano web application framework
 test_files:
 - spec/app_spec.rb
 - spec/data/alt/do_render