add scoped include / extend

Gemfile

@@ -7,6 +7,9 @@ gemspec
 gem 'rubocop', '~> 1.21'
 gem 'rubocop-performance'
 gem 'byebug'
+gem 'erubi'
+gem 'oj'
+gem 'rack'
 gem 'pry', '~> 0.12.2'
 gem 'rerun'
 gem 'rspec'

examples/playground/Gemfile.lock

@@ -92,6 +92,7 @@ GEM
     sequel (5.87.0)
       bigdecimal
     sqlite3 (2.8.1-x86_64-linux-gnu)
+    stimulux (1.0.0)
     thin (1.8.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
@@ -118,6 +119,7 @@ DEPENDENCIES
   rubocop
   sequel
   sqlite3
+  stimulux
   thin
 
 BUNDLED WITH

examples/playground/app.rb

@@ -40,8 +40,16 @@ def call(_req)
   end
 end
 
+module IncludeExample
+  def say_foo
+    'foo'
+  end
+end
+
 App =
   Rackr.new(config).app do
+    include IncludeExample
+
     get do |req|
       req.session['visitas'] ||= 0
 
@@ -54,6 +62,12 @@ def call(_req)
       render res:
     end
 
+    get 'include_example' do
+      render (html_slice do
+        h1 say_foo
+      end)
+    end
+
     get 'not_string_error' do
       render 2
     end

lib/rackr.rb

@@ -7,7 +7,7 @@
 
 # Rackr is a simple router for Rack.
 class Rackr
-  VERSION = '0.0.69'
+  VERSION = '0.0.70'
 
   class NotFound < StandardError; end
 
@@ -31,6 +31,14 @@ def initialize(config = {}, before: [], after: [])
     @router = Router.new(config, before: before, after: after)
   end
 
+  def include(mod)
+    self.class.include(mod)
+  end
+
+  def extend(mod)
+    self.class.extend(mod)
+  end
+
   def app(&)
     instance_eval(&)
 

lib/rackr/action.rb

@@ -143,16 +143,19 @@ module Action
 
     def self.included(base)
       base.class_eval do
-        if self != Rackr
+        if self == Rackr
+          include HtmlSlice if Object.const_defined?('HtmlSlice')
+          include Stimulux if Object.const_defined?('Stimulux')
+        else
           attr_reader :routes, :config, :deps, :db, :log, :cache
 
-          include Callbacks unless included_modules.include?(Rackr::Callback)
+          include Callbacks unless include?(Rackr::Callback)
         end
 
-        include HtmlSlice if Object.const_defined?('HtmlSlice')
-        include Stimulux if Object.const_defined?('Stimulux')
-
         def initialize(routes: nil, config: nil)
+          self.class.include(HtmlSlice) if Object.const_defined?('HtmlSlice')
+          self.class.include(Stimulux) if Object.const_defined?('Stimulux')
+
           @routes = routes
           @config = config
           @deps = config&.dig(:deps)

lib/spec/rackr/action_spec.rb

@@ -610,6 +610,7 @@ module ::HtmlSlice; end
         require_relative action_file_path
 
         action_class = Class.new { include Rackr::Action }
+        action_class.new # Create an instance to trigger the initialize method
         expect(action_class.included_modules).to include(HtmlSlice)
       end
     end
@@ -630,6 +631,7 @@ module ::Stimulux; end
         require_relative action_file_path
 
         action_class = Class.new { include Rackr::Action }
+        action_class.new # Create an instance to trigger the initialize method
         expect(action_class.included_modules).to include(Stimulux)
       end
     end

lib/spec/rackr/callback_spec.rb

@@ -13,7 +13,7 @@ class SomeClass3
 
 RSpec.describe Rackr::Callback do
   it 'includes http router action' do
-    expect(SomeClass3.included_modules.include?(Rackr::Action)).to be_truthy
+    expect(SomeClass3.include?(Rackr::Action)).to be_truthy
   end
 
   context 'not returning valid rack request' do

rackr.gemspec

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'lib/rackr'
-
 Gem::Specification.new do |s|
   s.name        = 'rackr'
-  s.version     = Rackr::VERSION
+  s.version = File.read(File.expand_path("../lib/rackr.rb", __FILE__))[/VERSION = ['"](.+)['"]/, 1]
   s.summary     = 'Rack first web framework.'
   s.description = 'Rack first web framework.'
   s.authors     = ['Henrique F. Teixeira']