active-fedora 9.0.6 → 9.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cbfeceebf66b94fa9e04ccb8527c9795167a4e73
-  data.tar.gz: 7438bf293a82b052a103ccea3febb14929e9e3c2
+SHA256:
+  metadata.gz: ebf611de1fa3721bc0d53f15e6210ced8509072da4f1406f818e2f14c5f11be2
+  data.tar.gz: 1f6729e4bce4f1b03ba5ba2864c4dbe84ae454932221de98fe4357b8e80e69e4
 SHA512:
-  metadata.gz: aa70a485f881672113c3004de9da43d15bb6008e8a95bf85ce22d097260b51169240490b2f2d369eeeb93fa429df116a5f0790b5707bb8ba5cc18684c098e0ef
-  data.tar.gz: cd423d69239dc6c2dfce41c5ad4c69570a71099d82a543122247efc421d59f1637dba4b5ff43319ccd8702f9f97b30ede3891c9c78db2acae083b693da798dfd
+  metadata.gz: f5ba1bc7bcb326f435f1ed88cad1e1a7b68c04b122472379430bf320a634e67e3da72c13c424dda5ba1f9d2673aec820a74d9b7adffb60bd9c23498f89ed7b52
+  data.tar.gz: 2e06a0593ec85862f1995277e7a530f05bff3f31e30ed80a4719c04beb8807c28060ec275fa2d833c118b83ad22fb812c5a07d848823bbfc9d90bb8693683fd9

data/History.txt

@@ -1,3 +1,60 @@
+v9.0.8
+
+  2015-04-15: Revert "Move the indexing logic to the model. Fixes #736"
+  [Justin Coyne] (cabb9057)
+
+  2015-04-15: Fix deleting from a HABTM when the inverse_of is a
+  has_many. Fixes #763 [Justin Coyne] (b1e67fb1)
+
+  2015-04-15: Remove a spec that is a duplicate of
+  integration/collection_association_spec.rb:92 [Justin Coyne]
+  (bdafd50d)
+
+  2015-04-15: Leverage the code in AssociationRelation to find the
+  inverse. Fixes #760 [Justin Coyne] (c764ea70)
+
+  2015-04-15: Make #translate_id_to_uri/uri_to_id reliable. [Trey
+  Terrell] (80a4e3fd)
+
+  2015-04-15: Find best model match in case of inheritance [Stuart
+  Kenny] (481a9cd4)
+
+  2015-04-15: Requires 'deprecation' for ActiveFedora::File [Andrew
+  Myers] (14be5cf6)
+
+  2015-04-07: The indexing hints should be inheritable [Justin Coyne]
+  (c8d41b91)
+
+v9.0.7
+  2015-04-06: Only set/save the inverse on a HABTM if the inverse is also HABTM
+  previously we were getting: [Justin Coyne]
+
+  2015-04-06: Derive a foreign_key ending with `_ids` if the inverse is a
+  collection [Justin Coyne]
+
+  2015-04-06: Find inverse relations when class_names have modules [Justin Coyne]
+
+  2015-04-06: Raise an error when the inverse relationship can not be found.
+  Previously a "SystemStackError: Stack too deep" was encountered in this
+  situation [Justin Coyne]
+
+  2015-04-02: Add a mechanism to set rdf_label on the ActiveTriple resource
+  [Justin Coyne]
+
+  2015-04-03: Refactor has_and_belongs_to_many_associations_spec [Justin Coyne]
+
+  2015-04-03: Remove unused sample classes [Justin Coyne]
+
+  2015-04-02: Sort versions as dates not as strings [Justin Coyne]
+
+  2015-04-01: Prevents an object from being loaded to the incorrect class. For
+  example, when loading a batch object it should be loaded into a Batch (and not a
+  File for example.) [Justin Coyne]
+
+  2015-03-27: Move the indexing logic to the model. Fixes #736 You should now add
+  indexing hints to has_attributes by passing a block similar to how you do it
+  with rdf properties. e.g.: [Justin Coyne]
+
 v9.0.6
   2015-03-26: Setting type should not wipe out properties. Fixes #737 [Justin Coyne]
 

data/lib/active_fedora.rb

@@ -51,6 +51,10 @@ module ActiveFedora #:nodoc:
     autoload :ChangeSet
     autoload :Config
     autoload :Core
+    autoload_under 'core' do
+      autoload :FedoraIdTranslator
+      autoload :FedoraUriTranslator
+    end
     autoload :Datastream
     autoload :Datastreams
     autoload :DelegatedAttribute
@@ -63,6 +67,7 @@ module ActiveFedora #:nodoc:
     autoload :FixityService
     autoload :Indexing
     autoload :IndexingService
+    autoload :InheritableAccessors
     autoload :LdpCache
     autoload :LdpResource
     autoload :LdpResourceService

data/lib/active_fedora/associations/collection_association.rb

@@ -343,29 +343,12 @@ module ActiveFedora
         def find_reflection
           return reflection if @reflection.options[:predicate]
           if @reflection.class_name && @reflection.class_name != 'ActiveFedora::Base' && @reflection.macro != :has_and_belongs_to_many
-            inverse_relation = @owner.class.to_s.underscore.to_sym
-            begin
-              find_reflection_for_relation(@reflection.class_name.constantize)
-            rescue NameError
-              raise "No :predicate attribute was set or could be inferred for #{@reflection.macro} #{@reflection.name.inspect} on #{@owner.class}"
-            end
+            @reflection.inverse_of || raise("No :inverse_of or :predicate attribute was set or could be inferred for #{@reflection.macro} #{@reflection.name.inspect} on #{@owner.class}")
           else
             raise "Couldn't find reflection"
           end
         end
 
-        def find_reflection_for_relation(klass, inverse_relation=@owner.class.to_s.underscore.to_sym)
-          raise "Unable to lookup the :predicate attribute for #{@reflection.macro} #{@reflection.name.inspect} on #{@owner.class} because #{klass} specifies \"class_name: 'ActiveFedora::Base'\".  Either specify a specific class_name in #{klass} or set :predicate in the #{@reflection.macro} declaration on #{@owner.class}" if inverse_relation == :'active_fedora/base'
-          if klass.reflections.key?(inverse_relation)
-            # Try it singular
-            return klass.reflections[inverse_relation]
-          elsif klass.reflections.key?(inverse_relation.to_s.pluralize.to_sym)
-            # Try it plural
-            return klass.reflections[inverse_relation.to_s.pluralize.to_sym]
-          end
-          find_reflection_for_relation(klass, @owner.class.superclass.to_s.underscore.to_sym)
-        end
-
         def create_record(attributes, raise = false)
           attributes.update(@reflection.options[:conditions]) if @reflection.options[:conditions].is_a?(Hash)
           ensure_owner_is_not_new

data/lib/active_fedora/associations/has_and_belongs_to_many_association.rb

@@ -18,13 +18,16 @@ module ActiveFedora
         owner[reflection.foreign_key] ||= []
         owner[reflection.foreign_key] += [record.id]
 
-        if @owner.new_record? and @reflection.options[:inverse_of]
-          ActiveFedora::Base.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.") if ActiveFedora::Base.logger
-        elsif @reflection.options[:inverse_of]
-          inverse = @reflection.inverse_of
-          record[inverse.foreign_key] ||= []
-          record[inverse.foreign_key] += [owner.id]
-          record.save
+        # Only if they've explicitly stated the inverse in the options
+        if reflection.options[:inverse_of]
+          inverse = reflection.inverse_of
+          if owner.new_record?
+            ActiveFedora::Base.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.") if ActiveFedora::Base.logger
+          elsif inverse.has_and_belongs_to_many?
+            record[inverse.foreign_key] ||= []
+            record[inverse.foreign_key] += [owner.id]
+            record.save
+          end
         end
 
         return true
@@ -76,9 +79,8 @@ module ActiveFedora
           records.each do |r|
             owner[reflection.foreign_key] -= [r.id]
 
-            if (@reflection.options[:inverse_of])
-              inverse = @reflection.inverse_of
-              r[inverse.foreign_key] -= [owner.id]
+            if inverse = @reflection.inverse_of
+              r[inverse.foreign_key] -= [owner.id] if inverse.has_and_belongs_to_many?
               r.association(inverse.name).reset
               r.save
             end

data/lib/active_fedora/core.rb

@@ -14,14 +14,25 @@ module ActiveFedora
       # :singleton-method
       #
       # Accepts a proc that takes an id and transforms it to a URI
-      mattr_accessor :translate_id_to_uri, instance_writer: false
+      mattr_reader :translate_id_to_uri do
+        FedoraIdTranslator
+      end
+
+      def self.translate_id_to_uri=(translator)
+        @@translate_id_to_uri = translator || FedoraIdTranslator
+      end
 
       ##
       # :singleton-method
       #
       # Accepts a proc that takes a uri and transforms it to an id
-      mattr_accessor :translate_uri_to_id, instance_writer: false
+      mattr_reader :translate_uri_to_id do
+        FedoraUriTranslator
+      end
 
+      def self.translate_uri_to_id=(translator)
+        @@translate_uri_to_id = translator || FedoraUriTranslator
+      end
     end
 
     def ldp_source
@@ -134,27 +145,14 @@ module ActiveFedora
       # Transforms an id into a uri
       # if translate_id_to_uri is set it uses that proc, otherwise just the default
       def id_to_uri(id)
-        if translate_id_to_uri
-          translate_id_to_uri.call(id)
-        else
-          id = "/#{id}" unless id.start_with? SLASH
-          unless ActiveFedora.fedora.base_path == SLASH || id.start_with?("#{ActiveFedora.fedora.base_path}/")
-            id = ActiveFedora.fedora.base_path + id
-          end
-          ActiveFedora.fedora.host + id
-        end
+        translate_id_to_uri.call(id)
       end
 
       ##
       # Transforms a uri into an id
       # if translate_uri_to_id is set it uses that proc, otherwise just the default
       def uri_to_id(uri)
-        if translate_uri_to_id
-          translate_uri_to_id.call(uri)
-        else
-          id = uri.to_s.sub(ActiveFedora.fedora.host + ActiveFedora.fedora.base_path, '')
-          id.start_with?('/') ? id[1..-1] : id
-        end
+        translate_uri_to_id.call(uri)
       end
 
       ##

data/lib/active_fedora/core/fedora_id_translator.rb

@@ -0,0 +1,12 @@
+module ActiveFedora::Core
+  class FedoraIdTranslator
+    SLASH = '/'.freeze
+    def self.call(id)
+      id = "/#{id}" unless id.start_with? SLASH
+      unless ActiveFedora.fedora.base_path == SLASH || id.start_with?("#{ActiveFedora.fedora.base_path}/")
+        id = ActiveFedora.fedora.base_path + id
+      end
+      ActiveFedora.fedora.host + id
+    end
+  end
+end

data/lib/active_fedora/core/fedora_uri_translator.rb

@@ -0,0 +1,9 @@
+module ActiveFedora::Core
+  class FedoraUriTranslator
+    SLASH = '/'.freeze
+    def self.call(uri)
+      id = uri.to_s.sub(ActiveFedora.fedora.host + ActiveFedora.fedora.base_path, '')
+      id.start_with?(SLASH) ? id[1..-1] : id
+    end
+  end
+end

data/lib/active_fedora/errors.rb

@@ -72,4 +72,8 @@ module ActiveFedora #:nodoc:
   # Transactions are currently incomplete
   class Rollback < ActiveFedoraError
   end
+
+  # Raised when Fedora returns a version without a create date
+  class VersionLacksCreateDate < ActiveFedoraError
+  end
 end

data/lib/active_fedora/fedora_attributes.rb

@@ -1,6 +1,7 @@
 module ActiveFedora
   module FedoraAttributes
     extend ActiveSupport::Concern
+    include InheritableAccessors
 
     included do
       include ActiveTriples::Properties
@@ -18,6 +19,8 @@ module ActiveFedora
       def modified_date
         super.first
       end
+
+      define_inheritable_accessor(:type, :rdf_label)
     end
 
     # Override ActiveTriples method for setting properties
@@ -62,6 +65,12 @@ module ActiveFedora
       @resource ||= self.class.resource_class.new(@ldp_source.graph.rdf_subject, @ldp_source.graph)
     end
 
+    # You can set the URI to use for the rdf_label on ClassMethods.rdf_label, then on
+    # the instance, calling rdf_label returns the value of that configured property
+    def rdf_label
+      resource.rdf_label
+    end
+
     module ClassMethods
       # We make a unique class, because properties belong to a class.
       # This keeps properties from different objects separate.
@@ -70,7 +79,7 @@ module ActiveFedora
       def resource_class
         @generated_resource_class ||= begin
             klass = self.const_set(:GeneratedResourceSchema, Class.new(ActiveTriples::Resource))
-            klass.configure type: @type if @type
+            klass.configure active_triple_options
             klass.properties.merge(self.properties).each do |property, config|
               klass.property(config.term,
                              predicate: config.predicate,
@@ -80,10 +89,11 @@ module ActiveFedora
         end
       end
 
-      # Set the rdf type for this class
-      def type(uri)
-        @type = uri
-      end
+      private
+        # @return a Hash of options suitable for passing to ActiveTriples::Base.configure
+        def active_triple_options
+          { type: type, rdf_label: rdf_label }
+        end
     end
   end
 end

data/lib/active_fedora/file.rb

@@ -1,3 +1,5 @@
+require 'deprecation'
+
 module ActiveFedora
 
   #This class represents a Fedora datastream

data/lib/active_fedora/inheritable_accessors.rb

@@ -0,0 +1,26 @@
+# Similar to ActiveSupport.class_attribute but with a setter that doesn't use the #{name}= syntax
+# This preserves backward compatibility with the API in ActiveTriples
+
+module ActiveFedora
+  module InheritableAccessors
+    extend ActiveSupport::Concern
+    module ClassMethods
+      def define_inheritable_accessor(*names)
+        names.each do |name|
+          define_accessor(name, nil)
+        end
+      end
+
+      private
+        def define_accessor(name, val)
+          singleton_class.class_eval do
+            remove_possible_method(name)
+            define_method(name) do |uri = nil|
+              define_accessor(name, uri) if uri
+              val
+            end
+          end
+        end
+    end
+  end
+end

data/lib/active_fedora/reflection.rb

@@ -152,6 +152,8 @@ module ActiveFedora
             "#{name.to_s.singularize}_ids"
           elsif options[:as]
             "#{options[:as]}_id"
+          elsif inverse_of && inverse_of.collection?
+            "#{options[:inverse_of].to_s.singularize}_ids"
           else
             # This works well if this is a has_many that is the inverse of a belongs_to, but it isn't correct for a has_many that is the invers of a has_and_belongs_to_many
             active_fedora.name.foreign_key
@@ -292,7 +294,7 @@ module ActiveFedora
       # returns either false or the inverse association name that it finds.
       def automatic_inverse_of
         if can_find_inverse_of_automatically?(self)
-          inverse_name = ActiveSupport::Inflector.underscore(active_fedora.name).to_sym
+          inverse_name = ActiveSupport::Inflector.underscore(options[:as] || active_fedora.name.demodulize).to_sym
 
           begin
             reflection = klass.reflect_on_association(inverse_name)

data/lib/active_fedora/relation/finder_methods.rb

@@ -38,7 +38,6 @@ module ActiveFedora
       return to_a.find { |*block_args| yield(*block_args) } if block_given?
       options = args.extract_options!
       options = options.dup
-
       cast = if @klass == ActiveFedora::Base && !options.has_key?(:cast)
         true
       else 
@@ -198,12 +197,37 @@ module ActiveFedora
         ActiveFedora::Base
       else
         # The true class may be a subclass of @klass, so always use from_class_uri
-        Model.from_class_uri(has_model_value(resource)) || ActiveFedora::Base
+        resource_class = Model.from_class_uri(has_model_value(resource)) || ActiveFedora::Base
+        unless equivalent_class?(resource_class)
+          raise ActiveFedora::ActiveFedoraError.new("Model mismatch. Expected #{@klass}. Got: #{resource_class}") 
+        end
+        resource_class
       end
     end
 
     def has_model_value(resource)
-      resource.graph.query([nil, ActiveFedora::RDF::Fcrepo::Model.hasModel, nil]).first.object.to_s
+      best_model_match = nil
+
+      resource.graph.query([nil, ActiveFedora::RDF::Fcrepo::Model.hasModel, nil]).each do |rg|
+
+        model_value = Model.from_class_uri(rg.object.to_s)
+
+        if model_value
+
+          best_model_match ||= model_value
+
+          # If there is an inheritance structure, use the most specific case.
+          if best_model_match > model_value
+            best_model_match = model_value
+          end
+        end
+      end
+
+      best_model_match.to_s
+    end
+
+    def equivalent_class?(other_class)
+      other_class <= @klass
     end
 
     def find_with_ids(ids, cast)

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.0.6"
+  VERSION = "9.0.8"
 end

data/lib/active_fedora/versions_graph.rb

@@ -2,11 +2,13 @@ module ActiveFedora
   class VersionsGraph < ::RDF::Graph
 
     def all opts={}
-      if opts[:include_auto_save]
-        fedora_versions
-      else
-        fedora_versions.reject { |v| v.label.match("auto") }
+      versions = fedora_versions
+      unless opts[:include_auto_save]
+        versions.reject! { |version| version.label.match("auto") }
       end
+      versions.sort_by { |version| DateTime.parse(version.created) }
+    rescue ArgumentError, NoMethodError
+      raise ActiveFedora::VersionLacksCreateDate
     end
 
     def first
@@ -50,10 +52,7 @@ module ActiveFedora
       end
 
       def fedora_versions
-        list = resources.map { |statement| version_from_resource(statement) }
-        list.sort_by(&:created)
+        resources.map { |statement| version_from_resource(statement) }
       end
-
   end
-
 end

data/spec/integration/associations_spec.rb

@@ -28,7 +28,7 @@ describe ActiveFedora::Base do
   describe "explicit foreign key" do
     before do
       class FooThing < ActiveFedora::Base
-        has_many :bars, :class_name=>'BarThing', :predicate=>ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, :as=>:foothing
+        has_many :bars, :class_name=>'BarThing', :predicate=>ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, as: :foothing
       end
 
       class BarThing < ActiveFedora::Base
@@ -286,6 +286,39 @@ describe ActiveFedora::Base do
       end
     end
 
+    describe "when fetching an existing object" do
+      before do
+        class Dog < ActiveFedora::Base; end
+        class BigDog < Dog; end
+        class Cat < ActiveFedora::Base; end
+        @dog = Dog.create
+        @big_dog = BigDog.create
+      end
+      it "should detect class mismatch" do
+        expect {
+          Cat.find @dog.id
+        }.to raise_error(ActiveFedora::ActiveFedoraError)
+      end
+
+      it "should not accept parent class into a subclass" do
+        expect {
+          BigDog.find @dog.id
+        }.to raise_error(ActiveFedora::ActiveFedoraError)
+      end
+
+      it "should accept a subclass into a parent class" do
+        # We could prevent this altogether since loading a subclass into
+        # a parent class (a BigDog into a Dog) would result in lost of 
+        # data if the object is saved back and the subclass has more 
+        # properties than the parent class. However, it does seem reasonable 
+        # that people might want to use them interchangeably (after all  
+        # a BigDog is a Dog) and therefore we allow for it.
+        expect {
+          Dog.find @big_dog.id
+        }.not_to raise_error    
+      end
+    end
+
     describe "setting belongs_to" do
       before do
         @library = Library.new()
@@ -558,27 +591,6 @@ describe ActiveFedora::Base do
         expect(MediaObject.new.association(:baubles).send(:find_reflection)).to eq MediaObject.reflect_on_association(:baubles)
       end
     end
-
-    describe "an object doesn't have a property" do
-      before :all do
-        class Bauble < ActiveFedora::Base
-          belongs_to :media_object, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
-        end
-
-        class MediaObject < ActiveFedora::Base
-          has_many :shoes
-        end
-      end
-
-      after :all do
-        Object.send(:remove_const, :Bauble)
-        Object.send(:remove_const, :MediaObject)
-      end
-
-      it "it should find the predicate" do
-        expect { MediaObject.new.shoes.send(:find_predicate) }.to raise_error RuntimeError, "No :predicate attribute was set or could be inferred for has_many :shoes on MediaObject"
-      end
-    end
   end
 
   describe "casting when the class name is ActiveFedora::Base" do