active-fedora 6.0.0 → 6.1.0

data/.gitignore

@@ -8,3 +8,4 @@ doc
 tmp
 Gemfile.lock
 jetty
+bin

data/History.txt

@@ -1,3 +1,19 @@
+6.1.0
+Give a list of classes that decend from ActiveFedora::Base
+ActiveFedora::Base.exists?(nil) now returns false. Fixes #56
+Removed extraneous solr configs.
+Deprecated get_values_from_datastream. Fixes #52
+Added ActiveFedora::Base.decendants
+Added some sensible defaults to the solrconfig. Removed comments about old fields.
+active_fedora_model solr field corrected to be single-valued.
+Fixed fields for solrconfig permissions.
+Deprecated Attributes#update_datastream_attributes.
+Delegate registry works with descendants of ActiveFedora::Base, not just direct subclasses. Fixes #59
+New ActiveFedora::Auditable mixin - provides access to Fedora audit trail.
+Fixed has and belongs to many, so it calls remove_relationship on the right object.
+Added jetty.yml to solr generator to overwrite the Blacklight jetty.yml.
+Upgrade to om 2.1.0.
+
 6.0.0
 New solr schema with descriptive field suffixes
 Added support for RDF lists

data/README.textile

@@ -1,4 +1,4 @@
-"!https://travis-ci.org/projecthydra/active_fedora.png!":https://travis-ci.org/projecthydra/active_fedora
+!https://travis-ci.org/projecthydra/active_fedora.png?branch=master!:https://travis-ci.org/projecthydra/active_fedora
 
 h2. Description
 
@@ -27,22 +27,27 @@ You can generate a model inheriting from ActiveFedora::Base.
 
 h2. Testing (this Gem)
 
-In order to run the RSpec tests, you need to have a copy of the ActiveFedora source code, and then run bundle install in the source directory.
+In order to run the RSpec tests, you need to have a copy of the ActiveFedora source code, and then run bundle install in the source directory.  Testing requires hydra-jetty, which contains version for Fedora and Solr.  Setting up and maintaining hydra-jetty for the purposes of testing this gem is all accomplished via
 
 <pre>
 git clone https://github.com/projecthydra/active_fedora.git
 cd /wherever/active_fedora/is
 bundle install
-git submodule init
-git submodule update
 </pre>
 
-h3. Testing with Hudson Rake Task
+h3. Using the continuous integration server
 
-The hudson rake task will spin up jetty, import the fixtures, and run the tests for you.
+You can test ActiveFedora using the same process as our continuous integration server.  To do that, unzip a copy
+of hydra-jetty first.  This includes copies of Fedora and Solr which are used during the testing process.
 
 <pre>
-  rake active_fedora:hudson
+  rake jetty:unzip 
+</pre>
+
+Once hydra-jetty is unzipped, the ci rake task will spin up jetty, import the fixtures, and run the tests for you.
+
+<pre>
+  rake active_fedora:ci
 </pre>
 
 h3. Testing Manually

data/active-fedora.gemspec

@@ -15,13 +15,13 @@ Gem::Specification.new do |s|
   s.required_ruby_version     = '>= 1.9.3'
 
   s.add_dependency('rsolr')
-  s.add_dependency('om', '~> 2.0.0')
+  s.add_dependency('om', '~> 2.1.0')
   s.add_dependency('nom-xml', '>=0.5.1')
   s.add_dependency("activeresource", '>= 3.0.0')
   s.add_dependency("activesupport", '>= 3.0.0')
   s.add_dependency("builder", '~> 3.0.0')
   s.add_dependency("mediashelf-loggable")
-  s.add_dependency("rubydora", '~>1.5')
+  s.add_dependency("rubydora", '~>1.6')
   s.add_dependency("rdf")
   s.add_dependency("rdf-rdfxml", '~>1.0.0')
   s.add_dependency("deprecation")

data/lib/active_fedora.rb

@@ -26,6 +26,7 @@ module ActiveFedora #:nodoc:
   eager_autoload do
     autoload :Associations
     autoload :Attributes
+    autoload :Auditable
     autoload :Base
     autoload :ContentModel
     autoload :Callbacks

data/lib/active_fedora/associations/association_collection.rb

@@ -74,7 +74,7 @@ module ActiveFedora
         flatten_deeper(records).each do |record|
           raise_on_type_mismatch(record)
           add_record_to_target_with_callbacks(record) do |r|
-            result &&= insert_record(record) unless @owner.new_record?
+            result &&= insert_record(record)
           end
         end
 

data/lib/active_fedora/associations/has_and_belongs_to_many_association.rb

@@ -31,16 +31,25 @@ module ActiveFedora
 
           ### TODO save relationship
           @owner.add_relationship(@reflection.options[:property], record)
-          if (@reflection.options[:inverse_of])
+
+          if @owner.new_record? and @reflection.options[:inverse_of]
+            logger.warn("has_and_belongs_to_many #{@reflection.inspect} is cowardly refusing to insert the inverse relationship into #{record}, because #{@owner} is not persisted yet.")
+          elsif @reflection.options[:inverse_of]
             record.add_relationship(@reflection.options[:inverse_of], @owner)
+            record.save
           end
-          record.save
+
           return true
         end
 
         def delete_records(records)
           records.each do |r| 
-            r.remove_relationship(@reflection.options[:property], @owner)
+            @owner.remove_relationship(@reflection.options[:property], r)
+            
+            if (@reflection.options[:inverse_of])
+              r.remove_relationship(@reflection.options[:inverse_of], @owner)
+              r.save
+            end
           end
         end
     end

data/lib/active_fedora/associations/has_many_association.rb

@@ -31,6 +31,10 @@ module ActiveFedora
       end
 
       def insert_record(record, force = false, validate = true)
+        if @owner.new_record?
+          logger.warn("has_many #{@reflection.inspect} is cowardly refusing to insert a relationship into #{record}, because #{@owner} is not persisted yet.")
+          return true 
+        end
         set_belongs_to_association_for(record)
         #force ? record.save! : record.save(:validate => validate)
         record.save

data/lib/active_fedora/attributes.rb

@@ -2,6 +2,10 @@ module ActiveFedora
   module Attributes
     extend ActiveSupport::Concern
     extend ActiveSupport::Autoload
+    extend Deprecation
+    self.deprecation_horizon = 'active-fedora 7.0.0'
+    
+    
     autoload :Serializers
 
     included do
@@ -60,6 +64,7 @@ module ActiveFedora
     #   }
     #   article.update_datastream_attributes( ds_values_hash )
     def update_datastream_attributes(params={}, opts={})
+      Deprecation.warn(Attributes, 'update_datastream_attributes is deprecated. Consider using delegate_to instead.', caller)
       result = params.dup
       params.each_pair do |dsid, ds_params| 
         if datastreams.include?(dsid)
@@ -72,6 +77,7 @@ module ActiveFedora
     end
     
     def get_values_from_datastream(dsid,field_key,default=[])
+      Deprecation.warn(Attributes, 'get_values_from_datastream is deprecated. Consider using Datastream#get_values instead.', caller)
       if datastreams.include?(dsid)
         return datastreams[dsid].get_values(field_key,default)
       else

data/lib/active_fedora/auditable.rb

@@ -0,0 +1,9 @@
+module ActiveFedora
+  module Auditable
+    
+    def audit_trail
+      inner_object.audit_trail
+    end
+
+  end
+end

data/lib/active_fedora/base.rb

@@ -1,6 +1,7 @@
 SOLR_DOCUMENT_ID = "id" unless (defined?(SOLR_DOCUMENT_ID) && !SOLR_DOCUMENT_ID.nil?)
 ENABLE_SOLR_UPDATES = true unless defined?(ENABLE_SOLR_UPDATES)
 require "digest"
+require 'active_support/descendants_tracker'
 
 module ActiveFedora
   
@@ -315,6 +316,7 @@ module ActiveFedora
   Base.class_eval do
     include Attributes
     include ActiveFedora::Persistence
+    extend ActiveSupport::DescendantsTracker
     extend Model
     include Loggable
     include Indexing

data/lib/active_fedora/delegating.rb

@@ -27,13 +27,15 @@ module ActiveFedora
 
     module ClassMethods
       def delegates
-        @delegates ||= {}
+        @local_delegates ||= {}
+        return @local_delegates unless superclass.respond_to?(:delegates) and value = superclass.delegates
+        @local_delegates = value.dup if @local_delegates.empty?
+        @local_delegates
       end
 
       def delegates= val
-        @delegates = val
+        @local_delegates = val
       end
-
       # Provides a delegate class method to expose methods in metadata streams
       # as member of the base object. Pass the target datastream via the
       # <tt>:to</tt> argument. If you want to return a unique result, (e.g. string

data/lib/active_fedora/indexing.rb

@@ -14,7 +14,7 @@ module ActiveFedora
         m_time = Time.parse(m_time) unless m_time.is_a?(Time)
         Solrizer.set_field(solr_doc, 'system_create', c_time, :stored_sortable)
         Solrizer.set_field(solr_doc, 'system_modified', m_time, :stored_sortable)
-        Solrizer.set_field(solr_doc, 'active_fedora_model', self.class.inspect, :symbol)
+        Solrizer.set_field(solr_doc, 'active_fedora_model', self.class.inspect, :stored_sortable)
         solr_doc.merge!(SOLR_DOCUMENT_ID.to_sym => pid)
         solrize_profile(solr_doc)
       end

data/lib/active_fedora/nokogiri_datastream.rb

@@ -3,10 +3,9 @@ module ActiveFedora
   class NokogiriDatastream < OmDatastream
     extend Deprecation
     def initialize(digital_object=nil, dsid=nil, options={})
+      Deprecation.warn(self.class, "NokogiriDatastream is deprecated and will be removed in hydra-head 7.0. Use OmDatastream insead.", caller(2))
       super
     end
-    self.deprecation_horizon= "hydra-head 7.0"
-    deprecation_deprecate :initialize
   end
 end
 

data/lib/active_fedora/querying.rb

@@ -72,6 +72,7 @@ module ActiveFedora
     # @param[String] pid 
     # @return[boolean] 
     def exists?(pid)
+      return false if pid.nil? || pid.empty?
       inner = DigitalObject.find_or_initialize(self, pid)
       !inner.new?
     end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.0.0"
+  VERSION = "6.1.0"
 end

data/lib/generators/active_fedora/config/solr/solr_generator.rb

@@ -5,6 +5,7 @@ module ActiveFedora
     source_root File.expand_path('../templates', __FILE__)
 
     def generate
+      copy_file('jetty.yml', 'config/jetty.yml')
       copy_file('solr.yml', 'config/solr.yml')
       directory('solr_conf', 'solr_conf')
     end

data/lib/generators/active_fedora/config/solr/templates/jetty.yml

@@ -0,0 +1,5 @@
+default:
+  jetty_port: 8983
+  java_opts:
+    - "-XX:MaxPermSize=128m" 
+    - "-Xmx256m"

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

@@ -13,30 +13,6 @@
     <field name="lat" type="tdouble" stored="true" indexed="true" multiValued="false"/>
     <field name="lng" type="tdouble" stored="true" indexed="true" multiValued="false"/>
 
-	<!--these fields are hard coded in places in hydra-head -->
-	<field name="active_fedora_model_s" type="string" stored="true" indexed="true"/>
-	<field name="object_profile_display" type="string" stored="true" indexed="true"/>
-	<field name="has_model_s" type="string" stored="true" indexed="true"/>
-	<field name="is_governed_by_s" type="string" stored="true" indexed="true"/>
-	
-	<!--
-	These are hard coded in places in hydra-head, but we hope to fix that.
-	
-	<field name="inheritable_discover_access_person_t" type="string" stored="true" indexed="true" multiValued="true"/>
-	<field name="inheritable_read_access_person_t" type="string" stored="true" indexed="true" multiValued="true"/>
-	<field name="inheritable_edit_access_person_t" type="string" stored="true" indexed="true" multiValued="true"/>
-	<field name="inheritable_discover_access_group_t" type="string" stored="true" indexed="true" multiValued="true"/>
-	<field name="inheritable_read_access_group_t" type="string" stored="true" indexed="true" multiValued="true"/>
-	<field name="inheritable_edit_access_group_t" type="string" stored="true" indexed="true" multiValued="true"/>
-	<field name="read_access_person_t" type="string" stored="true" indexed="true" multiValued="true"/>
-	<field name="discover_access_person_t" type="string" stored="true" indexed="true" multiValued="true"/>
-	<field name="edit_access_person_t" type="string" stored="true" indexed="true" multiValued="true"/>
-	<field name="read_access_group_t" type="string" stored="true" indexed="true" multiValued="true"/>
-	<field name="edit_access_group_t" type="string" stored="true" indexed="true" multiValued="true"/>
-	<field name="discover_access_group_t" type="string" stored="true" indexed="true" multiValued="true"/>
-	-->	
-
-
     <!-- NOTE:  not all possible Solr field types are represented in the dynamic fields -->
 
     <!-- text (_t...) -->
@@ -173,152 +149,16 @@
     <!-- you must define copyField source and dest fields explicity or schemaBrowser doesn't work -->
     <field name="all_text_timv" type="text" stored="false" indexed="true" multiValued="true" termVectors="true" termPositions="true" termOffsets="true"/>
 
-    <!-- deprecated fields from pre-Solr 4.0 pre-hydra 5.0 -->
-<!--    
-    <field name="marc_display" type="string" indexed="false" stored="true" multiValued="false"/>
-    <field name="title_display" type="string" indexed="false" stored="true" multiValued="false"/>
-    <field name="title_vern_display" type="string" indexed="false" stored="true" multiValued="false"/>
-    <field name="subtitle_display" type="string" indexed="false" stored="true" multiValued="false"/>
-    <field name="subtitle_vern_display" type="string" indexed="false" stored="true" multiValued="false"/>
-    <field name="author_display" type="string" indexed="false" stored="true" multiValued="false"/>
-    <field name="author_vern_display" type="string" indexed="false" stored="true" multiValued="false"/>
--->
-    <!-- these fields are also used for display, so they must be stored -->
-<!--    
-    <field name="isbn_t" type="text" indexed="true" stored="true" multiValued="true"/>
-    <field name="language_facet" type="string" indexed="true" stored="true" multiValued="true" />
-    <field name="subject_topic_facet" type="string" indexed="true" stored="true" multiValued="true" />
-    <field name="subject_era_facet" type="string" indexed="true" stored="true" multiValued="true" />
-    <field name="subject_geo_facet" type="string" indexed="true" stored="true" multiValued="true" />
--->
-     <!-- pub_date is used for facet and display so it must be indexed and stored -->
-<!--    
-    <field name="pub_date" type="string" indexed="true" stored="true" multiValued="true"/>
--->
-    <!-- pub_date sort uses new trie-based int fields, which are recommended for any int and are displayable, sortable, and range-quer
-    we use 'tint' for faster range-queries. -->
-<!--    
-    <field name="pub_date_sort" type="tint" indexed="true" stored="true" multiValued="false"/>
--->
-    <!-- format is used for facet, display, and choosing which partial to use for the show view, so it must be stored and indexed -->
-<!--    
-    <field name="format" type="string" indexed="true" stored="true"/>
-
-    <dynamicField name="*_i"  type="int"    indexed="true"  stored="true"/>
-    <dynamicField name="*_s"  type="string"  indexed="true"  stored="true" multiValued="true"/>
-    <dynamicField name="*_l"  type="long"   indexed="true"  stored="true"/>
-    <dynamicField name="*_t"  type="text"    indexed="true"  stored="true" multiValued="true"/>
-    <dynamicField name="*_txt" type="text_general"    indexed="true"  stored="true" multiValued="true"/>
-    <dynamicField name="*_b"  type="boolean" indexed="true"  stored="true"/>
-    <dynamicField name="*_f"  type="float"  indexed="true"  stored="true"/>
-    <dynamicField name="*_d"  type="double" indexed="true"  stored="true"/>
-
-    <dynamicField name="ignored_*" type="ignored" multiValued="true"/>
-    <dynamicField name="attr_*" type="text_general" indexed="true" stored="true" multiValued="true"/>
-
-    <dynamicField name="random_*" type="random" />
-
-    <dynamicField name="*_display" type="string" indexed="false" stored="true" multiValued="true" />
-    <dynamicField name="*_facet" type="string" indexed="true" stored="true" multiValued="true" />
-    <dynamicField name="*_sort" type="string" indexed="true" stored="false" multiValued="false" />
-    <dynamicField name="*_unstem_search" type="text_general" indexed="true" stored="false" multiValued="true" />
-    <dynamicField name="*spell" type="textSpell" indexed="true" stored="false" multiValued="true" />
--->
-    <!-- uncomment the following to ignore any fields that don't already match an existing
-         field name or dynamic field, rather than reporting them as an error.
-         alternately, change the type="ignored" to some other type e.g. "text" if you want
-         unknown fields indexed and/or stored by default -->
-    <!--dynamicField name="*" type="ignored" multiValued="true" /-->
-
-    <!-- END hydra deprecated items -->
 
   </fields>
 
-  <!-- START hydra deprecated items -->
-<!--  
-  <defaultSearchField>text</defaultSearchField>
--->
-  <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
-<!--  
-  <solrQueryParser defaultOperator="AND"/>
-
-  <copyField source="title_t" dest="title_unstem_search"/>
-  <copyField source="subtitle_t" dest="subtitle_unstem_search"/>
-  <copyField source="title_addl_t" dest="title_addl_unstem_search"/>
-  <copyField source="title_added_entry_t" dest="title_added_entry_unstem_search"/>
-  <copyField source="title_series_t" dest="title_series_unstem_search"/>
-  <copyField source="author_t" dest="author_unstem_search"/>
-  <copyField source="author_addl_t" dest="author_addl_unstem_search"/>
-  <copyField source="subject_t" dest="subject_unstem_search"/>
-  <copyField source="subject_addl_t" dest="subject_addl_unstem_search"/>
-  <copyField source="subject_topic_facet" dest="subject_topic_unstem_search"/>
--->
-  <!-- sort fields -->
-<!--  
-  <copyField source="pub_date" dest="pub_date_sort"/>
--->
-
-  <!-- spellcheck fields -->
-  <!-- default spell check;  should match fields for default request handler -->
-  <!-- it won't work with a copy of a copy field -->
-<!-- 
-  <copyField source="*_t" dest="spell"/>
-  <copyField source="*_facet" dest="spell"/>
--->
-  <!-- title spell check;  should match fields for title request handler -->
-<!-- 
-  <copyField source="title_t" dest="title_spell"/>
-  <copyField source="subtitle_t" dest="title_spell"/>
-  <copyField source="addl_titles_t" dest="title_spell"/>
-  <copyField source="title_added_entry_t" dest="title_spell"/>
-  <copyField source="title_series_t" dest="title_spell"/>
--->
-  <!-- author spell check; should match fields for author request handler -->
-<!-- 
-  <copyField source="author_t" dest="author_spell"/>
-  <copyField source="author_addl_t" dest="author_spell"/>
--->
-  <!-- subject spell check; should match fields for subject request handler -->
-<!-- 
-  <copyField source="subject_topic_facet" dest="subject_spell"/>
-  <copyField source="subject_t" dest="subject_spell"/>
-  <copyField source="subject_addl_t" dest="subject_spell"/>
--->
-  
-  <!-- OpenSearch query field should match request handler search fields -->
-<!--  
-  <copyField source="title_t" dest="opensearch_display"/>
-  <copyField source="subtitle_t" dest="opensearch_display"/>
-  <copyField source="addl_titles_t" dest="opensearch_display"/>
-  <copyField source="title_added_entry_t" dest="opensearch_display"/>
-  <copyField source="title_series_t" dest="opensearch_display"/>
-  <copyField source="author_t" dest="opensearch_display"/>
-  <copyField source="author_addl_t" dest="opensearch_display"/>
-  <copyField source="subject_topic_facet" dest="opensearch_display"/>
-  <copyField source="subject_t" dest="opensearch_display"/>
-  <copyField source="subject_addl_t" dest="opensearch_display"/>
--->
 
   <!-- Above, multiple source fields are copied to the [text] field.
       Another way to map multiple source fields to the same
       destination field is to use the dynamic field syntax.
       copyField also supports a maxChars to copy setting.  -->
 
-    <!-- <copyField source="*_t" dest="text" maxChars="3000"/> -->
-<!--  
-    <copyField source="*_s" dest="text"/>
-    <copyField source="*_t" dest="text"/>
-    <copyField source="*_facet" dest="text"/>
--->
-    <!-- copy name to alphaNameSort, a field designed for sorting by name -->
-    <!-- <copyField source="name" dest="alphaNameSort"/> -->
-
-    <!-- END hydra deprecated items -->
-
-  <!-- copy fields;  note that you must define copyField source and dest fields explicity or schemaBrowser doesn't work -->
-<!--
-  <copyField source="some_field" dest="all_text_timv" />
--->  
+    <!-- <copyField source="*_tesim" dest="all_text_timv" maxChars="3000"/> -->
 
   <types>
     <fieldType name="string" class="solr.StrField" sortMissingLast="true" />