snails 0.7.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d83a01b55251fb5f6178f810ed1634adcd6c29eb088fdb8cdbbbef399e5d92ff
-  data.tar.gz: 63388ea9f9d672a42aa949652217c454c18976193773c41865ba0d154ef0a394
+  metadata.gz: d235bda86922e62754528a0d8ebd0e875266c8101d162bed2d2791b30bbc76a7
+  data.tar.gz: ebffe464327f0bf09cff4cfdd5736ab9d3f8ed8866d8baa49bf77c74bf9c2870
 SHA512:
-  metadata.gz: 7ae7bbb963a436bffe57626b16e85c66e480d4e4650466e3bf3a7a1a83de8037b1e1a7a98b9a1077ddd1c8003b336e944ef237c9eb778a4e3a8ebc8459100b5a
-  data.tar.gz: 699378ef2f876cf6575aeada6c10b79f95326e2ad17c21534bdc855078a26962729f67c2470982aa833ac5a9667435b235291eeb7d02e08182a475c0eb6aae7e
+  metadata.gz: 1085f36ee8bd4dd653635407ed22d7a5276d6203ae01da4df9066039f77e9a916f6978b9677d1b4f8357f8291976d4b6e29ef0c79e5b8d44aea0aa98e261b09f
+  data.tar.gz: 2a7ac9e077c693a152af80d46f52bd1292a901f9299890490248b1208e44a4c8c70c526f34c3d0b3b6f618c4d2c4186d84b7915147509379092de2c9248f5502

data/example/app.rb

@@ -4,7 +4,9 @@ require 'snails/mailer'
 
 class MyApp < Snails::App
 
-  set :session_secret, SecureRandom.hex(32) # generates a new session cookie on each login
+  set :session_secret, SESSION_SECRET
+  set :session_domain, "app.localhost"
+
   register Snails::Assets
   register Snails::Sessions
   # register Snails::Database

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

@@ -98,6 +98,7 @@ module Snails
       require 'sprockets-helpers'
 
       cwd = Pathname.new(Dir.pwd)
+
       app.set :sprockets, Sprockets::Environment.new(cwd)
       app.set :digest_assets, false
       app.set :assets_prefix, app.setting(:assets_prefix, '/assets') # URL
@@ -106,6 +107,7 @@ module Snails
       app.set :assets_precompile, app.setting(:assets_precompile, %w(js/main.js css/main.css))
       app.set :assets_remove_digests, app.setting(:assets_remove_digests, false)
 
+
       app.configure do
         app.assets_paths.each do |path|
           app.sprockets.append_path cwd.join(path)
@@ -354,11 +356,13 @@ module Snails
       erb(view_name.to_sym, { layout: layout }.merge(opts))
     end
 
-    def show_date(date)
-      date ? date.strftime("%d de %b, %Y") : ''
+    def show_date(time)
+      time = Time.parse(time) if time.is_a?(String) && !time.blank?
+      time ? time.strftime("%d de %b, %Y") : ''
     end
 
     def show_time(time)
+      time = Time.parse(time) if time.is_a?(String) && !time.blank?
       time ? time.strftime("%d de %b, %Y a las %H:%M") : ''
     end
 
@@ -417,6 +421,10 @@ module Snails
     set :views, Snails.root.join('lib', 'views')
     set :static_paths, %w(/css /img /js /files /fonts /favicon.ico)
 
+    if defined?(Snails.loader) && Snails.loader.loaded?
+      set :lock, true if Snails.env.development?
+    end
+
     enable :method_override
     enable :logging
 
@@ -455,6 +463,10 @@ module Snails
       show_error(404)
     end
 
+    after do
+      Snails.loader.reload! if settings.lock
+    end
+
     protected
 
     def deliver(data, code = 200, format = :json)

data/lib/snails/loader.rb

@@ -0,0 +1,73 @@
+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, :postload_paths, :ignore_paths, :no_eager_load_paths
+
+    def initialize(loader: nil, load_paths: nil, preload_paths: nil, postload_paths: nil)
+      @loader = loader || Zeitwerk::Loader.new
+      @load_paths = load_paths || DEFAULT_LOAD_PATHS
+      @preload_paths = preload_paths || DEFAULT_PRELOAD_PATHS
+      @postload_paths = postload_paths || []
+      @ignore_paths = []
+      @no_eager_load_paths = []
+    end
+
+    def loaded?
+      @loaded
+    end
+
+    def load!(opts = {})
+      # $LOAD_PATH.unshift(File.join(Snails.root, 'lib'))
+
+      preload_paths.each do |path|
+        Dir.glob(Snails.root.join(path, '*.rb')).each { |f| require f }
+      end
+
+      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
+
+      postload_paths.each do |path|
+        Dir.glob(Snails.root.join(path, '*.rb')).each { |f| require f }
+      end
+
+      loader.eager_load if opts[:eager_load]
+
+      @loaded = true
+
+      # enable reloading for already defined apps
+      Snails.apps.each do |app|
+        app.set :lock, true
+      end if Snails.env.dev?
+    end
+
+    def reload!
+      loader.reload
+    end
+
+    private
+
+    DEFAULT_LOAD_PATHS = ['lib']
+    DEFAULT_PRELOAD_PATHS = ['config/initializers']
+  end
+end

data/lib/snails.rb

@@ -44,7 +44,7 @@ end
 # sinatra/activerecord only 'reads' RACK_ENV, so make sure it is set
 ENV['RACK_ENV'] ||= ENV['RAILS_ENV']
 
-require 'snails/app' unless Snails.env.test?
+# require 'snails/app' unless Snails.env.test?
 unless ENV['SILENT']
   ruby_version = "#{RUBY_VERSION}" # -p#{RUBY_PATCHLEVEL}
   ruby_version += " +YJIT" if RUBY_DESCRIPTION['YJIT']

data/snails.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "snails"
-  s.version     = '0.7.0'
+  s.version     = '0.8.1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Tomás Pollak']
   s.email       = ['tomas@forkhq.com']
@@ -17,6 +17,7 @@ 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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snails
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-19 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
@@ -141,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