hydra-core 8.0.0.beta1 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd0d6e692c5ae2bc1ab52d423137ca399d9b2d12
-  data.tar.gz: 88244842dba506ab0e6743b4dacd6309874cc3c1
+  metadata.gz: ba7e8c28c9a948c53ca47121118a2c4948c52827
+  data.tar.gz: db44e15d1c9635905cb3b528ce3925f5e853b597
 SHA512:
-  metadata.gz: fa1fad88dc614fb8fb1772635f395f90c5aa13b6f087c10d431296f955aaef4a16c30f16ad0e5f019116bbcad8067947de330512b093d39e63f05b64b5ab0ce6
-  data.tar.gz: 6e668815b37ade5c99968a826a1c5e34f03748341632b5e60cd2cbf6137d43962aaacf272bf827dbd09f920419dab0da0184b502cd38f9ddbe72b3fde6c43ecb
+  metadata.gz: 7e52e69c0e0301648d27a6d21982575fac30ddcc45768bbd2a09bff23350bfdbf96f922af063020675ceaa67730afc072cec4ef91df95cfa70bda09d7f64f166
+  data.tar.gz: ff9c9d7cbd6a2a10c4dca45c351e32e38abe093a4b3553bafa587c01112e218e6019b4e28e04233794f616e547e19fab2d121a549e3816d8667b88cee220b8b7

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

@@ -2,7 +2,6 @@ module Hydra
   module Controller
     module DownloadBehavior
       extend ActiveSupport::Concern
-      extend Deprecation
 
       included do
         include Hydra::Controller::ControllerBehavior
@@ -45,10 +44,6 @@ module Hydra
 
       # Customize the :download ability in your Ability class, or override this method
       def authorize_download!
-        if self.respond_to?(:can_download?)
-          Deprecation.warn(DownloadBehavior, "The `can_download?' method is deprecated and will not be supported in hydra-head 8.0.  Implement special authorization behavior by customizing the :download permission on ActiveFedora::Datastream in your Ability class.", caller)
-          current_ability.send(can_download? ? :can : :cannot, :download, ActiveFedora::Datastream, dsid: datastream.dsid, pid: datastream.pid)
-        end
         authorize! :download, datastream
       end
 
@@ -73,9 +68,7 @@ module Hydra
       end
       
       # Handle the HTTP show request
-      def send_content(asset_ = nil)
-        Deprecation.warn(DownloadBehavior, "The `asset' parameter of the `send_content' method is deprecated and will be removed from Hydra::Controller::DownloadBehavior in hydra-head 8.0", caller) if asset_
-
+      def send_content
         response.headers['Accept-Ranges'] = 'bytes'
 
         if request.head?

data/hydra-core.gemspec

@@ -20,10 +20,10 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9.3'
 
 
-  gem.add_dependency "rails", '>= 3.2.3', '< 5' 
+  gem.add_dependency "rails", '~> 4.0'
   gem.add_dependency 'block_helpers'
   gem.add_dependency 'hydra-access-controls', version
-  gem.add_dependency 'jettywrapper', ">=1.4.1"
+  gem.add_dependency 'jettywrapper', "~> 1.5"
   
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'yard'

data/lib/hydra-core.rb

@@ -2,10 +2,6 @@ require 'hydra-access-controls'
 require 'deprecation'
 
 module HydraHead 
-  extend Deprecation
   require 'hydra-head/engine' if defined?(Rails)
-  def self.add_routes(router, options = {})
-    Deprecation.warn HydraHead, "add_routes has been removed." # remove this warning in hydra-head 8
-  end
 end
 

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "8.0.0.beta1"
+  VERSION = "8.0.0"
 end
 

data/spec/controllers/downloads_controller_spec.rb

@@ -186,33 +186,5 @@ describe DownloadsController do
       end
     end
 
-    describe "overriding the can_download? method" do
-      before { sign_in @user }
-      context "current_ability.can? returns true / can_download? returns false" do
-        it "should authorize according to can_download?" do
-          expect(controller.current_ability.can?(:download, @obj.datastreams['buzz'])).to be true
-          allow(controller).to receive(:can_download?).and_return(false)
-          Deprecation.silence(Hydra::Controller::DownloadBehavior) do
-            get :show, id: @obj, datastream_id: 'buzz'
-          end
-          expect(response).to redirect_to root_url
-        end
-      end
-      context "current_ability.can? returns false / can_download? returns true" do
-        before do
-          @obj.rightsMetadata.clear_permissions!
-          @obj.save
-        end
-        it "should authorize according to can_download?" do
-          expect(controller.current_ability.can?(:download, @obj.datastreams['buzz'])).to be false
-          allow(controller).to receive(:can_download?).and_return(true)
-          Deprecation.silence(Hydra::Controller::DownloadBehavior) do
-            get :show, id: @obj, datastream_id: 'buzz'
-          end
-          expect(response).to be_successful
-        end
-      end
-    end
-
   end
 end

data/spec/test_app_templates/Gemfile.extra

@@ -1,7 +1,3 @@
-group :develop do
-  # gem 'active-fedora', github: "projecthydra/active_fedora"
-  gem 'active-fedora', '8.0.0.rc2'
-end
 gem 'rspec-rails', '~> 3.1', group: :test
 gem 'rspec-its'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 8.0.0.beta1
+  version: 8.0.0
 platform: ruby
 authors:
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield,
@@ -9,28 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2015-02-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'
+        version: '4.0'
   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'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: block_helpers
   requirement: !ruby/object:Gem::Requirement
@@ -51,28 +45,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.0.beta1
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.0.beta1
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -212,9 +206,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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2