krikri 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acb9717b689c2284ce0a35f93d7b015163815c79
-  data.tar.gz: bb147f029097ec38d27d4b89708edf712b0abf62
+  metadata.gz: 08dc724342001d3a6556c4d0b73d871b36df9ef8
+  data.tar.gz: ad8039d965681f2ff257b038218980f5cc7e0899
 SHA512:
-  metadata.gz: a83db3cc736d955d97145d3665f47993417293e9e86dc2ebc1b662b0800ce79054d91317dc90647e940bdff3b6f2c2218a96bdeb159069def9f4638540598ef6
-  data.tar.gz: d28a6972b162b22266892c0f91b890df645e25fc714741cebf92dbb21274b5bc2fdf30e6c04720eda5d0c89975a661183f0001b59fb5a106fcfa21007ba46051
+  metadata.gz: 777211674c7421f0bba2b66ae516d16dd19cad1853c0f96d089823e0a87e901a658d1cd07ce2bea333a05daa09f4907c60d729808a970a9940cf0bbb48f891c6
+  data.tar.gz: 65102709f49c72da7ac544da55db44fdec24465a21aba5bcb03b6874ed7ba24d3f29e34a2cec872c99485cb57f3ab22fd56be1d3dc52ef165ff84429de8bcc59

data/app/models/krikri/activity.rb

@@ -18,7 +18,6 @@ module Krikri
     #                   the activity
     # @!attribute start_time
     #    @return [DateTime] a datestamp marking the activity's start
-
     validate :agent_must_be_a_software_agent
 
     def agent_must_be_a_software_agent
@@ -40,18 +39,26 @@ module Krikri
     ##
     # Runs the block, setting the start and end time of the run. The given block
     # is passed an instance of the agent, and a URI representing this Activity.
+    # 
+    # Handles logging of activity start/stop and failure states.
+    #
+    # @raise [RuntimeError] re-raises logged errors on Activity failure
     def run
       if block_given?
         update_attribute(:end_time, nil) if ended?
+        Krikri::Logger
+          .log(:info, "Activity #{agent.constantize}-#{id} is running")
         set_start_time
         begin
           yield agent_instance, rdf_subject
         rescue => e
-          Rails.logger.error("Error performing Activity: #{id}\n" \
-                             "#{e.message}\n#{e.backtrace}")
+          Krikri::Logger.log(:error, "Error performing Activity: #{id}\n" \
+                                     "#{e.message}\n#{e.backtrace}")
           raise e
         ensure
           set_end_time
+          Krikri::Logger
+            .log(:info, "Activity #{agent.constantize}-#{id} is done")
         end
       end
     end
@@ -79,10 +86,20 @@ module Krikri
       JSON.parse(opts, symbolize_names: true)
     end
 
+    ##
+    # @return [RDF::URI] the uri for this activity
     def rdf_subject
       RDF::URI(Krikri::Settings['marmotta']['ldp']) /
         Krikri::Settings['prov']['activity'] / id.to_s
     end
+    alias_method :to_term, :rdf_subject
+    
+
+    ##
+    # @return [String] a string reprerestation of the activity
+    def to_s
+      inspect.to_s
+    end
 
     ##
     # Return an Enumerator of URI strings of entities (e.g. aggregations or
@@ -109,6 +126,5 @@ module Krikri
     def entities
       agent_instance.entity_behavior.entities(self)
     end
-
   end
 end

data/lib/krikri/enricher.rb

@@ -63,17 +63,16 @@ module Krikri
     # instantiation, and apply each enrichment from the enrichment chain.
     #
     def run(activity_uri = nil)
-      log :info, 'enricher is running'
       mapped_records = generator_activity.entities
       mapped_records.each do |rec|
         begin
           chain_enrichments!(rec)
           activity_uri ? rec.save_with_provenance(activity_uri) : rec.save
         rescue => e
-          log :error, "Enrichment error: #{e.message}\n#{e.backtrace}"
+          Krikri::Logger.log(:error, 
+                             "Enrichment error: #{e.message}\n#{e.backtrace}")
         end
       end
-      log :info, 'enricher is done'
     end
 
     ##

