snails 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cfb299fdc1c0ea02bbbd6eb4826c0925a41202cb
-  data.tar.gz: 80b38caff03a1d149eb41a2a07ee6ec99776ec82
+SHA256:
+  metadata.gz: 0cafb0e86036bc65418240e5e0942ce1b2a89052f812db2269917c900e6a9652
+  data.tar.gz: 39bf3a5d05baba4bfc4828e222eb0ef0728a45dd6cc6bb159c15c76da2ee92e9
 SHA512:
-  metadata.gz: f79f1bd48245a247f2d4844d028afcc69eaa29e2fa469ec401e5b6aa6f79059df39957c43cb5726eea261bba4b407012959ad895aee5483915da2b68eb427b11
-  data.tar.gz: 7e84b3eb5948d177b2c2532cc7b7b2e0278ff0b6a467ea37369b0346fad488fa77954d08593d74ea15bfdd3126db7c70fd6fb90836560a34ba87682efc333423
+  metadata.gz: 32bb3cc41d55574f44af28370da22ef8e21954f3b3165874926b3dd0bcf3e864e14c8ed5f8d2e1221ff2e4de67d0255d9bc5ff624b8952b0e9f32bc277ce8068
+  data.tar.gz: '09824f4141ec972a719a8cfa95b68fbc9e34f09f05155cb5b9865b66ee90b512df1436e53ec5b12479eab27a538bbb5f8cf48e3055dea2d4dc446f080ae7d845'

data/example/Rakefile

@@ -1,22 +1,2 @@
-require 'bundler/setup'
-require 'snails'
-require 'snails/notifier'
-
-class MyApp < Snails::App
-  # register Snails::Assets
-  # register Snails::Database
-end
-
-Notifier = Snails::Mailer.new({
-  from: 'User <test@myapp.com>',
-  smtp: {
-    helo_domain: 'myapp.com'
-  }
-})
-
-Notifier.email(:new_message) do |message|
-  text = "You have a new message from: #{message.from.email}"
-  send_email(to: message.to.email, subject: "New message!", body: text)
-end
-
+require './app'
 require 'snails/tasks'

data/example/app.rb

@@ -0,0 +1,27 @@
+require 'bundler/setup'
+require 'snails'
+require 'snails/mailer'
+
+class MyApp < Snails::App
+	set :session_secret, 'foobar'
+
+  register Snails::Assets
+	register Snails::Sessions
+  # register Snails::Database
+
+  get '/' do
+    'Hello world!'
+  end
+end
+
+Notifier = Snails::Mailer.new({
+  from: 'User <test@myapp.com>',
+  smtp: {
+    helo_domain: 'myapp.com'
+  }
+})
+
+Notifier.email(:new_message) do |message|
+  text = "You have a new message from: #{message.from.email}"
+  send_email(to: message.to.email, subject: "New message!", body: text)
+end

data/example/config.ru

@@ -1,12 +1,2 @@
-require 'bundler/setup'
-require 'snails'
-
-class MyApp < Snails::App
-  set :session_secret, 'foobar'
-
-  get '/' do
-    'Hello world!'
-  end
-end
-
+require './app'
 run MyApp

data/lib/snails/app.rb

@@ -12,10 +12,17 @@ module Snails
 
   module All
 
+    # usage:
+    # 
+    # class App < Snails::App
+    #   register Snails::All
+    # end
+
     def self.registered(app)
       app.register Snails::Database
       app.register Snails::Locales
       app.register Snails::Assets
+      app.register Snails::Sessions
     end
 
   end
@@ -50,7 +57,7 @@ module Snails
 
       cwd = Pathname.new(Dir.pwd)
       app.set :locale, :es
-      app.set :locales_path, app.respond_to?(:locales_path) ? app.locales_path : cwd.join('config', 'locales')
+      app.set :locales_path, app.setting(:locales_path, cwd.join('config', 'locales'))
 
       app.helpers do
         def t(key); I18n.t(key); end
@@ -93,8 +100,8 @@ module Snails
       cwd = Pathname.new(Dir.pwd)
       app.set :sprockets, Sprockets::Environment.new(cwd)
       app.set :digest_assets, false 
