cyborg 0.4.11 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef0c43dfae0fce8f9706fcc3135952f4c4c8e1c1
-  data.tar.gz: 1a39f101d0fe888ef661e84c04a7d84ac4175c4a
+  metadata.gz: 82bc5755ca9c2513786f46e4cc522771af004199
+  data.tar.gz: 60d535e47177d591f0dee474cba3b0b532468ab4
 SHA512:
-  metadata.gz: 3e03dc08260093192b81fb81dfae6df988f3ca8e92d38f17851df018783d02bdb1bebdd1ecf0362fe4c32c0434af26655152c45acc1f011d6cf27885b2a24e83
-  data.tar.gz: 97247809a96b58c7f47a6ed5a6526159012f052b21eb6ec35089caed48967b82a2183ae11538cfb7b9d924d9ac8194147f2a746f057a8aa326f8a53474d40b9e
+  metadata.gz: d18429cc529df9ae3551625f8d77aed1708acbf57429b091b74e2e32d272a59ad4b11559abedc89c95a95e5885c3e8f7ad62b3077150afa3259e6fd62234f3a9
+  data.tar.gz: b943de6964048a25deaa5bcd5adc3a702d8e8b0f3c1c1392ddfa19d288f1d0e09ce70da281a43c8b827870e30b4f34e01ce4542892d40bb00952ff86a67b4c5f

data/lib/cyborg/helpers/layout_helpers.rb

@@ -4,8 +4,9 @@ module Cyborg
       def render_layout(*args, &block)
         options = args.last.is_a?(Hash) ? args.pop : {}
         layout = args.first || 'default'
+        options[:template] = "layouts/#{layout}"
         yield if block_given?
-        render template: "layouts/#{layout}"
+        render options
       end
 
       def javascripts(&block)

data/lib/cyborg/middleware.rb

@@ -15,4 +15,31 @@ module Cyborg
       end
     end
   end
+  class StaticAssets
+    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
+
+      if req.get? || req.head?
+        path = req.path_info.chomp('/'.freeze)
+
+        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
+        end
+      end
+
+      @app.call(req.env)
+    end
+  end
 end

data/lib/cyborg/plugin.rb

@@ -34,8 +34,12 @@ module Cyborg
 
         engine_name Cyborg.plugin.name
 
+        require 'cyborg/middleware'
+
+        prefix = Rails.application.config.assets.prefix
+
         initializer "#{name}.static_assets" do |app|
-          app.middleware.insert_before(::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public")
+          app.middleware.insert_before ::ActionDispatch::Static, Cyborg::StaticAssets, "#{root}/public", engine_name: Cyborg.plugin.name
           app.middleware.insert_before ::ActionDispatch::Static, Rack::Deflater
         end
       end)
@@ -82,10 +86,19 @@ module Cyborg
       assets(options).map(&:watch)
     end
 
+    def asset_root
+      asset_prefix = Rails.application.config.assets.prefix || '/assets'
+      File.join asset_prefix, name
+    end
+
+    def production_asset_root
+      @production_asset_root || asset_root
+    end
+
     def config(options)
+
       options = {
-        production_asset_root: "/assets/#{name}",
-        asset_root:    "/assets/#{name}",
+        production_asset_root: nil,
         destination:   "public/",
         root:          @gem.full_gem_path,
         version:       @gem.version.to_s,
@@ -98,7 +111,7 @@ module Cyborg
       }.merge(options)
 
       options.each do |k,v|
-        set_instance(k.to_s,v) 
+        set_instance(k.to_s,v)
       end
     end
 
@@ -110,17 +123,19 @@ module Cyborg
     end
 
     def asset_path(file=nil)
-      dest = File.join(destination, asset_root)
+      dest = destination
       dest = File.join(dest, file) if file
       dest
     end
 
     def asset_url(file=nil)
-      path = if Cyborg.production? 
+
+      path = if Cyborg.production?
         production_asset_root
       else
         asset_root
       end
+
       path = File.join(path, file) if file
       path
     end
@@ -130,23 +145,18 @@ module Cyborg
     def asset_ext(klass)
       klass.name.split('::').last.downcase
     end
-    
+
     # Find files based on class type and
     # return an array of Classes for each file
     def add_files(klass)
       ext = asset_ext klass
-      find_files(ext).map do |path| 
+      find_files(ext).map do |path|
         klass.new(self, path)
       end
     end
 
-    def glob(asset_ext)
-
-    end
-
     # Find files by class type and extension
     def find_files(ext)
-
       files = Dir[File.join(paths[ext.to_sym], asset_glob(ext))]
 
       # Filter out partials
@@ -162,10 +172,10 @@ module Cyborg
       end
     end
 
-
     # Convert configuration into instance variables
     def set_instance(name, value)
       instance_variable_set("@#{name}", value)
+
       instance_eval(<<-EOS, __FILE__, __LINE__ + 1)
         def #{name}
           @#{name}

data/lib/cyborg/version.rb

@@ -1,3 +1,3 @@
 module Cyborg
-  VERSION = "0.4.11"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyborg
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.5.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass