snails 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee6183d74fa011a7f2cc62352a468cfa5ad948a3
-  data.tar.gz: bdff8341f0737d0b5889a9eaf34f8702cbb8b2ac
+  metadata.gz: daf351c2597c83b274ecc9a36cd7bd8558b96e0e
+  data.tar.gz: eaa66e198d7d3b20cad52442d8999fff954ed060
 SHA512:
-  metadata.gz: 356d0950976977e63f2bdbd7e17c938299ba2fa4307ad167b88865a937589e4e68d73ee249479eb8999f70a59ad4d35dd25b6967276b9e251a7d8ca77472b5d7
-  data.tar.gz: 414f2cad747f8733b480588ae7988f0a18c39d5e0bb5b9a7320324f4ead771a3501fd8aad8eb7369e94eb70eb512755812f307064498a6c9826c14e748ff1749
+  metadata.gz: 2bb1cc458d7d5120ebc098ff6641013e7fba9ff18ce57ca12e86269189b1a2b741f9f94362298a518d9cd1b81841d9ea38548730c625ecb763ea98641a76b4f9
+  data.tar.gz: 6082675242f0a8295e3a10a7f234f18b6a5d29e6274533985ea1e8cf09be38dd7aef653b2fa0e273bb82b187455ae3b91f46b543524529d9447aa0f631cb7432

data/lib/snails/mailer.rb

@@ -1,10 +1,13 @@
 require 'erb'
 require 'tilt/erb'
 require 'tuktuk'
+require 'snails'
 
 module Snails
 
   class Mailer
+    include Snails::SimpleFormat
+    Time.include(Snails::RelativeTime) unless Time.instance_methods.include?(:relative)
 
     @queue = :emails
 
@@ -33,6 +36,10 @@ module Snails
       end
     end
 
+    def helpers(&block)
+      instance_eval(&block) 
+    end
+
     def perform(method, *args)
       send(method, *args)
     end
@@ -43,7 +50,7 @@ module Snails
       Resque.enqueue(self, method, obj.id, *args)
     end
 
-    def send_error(to: @from_email, err:, env:, params: {}})
+    def send_error(to: @from_email, err:, env:, params: {})
       @exception, @env, @params = err, env, params
       @url = "#{env['REQUEST_METHOD']} #{env['REQUEST_URI']}"
 
@@ -88,22 +95,25 @@ A <%= @exception.class %> occurred in <%= @url %>:
       @logger ||= Logger.new(@logfile)
     end
 
-    def send_email(to:, subject:, body:, from: nil, html: nil)
+    def send_email(from: nil, to:, subject:, body: nil, template: nil, html_body: nil, html_template: nil)
       raise "No recipient given for mail: #{subject}!" if to.blank?
 
       message = {
         to:      to,
         from:    from || @from_email,
-        subject: @base_subject + subject,
-        body:    body.is_a?(Symbol) ? render(body) : body
+        subject: @base_subject + subject 
       }
 
-      if html
-        message[:html_body] = html.is_a?(Symbol) ? render(html) : html
+      if body or template
+        message[:body]  = template ? render(template) : body
+      end
+
+      if html_body or html_template
+        message[:html_body] = html_template ? render(html_template) : html_body
       end
 
-      logger.info "[#{to}] Delivering: #{subject}"
-      resp, email = Tuktuk.deliver(message) if Snails.env.production?
+      logger.info "[#{to}] Delivering: #{subject}" # debug
+      resp, email = Tuktuk.deliver(message, debug: !Snails.env.production?)
 
       if resp.is_a?(Tuktuk::Bounce)
         logger.info "[#{to}] Email bounced! [#{resp.code}] #{resp.message}"

data/lib/snails.rb

@@ -279,80 +279,7 @@ module Snails
 
   end
 
-  module ViewHelpers
-
-    def self.included(base)
-      Time.include(RelativeTime) unless Time.instance_methods.include?(:relative)
-    end
-
-    def action
-      request.path_info.gsub('/','').blank? ? 'home' : request.path_info.gsub('/',' ')
-    end
-
-    def partial(name, opts = {})
-      partial_name = name.to_s["/"] ? name.to_s.reverse.sub("/", "_/").reverse : "_#{name}"
-      erb(partial_name.to_sym, { layout: false }.merge(opts))
-    end
-
-    def view(view_name, opts = {})
-      layout = request.xhr? ? false : true
-      erb(view_name.to_sym, { layout: layout }.merge(opts))
-    end
-
-    #########################################
-    # pagination
-
-    def get_page(counter)
-      curr = params[:page].to_i
-      i = (curr == 0 && counter == 1)  ? 2
-        : (curr == 2 && counter == -1) ? 0
-        : curr + counter
-      i == 0 ? "" : "/page/#{i}"
-    end
-
-    def show_pager(array, path)
-      # remove page from path
-      path = (env['SCRIPT_NAME'] + path.gsub(/[?|&|\/]page[=|\/]\d+/,''))
-
-      prevlink = '<li>' + link_to("#{path}#{get_page(-1)}", '&larr; Prev').sub('//', '/') + '</li>'
-      nextlink = array.count != Routes::PER_PAGE ? ""
-        : '<li>' + link_to("#{path}#{get_page(1)}", 'Next &rarr;').sub('//', '/') + '</li>'
-
-      str = params[:page] ? prevlink + nextlink : nextlink
-      str != "" ? "<ul class='pager'>" + str + "</ul>" : ''
-    end
-
-    #########################################
-    # formatting
-
-    def tag(name, options = nil, open = false)
-      attributes = tag_attributes(options)
-      "<#{name}#{attributes}#{open ? '>' : ' />'}"
-    end
-
-    def tag_attributes(options)
-      return '' unless options
-      options.inject('') do |all,(key,value)|
-        next all unless value
-        all << ' ' if all.empty?
-        all << %(#{key}="#{value}" )
-      end.chomp!(' ')
-    end
-
-    def simple_format(text, options = {})
-      t = options.delete(:tag) || :p
-      start_tag = tag(t, options, true)
-      text = text.to_s.dup
-      text.gsub!(/\r\n?/, "\n")                      # \r\n and \r -> \n
-      text.gsub!(/\n\n+/, "</#{t}>\n\n#{start_tag}") # 2+ newline  -> paragraph
-      text.gsub!(/([^\n]\n)(?=[^\n])/, '\1<br />')   # 1 newline   -> br
-      text.insert 0, start_tag
-      text << "</#{t}>"
-      text
-    end
-
-    #########################################
-    # forms
+  module FormHelpers
 
     def form_input(object, field, options = {})
       id, name, index, label = input_base(object, field, options)
@@ -455,6 +382,83 @@ module Snails
 
   end
 
+  module SimpleFormat
+
+    def tag(name, options = nil, open = false)
+      attributes = tag_attributes(options)
+      "<#{name}#{attributes}#{open ? '>' : ' />'}"
+    end
+
+    def tag_attributes(options)
+      return '' unless options
+      options.inject('') do |all,(key,value)|
+        next all unless value
+        all << ' ' if all.empty?
+        all << %(#{key}="#{value}" )
+      end.chomp!(' ')
+    end
+
+    def simple_format(text, options = {})
+      t = options.delete(:tag) || :p
+      start_tag = tag(t, options, true)
+      text = text.to_s.dup
+      text.gsub!(/\r\n?/, "\n")                      # \r\n and \r -> \n
+      text.gsub!(/\n\n+/, "</#{t}>\n\n#{start_tag}") # 2+ newline  -> paragraph
+      text.gsub!(/([^\n]\n)(?=[^\n])/, '\1<br />')   # 1 newline   -> br
+      text.insert 0, start_tag
+      text << "</#{t}>"
+      text
+    end
+
+  end
+
+  module ViewHelpers
+
+    def self.included(base)
+      Time.include(RelativeTime) unless Time.instance_methods.include?(:relative)
+      base.include(FormHelpers)
+      base.include(SimpleFormat)
+    end
+
+    def action
+      request.path_info.gsub('/','').blank? ? 'home' : request.path_info.gsub('/',' ')
+    end
+
+    def partial(name, opts = {})
+      partial_name = name.to_s["/"] ? name.to_s.reverse.sub("/", "_/").reverse : "_#{name}"
+      erb(partial_name.to_sym, { layout: false }.merge(opts))
+    end
+
+    def view(view_name, opts = {})
+      layout = request.xhr? ? false : true
+      erb(view_name.to_sym, { layout: layout }.merge(opts))
+    end
+
+    #########################################
+    # pagination
+
+    def get_page(counter)
+      curr = params[:page].to_i
+      i = (curr == 0 && counter == 1)  ? 2
+        : (curr == 2 && counter == -1) ? 0
+        : curr + counter
+      i == 0 ? "" : "/page/#{i}"
+    end
+
+    def show_pager(array, path)
+      # remove page from path
+      path = (env['SCRIPT_NAME'] + path.gsub(/[?|&|\/]page[=|\/]\d+/,''))
+
+      prevlink = '<li>' + link_to("#{path}#{get_page(-1)}", '&larr; Prev').sub('//', '/') + '</li>'
+      nextlink = array.count != Routes::PER_PAGE ? ""
+        : '<li>' + link_to("#{path}#{get_page(1)}", 'Next &rarr;').sub('//', '/') + '</li>'
+
+      str = params[:page] ? prevlink + nextlink : nextlink
+      str != "" ? "<ul class='pager'>" + str + "</ul>" : ''
+    end
+
+  end
+
   module RelativeTime
 
     def in_words

data/snails.gemspec

@@ -3,13 +3,13 @@
 
 Gem::Specification.new do |s|
   s.name        = "snails"
-  s.version     = '0.0.7'
+  s.version     = '0.0.8'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Tomás Pollak']
   s.email       = ['tomas@forkhq.com']
   # s.homepage    = "https://github.com/tomas/snails"
-  s.summary     = "A simple-and-nimble version of Rails."
-  s.description = "A simple-and-nimble version of Rails."
+  s.summary     = "Ruby on Snails."
+  s.description = "Ruby on Snails."
 
   s.required_rubygems_version = ">= 1.3.6"
   s.add_development_dependency "bundler", ">= 1.0.0"
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "sinatra-activerecord", ">= 2.0.13"
   s.add_runtime_dependency "sinatra-flash", ">= 0.3.0"
   s.add_runtime_dependency "sprockets-helpers", ">= 1.2"
+  s.add_runtime_dependency "tuktuk", ">= 0.6.0"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snails
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2018-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,7 +114,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
-description: A simple-and-nimble version of Rails.
+- !ruby/object:Gem::Dependency
+  name: tuktuk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+description: Ruby on Snails.
 email:
 - tomas@forkhq.com
 executables: []
@@ -152,5 +166,5 @@ rubyforge_project:
 rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
-summary: A simple-and-nimble version of Rails.
+summary: Ruby on Snails.
 test_files: []