snails 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ab3513b9c123ab48d240332a7d065867a37aa1e
-  data.tar.gz: d0631690d2f6c57636dafea1e5c6a1803f68fa6f
+  metadata.gz: d801e91a29c8c095e5f94fdbc15edaec46a0be6e
+  data.tar.gz: df0ed66fbd0a2fb2d955a9db41ae85022e9ed8da
 SHA512:
-  metadata.gz: 6c74964dd253df391741e6daba7d8dc7e802280a363bc639f2846e92d7e6caaca4e3600ab58724526fafa44042e638d02e9518b2c450f2c6e0b8e4604252cb9a
-  data.tar.gz: 9840ba4d2517a9396835d732b0a6b46f5da5c4c326f3e52b6d15374075c00178a44e807fa2de9147f9378793dbdb4dd8699e39f87b354625ae17f6b25ee7a4f0
+  metadata.gz: aa89a7c352c5aa0d3445fb5e884241cbdb7fa629dff97fef576f90d361f8671bb64b7f8c48aa3d2608b468dbf86d8fb099104d9f0c8ec75b0f48558ce47dd34f
+  data.tar.gz: f7b36827e10d29214eef8f8c450011b76f024c1e91a6522709b3f4ecd3f2a0cc2aed3df247cbbfe11e47a1de9730adfd11726108aff1d68d2eaf90e8c47175ec

data/lib/snails/app.rb

@@ -1,5 +1,7 @@
+require 'snails' unless defined?(Snails)
+
 %w(
-snails
+snails/util
 active_support/core_ext/hash
 sinatra/base
 sinatra/content_for
@@ -317,36 +319,6 @@ 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)
@@ -394,46 +366,6 @@ module Snails
 
   end
 
-  module RelativeTime
-
-    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 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 1440..11519     then "#{(min/1440).floor} días"
-        when 11520..43199    then "#{(min/11520).floor} semanas"
-        when 43200..525599   then "#{(min/43200).floor} meses"
-        else                      "#{(min/525600).floor} años"
-      end
-    end
-
-    def in_words
-      minutes = (((Time.now - self).abs)/60).round
-      return nil if minutes < 0
-      RelativeTime.minutes_in_words(minutes)
-    end
-
-    def relative
-      if str = in_words
-        if Time.now < self
-          # "#{str} más"
-          "en #{str}"
-        else 
-          "hace #{str}"
-        end
-      end
-    end
-
-  end
-
   class App < Sinatra::Base
 
     def self.inherited(base)

data/lib/snails/mailer.rb

@@ -1,3 +1,4 @@
+require 'snails/util'
 require 'erb'
 require 'tilt/erb'
 require 'tuktuk'

data/lib/snails/util.rb

@@ -0,0 +1,75 @@
+# used both in app and mailer, so we put them here
+
+module Snails
+
+  module RelativeTime
+
+    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 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 1440..11519     then "#{(min/1440).floor} días"
+        when 11520..43199    then "#{(min/11520).floor} semanas"
+        when 43200..525599   then "#{(min/43200).floor} meses"
+        else                      "#{(min/525600).floor} años"
+      end
+    end
+
+    def in_words
+      minutes = (((Time.now - self).abs)/60).round
+      return nil if minutes < 0
+      RelativeTime.minutes_in_words(minutes)
+    end
+
+    def relative
+      if str = in_words
+        if Time.now < self
+          # "#{str} más"
+          "en #{str}"
+        else 
+          "hace #{str}"
+        end
+      end
+    end
+
+  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
+
+end

data/lib/snails.rb

@@ -30,5 +30,5 @@ module Snails
   end
 end
 
-# require 'snails/app'
+require 'snails/app'
 puts "Loaded #{Snails.env} environment."

data/snails.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tomás Pollak
@@ -160,6 +160,7 @@ files:
 - lib/snails/mailer.rb
 - lib/snails/rspec.rb
 - lib/snails/tasks.rb
+- lib/snails/util.rb
 - snails.gemspec
 homepage: 
 licenses: []