snails 0.3.6 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33aac0b5a88a59ea685e3fc896dbcdc7ee369b486b3802ceccd3b1e860d38db1
-  data.tar.gz: 6b6612a3054b980f46c0375967ee02204c11982d11179a4ef500bd0e1b94aeda
+  metadata.gz: 483517cd1b55bc5273ebb004bb9ef69a8cd6191de4be897c3d9f2c168ea13f4f
+  data.tar.gz: 1730ce09810faafc5802833ab4f38fb103e8dae059b9cfb51b85335893fb7f09
 SHA512:
-  metadata.gz: e7b51335c3a06e4a9d98bd6fc519a7ed72137c6249d940a5394acb9c10e4e167a02b6f9b8c09cdb756b8d0e4263602dd60e7b925c266993cac8d1fdbd2af825e
-  data.tar.gz: f60ec8d7471561c0f7b0db13a8ad9eef8def39cc285475bd907714a638614cdc615977042fa416121be61fb99403e4b1a956ec45cf6ce7f0de917d986602d15c
+  metadata.gz: e104410a7d4f8eea1370a583d13e4f23cefd043bc78f12027b5fea7063a87285c2cbeb89a1ab8c9a43e7a90d582b3b397528f1c483df2db60cf7dc654f66aba7
+  data.tar.gz: dfe0ae0b0116f29c71907e35a38548d3d28af693e7dbf824b29f6e467ddab841d588c6f573b238c3e50d420bae649f81fca9efb73cb3709ac158eb121dae45e3

data/lib/snails.rb

@@ -41,5 +41,10 @@ module Snails
   end
 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?
-puts "Loaded #{Snails.env} environment."
+unless ENV['SILENT']
+  puts "Loaded #{Snails.env} environment. (#{Time.now.to_s})"
+end

data/lib/snails/app.rb

@@ -13,7 +13,7 @@ module Snails
   module All
 
     # usage:
-    # 
+    #
     # class App < Snails::App
     #   register Snails::All
     # end
@@ -99,7 +99,7 @@ module Snails
 
       cwd = Pathname.new(Dir.pwd)
       app.set :sprockets, Sprockets::Environment.new(cwd)
-      app.set :digest_assets, false 
+      app.set :digest_assets, false
       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, app.setting(:assets_public_path, cwd.join('public', 'assets')) # output dir
@@ -308,8 +308,8 @@ module Snails
       label   = options[:label] || field.to_s.gsub('_', ' ').capitalize
       example = options[:example] ? "<small class='example'>#{options[:example]}</small>" : ''
 
-      id    = "#{get_model_name(object).downcase}_#{options[:key] || field}"
-      name  = "#{get_model_name(object).downcase}[#{field}]"
+      id    = options[:id] || "#{get_model_name(object).downcase}_#{options[:key] || field}"
+      name  = options[:name] || "#{get_model_name(object).downcase}[#{field}]"
       label = options[:label] == false ? '' : "<label for='#{id}'>#{label}#{example}</label>\n"
 
       @tabindex = @tabindex ? @tabindex + 1 : 1
@@ -353,6 +353,14 @@ module Snails
       erb(view_name.to_sym, { layout: layout }.merge(opts))
     end
 
+    def show_date(date)
+      date ? date.strftime("%d de %b, %Y") : ''
+    end
+
+    def show_time(time)
+      time ? time.strftime("%d de %b, %Y a las %H:%M") : ''
+    end
+
     #########################################
     # pagination
 
@@ -381,7 +389,7 @@ module Snails
 
     def self.registered(app)
       app.set :sessions, {
-        key: app.setting(:session_key, 'snails.session'), 
+        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
@@ -411,16 +419,17 @@ module Snails
     enable :logging
 
     use Rack::CommonLogger, Snails.logger
-    use Rack::Static, urls: static_paths, root: 'public' unless Snails.env.production? 
+    use Rack::Static, urls: static_paths, root: 'public' unless Snails.env.production?
 
     configure :production, :staging do
-      set :raise_errors, true
+      set :raise_errors, false
       set :dump_errors, false
+      set :show_exceptions, false
     end
 
     configure :development do
       set :raise_errors, true
-      set :dump_errors, false
+      set :dump_errors, true
       set :show_exceptions, true
       set :log_level, Logger::DEBUG
     end

data/lib/snails/mailer.rb

@@ -12,32 +12,28 @@ module Snails
 
     @queue = :emails
 
-    def initialize(opts)
-      mail_config = (opts[:smtp] || opts[:mail]) or raise ":smtp options missing"
-
-      if key = mail_config.dig(:dkim, :private_key) and File.exist?(key)
-        mail_config[:dkim][:private_key] = IO.read(key)
-      elsif mail_config[:dkim]
-        puts "Private key for DKIM not found! Disabling..."
-        mail_config.delete(:dkim)
-      end
+    # class Bounce < StandardError; end
+    # class SoftBounce < Bounce; end
+    # class HardBounce < Bounce; end
 
-      Tuktuk.options = mail_config
-      @debug         = mail_config[:debug]
+    def initialize(opts)
       @from_email    = opts[:from] or raise ":from required"
       @base_subject  = opts[:base_subject] || ''
       @views         = opts[:views] || Snails.root.join('lib', 'views')
       @logfile       = opts[:logfile] # || Snails.root.join('log', 'mailer.log')
+
+      backend_name   = opts[:backend_name] || 'TestBackend'
+      @backend       = self.class.backends[backend_name].new(opts[:backend_options])
     end
 
     def email(name, &block)
       define_singleton_method(name) do |*args|
-        instance_exec(*args, &block) 
+        instance_exec(*args, &block)
       end
     end
 
     def helpers(&block)
-      instance_eval(&block) 
+      instance_eval(&block)
     end
 
     def perform(method, *args)
@@ -81,50 +77,127 @@ A <%= @exception.class %> occurred in <%= @url %>:
 
     private
 
-    def render(view)
-      template = File.read(File.join(@views, "#{view}.erb"))
+    def render(view_path, layout_lath = nil)
+      view = File.read(File.join(@views, "#{view_path}.erb"))
+      if layout_path
+        layout = File.read(File.join(@views, "#{layout_path}.erb"))
+        render_erb(layout) { render_erb(view) }
+      else
+        render_erb(view)
+      end
+    end
+
+    def render_erb(template)
       ERB.new(template).result(binding)
     end
 
     def partial(name)
       partial_name = name.to_s["/"] ? name.to_s.reverse.sub("/", "_/").reverse : "_#{name}"
-      render partial_name
+      render(partial_name)
     end
 
     def logger
       @logger ||= @logfile ? Logger.new(@logfile) : Snails.logger
     end
 
-    def send_email(from: nil, to:, subject:, body: nil, template: nil, html_body: nil, html_template: nil, message_id: nil, return_path: nil, list_unsubscribe: nil)
+    def send_email(from: @from_email, to:, subject:, body: nil, template: nil, layout: nil, html_body: nil, html_template: nil, html_layout: nil, message_id: nil, return_path: nil, list_unsubscribe: nil)
       raise "No recipient given for mail: #{subject}!" if to.blank?
 
       message = {
         to:      to,
-        from:    from || @from_email,
-        subject: @base_subject + subject 
+        from:    from,
+        subject: @base_subject + subject
       }
 
+      raise "Blank from" if message[:from].blank?
+      raise "Blank to" if message[:to].blank?
+
       if body or template
-        message[:body]  = template ? render(template) : body
+        message[:body]  = template ? render(template, layout) : body
       end
 
       if html_body or html_template
-        message[:html_body] = html_template ? render(html_template) : html_body
+        message[:html_body] = html_template ? render(html_template, html_layout) : html_body
       end
 
       message[:message_id] = message_id if message_id
       message[:return_path] = return_path if return_path
       message[:list_unsubscribe] = list_unsubscribe if list_unsubscribe
 
-      logger.info "[#{to}] Delivering: #{subject}" 
-      debug = @debug.nil? ? !Snails.env.production? : @debug # if debug isn't set, determine based on env
-      resp, email = Tuktuk.deliver(message, debug: debug)
+      logger.info "[#{to}] Delivering: #{subject}"
+      @backend.deliver(message)
+    end
+
+    alias_method :deliver, :send_email
+
+    class Backend
+      def deliver(email, options = {})
+        raise "Please redefine in subclass"
+      end
+
+      def deliver_many(emails, options = {})
+        emails.map { |e| deliver(e, options) }
+      end
+    end
+
+    class Tuktuk < Backend
+      def initialize(config = {})
+        @debug = config[:debug]
+
+        if key = config.dig(:dkim, :private_key) and File.exist?(key)
+          config[:dkim][:private_key] = IO.read(key)
+        elsif config[:dkim]
+          puts "Private key for DKIM not found! Disabling..."
+          config.delete(:dkim)
+        end
+
+        Tuktuk.options = config
+      end
+
+      def deliver(email, options = {})
+        debug = @debug.nil? ? !Snails.env.production? : @debug # if debug isn't set, determine based on env
+        resp, email = Tuktuk.deliver(email, debug: debug)
+
+        if resp.is_a?(Tuktuk::Bounce)
+          logger.info "[#{to}] Email bounced! [#{resp.code}] #{resp.message}"
+        end
+
+        return resp, email
+      end
+
+      def deliver_many(emails, options = {})
+        Tuktuk.deliver_many(emails, options)
+      end
+    end
+
+    class Mailgun < Backend
+
+      def initialize(api_key:, domain_name:)
+        @key = api_key
+        @url = "https://api.mailgun.net/v3/#{domain_name}/messages"
+      end
+
+      def deliver(email, options = {})
+        raise "No body!" if email[:body].nil?
+
+        data = {
+          from: email[:from],
+          to: email[:to],
+          subject: email[:subject],
+        }
+
+        data[:text] = email[:body] if email[:body]
+        data[:html] = email[:html_body] if email[:html_body]
+
+        if data[:text].blank? && data[:html].blank?
+          raise ArgumentError, "Either text or html required"
+        end
 
-      if resp.is_a?(Tuktuk::Bounce)
-        logger.info "[#{to}] Email bounced! [#{resp.code}] #{resp.message}"
+        opts = { username: 'api', password: @key }
+        resp = Dagger.post(@url, data, opts)
+        resp.ok? ? [resp.data, data[:to]] : nil
       end
 
-      return resp, email
     end
 
   end

data/lib/snails/markdown.rb

@@ -0,0 +1,53 @@
+begin
+	require 'rinku'
+	require 'kramdown'
+	require 'sanitize'
+
+	module Snails
+		module Markdown
+
+			MARKDOWN_OPTS = {
+			  input: 'GFM',
+			  enable_coderay: true,
+			  parse_block_html: false,
+			  line_width: 72,
+			  coderay_tab_width: 2,
+			  coderay_line_numbers: nil,
+			  coderay_default_lang: 'bash',
+			  coderay_css: :class
+			}
+
+			SANITIZE_OPTS = Sanitize::Config::RELAXED
+
+			SANITIZE_OPTS[:elements] = %w(
+			  p br a span sub sup strong em div hr abbr
+			  ul ol li
+			  blockquote pre code kbd
+			  h1 h2 h3 h4 h5 h6
+			  img object param del
+			)
+
+			SANITIZE_OPTS[:attributes] = {
+			  :all     => ['class', 'style', 'title', 'id'],
+			  'a'      => ['href', 'rel', 'name'],
+			  'img'    => ['src', 'title', 'alt', 'width', 'height']
+			}
+
+			SANITIZE_OPTS[:add_attributes] = { 'a' => {'rel' => 'nofollow', 'target' => '_blank'} }
+
+	    def render_markdown(str, options = {})
+	      html = Kramdown::Document.new(str, MARKDOWN_OPTS).to_html
+	      html = Rinku.auto_link(html, :urls)
+	      Sanitize.clean(html, SANITIZE_OPTS)
+	    end
+
+	  end
+
+	end
+
+rescue LoadError => e
+	puts "Cannot load Snails's markdown lib. (#{e.class})"
+	puts "You need the `kramdown`, `rinku` and `sanitize` gems for this."
+end
+
+

data/lib/snails/tasks.rb

@@ -1,11 +1,10 @@
 require 'snails'
 
-if defined?(Sinatra::ActiveRecordHelper)
+if defined?(Sinatra::ActiveRecordHelper) or File.exist?(FileUtils.pwd + '/db/schema.rb')
   require 'sinatra/activerecord/rake'
 end
 
 namespace :assets do
-    
   desc 'Precompiles assets'
   task :precompile do
     if Snails.apps.empty?
@@ -16,5 +15,4 @@ namespace :assets do
       end
     end
   end
-
-end
+end

data/lib/snails/util.rb

@@ -6,16 +6,12 @@ module Snails
 
     def self.minutes_in_words(min)
       case min.to_i
-        when 0..1            then 'menos de un min'
-        when 2..4            then 'menos de 5 min'
-        when 5..14           then 'menos de 15 min'
+        when 0..1            then 'un minuto'
+        when 2..4            then '5 minutos'
+        when 5..14           then '15 minutos'
         when 15..29          then "media hora"
-        when 30..59          then "#{min} minutos"
-        when 60..119         then '1 hora'
-        when 120..239        then '2 horas'
-        when 240..479        then '4 horas'
-        when 480..719        then '8 horas'
-        when 720..1439       then '12 horas'
+        when 30..59          then "#{min} min"
+        when 60..1439        then "#{(min/60).floor} horas"
         when 1440..11519     then "#{(min/1440).floor} días"
         when 11520..43199    then "#{(min/11520).floor} semanas"
         when 43200..525599   then "#{(min/43200).floor} meses"
@@ -34,7 +30,7 @@ module Snails
         if Time.now < self
           # "#{str} más"
           "en #{str}"
-        else 
+        else
           "hace #{str}"
         end
       end

data/snails.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "snails"
-  s.version     = '0.3.6'
+  s.version     = '0.4.3'
   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 "activerecord", "< 6.0"
   s.add_runtime_dependency "sinatra-contrib", ">= 2.0.3"
   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.3.6
+  version: 0.4.3
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-10 00:00:00.000000000 Z
+date: 2020-10-13 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: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +173,7 @@ files:
 - lib/snails.rb
 - lib/snails/app.rb
 - lib/snails/mailer.rb
+- lib/snails/markdown.rb
 - lib/snails/rspec.rb
 - lib/snails/tasks.rb
 - lib/snails/util.rb