marfa 0.1.5 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a423c48b5405907fa9a6e7e782f8695dad2c3c36
-  data.tar.gz: 9a4ab9f1754e2bdab22f437a5928ef00f94b8fa3
+  metadata.gz: a777d031578dcff7a85bf3264c509d21586551d9
+  data.tar.gz: b4690307d3915a21c4db20aa9035927fcd094d6f
 SHA512:
-  metadata.gz: 138fe6e3b19da6060c509eaebd92b7c7a13c6a0f39ca8a435958e9cc9faa5c6c714c9be89c28d4815e45b7ccbf0dc1939a5d97691a7f42f9d0ddc0e1c82352ff
-  data.tar.gz: 400b292c45fdfa2bf8218147282bc1a15dee62f1c9ea1456c229dd9f8e2e5dfcb4c0d8ae7e8ab6961d4be14dff45b10a472356c4996fb386fa878671cbd8411c
+  metadata.gz: b0dd578a7013bbd5f3b6b27204b73caa56ffde015c06f76f62fd6065db914c4adc3f7dfbd072f75ab1aabeeb7a877698cfc8486b5eb6fd44d34bd98d18c81138
+  data.tar.gz: e82ff2f99c26bfa94dbf1b5c6c4339554b250273e50b46642b1e26059923c559bcbd4bf0a5cf8b94124058bb193dfb292c0d981bd208f6d455503d02b2dc41cd

data/lib/marfa/configuration.rb

@@ -18,6 +18,12 @@ module Marfa
     _configure_ext_modules(Marfa::Controllers::BaseController)
   end
 
+  # Configure Marfa in block
+  def self.configure
+    config if @config.nil?
+    yield @config
+  end
+
   private
 
   # Configure controller settings

data/lib/marfa/controllers/base_controller.rb

@@ -3,7 +3,6 @@ require 'rack/csrf'
 require 'device_detector'
 require 'marfa/helpers/controller'
 require 'marfa/helpers/http/vary'
-require 'marfa/helpers/javascript'
 
 # Extending Marfa
 module Marfa
@@ -24,7 +23,6 @@ module Marfa
       # All methods defined below might be used in child controllers
       helpers Marfa::Helpers::Controller
       helpers Marfa::Helpers::HTTP::Vary
-      helpers Marfa::Helpers::Javascript
     end
   end
 end

data/lib/marfa/file_templates.rb

@@ -14,63 +14,64 @@ module Marfa
     def marfa_rb(project_path)
       File.open("#{project_path}/config/marfa.rb", 'w') do |file|
         file.puts "# Marfa configuration file
-
-# Specifying API Server is needed
-Marfa.config.api_server = ''
-
-# Views path is needed
-Marfa.config.views = File.expand_path('./app/views')
-
-# Cache config
-Marfa.config.cache = {
-  enabled: false,
-  host: '',
-  port: 0,
-  db: 0,
-  expiration_time: 3600
-}
-
-# Static files content path
-Marfa.config.content_path = '/images/content/'
-
-Marfa.config.cache_styles = true
-
-# Public folder
-Marfa.config.public_folder = File.expand_path('./static')
-
-# Static files cache
-Marfa.config.static_cache_control = [:public, max_age: 2_592_000]
-
-# CSRF Protection
-Marfa.config.csrf_enabled = false
-
-# HTML Compression
-Marfa.config.html_compression_options = {
-  enabled: true,
-  remove_multi_spaces: true,
-  remove_comments: true,
-  remove_intertag_spaces: false,
-  remove_quotes: true,
-  compress_css: false,
-  compress_javascript: false,
-  simple_doctype: false,
-  remove_script_attributes: true,
-  remove_style_attributes: true,
-  remove_link_attributes: true,
-  remove_form_attributes: false,
-  remove_input_attributes: true,
-  remove_javascript_protocol: true,
-  remove_http_protocol: false,
-  remove_https_protocol: false,
-  preserve_line_breaks: false,
-  simple_boolean_attributes: true
-}
-
-# CSS Minifying
-Marfa.config.minify_css = true
-
-# JS Minifying
-Marfa.config.minify_js = true
+Marfa.configure do |cfg|
+  # Specifying API Server is needed
+  cfg.api_server = ''
+
+  # Views path is needed
+  cfg.views = File.expand_path('./app/views')
+
+  # Cache config
+  cfg.cache = {
+    enabled: false,
+    host: '',
+    port: 0,
+    db: 0,
+    expiration_time: 3600
+  }
+
+  # Static files content path
+  cfg.content_path = '/images/content/'
+
+  cfg.cache_styles = true
+
+  # Public folder
+  cfg.public_folder = File.expand_path('./static')
+
+  # Static files cache
+  cfg.static_cache_control = [:public, max_age: 2_592_000]
+
+  # CSRF Protection
+  cfg.csrf_enabled = false
+
+  # HTML Compression
+  cfg.html_compression_options = {
+    enabled: true,
+    remove_multi_spaces: true,
+    remove_comments: true,
+    remove_intertag_spaces: false,
+    remove_quotes: true,
+    compress_css: false,
+    compress_javascript: false,
+    simple_doctype: false,
+    remove_script_attributes: true,
+    remove_style_attributes: true,
+    remove_link_attributes: true,
+    remove_form_attributes: false,
+    remove_input_attributes: true,
+    remove_javascript_protocol: true,
+    remove_http_protocol: false,
+    remove_https_protocol: false,
+    preserve_line_breaks: false,
+    simple_boolean_attributes: true
+  }
+
+  # CSS Minifying
+  cfg.minify_css = true
+
+  # JS Minifying
+  cfg.minify_js = true
+end
       "
       end
     end

data/lib/marfa/helpers/email.rb

@@ -0,0 +1,32 @@
+require 'pony'
+
+# Email adapter for Pony gem
+module Marfa
+  # Extending Helpers
+  module Helpers
+    # Provide helpers for Sinatra controllers
+    module Email
+      # Send email using mailbox config
+      # @param template [String] - path to template file
+      # @param to [String] - email address to send
+      # @param subject [String] - email subject
+      # @param data [Hash] - data to render in template
+      # @param mailbox [Symbol] - mailbox config
+      # @example:
+      #   send_email('mail', 'user@example.com', :admin, 'Hello', { title: 'Hello!' })
+      def send_email(template, to, mailbox = :default, subject = '', data = {})
+        config = Marfa.config.email[mailbox]
+        return if config.nil?
+
+        body = haml :"#{template}", locals: data, layout: false
+
+        Pony.options = {
+          via: :smtp,
+          via_options: config
+        }
+
+        Pony.mail(to: to, subject: subject, html_body: body)
+      end
+    end
+  end
+end

data/lib/marfa/version.rb

@@ -1,7 +1,7 @@
 # Version constant
 module Marfa
   # The version constant for the current version of Marfa
-  VERSION = '0.1.5' unless defined?(Marfa::VERSION)
+  VERSION = '0.1.8' unless defined?(Marfa::VERSION)
 
   # The current Marfa version.
   # @return [String] The version number

data/lib/marfa.rb

@@ -6,7 +6,7 @@ require 'marfa/helpers/controller'
 require 'marfa/helpers/http/vary'
 require 'marfa/helpers/scss'
 require 'marfa/helpers/style'
-require 'marfa/helpers/javascript'
+require 'marfa/helpers/email'
 require 'marfa/controllers'
 require 'marfa/controllers/base_controller'
 require 'marfa/controllers/css_controller'

data/marfa.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'marfa'
-  s.version     = '0.1.5'
+  s.version     = '0.1.8'
   s.platform    = Gem::Platform::RUBY
   s.date        = Time.now.strftime('%Y-%m-%d')
   s.summary     = 'Little Sinatra-based framework'
@@ -32,5 +32,6 @@ Gem::Specification.new do |s|
   s.add_dependency('csso-rails', '~> 0.5.0')
   s.add_dependency('yard')
   s.add_dependency('yard-sinatra')
-  s.add_dependency('compass')
+  s.add_dependency('compass', '~> 1.0.3')
+  s.add_dependency('pony', '~> 1.11')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marfa
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.8
 platform: ruby
 authors:
 - Max Krechetov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -240,16 +240,30 @@ dependencies:
   name: compass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: pony
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
 description: Little Sinatra-based framework
 email: mvkrechetov@gmail.com
 executables:
@@ -275,8 +289,8 @@ files:
 - lib/marfa/file_templates.rb
 - lib/marfa/helpers/classes/string.rb
 - lib/marfa/helpers/controller.rb
+- lib/marfa/helpers/email.rb
 - lib/marfa/helpers/http/vary.rb
-- lib/marfa/helpers/javascript.rb
 - lib/marfa/helpers/sass_functions.rb
 - lib/marfa/helpers/scss.rb
 - lib/marfa/helpers/style.rb

data/lib/marfa/helpers/javascript.rb

@@ -1,46 +0,0 @@
-require 'babel/transpiler'
-require 'closure-compiler'
-
-# TODO: Remove in v0.2
-
-# Javascript
-module Marfa
-  # Helpers for Javascript
-  module Helpers
-    # Javascript module
-    module Javascript
-      def js_transpile(path, is_plain_text = true)
-        path = File.read(path) unless is_plain_text
-        result = Babel::Transpiler.transform(path)
-        result['code']
-      end
-
-      # https://developers.google.com/closure/compiler/docs/compilation_levels
-      def js_import(path)
-        path = settings.views + path
-
-        closure = Closure::Compiler.new(
-          compilation_level: 'SIMPLE_OPTIMIZATIONS',
-          language_out: 'ES5_STRICT'
-        )
-
-        code = js_transpile(path, false)
-        code = closure.compile(code) if Marfa.config.minify_js
-        '<script>' + code + '</script>'
-      end
-
-      # https://developers.google.com/closure/compiler/docs/compilation_levels
-      def js_import_from_haml(path, data = {})
-        closure = Closure::Compiler.new(
-          compilation_level: 'SIMPLE_OPTIMIZATIONS',
-          language_out: 'ES5_STRICT'
-        )
-
-        template = haml :"#{path}", :layout => false, :locals => data
-        code = js_transpile(template)
-        code = closure.compile(code)
-        '<script>' + code + '</script>'
-      end
-    end
-  end
-end