hydra-collections 3.0.0.beta3 → 4.0.0.beta1

data/spec/spec_helper.rb

@@ -9,18 +9,29 @@ require 'hydra-collections'
 FactoryGirl.definition_file_paths = [File.expand_path("../factories", __FILE__)]
 FactoryGirl.find_definitions
 
+# HttpLogger.logger = Logger.new(STDOUT)
+# HttpLogger.ignore = [/localhost:8983\/solr/]
+# HttpLogger.colorize = false
+# # Patch for https://github.com/railsware/http_logger/issues/13
+# HttpLogger::HTTP_METHODS_WITH_BODY = Set.new(%w(POST PUT GET PATCH))
+
 module EngineRoutes
   def self.included(base)
     base.routes { Hydra::Collections::Engine.routes }
   end
 end
 
+require 'active_fedora/cleaner'
 RSpec.configure do |config|
   config.use_transactional_fixtures = true
   config.include Devise::TestHelpers, :type => :controller
-  config.before(:each, :type=>"controller") { @routes = Hydra::Collections::Engine.routes }
+  config.before(:each, type: "controller") { @routes = Hydra::Collections::Engine.routes }
   config.include EngineRoutes, :type => :controller
   config.infer_spec_type_from_file_location!
+  # Stub out test stuff.
+  config.before(:each) do
+    ActiveFedora::Cleaner.clean!
+  end
 end
 
 module FactoryGirl

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

@@ -9,6 +9,7 @@ class TestAppGenerator < Rails::Generators::Base
     end
   end
 
+
   def run_blacklight_generator
     say_status("warning", "GENERATING BL", :yellow)       
 

data/tasks/hydra-collections-dev.rake

@@ -3,10 +3,12 @@ require 'rspec/core/rake_task'
 require 'jettywrapper'
 require 'engine_cart/rake_task'
 
+Jettywrapper.hydra_jetty_version = "v8.1.0"
+
 RSpec::Core::RakeTask.new(:spec)
 
 desc 'Spin up hydra-jetty and run specs'
-task ci: ['engine_cart:generate', 'jetty:clean', 'jetty:config'] do
+task ci: ['engine_cart:clean', 'engine_cart:generate', 'jetty:clean'] do
   puts 'running continuous integration'
   jetty_params = Jettywrapper.load_config
   error = Jettywrapper.wrap(jetty_params) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-collections
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta3
+  version: 4.0.0.beta1
 platform: ruby
 authors:
 - Carolyn Cole
@@ -30,14 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.0.0.beta1
+        version: 9.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.0.0.beta1
+        version: 9.0.0.beta1
+- !ruby/object:Gem::Dependency
+  name: deprecation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +89,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".gitmodules"
+- ".rspec"
 - ".travis.yml"
 - CONTRIBUTING.md
 - Changelog.md
@@ -86,13 +101,13 @@ files:
 - app/assets/javascripts/hydra_collections.js
 - app/assets/stylesheets/hydra_collections.css.scss
 - app/controllers/collections_controller.rb
+- app/controllers/concerns/hydra/collections/selects_collections.rb
 - app/controllers/concerns/hydra/collections_controller_behavior.rb
 - app/helpers/batch_select_helper.rb
 - app/helpers/collections_helper.rb
 - app/helpers/collections_search_helper.rb
 - app/models/collection.rb
 - app/models/concerns/hydra/collection.rb
-- app/models/datastreams/hydra/collection_rdf_datastream.rb
 - app/models/solr_document.rb
 - app/views/batch_select/_add_button.html.erb
 - app/views/batch_select/_check_all.html.erb
@@ -123,7 +138,6 @@ files:
 - lib/hydra/collections/accepts_batches.rb
 - lib/hydra/collections/collectible.rb
 - lib/hydra/collections/search_service.rb
-- lib/hydra/collections/selects_collections.rb
 - lib/hydra/collections/solr_document_behavior.rb
 - lib/hydra/collections/version.rb
 - solr_conf/conf/schema.xml
@@ -135,7 +149,6 @@ files:
 - spec/controllers/other_collections_controller_spec.rb
 - spec/controllers/selects_collections_spec.rb
 - spec/factories.rb
-- spec/factories/.gitkeep
 - spec/factories/users.rb
 - spec/helpers/collections_helper_spec.rb
 - spec/helpers/collections_search_helper_spec.rb
@@ -153,7 +166,7 @@ files:
 - spec/test_app_templates/lib/tasks/rspec.rake
 - tasks/hydra-collections-dev.rake
 - tasks/jetty.rake
-homepage: https://github.com/psu-stewardship/hydra-collections
+homepage: https://github.com/projecthydra-labs/hydra-collections
 licenses:
 - APACHE2
 metadata: {}
@@ -184,7 +197,6 @@ test_files:
 - spec/controllers/other_collections_controller_spec.rb
 - spec/controllers/selects_collections_spec.rb
 - spec/factories.rb
-- spec/factories/.gitkeep
 - spec/factories/users.rb
 - spec/helpers/collections_helper_spec.rb
 - spec/helpers/collections_search_helper_spec.rb

data/app/models/datastreams/hydra/collection_rdf_datastream.rb

@@ -1,54 +0,0 @@
-module Hydra
-  class CollectionRdfDatastream < ActiveFedora::NtriplesRDFDatastream
-    property :part_of, predicate: RDF::DC.isPartOf
-    property :contributor, predicate: RDF::DC.contributor do |index|
-      index.as :stored_searchable, :facetable
-    end
-    property :creator, predicate: RDF::DC.creator do |index|
-      index.as :stored_searchable, :facetable
-    end
-    property :title, predicate: RDF::DC.title do |index|
-      index.as :stored_searchable
-    end
-    property :description, predicate: RDF::DC.description do |index|
-      index.type :text
-      index.as :stored_searchable
-    end
-    property :publisher, predicate: RDF::DC.publisher do |index|
-      index.as :stored_searchable, :facetable
-    end
-    property :date_created, predicate: RDF::DC.created do |index|
-      index.as :stored_searchable
-    end
-    property :date_uploaded, predicate: RDF::DC.dateSubmitted do |index|
-      index.type :date
-      index.as :stored_sortable
-    end
-    property :date_modified, predicate: RDF::DC.modified do |index|
-      index.type :date
-      index.as :stored_sortable
-    end
-    property :subject, predicate: RDF::DC.subject do |index|
-      index.as :stored_searchable, :facetable
-    end
-    property :language, predicate: RDF::DC.language do |index|
-      index.as :stored_searchable, :facetable
-    end
-    property :rights, predicate: RDF::DC.rights do |index|
-      index.as :stored_searchable
-    end
-    property :resource_type, predicate: RDF::DC.type do |index|
-      index.as :stored_searchable, :facetable
-    end
-    property :identifier, predicate: RDF::DC.identifier do |index|
-      index.as :stored_searchable
-    end
-    property :based_near, predicate: RDF::FOAF.based_near do |index|
-      index.as :stored_searchable, :facetable
-    end
-    property :tag, predicate: RDF::DC.relation do |index|
-      index.as :stored_searchable, :facetable
-    end
-    property :related_url, predicate: RDF::RDFS.seeAlso
-  end
-end