zorglub 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88366b3d9072148ff02475d0c49f01308b4c5b93e44c9c144132d967148fd876
-  data.tar.gz: 86e1a4e383f65d05fa80a871e7246b089bc70708475e6123eaadfd0aa82ec26c
+  metadata.gz: be6b53fccd29ce596c15253af31b7c4b7470e1a55075aa34cd541edd54144f57
+  data.tar.gz: cda16f4674a73d6ce3659db5e5cf7f51eea5fe0779324990b406046a341b6a04
 SHA512:
-  metadata.gz: 2266d5149353d7d1351b944f5f20df05f60425926090cfcb44136f2fa8eb7849317c47c920620654f61e410d17611305f20eaa6aa700ef738a36a9c300b0a3eb
-  data.tar.gz: 725d026f3eccc26579d1455de735762e4baef7ba172b1e3caf7611e36a941fb005343b2f09a9b638660e2d20c9907046e9080cbbedff12aefc809043572611ad
+  metadata.gz: 10c3739c48de2eed8c53c32d703f198ec5fc4a752ce32a36de12c5964664d057ad04f81eeb6ce95b16bd4ae0236e4cd4f02d00c27327372a4479078b1c822e28
+  data.tar.gz: 109e27aa1526edff83bd67681f61aced077b2f55a23e13d3b3aaa8ec0962ccf61a8218e0f6f0bcd405cd4c3680e3e370e515ce46718b7d758f86f0322fc1e0bc

data/Changelog

@@ -1,3 +1,11 @@
+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

data/Gemfile.lock

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

data/lib/zorglub/node.rb

@@ -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.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
@@ -281,16 +281,15 @@ module Zorglub
       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.6'.freeze
+  VERSION = '0.1.7'.freeze
 end
 
 require 'zorglub/node'

data/spec/node_spec.rb

@@ -56,6 +56,7 @@ describe Zorglub do
     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[2][0]).to eq "Node0 mapped at /node0 can't respond to : noresponse"
       expect(r[0]).to eq 404
     end
 
@@ -294,16 +295,16 @@ describe Zorglub do
     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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zorglub
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Jérémy Zurcher
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-20 00:00:00.000000000 Z
+date: 2024-10-01 00:00:00.000000000 Z
 dependencies: []
 description: A very stripped down version of innate.
 email: