hydra-core 9.10.0 → 10.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e7a09ee2cc35ca27116e0036a393f4926302802
-  data.tar.gz: 5922a2cb6604399db64ab354164b73881af55f9e
+  metadata.gz: b7909e0bdec3dbba0591ceb4204e1ca6afaffb50
+  data.tar.gz: 18593bc5376cf62b90f4e0ed5da2b7ce12f4138e
 SHA512:
-  metadata.gz: 6392ef2d4d05964fcf1f07a1f4e447a37958c7b5f01701e8530a094b69021f2ac198e34d2d2a54595f7ef2a68633437410c5b32f368fc3ff3d81a5459be8e9d9
-  data.tar.gz: 61c0009af27eb9bcf16ae8e7805876e0c43bb73d6e8b841aefc3ca9c043f1a939f3ff66a902eb64ae635528229eb0d55f9127bb1dc94838d88aba865b14fc5ad
+  metadata.gz: d75dcabf8cc6510523dcab0a7a7dc51224716d0ce9da12fa147c2eaefba0a339fdf2307d2131330b427fa6d816f08481b5c9590c554e4bf049c2850aab64d36d
+  data.tar.gz: 379c8cc1b8ec7e1db064e50b65d3ce881ed8f5c976022c1be50d50e41d6085654e9477392a9fc7675d6cfad67e0b627b5660c4c67c85edee1d41fbceca8aa312

data/Rakefile

@@ -1,5 +1,10 @@
 require 'rake/testtask'
 require 'bundler'
+require 'rspec/core/rake_task'
 Bundler::GemHelper.install_tasks
 
 Dir.glob('tasks/*.rake').each { |r| import r }
+desc "Run specs"
+RSpec::Core::RakeTask.new 
+
+task :default => :spec

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
@@ -42,11 +41,6 @@ module Hydra
         @asset ||= ActiveFedora::Base.find(params[asset_param_key])
       end
 
-      def datastream
-        Deprecation.warn(DownloadBehavior, "datastream is deprecated and will be removed in hydra-head 10.0. Use `file` instead.")
-        file
-      end
-
       def file
         @file ||= load_file
       end
@@ -58,21 +52,12 @@ module Hydra
       # @return [ActiveFedora::File] the file
       def load_file
         file_path = params[:file]
-        if !file_path && params[:datastream_id]
-          Deprecation.warn(DownloadBehavior, "Parameter `datastream_id` is deprecated and will be removed in hydra-head 10.0. Use `file` instead.")
-          file_path = params[:datastream_id]
-        end
         f = asset.attached_files[file_path] if file_path
         f ||= default_file
         raise "Unable to find a file for #{asset}" if f.nil?
         f
       end
 
-      def datastream_to_show
-        Deprecation.warn(DownloadBehavior, "datastream_to_show is deprecated and will be removed in hydra-head 10.0")
-        load_file
-      end
-
       # Handle the HTTP show request
       def send_content
 
@@ -92,13 +77,6 @@ module Hydra
         { disposition: 'inline', type: file.mime_type, filename: file_name }
       end
 
-      # Override this if you'd like a different filename
-      # @return [String] the filename
-      def datastream_name
-        Deprecation.warn(DownloadBehavior, "datastream_name is deprecated and will be removed in hydra-head 10.0, use file_name instead")
-        file_name
-      end
-
       # Override this if you'd like a different filename
       # @return [String] the filename
       def file_name
@@ -151,31 +129,15 @@ module Hydra
         response.stream.close
       end
 
-      def default_content_ds
-        Deprecation.warn(DownloadBehavior, "default_content_ds is deprecated and will be removed in hydra-head 10.0, use default_file instead")
-        default_file
-      end
-
       def default_file
         if asset.class.respond_to?(:default_file_path)
           asset.attached_files[asset.class.default_file_path]
-        elsif asset.class.respond_to?(:default_content_ds)
-          Deprecation.warn(DownloadBehavior, "default_content_ds is deprecated and will be removed in hydra-head 10.0, use default_file_path instead")
-          asset.attached_files[asset.class.default_content_ds]
         elsif asset.attached_files.key?(DownloadsController.default_file_path)
           asset.attached_files[DownloadsController.default_file_path]
