active-fedora 6.2.0 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c01087204a8c5f60744938710ac3eb0c461b6e7
-  data.tar.gz: 49f69184528ee7b71ae305da79ea785fa6b682a4
+  metadata.gz: bcded8e76a404beaf4995b0a8d4ff0f9747e5170
+  data.tar.gz: 449b9bb2fd96f88fc07e6fe6ab3aecc9015cfe5b
 SHA512:
-  metadata.gz: 5b90ee428f9e28fa66d2425dc5a021262a44ee85163a7595c68acb7bac96db4924b409e8b70af51d6a9e6f08efbb74ed4d74349a8af891d4badf910fd986ca41
-  data.tar.gz: 2d0b2da228cb0e2c27a328975ab89e15f0be882a05c18cd2acfd270515b83c6a05dfb50165f8588f15ca56da15080b2c34b061900db88c72da53d2c81f48ac28
+  metadata.gz: fc219dd3f66394ef8da3b7fca9aeef738f6de5bf91e51d8d8f51b0df35ea52e3f360d7c61477266399bf77bf7a06b9dd9ee196c1758363a5924e41d47756f1cf
+  data.tar.gz: fa2a07fc6796b488e542ab397333a47aff1ac6db3018b5355c654821407ae3f1a7b45493ec05be8cae67d0cb871d25a0e13bf4210b7764734b5965016734fbc1

data/.mailmap

@@ -0,0 +1,9 @@
+Mark Bussey <mark@curationexperts.com> mark-dce <mark@curationexperts.com>
+Andrew Myers <andrew_myers@wgbh.org> afred <afredmyers@gmail.com>
+Richard Johnson <rick.johnson@nd.edu> rjohns14@github.com <rjohns14@LIB-1224.library.nd.edu>
+Richard Johnson <rick.johnson@nd.edu> rjohns14 <rjohns14@LIB-1224.library.nd.edu>
+Richard Johnson <rick.johnson@nd.edu> rickjohnson <rick.johnson@nd.edu>
+Justin Coyne <justin@curationexperts.com> jcoyne <digger250@gmail.com>
+Chris Colvard <cjcolvar@indiana.edu> cjcolvar <cjcolvar@indiana.edu>
+David Chandek-Stark <dchandekstark@gmail.com> dchandekstark <dchandekstark@gmail.com>
+Matt Zumwalt <matt.zumwalt@yourmediashelf.com> flyingzumwalt <matt.zumwalt@gmail.com>

data/CONTRIBUTORS.md

@@ -0,0 +1,25 @@
+Contributors to this project:
+
+*  Adam Wead
+*  Andrew Curley
+*  Benjamin Armintor
+*  Bess Sadler
+*  Carolyn Cole
+*  Chris Beer
+*  Chris Colvard
+*  David Chandek-Stark
+*  Edwin Shin
+*  Jeremy Friesen
+*  Jessie Keck
+*  John Scofield
+*  Justin Coyne
+*  Matt Zumwalt
+*  Michael B. Klein
+*  Michael J. Giarlo
+*  Michael Klein
+*  Mirosław Boruta
+*  Naomi Dushay
+*  Richard Johnson
+*  Thomas Johnson
+*  mpc3c
+

data/History.txt

@@ -1,3 +1,55 @@
+6.3.0 (2013-06-14)
+
+Added method: ActiveFedora::Base#required? [Justin Coyne]
+
+Removed redundant MacroReflection#klass method definition. Removed some excessive whitespace. [David Chandek-Stark]
+
+Updated doc comment for .count to reflect change made in commit 1cd412a817f5d7b5c2f2cbc304b915b7423c499d. [David Chandek-Stark]
+
+Adding CONTRIBUTORS and mailmap [Jeremy Friesen]
+
+Test against rails 4.0.0.rc2 [Justin Coyne]
+
+Backwards compatible change adding optional `args' param to ActiveFedora::SolrService.count, enabling the method to pass args through to ActiveFedora::SolrService.query. [David Chandek-Stark]
+
+habtm#delete saves between the before and after hook. [Justin Coyne]
+
+Added association delete callbacks [Justin Coyne]
+
+Fix nested_attributes handling [Mirosław Boruta]
+
+Startup wait in one spot [Justin Coyne]
+
+Remove unnecessary environment task [Chris Colvard]
+
+try to use a createdDate accessor on @inner_object if it is available [Chris Beer]
+
+use our test namespace rather than minting a new one in base_spec [Chris Beer]
+
+remove checks for fedora default values [Chris Beer]
+
+remove unnecessary test [Chris Beer]
+
+add support for rubydora's #uri method (for fcrepo4 compatbility) [Chris Beer]
+
+wrap property accessors in multi -> single valued wrappers [Chris Beer]
+
+Closes #84 [David Chandek-Stark]
+
+Modify or remove tests that check for DC datastreams; deprecate Datastreams#dc in favor of Datastreams#datastreams["DC"] [Chris Colvard]
+
+Using Rubydora's mint for assign_pid [Jeremy Friesen]
+
+fix #87 - use solr's !raw and sub-query feature to handle solr query escaping [Chris Beer]
+
+Reworking datastream id spec to be order agnostic [Jeremy Friesen]
+
+fix #87 - use solr _query_ to encapsulate solr queries for escaping [Chris Beer]
+
+Fix validations unit test to pass legitimately [Andrew Curley]
+
+
+
 6.2.0 (2013-06-05)
 
 Support for rails 4

data/active-fedora.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency('nom-xml', '>=0.5.1')
   s.add_dependency("activesupport", '>= 3.0.0')
   s.add_dependency("mediashelf-loggable")
-  s.add_dependency("rubydora", '~>1.6')
+  s.add_dependency("rubydora", '~>1.6', '>= 1.6.5')
   s.add_dependency("rdf")
   s.add_dependency("rdf-rdfxml", '~>1.0.0')
   s.add_dependency("deprecation")

data/config/jetty.yml

@@ -1,5 +1,5 @@
 default:
-  startup_wait: 45
+  startup_wait: 60
   jetty_port: 8983
   java_opts:
     - "-Xmx256m" 

data/gemfiles/gemfile.rails4

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec :path=>"../"
 
-gem 'activemodel', '4.0.0.rc1'
+gem 'activemodel', '4.0.0.rc2'
 
 group :development, :test do
   gem 'simplecov', :platform => :mri_19

data/lib/active_fedora/associations.rb

@@ -38,6 +38,7 @@ module ActiveFedora
       def has_many(association_id, options={})
         raise "You must specify a property name for #{name}" if !options[:property]
         reflection = create_has_many_reflection(association_id, options)
+        add_association_callbacks(reflection.name, reflection.options)
         collection_accessor_methods(reflection, HasManyAssociation)
       end
 
@@ -152,7 +153,7 @@ module ActiveFedora
         reflection = create_has_and_belongs_to_many_reflection(association_id, options, &extension)
         collection_accessor_methods(reflection, HasAndBelongsToManyAssociation)
         #configure_after_destroy_method_for_has_and_belongs_to_many(reflection)
-        #add_association_callbacks(reflection.name, options)
+        add_association_callbacks(reflection.name, options)
       end
 
 
@@ -171,6 +172,20 @@ module ActiveFedora
           create_reflection(:has_and_belongs_to_many, association_id, options, self)
         end
 
+        def add_association_callbacks(association_name, options)
+          callbacks = %w(before_add after_add before_remove after_remove)
+          callbacks.each do |callback_name|
+            full_callback_name = "#{callback_name}_for_#{association_name}"
+            defined_callbacks = options[callback_name.to_sym]
+            class_attribute full_callback_name.to_sym
+            if options.has_key?(callback_name.to_sym)
+              self.send((full_callback_name +'=').to_sym, [defined_callbacks].flatten)
+            else
+              self.send((full_callback_name +'=').to_sym, [])
+            end
+          end
+        end
+
         def association_accessor_methods(reflection, association_proxy_class)
           redefine_method(reflection.name) do |*params|
             force_reload = params.first unless params.empty?

data/lib/active_fedora/associations/association_collection.rb

@@ -215,10 +215,28 @@ module ActiveFedora
           records = flatten_deeper(records)
           records.each { |record| raise_on_type_mismatch(record) }
 
-          #records.each { |record| callback(:before_remove, record) }
+          records.each { |record| callback(:before_remove, record) }
           old_records = records.reject { |r| r.new_record? }
           yield(records, old_records)
-          #records.each { |record| callback(:after_remove, record) }
+          records.each { |record| callback(:after_remove, record) }
+        end
+
+        def callback(method, record)
+          callbacks_for(method).each do |callback|
+            case callback
+            when Symbol
+              @owner.send(callback, record)
+            when Proc
+              callback.call(@owner, record)
+            else
+              callback.send(method, @owner, record)
+            end
+          end
+        end
+
+        def callbacks_for(callback_name)
+          full_callback_name = "#{callback_name}_for_#{@reflection.name}"
+          @owner.class.send(full_callback_name.to_sym) || []
         end
 
         def ensure_owner_is_not_new

data/lib/active_fedora/associations/has_and_belongs_to_many_association.rb

@@ -48,10 +48,17 @@ module ActiveFedora
             
             if (@reflection.options[:inverse_of])
               r.remove_relationship(@reflection.options[:inverse_of], @owner)
+              # It looks like inverse_of points at a predicate, not at a relationship name,
+              # which is what we should have done. Now we need a way to look up the
+              # reflection by predicate
+              name = r.class.reflection_name_for_predicate(@reflection.options[:inverse_of])
+              r.send(name).reset
               r.save
             end
           end
+          @owner.save!
         end
+
     end
   end
 end

data/lib/active_fedora/base.rb

@@ -30,8 +30,7 @@ module ActiveFedora
     self.fedora_connection = {}
     self.profile_solr_name = ActiveFedora::SolrService.solr_name("object_profile", :displayable)
 
-    delegate :label, :label=, to: :inner_object
-    delegate :state=, :state, to: :inner_object
+    delegate :state=,:label=, to: :inner_object
 
     def method_missing(name, *args)
       dsid = corresponding_datastream_name(name)
@@ -64,6 +63,19 @@ module ActiveFedora
       !new_object?
     end
 
+    def mark_for_destruction
+      @marked_for_destruction = true
+    end
+
+    def marked_for_destruction?
+      @marked_for_destruction
+    end
+
+    def reload(options = nil)
+      @marked_for_destruction = false
+      super
+    end
+
     # Constructor.  You may supply a custom +:pid+, or we call the Fedora Rest API for the
     # next available Fedora pid, and mark as new object.
     # Also, if +attrs+ does not contain +:pid+ but does contain +:namespace+ it will pass the
@@ -184,9 +196,7 @@ module ActiveFedora
         credentials = ActiveFedora.config.credentials
       end
       fedora_connection[0] ||= ActiveFedora::RubydoraConnection.new(credentials)
-      d = Nokogiri::XML( fedora_connection[0].connection.next_pid(args))
-      pid = d.xpath('//fedora:pid', 'fedora' => 'http://www.fedora.info/definitions/1/0/management/').text
-      pid
+      fedora_connection[0].connection.mint(args)
     end
 
     def inner_object # :nodoc
@@ -220,21 +230,35 @@ module ActiveFedora
 
     #return the owner id
     def owner_id
-      @inner_object.ownerId
+      Array(@inner_object.ownerId).first
     end
     
     def owner_id=(owner_id)
       @inner_object.ownerId=(owner_id)
     end
 
+    def label
+      Array(@inner_object.label).first
+    end
+
+    def state
+      Array(@inner_object.state).first
+    end
+
     #return the create_date of the inner object (unless it's a new object)
     def create_date
-      @inner_object.new? ? Time.now : @inner_object.profile["objCreateDate"]
+      if @inner_object.new?
+        Time.now
+      elsif @inner_object.respond_to? :createdDate
+        Array(@inner_object.createdDate).first
+      else
+        @inner_object.profile['objCreateDate']
+      end
     end
 
     #return the modification date of the inner object (unless it's a new object)
     def modified_date
-      @inner_object.new? ? Time.now : @inner_object.profile["objLastModDate"]
+      @inner_object.new? ? Time.now : Array(@inner_object.lastModifiedDate).first
     end
 
     def ==(comparison_object)

data/lib/active_fedora/datastream.rb

@@ -10,6 +10,13 @@ module ActiveFedora
       super
     end
 
+    alias_method :realLabel, :label
+
+    def label
+      Array(realLabel).first
+    end
+    alias_method :dsLabel, :label
+
     def inspect
       "#<#{self.class} @pid=\"#{digital_object ? pid : nil}\" @dsid=\"#{dsid}\" @controlGroup=\"#{controlGroup}\" changed=\"#{changed?}\" @mimeType=\"#{mimeType}\" >"
     end

data/lib/active_fedora/datastreams.rb

@@ -123,6 +123,7 @@ module ActiveFedora
     # Return the Dublin Core (DC) Datastream. You can also get at this via 
     # the +datastreams["DC"]+.
     def dc
+      Deprecation.warn(Datastreams, 'dc is deprecated. Consider using Base#datastreams["DC"] instead.', caller)
       return datastreams["DC"] 
     end
 

data/lib/active_fedora/nested_attributes.rb

@@ -5,6 +5,9 @@ require 'active_support/core_ext/object/blank'
 
 module ActiveFedora
   module NestedAttributes #:nodoc:
+    class TooManyRecords < RuntimeError
+    end
+
     extend ActiveSupport::Concern
     included do
       class_attribute :nested_attributes_options, :instance_writer => false
@@ -50,10 +53,12 @@ module ActiveFedora
     #   # creates avatar_attributes= and posts_attributes=
     #   accepts_nested_attributes_for :avatar, :posts, :allow_destroy => true
     module ClassMethods
+      REJECT_ALL_BLANK_PROC = proc { |attributes| attributes.all? { |key, value| key == '_destroy' || value.blank? } }
+
       def accepts_nested_attributes_for(*attr_names)
         options = { :allow_destroy => false, :update_only => false }
         options.update(attr_names.extract_options!)
-        # options.assert_valid_keys(:allow_destroy, :reject_if, :limit, :update_only)
+        options.assert_valid_keys(:allow_destroy, :reject_if, :limit, :update_only)
         options[:reject_if] = REJECT_ALL_BLANK_PROC if options[:reject_if] == :all_blank
 
         attr_names.each do |association_name|
@@ -61,20 +66,23 @@ module ActiveFedora
             reflection.options[:autosave] = true
             # add_autosave_association_callbacks(reflection)
             ## TODO this ought to work, but doesn't seem to do the class inheitance right
+
+            nested_attributes_options = self.nested_attributes_options.dup
             nested_attributes_options[association_name.to_sym] = options
+            self.nested_attributes_options = nested_attributes_options
+
             type = (reflection.collection? ? :collection : :one_to_one)
 
             # def pirate_attributes=(attributes)
             #   assign_nested_attributes_for_one_to_one_association(:pirate, attributes)
             # end
             class_eval <<-eoruby, __FILE__, __LINE__ + 1
-              if method_defined?(:#{association_name}_attributes=)
-                remove_method(:#{association_name}_attributes=)
-              end
+              remove_possible_method(:#{association_name}_attributes=)
+
               def #{association_name}_attributes=(attributes)
                 assign_nested_attributes_for_#{type}_association(:#{association_name}, attributes)
                 ## in lieu of autosave_association_callbacks just save all of em.
-                send(:#{association_name}).each {|obj| obj.save}
+                send(:#{association_name}).each {|obj| obj.marked_for_destruction? ? obj.destroy : obj.save}
               end
             eoruby
           else
@@ -92,8 +100,12 @@ module ActiveFedora
 
 
     def assign_nested_attributes_for_collection_association(association_name, attributes_collection)
-      options= {}
-      #options = nested_attributes_options[association_name]
+      options = nested_attributes_options[association_name]
+
+      if options[:limit] && attributes_collection.size > options[:limit]
+        raise TooManyRecords, "Maximum #{options[:limit]} records are allowed. Got #{attributes_collection.size} records instead."
+      end
+
       if attributes_collection.is_a? Hash
         keys = attributes_collection.keys
         attributes_collection = if keys.include?('id') || keys.include?(:id)
@@ -116,11 +128,14 @@ module ActiveFedora
         attributes = attributes.with_indifferent_access
 
         if attributes['id'].blank?
-          association.build(attributes.except(*UNASSIGNABLE_KEYS))
+          association.build(attributes.except(*UNASSIGNABLE_KEYS)) unless call_reject_if(association_name, attributes)
 
         elsif existing_record = existing_records.detect { |record| record.id.to_s == attributes['id'].to_s }
           association.send(:add_record_to_target_with_callbacks, existing_record) if !association.loaded? && !call_reject_if(association_name, attributes)
-          assign_to_or_mark_for_destruction(existing_record, attributes, options[:allow_destroy])
+
+          if !call_reject_if(association_name, attributes)
+            assign_to_or_mark_for_destruction(existing_record, attributes, options[:allow_destroy])
+          end
 
         else
           raise_nested_attributes_record_not_found(association_name, attributes['id'])
@@ -146,6 +161,16 @@ module ActiveFedora
       raise ObjectNotFoundError, "Couldn't find #{reflection.klass.name} with ID=#{record_id} for #{self.class.name} with ID=#{id}"
     end
 
+    def call_reject_if(association_name, attributes)
+      return false if has_destroy_flag?(attributes)
+      case callback = self.nested_attributes_options[association_name][:reject_if]
+      when Symbol
+        method(callback).arity == 0 ? send(callback) : send(callback, attributes)
+      when Proc
+        callback.call(attributes)
+      end
+    end
+
   end
 end
 

data/lib/active_fedora/reflection.rb

@@ -7,9 +7,13 @@ module ActiveFedora
       self.reflections = {}
     end
 
-
-
     module ClassMethods
+      def reflection_name_for_predicate(predicate)
+        reflections.each do |k, v|
+          return k if v.options[:property] == predicate
+        end
+      end
+
       def create_reflection(macro, name, options, active_fedora)
         case macro
           when :has_many, :belongs_to, :has_and_belongs_to_many
@@ -55,12 +59,9 @@ module ActiveFedora
         # a new association object. Use +build_association+ or +create_association+
         # instead. This allows plugins to hook into association object creation.
         def klass
-          #@klass ||= active_record.send(:compute_type, class_name)
-          @klass ||= class_name
+          @klass ||= class_name.constantize
         end
 
-
-
         def initialize(macro, name, options, active_fedora)
           @macro, @name, @options, @active_fedora = macro, name, options, active_fedora
         end
@@ -73,36 +74,23 @@ module ActiveFedora
 
         # Returns the name of the macro.
         #
-        # <tt>composed_of :balance, :class_name => 'Money'</tt> returns <tt>:balance</tt>
         # <tt>has_many :clients</tt> returns <tt>:clients</tt>
         attr_reader :name
 
-
         # Returns the hash of options used for the macro.
         #
-        # <tt>composed_of :balance, :class_name => 'Money'</tt> returns <tt>{ :class_name => "Money" }</tt>
         # <tt>has_many :clients</tt> returns +{}+
         attr_reader :options
 
         attr_reader :macro
 
-        # Returns the class for the macro.
-        #
-        # <tt>composed_of :balance, :class_name => 'Money'</tt> returns the Money class
-        # <tt>has_many :clients</tt> returns the Client class
-        def klass
-          @klass ||= class_name.constantize
-        end
-
         # Returns the class name for the macro.
         #
-        # <tt>composed_of :balance, :class_name => 'Money'</tt> returns <tt>'Money'</tt>
         # <tt>has_many :clients</tt> returns <tt>'Client'</tt>
         def class_name
           @class_name ||= options[:class_name] || derive_class_name
         end
 
-
         # Returns whether or not this association reflection is for a collection
         # association. Returns +true+ if the +macro+ is either +has_many+ or
         # +has_and_belongs_to_many+, +false+ otherwise.
@@ -110,8 +98,6 @@ module ActiveFedora
           @collection
         end
 
-
-
         private
           def derive_class_name
             class_name = name.to_s.camelize
@@ -119,7 +105,6 @@ module ActiveFedora
             class_name
           end
 
-
       end
 
       # Holds all the meta-data about an association as it was specified in the
@@ -134,7 +119,6 @@ module ActiveFedora
         def primary_key_name
           @primary_key_name ||= options[:foreign_key] || derive_primary_key_name
         end
-
         
         # Creates a new instance of the associated class, and immediately saves it
         # with ActiveRecord::Base#save. +options+ will be passed to the class's
@@ -143,8 +127,6 @@ module ActiveFedora
           klass.create(*options)
         end
 
-
-
         private
 
         def derive_primary_key_name