data/lib/krikri/harvester.rb

@@ -130,17 +130,16 @@ module Krikri
     # @return [Boolean]
     # @see Krirki::Harvesters:HarvestBehavior
     def run(activity_uri = nil)
-      log :info, 'harvest is running'
       records.each do |rec|
         begin
           process_record(rec, activity_uri)
         rescue => e
-          log :error, "Error harvesting record:\n#{rec.content}\n\t" \
-                      "with message:\n#{e.message}"
+          Krikri::Logger.log :error, "Error harvesting record:\n" \
+                                     "#{rec.content}\n\twith message:\n"\
+                                     "#{e.message}"
           next
         end
       end
-      log :info, 'harvest is done'
       true
     end
 

data/lib/krikri/indexer.rb

@@ -21,7 +21,7 @@ module Krikri
     include SoftwareAgent
     include EntityConsumer
 
-    attr_reader :index_class, :index_opts
+    attr_reader :index, :index_class, :index_opts
 
     def self.queue_name
       :indexing
@@ -33,14 +33,12 @@ module Krikri
       @index_opts = opts
     end
 
+    def index
+      @index ||= index_class.constantize.new(index_opts)
+    end
+
     def run
-      log :info, 'indexer is running'
-      search_index = index_class.constantize.new(index_opts)
-      search_index.update_from_activity(generator_activity)
-    rescue => e
-      Rails.logger.error("Indexing error: #{e.message}\n#{e.backtrace}")
-    ensure
-      log :info, 'indexer is done'
+      index.update_from_activity(generator_activity)
     end
   end
 end

data/lib/krikri/logger.rb

@@ -0,0 +1,38 @@
+module Krikri
+  ##
+  # An application-wide tagged logger
+  # 
+  # @example with default logger
+  #   Krikri::Logger.log :info, 'message'
+  #
+  # @example with custom logger
+  #   logger = Logger.new(my_logger)
+  #   logger.log :info, 'message'
+  class Logger
+    ##
+    # @param [ActiveSupport::TaggedLogging] logger
+    def initialize(logger = ActiveSupport::TaggedLogging.new(Rails.logger))
+      @logger = logger
+    end
+
+    class << self
+      ##
+      # Initializes a logger with the default settings and logs a message to it
+      # @see #log
+      def log(priority, msg)
+        new.log(priority, msg)
+      end
+    end
+
+    ##
+    # Log a message, tagged for application-wide consistency
+    #
+    # @param [Symbol] priority  a priority tag
+    # @param [string] msg  the message to log
+    def log(priority, msg)
+      @logger.tagged(Time.now.to_s, Process.pid, to_s) do
+        @logger.send(priority, msg)
+      end
+    end
+  end
+end

data/lib/krikri/map_crosswalk.rb

@@ -232,7 +232,7 @@ module Krikri
 
       def get_label(resource)
         return resource if resource.is_a? String
-        return resource.preflabel if resource.respond_to?(:prefLabel) &&
+        return resource.prefLabel if resource.respond_to?(:prefLabel) &&
                                  resource.prefLabel.any?
         return resource.label if resource.respond_to?(:label) &&
                                  resource.label.any?

data/lib/krikri/mapping_dsl/child_declaration.rb

@@ -20,10 +20,14 @@ module Krikri::MappingDSL
       as_sym = @as
       lambda do |target, record|
         if each_val
-          each_val.call(record).each do |value|
+          iter = each_val.respond_to?(:call) ? each_val.call(record) : each_val
+          iter.each do |value|
             map = ::Krikri::Mapping.new(target_class)
             map.define_singleton_method(as_sym) do
-              each_val.dup.select { |v| v.value == value }
+              each_val.dup.select do |v|
+                v = v.value if v.respond_to? :value
+                v == value 
+              end
             end
             map.instance_eval(&block)
             target.send(name) << map.process_record(record)

data/lib/krikri/provenance_query_client.rb

@@ -16,11 +16,11 @@ module Krikri
     #   give solutions containing the URIs for the resources in `#record`.
     def find_by_activity(activity_uri)
       raise ArgumentError, 'activity_uri must be an RDF::URI' unless
-        activity_uri.respond_to? :to_uri
+        activity_uri.respond_to? :to_term
       SPARQL_CLIENT.select(:record)
         .where([:record,
                 [RDF::PROV.wasGeneratedBy, '|', RDF::DPLA.wasRevisedBy],
-                activity_uri])
+                activity_uri.to_term])
     end
   end
 end

data/lib/krikri/search_index.rb

@@ -33,11 +33,10 @@ module Krikri
     # Shim that determines, for a particular type of index, which strategy
     # to use, adding a single document, or adding them in bulk.  Intended
     # to be overridden as necessary.
+    #
     # @see #add
     # @see #bulk_add
     def update_from_activity(activity)
-      fail "#{activity} is not an Activity" \
-        unless activity.class == Krikri::Activity
       incremental_update_from_activity(activity)
     end
 
@@ -47,12 +46,14 @@ module Krikri
     # Given an activity, use the bulk-update method to load its revised
     # entities into the search index.
     #
+    # Any errors on bulk adds are caught and logged, and the batch is skipped.
+    #
     # @param activity [Krikri::Activity]
     def bulk_update_from_activity(activity)
       all_aggs = entities_as_json_hashes(activity)
       agg_batches = bulk_update_batches(all_aggs)
       agg_batches.each do |batch|
-        bulk_add(batch)
+        index_with_error_handling(activity) { bulk_add(batch) }
       end
     end
 
@@ -83,10 +84,13 @@ module Krikri
     # Given an activity, load its revised entities into the search index one
     # at a time.
     #
+    # Any errors on individual record adds are caught and logged, and the 
+    # record is skipped.
+    #
     # @param activity [Krikri::Activity]
     def incremental_update_from_activity(activity)
       entities_as_json_hashes(activity).each do |h|
-        add(h)
+        index_with_error_handling(activity) { add(h) }
       end
     end
 
@@ -116,6 +120,20 @@ module Krikri
     def hash_for_index_schema(aggregation)
       aggregation.to_jsonld['@graph'][0]
     end
+
+    private
+    
+    ##
+    # Runs a block, catching any errors and logging them with the given 
+    # activity id.
+    def index_with_error_handling(activity, &block)
+      begin
+        yield if block_given?
+      rescue => e
+        Krikri::Logger
+          .log(:error, "indexer error for Activity #{activity}:\n#{e.message}")
+      end
+    end
   end
 
   ##

data/lib/krikri/software_agent.rb

@@ -1,8 +1,13 @@
 module Krikri
   ##
   # SoftwareAgent is a mixin for logic common to code that generates a
-  # Krikri::Activity.
+  # `Krikri::Activity`.
   #
+  # Software Agents should handle internal errors that do not result in full
+  # activity failure, and raise a `RuntimeError` when the job fails. `Activity`
+  # handles logging of activity start/stop, and failure status.
+  #
+  # @see Krikri::Activity
   module SoftwareAgent
     extend ActiveSupport::Concern
 
@@ -10,8 +15,6 @@ module Krikri
       attr_writer :entity_behavior
     end
 
-    Logger = ActiveSupport::TaggedLogging.new(Rails.logger)
-
     ##
     # Return the EntityBehavior associated with the SoftwareAgent.
     # Meant to be overridden as necessary.
@@ -41,33 +44,17 @@ module Krikri
     #
     # @return [Boolean] `true` if the run has succeeded; otherwise `false`
     #
+    # @raise [RuntimeError] when the software agent's activity fails
+    #
     # @see Krirkri::Activity
     # @see Krikri::Job.run
     def run
       fail NotImplementedError
     end
 
-    ##
-    # @see Krikri::SoftwareAgent#log
-    def log(priority, msg)
-      self.class.log(priority, msg)
-    end
-
     ##
     # Class methods for extension by ActiveSupport::Concern
     module ClassMethods
-
-      ##
-      # Log a message, tagged in a way suitable for software agents.
-      # @see Krikri::SoftwareAgent::method_missing
-      def log(priority, msg)
-        Krikri::SoftwareAgent::Logger.tagged(
-          Time.now.to_s, Process.pid, to_s
-        ) do
-          Krikri::SoftwareAgent::Logger.send(priority, msg)
-        end
-      end
-
       ##
       # @return a string representation of this SoftwareAgent class
       def agent_name