-      app.set :assets_prefix, app.respond_to?(:assets_prefix) ? app.assets_prefix : '/assets' # URL
-      app.set :assets_paths, app.respond_to?(:assets_paths) ? app.assets_paths : %w(assets) # source files
+      app.set :assets_prefix, app.setting(:assets_prefix, '/assets') # URL
+      app.set :assets_paths, app.setting(:assets_paths, %w(assets)) # source files
       app.set :assets_public_path, -> { cwd.join('public', 'assets') } # output dir
       app.set :assets_precompile, %w(js/main.js css/main.css)
       app.set :assets_remove_digests, false
@@ -150,7 +157,7 @@ module Snails
     module Tasks
 
       def self.precompile_for(app)
-        unless app.respond_to?(:assets_public_path)
+        unless app.respond_tobno?(:assets_public_path)
           return puts "#{app.name} doesn't have the Asset module included."
         end
 
@@ -371,6 +378,21 @@ module Snails
 
   end
 
+  module Sessions
+
+    def self.registered(app)
+      app.set :sessions, {
+        key: app.setting(:session_key, 'snails.session'), 
+        path: app.setting(:session_path, '/'),
+        expire_after: app.setting(:session_expire_after, 2592000), # one month in seconds
+        secret: app.session_secret # uses previous set :session_secret or generates one
+      }
+
+      app.register Sinatra::Flash
+    end
+
+  end
+
   class App < Sinatra::Base
 
     def self.inherited(base)
@@ -378,18 +400,19 @@ module Snails
       super
     end
 
+    def self.setting(key, default)
+      respond_to?(key) ? public_send(key) : default.respond_to?(:call) ? default.call : default
+    end
+
     set :protection, except: :frame_options
-    set :views, Snails.root.join('lib', 'views')
-    set :session_secret, ENV.fetch('SESSION_SECRET') { SecureRandom.hex }
+    set :views, setting(:views, Snails.root.join('lib', 'views'))
     set :static_paths, %w(/css /img /js /files /fonts favicon.ico)
 
-    enable :sessions
     enable :method_override
     enable :logging
 
-    register Sinatra::Flash
     use Rack::CommonLogger, Snails.logger
-    use Rack::Static, urls: static_paths, root: 'public'
+    use Rack::Static, urls: static_paths, root: 'public' unless Snails.env.production? 
 
     configure :production, :staging do
       set :raise_errors, true
@@ -398,6 +421,7 @@ module Snails
 
     configure :development do
       set :raise_errors, true
+      set :dump_errors, false
       set :show_exceptions, true
       set :log_level, Logger::DEBUG
     end
@@ -413,7 +437,8 @@ module Snails
       err = request.env['sinatra.error']
       logger.error err.message
       logger.error err.backtrace.first(3).join("\n")
-      halt(500, err.message)
+      # halt(500, err.message)
+      show_error(500)
     end
 
     not_found do

data/lib/snails.rb

@@ -3,8 +3,11 @@ require 'pathname'
 
 module Snails
   class Environment
+    include Comparable
+
     def initialize(str); @str = str.to_s.freeze; end
     def to_s; @str; end
+    def <=>(str); @str <=> str.to_s; end
     def inspect; @str.inspect; end
 
     %w(production staging development test).each do |key|

data/snails.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "snails"
-  s.version     = '0.2.4'
+  s.version     = '0.2.5'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Tomás Pollak']
   s.email       = ['tomas@forkhq.com']

data/spec/app_spec.rb

@@ -0,0 +1,16 @@
+require './lib/snails'
+
+require 'rspec/mocks'
+require 'rspec/expectations'
+
+describe 'App' do
+
+  let(:subject) { 
+    Snails::App.new
+  }
+
+  it 'works' do
+    expect(subject.class).to eq(Sinatra::Wrapper)
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snails
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-24 00:00:00.000000000 Z
+date: 2019-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -154,6 +154,7 @@ files:
 - Rakefile
 - example/Gemfile
 - example/Rakefile
+- example/app.rb
 - example/config.ru
 - lib/snails.rb
 - lib/snails/app.rb
@@ -162,6 +163,7 @@ files:
 - lib/snails/tasks.rb
 - lib/snails/util.rb
 - snails.gemspec
+- spec/app_spec.rb
 homepage: 
 licenses: []
 metadata: {}
@@ -181,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Ruby on Snails.