zorglub 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88366b3d9072148ff02475d0c49f01308b4c5b93e44c9c144132d967148fd876
-  data.tar.gz: 86e1a4e383f65d05fa80a871e7246b089bc70708475e6123eaadfd0aa82ec26c
+  metadata.gz: 8d89d17dda2afc40f6e680136dcf4562b2dd5bc04660b7b5287ddde1cf92a7dd
+  data.tar.gz: b18816ab21c0a4635a1e3c0584d7ecc0bba355789304c57d15798b883a729ff1
 SHA512:
-  metadata.gz: 2266d5149353d7d1351b944f5f20df05f60425926090cfcb44136f2fa8eb7849317c47c920620654f61e410d17611305f20eaa6aa700ef738a36a9c300b0a3eb
-  data.tar.gz: 725d026f3eccc26579d1455de735762e4baef7ba172b1e3caf7611e36a941fb005343b2f09a9b638660e2d20c9907046e9080cbbedff12aefc809043572611ad
+  metadata.gz: 23185e5cb71d2de61692d6a0345f36cc9f4e825405fe995b1750f1ea376adb39cc946039e30058bd30889bb91d6263d0618c0dff622955aa88b616dcaa4cde09
+  data.tar.gz: 31a2709c3daca4485320edd49d288109edaab0b0c5690d1d73511904293990aeae86db871991a0fb81f39d47acf56c5a33e983984b1a472ef8289d192c63bb66

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,41 +1,41 @@
 PATH
   remote: .
   specs:
-    zorglub (0.1.6)
+    zorglub (0.1.8)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    bigdecimal (3.1.8)
+    bigdecimal (3.1.9)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
       term-ansicolor (~> 1.3)
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
-    diff-lcs (1.5.1)
+    diff-lcs (1.6.1)
     docile (1.4.1)
-    ffi (1.17.0)
+    ffi (1.17.1)
     haml (6.3.0)
       temple (>= 0.8.2)
       thor
       tilt
-    json (2.7.2)
-    rack (3.1.7)
+    json (2.10.2)
+    rack (3.1.12)
     rake (13.2.1)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
+    rspec-support (3.13.2)
     sassc (2.4.0)
       ffi (~> 1.9)
     simplecov (0.16.1)
@@ -47,9 +47,9 @@ GEM
     temple (0.10.3)
     term-ansicolor (1.11.2)
       tins (~> 1.0)
-    thor (1.3.1)
-    tilt (2.4.0)
-    tins (1.33.0)
+    thor (1.3.2)
+    tilt (2.6.0)
+    tins (1.38.0)
       bigdecimal
       sync
 
@@ -66,4 +66,4 @@ DEPENDENCIES
   zorglub!
 
 BUNDLED WITH
-   2.5.17
+   2.6.7

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.8'.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.8
 platform: ruby
 authors:
 - Jérémy Zurcher
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-20 00:00:00.000000000 Z
+date: 2025-04-09 00:00:00.000000000 Z
 dependencies: []
 description: A very stripped down version of innate.
 email:
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: a rack based nano web application framework