blacklight-spotlight 0.20.2 → 0.20.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67c958d969ca32275b0a601a62193550a72ff895
-  data.tar.gz: 11af2709ad72c89efaec127a523d81adf5514a4e
+  metadata.gz: a9f570da0859bafcdda5b278a6c091c078d3923a
+  data.tar.gz: f949ab89b4ae716b88a2b1637ed74ed661706193
 SHA512:
-  metadata.gz: 6925061b77a27a85c903bbe2d28752c69f0aea0d89c120fc4ca8a5e97bbd5c37faed52105dc92248110660887227ccdeebb604de186eb70d1365cbd4f10b9471
-  data.tar.gz: cc014078433c7f278038fc9607f78ff1cc9f10160eef8c605acfcf72d30912f5114e0226803fd312eb6ee27858191c1969f5d8e40bd7dc936eb04be618a1e0b2
+  metadata.gz: c16e162aefe79ed7d01a1886c7636208cce5d82c5826e921a66ec0e440b41893588ff7c7eaf64bae4862fbbfd943deb20c9ad271074debfa8e4b93297c99bfb6
+  data.tar.gz: 5c603afe59cc54c39e476eed12ca820d183007968b68cd1c01c18466216c721f8460bcffad3114dc65de902f1f09f5af2d406134fe4ac8d3c839eae36b26d9b4

data/app/assets/javascripts/spotlight/reindex_monitor.js

@@ -22,7 +22,7 @@ Spotlight.onLoad(function() {
     }
 
     function success(data) {
-      if (data.in_progress) {
+      if (data.recently_in_progress) {
         monitorPanel().show();
         updateMonitorPanel(data);
       } else {
@@ -33,7 +33,7 @@ Spotlight.onLoad(function() {
     function fail() { monitorPanel().hide(); }
 
     function updateMonitorPanel(data) {
-      panelStartDate().text(data.started);
+      panelStartDate().text(data.started_at);
       panelCurrentDate().text(data.updated_at);
       panelCompleted().text(data.completed);
       updatePanelTotals(data);

data/app/models/spotlight/exhibit.rb

@@ -100,7 +100,7 @@ module Spotlight
     end
 
     def reindex_progress
-      @reindex_progress ||= ReindexProgress.new(resources.order('updated_at')) if resources
+      @reindex_progress ||= ReindexProgress.new(resources) if resources
     end
 
     protected

data/app/models/spotlight/reindex_progress.rb

@@ -4,23 +4,33 @@ module Spotlight
   class ReindexProgress
     def initialize(resource_list)
       @resources = if resource_list.present?
-                     resource_list
+                     resource_list.order('updated_at')
                    else
-                     null_resources
+                     Spotlight::Resource.none
                    end
     end
 
-    def in_progress?
-      return unless finished
-      any_waiting? || finished > Spotlight::Engine.config.reindex_progress_window.minutes.ago
+    def recently_in_progress?
+      any_waiting? || (!!finished_at && finished_at > Spotlight::Engine.config.reindex_progress_window.minutes.ago)
     end
 
-    def started
-      @started ||= resources.first.indexed_at
+    def started_at
+      return unless resources.present?
+
+      @started ||= resources.min_by(&:enqueued_at).enqueued_at
+    end
+
+    def updated_at
+      @updated ||= resources.maximum(:updated_at) || started_at
     end
 
-    def finished
-      @finished ||= completed_resources.last.updated_at
+    def finished?
+      completed_resources.present? && !any_waiting?
+    end
+
+    def finished_at
+      return unless finished?
+      @finished ||= completed_resources.max_by(&:last_indexed_finished).last_indexed_finished
     end
 
     def total
@@ -37,11 +47,12 @@ module Spotlight
 
     def as_json(*)
       {
-        in_progress: in_progress?,
-        started: localized_start_time,
+        recently_in_progress: recently_in_progress?,
+        started_at: localized_start_time,
+        finished_at: localized_finish_time,
+        updated_at: localized_updated_time,
         total: total,
         completed: completed,
-        updated_at: localized_finish_time,
         errored: errored?
       }
     end
@@ -55,53 +66,22 @@ module Spotlight
     end
 
     def localized_start_time
-      return unless started
-      I18n.l(started, format: :short)
+      return unless started_at
+      I18n.l(started_at, format: :short)
     end
 
     def localized_finish_time
-      return unless finished
-      I18n.l(finished, format: :short)
-    end
-
-    def completed_resources
-      if resources.try(:completed).present?
-        resources.completed
-      else
-        null_resources
-      end
+      return unless finished_at
+      I18n.l(finished_at, format: :short)
     end
 
-    def null_resources
-      [NullResource.new]
+    def localized_updated_time
+      return unless updated_at
+      I18n.l(updated_at, format: :short)
     end
 
-    ##
-    # A NullObject for use in the absense of resources
-    class NullResource
-      def updated_at
-        nil
-      end
-
-      def indexed_at
-        nil
-      end
-
-      def last_indexed_estimate
-        0
-      end
-
-      def last_indexed_count
-        0
-      end
-
-      def waiting?
-        false
-      end
-
-      def errored?
-        false
-      end
+    def completed_resources
+      resources.completed
     end
   end
 end

data/app/models/spotlight/resource.rb

@@ -15,6 +15,7 @@ module Spotlight
     belongs_to :exhibit
     serialize :data, Hash
     store :metadata, accessors: [
+      :enqueued_at,
       :last_indexed_estimate,
       :last_indexed_count,
       :last_index_elapsed_time,
@@ -42,6 +43,16 @@ module Spotlight
       Spotlight::ReindexJob.perform_later(self)
     end
 
+    def waiting!
+      update(enqueued_at: Time.zone.now)
+      super
+    end
+
+    def enqueued_at
+      value = super
+      Time.zone.parse(value) if value
+    end
+
     def document_model
       exhibit.blacklight_config.document_model if exhibit
     end

data/lib/spotlight/version.rb

@@ -1,3 +1,3 @@
 module Spotlight
-  VERSION = '0.20.2'.freeze
+  VERSION = '0.20.3'.freeze
 end

data/spec/models/spotlight/reindex_progress_spec.rb

@@ -1,82 +1,96 @@
 describe Spotlight::ReindexProgress, type: :model do
-  let(:start_time) { 20.minutes.ago }
-  let(:finish_time) { 5.minutes.ago }
-  let(:first_resource) do
+  let(:start_time) { 20.minutes.ago.at_beginning_of_minute }
+  let(:finish_time) { 5.minutes.ago.at_beginning_of_minute }
+  let(:updated_time) { 1.minute.ago.at_beginning_of_minute }
+  let!(:first_resource) do
     FactoryGirl.create(
       :resource,
-      updated_at: 15.minutes.ago,
+      updated_at: updated_time,
       indexed_at: start_time,
+      enqueued_at: start_time,
+      last_indexed_finished: start_time,
       last_indexed_estimate: 7,
       last_indexed_count: 5,
       index_status: 1
     )
   end
-  let(:last_resource) do
+  let!(:last_resource) do
     FactoryGirl.create(
       :resource,
       updated_at: finish_time,
-      indexed_at: 15.minutes.ago,
+      indexed_at: finish_time,
+      enqueued_at: start_time,
+      last_indexed_finished: finish_time,
       last_indexed_estimate: 3,
       last_indexed_count: 2,
       index_status: 1
     )
   end
   let(:resources) { [first_resource, last_resource] }
-  subject { described_class.new(resources) }
+  subject { described_class.new(Spotlight::Resource.all) }
   let(:json) { JSON.parse(subject.to_json) }
 
   before do
     allow(subject).to receive_messages(completed_resources: resources)
   end
 
-  describe '#in_progress' do
+  describe '#recently_in_progress?' do
     context 'when the last resource has been updated within the allotted time' do
       it 'is true' do
-        expect(subject).to be_in_progress
+        expect(subject).to be_recently_in_progress
       end
     end
 
     context 'when any of the resources is makred as waiting' do
       before do
-        expect(last_resource).to receive_messages(updated_at: 12.minutes.ago)
         first_resource.waiting!
       end
       it 'is true' do
-        expect(subject).to be_in_progress
+        expect(subject).to be_recently_in_progress
       end
     end
 
     context 'when the last resources has been updated outside of the allotted time ' do
       before do
-        expect(last_resource).to receive_messages(updated_at: 12.minutes.ago)
+        expect(last_resource).to receive_messages(last_indexed_finished: 12.minutes.ago)
       end
       it 'is false' do
-        expect(subject).not_to be_in_progress
+        expect(subject).not_to be_recently_in_progress
       end
     end
 
     it 'is included in the json' do
-      expect(json['in_progress']).to be true
+      expect(json['recently_in_progress']).to be true
     end
   end
 
-  describe '#started' do
+  describe '#started_at' do
     it 'returns the indexed_at attribute of the first resource' do
-      expect(subject.started).to eq start_time
+      expect(subject.started_at).to eq start_time
     end
 
     it 'is included in the json as a localized string' do
-      expect(json['started']).to eq I18n.l(start_time, format: :short)
+      expect(json['started_at']).to eq I18n.l(start_time, format: :short)
     end
   end
 
-  describe '#finished' do
+  describe '#updated_at' do
     it 'returns the updated_at attribute of the last resource' do
-      expect(subject.finished).to eq finish_time
+      expect(subject.updated_at).to eq updated_time
     end
 
     it 'is included in the json as a localized string under the updated_at attribute' do
-      expect(json['updated_at']).to eq I18n.l(finish_time, format: :short)
+      expect(json['updated_at']).to eq I18n.l(updated_time, format: :short)
+    end
+  end
+
+  describe '#finished_at' do
+    it 'returns the updated_at attribute of the last resource' do
+      expect(subject.finished_at).to eq finish_time
+    end
+
+    it 'is included in the json as a localized string under the updated_at attribute' do
+      expect(json['finished_at']).to eq I18n.l(finish_time, format: :short)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 0.20.2
+  version: 0.20.3
 platform: ruby
 authors:
 - Chris Beer