rooibos 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de0fd230ae66b1f7bb75d7bc0dbaad374d929efe3102638f0dfd2a7558312bc5
-  data.tar.gz: 03bc89ff9e8880b053e022dfdf8bbab94f107e153e174402d9ce5c83b9644c2f
+  metadata.gz: 84b4f67bd8240b412f78b91e8e8e52af841e6438694bb51013519d3ba6e28fe7
+  data.tar.gz: 63ac12eba2aee98ecf595aa948d457babc3533ce66b2d9fa20eee5257e26bcf1
 SHA512:
-  metadata.gz: de7f4335062b9feefca507ef70b058d1561efe6d3fd69ccf764c2b1e4809d17bd3378380b752cf5c1108957dc7ca94a249b276fe1058c1fe6d9abbecc8d1f060
-  data.tar.gz: b50d6ddb3cc4ab37d0d2514d3852c95dbedd6c4cb756cbcb7fe7fcf8937189e7137961704bc1a284a9777f5ee83bd8fe263f9bad99e71f45ea5e29d1da6c864e
+  metadata.gz: 193556d2bf1093e16c1229162e579113c3d4a75c472cf37c071db593f4d1506405de0c7eaf1bccfcb9b2555335ed304c64d25f1cd08231c7c084a58bfa9ba731
+  data.tar.gz: a8ab3b783bc7f40527f05b15d7c32e971f70518cb9a4769f5d0312590ff866773debe986dcfb93ab36e8cf61a95dc40f9b91db842557633b36333296ffaf6fbf

data/lib/rooibos/router/guard.rb

@@ -32,10 +32,16 @@ module Rooibos
         new(callable: apply_scope(normalized))
       end
 
+      # Combines two guards into a single callable without creating a closure.
+      class CombinedGuard < Data.define(:inner, :outer)
+        def arity = 2
+        def call(msg, model) = inner.call(msg, model) && outer.call(msg, model)
+      end
+
       private_class_method def self.apply_scope(callable)
         @scope.inject(callable) do |inner, outer|
           if inner
-            -> (msg, model) { outer.call(msg, model) && inner.call(msg, model) }
+            CombinedGuard.new(inner:, outer:)
           else
             outer
           end

data/lib/rooibos/version.rb

@@ -8,5 +8,5 @@
 module Rooibos
   # The version of this gem.
   # See https://semver.org/spec/v2.0.0.html
-  VERSION = "0.7.0"
+  VERSION = "0.7.2"
 end

data/lib/rooibos/welcome.rb

@@ -8,6 +8,20 @@
 module Rooibos
   # Built-in welcome screen used by scaffolded applications.
   module Welcome
+    # Detect the gem name from the file that required this welcome screen.
+    # A scaffolded app's main lib file (e.g. lib/hello_rooibos.rb) lives
+    # directly under lib/ with no subdirectory — that distinguishes it from
+    # gem internals (lib/rooibos/welcome.rb) and test files (test/*.rb).
+    # Evaluated once at require-time; nil when loaded outside a lib/ context.
+    SOURCE_GEM = begin
+      rooibos_lib = File.expand_path("..", String(__dir__)) # this gem's lib/ dir
+      caller_locations
+        &.filter_map(&:absolute_path)
+        &.find { |p| p.match?(%r{/lib/[^/]+\.rb\z}) && !p.start_with?(rooibos_lib) }
+        &.then { |p| File.basename(p, ".rb") }
+    end
+    private_constant :SOURCE_GEM
+
     module UI # :nodoc:
       module Styles # :nodoc:
         TEXT = RatatuiRuby::Style::Style.new
@@ -27,12 +41,15 @@ module Rooibos
       end
 
       module Widgets # :nodoc:
+        LIB_FILE  = SOURCE_GEM ? "lib/#{SOURCE_GEM}.rb"       : "lib/your_app.rb"
+        TEST_FILE = SOURCE_GEM ? "test/test_#{SOURCE_GEM}.rb" : "test/test_your_app.rb"
+
         WELCOME_TEXT = {
           "Welcome to Rooibos! You will find the Ruby code " \
             "for this application in " => Styles::TEXT,
-          "lib/saturday.rb" => Styles::FILENAME,
+          LIB_FILE => Styles::FILENAME,
           ". The tests that verify it are at " => Styles::TEXT,
-          "test/test_saturday.rb" => Styles::FILENAME,
+          TEST_FILE => Styles::FILENAME,
           ". You can run the tests with " => Styles::TEXT,
           "bundle exec rake test" => Styles::COMMAND,
           ". Visit " => Styles::TEXT,

data/sig/rooibos/router/guard.rbs

@@ -16,6 +16,14 @@ module Rooibos
 
       # Evaluates the guard. Returns true if no callable.
       def call: (message, _DataModel) -> boolish
+
+      class CombinedGuard < Data
+        attr_reader inner: guard
+        attr_reader outer: guard
+
+        def arity: () -> Integer
+        def call: (message, _DataModel) -> boolish
+      end
     end
   end
 end

data/sig/rooibos/welcome.rbs

@@ -6,6 +6,7 @@
 module Rooibos
   # Built-in welcome screen used by scaffolded applications.
   module Welcome
+    SOURCE_GEM: String?
     WEBSITE_URL: String
 
     # Internal UI module for styles and widgets.
@@ -26,6 +27,8 @@ module Rooibos
       end
 
       module Widgets
+        LIB_FILE: String
+        TEST_FILE: String
         WELCOME_TEXT: Hash[String, RatatuiRuby::Style::Style]
         PARAGRAPH: RatatuiRuby::Widgets::Paragraph
         def self.website_button: (?focused: bool, ?hovered: bool) -> RatatuiRuby::Text::Span

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rooibos
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Kerrick Long