blacklight-spotlight 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 283d5c887e24780d4fa2c2eb0d8ea95c2716f383
-  data.tar.gz: 4510724deeb46830e4d3b1b97477332908935850
+  metadata.gz: 136e58b1c7ddacee60a975326d3b482f88a19bb6
+  data.tar.gz: 607da59315b2155874802b87f117b940f358abc7
 SHA512:
-  metadata.gz: 79f52fe10b09af9e316d7a42a07a6f8cc55ff1fa06b83d64bddc2e9255c36fe1539ce5402bafd7ae6070cfd06b7bc612de5ab14548a6231b715f5e52a9393d38
-  data.tar.gz: 205927e362eee400c93ac200889701f948d681f5a2594ab85735ef5d79d56ae0471c809e731dbb7fd1f4114857abf535e79e63dfb36f0faa9ea35a8a87b6277b
+  metadata.gz: 531b33a80abda0a690e4120bcb4776bbadfe7bc4bba9d23a2e39f5878749547877a07b1a162596da47a8ca476a158215367d73e667ef226cf12bd6cdd97bf455
+  data.tar.gz: 9bfe3194807b9b227d768a63da611409f317a7d8e9e92b5e225ef0c6585e5d5ca9e640198066feea688903f5d8f36e85775ad45e2f1bb04c9c896641bfa2229a

data/Rakefile

@@ -110,4 +110,4 @@ namespace :spotlight do
   end
 end
 
-task default: [:ci, :rubocop]
+task default: [:rubocop, :ci]

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

@@ -21,7 +21,6 @@
 //= require bootstrap/popover
 //= require bootstrap/carousel
 //= require bootstrap-tagsinput
-//= require social-share-button
 //= require jquery.serializejson
 
 //= require_tree .

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

@@ -19,8 +19,5 @@ Blacklight.onLoad(function() {
 
 Spotlight.onLoad(function(){
   SpotlightNestable.init();
-  $.each($('.social-share-button a'), function() {
-    $(this).append($(this).attr('title'));
-  });
 });
 

data/app/assets/stylesheets/spotlight/_footer.scss

@@ -9,18 +9,4 @@
   bottom: 0;
   height: $footer-height;
   width: 100%;
-
-  .social-share-button {
-    a {
-      display: block;
-      margin-bottom: 5px;
-      padding-left: 18px;
-      text-indent: 10px;
-      color: $gray-light;
-    }
-    a:hover, a:focus {
-      color: $gray;
-      text-decoration: none;
-    }
-  }
 }

data/app/models/concerns/spotlight/ar_light.rb

@@ -30,14 +30,6 @@ module Spotlight
         false
       end
 
-      def generated_feature_methods
-        @generated_feature_methods ||= begin
-          mod = const_set(:GeneratedFeatureMethods, Module.new)
-          include mod
-          mod
-        end
-      end
-
       def before_destroy(*_args)
       end
 

data/app/models/spotlight/reindex_progress.rb

@@ -17,7 +17,7 @@ module Spotlight
     def started_at
       return unless resources.present?
 
-      @started ||= resources.min_by(&:enqueued_at).enqueued_at
+      @started ||= resources.select(&:enqueued_at?).min_by(&:enqueued_at).enqueued_at
     end
 
     def updated_at
@@ -34,11 +34,11 @@ module Spotlight
     end
 
     def total
-      @total ||= resources.map(&:last_indexed_estimate).sum
+      @total ||= resources.map(&:last_indexed_estimate).compact.sum
     end
 
     def completed
-      @completed ||= completed_resources.map(&:last_indexed_count).sum
+      @completed ||= completed_resources.map(&:last_indexed_count).compact.sum
     end
 
     def errored?

data/app/models/spotlight/resource.rb

@@ -49,19 +49,15 @@ module Spotlight
     end
 
     def enqueued_at
-      if defined? ActiveModel::Type::DateTime
-        ActiveModel::Type::DateTime.new.cast(super)
-      else
-        ActiveRecord::Type::DateTime.new.type_cast_from_database(super)
-      end
+      cast_to_date_time(super)
+    end
+
+    def enqueued_at?
+      enqueued_at.present?
     end
 
     def last_indexed_finished
-      if defined? ActiveModel::Type::DateTime
-        ActiveModel::Type::DateTime.new.cast(super)
-      else
-        ActiveRecord::Type::DateTime.new.type_cast_from_database(super)
-      end
+      cast_to_date_time(super)
     end
 
     def document_model
@@ -141,6 +137,16 @@ module Spotlight
       def write?
         Spotlight::Engine.config.writable_index
       end
+
+      def cast_to_date_time(value)
+        return unless value
+
+        if defined? ActiveModel::Type::DateTime
+          ActiveModel::Type::DateTime.new.cast(value)
+        else
+          ActiveRecord::Type::DateTime.new.type_cast_from_database(value)
+        end
+      end
     end
   end
 end

data/app/views/shared/_footer.html.erb

@@ -1,7 +1 @@
-<footer class="site-footer">
-  <div class="row">
-    <%= render 'shared/share_follow' %>
-  </div>
-</footer>
-
 <%= render 'shared/analytics' %>

data/lib/generators/spotlight/install_generator.rb

@@ -118,8 +118,7 @@ module Spotlight
       end
     end
 
-    def generate_social_share_button_initializer
-      gem 'social-share-button', github: 'cbeer/social-share-button', branch: 'on_load'
+    def generate_config
       directory 'config'
     end
 

data/lib/generators/spotlight/templates/spotlight.scss

@@ -1,5 +1,4 @@
 /*
-*= require social-share-button
 *= require bootstrap-tagsinput
 *= require jquery.jcrop
 */

data/lib/spotlight/engine.rb

@@ -28,7 +28,6 @@ module Spotlight
 
     require 'carrierwave'
     require 'carrierwave/crop'
-    require 'social-share-button'
     require 'lodash-rails'
     require 'github/markup'
     require 'sir_trevor_rails'

data/lib/spotlight/version.rb

@@ -1,3 +1,3 @@
 module Spotlight
-  VERSION = '0.21.0'.freeze
+  VERSION = '0.22.0'.freeze
 end

data/lib/tasks/spotlight_tasks.rake

@@ -4,14 +4,14 @@ namespace :spotlight do
     puts 'Creating an initial admin user.'
     u = prompt_to_create_user
 
-    Spotlight::Role.create(user: u, resource: nil, role: 'admin')
+    Spotlight::Role.create(user: u, resource: Spotlight::Site.instance, role: 'admin')
     puts 'User created.'
   end
 
   desc 'Add application-wide admin privileges to a user'
   task admin: :environment do
     u = prompt_to_create_user
-    Spotlight::Role.create(user: u, resource: nil, role: 'admin')
+    Spotlight::Role.create(user: u, resource: Spotlight::Site.instance, role: 'admin')
   end
 
   desc 'Create a new exhibit'

data/spec/models/spotlight/reindex_progress_spec.rb

@@ -26,7 +26,15 @@ describe Spotlight::ReindexProgress, type: :model do
       index_status: 1
     )
   end
