krikri 0.12.0.pre.rc.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b7f5913ed8e669b3e0451397e3c036dead804cc
-  data.tar.gz: 541d265b195aa3d779a6ddd3e5de4eeae4faffed
+  metadata.gz: 6ac6156f3d3dfd9164e4598d0b236bff739885ed
+  data.tar.gz: 437640a56aa024e4bcb4b58a58a70e02d3f8edb5
 SHA512:
-  metadata.gz: dd37e66d03acee110f6ec49aa0d5e5ccbcdc97f246785535de6bc68ada64ce984eebfc85e1435fc3e53a75f0525fc0c36a54089e99466b58ff5b96e353ab522d
-  data.tar.gz: 4a4c71f09a89585ec8132378893241852aa72d0c8887ef0d76ba1c07e2d10a87428b1929e606eb6449b5d86ff7179eec644382e5f4d9c5abcf559735421601b1
+  metadata.gz: 9bdc4b60c7c533c4ed27d635c14fa11bef703037729edc5e4b31c80376f450289f1fb369c6f5e36d5de3ced9edd8162591d2f651bff01b6c63a1505c33861217
+  data.tar.gz: f2cc707b635d75265947eccc27617310199721186831e84b6d75ab64dab4178471631df760a5db5f01f8dff2dd42c305d8c47876216858ab0295b8035d9d6666

data/app/models/krikri/activity.rb

@@ -127,14 +127,14 @@ module Krikri
     # that have been affected by this activity.
     #
     # The kind of object that is returned depends on the EntityBehavior class
-    # that is associated with the SoftwareAgent that is represented by the
+    # that is associated with the SoftwareAgent class that is represented by the
     # Activity's `agent' field.
     #
     # @param [Array<Object>] *args Arguments to pass along to
     #                              EntityBehavior#entities
     # @return [Enumerator] Objects
     def entities(*args)
-      agent_instance.entity_behavior.entities(self, *args)
+      agent.constantize.entity_behavior.entities(self, *args)
     end
   end
 end

data/lib/krikri/enricher.rb

@@ -33,14 +33,6 @@ module Krikri
       :enrichment
     end
 
-    ##
-    # @see Krikri::Activity#entities
-    # @see Krikri::EntityBehavior
-    # @see Krikri::SoftwareAgent#entity_behavior
-    def entity_behavior
-      @entity_behavior ||= Krikri::AggregationEntityBehavior
-    end
-
     ##
     # Create a new Enricher, given a hash of options:
     #   generator_uri:  the LDP URI of the Activity that generated the mapped
@@ -53,6 +45,7 @@ module Krikri
     def initialize(opts = {})
       @generator_uri = RDF::URI(opts.fetch(:generator_uri))
       @chain = deep_sym(opts.fetch(:chain) { {} })
+      @entity_behavior = self.class.entity_behavior
       assign_generator_activity!(opts)
     end
 

data/lib/krikri/harvester.rb

@@ -43,15 +43,13 @@ module Krikri
         def queue_name
           :harvest
         end
-      end
-    end
 
-    ##
-    # @see Krikri::Activity#entities
-    # @see Krikri::EntityBehavior
-    # @see Krikri::SoftwareAgent#entity_behavior
-    def entity_behavior
-      @entity_behavior ||= Krikri::OriginalRecordEntityBehavior
+        ##
+        # @see Krikri::SoftwareAgent::ClassMethods#entity_behavior
+        def entity_behavior
+          Krikri::OriginalRecordEntityBehavior
+        end
+      end
     end
 
     ##
@@ -79,6 +77,7 @@ module Krikri
       @harvest_behavior = opts.delete(:harvest_behavior) do
         Krikri::Harvesters::BasicSaveBehavior
       end.to_s.constantize
+      @entity_behavior = self.class.entity_behavior
     end
 
     delegate :process_record, :to => :@harvest_behavior

data/lib/krikri/mapper.rb

@@ -98,16 +98,9 @@ module Krikri
         :mapping
       end
 
-      ##
-      # @see Krikri::Activity#entities
-      # @see Krikri::EntityBehavior
-      # @see Krikri::SoftwareAgent#entity_behavior
-      def entity_behavior
-        @entity_behavior ||= Krikri::AggregationEntityBehavior
-      end
-
       def initialize(opts = {})
         @name = opts.fetch(:name).to_sym
+        @entity_behavior = self.class.entity_behavior
         assign_generator_activity!(opts)
       end
 

data/lib/krikri/software_agent.rb

@@ -11,20 +11,12 @@ module Krikri
   module SoftwareAgent
     extend ActiveSupport::Concern
 
-    included do
-      attr_writer :entity_behavior
-    end
-
     ##
-    # Return the EntityBehavior associated with the SoftwareAgent.
-    # Meant to be overridden as necessary.
-    #
-    # @see Krikri::Activity#entities
-    # @see Krikri::EntityBehavior
-    #
-    def entity_behavior
-      @entity_behavior ||= nil
-    end
+    # @!attribute [rw] entity_behavior
+    #   @return [Krikri::EntityBehavior] the entity initialization behavior to  use with this 
+    #     SoftwareAgent.
+    #   @see Krikri::Activity#entities
+    included { attr_accessor :entity_behavior }
 
     ##
     # Return an agent name suitable for saving in an Activity.
@@ -61,6 +53,14 @@ module Krikri
         to_s
       end
 
+      ##
+      # @return [Krikri::EntityBehavior] the default entity initializiation 
+      #   behavior for this class of SoftwareAgents
+      # @see #entity_behavior
+      def entity_behavior
+        Krikri::AggregationEntityBehavior
+      end
+
       ##
       # @return the name of the default queue for jobs invoking this
       #   SoftwareAgent

data/lib/krikri/version.rb

@@ -1,3 +1,3 @@
 module Krikri
-  VERSION = '0.12.0-rc.1'.freeze
+  VERSION = '0.12.0'.freeze
 end

data/spec/internal/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /vagrant
   specs:
-    krikri (0.11.2)
+    krikri (0.12.0.pre.rc.1)
       analysand (= 4.0.0)
       audumbla (~> 0.1)
       blacklight (~> 5.8.0)

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

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

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 = '06f55f081179339565cd683591dffdaf57f6f340206d19f26fd13a1c9fd18c4d549709d74a960c5636a6f6f3e959e3316a864a73cf3c5d41b012c7c067a6c049'
+  # config.secret_key = '0b72f71851a885c429315093ac2db2dcd3823429a5a4f9f7c6ac233e8b2ecdc4cb6ecbc70b265102e87b6bd969325eed8197e6ac3cfdfe95f0b0fa335f180147'
 
   # ==> 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 = '379239f236a953fc942bf473655eedc8b90c653f6404ac06cd45c71690e6565d6671f63701b120cb1170eaa579c387059ad10a9b537c0e7ef32b702b73e6efd6'
+  # config.pepper = '94ee00c9080cdb76c8c060c1af2f24299179ef43587ed58fa553da7ab56b4da1dc25c2b351f8ef027abafc2df9d53584566312c2a0586faac7edb43b46b9c905'
 
   # ==> 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: 40552a8973624429a73ba6bda6a5797bae4ad3495d8404891ace56a633405174fa9365c34e9dc3b579f92ed26f165c72c3e9b454ca814cab20b91893c00eb93d
+  secret_key_base: 54220d04d57b5dcc6dd2eadc805455695bda1ca0ed39225d5bf33b640fa983eeec53bb3e734a9af4b2c67dbae35033203ddb1e2a95851af90a0a6d66a34aa33c
 
 test:
-  secret_key_base: b7a204846993178e23440606508244c4a6d865bfaff1d432b9a466b6bd2f522acb45ea1e36aaf39206ff36b0e32b340146fdd09fad6061ec4519b2ae9d7349cc
+  secret_key_base: f3ba998d333d9560c0bf83d53703cd7efd707afa57ccc4d0a9f00029b26c78b4341e03799dd390ba88e41e199789d9fa330cd507c6e5e3756f3edc2a847ae83d
 
 # 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: 20160224174740) do
+ActiveRecord::Schema.define(version: 20160304151249) do
 
   create_table "bookmarks", force: true do |t|
     t.integer  "user_id",       null: false

data/spec/internal/log/development.log

@@ -1,57 +1,57 @@
-   (5.1ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (6.1ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
    (0.1ms)  select sqlite_version(*)
-   (5.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
-  ActiveRecord::SchemaMigration Load (1.0ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (4.5ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  ActiveRecord::SchemaMigration Load (1.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
 Migrating to CreateKrikriInstitutions (20141113200614)
    (0.1ms)  begin transaction
-   (2.7ms)  CREATE TABLE "krikri_institutions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "notes" text, "created_at" datetime, "updated_at" datetime) 
-  SQL (0.8ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20141113200614"]]
-   (2.4ms)  commit 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
 Migrating to CreateKrikriHarvestSources (20141113200643)
    (0.1ms)  begin transaction
-   (2.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) 
-  SQL (1.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20141113200643"]]
-   (2.8ms)  commit 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
 Migrating to CreateKrikriActivities (20141212220924)
-   (0.2ms)  begin transaction
-   (4.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.8ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20141212220924"]]
-   (2.3ms)  commit transaction
+   (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
 Migrating to AddOptsToKrikriHarvestSources (20150106164218)
    (0.1ms)  begin transaction
-   (4.4ms)  ALTER TABLE "krikri_harvest_sources" ADD "opts" text
+   (3.3ms)  ALTER TABLE "krikri_harvest_sources" ADD "opts" text
   SQL (0.9ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150106164218"]]
-   (2.1ms)  commit transaction
+   (2.8ms)  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.3ms)  SELECT * FROM "krikri_activities"
-   (2.9ms)  DROP TABLE "krikri_activities"
+   (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"
    (0.2ms)  DROP TABLE "akrikri_activities"
   SQL (0.9ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150309160112"]]
-   (3.5ms)  commit transaction
+   (3.2ms)  commit transaction
 Migrating to RemoveOptsLimitInKrikriActivities (20150310190054)
-   (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) 
-   (1.8ms)  SELECT * FROM "krikri_activities"
-   (2.9ms)  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, "created_at" datetime, "updated_at" datetime) 
+   (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)  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.6ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150310190054"]]
-   (2.2ms)  commit transaction
+  SQL (0.7ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150310190054"]]
+   (2.6ms)  commit transaction
 Migrating to AddQaReport (20150328035550)
    (0.1ms)  begin transaction
-   (3.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 (1.3ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150328035550"]]
-   (2.8ms)  commit transaction
-Migrating to DeviseCreateUsers (20160224174647)
-   (0.2ms)  begin transaction
-   (4.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) 
+   (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.1ms)              SELECT sql
+   (0.3ms)              SELECT sql
             FROM sqlite_master
             WHERE name='index_users_on_email' AND type='index'
             UNION ALL
@@ -59,11 +59,11 @@ Migrating to DeviseCreateUsers (20160224174647)
             FROM sqlite_temp_master
             WHERE name='index_users_on_email' AND type='index'
 
-   (0.2ms)  CREATE UNIQUE INDEX "index_users_on_reset_password_token" ON "users" ("reset_password_token")
-  SQL (0.8ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160224174647"]]
-   (2.6ms)  commit transaction
-  ActiveRecord::SchemaMigration Load (1.0ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-   (1.5ms)              SELECT sql
+   (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
             FROM sqlite_master
             WHERE name='index_users_on_reset_password_token' AND type='index'
             UNION ALL
@@ -71,7 +71,7 @@ Migrating to DeviseCreateUsers (20160224174647)
             FROM sqlite_temp_master
             WHERE name='index_users_on_reset_password_token' AND type='index'
 
-   (1.2ms)              SELECT sql
+   (1.3ms)              SELECT sql
             FROM sqlite_master
             WHERE name='index_users_on_email' AND type='index'
             UNION ALL
@@ -79,27 +79,27 @@ Migrating to DeviseCreateUsers (20160224174647)
             FROM sqlite_temp_master
             WHERE name='index_users_on_email' AND type='index'
 
-  ActiveRecord::SchemaMigration Load (4.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-Migrating to CreateSearches (20160224174738)
-   (0.2ms)  begin transaction
-   (8.2ms)  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.2ms)  select sqlite_version(*)
-   (2.5ms)  CREATE  INDEX "index_searches_on_user_id" ON "searches" ("user_id")
-  SQL (2.8ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160224174738"]]
-   (15.9ms)  commit transaction
-Migrating to CreateBookmarks (20160224174739)
+  ActiveRecord::SchemaMigration Load (1.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateSearches (20160304151247)
+   (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
-   (6.6ms)  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", "20160224174739"]]
-   (3.0ms)  commit transaction
-Migrating to AddPolymorphicTypeToBookmarks (20160224174740)
+   (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
-   (10.9ms)  ALTER TABLE "bookmarks" ADD "document_type" varchar(255)
-   (2.8ms)  CREATE  INDEX "index_bookmarks_on_user_id" ON "bookmarks" ("user_id")
-  SQL (1.3ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160224174740"]]
-   (12.8ms)  commit transaction
-  ActiveRecord::SchemaMigration Load (5.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-   (2.2ms)              SELECT sql
+   (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
             FROM sqlite_master
             WHERE name='index_bookmarks_on_user_id' AND type='index'
             UNION ALL
@@ -107,7 +107,7 @@ Migrating to AddPolymorphicTypeToBookmarks (20160224174740)
             FROM sqlite_temp_master
             WHERE name='index_bookmarks_on_user_id' AND type='index'
 
-   (1.7ms)              SELECT sql
+   (2.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 (20160224174740)
             FROM sqlite_temp_master
             WHERE name='index_searches_on_user_id' AND type='index'
 
-   (1.7ms)              SELECT sql
+   (0.9ms)              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 (20160224174740)
             FROM sqlite_temp_master
             WHERE name='index_users_on_reset_password_token' AND type='index'
 
-   (2.9ms)              SELECT sql
+   (1.6ms)              SELECT sql
             FROM sqlite_master
             WHERE name='index_users_on_email' AND type='index'
             UNION ALL
@@ -131,18 +131,18 @@ Migrating to AddPolymorphicTypeToBookmarks (20160224174740)
             FROM sqlite_temp_master
             WHERE name='index_users_on_email' AND type='index'
 
-   (9.2ms)  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)) 
+   (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(*)
-   (8.2ms)  CREATE  INDEX "index_bookmarks_on_user_id" ON "bookmarks" ("user_id")
-   (7.8ms)  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) 
-   (10.2ms)  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) 
-   (8.2ms)  CREATE TABLE "krikri_institutions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "notes" text, "created_at" datetime, "updated_at" datetime) 
-   (9.1ms)  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) 
-   (11.7ms)  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) 
-   (5.9ms)  CREATE  INDEX "index_searches_on_user_id" ON "searches" ("user_id")
-   (8.0ms)  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) 
-   (12.3ms)  CREATE UNIQUE INDEX "index_users_on_email" ON "users" ("email")
-   (6.3ms)              SELECT sql
+   (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
             FROM sqlite_master
             WHERE name='index_users_on_email' AND type='index'
             UNION ALL
@@ -150,18 +150,18 @@ Migrating to AddPolymorphicTypeToBookmarks (20160224174740)
             FROM sqlite_temp_master
             WHERE name='index_users_on_email' AND type='index'
 
-   (12.2ms)  CREATE UNIQUE INDEX "index_users_on_reset_password_token" ON "users" ("reset_password_token")
-   (8.0ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
-   (9.1ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
-   (2.8ms)  SELECT version FROM "schema_migrations"
-   (8.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20160224174740')
-   (8.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20160224174647')
-   (9.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20160224174738')
-   (6.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20160224174739')
-   (7.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141113200614')
-   (7.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141113200643')
-   (7.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141212220924')
-   (7.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150106164218')
-   (9.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150309160112')
-   (8.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150310190054')
-   (7.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150328035550')
+   (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')