hydra-collections 2.0.5 → 3.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/{support → test_app_templates}/lib/generators/test_app_generator.rb

@@ -1,7 +1,14 @@
 require 'rails/generators'
 
 class TestAppGenerator < Rails::Generators::Base
-  source_root File.expand_path("../../../../support", __FILE__)
+  source_root File.expand_path("../../../../test_app_templates", __FILE__)
+
+  def update_gemfile
+    append_to_file "Gemfile" do
+      "\n   gem 'factory_girl_rails'"
+    end
+  end
+
 
   def run_blacklight_generator
     say_status("warning", "GENERATING BL", :yellow)       
@@ -33,7 +40,7 @@ class TestAppGenerator < Rails::Generators::Base
 
   def delete_generated_noise
     remove_file("public/index.html")
-    remove_file("spec/models/user_spec.rb")
+    remove_file("test/factories/users.rb")
   end
   
   def copy_view_overrides
@@ -74,3 +81,4 @@ class TestAppGenerator < Rails::Generators::Base
     end
   end
 end
+

data/tasks/hydra-collections-dev.rake

@@ -1,11 +1,15 @@
 require 'rspec/core'
 require 'rspec/core/rake_task'
-APP_ROOT="." # for jettywrapper
 require 'jettywrapper'
-ENV["RAILS_ROOT"] ||= 'spec/internal'
+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 => ['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
@@ -14,61 +18,17 @@ task :ci => ['jetty:config'] do
   raise "test failures: #{error}" if error
 end
 
-desc "Run specs"
-# Note: this is _not_ an RSpec::Core::RakeTask.  
-# It's a regular rake task that calls the RSpec RakeTask that's defined in spec/support/lib/tasks/rspec.rake
-task :spec => [:generate] do |t|
-  focused_spec = ENV['SPEC'] ? " SPEC=#{File.join(GEM_ROOT, ENV['SPEC'])}" : ''
-  Bundler.with_clean_env do
-    within_test_app do
-      system "rake myspec#{focused_spec}"
-      abort "Error running hydra-collections" unless $?.success?
-    end
-  end
-end
+EXTRA_GEMS =<<EOF
+gem 'active-fedora', '9.0.0.beta3'
+gem 'hydra-head', github: 'projecthydra/hydra-head', branch: 'fedora-4'
 
-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"
+EOF
 
-    `echo "gem 'hydra-collections', :path=>'../../../hydra-collections'
-gem 'factory_girl_rails'
-    " >> spec/internal/Gemfile`
-    puts "Copying generator"
-    `cp -r spec/support/lib/generators spec/internal/lib`
-    Bundler.with_clean_env do
-      within_test_app do
-        puts "Bundle install"
-        `bundle install`
-        puts "running test_app_generator"
-        system "rails generate test_app"
-        # These factories are autogenerated and conflict with our factories
-        system 'rm test/factories/users.rb'
-        puts "running migrations"
-        puts `rake db:migrate db:test:prepare`
-      end
+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
-  puts "Done generating test app"
-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')
-  yield
-  FileUtils.cd('../..')
-end
-
-namespace :meme do
-  desc "configure jetty to generate checksums"
-  task :config do
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-collections
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 3.0.0.beta1
 platform: ruby
 authors:
 - Carolyn Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -30,30 +30,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 8.0.0.alpha
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 8.0.0.alpha
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: deprecation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: engine_cart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".gitmodules"
+- ".rspec"
 - ".travis.yml"
 - CONTRIBUTING.md
 - Changelog.md
@@ -100,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
@@ -137,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
@@ -149,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
@@ -157,17 +156,17 @@ files:
 - spec/lib/search_service_spec.rb
 - spec/models/collection_spec.rb
 - spec/spec_helper.rb
-- spec/support/app/models/sample.rb
-- spec/support/app/models/solr_document.rb
-- spec/support/app/views/catalog/_document_header.html.erb
-- spec/support/app/views/catalog/_index_collection.html.erb
-- spec/support/app/views/catalog/_sort_and_per_page.html.erb
-- spec/support/db/migrate/20111101221803_create_searches.rb
-- spec/support/lib/generators/test_app_generator.rb
-- spec/support/lib/tasks/rspec.rake
+- spec/test_app_templates/app/models/sample.rb
+- spec/test_app_templates/app/models/solr_document.rb
+- spec/test_app_templates/app/views/catalog/_document_header.html.erb
+- spec/test_app_templates/app/views/catalog/_index_collection.html.erb
+- spec/test_app_templates/app/views/catalog/_sort_and_per_page.html.erb
+- spec/test_app_templates/db/migrate/20111101221803_create_searches.rb
+- spec/test_app_templates/lib/generators/test_app_generator.rb
+- 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: {}
@@ -182,12 +181,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 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.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A rails engine for managing Hydra Collections
@@ -198,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
@@ -206,12 +204,11 @@ test_files:
 - spec/lib/search_service_spec.rb
 - spec/models/collection_spec.rb
 - spec/spec_helper.rb
-- spec/support/app/models/sample.rb
-- spec/support/app/models/solr_document.rb
-- spec/support/app/views/catalog/_document_header.html.erb
-- spec/support/app/views/catalog/_index_collection.html.erb
-- spec/support/app/views/catalog/_sort_and_per_page.html.erb
-- spec/support/db/migrate/20111101221803_create_searches.rb
-- spec/support/lib/generators/test_app_generator.rb
-- spec/support/lib/tasks/rspec.rake
-has_rdoc: 
+- spec/test_app_templates/app/models/sample.rb
+- spec/test_app_templates/app/models/solr_document.rb
+- spec/test_app_templates/app/views/catalog/_document_header.html.erb
+- spec/test_app_templates/app/views/catalog/_index_collection.html.erb
+- spec/test_app_templates/app/views/catalog/_sort_and_per_page.html.erb
+- spec/test_app_templates/db/migrate/20111101221803_create_searches.rb
+- spec/test_app_templates/lib/generators/test_app_generator.rb
+- spec/test_app_templates/lib/tasks/rspec.rake

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

@@ -1,58 +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
-
-    def prefix
-      ""
-    end
-  end
-end