zorglub 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d89d17dda2afc40f6e680136dcf4562b2dd5bc04660b7b5287ddde1cf92a7dd
-  data.tar.gz: b18816ab21c0a4635a1e3c0584d7ecc0bba355789304c57d15798b883a729ff1
+  metadata.gz: bf262a5d18465314e40cfa28bf3c547dd4cbbb8c296908c4748d66a4b53facdc
+  data.tar.gz: 61210551728871485fcd2f1a4dbba7567aab3df98ad2b904d1b91b750b6e6928
 SHA512:
-  metadata.gz: 23185e5cb71d2de61692d6a0345f36cc9f4e825405fe995b1750f1ea376adb39cc946039e30058bd30889bb91d6263d0618c0dff622955aa88b616dcaa4cde09
-  data.tar.gz: 31a2709c3daca4485320edd49d288109edaab0b0c5690d1d73511904293990aeae86db871991a0fb81f39d47acf56c5a33e983984b1a472ef8289d192c63bb66
+  metadata.gz: 0ffba7e7b5e57088a261820ea5d997cf62814ed1f61177a1c1e0dcb09b3b70722f46b8390aad4b7cc0a51c92526e878eab1f993a6d726e044b16efe1c7e58ef7
+  data.tar.gz: 99ec63041fad6025ebc1feea9aa31e3337184f2bfeeb38a48d5fc8a37f19780f4eaf0c62fdc4447c082319d23368d7bfd75bdd737cf561a9e75bd7ee24d66729

data/Changelog

@@ -1,3 +1,16 @@
+
+2026-02-16 Jérémy Zurcher <jeremy@asynk.ch>
+	* release 0.1.9
+	* support nil meth
+	* may override view in partial call
+	* local variables, recursion check, instance level partial method
+	* partial(env, …) -> partial(… env: {}, no_hooks: false)
+	* use securerandom
+
+2025-04-09 Jérémy Zurcher <jeremy@asynk.ch>
+	* release 0.1.8
+	* bundle update
+
 2024-10-01 Jérémy Zurcher <jeremy@asynk.ch>
 	* release 0.1.7
 	* debug to stdout
@@ -5,7 +18,6 @@
 	* fix error404 msg
 	* use keyword arguments
 
-
 2024-08-20 Jérémy Zurcher <jeremy@asynk.ch>
 	* release 0.1.6
 	* fix specs

data/Gemfile

@@ -4,15 +4,16 @@ source "http://rubygems.org"
 gemspec
 
 gem 'rack'
+gem 'securerandom'
 
 group :test do
-    gem 'rake'
-    gem 'rspec'
+  gem 'rake'
+  gem 'rspec'
 end
 
 group :test, :development do
-    gem 'haml'
-    gem 'sassc'
+  gem 'haml'
+  gem 'sassc'
 end
 
 gem 'coveralls', require: false

data/Gemfile.lock

@@ -1,56 +1,65 @@
 PATH
   remote: .
   specs:
-    zorglub (0.1.8)
+    zorglub (0.1.9)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    bigdecimal (3.1.9)
+    bigdecimal (4.0.1)
     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.6.1)
+    diff-lcs (1.6.2)
     docile (1.4.1)
-    ffi (1.17.1)
-    haml (6.3.0)
+    ffi (1.17.3)
+    haml (7.2.0)
       temple (>= 0.8.2)
       thor
       tilt
-    json (2.10.2)
-    rack (3.1.12)
-    rake (13.2.1)
-    rspec (3.13.0)
+    io-console (0.8.2)
+    json (2.18.1)
+    mize (0.6.1)
+    rack (3.2.5)
+    rake (13.3.1)
+    readline (0.0.4)
+      reline
+    reline (0.6.3)
+      io-console (~> 0.5)
+    rspec (3.13.2)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.3)
+    rspec-core (3.13.6)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.2)
+    rspec-mocks (3.13.7)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.2)
+    rspec-support (3.13.7)
     sassc (2.4.0)
       ffi (~> 1.9)
+    securerandom (0.4.1)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     sync (0.5.0)
-    temple (0.10.3)
-    term-ansicolor (1.11.2)
-      tins (~> 1.0)
-    thor (1.3.2)
-    tilt (2.6.0)
-    tins (1.38.0)
+    temple (0.10.4)
+    term-ansicolor (1.11.3)
+      tins (~> 1)
+    thor (1.5.0)
+    tilt (2.7.0)
+    tins (1.51.1)
       bigdecimal
