hydra-core 6.5.2 → 7.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc393c7c2006c1b4640304025e401d3920a08e68
-  data.tar.gz: 3406224bbbc5f743ef6d0398707c61c147a3414d
+  metadata.gz: 1cf9361903147e9724ae37d21f4a890a84a031ff
+  data.tar.gz: afe9fc4f220f71e8148ab55ea68e920a31a19784
 SHA512:
-  metadata.gz: a78f797300a1fd710b4d09e109218696e79a196213ba24cc32c02ad0f7263ce723c86c22262cb1485a007c09b06cc1143e8cfa9c4f18bf71aefecef44d13c4f7
-  data.tar.gz: 331ea9537f156be69613d7bcfd9494721a6b602519bc62a94e62a21d8ba902e7c1f3bf2369f8aae92434762891637e18aaa09c6a6faa64be7c74358779329399
+  metadata.gz: 601bc533781382961b862b46f294b9c4dd13bb2a55ed4dc33fa4a5622d76323e914a2332df218bddecda4d662466c7bcb2c3e3ff2f14c39e5b7d2cf24f75e39b
+  data.tar.gz: e23f48c1de6975b59eda986938c83a06e7ee2e2b7a7a27bf35d2cca2c62e083e05c82bdbb22dea6baf4826d207c27df4598f8d6bf28fb8094998259f6f7faed6

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

@@ -0,0 +1,2 @@
+module Hydra::Controller
+end

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

@@ -2,24 +2,20 @@ module Hydra
   module Controller
     module DownloadBehavior
       extend ActiveSupport::Concern
+      extend Deprecation
 
       included do
         before_filter :load_asset
         before_filter :load_datastream
+        before_filter :authorize_download!
       end
       
       # Responds to http requests to show the datastream
       def show
-        if can_download?
-          if datastream.new?
-            render_404
-          else
-            # we can now examine asset and determine if we should send_content, or some other action.
-            send_content (asset)
-          end
-        else 
-          logger.info "Can not read #{params[asset_param_key]}"
-          raise Hydra::AccessDenied.new("You do not have sufficient access privileges to read this document, which has been marked private.", :read, params[asset_param_key])
+        if datastream.new?
+          render_404
+        else
+          send_content
         end
       end
 
@@ -46,6 +42,15 @@ module Hydra
         @ds = datastream_to_show
       end
 
+      # 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
+
       def asset
         @asset
       end
@@ -54,14 +59,6 @@ module Hydra
         @ds
       end
 
-      # Override this method to enforce access controls. By default it allows
-      # any datastream on an object the current user has read access to.
-      # @return [Boolean] can the curent user view this object/datastream
-      def can_download?
-        can? :read, datastream.pid
-      end 
-
-
       # Override this method to change which datastream is shown.
       # Loads the datastream specified by the HTTP parameter `:datastream_id`. 
       # If this object does not have a datastream by that name, return the default datastream
@@ -75,7 +72,9 @@ module Hydra
       end
       
       # Handle the HTTP show request
-      def send_content(asset)
+      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_
+
         response.headers['Accept-Ranges'] = 'bytes'
 
         if request.head?

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

@@ -0,0 +1,5 @@
+module Hydra
+  module Models
+  end
+end
+

data/hydra-core.gemspec

@@ -19,9 +19,10 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 1.9.3'
 
+
   gem.add_dependency "rails", '>= 3.2.3', '< 5' 
-  gem.add_dependency "blacklight", '~> 4.7'  
-  gem.add_dependency "active-fedora", '~> 6.7'
+  gem.add_dependency "blacklight", '~> 4.0'  
+  gem.add_dependency "active-fedora"
   gem.add_dependency 'block_helpers'
   gem.add_dependency 'deprecation', ">= 0.0.5"
   gem.add_dependency 'hydra-access-controls', version

data/lib/generators/hydra/head_generator.rb

@@ -48,8 +48,10 @@ class HeadGenerator < Rails::Generators::Base
     # Initializers
     file_path = "config/initializers/hydra_config.rb"
     copy_file "config/initializers/hydra_config.rb", file_path
-    insert_into_file file_path, :after => '# specify the user model' do
-        "\n    config[:user_model] = '#{model_name.classify}'"
+    unless model_name == 'user'
+      insert_into_file file_path, :after => 'Hydra.configure do |config|' do
+          "\n  config.user_model = '#{model_name.classify}'"
+      end
     end
 
     copy_file "config/initializers/action_dispatch_http_upload_monkey_patch.rb", "config/initializers/action_dispatch_http_upload_monkey_patch.rb"
@@ -79,14 +81,5 @@ class HeadGenerator < Rails::Generators::Base
       puts "     \e[31mFailure\e[0m  Hydra requires a user object in order to apply access controls. This generators assumes that the model is defined in the file #{file_path}, which does not exist.  If you used a different name, please re-run the generator and provide that name as an argument. Such as \b  rails -g hydra:head client"
     end
   end
-
-  # Inject call to HydraHead.add_routes in config/routes.rb
-  def inject_hydra_routes
-    insert_into_file "config/routes.rb", :after => 'Blacklight.add_routes(self)' do
-      "\n  # Add Hydra routes.  For options, see API docs for HydraHead.routes"
-      "\n  HydraHead.add_routes(self)"
-    end
-  end
-
 end # HeadGenerator
 end # Hydra

data/lib/generators/hydra/templates/config/initializers/hydra_config.rb

@@ -1,28 +1,21 @@
-# The following lines determine which user attributes your hydrangea app will use
-# This configuration allows you to use the out of the box ActiveRecord associations between users and user_attributes
-# It also allows you to specify your own user attributes
-# The easiest way to override these methods would be to create your own module to include in User
-# For example you could create a module for your local LDAP instance called MyLocalLDAPUserAttributes:
-#   User.send(:include, MyLocalLDAPAttributes)
-# As long as your module includes methods for full_name, affiliation, and photo the personalization_helper should function correctly
-#
-
 # windows doesn't properly require hydra-head (from the gemfile), so we need to require it explicitly here:
 require 'hydra/head' unless defined? Hydra
 
-if Hydra.respond_to?(:configure)
-  Hydra.configure(:shared) do |config|
-    # This specifies the solr field names of permissions-related fields.
-    # You only need to change these values if you've indexed permissions by some means other than the Hydra's built-in tooling.
-    # If you change these, you must also update the permissions request handler in your solrconfig.xml to return those values
-    indexer = Solrizer::Descriptor.new(:string, :stored, :indexed, :multivalued)
-    config[:permissions] = {
-      :discover => {:group =>ActiveFedora::SolrService.solr_name("discover_access_group", indexer), :individual=>ActiveFedora::SolrService.solr_name("discover_access_person", indexer)},
-      :read => {:group =>ActiveFedora::SolrService.solr_name("read_access_group", indexer), :individual=>ActiveFedora::SolrService.solr_name("read_access_person", indexer)},
-      :edit => {:group =>ActiveFedora::SolrService.solr_name("edit_access_group", indexer), :individual=>ActiveFedora::SolrService.solr_name("edit_access_person", indexer)},
-      :owner => ActiveFedora::SolrService.solr_name("depositor", indexer),
-      :embargo_release_date => ActiveFedora::SolrService.solr_name("embargo_release_date", Solrizer::Descriptor.new(:date, :stored, :indexed))
-    }
-
-  end
+Hydra.configure do |config|
+  # This specifies the solr field names of permissions-related fields.
+  # You only need to change these values if you've indexed permissions by some means other than the Hydra's built-in tooling.
+  # If you change these, you must also update the permissions request handler in your solrconfig.xml to return those values
+  #
+  # config.permissions.discover.group       = ActiveFedora::SolrService.solr_name("discover_access_group", :symbol)
+  # config.permissions.discover.individual  = ActiveFedora::SolrService.solr_name("discover_access_person", :symbol)
+  # config.permissions.read.group           = ActiveFedora::SolrService.solr_name("read_access_group", :symbol)
+  # config.permissions.read.individual      = ActiveFedora::SolrService.solr_name("read_access_person", :symbol)
+  # config.permissions.edit.group           = ActiveFedora::SolrService.solr_name("edit_access_group", :symbol)
+  # config.permissions.edit.individual      = ActiveFedora::SolrService.solr_name("edit_access_person", :symbol)
+  #
+  # config.permissions.embargo_release_date = ActiveFedora::SolrService.solr_name("embargo_release_date", Solrizer::Descriptor.new(:date, :stored, :indexed))
+  # }
+  #
+  # specify the user model
+  # config.user_model = '#{model_name.classify}'
 end

data/lib/hydra-core.rb

@@ -1,41 +1,11 @@
 require 'hydra-access-controls'
-
-module Hydra
-  extend ActiveSupport::Autoload
-  autoload :GlobalConfigurable
-  extend GlobalConfigurable
-  autoload :Controller
-  autoload :ModelMethods
-  autoload :RepositoryController
-  autoload :Solr
-  module ModelMixins
-    # ModelMixins already loaded by hydra-access-controls
-    autoload :SolrDocumentExtension
-  end
-  autoload :Models
-end
+require 'deprecation'
 
 module HydraHead 
+  extend Deprecation
   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.
-  # See {HydraHead::Routes} for information about how to modify which routes are generated.
-  # @example 
-  #   # in config/routes.rb
-  #   MyAppName::Application.routes.draw do
-  #     Blacklight.add_routes(self)
-  #     HydraHead.add_routes(self)
-  #   end
   def self.add_routes(router, options = {})