@@ -126,13 +113,11 @@ module Krikri
           a.opts = JSON.generate(opts)
         end
 
-        log :info, "created activity #{activity.id}"
+        Krikri::Logger.log :info, "created activity #{activity.id}"
         Resque.enqueue_to(queue, Krikri::Job, activity.id)
-        log :info, "enqueued to #{queue}"
+        Krikri::Logger.log :info, "enqueued to #{queue}"
         true
       end
-
     end
-
   end
 end

data/lib/krikri/version.rb

@@ -1,3 +1,3 @@
 module Krikri
-  VERSION = '0.8.2'.freeze
+  VERSION = '0.8.3'.freeze
 end

data/spec/dummy/log/development.log

@@ -0,0 +1,207 @@
+   (1.9ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.4ms)  select sqlite_version(*)
+   (0.7ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (1.0ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (0.9ms)  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 ('0')
+
+
+Started GET "/" for 127.0.0.1 at 2014-10-20 18:59:04 -0400
+Processing by CatalogController#index as HTML
+Solr :rows parameter not set (by the user, configuration, or default solr parameters); using 10 rows by default
+Completed 500 Internal Server Error in 4ms
+
+RuntimeError (You are missing a solr configuration file: /Users/mark/Documents/Code/dpla/KriKri/spec/dummy/config/solr.yml. Have you run "rails generate blacklight:install"?):
+  blacklight (5.7.1) lib/blacklight.rb:69:in `solr_yml'
+  blacklight (5.7.1) lib/blacklight.rb:58:in `solr_config'
+  blacklight (5.7.1) lib/blacklight/solr_helper.rb:368:in `blacklight_solr_config'
+  blacklight (5.7.1) lib/blacklight/solr_helper.rb:364:in `blacklight_solr'
+  blacklight (5.7.1) lib/blacklight/solr_helper.rb:82:in `block in find'
+  activesupport (4.1.6) lib/active_support/benchmarkable.rb:41:in `block in benchmark'
+  activesupport (4.1.6) lib/active_support/core_ext/benchmark.rb:12:in `block in ms'
+  /Users/mark/.rbenv/versions/2.1.3/lib/ruby/2.1.0/benchmark.rb:294:in `realtime'
+  activesupport (4.1.6) lib/active_support/core_ext/benchmark.rb:12:in `ms'
+  activesupport (4.1.6) lib/active_support/benchmarkable.rb:41:in `benchmark'
+  blacklight (5.7.1) lib/blacklight/solr_helper.rb:76:in `find'
+  blacklight (5.7.1) lib/blacklight/solr_helper.rb:135:in `query_solr'
+  blacklight (5.7.1) lib/blacklight/solr_helper.rb:116:in `get_search_results'
+  blacklight (5.7.1) lib/blacklight/catalog.rb:24:in `index'
+  actionpack (4.1.6) lib/action_controller/metal/implicit_render.rb:4:in `send_action'
+  actionpack (4.1.6) lib/abstract_controller/base.rb:189:in `process_action'
+  actionpack (4.1.6) lib/action_controller/metal/rendering.rb:10:in `process_action'
+  actionpack (4.1.6) lib/abstract_controller/callbacks.rb:20:in `block in process_action'
+  activesupport (4.1.6) lib/active_support/callbacks.rb:113:in `call'
+  activesupport (4.1.6) lib/active_support/callbacks.rb:113:in `call'
+  activesupport (4.1.6) lib/active_support/callbacks.rb:149:in `block in halting_and_conditional'
+  activesupport (4.1.6) lib/active_support/callbacks.rb:229:in `call'
+  activesupport (4.1.6) lib/active_support/callbacks.rb:229:in `block in halting'
+  activesupport (4.1.6) lib/active_support/callbacks.rb:229:in `call'
+  activesupport (4.1.6) lib/active_support/callbacks.rb:229:in `block in halting'
+  activesupport (4.1.6) lib/active_support/callbacks.rb:166:in `call'
+  activesupport (4.1.6) lib/active_support/callbacks.rb:166:in `block in halting'
+  activesupport (4.1.6) lib/active_support/callbacks.rb:86:in `call'
+  activesupport (4.1.6) lib/active_support/callbacks.rb:86:in `run_callbacks'
+  actionpack (4.1.6) lib/abstract_controller/callbacks.rb:19:in `process_action'
+  actionpack (4.1.6) lib/action_controller/metal/rescue.rb:29:in `process_action'
+  actionpack (4.1.6) lib/action_controller/metal/instrumentation.rb:31:in `block in process_action'
+  activesupport (4.1.6) lib/active_support/notifications.rb:159:in `block in instrument'
+  activesupport (4.1.6) lib/active_support/notifications/instrumenter.rb:20:in `instrument'
+  activesupport (4.1.6) lib/active_support/notifications.rb:159:in `instrument'
+  actionpack (4.1.6) lib/action_controller/metal/instrumentation.rb:30:in `process_action'
+  actionpack (4.1.6) lib/action_controller/metal/params_wrapper.rb:250:in `process_action'
+  activerecord (4.1.6) lib/active_record/railties/controller_runtime.rb:18:in `process_action'
+  actionpack (4.1.6) lib/abstract_controller/base.rb:136:in `process'
+  actionview (4.1.6) lib/action_view/rendering.rb:30:in `process'
+  actionpack (4.1.6) lib/action_controller/metal.rb:196:in `dispatch'
+  actionpack (4.1.6) lib/action_controller/metal/rack_delegation.rb:13:in `dispatch'
+  actionpack (4.1.6) lib/action_controller/metal.rb:232:in `block in action'
+  actionpack (4.1.6) lib/action_dispatch/routing/route_set.rb:82:in `call'
+  actionpack (4.1.6) lib/action_dispatch/routing/route_set.rb:82:in `dispatch'
+  actionpack (4.1.6) lib/action_dispatch/routing/route_set.rb:50:in `call'
+  actionpack (4.1.6) lib/action_dispatch/journey/router.rb:73:in `block in call'
+  actionpack (4.1.6) lib/action_dispatch/journey/router.rb:59:in `each'
+  actionpack (4.1.6) lib/action_dispatch/journey/router.rb:59:in `call'
+  actionpack (4.1.6) lib/action_dispatch/routing/route_set.rb:678:in `call'
+  rack (1.5.2) lib/rack/etag.rb:23:in `call'
+  rack (1.5.2) lib/rack/conditionalget.rb:25:in `call'
+  rack (1.5.2) lib/rack/head.rb:11:in `call'
+  actionpack (4.1.6) lib/action_dispatch/middleware/params_parser.rb:27:in `call'
+  actionpack (4.1.6) lib/action_dispatch/middleware/flash.rb:254:in `call'
+  rack (1.5.2) lib/rack/session/abstract/id.rb:225:in `context'
+  rack (1.5.2) lib/rack/session/abstract/id.rb:220:in `call'
+  actionpack (4.1.6) lib/action_dispatch/middleware/cookies.rb:560:in `call'
+  activerecord (4.1.6) lib/active_record/query_cache.rb:36:in `call'
+  activerecord (4.1.6) lib/active_record/connection_adapters/abstract/connection_pool.rb:621:in `call'
+  activerecord (4.1.6) lib/active_record/migration.rb:380:in `call'
+  actionpack (4.1.6) lib/action_dispatch/middleware/callbacks.rb:29:in `block in call'
+  activesupport (4.1.6) lib/active_support/callbacks.rb:82:in `run_callbacks'
+  actionpack (4.1.6) lib/action_dispatch/middleware/callbacks.rb:27:in `call'
+  actionpack (4.1.6) lib/action_dispatch/middleware/reloader.rb:73:in `call'
+  actionpack (4.1.6) lib/action_dispatch/middleware/remote_ip.rb:76:in `call'
+  actionpack (4.1.6) lib/action_dispatch/middleware/debug_exceptions.rb:17:in `call'
+  actionpack (4.1.6) lib/action_dispatch/middleware/show_exceptions.rb:30:in `call'
+  railties (4.1.6) lib/rails/rack/logger.rb:38:in `call_app'
+  railties (4.1.6) lib/rails/rack/logger.rb:20:in `block in call'
+  activesupport (4.1.6) lib/active_support/tagged_logging.rb:68:in `block in tagged'
+  activesupport (4.1.6) lib/active_support/tagged_logging.rb:26:in `tagged'
+  activesupport (4.1.6) lib/active_support/tagged_logging.rb:68:in `tagged'
+  railties (4.1.6) lib/rails/rack/logger.rb:20:in `call'
+  actionpack (4.1.6) lib/action_dispatch/middleware/request_id.rb:21:in `call'
+  rack (1.5.2) lib/rack/methodoverride.rb:21:in `call'
+  rack (1.5.2) lib/rack/runtime.rb:17:in `call'
+  activesupport (4.1.6) lib/active_support/cache/strategy/local_cache_middleware.rb:26:in `call'
+  rack (1.5.2) lib/rack/lock.rb:17:in `call'
+  actionpack (4.1.6) lib/action_dispatch/middleware/static.rb:64:in `call'
+  rack (1.5.2) lib/rack/sendfile.rb:112:in `call'
+  railties (4.1.6) lib/rails/engine.rb:514:in `call'
+  railties (4.1.6) lib/rails/application.rb:144:in `call'
+  rack (1.5.2) lib/rack/lock.rb:17:in `call'
+  rack (1.5.2) lib/rack/content_length.rb:14:in `call'
+  rack (1.5.2) lib/rack/handler/webrick.rb:60:in `service'
+  /Users/mark/.rbenv/versions/2.1.3/lib/ruby/2.1.0/webrick/httpserver.rb:138:in `service'
+  /Users/mark/.rbenv/versions/2.1.3/lib/ruby/2.1.0/webrick/httpserver.rb:94:in `run'
+  /Users/mark/.rbenv/versions/2.1.3/lib/ruby/2.1.0/webrick/server.rb:295:in `block in start_thread'
+
+
+  Rendered /Users/mark/.rbenv/versions/2.1.3/lib/ruby/gems/2.1.0/gems/actionpack-4.1.6/lib/action_dispatch/middleware/templates/rescues/_source.erb (0.5ms)
+  Rendered /Users/mark/.rbenv/versions/2.1.3/lib/ruby/gems/2.1.0/gems/actionpack-4.1.6/lib/action_dispatch/middleware/templates/rescues/_trace.html.erb (1.0ms)
+  Rendered /Users/mark/.rbenv/versions/2.1.3/lib/ruby/gems/2.1.0/gems/actionpack-4.1.6/lib/action_dispatch/middleware/templates/rescues/_request_and_response.html.erb (9.1ms)
+  Rendered /Users/mark/.rbenv/versions/2.1.3/lib/ruby/gems/2.1.0/gems/actionpack-4.1.6/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb within rescues/layout (23.4ms)
+
+
+Started GET "/" for 127.0.0.1 at 2014-10-20 19:05:02 -0400
+Processing by CatalogController#index as HTML
+Solr :rows parameter not set (by the user, configuration, or default solr parameters); using 10 rows by default
+Completed 500 Internal Server Error in 8ms
+
+Blacklight::Exceptions::ECONNREFUSED (Connection refused - Unable to connect to Solr instance using #<RSolr::Client:0x007f895299c658 @uri=#<URI::HTTP:0x007f895299a8a8 URL:http://127.0.0.1:8983/solr/>, @proxy=nil, @connection=#<RSolr::Connection:0x007f895299c680 @http=#<Net::HTTP 127.0.0.1:8983 open=false>>, @options={:url=>"http://127.0.0.1:8983/solr"}>):
+  blacklight (5.7.1) lib/blacklight/solr_helper.rb:91:in `rescue in find'
+  blacklight (5.7.1) lib/blacklight/solr_helper.rb:76:in `find'
+  blacklight (5.7.1) lib/blacklight/solr_helper.rb:135:in `query_solr'
+  blacklight (5.7.1) lib/blacklight/solr_helper.rb:116:in `get_search_results'
+  blacklight (5.7.1) lib/blacklight/catalog.rb:24:in `index'
+  actionpack (4.1.6) lib/action_controller/metal/implicit_render.rb:4:in `send_action'
+  actionpack (4.1.6) lib/abstract_controller/base.rb:189:in `process_action'
+  actionpack (4.1.6) lib/action_controller/metal/rendering.rb:10:in `process_action'
+  actionpack (4.1.6) lib/abstract_controller/callbacks.rb:20:in `block in process_action'
+  activesupport (4.1.6) lib/active_support/callbacks.rb:113:in `call'
+  activesupport (4.1.6) lib/active_support/callbacks.rb:113:in `call'
+  activesupport (4.1.6) lib/active_support/callbacks.rb:149:in `block in halting_and_conditional'
+  activesupport (4.1.6) lib/active_support/callbacks.rb:229:in `call'
+  activesupport (4.1.6) lib/active_support/callbacks.rb:229:in `block in halting'
+  activesupport (4.1.6) lib/active_support/callbacks.rb:229:in `call'
+  activesupport (4.1.6) lib/active_support/callbacks.rb:229:in `block in halting'
+  activesupport (4.1.6) lib/active_support/callbacks.rb:166:in `call'
+  activesupport (4.1.6) lib/active_support/callbacks.rb:166:in `block in halting'
+  activesupport (4.1.6) lib/active_support/callbacks.rb:86:in `call'
+  activesupport (4.1.6) lib/active_support/callbacks.rb:86:in `run_callbacks'
+  actionpack (4.1.6) lib/abstract_controller/callbacks.rb:19:in `process_action'
+  actionpack (4.1.6) lib/action_controller/metal/rescue.rb:29:in `process_action'
+  actionpack (4.1.6) lib/action_controller/metal/instrumentation.rb:31:in `block in process_action'
+  activesupport (4.1.6) lib/active_support/notifications.rb:159:in `block in instrument'
+  activesupport (4.1.6) lib/active_support/notifications/instrumenter.rb:20:in `instrument'
+  activesupport (4.1.6) lib/active_support/notifications.rb:159:in `instrument'
+  actionpack (4.1.6) lib/action_controller/metal/instrumentation.rb:30:in `process_action'
+  actionpack (4.1.6) lib/action_controller/metal/params_wrapper.rb:250:in `process_action'
+  activerecord (4.1.6) lib/active_record/railties/controller_runtime.rb:18:in `process_action'
+  actionpack (4.1.6) lib/abstract_controller/base.rb:136:in `process'
+  actionview (4.1.6) lib/action_view/rendering.rb:30:in `process'
+  actionpack (4.1.6) lib/action_controller/metal.rb:196:in `dispatch'
+  actionpack (4.1.6) lib/action_controller/metal/rack_delegation.rb:13:in `dispatch'
+  actionpack (4.1.6) lib/action_controller/metal.rb:232:in `block in action'
+  actionpack (4.1.6) lib/action_dispatch/routing/route_set.rb:82:in `call'
+  actionpack (4.1.6) lib/action_dispatch/routing/route_set.rb:82:in `dispatch'
+  actionpack (4.1.6) lib/action_dispatch/routing/route_set.rb:50:in `call'
+  actionpack (4.1.6) lib/action_dispatch/journey/router.rb:73:in `block in call'
+  actionpack (4.1.6) lib/action_dispatch/journey/router.rb:59:in `each'
+  actionpack (4.1.6) lib/action_dispatch/journey/router.rb:59:in `call'
+  actionpack (4.1.6) lib/action_dispatch/routing/route_set.rb:678:in `call'
+  rack (1.5.2) lib/rack/etag.rb:23:in `call'
+  rack (1.5.2) lib/rack/conditionalget.rb:25:in `call'
+  rack (1.5.2) lib/rack/head.rb:11:in `call'
+  actionpack (4.1.6) lib/action_dispatch/middleware/params_parser.rb:27:in `call'
+  actionpack (4.1.6) lib/action_dispatch/middleware/flash.rb:254:in `call'
+  rack (1.5.2) lib/rack/session/abstract/id.rb:225:in `context'
+  rack (1.5.2) lib/rack/session/abstract/id.rb:220:in `call'
+  actionpack (4.1.6) lib/action_dispatch/middleware/cookies.rb:560:in `call'
+  activerecord (4.1.6) lib/active_record/query_cache.rb:36:in `call'
+  activerecord (4.1.6) lib/active_record/connection_adapters/abstract/connection_pool.rb:621:in `call'
+  activerecord (4.1.6) lib/active_record/migration.rb:380:in `call'
+  actionpack (4.1.6) lib/action_dispatch/middleware/callbacks.rb:29:in `block in call'
+  activesupport (4.1.6) lib/active_support/callbacks.rb:82:in `run_callbacks'
+  actionpack (4.1.6) lib/action_dispatch/middleware/callbacks.rb:27:in `call'
+  actionpack (4.1.6) lib/action_dispatch/middleware/reloader.rb:73:in `call'
+  actionpack (4.1.6) lib/action_dispatch/middleware/remote_ip.rb:76:in `call'
+  actionpack (4.1.6) lib/action_dispatch/middleware/debug_exceptions.rb:17:in `call'
+  actionpack (4.1.6) lib/action_dispatch/middleware/show_exceptions.rb:30:in `call'
+  railties (4.1.6) lib/rails/rack/logger.rb:38:in `call_app'
+  railties (4.1.6) lib/rails/rack/logger.rb:20:in `block in call'
+  activesupport (4.1.6) lib/active_support/tagged_logging.rb:68:in `block in tagged'
+  activesupport (4.1.6) lib/active_support/tagged_logging.rb:26:in `tagged'
+  activesupport (4.1.6) lib/active_support/tagged_logging.rb:68:in `tagged'
+  railties (4.1.6) lib/rails/rack/logger.rb:20:in `call'
+  actionpack (4.1.6) lib/action_dispatch/middleware/request_id.rb:21:in `call'
+  rack (1.5.2) lib/rack/methodoverride.rb:21:in `call'
+  rack (1.5.2) lib/rack/runtime.rb:17:in `call'
+  activesupport (4.1.6) lib/active_support/cache/strategy/local_cache_middleware.rb:26:in `call'
+  rack (1.5.2) lib/rack/lock.rb:17:in `call'
+  actionpack (4.1.6) lib/action_dispatch/middleware/static.rb:64:in `call'
+  rack (1.5.2) lib/rack/sendfile.rb:112:in `call'
+  railties (4.1.6) lib/rails/engine.rb:514:in `call'
+  railties (4.1.6) lib/rails/application.rb:144:in `call'
+  rack (1.5.2) lib/rack/lock.rb:17:in `call'
+  rack (1.5.2) lib/rack/content_length.rb:14:in `call'
+  rack (1.5.2) lib/rack/handler/webrick.rb:60:in `service'
+  /Users/mark/.rbenv/versions/2.1.3/lib/ruby/2.1.0/webrick/httpserver.rb:138:in `service'
+  /Users/mark/.rbenv/versions/2.1.3/lib/ruby/2.1.0/webrick/httpserver.rb:94:in `run'
+  /Users/mark/.rbenv/versions/2.1.3/lib/ruby/2.1.0/webrick/server.rb:295:in `block in start_thread'
+
+
+  Rendered /Users/mark/.rbenv/versions/2.1.3/lib/ruby/gems/2.1.0/gems/actionpack-4.1.6/lib/action_dispatch/middleware/templates/rescues/_source.erb (0.4ms)
+  Rendered /Users/mark/.rbenv/versions/2.1.3/lib/ruby/gems/2.1.0/gems/actionpack-4.1.6/lib/action_dispatch/middleware/templates/rescues/_trace.html.erb (0.8ms)
+  Rendered /Users/mark/.rbenv/versions/2.1.3/lib/ruby/gems/2.1.0/gems/actionpack-4.1.6/lib/action_dispatch/middleware/templates/rescues/_request_and_response.html.erb (8.0ms)
+  Rendered /Users/mark/.rbenv/versions/2.1.3/lib/ruby/gems/2.1.0/gems/actionpack-4.1.6/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb within rescues/layout (20.1ms)