hydra-core 6.2.2 → 6.3.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4963c47486b3c304f959a1972e62421a54df354b
-  data.tar.gz: 43f419c9b0b0b22baf602a2fd35033edcf59cc14
+  metadata.gz: 72d25319b87e47b55a3cac1d7de077f8c17faebb
+  data.tar.gz: 9ac105348b61019ecf34bee28e26011ff1b199d6
 SHA512:
-  metadata.gz: 8073baf578a0f4b80cc3cbadd08eb6605a23d604532713f658ab0ec21e34ea8270ca384d3ed14ccda6c57ffb3024b70f699b24df03e9d59015e52b04eadf7c3f
-  data.tar.gz: 09e4730edc6b7bd91305aff333044f69d649e7033d4e3119f97aed360b340f1f0756a48b9d6f4ee072615e033a96859b4a32c867b403627a27f7cccffe1332a9
+  metadata.gz: f8451f542407c4d4921d066ff94cbb52f30fdf6f4081a475c6661be381b5a935cd2947560ecb94e3c9aa02c905e3496bca9eff40204de601481e3d707faf3b4a
+  data.tar.gz: 8ab22ba9ac7bb63f170689b03a7489ba03faef3b403828e8cf45d85a21106cf0c138a77d43cadb77be8c617c8ece4ccbbd02f7634b8c547ae6ced40b52228fbb

data/hydra-core.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9.3'
 
 
-  gem.add_dependency "rails", '~>3.2.3' 
+  gem.add_dependency "rails", '>= 3.2.3', '< 5' 
   gem.add_dependency "blacklight", '~> 4.0'  
   gem.add_dependency "active-fedora"
   gem.add_dependency 'block_helpers'

data/lib/hydra-core.rb

@@ -1,7 +1,7 @@
 require 'hydra'
 
 module HydraHead 
-  require 'hydra-head/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
+  require 'hydra-head/engine' if defined?(Rails)
   require 'hydra-head/routes'
   # If you put this in your application's routes.rb, it will add the Hydra Head routes to the app.
   # The hydra:head generator puts this in routes.rb for you by default.

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "6.2.2"
+  VERSION = "6.3.0.rc1"
 end
 

data/lib/hydra/controller/download_behavior.rb

@@ -63,7 +63,7 @@ module Hydra
 
         if request.head?
           content_head
-        elsif request.headers["Range"]
+        elsif request.headers['HTTP_RANGE']
           send_range
         else
           send_file_headers! content_options
@@ -93,7 +93,7 @@ module Hydra
 
       # render an HTTP Range response
       def send_range
-        _, range = request.headers["Range"].split('bytes=')
+        _, range = request.headers['HTTP_RANGE'].split('bytes=')
         from, to = range.split('-').map(&:to_i)
         to = datastream.dsSize - 1 unless to
         length = to - from + 1

data/spec/controllers/downloads_controller_spec.rb

@@ -90,14 +90,14 @@ describe DownloadsController do
           controller.stub(:log_download)
         end
         it "head request" do
-          request.env["Range"] = 'bytes=0-15'
+          request.env["HTTP_RANGE"] = 'bytes=0-15'
           head :show, id: 'changeme:test', datastream_id: 'webm'
           response.headers['Content-Length'].should == 16
           response.headers['Accept-Ranges'].should == 'bytes'
           response.headers['Content-Type'].should == 'video/webm'
         end
         it "should send the whole thing" do
-          request.env["Range"] = 'bytes=0-15'
+          request.env["HTTP_RANGE"] = 'bytes=0-15'
           get :show, id: 'changeme:test', datastream_id: 'webm'
           response.body.should == 'one1two2threfour'
           response.headers["Content-Range"].should == 'bytes 0-15/16'
@@ -113,14 +113,14 @@ describe DownloadsController do
           response.body.should == 'one1two2threfour'
         end
         it "should get a range not starting at the beginning" do
-          request.env["Range"] = 'bytes=3-15'
+          request.env["HTTP_RANGE"] = 'bytes=3-15'
           get :show, id: 'changeme:test', datastream_id: 'webm'
           response.body.should == '1two2threfour'
           response.headers["Content-Range"].should == 'bytes 3-15/16'
           response.headers["Content-Length"].should == '13'
         end
         it "should get a range not ending at the end" do
-          request.env["Range"] = 'bytes=4-11'
+          request.env["HTTP_RANGE"] = 'bytes=4-11'
           get :show, id: 'changeme:test', datastream_id: 'webm'
           response.body.should == 'two2thre'
           response.headers["Content-Range"].should == 'bytes 4-11/16'

data/tasks/rspec.rake

@@ -23,8 +23,10 @@ task :generate do
   unless File.exists?('spec/internal/Rakefile')
     puts "Generating rails app"
     `rails new spec/internal`
-    puts "Copying gemfile"
-    `cp spec/support/Gemfile spec/internal`
+    puts "Updating gemfile"
+    `echo " gem 'hydra-access-controls', :path=>'../../../hydra-access-controls'" >> spec/internal/Gemfile`
+    `echo " gem 'hydra-core', :path=>'../../', :require=>'hydra-core'" >> spec/internal/Gemfile`
+    `echo " gem 'factory_girl_rails'" >> spec/internal/Gemfile`
     puts "Copying generator"
     `cp -r spec/support/lib/generators spec/internal/lib`
     within_test_app do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 6.2.2
+  version: 6.3.0.rc1
 platform: ruby
 authors:
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield,
@@ -9,22 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.3
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.3
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -87,14 +93,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.2.2
+        version: 6.3.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.2.2
+        version: 6.3.0.rc1
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
@@ -238,7 +244,6 @@ files:
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/support/Gemfile
 - spec/support/app/controllers/downloads_controller.rb
 - spec/support/app/models/generic_content.rb
 - spec/support/app/models/sample.rb
@@ -269,9 +274,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
@@ -298,7 +303,6 @@ test_files:
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/support/Gemfile
 - spec/support/app/controllers/downloads_controller.rb
 - spec/support/app/models/generic_content.rb
 - spec/support/app/models/sample.rb

data/spec/support/Gemfile

@@ -1,12 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', '3.2.12'
-
-gem 'sqlite3'
-
-gem 'devise'
-gem 'blacklight'
-gem 'hydra-access-controls', :path=>'../../../hydra-access-controls'
-gem 'hydra-core', :path=>'../../', :require=>'hydra-core'
-gem 'rspec-rails'
-gem 'factory_girl_rails'