-    HydraHead::Routes.new(router, options).draw
+    Deprecation.warn HydraHead, "add_routes has been removed." # remove this warning in hydra-head 8
   end
 end
 
-ActiveSupport.on_load(:after_initialize) do
-  begin
-    SolrDocument.use_extension Hydra::ModelMixins::SolrDocumentExtension
-  rescue NameError
-    logger.warn "Couldn't find SolrDocument"
-  end
-end

data/lib/hydra-head/engine.rb

@@ -6,6 +6,7 @@ module HydraHead
 
     config.autoload_paths += %W(
       #{config.root}/app/controllers/concerns
+      #{config.root}/app/models/concerns
     )
     
     # Load rake tasks

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "6.5.2"
+  VERSION = "7.0.0.pre1"
 end
 

data/spec/controllers/catalog_controller_spec.rb

@@ -56,7 +56,7 @@ describe CatalogController do
       before(:all) do
         fq = "read_access_group_ssim:public OR edit_access_group_ssim:public OR discover_access_group_ssim:public"
         solr_opts = {:fq=>fq}
-        response = ActiveFedora::SolrService.instance.conn.get('select', :params=>solr_opts)
+        response = Blacklight.solr.get('select', :params=> solr_opts)
         @public_only_results = Blacklight::SolrResponse.new(response, solr_opts)
       end
 

data/spec/controllers/downloads_controller_spec.rb

@@ -102,7 +102,7 @@ describe DownloadsController do
           stub_ds.stub(:pid).and_return('changeme:test')
           stub_file = double('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(:authorize!).with(:download, stub_ds).and_return(true)
           controller.stub(:log_download)
         end
         it "head request" do
@@ -145,17 +145,6 @@ describe DownloadsController do
       end
     end
 
-    describe "when not logged in as reader" do
-      describe "show" do
-        before do
-          sign_in User.new.tap {|u| u.email = 'email2@example.com'; u.password = 'password'; u.save}
-        end
-        it "should deny access" do
-          lambda { get "show", :id =>@obj.pid }.should raise_error Hydra::AccessDenied
-        end
-      end
-    end
-
     describe "overriding the default asset param key" do
       before do
         Rails.application.routes.draw do
@@ -172,5 +161,28 @@ 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
+          controller.current_ability.can?(:download, @obj.datastreams['buzz']).should be_true
+          controller.stub(:can_download?).and_return(false)
+          expect { get :show, id: @obj, datastream_id: 'buzz' }.to raise_error(CanCan::AccessDenied)
+        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
+          controller.current_ability.can?(:download, @obj.datastreams['buzz']).should be_false
+          controller.stub(:can_download?).and_return(true)
+          get :show, id: @obj, datastream_id: 'buzz'
+          response.should be_successful           
+        end
+      end
+    end
+
   end
 end

data/spec/lib/model_methods_spec.rb

@@ -6,7 +6,7 @@ describe Hydra::ModelMethods do
     class TestModel < ActiveFedora::Base
       include Hydra::AccessControls::Permissions
       include Hydra::ModelMethods
-      has_metadata :name => "properties", :type => Hydra::Datastream::Properties
+      has_metadata "properties", type: Hydra::Datastream::Properties
     end
   end
 
@@ -15,12 +15,12 @@ describe Hydra::ModelMethods do
   describe "apply_depositor_metadata" do
     it "should add edit access" do
       subject.apply_depositor_metadata('naomi')
-      subject.rightsMetadata.individuals.should == {'naomi' => 'edit'}
+      subject.rightsMetadata.users.should == {'naomi' => 'edit'}
     end
     it "should not overwrite people with edit access" do
       subject.rightsMetadata.permissions({:person=>"jessie"}, 'edit')
       subject.apply_depositor_metadata('naomi')
-      subject.rightsMetadata.individuals.should == {'naomi' => 'edit', 'jessie' =>'edit'}
+      subject.rightsMetadata.users.should == {'naomi' => 'edit', 'jessie' =>'edit'}
     end
     it "should set depositor" do
       subject.apply_depositor_metadata('chris')

data/spec/support/app/models/generic_content.rb

@@ -0,0 +1,21 @@
+# GenericContent:  EXAMPLE Model that conforms to the Hydra genericContent and genericMetadata cModels 
+require 'deprecation'
+class GenericContent < ActiveFedora::Base
+  extend Deprecation
+
+  # Uses the Hydra Rights Metadata Schema for tracking access permissions & copyright
+  #  FIXME:  should this have   "include Hydra::ModelMixins::CommonMetadata" instead?
+  has_metadata :name => "rightsMetadata", :type => Hydra::Datastream::RightsMetadata 
+
+  # A place to put extra metadata values, e.g. the user id of the object depositor (for permissions)
+  has_metadata :name => "properties", :type => Hydra::Datastream::Properties
+  
+  # adds helpful methods for basic hydra objects.  
+  # FIXME:  redundate with  GenericContent include above??
+  include Hydra::ModelMethods
+  
+  def initialize( attrs={} )
+    Deprecation.warn(GenericContent, "GenericContent is deprecated and will be removed in hydra-head 5.x")
+    super
+  end
+end

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

@@ -3,19 +3,16 @@ require 'rails/generators'
 class TestAppGenerator < Rails::Generators::Base
   source_root File.expand_path("../../../../support", __FILE__)
 
-  # Inject call to Hydra::BatchEdit.add_routes in config/routes.rb
-  def inject_routes
-    insert_into_file "config/routes.rb", :after => '.draw do' do
-      "\n  # Add HydraHead routes."
-      "\n  HydraHead.add_routes(self)"
-    end
-  end
-
   def copy_test_fixtures
+    copy_file "app/models/generic_content.rb"
+
     # Download controller
     copy_file "app/controllers/downloads_controller.rb"
 
     copy_file "spec/fixtures/hydrangea_fixture_mods_article1.foxml.xml" 
+
+    # For testing Hydra::SubmissionWorkflow
+    copy_file "spec/fixtures/hydra_test_generic_content.foxml.xml"
   end
 
   def copy_rspec_rake_task

data/spec/support/spec/fixtures/hydra_test_generic_content.foxml.xml

@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<foxml:digitalObject VERSION="1.1" PID="hydra:test_generic_content" xmlns:foxml="info:fedora/fedora-system:def/foxml#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
+  <foxml:objectProperties>
+    <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+    <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE=""/>
+    <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+    <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2011-07-14T01:28:47.221Z"/>
+    <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2011-07-14T01:30:56.432Z"/>
+  </foxml:objectProperties>
+  <foxml:datastream ID="DC" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+    <foxml:datastreamVersion ID="DC1.0" LABEL="Dublin Core Record for this object" CREATED="2011-07-14T01:28:47.221Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="341">
+      <foxml:xmlContent>
+        <oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
+          <dc:identifier>hydra:test_generic_content</dc:identifier>
+          <dc:description>A test object using the GenericContent (active)fedora model</dc:description>
+        </oai_dc:dc>
+      </foxml:xmlContent>
+    </foxml:datastreamVersion>
+  </foxml:datastream>
+  <foxml:datastream ID="descMetadata" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+    <foxml:datastreamVersion ID="descMetadata.1" LABEL="" CREATED="2011-07-14T01:30:13.169Z" MIMETYPE="text/xml" SIZE="1552">
+      <foxml:xmlContent>
+        <mods xmlns="http://www.loc.gov/mods/v3" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3" xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-3.xsd">
+          <titleInfo lang="">
+            <title>generic content</title>
+          </titleInfo>
+          <name type="personal">
+            <namePart type="given">Orlob</namePart>
+            <namePart type="family">Gryphon</namePart>
+            <affiliation>Fantasy</affiliation>
+            <role>
+              <roleTerm authority="marcrelator" type="text"/>
+            </role>
+            <description>Mythical Creatures</description>
+          </name>
+          <typeOfResource/>
+          <genre authority="marcgt"/>
+          <language>
+            <languageTerm authority="iso639-2b" type="code"/>
+          </language>
+          <physicalDescription>
+            <extent/>
+          </physicalDescription>
+          <abstract>A test object using the GenericContent (active)fedora model</abstract>
+          <subject>
+            <topic>flying creatures</topic>
+          </subject>
+          <relatedItem type="host">
+            <titleInfo>
+              <title/>
+            </titleInfo>
+            <identifier type="issn"/>
+            <originInfo>
+              <publisher/>
+              <dateIssued/>
+            </originInfo>
+            <part>
+              <detail type="volume">
+                <number/>
+              </detail>
+              <detail type="number">
+                <number/>
+              </detail>
+              <extent unit="pages">
+                <start/>
+                <end/>
+              </extent>
+              <date/>
+            </part>
+          </relatedItem>
+          <location>
+            <url/>
+          </location>
+        </mods>
+      </foxml:xmlContent>
+    </foxml:datastreamVersion>
+  </foxml:datastream>
+  <foxml:datastream ID="RELS-EXT" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+    <foxml:datastreamVersion ID="RELS-EXT.0" LABEL="" CREATED="2011-07-14T01:28:49.031Z" MIMETYPE="text/xml" SIZE="277">
+      <foxml:xmlContent>
+        <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+          <rdf:Description rdf:about="info:fedora/hydra:test_generic_content">
+            <hasModel xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/afmodel:GenericContent"/>
+          </rdf:Description>
+        </rdf:RDF>
+      </foxml:xmlContent>
+    </foxml:datastreamVersion>
+  </foxml:datastream>
+  <foxml:datastream ID="rightsMetadata" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+     <foxml:datastreamVersion ID="rightsMetadata.1" LABEL="" CREATED="2011-07-14T01:30:56.432Z" MIMETYPE="text/xml" SIZE="777">
+      <foxml:xmlContent>
+        <rightsMetadata xmlns="http://hydra-collab.stanford.edu/schemas/rightsMetadata/v1" version="0.1">
+          <copyright>
+            <human/>
+            <machine>
+              <uvalicense>no</uvalicense>
+            </machine>
+          </copyright>
+          <access type="discover">
+            <human/>
+            <machine/>
+          </access>
+          <access type="read">
+            <human/>
+            <machine>
+              <group>researcher</group>
+              <group>public</group>
+              <group>patron</group>
+              <group>donor</group>
+            </machine>
+          </access>
+          <access type="edit">
+            <human/>
+            <machine>
+              <person>archivist1</person>
+              <group>archivist</group>
+              <group>admin_policy_object_editor</group>
+            </machine>
+          </access>
+          <embargo>
+            <human/>
+            <machine/>
+          </embargo>
+        </rightsMetadata>
+      </foxml:xmlContent>
+    </foxml:datastreamVersion>
+  </foxml:datastream>
+  <foxml:datastream ID="properties" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+    <foxml:datastreamVersion ID="properties.0" LABEL="" CREATED="2011-07-14T01:28:49.367Z" MIMETYPE="text/xml" SIZE="99">
+      <foxml:xmlContent>
+        <fields>
+          <collection>generic_content</collection>
+          <depositor>archivist1</depositor>
+        </fields>
+      </foxml:xmlContent>
+    </foxml:datastreamVersion>
+  </foxml:datastream>
+</foxml:digitalObject>

data/spec/test_app_templates/Gemfile.extra

@@ -0,0 +1,4 @@
+group :develop do
+  gem 'active-fedora', github: "projecthydra/active_fedora"
+end
+

data/tasks/rspec.rake

@@ -26,6 +26,7 @@ task :generate do
     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`

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 6.5.2
+  version: 7.0.0.pre1
 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-05-07 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -37,28 +37,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '6.7'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '6.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: block_helpers
   requirement: !ruby/object:Gem::Requirement
@@ -93,14 +93,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.5.2
+        version: 7.0.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.5.2
+        version: 7.0.0.pre1
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
@@ -182,13 +182,16 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Rakefile
+- app/controllers/concerns/hydra/controller.rb
 - app/controllers/concerns/hydra/controller/controller_behavior.rb
 - app/controllers/concerns/hydra/controller/download_behavior.rb
 - app/controllers/concerns/hydra/controller/upload_behavior.rb
 - app/helpers/blacklight_helper.rb
-- app/helpers/facets_helper.rb
 - app/helpers/hydra/blacklight_helper_behavior.rb
-- app/helpers/hydra/facets_helper_behavior.rb
+- app/models/concerns/hydra/model_methods.rb
+- app/models/concerns/hydra/models.rb
+- app/models/concerns/hydra/models/file_asset.rb
+- app/models/concerns/hydra/solr.rb
 - app/models/file_asset.rb
 - app/models/hydra/datastream/properties.rb
 - app/models/mods_asset.rb
@@ -212,16 +215,7 @@ files:
 - lib/generators/hydra/templates/config/solr.yml
 - lib/hydra-core.rb
 - lib/hydra-head/engine.rb
-- lib/hydra-head/routes.rb
 - lib/hydra-head/version.rb
-- lib/hydra/controller.rb
-- lib/hydra/global_configurable.rb
-- lib/hydra/model_methods.rb
-- lib/hydra/model_mixins/common_metadata.rb
-- lib/hydra/model_mixins/solr_document_extension.rb
-- lib/hydra/models.rb
-- lib/hydra/models/file_asset.rb
-- lib/hydra/solr.rb
 - lib/railties/active-fedora.rake
 - lib/railties/hydra-fixtures.rake
 - lib/railties/hydra_jetty.rake
@@ -231,12 +225,9 @@ files:
 - spec/controllers/downloads_controller_spec.rb
 - spec/factories.rb
 - spec/helpers/blacklight_helper_spec.rb
-- spec/helpers/facets_helper_spec.rb
 - spec/helpers/upload_behavior_spec.rb
 - spec/lib/catalog_spec.rb
-- spec/lib/global_configurable_spec.rb
 - spec/lib/model_methods_spec.rb
-- spec/lib/solr_document_extension_spec.rb
 - spec/models/file_asset_spec.rb
 - spec/models/mods_asset_spec.rb
 - spec/models/solr_document_spec.rb
@@ -245,6 +236,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/app/controllers/downloads_controller.rb
+- spec/support/app/models/generic_content.rb
 - spec/support/app/models/sample.rb
 - spec/support/app/models/solr_document.rb
 - spec/support/db/migrate/20111101221803_create_searches.rb
@@ -252,7 +244,9 @@ files:
 - spec/support/lib/tasks/rspec.rake
 - spec/support/matchers/helper_matcher.rb
 - spec/support/matchers/solr_matchers.rb
+- spec/support/spec/fixtures/hydra_test_generic_content.foxml.xml
 - spec/support/spec/fixtures/hydrangea_fixture_mods_article1.foxml.xml
+- spec/test_app_templates/Gemfile.extra
 - spec/unit/hydra-head-engine_spec.rb
 - spec/unit/hydra-head_spec.rb
 - tasks/hydra-head-fixtures.rake
@@ -273,12 +267,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.0.14
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Hydra-Head Rails Engine (requires Rails3)
@@ -289,12 +283,9 @@ test_files:
 - spec/controllers/downloads_controller_spec.rb
 - spec/factories.rb
 - spec/helpers/blacklight_helper_spec.rb
-- spec/helpers/facets_helper_spec.rb
 - spec/helpers/upload_behavior_spec.rb
 - spec/lib/catalog_spec.rb
-- spec/lib/global_configurable_spec.rb
 - spec/lib/model_methods_spec.rb
-- spec/lib/solr_document_extension_spec.rb
 - spec/models/file_asset_spec.rb
 - spec/models/mods_asset_spec.rb
 - spec/models/solr_document_spec.rb
@@ -303,6 +294,7 @@ test_files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/app/controllers/downloads_controller.rb
+- spec/support/app/models/generic_content.rb
 - spec/support/app/models/sample.rb
 - spec/support/app/models/solr_document.rb
 - spec/support/db/migrate/20111101221803_create_searches.rb
@@ -310,7 +302,9 @@ test_files:
 - spec/support/lib/tasks/rspec.rake
 - spec/support/matchers/helper_matcher.rb
 - spec/support/matchers/solr_matchers.rb
+- spec/support/spec/fixtures/hydra_test_generic_content.foxml.xml
 - spec/support/spec/fixtures/hydrangea_fixture_mods_article1.foxml.xml
+- spec/test_app_templates/Gemfile.extra
 - spec/unit/hydra-head-engine_spec.rb
 - spec/unit/hydra-head_spec.rb
 has_rdoc: 

data/app/helpers/facets_helper.rb

@@ -1,4 +0,0 @@
-module FacetsHelper
-  include Hydra::FacetsHelperBehavior
-
-end

data/app/helpers/hydra/facets_helper_behavior.rb

@@ -1,25 +0,0 @@
-module Hydra
-  module FacetsHelperBehavior
-    include Blacklight::FacetsHelperBehavior
-
-    # Removing the [remove] link and label class from the default selected facet display
-    def render_selected_facet_value(facet_solr_field, item)
-      content_tag(:span, render_facet_value(facet_solr_field, item, :suppress_link => true), :class => "selected")
-    end
-
-    # Override to remove the label class (easier integration with bootstrap)
-    # and handles arrays
-    def render_facet_value(facet_solr_field, item, options ={})    
-      if item.is_a? Array
-        render_array_facet_value(facet_solr_field, item, options)
-      end
-
-      (link_to_unless(options[:suppress_link], facet_display_value(facet_solr_field, item), add_facet_params_and_redirect(facet_solr_field, item.value), :class=>"facet_select") + " " + render_facet_count(item.hits)).html_safe
-    end
-
-    def render_array_facet_value(facet_solr_field, item, options)
-      (link_to_unless(options[:suppress_link], facet_display_value(facet_solr_field, item[0]), add_facet_params_and_redirect(facet_solr_field, item[0]), :class=>"facet_select") + " (" + format_num(item[1]) + ")").html_safe 
-    end
-  end
-end
-

data/lib/hydra-head/routes.rb

@@ -1,46 +0,0 @@
-# -*- encoding : utf-8 -*-
-module HydraHead
-  class Routes
-
-    def initialize(router, options)
-      @router = router
-      @options = options
-    end
-
-    def draw
-      route_sets.each do |r|
-        self.send(r)
-      end
-    end
-
-    protected
-
-    def add_routes &blk
-      @router.instance_exec(@options, &blk)
-    end
-
-    def route_sets
-      (@options[:only] || default_route_sets) - (@options[:except] || [])
-    end
-
-    def default_route_sets
-      [:assets_with_all_nested_routes]
-    end
-
-    module RouteSets
-      def assets_with_all_nested_routes
-        add_routes do |options|
-          namespace :hydra do
-            resources :file_assets
-            resources :assets do 
-              resources :file_assets
-            end
-          end
-        end
-      end
-    end
-
-    include RouteSets
-
-  end
-end

data/lib/hydra/controller.rb

@@ -1,7 +0,0 @@
-module Hydra::Controller
-  autoload :AssetsControllerBehavior, 'hydra/controller/assets_controller_behavior'
-  autoload :ControllerBehavior, 'hydra/controller/controller_behavior'
-  autoload :UploadBehavior, 'hydra/controller/upload_behavior'
-  autoload :DownloadBehavior, 'hydra/controller/download_behavior'
-  autoload :FileAssetsBehavior, 'hydra/controller/file_assets_behavior'
-end

data/lib/hydra/global_configurable.rb

@@ -1,46 +0,0 @@
-module Hydra::GlobalConfigurable
-  
-  # The config environment name used by the #config method
-  #
-  # Example:
-  #   class MyThing
-  #     extend Hydra::GlobalConfigurable
-  #   end
-  # 
-  # Now MyThing.config will be the result of:
-  #   MyThing.configure(:production) {|config|}
-  #
-  # You set shared attributes by leaving the first argument blank or passing the :shared value:
-  #   MyThing.configure {|config|} 
-  # or
-  #   MyThing.configure(:shared) {|config|}
-  
-  # sets the @configs variable to a new Hash with empty Hash for :shared key and @config to nil
-  def reset_configs!
-    @config = nil
-    @configs = {:shared=>{}}
-  end
-  
-  # A hash of all environment configs
-  # The key is the environment name, the value a Hash
-  def configs
-    @configs ? @configs : (reset_configs! and @configs)
-  end
-  
-  # The main config accessor. It merges the current configs[::Rails.env] 
-  # with configs[:shared] and lazy-loads @config to the result.
-  def config
-    @config ||= configs[:shared].merge(configs[::Rails.env] ||= {})
-  end
-  alias_method :blacklight_config, :config
-  
-  # Accepts a value for the environment to configure and a block
-  # A hash is yielded to the block
-  # If the "env" != :shared,
-  # the hash is created by deep cloning the :shared environment config.
-  # This makes it possible to create defaults in the :shared config
-  def configure(env = :shared, &blk)
-    configs[env] = {}
-    yield configs[env]
-  end
-end

data/lib/hydra/model_mixins/common_metadata.rb

@@ -1,24 +0,0 @@
-# Include this into models that you want to conform to the Hydra commonMetadata cModel
-# See https://wiki.duraspace.org/display/hydra/Hydra+objects%2C+content+models+%28cModels%29+and+disseminators#Hydraobjects%2Ccontentmodels%28cModels%29anddisseminators-models
-#
-# Explicitly declares:
-#   rightsMetadata datastream using Hydra::RightsMetadata Terminology
-#
-# Does not explicitly declare:
-#   descMetadata datastream -- should be declared by a more specific mixin like Hydra::ModelMixins::ModsObject
-#   DC datastream -- Handled by ActiveFedora::Base
-#   RELS-EXT datastream -- Handled by ActiveFedora::Base & ActiveFedora::RelsExtDatastream
-#   optional datastreams (contentMetadata, technicalMetadata, provenanceMetadata, sourceMetadata)
-#
-module Hydra::ModelMixins
-  module CommonMetadata
-    extend Deprecation
-    extend ActiveSupport::Concern
-  
-    included do
-      # Uses the Hydra Rights Metadata Schema for tracking access permissions & copyright
-      has_metadata "rightsMetadata", type: Hydra::Datastream::RightsMetadata
-      Deprecation.warn(CommonMetadata, "Hydra::ModelMixins::CommonMetadata is deprecated and will be removed in hydra-head 7.  Use Hydra::AccessControls::Permissions instead.", caller(1))
-    end
-  end
-end

data/lib/hydra/model_mixins/solr_document_extension.rb

@@ -1,33 +0,0 @@
-module Hydra::ModelMixins
-  module SolrDocumentExtension
-    extend Deprecation
-    self.deprecation_horizon = 'hydra-head 7.0.0'
-
-    def document_type display_type = CatalogController.blacklight_config.show.display_type
-      type = self.fetch(:medium_t, nil)
-
-      type ||= self.fetch(display_type, nil) if display_type
-
-      type.first.to_s.gsub("info:fedora/afmodel:","").gsub("Hydrangea","").gsub(/^Generic/,"")
-    end
-    deprecation_deprecate :document_type
-
-    def get_person_from_role(role, opts={})
-      i = 0
-      while i < 10
-        persons_roles = self["person_#{i}_role_t"].map{|w|w.strip.downcase} unless self["person_#{i}_role_t"].nil?
-        if persons_roles and persons_roles.include?(role.downcase)
-          return {:first=>self["person_#{i}_first_name_t"], :last=>self["person_#{i}_last_name_t"]}
-        end
-        i += 1
-      end
-    end
-    deprecation_deprecate :get_person_from_role
-
-    def get_file_asset_count()
-      ActiveFedora::Base.count(:conditions=>"is_part_of_t:#{ActiveFedora::Base.quote_for_solr(id)}")
-    end
-    deprecation_deprecate :get_file_asset_count
-  end
-end
-

data/lib/hydra/models.rb

@@ -1,7 +0,0 @@
-module Hydra
-  module Models
-    extend ActiveSupport::Autoload
-    autoload :FileAsset
-  end
-end
-

data/spec/helpers/facets_helper_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-describe FacetsHelper do
-  let(:blacklight_config) { Blacklight::Configuration.new }
-
-  before(:each) do
-    helper.stub(:blacklight_config).and_return blacklight_config
-  end
-  
-  
-  describe "render_selected_facet_value" do
-    it "should be html_safe and not have the remove link" do
-      item = double("item", :value=>'two', :hits=>9)
-      ret_val = helper.render_selected_facet_value("one", item)
-      ret_val.should == "<span class=\"selected\">two <span class=\"count\">9</span></span>"
-      ret_val.should be_html_safe
-    end
-    it "should use facet_display_value" do
-      item = double("item", :value=>'two', :hits=>9)
-      helper.stub(:facet_display_value).and_return('four')
-      ret_val = helper.render_selected_facet_value("one", item)
-      ret_val.should == "<span class=\"selected\">four <span class=\"count\">9</span></span>"
-    end
-  end
-end
-

data/spec/lib/global_configurable_spec.rb

@@ -1,98 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe Hydra::GlobalConfigurable do
-  
-  class TestConfig
-    extend Hydra::GlobalConfigurable
-  end
-  
-  before(:each) do
-    TestConfig.reset_configs!
-  end
-  
-  it "should respond to configure" do
-    TestConfig.respond_to? :configure
-  end
-  
-  describe "the default state" do
-    describe "config" do
-      it "should be a Hash" do
-          TestConfig.config.should be_a Hash      
-      end
-    end
-    describe "configs[:shared]" do
-      it "should be a Hash" do
-        TestConfig.configs[:shared].should be_a Hash
-      end
-    end
-  end
-  
-  describe "configs[:shared]" do
-    it "should not have the values of its members altered by other environments" do
-      TestConfig.configure do |config|
-        config[:key] = ":shared value"
-      end
-      TestConfig.configure(::Rails.env) do |config|
-        config[:key] = ":test value"
-      end
-      TestConfig.config[:key].should == ":test value"
-      TestConfig.configs[:shared][:key].should == ":shared value"
-      TestConfig.configs[::Rails.env][:key].should == ":test value"
-    end
-  end
-  
-  describe "the #configure method behavior" do
-    it "requires a block" do
-      lambda{TestConfig.configure}.should raise_error(LocalJumpError)
-    end
-    it "yields a hash" do
-      TestConfig.configure{|config| config.should be_a(Hash) }
-    end
-    it "should clear the configs if reset_configs! is called" do
-      TestConfig.configure do |config|
-        config[:asdf] = 'asdf'
-      end
-      TestConfig.configs[:shared][:asdf].should == 'asdf'
-      TestConfig.reset_configs!
-      TestConfig.configs[:shared][:asdf].should == nil
-    end
-    
-    it "should merge settings from the :shared environment" do
-      TestConfig.configure do |config|
-        config[:app_id] = 'Blacklight'
-        config[:mode] = :shared!
-      end
-      TestConfig.configure(::Rails.env) do |config|
-        config[:mode] = ::Rails.env
-      end
-      TestConfig.config[:app_id].should == 'Blacklight'
-      TestConfig.config[:mode].should_not == :shared!
-      TestConfig.config[:mode].should == ::Rails.env
-    end
-  end
-  
-  describe "config" do
-    it "should return an empty Hash if nothing was configured" do
-      TestConfig.config.should == {}
-    end
-    
-    it "should return only what is in configs[:shared] if no other environment was configured" do
-      TestConfig.configure(:shared) do |config|
-        config[:foo] = 'bar'
-        config[:baz] = 'dang'
-      end
-      TestConfig.config.should == {:foo => 'bar', :baz => 'dang'}
-      TestConfig.config.should == TestConfig.configs[:shared]
-    end
-    
-    it "should return a merge of configs[:shared] and configs[RAILS_ENV]" do
-      TestConfig.configure(:shared) do |config|
-        config[:foo] = 'bar'
-        config[:baz] = 'dang'
-      end
-    end
-  end
-  
-  
-end

data/spec/lib/solr_document_extension_spec.rb

@@ -1,14 +0,0 @@
-require 'spec_helper'
-
-describe Hydra::ModelMixins::SolrDocumentExtension do
-  before do
-    @doc = SolrDocument.new(:id=>'changeme:99')
-  end
-
-  it "should get_file_asset_count" do
-    Deprecation.stub(:warn).and_return(nil)
-    mock_result = {'response'=>{'numFound'=>0}}
-    ActiveFedora::SolrService.should_receive(:query).with("is_part_of_t:\"changeme\\:99\"", :rows=>0, :raw=>true).and_return(mock_result)
-    @doc.get_file_asset_count.should == 0
-  end
-end