active-fedora 9.8.0 → 9.8.1

data/spec/unit/file_spec.rb

@@ -292,4 +292,109 @@ describe ActiveFedora::File do
       it { is_expected.to be_a(DateTime) }
     end
   end
+
+  describe "callbacks" do
+    before do
+      class MyFile < ActiveFedora::File
+        after_initialize :a_init
+        before_create :b_create
+        after_create :a_create
+        before_update :b_update
+        after_update :a_update
+        before_save :b_save
+        after_save :a_save
+        before_destroy :b_destroy
+        after_destroy :a_destroy
+
+        def a_init; end
+
+        def b_create; end
+
+        def a_create; end
+
+        def b_save; end
+
+        def a_save; end
+
+        def b_destroy; end
+
+        def a_destroy; end
+
+        def b_update; end
+
+        def a_update; end
+      end
+    end
+
+    after do
+      Object.send(:remove_const, :MyFile)
+    end
+
+    subject { MyFile.new }
+
+    describe "initialize" do
+      specify {
+        expect_any_instance_of(MyFile).to receive(:a_init)
+        MyFile.new
+      }
+    end
+
+    describe "create" do
+      describe "when content is not nil" do
+        specify {
+          expect(subject).to receive(:b_create).once
+          expect(subject).to receive(:a_create).once
+          expect(subject).to receive(:b_save).once
+          expect(subject).to receive(:a_save).once
+          subject.content = "foo"
+          subject.save
+        }
+      end
+      describe "when content is nil" do
+        specify {
+          expect(subject).to receive(:b_create).once
+          expect(subject).not_to receive(:a_create)
+          expect(subject).to receive(:b_save).once
+          expect(subject).not_to receive(:a_save)
+          subject.save
+        }
+      end
+    end
+
+    describe "update" do
+      describe "when content has changed" do
+        specify {
+          subject.content = "foo"
+          subject.save
+          expect(subject).to receive(:b_save).once
+          expect(subject).to receive(:a_save).once
+          expect(subject).to receive(:b_update).once
+          expect(subject).to receive(:a_update).once
+          subject.content = "bar"
+          subject.save
+        }
+      end
+      describe "when content has not changed" do
+        specify {
+          subject.content = "foo"
+          subject.save
+          expect(subject).to receive(:b_save).once
+          expect(subject).not_to receive(:a_save)
+          expect(subject).to receive(:b_update).once
+          expect(subject).not_to receive(:a_update)
+          subject.save
+        }
+      end
+    end
+
+    describe "destroy" do
+      specify {
+        subject.content = "foo"
+        subject.save
+        expect(subject).to receive(:b_destroy).once
+        expect(subject).to receive(:a_destroy).once
+        subject.destroy
+      }
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.8.0
+  version: 9.8.1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -479,9 +479,22 @@ files:
 - lib/generators/active_fedora/config/fedora/templates/fedora.yml
 - lib/generators/active_fedora/config/solr/solr_generator.rb
 - lib/generators/active_fedora/config/solr/templates/solr.yml
-- lib/generators/active_fedora/config/solr/templates/solr_conf/conf/schema.xml
-- lib/generators/active_fedora/config/solr/templates/solr_conf/conf/solrconfig.xml
-- lib/generators/active_fedora/config/solr/templates/solr_conf/solr.xml
+- lib/generators/active_fedora/config/solr/templates/solr/config/_rest_managed.json
+- lib/generators/active_fedora/config/solr/templates/solr/config/admin-extra.html
+- lib/generators/active_fedora/config/solr/templates/solr/config/elevate.xml
+- lib/generators/active_fedora/config/solr/templates/solr/config/mapping-ISOLatin1Accent.txt
+- lib/generators/active_fedora/config/solr/templates/solr/config/protwords.txt
+- lib/generators/active_fedora/config/solr/templates/solr/config/schema.xml
+- lib/generators/active_fedora/config/solr/templates/solr/config/scripts.conf
+- lib/generators/active_fedora/config/solr/templates/solr/config/solrconfig.xml
+- lib/generators/active_fedora/config/solr/templates/solr/config/spellings.txt
+- lib/generators/active_fedora/config/solr/templates/solr/config/stopwords.txt
+- lib/generators/active_fedora/config/solr/templates/solr/config/stopwords_en.txt
+- lib/generators/active_fedora/config/solr/templates/solr/config/synonyms.txt
+- lib/generators/active_fedora/config/solr/templates/solr/config/xslt/example.xsl
+- lib/generators/active_fedora/config/solr/templates/solr/config/xslt/example_atom.xsl
+- lib/generators/active_fedora/config/solr/templates/solr/config/xslt/example_rss.xsl
+- lib/generators/active_fedora/config/solr/templates/solr/config/xslt/luke.xsl
 - lib/generators/active_fedora/model/USAGE
 - lib/generators/active_fedora/model/model_generator.rb
 - lib/generators/active_fedora/model/templates/datastream.rb.erb

