hydra-core 7.1.0 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e0bb910f8bac80a3f56529027de3c34800c305f
-  data.tar.gz: 904c77e5a596d35b9d54264961c9efa37551ba8d
+  metadata.gz: bf5e63d3cf136ab5bfa843a09fe510dab1438dcb
+  data.tar.gz: 3bc197f03b84e4fcdbddc42618bdd08cfc599bd4
 SHA512:
-  metadata.gz: 59e108e7eba0a4520acc4a396f33774b48b62e7dabd151ca364b0d29f8ce242001e2c92d65593a4101a05f05e9302b48dff3470ab57e1121dee5526ec6504ae9
-  data.tar.gz: 7c741d190154375d9a94bd2df9b5870903ad6fa41c873370ad07af872bfa5f3f7e4b95bba5252b0c0f05bfcf0c16428bf71cf7fb50c2cb8bdc52d5a9a727dc8f
+  metadata.gz: 957acdccc65ed9c295dceb76f58eb25741dbe01e5aabada562eebbb404bf56b4f8b4b1ff674ed26aaffa2a857762f546ea04f57ce929f1a817131a4ae970e747
+  data.tar.gz: 9e1843a9f197decec1bc0a5d9a4d72115bee014f04a5da3d77302779cb3eac8b83b4f7217090eb5c93d2f8181de89bbd04d184d65cf2e62a2f2b54e7ee2cf505

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

@@ -83,8 +83,7 @@ module Hydra
         elsif request.headers['HTTP_RANGE']
           send_range
         else
-          send_file_headers! content_options
-          self.response_body = datastream.stream
+          send_file_contents
         end
       end
 
@@ -117,10 +116,22 @@ module Hydra
         response.headers['Content-Range'] = "bytes #{from}-#{to}/#{datastream.dsSize}"
         response.headers['Content-Length'] = "#{length}"
         self.status = 206
-        send_file_headers! content_options
+        prepare_file_headers
         self.response_body = datastream.stream(from, length)
       end
+
+      def send_file_contents
+        self.status = 200
+        prepare_file_headers
+        self.response_body = datastream.stream
+      end
       
+      def prepare_file_headers
+        send_file_headers! content_options
+        response.headers['Content-Type'] = datastream.mimeType
+        self.content_type = datastream.mimeType
+      end
+
       private 
       
       def default_content_ds

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "7.1.0"
+  VERSION = "7.2.0"
 end
 

data/spec/support/lib/generators/test_app_generator.rb

@@ -30,4 +30,8 @@ class TestAppGenerator < Rails::Generators::Base
 
     generate 'hydra:head', '-f --skip-rspec'
   end
+
+  def remove_generated_user_spec
+    remove_file 'spec/models/user_spec.rb'
+  end
 end

data/spec/test_app_templates/Gemfile.extra

@@ -1,6 +1,8 @@
 group :develop do
   gem 'active-fedora', github: "projecthydra/active_fedora"
 end
-gem 'rspec-rails', '~> 2.99', group: :test
+# Temporary fix for https://github.com/twbs/bootstrap-sass/issues/647 on Rails 3
+gem 'bootstrap-sass', github: 'twbs/bootstrap-sass', ref: '540ad23'
+gem 'rspec-rails', '~> 3.0', group: :test
 gem 'rspec-its'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.2.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: 2014-06-23 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -51,14 +51,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement