hydra-core 6.1.1 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0bab92197a631330fa21a7a548ce74eac3b6c1b
-  data.tar.gz: e93594e35f3912e8bb315c896a2d1b9bfeeca262
+  metadata.gz: 6823b327eeb35861172d4fe2f92b00519d103d0b
+  data.tar.gz: 32142650a0e2b2117501ddaa661c365af11c76b8
 SHA512:
-  metadata.gz: 6acbd061cda6f61cac8be5a275936e92e169d4f07e3491a475116cf5dd829b08be8b7150f1e37316c4a523910637734f26632755935b9ef0290ef5d55b3ad807
-  data.tar.gz: 009fdf265cf9e97ea3bc8e7ef900bc1c705eea7f2cb0826cdf31769c76200e98e4f3a378783f660d2af95a0f0f274ddb5ab7e1ffdce721f6b64e9020934d30fa
+  metadata.gz: 4badc4b07b639c500d8176c2c0e79bf2dbd840330c3122767636d8290c7d5c29a322cc2332d1c9e5f53f46b87ac4996405e9cdc689d5e19f4d1924f84cd92fd8
+  data.tar.gz: 20ec96f1b7fc208e67cb5dfafd793b2faca66f383fcf1854f15594855ad9e0a5f587111598d8b78e4fd8ddb36196b17ad82c4d374fc404f464bb9237809f5397

data/lib/generators/hydra/head_generator.rb

@@ -45,7 +45,6 @@ class HeadGenerator < Rails::Generators::Base
    
     # Fedora & Solr YAML files
     invoke('active_fedora:config')
-    copy_file "config/jetty.yml", "config/jetty.yml"
   end
   
   # Add Hydra behaviors to the user model

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "6.1.1"
+  VERSION = "6.2.0"
 end
 

data/lib/hydra/controller/download_behavior.rb

@@ -62,9 +62,9 @@ module Hydra
         response.headers['Accept-Ranges'] = 'bytes'
 
         if request.head?
-          content_head(datastream)
+          content_head
         elsif request.headers["Range"]
-          send_range(datastream)
+          send_range
         else
           send_file_headers! content_options
           self.response_body = datastream.stream

data/spec/controllers/downloads_controller_spec.rb

@@ -72,6 +72,61 @@ describe DownloadsController do
           response.body.should == 'foobarfoobarfoobar'
         end
       end
+      describe "stream" do
+        before do
+          stub_response = stub()
+          stub_response.stub(:read_body).and_yield("one1").and_yield('two2').and_yield('thre').and_yield('four')
+          stub_repo = stub()
+          stub_repo.stub(:datastream_dissemination).and_yield(stub_response)
+          stub_ds = ActiveFedora::Datastream.new
+          stub_ds.stub(:repository).and_return(stub_repo)
+          stub_ds.stub(:mimeType).and_return('video/webm')
+          stub_ds.stub(:dsSize).and_return(16)
+          stub_ds.stub(:dsid).and_return('webm')
+          stub_ds.stub(:pid).and_return('changeme:test')
+          stub_file = stub('stub object', datastreams: {'webm' => stub_ds}, pid:'changeme:test', label: "MyVideo.webm")
+          ActiveFedora::Base.should_receive(:load_instance_from_solr).with('changeme:test').and_return(stub_file)
+          controller.stub(:can?).with(:read, 'changeme:test').and_return(true)
+          controller.stub(:log_download)
+        end
+        it "head request" do
+          request.env["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'
+          get :show, id: 'changeme:test', datastream_id: 'webm'
+          response.body.should == 'one1two2threfour'
+          response.headers["Content-Range"].should == 'bytes 0-15/16'
+          response.headers["Content-Length"].should == '16'
+          response.headers['Accept-Ranges'].should == 'bytes'
+          response.headers['Content-Type'].should == "video/webm"
+          response.headers["Content-Disposition"].should == "inline; filename=\"MyVideo.webm\""
+          response.status.should == 206
+        end
+        it "should send the whole thing when the range is open ended" do
+          request.env["Range"] = 'bytes=0-'
+          get :show, id: 'changeme:test', datastream_id: 'webm'
+          response.body.should == 'one1two2threfour'
+        end
+        it "should get a range not starting at the beginning" do
+          request.env["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'
+          get :show, id: 'changeme:test', datastream_id: 'webm'
+          response.body.should == 'two2thre'
+          response.headers["Content-Range"].should == 'bytes 4-11/16'
+          response.headers["Content-Length"].should == '8'
+        end
+      end
     end
 
     describe "when not logged in as reader" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.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: 2013-05-09 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.1
+        version: 6.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.1
+        version: 6.2.0
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
@@ -195,7 +195,6 @@ files:
 - lib/generators/hydra/templates/config/fedora.yml
 - lib/generators/hydra/templates/config/initializers/action_dispatch_http_upload_monkey_patch.rb
 - lib/generators/hydra/templates/config/initializers/hydra_config.rb
-- lib/generators/hydra/templates/config/jetty.yml
 - lib/generators/hydra/templates/config/role_map_cucumber.yml
 - lib/generators/hydra/templates/config/role_map_development.yml
 - lib/generators/hydra/templates/config/role_map_production.yml

data/lib/generators/hydra/templates/config/jetty.yml

@@ -1,5 +0,0 @@
-default:
-  jetty_port: 8983
-  java_opts:
-    - "-XX:MaxPermSize=128m" 
-    - "-Xmx256m"