snails 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 982126d7b4bff6dd0a06db8fad9a2979e68aa315
-  data.tar.gz: d32bc442d6eec60a33f28929af7dda910890fbde
+  metadata.gz: 3590d188f5ba6f0e5d8ea137f194b56febf14da2
+  data.tar.gz: 8a5a30da16236c741b3f391fadf55911f709dc64
 SHA512:
-  metadata.gz: 18ef4ef42b0dc867de881b3df64657eeafe48bcbe0ad83aadc1875e0592b4d5e9976ade5e3f8f1d80b2508bbcc565a02a7a661ac33f69cd8961a2990964d432a
-  data.tar.gz: 6f1cbc8265728f3b5c6a2df2bdb7bbcdba0642c6358658548d287e8ab01a259ccce213801174d46d5962ac8d1e307acf72338a069a415ca7fd51c153ffeb91fa
+  metadata.gz: 26578d70dd7892a27e41cbc655927e6444344f6f73198de4ae9cb72f7f49cb5abd8e9f8bdeae8614edac80c62e65741c4a2f6900c42fc8847f89f15aec7953a7
+  data.tar.gz: e9ad79ffe2670aa1c273b22e40778328b7c96bbb156ab5a5480a35998b3dc897c3ca348f8e08c8f8e9e0ecb8c99b24a817cdeaf72b230afa7b2ca15a7982662a

data/lib/snails/app.rb

@@ -8,87 +8,6 @@ sinatra/flash
 
 module Snails
 
-  module RequiredParams
-    def requires!(req, hash = params)
-      if req.is_a?(Hash)
-        req.each do |k, vals|
-          if vals.is_a?(Array) or vals.is_a?(Hash)
-            halt(400, "Missing: #{k} in #{hash}") if hash[k].nil?
-            requires!(vals, hash[k])
-          else
-            requires!(k, hash)
-          end
-        end
-      elsif req.nil? or (req.is_a?(Symbol) and hash[req].nil?) \
-        or (req.is_a?(Array) and req.any? { |p| hash[p].nil? })
-          halt(400, "Required parameters: #{req} (in #{hash})")
-      end
-    end
-  end
-
-  class App < Sinatra::Base
-
-    def self.inherited(base)
-      Snails.apps << base
-      super
-    end
-
-    set :protection, except: :frame_options
-    set :views, Snails.root.join('lib', 'views')
-    set :session_secret, ENV.fetch('SESSION_SECRET') { SecureRandom.hex }
-    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'
-
-    configure :production, :staging do
-      set :raise_errors, true
-      set :dump_errors, false
-    end
-
-    configure :development do
-      set :raise_errors, true
-      set :show_exceptions, true
-      set :log_level, Logger::DEBUG
-    end
-
-    helpers do
-      include RequiredParams
-      include Snails::ViewHelpers
-      include Sinatra::ContentFor
-      def logger; Snails.logger; end
-    end
-
-    error do
-      err = request.env['sinatra.error']
-      logger.error err.message
-      logger.error err.backtrace.first(3).join("\n")
-      halt(500, err.message)
-    end
-
-    not_found do
-      show_error(404)
-    end
-
-    protected
-
-    def deliver(data, code = 200, format = :json)
-      status(code)
-      content_type(format)
-      data.public_send("to_#{format}")
-    end
-
-    def show_error(code)
-      erb :"errors/#{code}", layout: false
-    end
-
-  end
-
   module All
 
     def self.registered(app)
@@ -166,9 +85,9 @@ module Snails
 
       cwd = Pathname.new(Dir.pwd)
       app.set :sprockets, Sprockets::Environment.new(cwd)
-      app.set :digest_assets, false # 
-      app.set :assets_prefix, app.assets_prefix || '/assets' # URL
-      app.set :assets_paths, app.assets_paths || %w(assets)  # source files
+      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_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
@@ -263,6 +182,24 @@ module Snails
 
   end
 
+  module RequiredParams
+    def requires!(req, hash = params)
+      if req.is_a?(Hash)
+        req.each do |k, vals|
+          if vals.is_a?(Array) or vals.is_a?(Hash)
+            halt(400, "Missing: #{k} in #{hash}") if hash[k].nil?
+            requires!(vals, hash[k])
+          else
+            requires!(k, hash)
+          end
+        end
+      elsif req.nil? or (req.is_a?(Symbol) and hash[req].nil?) \
+        or (req.is_a?(Array) and req.any? { |p| hash[p].nil? })
+          halt(400, "Required parameters: #{req} (in #{hash})")
+      end
+    end
+  end
+
   module FormHelpers
 
     def form_input(object, field, options = {})
@@ -301,6 +238,13 @@ module Snails
       label + "<textarea #{style} tabindex='#{index}' id='#{id}' name='#{name}'>#{object.send(field)}</textarea>"
     end
 
+    def form_select(object, field, option_list, options = {})
+      id, name, index, label = input_base(object, field, options)
+      style = options[:style] ? "style='#{options[:style]}'" : ''
+      options = form_select_options(option_list, object.send(field))
+      label + "<select #{style} tabindex='#{index}' id='#{id}' name='#{name}'>#{options}</select>"
+    end
+
     def form_select_options(list, selected = nil)
       list.map do |name, val|
         val = name if val.nil?
@@ -322,12 +266,19 @@ module Snails
       form_id      = opts.delete(:form_id) || path.gsub(/[^a-z0-9]/, '_').gsub(/_+/, '_')
       css_class    = opts.delete(:css_class) || ''
       input_html   = opts.delete(:input_html) || ''
-      confirm_text = opts.delete(:confirm_text) || 'Seguro?'
       submit_val   = opts.delete(:value) || text
-      '<form id="' + form_id + '" style="display:inline" method="post" action="' + url(path) + '" onsubmit="return confirm(\'' + confirm_text + '\');">
-        ' + input_html + '
-        <button name="submit" type="submit" class="' + css_class + ' button" value="' + submit_val + '">' + text + '</button>
-      </form>'
+      style        = "style='display:inline; #{opts[:style]}'"
+
+      onsubmit = if str = opts[:onsubmit]
+        "onsubmit=\"#{str}\""
+      else
+        confirm_text = opts.delete(:confirm_text) || 'Seguro?'
+        "onsubmit='return confirm(\"#{confirm_text}\");'"
+      end
+
+      form_tag = "<form id='#{form_id}' method='post' action='#{url(path)}' #{style} #{onsubmit}>"
+      button = "<button name='submit' type='submit' class='button #{css_class}' value='#{submit_val}'>#{text}</button>"
+      form_tag + input_html + button + '</form>'
     end
 
     def delete_link(options = {})
@@ -480,4 +431,67 @@ module Snails
 
   end
 
+  class App < Sinatra::Base
+
+    def self.inherited(base)
+      Snails.apps << base
+      super
+    end
+
+    set :protection, except: :frame_options
+    set :views, Snails.root.join('lib', 'views')
+    set :session_secret, ENV.fetch('SESSION_SECRET') { SecureRandom.hex }
+    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'
+
+    configure :production, :staging do
+      set :raise_errors, true
+      set :dump_errors, false
+    end
+
+    configure :development do
+      set :raise_errors, true
+      set :show_exceptions, true
+      set :log_level, Logger::DEBUG
+    end
+
+    helpers do
+      include RequiredParams
+      include ViewHelpers
+      include Sinatra::ContentFor
+      def logger; Snails.logger; end
+    end
+
+    error do
+      err = request.env['sinatra.error']
+      logger.error err.message
+      logger.error err.backtrace.first(3).join("\n")
+      halt(500, err.message)
+    end
+
+    not_found do
+      show_error(404)
+    end
+
+    protected
+
+    def deliver(data, code = 200, format = :json)
+      status(code)
+      content_type(format)
+      data.public_send("to_#{format}")
+    end
+
+    def show_error(code)
+      erb :"errors/#{code}", layout: false
+    end
+
+  end
+
 end

data/lib/snails/rspec.rb

@@ -0,0 +1,12 @@
+# $:.unshift(File.expand_path('../../lib', __FILE__))
+
+ENV['RACK_ENV'] = 'test'
+
+require 'rubygems'
+require 'bundler'
+Bundler.require(:default, :test)
+
+RSpec.configure do |config|
+  config.formatter = :fuubar
+  config.color = true
+end

data/snails.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snails
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-03 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,6 +143,7 @@ files:
 - lib/snails.rb
 - lib/snails/app.rb
 - lib/snails/mailer.rb
+- lib/snails/rspec.rb
 - lib/snails/tasks.rb
 - snails.gemspec
 homepage: