hydra-collections 3.0.0.beta2 → 3.0.0.beta3

data/spec/spec_helper.rb

@@ -9,29 +9,18 @@ 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,7 +9,6 @@ class TestAppGenerator < Rails::Generators::Base
     end
   end
 
-
   def run_blacklight_generator
     say_status("warning", "GENERATING BL", :yellow)       
 

data/tasks/hydra-collections-dev.rake

@@ -3,13 +3,10 @@ require 'rspec/core/rake_task'
 require 'jettywrapper'
 require 'engine_cart/rake_task'
 
-JETTY_ZIP_BASENAME = 'fedora-4/master'
-Jettywrapper.url = "https://github.com/projecthydra/hydra-jetty/archive/#{JETTY_ZIP_BASENAME}.zip"
-
 RSpec::Core::RakeTask.new(:spec)
 
 desc 'Spin up hydra-jetty and run specs'
-task ci: ['engine_cart:clean', 'engine_cart:generate', 'jetty:clean'] do
+task ci: ['engine_cart:generate', 'jetty:clean', 'jetty:config'] do
   puts 'running continuous integration'
   jetty_params = Jettywrapper.load_config
   error = Jettywrapper.wrap(jetty_params) do
@@ -17,18 +14,3 @@ task ci: ['engine_cart:clean', 'engine_cart:generate', 'jetty:clean'] do
   end
   raise "test failures: #{error}" if error
 end
-
-EXTRA_GEMS =<<EOF
-gem 'active-fedora', '9.0.0.beta3'
-gem 'hydra-head', github: 'projecthydra/hydra-head', branch: 'fedora-4'
-
-EOF
-
-namespace :engine_cart do
-  # we're adding some extra stuff into the gemfile beyond what engine_cart gives us by default
-  task :inject_gemfile_extras do
-    open(File.expand_path('Gemfile', EngineCart.destination), 'a') do |f|
-      f.write EXTRA_GEMS
-    end
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-collections
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta2
+  version: 3.0.0.beta3
 platform: ruby
 authors:
 - Carolyn Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -30,28 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.0.beta1
+        version: 8.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        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'
+        version: 8.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
@@ -89,7 +75,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".gitmodules"
-- ".rspec"
 - ".travis.yml"
 - CONTRIBUTING.md
 - Changelog.md
@@ -101,13 +86,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
@@ -138,6 +123,7 @@ 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
@@ -149,6 +135,7 @@ 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
@@ -166,7 +153,7 @@ files:
 - spec/test_app_templates/lib/tasks/rspec.rake
 - tasks/hydra-collections-dev.rake
 - tasks/jetty.rake
-homepage: https://github.com/projecthydra-labs/hydra-collections
+homepage: https://github.com/psu-stewardship/hydra-collections
 licenses:
 - APACHE2
 metadata: {}
@@ -197,6 +184,7 @@ 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/.rspec

@@ -1 +0,0 @@
---colour