blacklight-spotlight 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79f3c55215f17eb642d2939afb0a526090b929ae
-  data.tar.gz: 73621327bd47b37ef54c0a083cfd3efdbe170223
+  metadata.gz: b138edc90732ce33fe7f454da4f4a21858b016d6
+  data.tar.gz: 38b9e958eac1286631b35752da63bf583aa540bf
 SHA512:
-  metadata.gz: 30ec54bcc766d93a529f47cfdec4ccef3dd0fc5fe1f361dea825c4020fab77c9b5de4268801c850e4706bf7167312f870517a09191bdc6492d9ef14b275bc966
-  data.tar.gz: 8e01d90acd6a9c838d8cfe59d18caa50dbe02a39f5838af87b4764c798911b82da81b97bb3cdaee2c5e8bb917567fc3e7b718ad54d724bdfa831b5cfddf80a42
+  metadata.gz: 55de525b9576d2dd3153b107063d9ca1d8f9680049f53875f2e29fa9f13def90d664327827a871c360f5055f1fdc8f0131f354ec3f1d52a29551959e83e46150
+  data.tar.gz: 150fb2d102718f3284f3213b6c3d6146a3d521a0443932f95bbb238283811aa7a26e5e49d3fedb3778d48a5846ae73cfc3a389b6c5d60f7c765403c40331ed45

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

@@ -6,11 +6,14 @@ module Spotlight
 
     included do
       before_create :setup_defaults
+      attr_accessor :skip_default_configuration
     end
 
     protected
 
     def setup_defaults
+      return if skip_default_configuration
+
       default_search_fields
       default_sort_fields
       default_view_types

data/app/serializers/spotlight/exhibit_export_serializer.rb

@@ -12,6 +12,14 @@ module Spotlight
     (Spotlight::BlacklightConfiguration.attribute_names - %w(id exhibit_id)).each do |prop|
       property prop
     end
+
+    property :skip_default_configuration, exec_context: :decorator
+
+    def skip_default_configuration
+      true
+    end
+
+    delegate :skip_default_configuration=, to: :represented
   end
 
   ##
@@ -53,6 +61,8 @@ module Spotlight
 
     property :thumbnail, class: Spotlight::FeaturedImage, decorator: FeaturedImageRepresenter
 
+    collection :main_navigations, class: Spotlight::MainNavigation, decorator: MainNavigationRepresenter
+
     property :blacklight_configuration, class: Spotlight::BlacklightConfiguration, decorator: ConfigurationRepresenter
 
     collection :custom_fields, parse_strategy: ->(fragment, _i, options) { options.represented.custom_fields.find_or_initialize_by(slug: fragment['slug']) },

data/app/serializers/spotlight/main_navigation_representer.rb

@@ -0,0 +1,11 @@
+module Spotlight
+  ##
+  # Serialize the Spotlight::BlacklightConfiguration
+  class MainNavigationRepresenter < Roar::Decorator
+    include Roar::JSON
+
+    (Spotlight::MainNavigation.attribute_names - %w(id exhibit_id)).each do |prop|
+      property prop
+    end
+  end
+end

data/lib/spotlight/version.rb

@@ -1,4 +1,4 @@
 #
 module Spotlight
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

data/spec/serializers/spotlight/exhibit_export_serializer_spec.rb

@@ -100,6 +100,17 @@ describe Spotlight::ExhibitExportSerializer do
       expect(subject.blacklight_configuration).to be_persisted
     end
 
+    context 'for an exhibit without search fields' do
+      before do
+        source_exhibit.blacklight_configuration.search_fields = {}
+        source_exhibit.blacklight_configuration.save
+      end
+
+      it 'remains without search fields' do
+        expect(subject.blacklight_configuration.search_fields).to be_blank
+      end
+    end
+
     it 'has home page properties' do
       expect(subject.home_page).to be_persisted
       expect(subject.home_page.id).not_to eq source_exhibit.home_page.id
@@ -131,6 +142,24 @@ describe Spotlight::ExhibitExportSerializer do
       expect(subject.owned_taggings.first.tag.name).to eq 'xyz'
     end
 
+    context 'with custom main navigation labels' do
+      before do
+        nav = source_exhibit.main_navigations.about
+        nav.label = 'Custom Label'
+        nav.save
+      end
+
+      it 'persists across import/export' do
+        expect(subject.main_navigations.about.label).to eq 'Custom Label'
+      end
+    end
+
+    it 'has tags' do
+      expect(subject.owned_taggings.length).to eq source_exhibit.owned_taggings.length
+      expect(subject.owned_taggings.first).to be_persisted
+      expect(subject.owned_taggings.first.tag.name).to eq 'xyz'
+    end
+
     it 'deals with nested feature pages' do
       FactoryGirl.create :feature_subpage, exhibit: source_exhibit
       expect(subject.feature_pages.at_top_level.length).to eq 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -874,6 +874,7 @@ files:
 - app/models/spotlight/solr_document_sidecar.rb
 - app/serializers/spotlight/exhibit_export_serializer.rb
 - app/serializers/spotlight/featured_image_representer.rb
+- app/serializers/spotlight/main_navigation_representer.rb
 - app/serializers/spotlight/page_representer.rb
 - app/uploaders/spotlight/attachment_uploader.rb
 - app/uploaders/spotlight/avatar_uploader.rb