spark_engine 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e14e3ea9f6106b145bd3c3a68525a2bf4bc20682aecf4c23844ecf6b2d2db7a1
-  data.tar.gz: c10f52044b61ee93dafb647fdd80ed18291fbe3d7f5d5110b662fde42d7bab52
+  metadata.gz: c58ea63e7821a0a536de0aaa29bf71c6cfbd6b3de7fb14199f7caa7d161d4708
+  data.tar.gz: b415c04a849dd42c435d94f840a50e5df1c017f8145a4a53d93dde9b69751086
 SHA512:
-  metadata.gz: 4d35cd50784a6fca125005939335ee5359f3adb6929db9cb63cb61248fb90be2d526b9b4334348aef63086627cd1ec931d35fbafef0ee4e955313e048c85e323
-  data.tar.gz: 2821d2dc7ce2d36d9f354768243e195e62b9f1f7e55dc26806dd3e472a604d67bdeef2d1631163cb61dc4c8522efe3c1fb32f3fb14689aa14ff95c61f4b2f79e
+  metadata.gz: 2659a3d59b3e9e857ca1619165d2282c205fbbfe9a0495c4b04967befdc9d6ff816ed13200b1c0cd6a2b02777e86a4258e016a169a4eb43a5676fe8d53818fa9
+  data.tar.gz: ccbe2ddb02852e853a2867fc1a65ecc53f9d8c2081a9eb34c709e4b4ba05884c9fde84eba0554873394ab7d4f52f18b025c54678f849a0931133c80542707d34

data/lib/spark_engine/helpers/layout_helpers.rb

@@ -3,8 +3,10 @@ module SparkEngine
     module LayoutHelper
       def render_layout(*args, &block)
         options = args.last.is_a?(Hash) ? args.pop : {}
-        layout = args.first || 'default'
-        options[:template] = "layouts/#{layout}"
+        options[:template] = "layouts/#{args.first}"
+        options[:locals] ||= {}
+        options[:locals][:classes] = [options.delete(:classes)].flatten
+
         yield if block_given?
         render options
       end

data/lib/spark_engine/middleware.rb

@@ -9,64 +9,32 @@ module SparkEngine
 
   class StaticAssets
 
-    # Rails 5 middleware patch
-    if SparkEngine.rails5?
-
-      def initialize(app, path, index: 'index', headers: {}, engine_name: nil)
-        @app = app
-        @engine_name = engine_name
-        @file_handler = ActionDispatch::FileHandler.new(path, index: index, headers: headers)
-      end
+    def initialize(app, path, index: 'index', headers: {}, engine_name: nil)
+      @app = app
+      @engine_name = engine_name
+      @file_handler = ActionDispatch::FileHandler.new(path, index: index, headers: headers)
+    end
 
-      def call(env)
-        req = Rack::Request.new env
-        prefix = File.join Application.config.assets.prefix, @engine_name
+    def call(env)
+      req = Rack::Request.new env
+      prefix = File.join Application.config.assets.prefix, @engine_name
 
-        if req.get? || req.head?
-          path = req.path_info.chomp('/'.freeze)
+      if req.get? || req.head?
+        path = req.path_info.chomp('/'.freeze)
 
-          if path.start_with? prefix
-            path = path.remove /\A#{prefix}\//
+        if path.start_with? prefix
+          path = path.remove /\A#{prefix}\//
 
-            if match = @file_handler.match?(path)
-              req.path_info = match
-              return @file_handler.serve(req)
-            end
+          if match = @file_handler.match?(path)
+            req.path_info = match
+            return @file_handler.serve(req)
           end
         end
-
-        @app.call(req.env)
       end
 
-    # Rails 4 middleware patch
-    else
-
-      def initialize(app, path, cache_control=nil, engine_name: nil)
-        @app = app
-        @engine_name = engine_name
-        @file_handler = ::ActionDispatch::FileHandler.new(path, cache_control)
-      end
-
-      def call(env)
-        prefix = File.join Application.config.assets.prefix, @engine_name
-
-        case env['REQUEST_METHOD']
-        when 'GET', 'HEAD'
-          path = env['PATH_INFO'].chomp('/')
-
-          if path.start_with? prefix
-            path = path.remove /\A#{prefix}\//
-
-            if match = @file_handler.match?(path)
-              env["PATH_INFO"] = match
-              return @file_handler.call(env)
-            end
-          end
-        end
-
-        @app.call(env)
-      end
+      @app.call(req.env)
     end
+
   end
 
 end

data/lib/spark_engine/plugin/assets/stylesheets.rb

@@ -1,5 +1,8 @@
 require 'sass'
-require "autoprefixer-rails"
+begin
+  require "autoprefixer-rails"
+rescue
+end
 
 module SparkEngine
   module Assets
@@ -41,7 +44,8 @@ module SparkEngine
       end
 
       def build_css(file)
-        css = AutoprefixerRails.process(File.read(file)).css
+        css = File.read(file)
+        css = AutoprefixerRails.process().css if defined? AutoprefixerRails
         File.open(destination(file), 'w') { |io| io.write(css) }
 
         compress(destination(file))
@@ -54,7 +58,7 @@ module SparkEngine
         Sass.logger.log_level = :error if SparkEngine.production?
 
         css = Sass.compile_file(file, style: style)
-        css = AutoprefixerRails.process(css).css
+        css = AutoprefixerRails.process(css).css if defined? AutoprefixerRails
 
         File.open(dest, 'w') { |io| io.write(css) }
 

data/lib/spark_engine/plugin.rb

@@ -37,7 +37,7 @@ module SparkEngine
         require 'spark_engine/middleware'
 
         initializer "#{name}.static_assets" do |app|
-          if !SparkEngine.rails5? || app.config.public_file_server.enabled
+          if app.config.public_file_server.enabled
             app.middleware.insert_after ::ActionDispatch::Static, SparkEngine::StaticAssets, "#{root}/public", engine_name: SparkEngine.plugin.name
             app.middleware.insert_before ::ActionDispatch::Static, Rack::Deflater
           end

data/lib/spark_engine/scaffold/gem/app/views/layouts/namespace/default.html.erb

@@ -2,17 +2,22 @@
 <html>
   <head>
     <title><%= @plugin_module %></title>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="HandheldFriendly" content="True">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <%%= csrf_meta_tags %>
-    <%%= asset_tags %>
+    <%%= stylesheet_tag "<%= @engine %>" %>
     <%%= yield :stylesheets %>
     <%%= yield :head %>
+    <script>console.log("<%= @plugin_module %>: <%%= <%= @gem_module %>::VERSION %>")</script>
   </head>
 
-  <body>
-    <div class='site'>
-      <div class='page'><%%= yield %></div>
-    </div>
+  <%% body_classes ||= [] %>
+  <body class="<%%= body_classes.join(' ') %>">
+    <%%= yield %>
+
+    <%%= javascript_tag "<%= @engine %>" %>
+    <%%= yield :javascripts %>
   </body>
-  <%%= javascript_tag "<%= @engine %>" %>
-  <%%= yield :javascripts %>
 </html>

data/lib/spark_engine/version.rb

@@ -1,3 +1,3 @@
 module SparkEngine
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/spark_engine.rb

@@ -18,10 +18,6 @@ module SparkEngine
     ENV['CI'] || ENV['RAILS_ENV'] == 'production' || ( defined?(Command) && Command.production? )
   end
 
-  def rails5?
-   Gem::Version.new(Rails.version) >= Gem::Version.new('5') 
-  end
-
   def plugin
     @plugin
   end

data/spark_engine.gemspec

@@ -23,8 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'block_helpers', '~> 0.3'
   spec.add_runtime_dependency 'colorize', '~> 0.8'
   spec.add_runtime_dependency 'bundler', '~> 1.10'
-  spec.add_runtime_dependency 'autoprefixer-rails', '~> 9.0'
-  spec.add_runtime_dependency 'rails', '>= 4.2', '< 6'
+  spec.add_runtime_dependency 'rails', '>= 5.0', '< 6'
 
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'pry-byebug'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spark_engine
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-12 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -94,27 +94,13 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: autoprefixer-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '9.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
@@ -124,7 +110,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'