marfa 0.5.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fded6d57e7e8913d1c694355c1da6ffd09be9d2f
-  data.tar.gz: 81acbf44e1d75d9bb45bcfffd7bf47108a235ce7
+  metadata.gz: 3ac683e8c0c1a0d4de81e3d1f54c6b12c37e520d
+  data.tar.gz: b1c6144785b6653c1aa63fdad7f41f7a29f0d5c4
 SHA512:
-  metadata.gz: c94d24f9ece756e6cf8bf94ea860b8880b7c8f8b515737b546a39f71ca67a40aeaef1cd58c09e87a66b5cfaa61d21163500bda7b9a040a691737233e2ba89682
-  data.tar.gz: b783e105c2630e049a9df94ce6b1102e6f2bcadef6ed249928b552d776a1ffd4256f6b3b4796c492832d505758bdc4a12f4ec5121fb6b3c74ee7f93d5829b3e6
+  metadata.gz: 6ff955c64e6ad5ff064324645bb853c87a8952ce24dceb69cbb84c80daa514321a3816cb27245ebcf7cf4a54853e67f1f62ad7b7185a6dd912652b4ad2552de8
+  data.tar.gz: 4131e1c511e8a28f327a03d6a4e2603b375dad08c62e802bbdb290b25d3937e13acd10696bc3b06125539b8da131ba5648d1837adc368b047fb125ecb6a20215

data/lib/marfa/configuration.rb

@@ -14,7 +14,7 @@ module Marfa
     return if @config.to_h.empty?
 
     _configure_settings(Marfa::Controllers::BaseController)
-    _configure_settings(Marfa::Controllers::CssController)
+    _configure_settings(Marfa::Controllers::CssController) if Marfa.config.use_css_build
     _configure_ext_modules(Marfa::Controllers::BaseController)
   end
 

data/lib/marfa/controllers.rb

@@ -6,9 +6,8 @@ module Marfa
     # Controllers for Rack run
     # @return [Array] Controllers list
     def self.controllers_list
-      @controllers_list = [
-        CssController
-      ]
+      @controllers_list = []
+      @controllers_list << CssController if Marfa.config.use_css_build
     end
   end
 end

data/lib/marfa/file_templates.rb

@@ -15,74 +15,83 @@ module Marfa
       File.open("#{project_path}/config/marfa.rb", 'w') do |file|
         file.puts "# Marfa configuration file
 Marfa.configure do |cfg|
+  # Environment
+  cfg.environment = :development
+  # Request logging
+  cfg.logging = true
+  # Show error page with backtrace
+  cfg.show_exceptions = true
+  # log exception backtraces to STDERR
+  cfg.dump_errors = true
+
+  # Mode (not implemented yet)
+  cfg.mode = 'api'
+
   # Specifying API Server is needed
   cfg.api_server = ''
 
-  # Views path is needed
+  # Paths settings
+  cfg.content_path = '/images/content/'
+  cfg.public_folder = File.expand_path('./static')
   cfg.views = File.expand_path('./app/views')
+  cfg.block_templates_path = 'blocks'
 
-  # Cache config
+  # Redis cache settings
   cfg.cache = {
     enabled: false,
-    host: '',
-    port: 0,
+    host: 'localhost',
+    port: 6379,
     db: 0,
-    expiration_time: 3600,
-    use_device: true # use device name in page, blocks cache
+    expiration_time: 86_400
   }
 
-  # Static files content path
-  cfg.content_path = '/images/content/'
+  # Cache header
+  cfg.static_cache_control = [public, max_age: 0]
 
-  # Styles caching
-  cfg.cache_styles = true
+  # CSS build
+  cfg.use_css_build = false
 
-  # Blocks path
-  cfg.block_templates_path = 'blocks'
+  # CSS file cache
+  cfg.cache_styles = false
 
-  # Public folder
-  cfg.public_folder = File.expand_path('./static')
+  # CSRF protection
+  cfg.csrf_enabled = false
 
-  # Static files cache
-  cfg.static_cache_control = [:public, max_age: 2_592_000]
+  # HTML compression
+  cfg.html_compression_options = {
+    enabled: true,
+    remove_intertag_spaces: true
+  }
 
-  # CSRF Protection
-  cfg.csrf_enabled = false
+  # CSS/JS Minifying
+  cfg.minify_css = false
+  cfg.minify_js = true
 
-  # gem device_detector
-  cfg.device_detector = {
-      enabled: true,
-      default_device: 'smartphone'
+  # Email settings
+  cfg.email = {
+    default: {
+      address: '',
+      port: '587',
+      enable_starttls_auto: true,
+      user_name: '',
+      password: '',
+      authentication: :plain,
+      domain: 'localhost.localdomain'
+    }
   }
 
-  # 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
+  # Device detector
+  cfg.device_detector = {
+    enabled: true
   }
 
-  # CSS Minifying
-  cfg.minify_css = true
+  # Pagination default template
+  cfg.pagination_template = '/pagination'
 
-  # JS Minifying
-  cfg.minify_js = true
+  # Rack::Session secret
+  cfg.session_secret = 'secret'
 end
+
       "
       end
     end
@@ -109,16 +118,24 @@ Encoding.default_internal = Encoding::UTF_8
 
 require 'marfa'
 require File.dirname(__FILE__) + '/app/bootstrap'
-require File.dirname(__FILE__) + '/config/marfa'
+require File.dirname(__FILE__) + '/config/marfa/' + ENV['RACK_ENV']
+require 'pp' if ENV['RACK_ENV'] == 'production'
+
+p Using config #{File.dirname(__FILE__) + '/config/marfa/' + ENV['RACK_ENV']}
 
 Marfa.configure_app
 
 # Controllers auto-bootstrap
 controllers = Object.constants.select { |c| c.to_s.include? 'Controller' }
 controllers.map! { |controller| Object.const_get(controller) }
-controllers += Marfa::Controllers.controllers_list
+# controllers += Marfa::Controllers.controllers_list
+
+app_map = {
+  # '.css': CssController,
+  '/': IndexController
+}
 
-run Rack::Cascade.new(controllers)
+run Rack::AppMapper.new(controllers, app_map)
       "
       end
 

data/lib/marfa/helpers/classes/array.rb

@@ -0,0 +1,5 @@
+# Array class extending
+class Array
+  # @return [true, false]
+  alias blank? empty?
+end

data/lib/marfa/helpers/classes/false_class.rb

@@ -0,0 +1,7 @@
+# False class extending
+class FalseClass
+  # @return [true]
+  def blank?
+    true
+  end
+end

data/lib/marfa/helpers/classes/hash.rb

@@ -0,0 +1,4 @@
+# Hash class extending
+class Hash
+  alias blank? empty?
+end

data/lib/marfa/helpers/classes/nil_class.rb

@@ -0,0 +1,7 @@
+# Nil class extending
+class NilClass
+  # @return [true]
+  def blank?
+    true
+  end
+end

data/lib/marfa/helpers/classes/numeric.rb

@@ -7,4 +7,13 @@ class Numeric
   def to_price!
     self.to_s.to_price!
   end
+
+  # Check if digit is blank
+  # 0.blank? => true
+  # 1.blank? => false
+  # @return [true, false]
+  def blank?
+    return true if zero?
+    false
+  end
 end

data/lib/marfa/helpers/classes/object.rb

@@ -0,0 +1,10 @@
+# Object class extending
+class Object
+  # Copied from rails
+  # An object is present if it's not blank.
+  #
+  # @return [true, false]
+  def blank?
+    respond_to?(:empty?) ? !!empty? : !self
+  end
+end

data/lib/marfa/helpers/classes/regexp.rb

@@ -0,0 +1,11 @@
+# Regexp class extending
+# Helpers from Rails
+class Regexp
+  def multiline?
+    options & MULTILINE == MULTILINE
+  end
+
+  def match?(string, pos=0)
+    !!match(string, pos)
+  end unless //.respond_to?(:match?)
+end

data/lib/marfa/helpers/classes/string.rb

@@ -1,5 +1,7 @@
 # Additional String functionality
 class String
+  BLANK_RE = /\A[[:space:]]*\z/
+
   # Replaces all '/' to '_'
   # @example
   #   "some/path".to_underscore
@@ -48,4 +50,9 @@ class String
     # .gsub(pattern, replacement) returns a copy of str with the all occurrences of pattern substituted for the second argument
     self.split('.').first.reverse.gsub(/...(?=.)/, '\&;psniht&').reverse
   end
+
+  # @return [true, false]
+  def blank?
+    empty? || BLANK_RE.match?(self)
+  end
 end

data/lib/marfa/helpers/classes/time.rb

@@ -0,0 +1,7 @@
+# Time class extending
+class Time
+  # @return [false]
+  def blank?
+    false
+  end
+end

data/lib/marfa/helpers/classes/true_class.rb

@@ -0,0 +1,7 @@
+# TrueClass extending
+class TrueClass
+  # @return [false]
+  def blank?
+    false
+  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.5.4' unless defined?(Marfa::VERSION)
+  VERSION = '0.6.0'.freeze unless defined?(Marfa::VERSION)
 
   # The current Marfa version.
   # @return [String] The version number

data/lib/marfa.rb

@@ -11,7 +11,16 @@ require 'marfa/rack/app_mapper'
 require 'marfa/controllers'
 require 'marfa/controllers/base_controller'
 require 'marfa/controllers/css_controller'
+require 'marfa/helpers/classes/array'
+require 'marfa/helpers/classes/false_class'
+require 'marfa/helpers/classes/hash'
+require 'marfa/helpers/classes/nil_class'
+require 'marfa/helpers/classes/numeric'
+require 'marfa/helpers/classes/object'
+require 'marfa/helpers/classes/regexp'
 require 'marfa/helpers/classes/string'
+require 'marfa/helpers/classes/time'
+require 'marfa/helpers/classes/true_class'
 require 'marfa/helpers/sass_functions'
 require 'marfa/models/base_dto'
 require 'marfa/models/api_model'

data/marfa.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'marfa'
-  s.version     = '0.5.4'
+  s.version     = '0.6.0'
   s.required_ruby_version = '>= 2.3.0'
   s.platform    = Gem::Platform::RUBY
   s.date        = Time.now.strftime('%Y-%m-%d')
@@ -13,26 +13,30 @@ Gem::Specification.new do |s|
   s.email       = 'mvkrechetov@gmail.com'
   s.require_paths = ['lib']
   s.files       = `git ls-files`.split("\n")
+
+  # remove marfa-build-js in marfa-lite
   s.executables = ['marfa-start', 'marfa-build-js']
+
   s.homepage    = 'http://rubygems.org/gems/marfa'
   s.license     = 'MIT'
 
   s.add_dependency('haml', '~> 4.0', '>= 4.0.7')
-  s.add_dependency('puma', '>3.8.2')
+  s.add_dependency('puma', '~>3.8')
   s.add_dependency('rack_csrf', '~> 2.6')
   s.add_dependency('rake', '~> 12')
   s.add_dependency('redis', '~> 3.3', '>= 3.3.3')
   s.add_dependency('rest-client', '~> 2')
   s.add_dependency('sass', '~> 3.4', '>= 3.4.23')
-  s.add_dependency('babel-transpiler', '~> 0.7')
-  s.add_dependency('closure-compiler', '~> 1.1', '>= 1.1.12')
   s.add_dependency('sinatra', '~> 1.4', '>= 1.4.2')
   s.add_dependency('sinatra-contrib', '~> 1.4')
   s.add_dependency('device_detector', '~> 1.0')
+  s.add_dependency('pony', '~> 1.11')
+
+  # remove this in marfa-lite
+  s.add_dependency('babel-transpiler', '~> 0.7')
+  s.add_dependency('closure-compiler', '~> 1.1', '>= 1.1.12')
   s.add_dependency('htmlcompressor', '~> 0.3.1')
   s.add_dependency('csso-rails', '~> 0.5.0')
   s.add_dependency('yard', '~> 0.9', '>= 0.9.8')
   s.add_dependency('yard-sinatra', '~> 1')
-  s.add_dependency('compass', '~> 1.0', '>= 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.5.4
+  version: 0.6.0
 platform: ruby
 authors:
 - Max Krechetov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-03 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -36,16 +36,16 @@ dependencies:
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.2
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.2
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rack_csrf
   requirement: !ruby/object:Gem::Requirement
@@ -128,40 +128,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.23
-- !ruby/object:Gem::Dependency
-  name: babel-transpiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: closure-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.12
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.12
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -211,101 +177,115 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: htmlcompressor
+  name: pony
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '1.11'
 - !ruby/object:Gem::Dependency
-  name: csso-rails
+  name: babel-transpiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: closure-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 1.1.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 1.1.12
 - !ruby/object:Gem::Dependency
-  name: yard-sinatra
+  name: htmlcompressor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
-  name: compass
+  name: csso-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 0.9.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 0.9.8
 - !ruby/object:Gem::Dependency
-  name: pony
+  name: yard-sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1'
 description: Sinatra-based wrapper for our projects
 email: mvkrechetov@gmail.com
 executables:
@@ -328,8 +308,16 @@ files:
 - lib/marfa/controllers/css_controller.rb
 - lib/marfa/css_version.rb
 - lib/marfa/file_templates.rb
+- lib/marfa/helpers/classes/array.rb
+- lib/marfa/helpers/classes/false_class.rb
+- lib/marfa/helpers/classes/hash.rb
+- lib/marfa/helpers/classes/nil_class.rb
 - lib/marfa/helpers/classes/numeric.rb
+- lib/marfa/helpers/classes/object.rb
+- lib/marfa/helpers/classes/regexp.rb
 - lib/marfa/helpers/classes/string.rb
+- lib/marfa/helpers/classes/time.rb
+- lib/marfa/helpers/classes/true_class.rb
 - lib/marfa/helpers/controller.rb
 - lib/marfa/helpers/email.rb
 - lib/marfa/helpers/http/vary.rb