marfa 0.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bfc443e4ccb0a869cccb07907d0749cc9d3df3e
-  data.tar.gz: f745e7a1f995bf1e1856cf8b758178735075522f
+  metadata.gz: 665b97268b20f6f5ec311e76c976713d9d39aca4
+  data.tar.gz: 59c557ab53ff94ff31ca80ff35bf22c96846bdb6
 SHA512:
-  metadata.gz: cbb28a82a8e8df3446183a02fca1839a3b88d48283d2392a3db3f2b3250c6685e3bb72add54f65d921509498760c2bde1f31a7cae4abaf39c72570a4a21424ec
-  data.tar.gz: cac62f610452d339ee115373b2ba24bc2ac186c1535f87c3b0a6c0107cb1b5ec48b3f383e5348b53156a24604da7982a9a8d09b9b38840f988c0216f8c997a02
+  metadata.gz: 04f9a6f89afde128705cf3cdce767938c9e89e48ac30c78483eeb5b48cadca1a32d3d407dd2944cf1b49c204f61255f05a63411ead622ac95b4d80ce00249040
+  data.tar.gz: 59f0e36adaa646598ee9871d9260d58398b9bca1bc5bc5e22530a8673b54547ba737001ccd4f461d1981eb9fd76054a6251c7cc0b93c358df4651ee951ab041f

data/Rakefile

@@ -2,7 +2,9 @@ require 'fileutils'
 require 'rake'
 require 'babel/transpiler'
 require 'closure-compiler'
-
+# require 'sass/plugin'
+# require 'sass/engine'
+# require 'csso'
 include FileUtils
 
 # Default marfa configuration
@@ -119,6 +121,42 @@ 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
@@ -157,7 +195,12 @@ task :transpile_js, [:home_path, :search_dir, :output_dir] do |t, args|
 
   cd args[:home_path] + args[:search_dir], verbose: true
 
-  Dir[args[:home_path] + args[:search_dir] + '/**/*.js'].each do |path|
+  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(
@@ -167,8 +210,8 @@ task :transpile_js, [:home_path, :search_dir, :output_dir] do |t, args|
 
     code = js_transpile(path, false)
     code = closure.compile(code)
-    output_path = args[:home_path] + args[:output_dir]
-    mkdir_p(output_path)
+    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
@@ -176,3 +219,30 @@ task :transpile_js, [:home_path, :search_dir, :output_dir] do |t, args|
   end
 
 end
+
+# task :compile_css, [:home_path, :search_dir, :output_dir] do |t, args|
+#   search_dir = args[:search_dir] || ''
+#   output_dir = args[:output_dir] || '/static/css'
+#
+#   Dir[args[:home_path] + search_dir + '/**/*.scss'].each do |path|
+#     puts "Processing #{path}"
+#
+#     output_path = args[:home_path] + output_dir
+#     mkdir_p(output_path) unless Dir.exist?(output_path)
+#
+#     device_names.each do |device|
+#       full_path =
+#         output_path +
+#         '/' +
+#         path.split('/')
+#         .last
+#         .gsub('scss', '') +
+#         "#{device}.css"
+#
+#       styles = create_style(path, device)
+#       File.write(full_path, styles)
+#     end
+#
+#   end
+#
+# end

data/lib/marfa/helpers/controller.rb

@@ -47,7 +47,7 @@ module Marfa
       # @example
       #   render_block('index/index', ['tag1', 'tag2'])
       # @return [String] rendered block
-      def render_component(path, tags = [])
+      def render_component(path, tags = [], query = {})
         # TODO: Improve caching with parameters
         content = get_cached_content('block', path, tags)
         return content unless content.nil?
@@ -57,7 +57,7 @@ module Marfa
 
         attrs = {
           user_data: @user_data || {},
-          query: params.to_h
+          query: query
         }
 
         block = Object.const_get(classname).new

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' unless defined?(Marfa::VERSION)
+  VERSION = '0.1.2' 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.1'
+  s.version     = '0.1.2'
   s.platform    = Gem::Platform::RUBY
   s.date        = Time.now.strftime('%Y-%m-%d')
   s.summary     = 'Little Sinatra-based framework'
@@ -32,4 +32,5 @@ 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')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marfa
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.2
 platform: ruby
 authors:
 - Max Krechetov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -236,6 +236,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: compass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Little Sinatra-based framework
 email: mvkrechetov@gmail.com
 executables: