marfa 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45cd98b215a57b3fb81400092eba5a45b3fc3745
-  data.tar.gz: 58e2b86ae416f8f80ae847bbb03a20131ec6e1a1
+  metadata.gz: ab89dd272cc93c863a0956edc1e45c95d87442e2
+  data.tar.gz: 7c668efb07d5fb28462be95e0a0a22711dde6432
 SHA512:
-  metadata.gz: 64b579aef5a7e4bc797e1c9c22796f22cc5580c734347b492f5ef9d464e6771622451f100dbb3b782b27256eca8ff6eb47b75c68471ac2c7e14427bc615498ea
-  data.tar.gz: 8c1f8777121fb601255d502c91d65e041c19e7e907a3990a182234d69c91626f9d5270ed402eeda0c2f86394aed4c36bd825f864dfef1c5b32906aadea4a611d
+  metadata.gz: 915fbe80a57ba735d6d0928b31dc72bb446149aafd6985a76e1874bffaff9f1f2eefc44353e969283e8b5e3c3921ede3575f3e936a8eeb21a955b9249828082b
+  data.tar.gz: 64b40c3d0b6f030278f9c39b3d27b04ab16eb9e131d978549f5a544f3fc7d5631fbd24417f3528cf040feeb8288738ff7dfeb06c482722326d7bc3a13ac78bc6

data/Rakefile

@@ -1,82 +1,8 @@
-# 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 'marfa/file_templates'
 
 include FileUtils
-include Marfa::FileTemplates
-
-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
-
-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}"
-  cd args[:home_path], verbose: true
-
-  unless Dir.exist?(project_dir)
-    puts 'Creating project folder...'
-
-    mkdir_p(project_dir)
-    cd project_dir, 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 config files...'
-
-    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
-
-  search_dir = args[:search_dir] || ''
-  output_dir = args[:output_dir] || '/static/js'
-
-  cd args[:home_path] + search_dir, verbose: true
-
-  Dir[args[:home_path] + 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] + 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
-
 end

data/lib/marfa/cache.rb

@@ -61,7 +61,7 @@ module Marfa
     # @example
     #   Marfa.cache.create_key('block', 'offer/list', ['tag1', 'tag2'])
     # @return [String] key
-    def create_key(kind, path, tags)
+    def create_key(kind, path, tags = [])
       kind + '_' + path.tr('/', '_') + '__' + tags.join('_')
     end
 

data/lib/marfa/css_version.rb

@@ -1,6 +1,7 @@
+# CSS version
 module Marfa
+  # return css version
   def self.css_version
     @css_version ||= Time.now.to_i.freeze
   end
-  # set / get ?
 end

data/lib/marfa/file_templates.rb

@@ -33,8 +33,12 @@ Marfa.configure do |cfg|
   # Static files content path
   cfg.content_path = '/images/content/'
 
+  # Styles caching
   cfg.cache_styles = true
 
+  # Blocks path
+  cfg.block_templates_path = 'blocks'
+
   # Public folder
   cfg.public_folder = File.expand_path('./static')
 
@@ -93,7 +97,10 @@ Dir[File.dirname(__FILE__) + '/controllers/**/*.rb'].each { |file| require 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'
+        file.puts "Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
+
+require 'marfa'
 require File.dirname(__FILE__) + '/app/bootstrap'
 require File.dirname(__FILE__) + '/config/marfa'
 

data/lib/marfa/helpers/controller.rb

@@ -1,3 +1,5 @@
+require 'marfa/configuration'
+
 module Marfa
   module Helpers
     module Controller
@@ -36,7 +38,7 @@ module Marfa
       #   get_cached_content('page', 'index/index', ['tag1', 'tag2'])
       # @return [String] data from cache
       # @return [Nil]
-      def get_cached_content(kind, path, tags)
+      def get_cached_content(kind, path, tags = [])
         cache_key = Marfa.cache.create_key(kind, path, tags)
         return Marfa.cache.get(cache_key) if Marfa.cache.exist?(cache_key)
       end
@@ -44,15 +46,17 @@ module Marfa
       # Render block from cache, return html
       # @param path [String] - URL
       # @param tags [Array] - tag list
+      # @param query [Hash] - query params
+      # @param class_name [String] - class name to block
       # @example
       #   render_block('index/index', ['tag1', 'tag2'])
       # @return [String] rendered block
-      def render_component(path, tags = [], query = {})
+      def render_block(path, tags = [], query = {}, class_name = nil)
         # TODO: Improve caching with parameters
         content = get_cached_content('block', path, tags)
         return content unless content.nil?
 
-        classname = path.to_class_name + 'Block'
+        classname = class_name || (path.to_class_name + 'Block')
         return unless Object.const_defined?(classname)
 
         attrs = {
@@ -61,38 +65,25 @@ module Marfa
         }
 
         block = Object.const_get(classname).new
-
         data = block.get_data(attrs)
         cache_key = Marfa.cache.create_key('block', path, tags)
-        full_path = 'components/' + path
+        full_path = Marfa.config.block_templates_path + '/' + path
 
         render_cached_content(cache_key, full_path, data)
       end
 
-      # Render block from cache, return html
-      # DEPRECATED
+      # Render block from cache, return html without class eval
       # @param path [String] - URL
-      # @param tags [Array] - tag list
+      # @param data [Hash] - data to render
       # @example
-      #   render_block('index/index', ['tag1', 'tag2'])
+      #   render_static_block('index/index', ['tag1', 'tag2'])
       # @return [String] rendered block
-      def render_block(path, tags)
-        # TODO: Improve caching with parameters
-        content = get_cached_content('block', path, tags)
+      def render_static_block(path, data = {})
+        content = get_cached_content('block', path)
         return content unless content.nil?
 
-        classname = path.to_class_name + 'Block'
-        return unless Object.const_defined?(classname)
-
-        attrs = {
-          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 = 'blocks/' + path
+        cache_key = Marfa.cache.create_key('block', path)
+        full_path = Marfa.config.block_templates_path + '/' + path
 
         render_cached_content(cache_key, full_path, data)
       end
@@ -121,6 +112,9 @@ module Marfa
         html = render_page(path, tags, data) if html.nil?
         html
       end
+
+      alias_method :render_component, :render_block
+      alias_method :render_static_component, :render_static_block
     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.9' unless defined?(Marfa::VERSION)
+  VERSION = '0.2.0' unless defined?(Marfa::VERSION)
 
   # The current Marfa version.
   # @return [String] The version number

data/marfa.gemspec

@@ -3,35 +3,36 @@
 
 Gem::Specification.new do |s|
   s.name        = 'marfa'
-  s.version     = '0.1.9'
+  s.version     = '0.2.0'
+  s.required_ruby_version = '2.3.0'
   s.platform    = Gem::Platform::RUBY
   s.date        = Time.now.strftime('%Y-%m-%d')
-  s.summary     = 'Little Sinatra-based framework'
-  s.description = 'Little Sinatra-based framework'
+  s.summary     = 'Sinatra-based wrapper'
+  s.description = 'Sinatra-based wrapper for our projects'
   s.authors     = ['Max Krechetov', 'Roman Yakushev', 'Anatoly Matov']
   s.email       = 'mvkrechetov@gmail.com'
   s.require_paths = ['lib']
   s.files       = `git ls-files`.split("\n")
-  s.executables = ['marfa', 'marfa-start', 'marfa-build-js']
+  s.executables = ['marfa-start', 'marfa-build-js']
   s.homepage    = 'http://rubygems.org/gems/marfa'
   s.license     = 'MIT'
 
-  s.add_dependency('haml')
-  s.add_dependency('puma')
-  s.add_dependency('rack_csrf')
-  s.add_dependency('rake')
-  s.add_dependency('redis')
-  s.add_dependency('rest-client')
-  s.add_dependency('sass')
-  s.add_dependency('babel-transpiler')
-  s.add_dependency('closure-compiler')
-  s.add_dependency('sinatra')
-  s.add_dependency('sinatra-contrib')
+  s.add_dependency('haml', '~> 4.0', '>= 4.0.7')
+  s.add_dependency('puma', '~> 3.7')
+  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('htmlcompressor', '~> 0.3.1')
   s.add_dependency('csso-rails', '~> 0.5.0')
-  s.add_dependency('yard')
-  s.add_dependency('yard-sinatra')
-  s.add_dependency('compass', '~> 1.0.3')
+  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.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Max Krechetov
@@ -10,162 +10,192 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.7
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: rack_csrf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.3
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.23
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        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: '0'
+        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: '0'
+        version: 1.1.12
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: device_detector
   requirement: !ruby/object:Gem::Requirement
@@ -212,35 +242,44 @@ dependencies:
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.8
 - !ruby/object:Gem::Dependency
   name: yard-sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.3
   type: :runtime
@@ -248,6 +287,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.3
 - !ruby/object:Gem::Dependency
@@ -264,10 +306,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
-description: Little Sinatra-based framework
+description: Sinatra-based wrapper for our projects
 email: mvkrechetov@gmail.com
 executables:
-- marfa
 - marfa-start
 - marfa-build-js
 extensions: []
@@ -276,7 +317,6 @@ files:
 - ".gitignore"
 - Gemfile
 - Rakefile
-- bin/marfa
 - bin/marfa-build-js
 - bin/marfa-start
 - lib/marfa.rb
@@ -311,9 +351,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -324,5 +364,5 @@ rubyforge_project:
 rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: Little Sinatra-based framework
+summary: Sinatra-based wrapper
 test_files: []

data/bin/marfa

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-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]},#{ARGV[2]}]"
-
-  if $?.exitstatus > 0
-    puts 'Failed'
-  end
-
-else
-  puts 'Not enough parameters'
-end