+      mize (~> 0.6)
+      readline
       sync
 
 PLATFORMS
@@ -63,7 +72,8 @@ DEPENDENCIES
   rake
   rspec
   sassc
+  securerandom
   zorglub!
 
 BUNDLED WITH
-   2.6.7
+  4.0.6

data/lib/zorglub/node.rb

@@ -146,6 +146,10 @@ module Zorglub
       File.join map, (args.empty? ? meth : args.map(&:to_s))
     end
 
+    def partial(meth, *args, **options)
+      self.class.partial(meth, *args, env: request.env, parent: self, **options)
+    end
+
     def html
       %i[map r args engine layout view].inject('') { |s, sym| s + "<p>#{sym} => #{send sym}</p>" }
     end
@@ -231,16 +235,16 @@ module Zorglub
         meth ||= 'index'
         $stdout << "=> #{meth}(#{args.join ','})\n" if app.opt :debug
         node = new(env, meth, args)
-        return error404 node, meth unless node.respond_to? meth
+        return error404(node, meth) unless node.respond_to?(meth)
 
         node.realize!
       end
 
-      def partial(env, meth, *args)
-        node = new(env, meth.to_s, args, partial: true)
-        return error404 node, meth unless node.respond_to? meth
+      def partial(meth, *args, **options)
+        node = new(options[:env] || {}, meth, args, partial: true, **options)
+        return error404(node, meth) unless meth.nil? || node.respond_to?(meth)
 
-        node.feed!(no_hooks: env[:no_hooks])
+        node.feed!(no_hooks: options[:no_hooks] || false)
         node.content
       end
 
@@ -254,22 +258,33 @@ module Zorglub
       end
     end
 
-    attr_reader :request, :response, :content, :mime, :state, :engine, :meth, :args
+    attr_reader :request, :response, :content, :mime, :state, :engine, :meth, :args, :depth, :parent
+
+    def initialize(env, meth, args, **options)
+      @parent = options[:parent]
+      @depth = @parent ? @parent.depth + 1 : 0
+      raise 'Recursive partial depth limit exceeded' if @depth > 20
 
-    def initialize(env, meth, args, partial: false)
-      @meth = meth
-      @args = args
-      @partial = partial
-      @request = Rack::Request.new env
-      @response = Rack::Response.new
-      @cli_vals = {}
       @debug = app.opt :debug
-      @engine = self.class.engine
-      @layout = (partial ? nil : self.class.layout)
-      @view = r(meth)
       @static = self.class.static
+      @engine = self.class.engine
       @cache_lifetime = self.class.cache_lifetime
+
+      @meth = meth.to_s
+      @args = args
+      @request = @parent ? @parent.request : Rack::Request.new(env)
+      @response = @parent ? @parent.response : Rack::Response.new
+
+      @view = options[:view] || r(@meth)
+      @partial = options[:partial] || false
+      @layout = (options[:partial] ? nil : self.class.layout)
+
+      @cli_vals = {}
       self.class.cli_vals.each { |s, v| cli_val s, *v }
+
+      (options[:locals] || {}).each do |k, v|
+        instance_variable_set("@#{k}", v)
+      end
     end
 
     def realize!
@@ -285,7 +300,7 @@ module Zorglub
       @state = :pre_cb
       self.class.call_before_hooks self unless no_hooks
       @state = :meth
-      @content = send @meth, *@args
+      @content = send(@meth, *@args) unless @meth.empty?
       if (static_path = static)
         static_page! static_path
       else

data/lib/zorglub/session.rb

@@ -110,39 +110,11 @@ module Zorglub
     end
 
     def generate_sid!
-      begin sid = sid_algorithm end while @sessions.key? sid
-      sid
-    end
-
-    begin
-      require 'securerandom'
-      # Using SecureRandom, optional length.
-      # SecureRandom is available since Ruby 1.8.7.
-      # For Ruby versions earlier than that, you can require the uuidtools gem,
-      # which has a drop-in replacement for SecureRandom.
-      def sid_algorithm
-        SecureRandom.hex(@options[:sid_len])
-      end
-    rescue LoadError
-      require 'openssl'
-      # Using OpenSSL::Random for generation, this is comparable in performance
-      # with stdlib SecureRandom and also allows for optional length, it should
-      # have the same behaviour as the SecureRandom::hex method of the
-      # uuidtools gem.
-      def sid_algorithm
-        OpenSSL::Random.random_bytes(@options[:sid_len] / 2).unpack1('H*')[0]
-      end
-    rescue LoadError
-      # Digest::SHA2::hexdigest produces a string of length 64, although
-      # collisions are not very likely, the entropy is still very low and
-      # length is not optional.
-      #
-      # Replacing it with OS-provided random data would take a lot of code and
-      # won't be as cross-platform as Ruby.
-      def sid_algorithm
-        entropy = [srand, rand, Time.now.to_f, rand, $$, rand, object_id]
-        Digest::SHA2.hexdigest(entropy.join)
+      loop do
+        sid = SecureRandom.hex(@options[:sid_len])
+        break unless @sessions.key?(sid)
       end
+      sid
     end
   end
 end

data/lib/zorglub.rb

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

data/spec/node_spec.rb

@@ -169,17 +169,21 @@ describe Zorglub do
     end
 
     it 'partial should render correctly' do
-      expect(Node0.partial({}, :do_partial, 1, 2)).to eq 'partial_content'
+      expect(Node0.partial(:do_partial, 1, 2)).to eq 'partial_content'
     end
 
     it 'method level view should work' do
-      expect(Node0.partial({}, :other_view)).to eq 'partial_content'
+      expect(Node0.partial(:other_view)).to eq 'partial_content'
+    end
+
+    it 'partial may override the view' do
+      expect(Node0.partial(:do_partial, 1, 2, view: Node0.r(:do_render))).to eq 'do_render'
     end
 
     it 'partial with hooks should be default' do
       Node3.before = 0
       Node3.after = 0
-      expect(Node3.partial({}, :do_partial, 1, 2)).to eq 'partial_content'
+      expect(Node3.partial(:do_partial, 1, 2)).to eq 'partial_content'
       expect(Node3.before).to eq 1
       expect(Node3.after).to eq 1
     end
@@ -187,11 +191,23 @@ describe Zorglub do
     it 'partial without hooks should work' do
       Node3.before = 0
       Node3.after = 0
-      expect(Node3.partial({ no_hooks: true }, :do_partial, 1, 2)).to eq 'partial_content'
+      expect(Node3.partial(:do_partial, 1, 2, no_hooks: true)).to eq 'partial_content'
       expect(Node3.before).to eq 0
       expect(Node3.after).to eq 0
     end
 
+    it 'partial with locals should work' do
+      expect(Node0.partial(:test_locals, locals: { my_local: 'hello' })).to eq 'hello'
+    end
+
+    it 'recursive partial should work' do
+      expect(Node0.partial(:test_recursive, 3)).to eq '3-2-1-end'
+    end
+
+    it 'recursive partial depth limit should be enforced' do
+      expect { Node0.partial(:test_recursive, 25) }.to raise_error('Recursive partial depth limit exceeded')
+    end
+
     it 'static pages should be generated' do
       r = Node6.my_call '/do_static'
       expect(r[2][0]).to eq 'VAL 1'

data/spec/spec_helper.rb

@@ -33,7 +33,7 @@ RENDER_PROC = proc { |_path, obj|
   when :view
     ['view_content', 'text/view']
   when :partial
-    ['partial_content', 'text/partial']
+    [obj.view =~ /do_render/ ? 'do_render' : 'partial_content', 'text/partial']
   else
     raise Exception.new
   end
@@ -118,6 +118,17 @@ class Node0 < Zorglub::Node
       engine! :sass
     end
   end
+
+  def test_locals
+    @my_local
+  end
+
+  def test_recursive(val)
+    val = val.to_i
+    return 'end' if val <= 0
+
+    "#{val}-" + partial(:test_recursive, val - 1)
+  end
 end
 
 class Node1 < Zorglub::Node

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: zorglub
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Jérémy Zurcher
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: A very stripped down version of innate.
 email:
@@ -59,7 +58,6 @@ files:
 homepage: http://github.com/jeremyz/zorglub
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -74,8 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: a rack based nano web application framework
 test_files: