cyborg 0.5.16 → 0.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cf18cb2dd99fd138db54e28a447704d391b196f
-  data.tar.gz: 14f0aeea0ad8d01517b5f0689943f068a95c23a7
+  metadata.gz: d776f9abceda0bd53460b5d13f99ce467a96d0a9
+  data.tar.gz: 9bdce401f1c32154bca9180ede6ff74942d7434f
 SHA512:
-  metadata.gz: 5204cb4ad3b6a0f5a93c74e8331e5599834fa6b15eb2697af63cf77231ba0c6221567867d2efc2ee9dfea2415c02999043e7d27e1d8d92bcbcabb53601b1a033
-  data.tar.gz: 93a24cdc1a039496b4f608037e97f1d7a4a89e8749fbee98630442f5854cc3cd2e03d6a98c6d6c4523d3664b19ac6821bd6a08d8bce2c1f5583f5e01a9bbd7cd
+  metadata.gz: eb850b40be39bc1e9bfce8a0bcf17672b0706e73fec5c4303cb9f4fc0b0c08c3d8c18c1760995d960e5246fbe0f43fb4abe7d1a34c218e48ed2362677f4288f1
+  data.tar.gz: 209b0b53027061bb74ff37bcfe2f96e850fbb44582710d8ef8c6bd5f9a0a4cb1bcadc044ed6e8050761c751081276f610e8d5eb510f59a287a14ea069c5a8082

data/lib/cyborg.rb

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

data/lib/cyborg/middleware.rb

@@ -1,4 +1,5 @@
 require 'rack/cors'
+require 'action_dispatch/middleware/static'
 
 module Cyborg
   class Application < Rails::Application
@@ -19,7 +20,7 @@ module Cyborg
   class StaticAssets
 
     # Rails 5 middleware patch
-    if Gem::Version.new(Rails.version) >= Gem::Version.new('5')
+    if Cyborg.rails5?
 
       def initialize(app, path, index: 'index', headers: {}, engine_name: nil)
         @app = app

data/lib/cyborg/plugin.rb

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

data/lib/cyborg/version.rb

@@ -1,3 +1,3 @@
 module Cyborg
-  VERSION = "0.5.16"
+  VERSION = "0.5.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyborg
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.5.17
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass