krikri 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6b203c78eb59c0ebe59c473df10e84eaaa6aba5
-  data.tar.gz: 9e1824d2badadd4a0aa6d2fcdbaa89ed6b650da7
+  metadata.gz: 9b2d8957a0e4e4129ae3a818d8bbd972a14bc591
+  data.tar.gz: 79217f0cc7464b0cec61013d7b0fc10cb6c53f99
 SHA512:
-  metadata.gz: 0ecaf50ef5597d05994ffdf031145e661e0a4a8c23a90fcc3e29a5958f41e8523a27a75e9ba344484f4bdbdb9d6f5853d8b8c8b03aa9fe43629de20e64114ed9
-  data.tar.gz: e7dd24afa55cfa79efe78a5804725e0368bdcfa22721a779b9052290816f5a217980bddd7b6d559b4fe9623e9b65d8af5ea87fd120e7f2c57a37bdb5b327149b
+  metadata.gz: 788f41ca87a996bc7ee6bfcec0b02f298020f73a0075df7154479b4cfc3ce065d45c38bc957d8e9c99bd10de4a1a344d512a4dae17f35cc6c3f12063d821a264
+  data.tar.gz: 6d25298019ee75a91147d6c6f2f973311bd46e9db7c0a967486515c1b95490c90c357d0d39aa7b1b8df97778d1172b8e469e41e4bb176f7c560fa7120a34dd88

data/app/controllers/krikri/records_controller.rb

@@ -51,14 +51,14 @@ module Krikri
       # :show may be set to false if you don't want the facet to be drawn in the
       # facet bar
 
-      config.add_facet_field 'sourceResource_type_id', :label => 'Type'
+      config.add_facet_field 'sourceResource_type_providedLabel', :label => 'Type'
       config.add_facet_field 'sourceResource_format', :label => 'Format'
-      config.add_facet_field 'sourceResource_spatial_name', :label => 'Place'
-      config.add_facet_field 'sourceResource_subject_name', :label => 'Subject'
+      config.add_facet_field 'sourceResource_spatial_providedLabel', :label => 'Place'
+      config.add_facet_field 'sourceResource_subject_providedLabel', :label => 'Subject'
       config.add_facet_field 'sourceResource_collection_title',
                              :label => 'Collection'
-      config.add_facet_field 'dataProvider_name', :label => 'Data Provider'
-      config.add_facet_field 'sourceResource_creator_name', :label => 'Creator'
+      config.add_facet_field 'dataProvider_providedLabel', :label => 'Data Provider'
+      config.add_facet_field 'sourceResource_creator_providedLabel', :label => 'Creator'
 
       # Have BL send all facet field names to Solr, which has been the default
       # previously. Simply remove these lines if you'd rather use Solr request
@@ -72,10 +72,10 @@ module Krikri
                              :label => 'Description'
       config.add_index_field 'sourceResource_date_providedLabel',
                              :label => 'Date'
-      config.add_index_field 'sourceResource_type_id', :label => 'Type'
+      config.add_index_field 'sourceResource_type_providedLabel', :label => 'Type'
       config.add_index_field 'sourceResource_format', :label => 'Format'
       config.add_index_field 'sourceResource_rights', :label => 'Rights'
-      config.add_index_field 'dataProvider_name', :label => 'Data Provider'
+      config.add_index_field 'dataProvider_providedLabel', :label => 'Data Provider'
 
       config.index.thumbnail_field = :preview_id
 

data/app/models/krikri/validation_report.rb

@@ -2,7 +2,7 @@ module Krikri
   class ValidationReport
     attr_accessor :provider_id, :page, :rows
 
-    REQUIRED_FIELDS = ['dataProvider_name', 'isShownAt_id', 'preview_id',
+    REQUIRED_FIELDS = ['dataProvider_providedLabel', 'isShownAt_id', 'preview_id',
                        'sourceResource_rights', 'sourceResource_title',
                        'sourceResource_type_id']
 

data/lib/krikri/harvesters/couchdb_harvester.rb

@@ -20,6 +20,7 @@ module Krikri::Harvesters
       super
       @opts = opts.fetch(:couchdb, view: '_all_docs')
       @opts[:view] ||= '_all_docs'
+      @opts[:limit] ||= 10
       @client = Analysand::Database.new(uri)
     end
 
@@ -35,34 +36,89 @@ module Krikri::Harvesters
     # @see Analysand::StreamingViewResponse
     def record_ids(opts = {})
       view = opts[:view] || @opts[:view]
-      client.view(view, include_docs: false, stream: true).keys.lazy
+      # The set of record ids is all of the record IDs in the database minus
+      # the IDs of CouchDB design documents.
+      view_opts = {include_docs: false, stream: true}
+      client.view(view, view_opts).keys.lazy.select do |k|
+        !k.start_with?('_design')
+      end
     end
 
     ##
-    # Returns the total number of documents reported by a CouchDB view.
+    # Return the total number of documents reported by a CouchDB view.
+    #
+    # @param opts [Hash]  Analysand::Database#view options
+    #                     - view:  database view name
+    # @return [Fixnum]
+    #
     def count(opts = {})
       view = opts[:view] || @opts[:view]
-      client.view(view,
-                  limit: 0,
-                  include_docs: false,
-                  stream: true).total_rows
+      # The count that we want is the total documents in the database minus
+      # CouchDB design documents.  Asking for the design documents will give us
+      # the total count in addition to letting us determine the number of
+      # design documents.
+      v = client.view(view,
+                      include_docs: false,
+                      stream: false,
+                      startkey: '_design',
+                      endkey: '_design0')
+      total = v.total_rows
+      design_doc_count = v.keys.size
+      total - design_doc_count
     end
 
     ##
-    # Streams a response from a CouchDB view to yield documents.
+    # Makes requests to a CouchDB view to yield documents.
     #
     # The following will only send requests to the endpoint until it
     # has 1000 records:
     #
     #     records.take(1000)
     #
+    # Batches of records are requested, in order to avoid using
+    # `Analysand::StreamingViewResponse`, and the CouchDB `startkey` parameter
+    # is used for greater efficiency than `skip` in locating the next page of
+    # records.
+    #
+    # @return [Enumerator]
     # @see Analysand::Viewing
-    # @see Analysand::StreamingViewResponse
+    # @see http://docs.couchdb.org/en/latest/couchapp/views/collation.html#all-docs
     def records(opts = {})
       view = opts[:view] || @opts[:view]
-      client.view(view, include_docs: true, stream: true).docs.lazy.map do |r|
-        @record_class.build(mint_id(r['_id']), r.to_json, 'application/json')
+      limit = opts[:limit] || @opts[:limit]
+      record_rows(view, limit).map do |row|
+        @record_class.build(
+          mint_id(row['doc']['_id']),
+          row['doc'].to_json,
+          'application/json'
+        )
+      end
+    end
+
+    ##
+    # Return an enumerator that provides individual records from batched view
+    # requests.
+    #
+    # @return [Enumerator]
+    # @see #records
+    def record_rows(view, limit)
+      en = Enumerator.new do |e|
+        view_opts = {include_docs: true, stream: false, limit: limit}
+        rows_retrieved = 0
+        total_rows = nil
+        loop do
+          v = client.view(view, view_opts)
+          total_rows ||= v.total_rows
+          rows_retrieved += v.rows.size
+          v.rows.each do |row|
+            next if row['id'].start_with?('_design')
+            e.yield row
+          end
+          break if rows_retrieved == total_rows
+          view_opts[:startkey] = v.rows.last['id'] + '0'
+        end
       end
+      en.lazy
     end
 
     ##

data/lib/krikri/version.rb

@@ -1,3 +1,3 @@
 module Krikri
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/spec/internal/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mark/Documents/Code/dpla/KriKri
   specs:
-    krikri (0.5.1)
+    krikri (0.5.3)
       analysand (= 4.0.0)
       blacklight (~> 5.8.0)
       devise (~> 3.4.1)
@@ -89,7 +89,7 @@ GEM
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.3.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.9.1)
@@ -124,7 +124,7 @@ GEM
     equivalent-xml (0.5.1)
       nokogiri (>= 1.4.3)
     erubis (2.7.0)
-    execjs (2.4.0)
+    execjs (2.5.0)
     factory_girl (4.4.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.4.1)
@@ -240,13 +240,13 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    rdf (1.1.10)
+    rdf (1.1.11)
       link_header (~> 0.0, >= 0.0.8)
     rdf-aggregate-repo (1.1.0)
       rdf (>= 1.1)
     rdf-isomorphic (1.1.0)
       rdf (>= 1.1)
-    rdf-json (1.1.1)
+    rdf-json (1.1.2)
       rdf (~> 1.1)
     rdf-marmotta (0.0.8)
       nokogiri
@@ -254,7 +254,7 @@ GEM
       rdf (~> 1.1)
       rdf-rdfxml (~> 1.1)
       sparql-client (~> 1.1.4)
-    rdf-microdata (2.0)
+    rdf-microdata (2.0.1)
       htmlentities (~> 4.3)
       nokogiri (~> 1.6)
       rdf (~> 1.1)
@@ -267,7 +267,7 @@ GEM
       rdf (~> 1.1, >= 1.1.6)
       rdf-aggregate-repo
       rdf-xsd (~> 1.1)
-    rdf-rdfxml (1.1.3)
+    rdf-rdfxml (1.1.4)
       htmlentities (~> 4.3)
       rdf (~> 1.1, >= 1.1.6)
       rdf-rdfa (~> 1.1, >= 1.1.4.1)
@@ -282,9 +282,9 @@ GEM
       rdf-turtle (~> 1.1, >= 1.1.3)
     rdf-trix (1.1.0)
       rdf (>= 1.1)
-    rdf-turtle (1.1.5)
+    rdf-turtle (1.1.6)
       ebnf (~> 0.3, >= 0.3.6)
-      rdf (~> 1.1, >= 1.1.4)
+      rdf (~> 1.1, >= 1.1.10)
     rdf-xsd (1.1.3)
       rdf (~> 1.1, >= 1.1.9)
     rdoc (4.2.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 = '85c1dc12a2d01e31c18e6af4a99554055b3b5e676816c6e116f6a66f246082e39241563291d1dda640a201c1e05321cead02a080b7671b05cb390ef9f40b586e'
+# Blacklight.secret_key = '0d06e6bc99e4c427c3b5d75b00b5b415038ebb832c8f983540db6ba603143e638c210786531582afcbdbc86be5fe9bc03ebfcd24c0f8d39affa46db71875c5d8'
 

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 = 'd2709715f3121aee4cca787a33fe444930eca3960d96dc11ceac86b6e0b7cc221c533eaf330956dad2bb58a259924e559a21bcf83150309f2168c766d941d899'
+  # config.secret_key = '8af3c3fb5037ca0803eaa67ac97b6d1772505b16b62f06d0189d3a788b55028452a217bc9987b13670be761cce89b19e29f5e30f5906137782080f1c7ece9f5d'
 
   # ==> 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 = '74f48822ac8273a684fdad7e3831d5a54de52b3eb9e52cb9e6a1c7e8db1ddfcf75b95359ecc3b6564892ec5abd83421a8237ee61c4f7f0dd399b2b5f96296bdb'
+  # config.pepper = 'c3f0259db44a3013e15ea80e829622d1a9b0fc10edc49c94243a6ade494db2d2f2a53354cc13a0bde446c0a6eb21a5552ad6deea3c5c60c54a21c948066a91e8'
 
   # ==> 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: 0951375aa31191755be394d5bd477a0529bca96a8a6eaff31d7fc9a154c796cafc00d869d5833446f33046835e0f7edd604dea36e8188c62a544fc77957414ff
+  secret_key_base: 5e14aec5bae471921d516befadda906e28a79854b2c090746fa596331a6ab3fcd58f13ea3e2850b2b8a0aeb9489cec7af350148f502f17027bbc4b2264588d0a
 
 test:
-  secret_key_base: 0665e80e05c13be03eed0a78b3b3df3b3da4ea4a2707ce5226d84aaf4af0f7ad521e85b3aed8d5fdc00622a47345a2e3fc301739e14d442e12d7805d9c754a11
+  secret_key_base: 2c8c52ae7e1103728d1fd3630e08355e1c4ed01bb00443ebeac34cf5f07b5641a7e9cd59fa94ea362b91edbdcceae406ed63846160b04204f44c2b7fc4e81e80
 
 # 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: 20150406003045) do
+ActiveRecord::Schema.define(version: 20150408190545) do
 
   create_table "bookmarks", force: true do |t|
     t.integer  "user_id",       null: false

data/spec/internal/log/development.log

@@ -1,5 +1,5 @@
    (0.9ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
-   (0.1ms)  select sqlite_version(*)
+   (0.4ms)  select sqlite_version(*)
    (0.7ms)  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)
@@ -8,50 +8,50 @@ Migrating to CreateKrikriInstitutions (20141113200614)
   SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20141113200614"]]
    (0.6ms)  commit transaction
 Migrating to CreateKrikriHarvestSources (20141113200643)
-   (0.0ms)  begin transaction
+   (0.1ms)  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.0ms)  begin transaction
+   (0.1ms)  begin transaction
    (0.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.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20141212220924"]]
-   (0.5ms)  commit transaction
+   (0.6ms)  commit transaction
 Migrating to AddOptsToKrikriHarvestSources (20150106164218)
-   (0.0ms)  begin transaction
-   (0.3ms)  ALTER TABLE "krikri_harvest_sources" ADD "opts" text
+   (0.1ms)  begin transaction
+   (0.7ms)  ALTER TABLE "krikri_harvest_sources" ADD "opts" text
   SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150106164218"]]
-   (0.5ms)  commit transaction
+   (0.6ms)  commit transaction
 Migrating to ChangeOptsInKrikriActivities (20150309160112)
-   (0.0ms)  begin transaction
-   (0.8ms)  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.1ms)  begin transaction
+   (1.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.1ms)  SELECT * FROM "krikri_activities"
-   (0.2ms)  DROP TABLE "krikri_activities"
+   (0.9ms)  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.3ms)  DROP TABLE "akrikri_activities"
   SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150309160112"]]
-   (0.9ms)  commit transaction
+   (0.8ms)  commit transaction
 Migrating to RemoveOptsLimitInKrikriActivities (20150310190054)
-   (0.0ms)  begin transaction
+   (0.1ms)  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) 
    (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.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.0ms)  SELECT * FROM "akrikri_activities"
    (0.1ms)  DROP TABLE "akrikri_activities"
   SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150310190054"]]
    (0.7ms)  commit transaction
 Migrating to AddQaReport (20150328035550)
-   (0.0ms)  begin transaction
-   (0.2ms)  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) 
+   (0.1ms)  begin transaction
+   (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.6ms)  commit transaction
-Migrating to DeviseCreateUsers (20150406003020)
+Migrating to DeviseCreateUsers (20150408190519)
    (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
+   (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
@@ -59,8 +59,8 @@ Migrating to DeviseCreateUsers (20150406003020)
             FROM sqlite_temp_master
             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 (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150406003020"]]
+   (0.2ms)  CREATE UNIQUE INDEX "index_users_on_reset_password_token" ON "users" ("reset_password_token")
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150408190519"]]
    (0.6ms)  commit transaction
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
    (0.1ms)              SELECT sql
@@ -80,24 +80,24 @@ Migrating to DeviseCreateUsers (20150406003020)
             WHERE name='index_users_on_email' AND type='index'
 
   ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-Migrating to CreateSearches (20150406003043)
+Migrating to CreateSearches (20150408190543)
    (0.1ms)  begin transaction
-   (0.5ms)  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.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.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", "20150406003043"]]
-   (0.5ms)  commit transaction
-Migrating to CreateBookmarks (20150406003044)
-   (0.0ms)  begin transaction
-   (0.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) 
-  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150406003044"]]
-   (0.5ms)  commit transaction
-Migrating to AddPolymorphicTypeToBookmarks (20150406003045)
-   (0.0ms)  begin transaction
-   (0.2ms)  ALTER TABLE "bookmarks" ADD "document_type" varchar(255)
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150408190543"]]
+   (2.2ms)  commit transaction
+Migrating to CreateBookmarks (20150408190544)
+   (0.1ms)  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", "20150408190544"]]
+   (0.6ms)  commit transaction
+Migrating to AddPolymorphicTypeToBookmarks (20150408190545)
+   (0.2ms)  begin transaction
+   (0.4ms)  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", "20150406003045"]]
-   (0.8ms)  commit transaction
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150408190545"]]
+   (0.6ms)  commit transaction
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
    (0.1ms)              SELECT sql
             FROM sqlite_master
@@ -131,16 +131,16 @@ Migrating to AddPolymorphicTypeToBookmarks (20150406003045)
             FROM sqlite_temp_master
             WHERE name='index_users_on_email' AND type='index'
 
-   (0.9ms)  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.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.6ms)  CREATE  INDEX "index_bookmarks_on_user_id" ON "bookmarks" ("user_id")
+   (0.7ms)  CREATE  INDEX "index_bookmarks_on_user_id" ON "bookmarks" ("user_id")
    (0.6ms)  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.6ms)  CREATE TABLE "krikri_institutions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "notes" text, "created_at" datetime, "updated_at" datetime) 
-   (0.9ms)  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) 
-   (0.8ms)  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.8ms)  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.7ms)  CREATE TABLE "krikri_institutions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "notes" text, "created_at" datetime, "updated_at" datetime) 
+   (0.7ms)  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) 
+   (0.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) 
    (0.7ms)  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) 
+   (1.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) 
    (0.7ms)  CREATE UNIQUE INDEX "index_users_on_email" ON "users" ("email")
    (0.1ms)              SELECT sql
             FROM sqlite_master
@@ -151,17 +151,17 @@ Migrating to AddPolymorphicTypeToBookmarks (20150406003045)
             WHERE name='index_users_on_email' AND type='index'
 
    (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.7ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (1.4ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.9ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
    (0.1ms)  SELECT version FROM "schema_migrations"
-   (0.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150406003045')
-   (0.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150406003020')
-   (0.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150406003043')
-   (0.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150406003044')
-   (0.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141113200614')
-   (0.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141113200643')
-   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141212220924')
-   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150106164218')
+   (0.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150408190545')
+   (0.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150408190519')
+   (0.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150408190543')
+   (0.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150408190544')
+   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141113200614')
+   (0.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141113200643')
+   (0.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141212220924')
+   (0.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150106164218')
    (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150309160112')
-   (0.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150310190054')
-   (0.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150328035550')
+   (0.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150310190054')
+   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150328035550')