spotlight-dor-resources 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26c9986fe02749baef5e222fbd5307aaed238473
-  data.tar.gz: 211ec782a3c90f62010857c8d5467c7d091d470d
+  metadata.gz: 182216d0851743e3b7309ddc05271a0ba7c16cea
+  data.tar.gz: 21bf71fe88cb1e52a766404f60476519eddbe6f9
 SHA512:
-  metadata.gz: 59b9799e167ce1e845a32700a305f33677d65c4795690da1fc97cc3a6be4eb2e5d7e257b3fbf88598a5a2f8e4521b7a51856d9a39a03caf61cbe9cf7d0f2c64c
-  data.tar.gz: d6bc026eae7dffe3b4c7e3579028b5c0140a3cf4e3afd78a730515502327fcf5f298c1b5b12445661126b52782d0fd878f1a2a1abc76a8978d3ce379d6fc15e2
+  metadata.gz: bd1fd4bfe26544a6e344d0195abb4c74bc8ced7cc8bf70e7a910926c08e48ed8928a90cf1429dab4c7022398d2f149ad6cbf483fad54a0a34681abb0dbd94f6a
+  data.tar.gz: 4fa9a09684202c7894f99f00cfb5bb2c10c7db5475c8adf3b19a257ce1e1d442228db2ea753d2746af52b50cb580f1961939376b5ec6218210802f8de702c7bd

data/.rubocop_todo.yml

@@ -1,3 +1,25 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-07-07 21:30:11 -0500 using RuboCop version 0.41.2.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
 
-Style/ClassAndModuleChildren:
-  Enabled: false
+# Offense count: 1
+Lint/UselessAccessModifier:
+  Exclude:
+    - 'lib/spotlight/dor/indexer.rb'
+
+# Offense count: 7
+# Configuration parameters: Max.
+RSpec/ExampleLength:
+  Exclude:
+    - 'spec/lib/spotlight/dor/indexer_spec.rb'
+    - 'spec/models/spotlight/resources/dor_harvester_spec.rb'
+
+# Offense count: 2
+RSpec/VerifiedDoubles:
+  Exclude:
+    - 'spec/integration/gdor_integration_spec.rb'
+    - 'spec/models/spotlight/resources/dor_harvester_spec.rb'

data/.travis.yml

@@ -2,14 +2,16 @@ notifications:
   email: false
 
 rvm:
-  - 2.2.3
-
+  - 2.3.1
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+    - RAILS_VERSION=4.2.6
 
 sudo: false
 language: ruby
 
 script:
   - bundle exec rake
+
+jdk: oraclejdk8

data/Gemfile

@@ -13,10 +13,10 @@ group :test do
 end
 
 # BEGIN ENGINE_CART BLOCK
-# engine_cart: 0.8.0
-# engine_cart stanza: 0.8.0
+# engine_cart: 0.10.0
+# engine_cart stanza: 0.10.0
 # the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
-file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path(".internal_test_app", File.dirname(__FILE__)))
+file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app', File.dirname(__FILE__)))
 if File.exist?(file)
   begin
     eval_gemfile file
@@ -27,13 +27,22 @@ if File.exist?(file)
 else
   Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
 
-  gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
+  if ENV['RAILS_VERSION']
+    if ENV['RAILS_VERSION'] == 'edge'
+      gem 'rails', github: 'rails/rails'
+      ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge --skip-turbolinks'
+    else
+      gem 'rails', ENV['RAILS_VERSION']
+    end
+  end
 
-  if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
-    gem 'responders', "~> 2.0"
-    gem 'sass-rails', ">= 5.0"
-  else
-    gem 'sass-rails', "< 5.0"
+  case ENV['RAILS_VERSION']
+  when /^4.2/
+    gem 'responders', '~> 2.0'
+    gem 'sass-rails', '>= 5.0'
+    gem 'coffee-rails', '~> 4.1.0'
+  when /^4.[01]/
+    gem 'sass-rails', '< 5.0'
   end
 end
 # END ENGINE_CART BLOCK

data/README.md

@@ -25,7 +25,7 @@ Within a Spotlight application with `spotlight-dor-resources` installed, you cou
 Note that Spotlight:
 
 * is a Rails engine and needs to be used in the context of a Rails application. We use [engine_cart](https://github.com/cbeer/engine_cart) to create an internal test application at .internal_test_app.
-* uses Solr as part of its integration tests. We use [jettywrapper](https://github.com/projecthydra/jettywrapper) to manage the Solr instance used for development and test.
+* uses Solr as part of its integration tests. We use [solr_wrapper](https://github.com/cbeer/solr_wrapper) to manage the Solr instance used for development and test.
 
 Our `$ rake ci` task utilizes Solr and the testing rails app, with Spotlight installed, automatically.
 
@@ -40,9 +40,7 @@ This will download a test jetty instance (to run Solr), generate a testing app a
 
 ### Indexing with the generated test app
 
-    $ rake exhibits:configure_solr
-    $ rake jetty:clean
-    $ rake jetty:start
+    $ solr_wrapper
     $ bundle exec rake engine_cart:console
 
 ```ruby

data/Rakefile

@@ -4,8 +4,6 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-ZIP_URL = 'https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.4.zip'
-
 Bundler::GemHelper.install_tasks
 
 task default: [:ci, :rubocop]
@@ -16,19 +14,17 @@ RSpec::Core::RakeTask.new(:spec)
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new(:rubocop)
 
-require 'jettywrapper'
 require 'engine_cart/rake_task'
-require 'exhibits_solr_conf'
 desc 'Run tests in generated test Rails app with generated Solr instance running'
-task ci: ['engine_cart:generate', 'jetty:clean', 'exhibits:configure_solr'] do
+task ci: ['engine_cart:generate'] do
+  require 'solr_wrapper'
+  require 'exhibits_solr_conf'
   ENV['environment'] = 'test'
-  ENV['TEST_JETTY_PORT'] = '8983'
-  jetty_params = Jettywrapper.load_config
-  jetty_params[:startup_wait] = 60
-
-  Jettywrapper.wrap(jetty_params) do
-    # run the tests
-    Rake::Task['spec'].invoke
+  SolrWrapper.wrap(port: '8983') do |solr|
+    solr.with_collection(name: 'blacklight-core', dir: ExhibitsSolrConf.path) do
+      # run the tests
+      Rake::Task['spec'].invoke
+    end
   end
 end
 

data/app/controllers/spotlight/resources/dor_harvester_controller.rb

@@ -12,21 +12,12 @@ module Spotlight::Resources
       @resource.update(resource_params)
 
       if @resource.save_and_index
-        redirect_to spotlight.admin_exhibit_catalog_index_path(current_exhibit)
-      else
-        redirect_to spotlight.new_exhibit_resource_path(current_exhibit)
-      end
-    end
-
-    def update
-      @resource.update(resource_params)
-
-      if @resource.save_and_index
-        redirect_to spotlight.admin_exhibit_catalog_index_path(current_exhibit)
+        redirect_to spotlight.admin_exhibit_catalog_path(current_exhibit)
       else
         redirect_to spotlight.new_exhibit_resource_path(current_exhibit)
       end
     end
+    alias update create
 
     private
 

data/lib/spotlight/dor/resources/version.rb

@@ -2,7 +2,7 @@ module Spotlight
   module Dor
     # :nodoc:
     module Resources
-      VERSION = '1.0.1'
+      VERSION = '1.1.0'.freeze
     end
   end
 end

data/spec/controllers/spotlight/resources/dor_harvester_controller_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+RSpec.describe Spotlight::Resources::DorHarvesterController, type: :controller do
+  routes { Spotlight::Dor::Resources::Engine.routes }
+  let(:resource) { double }
+  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
+  let(:attributes) { { druid_list: '' } }
+
+  before do
+    sign_in user
+    allow(Spotlight::Resources::DorHarvester).to receive(:instance).and_return(resource)
+  end
+
+  describe '#create' do
+    before do
+      expect(resource).to receive(:update).with(attributes)
+      allow(resource).to receive(:save_and_index).and_return(save_status)
+    end
+
+    context 'when save is successful' do
+      let(:save_status) { true }
+
+      it 'goes to the exhibit' do
+        post :create, exhibit_id: exhibit.id, resources_dor_harvester: attributes
+
+        expect(response).to redirect_to Spotlight::Engine.routes.url_helpers.admin_exhibit_catalog_path(exhibit)
+      end
+    end
+
+    context 'when save is unsuccessful' do
+      let(:save_status) { false }
+
+      it 'goes to the exhibit' do
+        post :create, exhibit_id: exhibit.id, resources_dor_harvester: attributes
+
+        expect(response).to redirect_to Spotlight::Engine.routes.url_helpers.new_exhibit_resource_path(exhibit)
+      end
+    end
+  end
+
+  describe '#update' do
+    before do
+      expect(resource).to receive(:update).with(attributes)
+      allow(resource).to receive(:save_and_index).and_return(save_status)
+    end
+
+    context 'when save is successful' do
+      let(:save_status) { true }
+
+      it 'goes to the exhibit' do
+        patch :update, exhibit_id: exhibit.id, resources_dor_harvester: attributes
+
+        expect(response).to redirect_to Spotlight::Engine.routes.url_helpers.admin_exhibit_catalog_path(exhibit)
+      end
+    end
+
+    context 'when save is unsuccessful' do
+      let(:save_status) { false }
+
+      it 'goes to the exhibit' do
+        patch :update, exhibit_id: exhibit.id, resources_dor_harvester: attributes
+
+        expect(response).to redirect_to Spotlight::Engine.routes.url_helpers.new_exhibit_resource_path(exhibit)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,28 +3,31 @@ ENV["RAILS_ENV"] ||= 'test'
 require 'devise'
 require 'engine_cart'
 require 'vcr'
+
+if ENV["COVERAGE"] or ENV["CI"]
+  require 'simplecov'
+  require 'coveralls' if ENV["CI"]
+
+  SimpleCov.root(File.expand_path('../..', __FILE__))
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter if ENV["CI"]
+  SimpleCov.start('rails') do
+    add_filter '/.internal_test_app'
+    add_filter '/lib/generators'
+    add_filter '/spec'
+  end
+  SimpleCov.command_name 'spec'
+end
+
 EngineCart.load_application!
 
 require 'rspec/rails'
 require 'capybara'
-
 require 'factory_girl_rails'
 FactoryGirl.definition_file_paths ||= []
 FactoryGirl.definition_file_paths << "#{Gem.loaded_specs['blacklight-spotlight'].full_gem_path}/spec/factories"
 FactoryGirl.find_definitions
 
 require 'database_cleaner'
-
-if ENV["COVERAGE"] or ENV["CI"]
-  require 'simplecov'
-  require 'coveralls' if ENV["CI"]
-
-  SimpleCov.formatter = Coveralls::SimpleCov::Formatter if ENV["CI"]
-  SimpleCov.start do
-    add_filter "/spec/"
-  end
-end
-
 require 'spotlight'
 
 

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

@@ -12,7 +12,7 @@ class TestAppGenerator < Rails::Generators::Base
 
   def run_blacklight_generator
     say_status('warning', 'GENERATING BL', :yellow)
-    generate 'blacklight:install', '--devise --jettywrapper'
+    generate 'blacklight:install', '--devise'
   end
 
   def run_spotlight_migrations

data/spotlight-dor-resources.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   # newer versions of harvestdor-indexer have performance improvements for collections
   spec.add_dependency 'harvestdor-indexer', '~> 2.3'
   spec.add_dependency 'rails'
-  spec.add_dependency 'blacklight-spotlight', '~> 0.16'
+  spec.add_dependency 'blacklight-spotlight', '~> 0.18'
   spec.add_dependency 'parallel'
   spec.add_dependency 'stanford-mods', '~> 2.1'
   spec.add_development_dependency 'bundler', '~> 1.5'
@@ -36,10 +36,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'capybara'
   spec.add_development_dependency 'vcr', '~> 3.0'
   spec.add_development_dependency 'webmock'
-  spec.add_development_dependency 'jettywrapper'
+  spec.add_development_dependency 'solr_wrapper'
   spec.add_development_dependency 'engine_cart', '~> 0.8'
   spec.add_development_dependency 'database_cleaner'
-  spec.add_development_dependency 'exhibits_solr_conf'
+  spec.add_development_dependency 'exhibits_solr_conf', '~> 0.1'
   spec.add_development_dependency 'factory_girl_rails'
   spec.add_development_dependency 'rubocop', '~> 0.36'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spotlight-dor-resources
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jettywrapper
+  name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -266,16 +266,16 @@ dependencies:
   name: exhibits_solr_conf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -344,6 +344,7 @@ files:
 - lib/spotlight/dor/resources.rb
 - lib/spotlight/dor/resources/engine.rb
 - lib/spotlight/dor/resources/version.rb
+- spec/controllers/spotlight/resources/dor_harvester_controller_spec.rb
 - spec/integration/gdor_integration_spec.rb
 - spec/lib/spotlight/dor/indexer_spec.rb
 - spec/models/spotlight/resources/dor_harvester_spec.rb
@@ -376,11 +377,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Spotlight resource indexer for DOR resources.
 test_files:
+- spec/controllers/spotlight/resources/dor_harvester_controller_spec.rb
 - spec/integration/gdor_integration_spec.rb
 - spec/lib/spotlight/dor/indexer_spec.rb
 - spec/models/spotlight/resources/dor_harvester_spec.rb