-  let(:resources) { [first_resource, last_resource] }
+
+  let(:new_resource) do
+    FactoryGirl.create(
+      :resource,
+      index_status: 0
+    )
+  end
+
+  let(:resources) { [first_resource, last_resource, new_resource] }
   subject { described_class.new(Spotlight::Resource.all) }
   let(:json) { JSON.parse(subject.to_json) }
 
@@ -35,13 +43,14 @@ describe Spotlight::ReindexProgress, type: :model do
   end
 
   describe '#recently_in_progress?' do
+    let(:resources) { [first_resource, last_resource] }
     context 'when the last resource has been updated within the allotted time' do
       it 'is true' do
         expect(subject).to be_recently_in_progress
       end
     end
 
-    context 'when any of the resources is makred as waiting' do
+    context 'when any of the resources is marked as waiting' do
       before do
         first_resource.waiting!
       end
@@ -75,6 +84,8 @@ describe Spotlight::ReindexProgress, type: :model do
   end
 
   describe '#updated_at' do
+    let(:resources) { [first_resource, last_resource] }
+
     it 'returns the updated_at attribute of the last resource' do
       expect(subject.updated_at).to eq updated_time
     end
@@ -85,6 +96,8 @@ describe Spotlight::ReindexProgress, type: :model do
   end
 
   describe '#finished_at' do
+    let(:resources) { [first_resource, last_resource] }
+
     it 'returns the updated_at attribute of the last resource' do
       expect(subject.finished_at).to eq finish_time
     end

data/spec/models/spotlight/resource_spec.rb

@@ -11,6 +11,11 @@ describe Spotlight::Resource, type: :model do
 
       expect(subject.enqueued_at).to eq t
     end
+
+    it 'handles blank values' do
+      subject.enqueued_at = nil
+      expect(subject.enqueued_at).to be_nil
+    end
   end
 
   describe '#last_indexed_finished' do

data/spec/test_app_templates/Gemfile.extra

@@ -1,2 +1 @@
 gem 'friendly_id', github: 'norman/friendly_id'
-gem 'social-share-button', github: 'cbeer/social-share-button', branch: 'on_load'

data/spec/views/shared/_footer.html.erb_spec.rb

@@ -10,11 +10,4 @@ describe 'shared/_footer', type: :view do
     render
     expect(rendered).to have_content 'analytics'
   end
-
-  it 'displays social media links' do
-    render
-    expect(rendered).to have_selector('footer .social-share-button a.ssb-icon[title="Twitter"]')
-    expect(rendered).to have_selector('footer .social-share-button a.ssb-icon[title="Facebook"]')
-    expect(rendered).to have_selector('footer .social-share-button a.ssb-icon[title="Google+"]')
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -193,20 +193,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
-- !ruby/object:Gem::Dependency
-  name: social-share-button
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: blacklight-gallery
   requirement: !ruby/object:Gem::Requirement
@@ -1151,7 +1137,6 @@ files:
 - lib/generators/spotlight/install_generator.rb
 - lib/generators/spotlight/templates/catalog_controller.rb
 - lib/generators/spotlight/templates/config/initializers/riiif.rb
-- lib/generators/spotlight/templates/config/initializers/social_share_button.rb
 - lib/generators/spotlight/templates/config/sitemap.rb
 - lib/generators/spotlight/templates/solr/config/schema.xml
 - lib/generators/spotlight/templates/solr/config/solrconfig.xml

data/lib/generators/spotlight/templates/config/initializers/social_share_button.rb

@@ -1,3 +0,0 @@
-SocialShareButton.configure do |config|
-  config.allow_sites = %w(twitter facebook google_plus)
-end