hydra-core 9.2.2 → 9.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4aca722b114a11eaa4b2b4fe147ec453d2469f44
-  data.tar.gz: 2d11b61aa6d38798534ad3488b1a69058ec7c1ad
+  metadata.gz: e23e594007d826f8bad840f355b3665e69f0f7e0
+  data.tar.gz: 6aadfdfd537b2dc78a82590bef7d1081bcfb8551
 SHA512:
-  metadata.gz: fba7e3ee86763650d52622912bcdd7df918c6e12585d833f91212128d9961889342734f5236d4f1af2e698874459f9a975a57079418f5406fdd228ff1bc29889
-  data.tar.gz: fca747e2ccb374155ea7a424a3e0e3eee0eb72e1e72d520164bdb3b2515d4390110517bc76c44c53f5880d38286940320367194913ec2f04e52d64ecadfc84de
+  metadata.gz: 249ab501d9712ea5e3a3b2bc4e7e8531651a1a7cbae89f3083996a505db3a4b47fed46bf7c4887c69c6f6a79c1ac6af81b35a61d6571a0a80c8e2c5afde6565a
+  data.tar.gz: e1fe9b5671e08dbf820c6b5f6aa20aa9da234d9dab3a53c850341fb6429b8df7fdc6f00a2d896eef72c6a9d8ab379b0f8032b900e78eb213e0eaf70443b50c06

data/app/controllers/concerns/hydra/controller/download_behavior.rb

@@ -6,7 +6,6 @@ module Hydra
 
       included do
         include Hydra::Controller::ControllerBehavior
-        include ActionController::Live
         before_filter :authorize_download!
       end
 
@@ -136,6 +135,9 @@ module Hydra
       def prepare_file_headers
         send_file_headers! content_options
         response.headers['Content-Type'] = file.mime_type
+        response.headers['Content-Length'] ||= file.size
+        # Prevent Rack::ETag from calculating a digest over body
+        response.headers['Last-Modified'] = asset.modified_date.utc.strftime("%a, %d %b %Y %T GMT")
         self.content_type = file.mime_type
       end
 

data/lib/hydra-head/version.rb

@@ -1,3 +1,3 @@
 module HydraHead
-  VERSION = "9.2.2"
+  VERSION = "9.3.0"
 end

data/spec/controllers/downloads_controller_spec.rb

@@ -138,8 +138,7 @@ describe DownloadsController do
         it "head request" do
           request.env["HTTP_RANGE"] = 'bytes=0-15'
           head :show, id: parent, file: 'webm'
-          # See https://github.com/rails/rails/issues/18714
-          # expect(response.headers['Content-Length']).to eq 16
+          expect(response.headers['Content-Length']).to eq 16
           expect(response.headers['Accept-Ranges']).to eq 'bytes'
           expect(response.headers['Content-Type']).to eq 'video/webm'
         end
@@ -148,8 +147,7 @@ describe DownloadsController do
           get :show, id: '1234', file: 'webm'
           expect(response.body).to eq 'one1two2threfour'
           expect(response.headers["Content-Range"]).to eq 'bytes 0-15/16'
-          # See https://github.com/rails/rails/issues/18714
-          # expect(response.headers["Content-Length"]).to eq '16'
+          expect(response.headers["Content-Length"]).to eq '16'
           expect(response.headers['Accept-Ranges']).to eq 'bytes'
           expect(response.headers['Content-Type']).to eq "video/webm"
           expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"MyVideo.webm\""
@@ -165,16 +163,14 @@ describe DownloadsController do
           get :show, id: '1234', file: 'webm'
           expect(response.body).to eq '1two2threfour'
           expect(response.headers["Content-Range"]).to eq 'bytes 3-15/16'
-          # See https://github.com/rails/rails/issues/18714
-          # expect(response.headers["Content-Length"]).to eq '13'
+          expect(response.headers["Content-Length"]).to eq '13'
         end
         it "should get a range not ending at the end" do
           request.env["HTTP_RANGE"] = 'bytes=4-11'
           get :show, id: '1234', file: 'webm'
           expect(response.body).to eq 'two2thre'
           expect(response.headers["Content-Range"]).to eq 'bytes 4-11/16'
-          # See https://github.com/rails/rails/issues/18714
-          # expect(response.headers["Content-Length"]).to eq '8'
+          expect(response.headers["Content-Length"]).to eq '8'
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 9.2.2
+  version: 9.3.0
 platform: ruby
 authors:
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.2.2
+        version: 9.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.2.2
+        version: 9.3.0
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Hydra-Head Rails Engine (requires Rails3)