snails 0.6.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 937ce9b1eb6e291efded282e837bd6b45662268fb1c157cb9be6bcc359648200
-  data.tar.gz: b93517fcec6dc23ab51c993339e91a2bec7d35f1bbdad412fdc0ffc0eda3615c
+  metadata.gz: ace977fc33f80028eb415424addddbb1f6e9dcda49b35e4a852aaa7daa032524
+  data.tar.gz: a371db3ebc879c315e5b6b9fca7de42526963f053a2d128fb485acf07cf02214
 SHA512:
-  metadata.gz: 398b80b121279775d0acca31128773220981aaa75aaeed4742dc70c2b2aa6e084c2f170e74fc1b1700f2fc2db6fbf936ba815cd078f755a084d674d9538e9806
-  data.tar.gz: 4377e251ecdad20d0affd72be365aac86e78d6675b1b612f924b2b2e46d927893e4bf2e64f9a801293501720801e3ba1be26f9df90ed6a41fb0f9bebf48a9c32
+  metadata.gz: 6a24db7e0c46fe2bdfaa2ca0b19132116b8a39594f5bc59cd4bf14b4c5d433bb783fb1fa1702c82b36c0b94397d949dfecddc18727dba05629137d3c09db3a08
+  data.tar.gz: fac56d5ef6dac6db26678867090b88af56addbb792de515f835944698c079cab854110ed4e8f77f9b1ea690b6c515e5f670b032979ece8bd88b975c04924cc75

data/.gitignore

@@ -3,3 +3,4 @@ pkg
 test
 example/Gemfile.lock
 *.sh
+.ruby-version

data/example/app.rb

@@ -3,14 +3,18 @@ require 'snails'
 require 'snails/mailer'
 
 class MyApp < Snails::App
-	set :session_secret, 'foobar'
+
+  set :session_secret, SESSION_SECRET
+  set :session_domain, "app.localhost"
 
   register Snails::Assets
-	register Snails::Sessions
+  register Snails::Sessions
   # register Snails::Database
 
   get '/' do
-    'Hello world!'
+    number = session[:number] || 0
+    session[:number] = number.to_i + 1
+    "<h1>Hello world!</h1><p>This is your visit number #{number}. Come again!</p>"
   end
 end
 

data/example/app2.rb

@@ -0,0 +1,19 @@
+require 'bundler/setup'
+require 'snails'
+require 'snails/mailer'
+
+class MyOtherApp < Snails::App
+
+  set :session_secret, SESSION_SECRET
+  set :session_domain, "app.localhost"
+
+  register Snails::Assets
+  register Snails::Sessions
+  # register Snails::Database
+
+  get '/' do
+    number = session[:number] || 0
+    session[:number] = number.to_i + 1
+    "<h1>Hello world!</h1><p>This is your visit number #{number}. Come again!</p>"
+  end
+end

data/example/config.ru

@@ -1,2 +1,38 @@
+require 'securerandom'
+SESSION_SECRET = SecureRandom.hex(32) # generates a new session cookie on each login
+MAIN_DOMAIN = 'app.localhost'
+
 require './app'
-run MyApp
+require './app2'
+
+class SubdomainDispatcher
+  def initialize(mappings)
+    @mappings = mappings
+  end
+
+  def call(env)
+    subdomain = env['HTTP_HOST'].split('.').first
+
+    if subdomain.start_with?(MAIN_DOMAIN) # no domain, so see if first part of url matches one of the subdomains
+      parts = env['PATH_INFO'][1..].split('/')
+      if @mappings.key?(parts.first) # found match!
+        subdomain = parts.shift # get subdomain and remove it from path
+        env['PATH_INFO'] = parts.join('/')
+      else
+        subdomain = '' # map to root app, if present
+      end
+    end
+
+    if app = @mappings[subdomain]
+      app.call(env)
+    else
+      [404, { 'Content-Type' => 'text/html' }, "Not found"]
+    end
+  end
+end
+
+use Bugsnag::Rack if defined?(Bugsnag)
+run SubdomainDispatcher.new({
+  'one'      => MyApp,
+  'two'      => MyOtherApp
+})

data/lib/snails/app.rb

@@ -392,6 +392,7 @@ module Snails
       app.set :sessions, {
         key: app.setting(:session_key, 'snails.session'),
         path: app.setting(:session_path, '/'),
+        domain: app.setting(:session_domain, nil),
         expire_after: app.setting(:session_expire_after, 2592000), # one month in seconds
         secret: app.session_secret # uses previous set :session_secret or generates one
       }

data/lib/snails/loader.rb

@@ -0,0 +1,57 @@
+require_relative '../snails'
+require 'zeitwerk'
+
+module Snails
+
+  def self.loader
+    @loader ||= Loader.new
+  end
+
+  class Loader
+
+    attr_reader :loader
+    attr_accessor :load_paths, :preload_paths, :ignore_paths, :no_eager_load_paths
+
+    def initialize(loader: nil, load_paths: nil, preload_paths: nil)
+      @loader = loader || Zeitwerk::Loader.new
+      @load_paths = load_paths || DEFAULT_LOAD_PATHS
+      @preload_paths = preload_paths || DEFAULT_PRELOAD_PATHS
+      @ignore_paths = []
+      @no_eager_load_paths = []
+    end
+
+    def load!(opts = {})
+      # $LOAD_PATH.unshift(File.join(Snails.root, 'lib'))
+
+      load_paths.each do |path|
+        loader.push_dir(Snails.root.join(path))
+      end
+
+      ignore_paths.each do |path|
+        loader.ignore(Snails.root.join(path))
+      end
+
+      no_eager_load_paths.each do |path|
+        loader.do_not_eager_load(Snails.root.join(path))
+      end
+
+      loader.enable_reloading if opts[:enable_reload]
+      loader.setup
+
+      preload_paths.each do |path|
+        Dir.glob(Snails.root.join(path, '*.rb')).each { |f| require f }
+      end
+
+      loader.eager_load if opts[:eager_load]
+    end
+
+    def reload!
+      loader.reload
+    end
+
+    private
+
+    DEFAULT_LOAD_PATHS = ['lib']
+    DEFAULT_PRELOAD_PATHS = ['config/initializers']
+  end
+end

data/lib/snails.rb

@@ -46,5 +46,7 @@ ENV['RACK_ENV'] ||= ENV['RAILS_ENV']
 
 require 'snails/app' unless Snails.env.test?
 unless ENV['SILENT']
-  puts "Loaded #{Snails.env} environment. (#{Time.now.to_s})"
+  ruby_version = "#{RUBY_VERSION}" # -p#{RUBY_PATCHLEVEL}
+  ruby_version += " +YJIT" if RUBY_DESCRIPTION['YJIT']
+  puts "Loaded \e[1m#{Snails.env}\e[0m environment with \e[1mRuby #{ruby_version}\e[0m \e[37m(#{Time.now.to_s})\e[0m"
 end

data/snails.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "snails"
-  s.version     = '0.6.1'
+  s.version     = '0.8.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Tomás Pollak']
   s.email       = ['tomas@forkhq.com']
@@ -17,7 +17,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency "fuubar", '>= 2.3.2'
 
   s.add_runtime_dependency "i18n", ">= 1.0.1"
+  s.add_runtime_dependency "zeitwerk", "~> 2.6"
   s.add_runtime_dependency "sinatra-contrib", ">= 2.0.3"
+  s.add_runtime_dependency "activesupport", "> 6.0.0"
   # s.add_runtime_dependency "activerecord", "< 6.0"
   # s.add_runtime_dependency "sinatra-activerecord", ">= 2.0.13"
   s.add_runtime_dependency "sinatra-flash", ">= 0.3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snails
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-30 00:00:00.000000000 Z
+date: 2023-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +100,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.3
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: sinatra-flash
   requirement: !ruby/object:Gem::Requirement
@@ -127,9 +155,11 @@ files:
 - example/Gemfile
 - example/Rakefile
 - example/app.rb
+- example/app2.rb
 - example/config.ru
 - lib/snails.rb
 - lib/snails/app.rb
+- lib/snails/loader.rb
 - lib/snails/mailer.rb
 - lib/snails/markdown.rb
 - lib/snails/rspec.rb
@@ -155,8 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Ruby on Snails.