data/lib/generators/active_fedora/config/solr/templates/solr_conf/conf/solrconfig.xml

@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<config>
-  <!-- NOTE: various comments and unused configuration possibilities have been purged
-     from this file.  Please refer to http://wiki.apache.org/solr/SolrConfigXml,
-     as well as the default solrconfig file included with Solr -->
-  
-  <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
-  
-  <luceneMatchVersion>LUCENE_40</luceneMatchVersion>
-
-  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
-
-  <!-- solr lib dirs -->
-  <lib dir="../lib/contrib/analysis-extras/lib" />
-  <lib dir="../lib/contrib/analysis-extras/lucene-libs" />
-  
-  <dataDir>${solr.data.dir:}</dataDir>
-
-    <!-- The default high-performance update handler -->
-  <updateHandler class="solr.DirectUpdateHandler2">
-
-    <!-- Enables a transaction log, used for real-time get, durability, and
-         and solr cloud replica recovery.  The log can grow as big as
-         uncommitted changes to the index, so use of a hard autoCommit
-         is recommended (see below).
-         "dir" - the target directory for transaction logs, defaults to the
-                solr data directory.  --> 
-    <updateLog>
-      <str name="dir">${solr.ulog.dir:}</str>
-    </updateLog>
- 
-    <!-- AutoCommit
-
-         Perform a hard commit automatically under certain conditions.
-         Instead of enabling autoCommit, consider using "commitWithin"
-         when adding documents. 
-
-         http://wiki.apache.org/solr/UpdateXmlMessages
-
-         maxDocs - Maximum number of documents to add since the last
-                   commit before automatically triggering a new commit.
-
-         maxTime - Maximum amount of time in ms that is allowed to pass
-                   since a document was added before automatically
-                   triggering a new commit. 
-         openSearcher - if false, the commit causes recent index changes
-           to be flushed to stable storage, but does not cause a new
-           searcher to be opened to make those changes visible.
-
-         If the updateLog is enabled, then it's highly recommended to
-         have some sort of hard autoCommit to limit the log size.
-      -->
-     <autoCommit> 
-       <maxTime>${solr.autoCommit.maxTime:15000}</maxTime> 
-       <openSearcher>false</openSearcher> 
-     </autoCommit>
-
-    <!-- softAutoCommit is like autoCommit except it causes a
-         'soft' commit which only ensures that changes are visible
-         but does not ensure that data is synced to disk.  This is
-         faster and more near-realtime friendly than a hard commit.
-      -->
-
-     <autoSoftCommit> 
-       <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime> 
-     </autoSoftCommit>
-
-  </updateHandler>
-
-  <requestHandler name="search" class="solr.SearchHandler" default="true">
-    <!-- default values for query parameters can be specified, these
-         will be overridden by parameters in the request
-      -->
-     <lst name="defaults">
-       <str name="defType">edismax</str>
-       <str name="echoParams">explicit</str>
-       <str name="q.alt">*:*</str>
-       <str name="mm">2&lt;-1 5&lt;-2 6&lt;90%</str>
-       <int name="qs">1</int>
-       <int name="ps">2</int>
-       <float name="tie">0.01</float>
-       <!-- this qf and pf are used by default, if not otherwise specified by
-            client. The default blacklight_config will use these for the
-            "keywords" search. See the author_qf/author_pf, title_qf, etc 
-            below, which the default blacklight_config will specify for
-            those searches. You may also be interested in:
-            http://wiki.apache.org/solr/LocalParams
-       -->
-        <str name="qf">
-          id
-          active_fedora_model_ssi
-          title_tesim
-          author_tesim
-          subject_tesim
-        </str>
-        <str name="pf">
-          all_text_timv^10
-        </str>
-
-       <str name="author_qf">
-          author_tesim
-       </str>
-       <str name="author_pf">
-       </str>
-       <str name="title_qf">
-          title_tesim
-       </str>
-       <str name="title_pf">
-       </str>
-       <str name="subject_qf">
-          subject_tesim
-       </str>
-       <str name="subject_pf">
-       </str>
-       
-       <str name="fl">
-         *, 
-         score
-       </str>
-
-       <str name="facet">true</str>
-       <str name="facet.mincount">1</str>
-       <str name="facet.limit">10</str>
-       <str name="facet.field">active_fedora_model_ssi</str>
-       <str name="facet.field">subject_sim</str>
-       
-       <str name="spellcheck">true</str>
-       <str name="spellcheck.dictionary">default</str>
-       <str name="spellcheck.onlyMorePopular">true</str>
-       <str name="spellcheck.extendedResults">true</str>
-       <str name="spellcheck.collate">false</str>
-       <str name="spellcheck.count">5</str>
-
-     </lst>
-    <arr name="last-components">
-      <str>spellcheck</str>
-    </arr>
-  </requestHandler>
-
-  <requestHandler name="permissions" class="solr.SearchHandler" >
-    <lst name="defaults">
-      <str name="facet">off</str>
-      <str name="echoParams">all</str>
-      <str name="rows">1</str>
-      <str name="q">{!raw f=id v=$id}</str> <!-- use id=666 instead of q=id:666 -->
-      <str name="fl">
-        id,
-        access_ssim,
-        discover_access_group_ssim,discover_access_person_ssim,
-        read_access_group_ssim,read_access_person_ssim,
-        edit_access_group_ssim,edit_access_person_ssim,
-        depositor_ti,
-        embargo_release_date_dtsi
-        inheritable_access_ssim,
-        inheritable_discover_access_group_ssim,inheritable_discover_access_person_ssim,
-        inheritable_read_access_group_ssim,inheritable_read_access_person_ssim,
-        inheritable_edit_access_group_ssim,inheritable_edit_access_person_ssim,
-        inheritable_embargo_release_date_dtsi
-      </str>
-    </lst>
-  </requestHandler>
-  
-  <requestHandler name="standard" class="solr.SearchHandler">
-     <lst name="defaults">
-       <str name="echoParams">explicit</str>
-       <str name="defType">lucene</str>
-     </lst>
-  </requestHandler>
-
-  <!-- for requests to get a single document; use id=666 instead of q=id:666 -->
-  <requestHandler name="document" class="solr.SearchHandler" >
-    <lst name="defaults">
-      <str name="echoParams">all</str>
-      <str name="fl">*</str>
-      <str name="rows">1</str>
-      <str name="q">{!raw f=id v=$id}</str> <!-- use id=666 instead of q=id:666 -->
-    </lst>
-  </requestHandler>
-
-
-  <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
-    <str name="queryAnalyzerFieldType">textSpell</str>
-    <!-- Multiple "Spell Checkers" can be declared and used by this component
-      (e.g. for title_spell field)
-      -->
-    <lst name="spellchecker">
-      <str name="name">default</str>
-      <str name="field">spell</str>
-      <str name="spellcheckIndexDir">./spell</str>
-      <str name="buildOnOptimize">true</str>
-    </lst>
-  </searchComponent>
-  
-  <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" /> 
-  
-  <requestDispatcher handleSelect="true" >
-    <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
-  </requestDispatcher>
-  
-  <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
-  <requestHandler name="/update" class="solr.UpdateRequestHandler"  />
-  <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
-  
-  <requestHandler name="/admin/ping" class="solr.PingRequestHandler">
-    <lst name="invariants">
-      <str name="q">solrpingquery</str>
-    </lst>
-    <lst name="defaults">
-      <str name="echoParams">all</str>
-    </lst>
-  </requestHandler>
-  
-  <!-- config for the admin interface --> 
-  <admin>
-    <defaultQuery>search</defaultQuery>
-  </admin>
-  
-</config>