-        elsif asset.attached_files.key?(DownloadsController.default_content_dsid)
-          Deprecation.warn(DownloadBehavior, "DownloadsController.default_content_dsid is deprecated and will be removed in hydra-head 10.0, use default_file_path instead")
-          asset.attached_files[DownloadsController.default_content_dsid]
         end
       end
 
       module ClassMethods
-        def default_content_dsid
-          Deprecation.warn(DownloadBehavior, "default_content_dsid is deprecated and will be removed in hydra-head 10.0, use default_file_path instead")
-          default_file_path
-        end
-
         def default_file_path
           "content"
         end

data/lib/hydra-core.rb

@@ -1,11 +1,7 @@
 require 'hydra-access-controls'
 require 'deprecation'
 
-module HydraHead 
-  extend Deprecation
+module HydraHead
   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,3 +1,3 @@
 module HydraHead
-  VERSION = "9.10.0"
+  VERSION = "10.0.0.beta1"
 end

data/spec/.gitignore

@@ -1 +0,0 @@
-internal

data/spec/controllers/downloads_controller_spec.rb

@@ -19,7 +19,7 @@ describe DownloadsController do
     before do
       class ContentHolder < ActiveFedora::Base
         include Hydra::AccessControls::Permissions
-        contains 'thumbnail'
+        has_subresource 'thumbnail'
       end
       @user = User.new.tap {|u| u.email = 'email@example.com'; u.password = 'password'; u.save}
     end
@@ -68,18 +68,9 @@ describe DownloadsController do
         sign_in @user
         allow_any_instance_of(User).to receive(:groups).and_return([])
       end
-      describe "#show" do
-        it "should default to returning default download configured by object" do
-          allow(ContentHolder).to receive(:default_content_ds).and_return('buzz')
-          expect(Deprecation).to receive(:warn)
-          get :show, id: obj
-          expect(response).to be_successful
-          expect(response.headers['Content-Type']).to eq "image/png"
-          expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"buzz.png\""
-          expect(response.body).to eq 'fizz'
-        end
 
-        it "should default to returning default download configured by object" do
+      describe "#show" do
+        it "defaults to returning default download configured by object" do
           allow(ContentHolder).to receive(:default_file_path).and_return('buzz')
           get :show, id: obj
           expect(response).to be_successful
@@ -88,7 +79,7 @@ describe DownloadsController do
           expect(response.body).to eq 'fizz'
         end
 
-        it "should default to returning default download configured by controller" do
+        it "defaults to returning default download configured by controller" do
           expect(DownloadsController.default_file_path).to eq "content"
           get :show, id: obj
           expect(response).to be_successful

data/spec/search_builders/search_builder_spec.rb

@@ -8,14 +8,12 @@ describe SearchBuilder do
   let(:search_builder) { described_class }
 
   subject do
-    Deprecation.silence(Hydra::SearchBuilder) do
-      search_builder.new(processor_chain, context)
-    end
+    search_builder.new(processor_chain, context)
   end
   before { subject.current_ability = current_ability }
 
   it "extends classes with the necessary Hydra modules" do
-    expect(Hydra::SearchBuilder.included_modules).to include(Hydra::AccessControlsEnforcement)
+    expect(described_class.included_modules).to include(Hydra::AccessControlsEnforcement)
   end
 
   context "when a query is generated" do
@@ -24,19 +22,4 @@ describe SearchBuilder do
       subject.query
     end
   end
-
-  context "the deprecated Hydra::SearchBuilder" do
-    let(:search_builder) { Hydra::SearchBuilder }
-
-    it "extends classes with the necessary Hydra modules" do
-      expect(Hydra::SearchBuilder.included_modules).to include(Hydra::AccessControlsEnforcement)
-    end
-
-    context "when a query is generated" do
-      it "triggers add_access_controls_to_solr_params" do
-        expect(subject).to receive(:add_access_controls_to_solr_params)
-        subject.query
-      end
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,9 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
 ENV["RAILS_ENV"] ||= "test"
 
-require File.expand_path("config/environment", ENV['RAILS_ROOT'] || File.expand_path("../internal", __FILE__))
+require 'engine_cart'
+path = File.expand_path(File.join('..', '..', '..', '.internal_test_app'), __FILE__)
+EngineCart.load_application! path
+
 require 'bundler/setup'
 require 'rspec/rails'
 require 'hydra-core'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 9.10.0
+  version: 10.0.0.beta1
 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: 2016-04-19 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.10.0
+        version: 10.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.10.0
+        version: 10.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -111,19 +111,15 @@ files:
 - app/controllers/concerns/hydra/controller/controller_behavior.rb
 - app/controllers/concerns/hydra/controller/download_behavior.rb
 - app/controllers/concerns/hydra/controller/ip_based_ability.rb
-- app/controllers/concerns/hydra/controller/search_builder.rb
 - app/helpers/blacklight_helper.rb
 - app/helpers/hydra/blacklight_helper_behavior.rb
 - app/models/concerns/hydra/content_negotiation.rb
-- app/models/concerns/hydra/model_methods.rb
 - app/models/concerns/hydra/models.rb
 - app/models/concerns/hydra/solr.rb
 - app/models/hydra/content_negotiation/clean_graph_repository.rb
 - app/models/hydra/content_negotiation/fedora_uri_replacer.rb
 - app/models/hydra/content_negotiation/graph_finder.rb
 - app/models/hydra/content_negotiation/replacing_graph_finder.rb
-- app/models/hydra/datastream/properties.rb
-- app/search_builders/hydra/search_builder.rb
 - config/locales/hydra.en.yml
 - hydra-core.gemspec
 - lib/application_helper.rb
@@ -136,9 +132,7 @@ files:
 - lib/hydra-core.rb
 - lib/hydra-head/engine.rb
 - lib/hydra-head/version.rb
-- lib/mods_asset.rb
 - lib/railties/active-fedora.rake
-- lib/railties/hydra_jetty.rake
 - lib/tasks/hydra.rake
 - spec/.gitignore
 - spec/controllers/catalog_controller_spec.rb
@@ -146,25 +140,20 @@ files:
 - spec/controllers/ip_based_ability_spec.rb
 - spec/factories.rb
 - spec/helpers/blacklight_helper_spec.rb
-- spec/lib/model_methods_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/models/user_spec.rb
 - spec/rcov.opts
 - spec/search_builders/search_builder_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/support/app/controllers/downloads_controller.rb
 - spec/support/app/models/sample.rb
 - spec/support/app/models/solr_document.rb
 - spec/support/db/migrate/20111101221803_create_searches.rb
-- spec/support/lib/generators/test_app_generator.rb
-- spec/support/lib/tasks/rspec.rake
 - spec/support/matchers/helper_matcher.rb
 - spec/support/matchers/solr_matchers.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/unit/hydra-head-engine_spec.rb
 - spec/unit/hydra-head_spec.rb
-- tasks/rspec.rake
 homepage: http://projecthydra.org
 licenses:
 - APACHE2
@@ -180,12 +169,12 @@ 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.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Hydra-Head Rails Engine (requires Rails3)
@@ -196,19 +185,15 @@ test_files:
 - spec/controllers/ip_based_ability_spec.rb
 - spec/factories.rb
 - spec/helpers/blacklight_helper_spec.rb
-- spec/lib/model_methods_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/models/user_spec.rb
 - spec/rcov.opts
 - spec/search_builders/search_builder_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/support/app/controllers/downloads_controller.rb
 - spec/support/app/models/sample.rb
 - spec/support/app/models/solr_document.rb
 - spec/support/db/migrate/20111101221803_create_searches.rb
-- spec/support/lib/generators/test_app_generator.rb
-- spec/support/lib/tasks/rspec.rake
 - spec/support/matchers/helper_matcher.rb
 - spec/support/matchers/solr_matchers.rb
 - spec/test_app_templates/Gemfile.extra

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

