krikri 0.12.0 → 0.12.1

data/spec/internal/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: /vagrant
+  remote: /Users/mark/Documents/Code/dpla/KriKri
   specs:
-    krikri (0.12.0.pre.rc.1)
+    krikri (0.11.2)
       analysand (= 4.0.0)
       audumbla (~> 0.1)
       blacklight (~> 5.8.0)
@@ -26,17 +26,17 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.9)
-      actionpack (= 4.1.9)
-      actionview (= 4.1.9)
+    actionmailer (4.1.14.1)
+      actionpack (= 4.1.14.1)
+      actionview (= 4.1.14.1)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.9)
-      actionview (= 4.1.9)
-      activesupport (= 4.1.9)
+    actionpack (4.1.14.1)
+      actionview (= 4.1.14.1)
+      activesupport (= 4.1.14.1)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.9)
-      activesupport (= 4.1.9)
+    actionview (4.1.14.1)
+      activesupport (= 4.1.14.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
     active-triples (0.6.1)
@@ -45,14 +45,14 @@ GEM
       deprecation (~> 0.1)
       linkeddata (~> 1.1)
       rdf (~> 1.1)
-    activemodel (4.1.9)
-      activesupport (= 4.1.9)
+    activemodel (4.1.14.1)
+      activesupport (= 4.1.14.1)
       builder (~> 3.1)
-    activerecord (4.1.9)
-      activemodel (= 4.1.9)
-      activesupport (= 4.1.9)
+    activerecord (4.1.14.1)
+      activemodel (= 4.1.14.1)
+      activesupport (= 4.1.14.1)
       arel (~> 5.0.0)
-    activesupport (4.1.9)
+    activesupport (4.1.14.1)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -224,21 +224,21 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.9)
-      actionmailer (= 4.1.9)
-      actionpack (= 4.1.9)
-      actionview (= 4.1.9)
-      activemodel (= 4.1.9)
-      activerecord (= 4.1.9)
-      activesupport (= 4.1.9)
+    rails (4.1.14.1)
+      actionmailer (= 4.1.14.1)
+      actionpack (= 4.1.14.1)
+      actionview (= 4.1.14.1)
+      activemodel (= 4.1.14.1)
+      activerecord (= 4.1.14.1)
+      activesupport (= 4.1.14.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.9)
+      railties (= 4.1.14.1)
       sprockets-rails (~> 2.0)
     rails_config (0.4.2)
       activesupport (>= 3.0)
-    railties (4.1.9)
-      actionpack (= 4.1.9)
-      activesupport (= 4.1.9)
+    railties (4.1.14.1)
+      actionpack (= 4.1.14.1)
+      activesupport (= 4.1.14.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.5.0)
@@ -392,7 +392,7 @@ DEPENDENCIES
   jquery-rails
   krikri!
   pry-rails
-  rails (= 4.1.9)
+  rails (= 4.1.14.1)
   sass-rails (~> 4.0.3)
   sdoc (~> 0.4.0)
   sqlite3

data/spec/internal/app/assets/javascripts/application.js

@@ -7,7 +7,7 @@
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // compiled file.
 //
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
 //= require jquery

data/spec/internal/config/initializers/blacklight_initializer.rb

@@ -3,5 +3,5 @@
 # will use the application's secret key base instead.
 #
 
-# Blacklight.secret_key = 'ebc37207b10c8eca83db801d1048bab793a8989077927d0acd02dbf2510165f5e4d016d1c8c15c23c25dee94a9c1e1087ba5ede5dc94dce8fa4539cdcf93f270'
+# Blacklight.secret_key = 'cc12cf6ecad283a96940ff1048f905f37fb193f90fb3f27864a00f9e11910c093279af59aa296c0ef2c18c0e325e59fd83ea20a66aa1db762c41211886820274'
 

data/spec/internal/config/initializers/devise.rb

@@ -4,7 +4,7 @@ Devise.setup do |config|
   # The secret key used by Devise. Devise uses this key to generate
   # random tokens. Changing this key will render invalid all existing
   # confirmation, reset password and unlock tokens in the database.
-  # config.secret_key = '0b72f71851a885c429315093ac2db2dcd3823429a5a4f9f7c6ac233e8b2ecdc4cb6ecbc70b265102e87b6bd969325eed8197e6ac3cfdfe95f0b0fa335f180147'
+  # config.secret_key = '40ecf58b68fd1289ba1d8230901a4d066a5265f8f569e58a58adbdb05d26e95220beac0d20e9ff1c340093fc924b69dfb332a85427f37f748c0a520364be05b7'
 
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
@@ -97,7 +97,7 @@ Devise.setup do |config|
   config.stretches = Rails.env.test? ? 1 : 10
 
   # Setup a pepper to generate the encrypted password.
-  # config.pepper = '94ee00c9080cdb76c8c060c1af2f24299179ef43587ed58fa553da7ab56b4da1dc25c2b351f8ef027abafc2df9d53584566312c2a0586faac7edb43b46b9c905'
+  # config.pepper = '61f641377fee96c6de414fcb8ee81afbae5243d1c8fbc386b910eada4d445c79f429fee2415774134bed70cded219e56b96eb776ea8f16556ae589be15604e85'
 
   # ==> Configuration for :confirmable
   # A period that the user is allowed to access the website even without

data/spec/internal/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: 54220d04d57b5dcc6dd2eadc805455695bda1ca0ed39225d5bf33b640fa983eeec53bb3e734a9af4b2c67dbae35033203ddb1e2a95851af90a0a6d66a34aa33c
+  secret_key_base: 863fff84d2a9894a7ebbe17f0f0d7dc2a74dc3ebe204d6b6b9732538cc1148476637020525b1c80a520c18e4f679cb3169b634ba797bd7e12a8ff47d2a266ab0
 
 test:
-  secret_key_base: f3ba998d333d9560c0bf83d53703cd7efd707afa57ccc4d0a9f00029b26c78b4341e03799dd390ba88e41e199789d9fa330cd507c6e5e3756f3edc2a847ae83d
+  secret_key_base: 847e6a513b270df86d4aaed1a90d50cdd4309f019a7458e16f12cd03a15bca129056ee0da6616e8aed7dbb59fb99d228a5768d96abad6eb79146761815931e79
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.

data/spec/internal/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160304151249) do
+ActiveRecord::Schema.define(version: 20160226160228) do
 
   create_table "bookmarks", force: true do |t|
     t.integer  "user_id",       null: false

data/spec/internal/log/development.log

@@ -1,57 +1,57 @@
-   (6.1ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.1ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
    (0.1ms)  select sqlite_version(*)
-   (4.5ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
-  ActiveRecord::SchemaMigration Load (1.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (1.0ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
 Migrating to CreateKrikriInstitutions (20141113200614)
    (0.1ms)  begin transaction
-   (2.8ms)  CREATE TABLE "krikri_institutions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "notes" text, "created_at" datetime, "updated_at" datetime) 
-  SQL (1.3ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20141113200614"]]
-   (2.6ms)  commit transaction
+   (0.4ms)  CREATE TABLE "krikri_institutions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "notes" text, "created_at" datetime, "updated_at" datetime) 
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20141113200614"]]
+   (0.6ms)  commit transaction
 Migrating to CreateKrikriHarvestSources (20141113200643)
-   (0.1ms)  begin transaction
-   (2.6ms)  CREATE TABLE "krikri_harvest_sources" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "institution_id" integer, "name" varchar(255), "source_type" varchar(255), "metadata_schema" varchar(255), "uri" varchar(255), "notes" text, "created_at" datetime, "updated_at" datetime) 
-  SQL (0.8ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20141113200643"]]
-   (2.5ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.3ms)  CREATE TABLE "krikri_harvest_sources" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "institution_id" integer, "name" varchar(255), "source_type" varchar(255), "metadata_schema" varchar(255), "uri" varchar(255), "notes" text, "created_at" datetime, "updated_at" datetime) 
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20141113200643"]]
+   (0.6ms)  commit transaction
 Migrating to CreateKrikriActivities (20141212220924)
    (0.1ms)  begin transaction
-   (3.3ms)  CREATE TABLE "krikri_activities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "start_time" datetime, "end_time" datetime, "agent" varchar(255), "opts" varchar(255), "created_at" datetime, "updated_at" datetime) 
-  SQL (0.9ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20141212220924"]]
-   (2.2ms)  commit transaction
+   (0.7ms)  CREATE TABLE "krikri_activities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "start_time" datetime, "end_time" datetime, "agent" varchar(255), "opts" varchar(255), "created_at" datetime, "updated_at" datetime) 
+  SQL (0.4ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20141212220924"]]
+   (0.7ms)  commit transaction
 Migrating to AddOptsToKrikriHarvestSources (20150106164218)
    (0.1ms)  begin transaction
-   (3.3ms)  ALTER TABLE "krikri_harvest_sources" ADD "opts" text
-  SQL (0.9ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150106164218"]]
-   (2.8ms)  commit transaction
+   (0.3ms)  ALTER TABLE "krikri_harvest_sources" ADD "opts" text
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150106164218"]]
+   (0.6ms)  commit transaction
 Migrating to ChangeOptsInKrikriActivities (20150309160112)
    (0.1ms)  begin transaction
-   (0.3ms)  CREATE TEMPORARY TABLE "akrikri_activities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "start_time" datetime, "end_time" datetime, "agent" varchar(255), "opts" varchar(255), "created_at" datetime, "updated_at" datetime) 
-   (1.4ms)  SELECT * FROM "krikri_activities"
-   (2.2ms)  DROP TABLE "krikri_activities"
-   (0.2ms)  CREATE TABLE "krikri_activities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "start_time" datetime, "end_time" datetime, "agent" varchar(255), "opts" text(255), "created_at" datetime, "updated_at" datetime) 
-   (0.1ms)  SELECT * FROM "akrikri_activities"
+   (2.1ms)  CREATE TEMPORARY TABLE "akrikri_activities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "start_time" datetime, "end_time" datetime, "agent" varchar(255), "opts" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (0.0ms)  SELECT * FROM "krikri_activities"
+   (0.6ms)  DROP TABLE "krikri_activities"
+   (0.1ms)  CREATE TABLE "krikri_activities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "start_time" datetime, "end_time" datetime, "agent" varchar(255), "opts" text(255), "created_at" datetime, "updated_at" datetime) 
+   (0.0ms)  SELECT * FROM "akrikri_activities"
    (0.2ms)  DROP TABLE "akrikri_activities"
-  SQL (0.9ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150309160112"]]
-   (3.2ms)  commit transaction
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150309160112"]]
+   (0.8ms)  commit transaction
 Migrating to RemoveOptsLimitInKrikriActivities (20150310190054)
-   (0.4ms)  begin transaction
-   (0.2ms)  CREATE TEMPORARY TABLE "akrikri_activities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "start_time" datetime, "end_time" datetime, "agent" varchar(255), "opts" text(255), "created_at" datetime, "updated_at" datetime) 
-   (1.5ms)  SELECT * FROM "krikri_activities"
-   (2.4ms)  DROP TABLE "krikri_activities"
+   (0.1ms)  begin transaction
+   (0.3ms)  CREATE TEMPORARY TABLE "akrikri_activities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "start_time" datetime, "end_time" datetime, "agent" varchar(255), "opts" text(255), "created_at" datetime, "updated_at" datetime) 
+   (0.1ms)  SELECT * FROM "krikri_activities"
+   (0.2ms)  DROP TABLE "krikri_activities"
    (0.1ms)  CREATE TABLE "krikri_activities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "start_time" datetime, "end_time" datetime, "agent" varchar(255), "opts" text, "created_at" datetime, "updated_at" datetime) 
    (0.1ms)  SELECT * FROM "akrikri_activities"
    (0.1ms)  DROP TABLE "akrikri_activities"
-  SQL (0.7ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150310190054"]]
-   (2.6ms)  commit transaction
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150310190054"]]
+   (0.7ms)  commit transaction
 Migrating to AddQaReport (20150328035550)
    (0.1ms)  begin transaction
-   (2.5ms)  CREATE TABLE "krikri_qa_reports" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "provider" varchar(255), "field_report" text, "count_report" text, "created_at" datetime, "updated_at" datetime) 
-  SQL (0.8ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150328035550"]]
-   (2.3ms)  commit transaction
-Migrating to DeviseCreateUsers (20160304151204)
-   (0.1ms)  begin transaction
-   (3.6ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar(255) DEFAULT '' NOT NULL, "encrypted_password" varchar(255) DEFAULT '' NOT NULL, "reset_password_token" varchar(255), "reset_password_sent_at" datetime, "remember_created_at" datetime, "sign_in_count" integer DEFAULT 0 NOT NULL, "current_sign_in_at" datetime, "last_sign_in_at" datetime, "current_sign_in_ip" varchar(255), "last_sign_in_ip" varchar(255), "created_at" datetime, "updated_at" datetime) 
-   (0.4ms)  CREATE UNIQUE INDEX "index_users_on_email" ON "users" ("email")
-   (0.3ms)              SELECT sql
+   (0.3ms)  CREATE TABLE "krikri_qa_reports" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "provider" varchar(255), "field_report" text, "count_report" text, "created_at" datetime, "updated_at" datetime) 
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150328035550"]]
+   (0.5ms)  commit transaction
+Migrating to DeviseCreateUsers (20160226160200)
+   (0.0ms)  begin transaction
+   (0.3ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar(255) DEFAULT '' NOT NULL, "encrypted_password" varchar(255) DEFAULT '' NOT NULL, "reset_password_token" varchar(255), "reset_password_sent_at" datetime, "remember_created_at" datetime, "sign_in_count" integer DEFAULT 0 NOT NULL, "current_sign_in_at" datetime, "last_sign_in_at" datetime, "current_sign_in_ip" varchar(255), "last_sign_in_ip" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (0.3ms)  CREATE UNIQUE INDEX "index_users_on_email" ON "users" ("email")
+   (0.0ms)              SELECT sql
             FROM sqlite_master
             WHERE name='index_users_on_email' AND type='index'
             UNION ALL
@@ -60,10 +60,10 @@ Migrating to DeviseCreateUsers (20160304151204)
             WHERE name='index_users_on_email' AND type='index'
 
    (0.1ms)  CREATE UNIQUE INDEX "index_users_on_reset_password_token" ON "users" ("reset_password_token")
-  SQL (1.0ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160304151204"]]
-   (2.7ms)  commit transaction
-  ActiveRecord::SchemaMigration Load (1.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-   (1.7ms)              SELECT sql
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160226160200"]]
+   (0.8ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)              SELECT sql
             FROM sqlite_master
             WHERE name='index_users_on_reset_password_token' AND type='index'
             UNION ALL
@@ -71,7 +71,7 @@ Migrating to DeviseCreateUsers (20160304151204)
             FROM sqlite_temp_master
             WHERE name='index_users_on_reset_password_token' AND type='index'
 
-   (1.3ms)              SELECT sql
+   (0.1ms)              SELECT sql
             FROM sqlite_master
             WHERE name='index_users_on_email' AND type='index'
             UNION ALL
@@ -79,27 +79,27 @@ Migrating to DeviseCreateUsers (20160304151204)
             FROM sqlite_temp_master
             WHERE name='index_users_on_email' AND type='index'
 
-  ActiveRecord::SchemaMigration Load (1.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-Migrating to CreateSearches (20160304151247)
+  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateSearches (20160226160226)
    (0.1ms)  begin transaction
-   (4.4ms)  CREATE TABLE "searches" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "query_params" text, "user_id" integer, "user_type" varchar(255), "created_at" datetime, "updated_at" datetime) 
-   (0.3ms)  select sqlite_version(*)
-   (1.1ms)  CREATE  INDEX "index_searches_on_user_id" ON "searches" ("user_id")
-  SQL (0.9ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160304151247"]]
-   (2.9ms)  commit transaction
-Migrating to CreateBookmarks (20160304151248)
-   (0.1ms)  begin transaction
-   (3.3ms)  CREATE TABLE "bookmarks" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer NOT NULL, "user_type" varchar(255), "document_id" varchar(255), "title" varchar(255), "created_at" datetime, "updated_at" datetime) 
-  SQL (1.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160304151248"]]
-   (1.9ms)  commit transaction
-Migrating to AddPolymorphicTypeToBookmarks (20160304151249)
-   (0.1ms)  begin transaction
-   (3.3ms)  ALTER TABLE "bookmarks" ADD "document_type" varchar(255)
-   (0.2ms)  CREATE  INDEX "index_bookmarks_on_user_id" ON "bookmarks" ("user_id")
-  SQL (0.9ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160304151249"]]
-   (2.9ms)  commit transaction
-  ActiveRecord::SchemaMigration Load (1.9ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-   (1.8ms)              SELECT sql
+   (1.0ms)  CREATE TABLE "searches" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "query_params" text, "user_id" integer, "user_type" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (0.1ms)  select sqlite_version(*)
+   (0.1ms)  CREATE  INDEX "index_searches_on_user_id" ON "searches" ("user_id")
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160226160226"]]
+   (0.6ms)  commit transaction
+Migrating to CreateBookmarks (20160226160227)
+   (0.0ms)  begin transaction
+   (0.3ms)  CREATE TABLE "bookmarks" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer NOT NULL, "user_type" varchar(255), "document_id" varchar(255), "title" varchar(255), "created_at" datetime, "updated_at" datetime) 
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160226160227"]]
+   (0.6ms)  commit transaction
+Migrating to AddPolymorphicTypeToBookmarks (20160226160228)
+   (0.0ms)  begin transaction
+   (0.3ms)  ALTER TABLE "bookmarks" ADD "document_type" varchar(255)
+   (0.1ms)  CREATE  INDEX "index_bookmarks_on_user_id" ON "bookmarks" ("user_id")
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160226160228"]]
+   (0.7ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)              SELECT sql
             FROM sqlite_master
             WHERE name='index_bookmarks_on_user_id' AND type='index'
             UNION ALL
@@ -107,7 +107,7 @@ Migrating to AddPolymorphicTypeToBookmarks (20160304151249)
             FROM sqlite_temp_master
             WHERE name='index_bookmarks_on_user_id' AND type='index'
 
-   (2.1ms)              SELECT sql
+   (0.1ms)              SELECT sql
             FROM sqlite_master
             WHERE name='index_searches_on_user_id' AND type='index'
             UNION ALL
@@ -115,7 +115,7 @@ Migrating to AddPolymorphicTypeToBookmarks (20160304151249)
             FROM sqlite_temp_master
             WHERE name='index_searches_on_user_id' AND type='index'
 
-   (0.9ms)              SELECT sql
+   (0.1ms)              SELECT sql
             FROM sqlite_master
             WHERE name='index_users_on_reset_password_token' AND type='index'
             UNION ALL
@@ -123,7 +123,7 @@ Migrating to AddPolymorphicTypeToBookmarks (20160304151249)
             FROM sqlite_temp_master
             WHERE name='index_users_on_reset_password_token' AND type='index'
 
-   (1.6ms)              SELECT sql
+   (0.1ms)              SELECT sql
             FROM sqlite_master
             WHERE name='index_users_on_email' AND type='index'
             UNION ALL
@@ -131,18 +131,18 @@ Migrating to AddPolymorphicTypeToBookmarks (20160304151249)
             FROM sqlite_temp_master
             WHERE name='index_users_on_email' AND type='index'
 
-   (4.8ms)  CREATE TABLE "bookmarks" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer NOT NULL, "user_type" varchar(255), "document_id" varchar(255), "title" varchar(255), "created_at" datetime, "updated_at" datetime, "document_type" varchar(255)) 
-   (0.1ms)  select sqlite_version(*)
-   (3.6ms)  CREATE  INDEX "index_bookmarks_on_user_id" ON "bookmarks" ("user_id")
-   (3.9ms)  CREATE TABLE "krikri_activities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "start_time" datetime, "end_time" datetime, "agent" varchar(255), "opts" text, "created_at" datetime, "updated_at" datetime) 
-   (3.9ms)  CREATE TABLE "krikri_harvest_sources" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "institution_id" integer, "name" varchar(255), "source_type" varchar(255), "metadata_schema" varchar(255), "uri" varchar(255), "notes" text, "created_at" datetime, "updated_at" datetime, "opts" text) 
-   (3.7ms)  CREATE TABLE "krikri_institutions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "notes" text, "created_at" datetime, "updated_at" datetime) 
-   (3.3ms)  CREATE TABLE "krikri_qa_reports" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "provider" varchar(255), "field_report" text, "count_report" text, "created_at" datetime, "updated_at" datetime) 
-   (5.1ms)  CREATE TABLE "searches" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "query_params" text, "user_id" integer, "user_type" varchar(255), "created_at" datetime, "updated_at" datetime) 
-   (4.4ms)  CREATE  INDEX "index_searches_on_user_id" ON "searches" ("user_id")
-   (5.4ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar(255) DEFAULT '' NOT NULL, "encrypted_password" varchar(255) DEFAULT '' NOT NULL, "reset_password_token" varchar(255), "reset_password_sent_at" datetime, "remember_created_at" datetime, "sign_in_count" integer DEFAULT 0 NOT NULL, "current_sign_in_at" datetime, "last_sign_in_at" datetime, "current_sign_in_ip" varchar(255), "last_sign_in_ip" varchar(255), "created_at" datetime, "updated_at" datetime) 
-   (4.0ms)  CREATE UNIQUE INDEX "index_users_on_email" ON "users" ("email")
-   (0.8ms)              SELECT sql
+   (0.8ms)  CREATE TABLE "bookmarks" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer NOT NULL, "user_type" varchar(255), "document_id" varchar(255), "title" varchar(255), "created_at" datetime, "updated_at" datetime, "document_type" varchar(255)) 
+   (0.0ms)  select sqlite_version(*)
+   (0.7ms)  CREATE  INDEX "index_bookmarks_on_user_id" ON "bookmarks" ("user_id")
+   (0.7ms)  CREATE TABLE "krikri_activities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "start_time" datetime, "end_time" datetime, "agent" varchar(255), "opts" text, "created_at" datetime, "updated_at" datetime) 
+   (0.7ms)  CREATE TABLE "krikri_harvest_sources" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "institution_id" integer, "name" varchar(255), "source_type" varchar(255), "metadata_schema" varchar(255), "uri" varchar(255), "notes" text, "created_at" datetime, "updated_at" datetime, "opts" text) 
+   (0.8ms)  CREATE TABLE "krikri_institutions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "notes" text, "created_at" datetime, "updated_at" datetime) 
+   (2.0ms)  CREATE TABLE "krikri_qa_reports" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "provider" varchar(255), "field_report" text, "count_report" text, "created_at" datetime, "updated_at" datetime) 
+   (1.6ms)  CREATE TABLE "searches" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "query_params" text, "user_id" integer, "user_type" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.5ms)  CREATE  INDEX "index_searches_on_user_id" ON "searches" ("user_id")
+   (0.9ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar(255) DEFAULT '' NOT NULL, "encrypted_password" varchar(255) DEFAULT '' NOT NULL, "reset_password_token" varchar(255), "reset_password_sent_at" datetime, "remember_created_at" datetime, "sign_in_count" integer DEFAULT 0 NOT NULL, "current_sign_in_at" datetime, "last_sign_in_at" datetime, "current_sign_in_ip" varchar(255), "last_sign_in_ip" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (0.6ms)  CREATE UNIQUE INDEX "index_users_on_email" ON "users" ("email")
+   (0.1ms)              SELECT sql
             FROM sqlite_master
             WHERE name='index_users_on_email' AND type='index'
             UNION ALL
@@ -150,18 +150,18 @@ Migrating to AddPolymorphicTypeToBookmarks (20160304151249)
             FROM sqlite_temp_master
             WHERE name='index_users_on_email' AND type='index'
 
-   (5.3ms)  CREATE UNIQUE INDEX "index_users_on_reset_password_token" ON "users" ("reset_password_token")
-   (4.0ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
-   (4.4ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
-   (1.2ms)  SELECT version FROM "schema_migrations"
-   (4.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20160304151249')
-   (5.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20160304151204')
-   (4.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20160304151247')
-   (4.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20160304151248')
-   (4.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141113200614')
-   (4.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141113200643')
-   (3.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141212220924')
-   (3.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150106164218')
-   (4.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150309160112')
-   (3.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150310190054')
-   (4.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150328035550')
+   (0.7ms)  CREATE UNIQUE INDEX "index_users_on_reset_password_token" ON "users" ("reset_password_token")
+   (0.7ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.8ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20160226160228')
+   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20160226160200')
+   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20160226160226')
+   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20160226160227')
+   (0.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141113200614')
+   (0.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141113200643')
+   (0.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141212220924')
+   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150106164218')
+   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150309160112')
+   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150310190054')
+   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150328035550')

data/spec/lib/krikri/async_uri_getter_spec.rb

@@ -92,15 +92,39 @@ describe Krikri::AsyncUriGetter do
         .to_raise(Faraday::ConnectionFailed)
     end
 
-    it 'propagates exceptions to the calling thread when #join is called' do
-      r = subject.add_request(uri: test_uri)
-      expect { r.join }.to raise_error(Faraday::ConnectionFailed)
+    context 'without inline exceptions' do
+      it 'propagates exceptions to the calling thread when #join is called' do
+        r = subject.add_request(uri: test_uri)
+        expect { r.join }.to raise_error(Faraday::ConnectionFailed)
+      end
+
+      it 'propagates exceptions when the response is requested' do
+        r = subject.add_request(uri: test_uri)
+        expect { r.with_response { |_| } }
+          .to raise_error(Faraday::ConnectionFailed)
+      end
     end
 
-    it 'propagates exceptions when the response is requested' do
-      r = subject.add_request(uri: test_uri)
-      expect { r.with_response { |_| } }
-        .to raise_error(Faraday::ConnectionFailed)
+    context 'with inline exceptions' do
+      subject { described_class.new(opts: { inline_exceptions: true }) }
+
+      it 'does not throw an exception when #join is called' do
+        r = subject.add_request(uri: test_uri)
+        expect { r.join }.to_not raise_error
+      end
+
+      it 'passes the exception as a 5xx HTTP response' do
+        r = subject.add_request(uri: test_uri)
+        r.with_response do |response|
+          expect(response.status).to eq(500)
+          expect(response.body).to include('Exception')
+
+          headers = response.headers
+          expect(headers.keys).to include('X-Internal-Response')
+          expect(headers.keys).to include('X-Exception-Message')
+          expect(headers['X-Exception']).to be_kind_of(Exception)
+        end
+      end
     end
   end
 end

data/spec/lib/krikri/entity_consumer_spec.rb

@@ -1,18 +1,50 @@
 require 'spec_helper'
 
 describe Krikri::EntityConsumer do
-
   before(:all) do
     DatabaseCleaner.clean_with(:truncation)
     create(:krikri_harvest_activity)
     create(:krikri_mapping_activity)
   end
 
-  context 'as a mapper agent' do
-    let(:generator_uri) { 'http://example.org/ldp/activity/2' }
-    let(:opts) do
-      {name: :agent_map, generator_uri: generator_uri}
+  subject { DummyAgent.new }
+  let(:generator_uri) { Krikri::Activity.base_uri / 2 }
+
+  before  { class DummyAgent; include Krikri::EntityConsumer; end }
+  after   { Object.send(:remove_const, :DummyAgent) }
+
+  describe 'deprecated interface' do
+    it 'sets the activity' do
+      expect { subject.assign_generator_activity!(generator_uri: generator_uri) }
+        .to change { subject.generator_activity }
+             .to Krikri::Activity.from_uri(generator_uri)
+    end
+
+    it 'activity defaults to nil' do
+      expect(subject.generator_activity).to be_nil
+    end
+
+    it 'integrates with new interface' do
+      expect { subject.assign_generator_activity!(generator_uri: generator_uri) }
+        .to change { subject.entity_source }
+             .to Krikri::Activity.from_uri(generator_uri)
     end
+  end
+
+  describe '#entities' do
+    it 'is empty when no source is available' do
+      expect(subject.entities).to be_empty
+    end
+  end
+
+  describe '#entity_source' do
+    it 'is nil by default' do
+      expect(subject.entities).to be_empty
+    end
+  end
+
+  context 'as a mapper agent' do
+    let(:opts) { { name: :agent_map, generator_uri: generator_uri } }
     let(:mapper_agent) { Krikri::Mapper::Agent.new(opts) }
 
     describe '#assign_generator_activity!' do
@@ -21,7 +53,5 @@ describe Krikri::EntityConsumer do
           .to respond_to(:entities)
       end
     end
-
   end
-
 end

data/spec/lib/krikri/harvester_spec.rb

@@ -4,8 +4,11 @@ describe Krikri::Harvester do
 
   # Our subject is an instance of a dummy class that mixes in
   # Krikri::Harvester.
-  let(:klass) { class DummyHarvester; end; DummyHarvester }
-  subject { klass.include(Krikri::Harvester).new(:uri => 'urn:fake_uri') }
+  before { class DummyHarvester; include(Krikri::Harvester); end }
+  after  { Object.send(:remove_const, :DummyHarvester) }
+
+  let(:klass) { DummyHarvester }
+  subject { klass.new(:uri => 'urn:fake_uri') }
 
   context 'with record_ids implemented' do
     before do
@@ -33,7 +36,8 @@ describe Krikri::Harvester do
 
   describe '.entity_behavior' do
     it 'knows its entity behavior' do
-      expect(klass.entity_behavior).to eq(Krikri::OriginalRecordEntityBehavior)
+      expect(subject.class.entity_behavior)
+        .to eq(Krikri::OriginalRecordEntityBehavior)
     end
   end
 

data/spec/lib/krikri/indexer_spec.rb

@@ -8,15 +8,18 @@ describe Krikri::Indexer do
 
   subject { described_class.new(opts) }
 
-  enrichment_gen_uri_str = 'http://example.org/ldp/activity/5'
-  behaves_opts = { generator_uri: enrichment_gen_uri_str,
+  enrichment_gen_uri = Krikri::Activity.base_uri / 5
+
+  behaves_opts = { generator_uri: enrichment_gen_uri,
                    index_class:   'Krikri::QASearchIndex' }
 
-  it_behaves_like 'a software agent', behaves_opts
+  it_behaves_like 'a software agent', behaves_opts do
+    after { clear_search_index }
+  end
   
   # See mapper_agent_spec.rb regarding :opts and behaves_opts...
   let(:opts) do
-    { generator_uri: enrichment_gen_uri_str,
+    { generator_uri: enrichment_gen_uri,
       index_class:   index_class.to_s }
   end