cyborg 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82bc5755ca9c2513786f46e4cc522771af004199
-  data.tar.gz: 60d535e47177d591f0dee474cba3b0b532468ab4
+  metadata.gz: d4391a22814aa388e782af12c327f4497715fbe0
+  data.tar.gz: 7ae0410c27217feaffd69f5a96b1ec57f9e43b77
 SHA512:
-  metadata.gz: d18429cc529df9ae3551625f8d77aed1708acbf57429b091b74e2e32d272a59ad4b11559abedc89c95a95e5885c3e8f7ad62b3077150afa3259e6fd62234f3a9
-  data.tar.gz: b943de6964048a25deaa5bcd5adc3a702d8e8b0f3c1c1392ddfa19d288f1d0e09ce70da281a43c8b827870e30b4f34e01ce4542892d40bb00952ff86a67b4c5f
+  metadata.gz: ccf962bb6092dc6a91b4012980d8364808bbcddba1765ac504396f45f7c3f11b32246c208cda8d93916078dbb01e0d1ab97b557598c89a65c3f96b1f988d3e19
+  data.tar.gz: cf11a83001d91ef53e665e48c886fbde62f44931c07ab575509394543add2490099c651499377286755be0de4902e93765e7ed7a76dc9ea635b86e695f22d272

data/lib/cyborg/middleware.rb

@@ -15,31 +15,67 @@ 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
+    # Rails 5 middleware patch
+    if Gem::Version.new(Rails.version) >= Gem::Version.new('5')
+
+      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 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)
+            if match = @file_handler.match?(path)
+              req.path_info = match
+              return @file_handler.serve(req)
+            end
           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
 
-      @app.call(req.env)
+      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
     end
   end
+
 end

data/lib/cyborg/version.rb

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

metadata

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