@@ -1,8 +0,0 @@
-module Hydra::Controller::SearchBuilder
-  extend ActiveSupport::Concern
-
-  included do
-    Deprecation.warn Hydra::Controller::SearchBuilder, "Hydra::Controller::SearchBuilder no longer does anything.  It will be removed in Hydra version 10.  The code that used to be in this module was moved to Blacklight::AccessControls::Catalog in the blacklight-access_controls gem."
-  end
-
-end

data/app/models/concerns/hydra/model_methods.rb

@@ -1,66 +0,0 @@
-require 'mime/types'
-
-module Hydra::ModelMethods
-  extend ActiveSupport::Concern
-
-  included do
-    Deprecation.warn self, "Hydra::ModelMethods is deprecated and will be remove in hydra-head 10.0.0", caller(3)
-    include Hydra::WithDepositor
-  end
-
-  # Puts the contents of file (posted blob) into a datastream and sets the title and label
-  # Sets asset label and title to filename if they're empty
-  #
-  # @param [#read] file the IO object that is the blob
-  # @param [String] file the IO object that is the blob
-  def add_file(file, path, file_name, mime_type=nil)
-    mime_type ||= best_mime_for_filename(file_name)
-    options = { mime_type: mime_type, original_name: file_name }
-    options[:path] = path if path
-    super(file, options)
-    set_title_and_label(file_name, only_if_blank: true)
-  end
-
-  def best_mime_for_filename(file_name)
-    mime_types = MIME::Types.of(file_name)
-    mime_types.empty? ? "application/octet-stream" : mime_types.first.content_type
-  end
-
-
-  # Set the title and label on the current object
-  #
-  # @param [String] new_title
-  # @param [Hash] opts (optional) hash of configuration options
-  #
-  # @example Use :only_if_blank option to only update the values when the label is empty
-  #   obj.set_title_and_label("My Title", :only_if_blank=> true)
-  def set_title_and_label(new_title, opts={})
-    if opts[:only_if_blank]
-      if respond_to?(:label) && label.blank?
-        self.label = new_title
-        set_title new_title
-      end
-    else
-      self.label = new_title if respond_to? :label
-      set_title new_title
-    end
-  end
-
-  # Set the title and label on the current object
-  #
-  # @param [String] new_title
-  # @param [Hash] opts (optional) hash of configuration options
-  def set_title(new_title, opts={})
-    if respond_to? :title=
-      self.title = self.class.multiple?(:title) ? Array(new_title) : new_title
-    elsif attached_files.has_key?("descMetadata")
-      Deprecation.warn ModelMethods, 'setting title in descMetadata is deprecated and will be remove in hydra-head 10.0. If you need this behavior declare `has_attribute :title`'
-      if descMetadata.respond_to?(:title_values)
-        descMetadata.title_values = new_title
-      else
-        descMetadata.title = new_title
-      end
-    end
-  end
-
-end

data/app/models/hydra/datastream/properties.rb

@@ -1,31 +0,0 @@
-# properties datastream: catch-all for info that didn't have another home.  Particularly depositor.
-module Hydra::Datastream
-  class Properties < ActiveFedora::OmDatastream
-    extend Deprecation
-
-    def initialize(*)
-      super
-      Deprecation.warn(Properties, "Hydra::Datastream::Properties is deprecated and will be removed in hydra-head 10.0")
-    end
-
-    set_terminology do |t|
-      t.root(:path=>"fields", :xmlns => '', :namespace_prefix => nil) 
-
-      # This is where we put the user id of the object depositor -- impacts permissions/access controls
-      t.depositor :xmlns => '', :namespace_prefix => nil
-
-      # @deprecated  Collection should be tracked in RELS-EXT RDF.  collection term will be removed no later than release 6.x
-      t.collection :xmlns => '', :namespace_prefix => nil
-      # @deprecated  Title should be tracked in descMetadata.  title term will be removed no later than release 6.x
-      t.title :xmlns => '', :namespace_prefix => nil
-    end
-
-    def self.xml_template
-      builder = Nokogiri::XML::Builder.new do |xml|
-        xml.fields
-      end
-
-      builder.doc
-    end
-  end
-end

data/app/search_builders/hydra/search_builder.rb

@@ -1,12 +0,0 @@
-module Hydra
-  class SearchBuilder < Blacklight::SearchBuilder
-    include Blacklight::Solr::SearchBuilderBehavior
-    include Hydra::AccessControlsEnforcement
-    extend Deprecation
-
-    def initialize(*)
-      Deprecation.warn SearchBuilder, "Hydra::SearchBuilder is deprecated and will be removed in hydra-head 10.0. Instead add include Hydra::AccessControlsEnforcement to app/models/search_builder.rb"
-      super
-    end
-  end
-end

data/lib/mods_asset.rb

@@ -1,15 +0,0 @@
-# An EXAMPLE   Basic Model for Assets that conform to Hydra commonMetadata cModel and have basic MODS metadata (currently "Article" is the MODS exemplar)
-class ModsAsset < ActiveFedora::Base
-  extend Deprecation
-
-  def initialize(*)
-    Deprecation.warn(ModsAsset, "ModsAsset is deprecated and will be removed in hydra-head 10")
-    super
-  end
-
-  ## Convenience methods for manipulating the rights metadata datastream
-  include Hydra::AccessControls::Permissions
-
-  # adds helpful methods for basic hydra objects
-  include Hydra::ModelMethods
-end

data/lib/railties/hydra_jetty.rake

@@ -1,26 +0,0 @@
-namespace :jetty do
-  desc "Apply all configs to Testing Server (relies on hydra:jetty:config tasks unless you override it)"
-  task :config do
-    Rake::Task["hydra:jetty:config"].invoke
-  end
-end
-
-namespace :hydra do
-  namespace :jetty do
-    desc "Copies the default Solr config into the bundled Hydra Testing Server"
-    task :config do
-      Rake::Task["hydra:jetty:config_solr"].invoke
-    end
-
-    desc "Copies the contents of solr_conf into the Solr development-core and test-core of Testing Server"
-    task :config_solr do
-      FileList['solr_conf/conf/*'].each do |f|
-        cp("#{f}", 'jetty/solr/development-core/conf/', :verbose => true)
-        cp("#{f}", 'jetty/solr/test-core/conf/', :verbose => true)
-      end
-    end
-
-    desc "Copies the default SOLR config files and starts up the fedora instance."
-    task :load => [:config, 'jetty:start']
-  end
-end

data/spec/lib/model_methods_spec.rb

@@ -1,78 +0,0 @@
-require 'spec_helper'
-
-describe Hydra::ModelMethods do
-
-  before do
-    allow(Deprecation).to receive(:warn)
-    class TestModel < ActiveFedora::Base
-      include Hydra::AccessControls::Permissions
-      include Hydra::ModelMethods
-      property :depositor, predicate: ::RDF::URI.new("http://id.loc.gov/vocabulary/relators/dpt"), multiple: false
-      attr_accessor :label
-    end
-  end
-
-  after { Object.send(:remove_const, :TestModel) }
-
-  subject { TestModel.new }
-
-  describe 'add_file' do
-    let(:file_name) { "my_file.foo" }
-    let(:mock_file) { "File contents" }
-
-    it "should set the dsid, mimetype and content" do
-      expect(subject).to receive(:set_title_and_label).with(file_name, only_if_blank: true )
-      expect(MIME::Types).to receive(:of).with(file_name).and_return([double(content_type: "mymimetype")])
-      subject.add_file(mock_file, 'bar', file_name)
-      expect(subject.bar.content).to eq mock_file
-    end
-
-    it "should accept a supplied mime_type and content" do
-      expect(subject).to receive(:set_title_and_label).with(file_name, only_if_blank: true )
-      subject.add_file(mock_file, 'bar', file_name, 'image/png')
-      expect(subject.bar.content).to eq mock_file
-    end
-  end
-
-  describe '#set_title_and_label' do
-    context 'when only_if_blank is true' do
-      before do
-        subject.label = initial_label
-        subject.set_title_and_label('second', only_if_blank: true)
-      end
-
-      context 'and label is already set' do
-        let(:initial_label) { 'first' }
-        it "should not update the label" do
-          expect(subject.label).to eq 'first'
-        end
-      end
-
-      context 'and label is not already set' do
-        let(:initial_label) { nil }
-        it "should not update the label" do
-          expect(subject.label).to eq 'second'
-        end
-      end
-    end
-  end
-
-  describe '#set_title' do
-    context "on a class with a title property" do
-      before do
-        expect(Deprecation).to receive(:warn)
-        class WithProperty < ActiveFedora::Base
-          include Hydra::ModelMethods
-          property :title, predicate: ::RDF::DC.title
-        end
-      end
-
-      subject { WithProperty.new }
-
-      it "should set the property" do
-        subject.set_title('foo')
-        expect(subject.title).to eq ['foo']
-      end
-    end
-  end
-end

data/spec/support/app/controllers/downloads_controller.rb

@@ -1,3 +0,0 @@
-class DownloadsController < ApplicationController
-  include Hydra::Controller::DownloadBehavior
-end

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

@@ -1,30 +0,0 @@
-require 'rails/generators'
-
-class TestAppGenerator < Rails::Generators::Base
-  source_root File.expand_path("../../../../support", __FILE__)
-
-  def copy_test_classes
-    # Download controller
-    copy_file "app/controllers/downloads_controller.rb"
-  end
-
-  def copy_rspec_rake_task
-    copy_file "lib/tasks/rspec.rake"
-  end
-
-  def run_blacklight_generator
-    say_status("warning", "GENERATING BL", :yellow)       
-
-    generate 'blacklight:install', '--devise'
-  end
-
-  def run_hydra_head_generator
-    say_status("warning", "GENERATING HH", :yellow)       
-
-    generate 'hydra:head', '-f --skip-rspec'
-  end
-
-  def remove_generated_user_spec
-    remove_file 'spec/models/user_spec.rb'
-  end
-end

data/spec/support/lib/tasks/rspec.rake

@@ -1,8 +0,0 @@
-require 'rspec/core/rake_task'
-desc "run the hydra-core gem spec"
-gem_home = File.expand_path('../../../../..', __FILE__)
-RSpec::Core::RakeTask.new(:myspec) do |t|
-  t.pattern = gem_home + '/spec/**/*_spec.rb'
-  t.rspec_opts = ["--colour", '--backtrace']
-  t.ruby_opts = "-I#{gem_home}/spec"
-end

data/tasks/rspec.rake

@@ -1,52 +0,0 @@
-ENV["RAILS_ROOT"] ||= 'spec/internal'
-
-GEM_ROOT= File.expand_path(File.join(File.dirname(__FILE__),".."))
-
-desc "Run specs"
-task spec: :generate do |t|
-  focused_spec = ENV['SPEC'] ? " SPEC=#{File.join(GEM_ROOT, ENV['SPEC'])}" : ''
-  within_test_app do
-    system "rake myspec#{focused_spec}"
-    abort "Error running hydra-core" unless $?.success?
-  end
-end
-
-
-desc "Create the test rails app"
-task :generate do
-  unless File.exists?('spec/internal/Rakefile')
-    puts "Generating rails app"
-    `rails new 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 " eval File.read('../test_app_templates/Gemfile.extra'), nil, '../test_app_templates/Gemfile.extra'" >> 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
-      puts "Bundle install"
-      `bundle install`
-      puts "running test_app_generator"
-      system "rails generate test_app"
-
-      puts "running migrations"
-      puts `rake db:migrate db:test:prepare`
-    end
-  end
-  puts "Running specs"
-end
-
-desc "Clean out the test rails app"
-task :clean do
-  puts "Removing sample rails app"
-  `rm -rf spec/internal`
-end
-
-def within_test_app
-  FileUtils.cd('spec/internal')
-  Bundler.with_clean_env do
-    yield
-  end
-  FileUtils.cd('../..')
-end