marfa 0.0.3.9 → 0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 710e3c673087c7b47f6a4e00fba5e4f74821fcb0
-  data.tar.gz: 049645723de6b540d9026704aa34575219a63b95
+  metadata.gz: 5bfc443e4ccb0a869cccb07907d0749cc9d3df3e
+  data.tar.gz: f745e7a1f995bf1e1856cf8b758178735075522f
 SHA512:
-  metadata.gz: b5dba35208281137476e36436f13b0c288202bffe0405a59803a7f94bf0cf1342800ed1dbd748aab3321365bd494b0d476f1ae54e294bc0d0ce545f901b4a050
-  data.tar.gz: 39ff0ce885d00eb46ac056d21ad61e9c33f794bca78e9c0f9d2b97a4ef68efa23c30795ef9b79f4ad33e4e32893feecc823370b2aedf6386ae4c2a493539ee24
+  metadata.gz: cbb28a82a8e8df3446183a02fca1839a3b88d48283d2392a3db3f2b3250c6685e3bb72add54f65d921509498760c2bde1f31a7cae4abaf39c72570a4a21424ec
+  data.tar.gz: cac62f610452d339ee115373b2ba24bc2ac186c1535f87c3b0a6c0107cb1b5ec48b3f383e5348b53156a24604da7982a9a8d09b9b38840f988c0216f8c997a02

data/Rakefile

@@ -1,5 +1,7 @@
 require 'fileutils'
 require 'rake'
+require 'babel/transpiler'
+require 'closure-compiler'
 
 include FileUtils
 
@@ -26,6 +28,8 @@ def create_marfa_config_file
     file.puts '# Static files content path'
     file.puts "Marfa.config.content_path = '/images/content/'"
     file.puts ''
+    file.puts 'Marfa.config.cache_styles = true'
+    file.puts ''
     file.puts '# Public folder'
     file.puts "Marfa.config.public_folder = File.expand_path('./static')"
     file.puts ''
@@ -36,7 +40,26 @@ def create_marfa_config_file
     file.puts 'Marfa.config.csrf_enabled = false'
     file.puts ''
     file.puts '# HTML Compression'
-    file.puts 'Marfa.config.compression_enabled = false'
+    file.puts 'Marfa.config.html_compression_options = {'
+    file.puts ':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'
+    file.puts '}'
     file.puts ''
     file.puts '# CSS Minifying'
     file.puts 'Marfa.config.minify_css = true'
@@ -90,6 +113,12 @@ def create_bootstrap_file
   end
 end
 
+def js_transpile(path, is_plain_text = true)
+  path = File.read(path) unless is_plain_text
+  result = Babel::Transpiler.transform(path)
+  result['code']
+end
+
 task :default do
   puts 'Please specify command'
 end
@@ -120,6 +149,30 @@ task :start, [:home_path, :project_dir] do |t, args|
     create_bootstrap_file
     create_rackup_config_file
     puts 'Config files are created'
+  end
+end
 
+task :transpile_js, [:home_path, :search_dir, :output_dir] do |t, args|
+  puts 'Starting js transpile'
+
+  cd args[:home_path] + args[:search_dir], verbose: true
+
+  Dir[args[:home_path] + args[:search_dir] + '/**/*.js'].each do |path|
+    puts "Processing #{path}"
+
+    closure = Closure::Compiler.new(
+      compilation_level: 'SIMPLE_OPTIMIZATIONS',
+      language_out: 'ES5_STRICT'
+    )
+
+    code = js_transpile(path, false)
+    code = closure.compile(code)
+    output_path = args[:home_path] + args[:output_dir]
+    mkdir_p(output_path)
+
+    File.open(output_path + '/' + path.split('/').last, 'w') do |f|
+      f.puts code
+    end
   end
+
 end

data/bin/marfa

@@ -4,7 +4,7 @@ require 'fileutils'
 if ARGV.length > 1
   command = ARGV[0]
   rake_path = File.expand_path('../../Rakefile', __FILE__)
-  system "rake -f #{rake_path} #{command}[#{FileUtils.pwd},#{ARGV[1]}]"
+  system "rake -f #{rake_path} #{command}[#{FileUtils.pwd},#{ARGV[1]},#{ARGV[2]}]"
 
   if $?.exitstatus > 0
     puts 'Failed'

data/lib/marfa/configuration.rb

@@ -31,9 +31,11 @@ module Marfa
 
   # Configure extending modules
   def self._configure_ext_modules(app)
+    opts = Marfa.config.html_compression_options
+
     app.configure do
       app.use Rack::Csrf, raise: true if Marfa.config.csrf_enabled
-      app.use HtmlCompressor::Rack if Marfa.config.compression_enabled
+      app.use HtmlCompressor::Rack, opts if opts && opts[:enabled]
     end
   end
 

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

@@ -15,7 +15,7 @@ class String
   def to_class_name
     parts = downcase.split('/')
     parts.each(&:capitalize!)
-    parts.join('')
+    parts.join('').gsub(%r{-}, '')
   end
 
   # Convert string to url part

data/lib/marfa/helpers/controller.rb

@@ -48,7 +48,6 @@ module Marfa
       #   render_block('index/index', ['tag1', 'tag2'])
       # @return [String] rendered block
       def render_component(path, tags = [])
-
         # TODO: Improve caching with parameters
         content = get_cached_content('block', path, tags)
         return content unless content.nil?
@@ -57,11 +56,12 @@ module Marfa
         return unless Object.const_defined?(classname)
 
         attrs = {
-            user_data: @user_data || {},
-            query: params.to_h
+          user_data: @user_data || {},
+          query: params.to_h
         }
 
         block = Object.const_get(classname).new
+
         data = block.get_data(attrs)
         cache_key = Marfa.cache.create_key('block', path, tags)
         full_path = 'components/' + path
@@ -85,8 +85,8 @@ module Marfa
         return unless Object.const_defined?(classname)
 
         attrs = {
-            user_data: @user_data || {},
-            query: params.to_h
+          user_data: @user_data || {},
+          query: params.to_h
         }
 
         block = Object.const_get(classname).new

data/lib/marfa/helpers/javascript.rb

@@ -1,6 +1,8 @@
 require 'babel/transpiler'
 require 'closure-compiler'
 
+# TODO: Remove in v0.2
+
 # Javascript
 module Marfa
   # Helpers for Javascript
@@ -28,13 +30,13 @@ module Marfa
       end
 
       # https://developers.google.com/closure/compiler/docs/compilation_levels
-      def js_import_from_haml(path)
+      def js_import_from_haml(path, data = {})
         closure = Closure::Compiler.new(
           compilation_level: 'SIMPLE_OPTIMIZATIONS',
           language_out: 'ES5_STRICT'
         )
 
-        template = haml :"#{path}", :layout => false
+        template = haml :"#{path}", :layout => false, :locals => data
         code = js_transpile(template)
         code = closure.compile(code)
         '<script>' + code + '</script>'

data/lib/marfa/helpers/style.rb

@@ -1,5 +1,6 @@
 require 'sass/plugin'
 require 'csso'
+require 'fileutils'
 
 # Rendering and caching style
 module Marfa
@@ -27,13 +28,14 @@ module Marfa
         return if options[:device].nil?
 
         root_path = options[:root_path] || '/'
+        path_to_css = settings.public_folder.to_s + '/css' + root_path
 
         file_name =
           [options[:section], options[:range], options[:device]]
           .reject { |opt| opt.nil? }
           .join('.') + '.css'
 
-        path = settings.public_folder.to_s + '/css' + root_path + file_name
+        full_path = path_to_css + file_name
 
         scss_path =
           root_path +
@@ -41,11 +43,12 @@ module Marfa
             .reject { |opt| opt.nil? }
             .join('/')
 
-        if File.exist?(path) && Marfa.config.cache_styles
-          send_file(File.join(settings.public_folder.to_s + '/css', File.basename(file_name)), type: 'text/css')
+        if File.exist?(full_path) && Marfa.config.cache_styles
+          send_file(full_path, type: 'text/css')
         else
+          FileUtils.mkdir_p(path_to_css) unless Dir.exist?(path_to_css)
           styles = create_style(scss_path, options[:device])
-          File.write(path, styles) if Marfa.config.cache_styles
+          File.write(full_path, styles) if Marfa.config.cache_styles
           content_type 'text/css', charset: 'utf-8', cache: 'false'
           styles
         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.0.3.9' unless defined?(Marfa::VERSION)
+  VERSION = '0.1' unless defined?(Marfa::VERSION)
 
   # The current Marfa version.
   # @return [String] The version number

data/marfa.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'marfa'
-  s.version     = '0.0.3.9'
+  s.version     = '0.1'
   s.platform    = Gem::Platform::RUBY
   s.date        = Time.now.strftime('%Y-%m-%d')
   s.summary     = 'Little Sinatra-based framework'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marfa
 version: !ruby/object:Gem::Version
-  version: 0.0.3.9
+  version: '0.1'
 platform: ruby
 authors:
 - Max Krechetov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml