marfa 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 665b97268b20f6f5ec311e76c976713d9d39aca4
-  data.tar.gz: 59c557ab53ff94ff31ca80ff35bf22c96846bdb6
+  metadata.gz: 47f3270a50621c8708d3977e3773b2ac5aa03516
+  data.tar.gz: 6a7512f056c10e4c2aabe283425dbf0756b72eeb
 SHA512:
-  metadata.gz: 04f9a6f89afde128705cf3cdce767938c9e89e48ac30c78483eeb5b48cadca1a32d3d407dd2944cf1b49c204f61255f05a63411ead622ac95b4d80ce00249040
-  data.tar.gz: 59f0e36adaa646598ee9871d9260d58398b9bca1bc5bc5e22530a8673b54547ba737001ccd4f461d1981eb9fd76054a6251c7cc0b93c358df4651ee951ab041f
+  metadata.gz: 8ec251c505738406677f431605eeb06a341d533fc7a2cec9567ee990f6c3948840392cbedd2c866ad237a90f8e35bab26519444da514b4571f2b9a64b27b35e8
+  data.tar.gz: 0219d83d38ebe1ce727dc73d42d5c1dcae9ddaf55685bad8f6af89e74a84dc4d2c8c071393a2224040e569b79acb836189e5aa0a039b1786f47e489b7ae09d01

data/Rakefile

@@ -1,119 +1,14 @@
+# Warning: this is deprecated and will be removed in 0.2
+# TODO: remove in 0.2
+
 require 'fileutils'
 require 'rake'
 require 'babel/transpiler'
 require 'closure-compiler'
-# require 'sass/plugin'
-# require 'sass/engine'
-# require 'csso'
-include FileUtils
-
-# Default marfa configuration
-def create_marfa_config_file
-  open('config/marfa.rb', 'w') do |file|
-    file.puts '# Marfa configuration file'
-    file.puts ''
-    file.puts '# Specifying API Server is needed'
-    file.puts "Marfa.config.api_server = ''"
-    file.puts ''
-    file.puts '# Views path is needed'
-    file.puts "Marfa.config.views = File.expand_path('./app/views')"
-    file.puts ''
-    file.puts '# Cache config'
-    file.puts "Marfa.config.cache = {"
-    file.puts '  enabled: false,'
-    file.puts "  host: '',"
-    file.puts '  port: 0,'
-    file.puts '  db: 0,'
-    file.puts '  expiration_time: 3600'
-    file.puts '}'
-    file.puts ''
-    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 ''
-    file.puts '# Static files cache'
-    file.puts "Marfa.config.static_cache_control = [:public, :max_age => 2_592_000]"
-    file.puts ''
-    file.puts '# CSRF Protection'
-    file.puts 'Marfa.config.csrf_enabled = false'
-    file.puts ''
-    file.puts '# HTML Compression'
-    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'
-    file.puts ''
-    file.puts '# JS Minifying'
-    file.puts 'Marfa.config.minify_js = true'
-  end
-end
-
-def create_application_config_file
-  open('config/application.rb', 'w') do |file|
-    # file.puts "require 'marfa'"
-    # file.puts ''
-  end
-end
-
-# Default DTO file
-def create_base_dto_file
-  open('app/models/dto.rb', 'w') do |file|
-    file.puts "require 'marfa'"
-    file.puts ''
-    file.puts 'class DTO < Marfa::Models::BaseDTO'
-    file.puts 'end'
-  end
-end
-
-# Rackup file
-def create_rackup_config_file
-  open('config.ru', 'w') do |file|
-    file.puts "require 'marfa'"
-    file.puts "require File.dirname(__FILE__) + '/app/bootstrap'"
-    file.puts "require File.dirname(__FILE__) + '/config/marfa'"
-    file.puts ''
-    file.puts 'Marfa.configure_app'
-    file.puts ''
-    file.puts '# Controllers auto-bootstrap'
-    file.puts "controllers = Object.constants.select { |c| c.to_s.include? 'Controller' }"
-    file.puts 'controllers.map! { |controller| Object.const_get(controller) }'
-    file.puts 'controllers += Marfa::Controllers.controllers_list'
-    file.puts 'run Rack::Cascade.new(controllers)'
-  end
-end
+require 'marfa/file_templates'
 
-def create_bootstrap_file
-  open('app/bootstrap.rb', 'w') do |file|
-    file.puts "require File.dirname(__FILE__) + '/models/dto'"
-    file.puts ''
-    file.puts '# requiring all blocks and controllers'
-    file.puts "Dir[File.dirname(__FILE__) + '/blocks/**/*.rb'].each { |file| require file }"
-    file.puts "Dir[File.dirname(__FILE__) + '/controllers/**/*.rb'].each { |file| require file }"
-  end
-end
+include FileUtils
+include Marfa::FileTemplates
 
 def js_transpile(path, is_plain_text = true)
   path = File.read(path) unless is_plain_text
@@ -121,47 +16,12 @@ def js_transpile(path, is_plain_text = true)
   result['code']
 end
 
-# def device_names
-#   [
-#     'desktop',
-#     'smartphone',
-#     'tablet',
-    # 'feature phone',
-    # 'console',
-    # 'tv',
-    # 'car browser',
-    # 'smart display',
-    # 'camera',
-    # 'portable media player',
-    # 'phablet'
-  # ]
-# end
-
-# Create styles
-# @param [String] scss_path - path to scss file
-# @param [String] device - device type
-# def create_style(scss_path, device)
-#   dynamic_vars(device)
-#   template = File.read(scss_path)
-#   sass_engine = Sass::Engine.new(template, {syntax: :scss})
-#   output = sass_engine.render
-#   p output
-#   Csso.optimize(output)
-# end
-#
-#
-# def dynamic_vars(device, section = 'root')
-#   Sass::Plugin.options[:custom] ||= {}
-#   Sass::Plugin.options[:custom][:device] = device
-#   Sass::Plugin.options[:custom][:section] = section
-#   # Sass::Plugin.options[:custom][:contentPath] = Marfa.config.content_path
-# end
-
 task :default do
   puts 'Please specify command'
 end
 
 task :start, [:home_path, :project_dir] do |t, args|
+  puts "Deprecation warning: this will be removed in marfa-0.2. Use marfa-start instead."
   project_dir = args[:project_dir]
 
   puts "Starting project #{project_dir}"
@@ -177,20 +37,21 @@ task :start, [:home_path, :project_dir] do |t, args|
     mkdir_p(%w(app config static app/blocks app/controllers app/models app/views))
     puts 'Project structure are created'
 
-    puts 'Creating dummy model files...'
-    create_base_dto_file
-    puts 'Dummy model files are created'
-
     puts 'Creating config files...'
-    create_marfa_config_file
-    create_application_config_file
-    create_bootstrap_file
-    create_rackup_config_file
+
+    project_path = "#{args[:home_path]}/#{project_dir}"
+
+    marfa_rb(project_path)
+    application_rb(project_path)
+    bootstrap_rb(project_path)
+    config_ru(project_path)
+
     puts 'Config files are created'
   end
 end
 
 task :transpile_js, [:home_path, :search_dir, :output_dir] do |t, args|
+  puts "Deprecation warning: this will be removed in marfa-0.2. Use marfa-build-js instead."
   puts 'Starting js transpile'
 
   cd args[:home_path] + args[:search_dir], verbose: true

data/bin/marfa-build-js

@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+require 'optparse'
+require 'babel/transpiler'
+require 'closure-compiler'
+
+include FileUtils
+
+options = {
+  home_path: FileUtils.pwd,
+  search_dir: '',
+  output_dir: '/static/js'
+}
+
+parser = OptionParser.new do |opts|
+  opts.banner = 'Usage: marfa-build-js [options]'
+
+  opts.on('-s', '--search_dir search_dir', 'Search dir') do |search_dir|
+    options[:search_dir] = search_dir
+  end
+
+  opts.on('-o', '--output_dir output_dir', 'Output dir') do |output_dir|
+    options[:output_dir] = output_dir
+  end
+
+  opts.on('-h', '--help', 'Displays help') do
+    puts opts
+    exit
+  end
+end
+
+parser.parse!
+
+puts 'Starting js transpile'
+
+search_dir = options[:home_path] + options[:search_dir]
+
+cd search_dir, verbose: true
+
+Dir[search_dir + '/**/*.js'].each do |path|
+  puts "Processing #{path}"
+
+  closure = Closure::Compiler.new(
+    compilation_level: 'SIMPLE_OPTIMIZATIONS',
+    language_out: 'ES5_STRICT'
+  )
+
+  result = Babel::Transpiler.transform(File.read(path))
+  code = closure.compile(result['code'])
+  output_path = options[:home_path] + options[:output_dir]
+
+  mkdir_p(output_path) unless Dir.exist?(output_path)
+
+  File.open(output_path + '/' + path.split('/').last, 'w') do |f|
+    f.puts code
+  end
+end
+
+puts 'All js files processed'

data/bin/marfa-start

@@ -0,0 +1,60 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+require 'optparse'
+require 'marfa/file_templates'
+
+include FileUtils
+include Marfa::FileTemplates
+
+options = {
+  home_path: FileUtils.pwd,
+  project_name: nil
+}
+
+parser = OptionParser.new do |opts|
+  opts.banner = 'Usage: marfa-start [project_name]'
+
+  opts.on('-n', '--name name', 'Project name') do |project_name|
+    options[:project_name] = project_name
+  end
+
+  opts.on('-h', '--help', 'Displays help') do
+    puts opts
+    exit
+  end
+end
+
+parser.parse!
+
+if options[:project_name].nil?
+  print 'Enter project name: '
+  options[:project_name] = gets.chomp
+end
+
+project_name = options[:project_name]
+
+puts "Starting project #{project_name}"
+cd options[:home_path], verbose: true
+
+unless Dir.exist?(project_name)
+  puts 'Creating project folder...'
+
+  mkdir_p(project_name)
+  cd project_name, verbose: true
+
+  puts 'Creating project structure...'
+  mkdir_p(%w(app config static app/blocks app/controllers app/models app/views))
+  puts 'Project structure are created'
+
+  puts 'Creating configuration files...'
+
+  project_path = "#{options[:home_path]}/#{project_name}"
+
+  marfa_rb(project_path)
+  application_rb(project_path)
+  bootstrap_rb(project_path)
+  config_ru(project_path)
+
+  puts 'Configuration files are created.'
+  puts "Project #{project_name} is created succesfully."
+end

data/lib/marfa/file_templates.rb

@@ -0,0 +1,113 @@
+# This module contains file templates for generate new project structure
+module Marfa
+  module FileTemplates
+    # generates content for 'config/application.rb' file
+    # @param [String] project_path - path to create_file
+    def application_rb(project_path)
+      File.open("#{project_path}/config/application.rb", 'w') do |file|
+        file.puts ''
+      end
+    end
+
+    # generates content for 'config/marfa.rb' file
+    # @param [String] project_path - path to create_file
+    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
+      "
+      end
+    end
+
+    # content for 'app/bootstrap.rb'
+    # @param [String] project_path - path to create_file
+    def bootstrap_rb(project_path)
+      File.open("#{project_path}/app/bootstrap.rb", 'w') do |file|
+        file.puts "require './config/application'
+
+# requiring all blocks and controllers
+Dir[File.dirname(__FILE__) + '/blocks/**/*.rb'].each { |file| require file }
+Dir[File.dirname(__FILE__) + '/controllers/**/*.rb'].each { |file| require file }
+      "
+      end
+    end
+
+    # content for 'config.ru' file
+    # @param [String] project_path - path to create_file
+    def config_ru(project_path)
+      File.open("#{project_path}/config.ru", 'w') do |file|
+        file.puts "require 'marfa'
+require File.dirname(__FILE__) + '/app/bootstrap'
+require File.dirname(__FILE__) + '/config/marfa'
+
+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
+
+run Rack::Cascade.new(controllers)
+      "
+      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.2' unless defined?(Marfa::VERSION)
+  VERSION = '0.1.4' unless defined?(Marfa::VERSION)
 
   # The current Marfa version.
   # @return [String] The version number

data/lib/marfa.rb

@@ -15,6 +15,7 @@ require 'marfa/helpers/sass_functions'
 require 'marfa/models/base_dto'
 require 'marfa/models/api_model'
 require 'marfa/models/db_model'
+require 'marfa/file_templates'
 
 # requires all submodules
 module Marfa

data/marfa.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'marfa'
-  s.version     = '0.1.2'
+  s.version     = '0.1.4'
   s.platform    = Gem::Platform::RUBY
   s.date        = Time.now.strftime('%Y-%m-%d')
   s.summary     = 'Little Sinatra-based framework'
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email       = 'mvkrechetov@gmail.com'
   s.require_paths = ['lib']
   s.files       = `git ls-files`.split("\n")
-  s.executables = ['marfa']
+  s.executables = ['marfa', 'marfa-start', 'marfa-build-js']
   s.homepage    = 'http://rubygems.org/gems/marfa'
   s.license     = 'MIT'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marfa
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Max Krechetov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -254,6 +254,8 @@ description: Little Sinatra-based framework
 email: mvkrechetov@gmail.com
 executables:
 - marfa
+- marfa-start
+- marfa-build-js
 extensions: []
 extra_rdoc_files: []
 files:
@@ -261,6 +263,8 @@ files:
 - Gemfile
 - Rakefile
 - bin/marfa
+- bin/marfa-build-js
+- bin/marfa-start
 - lib/marfa.rb
 - lib/marfa/blocks/base_block.rb
 - lib/marfa/cache.rb
@@ -268,6 +272,7 @@ files:
 - lib/marfa/controllers.rb
 - lib/marfa/controllers/base_controller.rb
 - lib/marfa/controllers/css_controller.rb
+- lib/marfa/file_templates.rb
 - lib/marfa/helpers/classes/string.rb
 - lib/marfa/helpers/controller.rb
 - lib/marfa/helpers/http/vary.rb