active-fedora 9.0.0.rc3 → 9.0.0

data/lib/active_fedora/ldp_cache.rb

@@ -0,0 +1,46 @@
+module ActiveFedora
+  # = Active Fedora Ldp Cache
+  class LdpCache
+    module ClassMethods
+      # Enable the query cache within the block if Active Fedora is configured.
+      # If it's not, it will execute the given block.
+      def cache(&block)
+        connection = ActiveFedora.fedora.connection
+        connection.cache(&block)
+      end
+
+      # Disable the query cache within the block if Active Fedora is configured.
+      # If it's not, it will execute the given block.
+      def uncached(&block)
+        ActiveFedora.fedora.connection.uncached(&block)
+      end
+    end
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      ActiveFedora.fedora.connection.enable_cache!
+
+      response = @app.call(env)
+      response[2] = Rack::BodyProxy.new(response[2]) do
+        reset_cache_settings
+      end
+
+      response
+    rescue Exception => e
+      reset_cache_settings
+      raise e
+    end
+
+    private
+
+    def reset_cache_settings
+      ActiveFedora.fedora.connection.clear_cache
+      ActiveFedora.fedora.connection.disable_cache!
+    end
+
+  end
+end
+

data/lib/active_fedora/ldp_resource_service.rb

@@ -0,0 +1,27 @@
+module ActiveFedora
+  class LdpResourceService
+    attr_reader :connection
+
+    def initialize(conn)
+      @connection = conn
+    end
+
+    def build(klass, id)
+      if id
+        LdpResource.new(connection, to_uri(klass, id))
+      else
+        LdpResource.new(connection, nil, nil, ActiveFedora.fedora.host + ActiveFedora.fedora.base_path)
+      end
+    end
+
+    def update(change_set, klass, id)
+      SparqlInsert.new(change_set.changes).execute(to_uri(klass, id))
+    end
+
+    private
+      def to_uri(klass, id)
+        klass.id_to_uri(id)
+      end
+
+  end
+end

data/lib/active_fedora/loadable_from_json.rb

@@ -15,9 +15,11 @@ module ActiveFedora
         @hash.fetch(terminology.first, [])
       end
 
+      # It is expected that the singular filter gets applied after fetching the value from this
+      # resource, so cast everything back to an array.
       def update_indexed_attributes hash
         hash.each do |k, v|
-          @hash[k.first] = v
+          @hash[k.first] = Array(v)
         end
       end
 

data/lib/active_fedora/log_subscriber.rb

@@ -0,0 +1,38 @@
+module ActiveFedora
+  class LogSubscriber < ActiveSupport::LogSubscriber
+
+    def initialize
+      super
+      @odd = false
+    end
+
+    def ldp(event)
+      return unless logger.debug?
+
+      payload = event.payload
+
+      name  = "#{payload[:name]} (#{event.duration.round(1)}ms)"
+      id   = payload[:id] || "[no id]"
+
+      if odd?
+        name = color(name, CYAN, true)
+        id  = color(id, nil, true)
+      else
+        name = color(name, MAGENTA, true)
+      end
+
+      debug "  #{name} #{id} Service: #{payload[:ldp_service]}"
+    end
+
+    def odd?
+      @odd = !@odd
+    end
+
+    def logger
+      ActiveFedora::Base.logger
+    end
+  end
+end
+
+ActiveFedora::LogSubscriber.attach_to :active_fedora
+

data/lib/active_fedora/persistence.rb

@@ -23,13 +23,12 @@ module ActiveFedora
     # @param [Hash] options
     # @option options [Boolean] :update_index (true) set false to skip indexing
     # @return [Boolean] true if save was successful, otherwise false
-    def save(options={})
-      raise ReadOnlyRecord if readonly?
-      new_record? ? create_record(options) : update_record(options)
+    def save(*args)
+      create_or_update(*args)
     end
 
-    def save!(options={})
-      save(options)
+    def save!(*args)
+      create_or_update(*args)
     end
 
     # Pushes the object and all of its new or dirty attached files into Fedora
@@ -43,7 +42,7 @@ module ActiveFedora
     #Deletes a Base object, also deletes the info indexed in Solr, and
     #the underlying inner_object.  If this object is held in any relationships (ie inbound relationships
     #outside of this object it will remove it from those items rels-ext as well
-    def delete
+    def delete(opts = {})
       return self if new_record?
 
       @destroyed = true
@@ -55,7 +54,7 @@ module ActiveFedora
 
       id = self.id ## cache so it's still available after delete
       # Clear out the ETag
-      @ldp_source = LdpResource.new(conn, uri)
+      @ldp_source = build_ldp_resource(id)
       begin
         @ldp_source.delete
       rescue Ldp::NotFound
@@ -63,12 +62,15 @@ module ActiveFedora
       end
 
       ActiveFedora::SolrService.delete(id) if ENABLE_SOLR_UPDATES
+      if opts[:eradicate]
+        self.class.eradicate(id)
+      end
       freeze
     end
 
-    def destroy
+    def destroy(*args)
       raise ReadOnlyRecord if readonly?
-      delete
+      delete(*args)
     end
 
     def eradicate
@@ -133,6 +135,11 @@ module ActiveFedora
 
   private
 
+    def create_or_update(*args)
+      raise ReadOnlyRecord if readonly?
+      new_record? ? create_record(*args) : update_record(*args)
+    end
+
     # Deals with preparing new object to be saved to Fedora, then pushes it and its attached files into Fedora.
     def create_record(options = {})
       assign_rdf_subject
@@ -152,20 +159,23 @@ module ActiveFedora
     end
 
     def refresh
-      @ldp_source = LdpResource.new(conn, uri)
+      @ldp_source = build_ldp_resource(id)
       @resource = nil
     end
 
     def execute_sparql_update
       change_set = ChangeSet.new(self, self.resource, self.changed_attributes.keys)
       return true if change_set.empty?
-      SparqlInsert.new(change_set.changes).execute(uri)
+      ActiveFedora.fedora.ldp_resource_service.update(change_set, self.class, id)
     end
 
-
+    # Override to tie in an ID minting service
     def assign_id
     end
 
+    # This is only used when creating a new record. If the object doesn't have an id
+    # and assign_id can mint an id for the object, then assign it to the resource.
+    # Otherwise the resource will have the id assigned by the LDP server
     def assign_rdf_subject
       @ldp_source = if !id && new_id = assign_id
         LdpResource.new(ActiveFedora.fedora.connection, self.class.id_to_uri(new_id), @resource)

data/lib/active_fedora/predicates.rb

@@ -25,7 +25,7 @@ module ActiveFedora
           rel_predicate = nil
         end
       else
-        xmlns="http://fedora.info/definitions/v4/rels-ext#"
+        xmlns="info:fedora/fedora-system:def/relations-external#"
         begin
           rel_predicate = predicate_lookup(predicate,xmlns)
         rescue UnregisteredPredicateError
@@ -52,7 +52,7 @@ module ActiveFedora
     # If predicate is a symbol, looks up the predicate in the predicate_mappings
     # If predicate is not a Symbol, returns the predicate untouched
     # @raise UnregisteredPredicateError if the predicate is a symbol but is not found in the predicate_mappings
-    def self.predicate_lookup(predicate,namespace="http://fedora.info/definitions/v4/rels-ext#")
+    def self.predicate_lookup(predicate,namespace="info:fedora/fedora-system:def/relations-external#")
       if predicate.class == Symbol 
         if predicate_mappings[namespace].has_key?(predicate)
           return predicate_mappings[namespace][predicate]
@@ -100,7 +100,7 @@ module ActiveFedora
     # @example
     #  ActiveFedora::Predicates.set_predicates({
     #                                              "http://projecthydra.org/ns/relations#"=>{has_profile:"hasProfile"},
-    #                                              "http://fedora.info/definitions/v4/rels-ext#"=>{
+    #                                              "info:fedora/fedora-system:def/relations-external#"=>{
     #                                                  references:"references",
     #                                                  has_derivation: "cameFrom"
     #                                              },

data/lib/active_fedora/railtie.rb

@@ -1,6 +1,9 @@
 module ActiveFedora
   class Railtie < Rails::Railtie
 
+    config.app_middleware.insert_after "::ActionDispatch::Callbacks",
+      "ActiveFedora::LdpCache"
+
     initializer 'active_fedora.autoload', before: :set_autoload_paths do |app|
       app.config.autoload_paths << 'app/models/datastreams'
     end

data/lib/active_fedora/rdf.rb

@@ -8,7 +8,6 @@ module ActiveFedora
     autoload :IndexingService
     autoload :Identifiable
     autoload :Persistence
-    autoload :RelsExt
     autoload :ProjectHydra
   end
 end

data/lib/active_fedora/relation/finder_methods.rb

@@ -188,7 +188,7 @@ module ActiveFedora
 
     def load_from_fedora(id, cast)
       raise ActiveFedora::ObjectNotFoundError if id.empty?
-      resource = LdpResource.new(ActiveFedora.fedora.connection, klass.id_to_uri(id))
+      resource = ActiveFedora.fedora.ldp_resource_service.build(klass, id)
       raise ActiveFedora::ObjectNotFoundError if resource.new?
       class_to_load(resource, cast).allocate.init_with_resource(resource) # Triggers the find callback
     end
@@ -202,9 +202,8 @@ module ActiveFedora
       end
     end
 
-    # TODO just use has_model
     def has_model_value(resource)
-      Ldp::Orm.new(resource).value(ActiveFedora::RDF::Fcrepo::Model.hasModel).first.to_s
+      resource.graph.query([nil, ActiveFedora::RDF::Fcrepo::Model.hasModel, nil]).first.object.to_s
     end
 
     def find_with_ids(ids, cast)

data/lib/active_fedora/validations.rb

@@ -69,7 +69,7 @@ module ActiveFedora
       output = super(context)
       errors.empty? && output
     end
-    
+
     # Test to see if the given field is required
     # @param [Symbol] key a field
     # @return [Boolean] is it required or not
@@ -85,5 +85,3 @@ module ActiveFedora
     end
   end
 end
-
-

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.0.0.rc3"
+  VERSION = "9.0.0"
 end

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

@@ -1,5 +1,6 @@
 default:
+  startup_wait: 90
   jetty_port: 8983
   java_opts:
-    - "-XX:MaxPermSize=128m" 
-    - "-Xmx256m"
+    - "-Xmx512m"
+    - "-XX:MaxPermSize=128m"

data/spec/fixtures/rails_root/config/predicate_mappings.yml

@@ -1,7 +1,7 @@
-:default_namespace: http://fedora.info/definitions/v4/rels-ext#
+:default_namespace: info:fedora/fedora-system:def/relations-external#
 
 :predicate_mapping:
-  http://fedora.info/definitions/v4/rels-ext#: 
+  info:fedora/fedora-system:def/relations-external#: 
     :is_derivation_of: isDerivationOf
     :is_metadata_for: isMetadataFor
     :is_member_of_collection: isMemberOfCollection

data/spec/integration/associations_spec.rb

@@ -28,13 +28,13 @@ describe ActiveFedora::Base do
   describe "complex example" do
     before do
       class Library < ActiveFedora::Base
-        has_many :books, predicate: ActiveFedora::RDF::RelsExt.hasConstituent
+        has_many :books, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasConstituent
       end
 
       class Book < ActiveFedora::Base
-        belongs_to :library, predicate: ActiveFedora::RDF::RelsExt.hasConstituent
-        belongs_to :author, predicate: ActiveFedora::RDF::RelsExt.hasMember, class_name: 'Person'
-        belongs_to :publisher, predicate: ActiveFedora::RDF::RelsExt.hasMember
+        belongs_to :library, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasConstituent
+        belongs_to :author, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasMember, class_name: 'Person'
+        belongs_to :publisher, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasMember
       end
 
       class Person < ActiveFedora::Base
@@ -335,10 +335,10 @@ describe ActiveFedora::Base do
   describe "single direction habtm" do
     before :all do
       class Course < ActiveFedora::Base
-        has_and_belongs_to_many :textbooks, predicate: ActiveFedora::RDF::RelsExt.isPartOf
+        has_and_belongs_to_many :textbooks, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
       end
       class Textbook < ActiveFedora::Base
-        has_many :courses, predicate: ActiveFedora::RDF::RelsExt.isPartOf
+        has_many :courses, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
       end
 
     end
@@ -395,7 +395,7 @@ describe ActiveFedora::Base do
     describe "for habtm" do
       before :all do
         class LibraryBook < ActiveFedora::Base
-          has_and_belongs_to_many :pages, predicate: ActiveFedora::RDF::RelsExt.isPartOf, after_remove: :after_hook, before_remove: :before_hook
+          has_and_belongs_to_many :pages, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, after_remove: :after_hook, before_remove: :before_hook
 
           def before_hook(m)
             say_hi(m)
@@ -413,7 +413,7 @@ describe ActiveFedora::Base do
 
         end
         class Page < ActiveFedora::Base
-          has_many :library_books, predicate: ActiveFedora::RDF::RelsExt.isPartOf
+          has_many :library_books, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
         end
 
       end
@@ -441,11 +441,11 @@ describe ActiveFedora::Base do
     describe "for has_many" do
       before :all do
         class LibraryBook < ActiveFedora::Base
-          has_many :pages, predicate: ActiveFedora::RDF::RelsExt.isPartOf, after_remove: :say_hi
+          has_many :pages, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, after_remove: :say_hi
 
         end
         class Page < ActiveFedora::Base
-          belongs_to :library_book, predicate: ActiveFedora::RDF::RelsExt.isPartOf
+          belongs_to :library_book, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
         end
       end
 
@@ -472,7 +472,7 @@ describe ActiveFedora::Base do
     describe "when an object doesn't have a property, and the class_name is predictable" do
       before (:all) do
         class Bauble < ActiveFedora::Base
-          belongs_to :media_object, predicate: ActiveFedora::RDF::RelsExt.isPartOf
+          belongs_to :media_object, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
         end
         class MediaObject < ActiveFedora::Base
           has_many :baubles
@@ -491,7 +491,7 @@ describe ActiveFedora::Base do
     describe "when an object doesn't have a property, but has a class_name" do
       before :all do
         class MasterFile < ActiveFedora::Base
-          belongs_to :media_object, predicate: ActiveFedora::RDF::RelsExt.isPartOf
+          belongs_to :media_object, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
         end
         class MediaObject < ActiveFedora::Base
           has_many :parts, class_name: 'MasterFile'
@@ -511,10 +511,10 @@ describe ActiveFedora::Base do
     describe "an object has an explicity property" do
       before :all do
         class Bauble < ActiveFedora::Base
-          belongs_to :media_object, predicate: ActiveFedora::RDF::RelsExt.isPartOf
+          belongs_to :media_object, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
         end
         class MediaObject < ActiveFedora::Base
-          has_many :baubles, predicate: ActiveFedora::RDF::RelsExt.hasEquivalent
+          has_many :baubles, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasEquivalent
         end
       end
 
@@ -531,7 +531,7 @@ describe ActiveFedora::Base do
     describe "an object doesn't have a property" do
       before :all do
         class Bauble < ActiveFedora::Base
-          belongs_to :media_object, predicate: ActiveFedora::RDF::RelsExt.isPartOf
+          belongs_to :media_object, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
         end
 
         class MediaObject < ActiveFedora::Base
@@ -554,16 +554,16 @@ describe ActiveFedora::Base do
     describe "for habtm" do
       before :all do
         class Novel < ActiveFedora::Base
-          has_and_belongs_to_many :contents, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
+          has_and_belongs_to_many :contents, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
         end
         class TextBook < ActiveFedora::Base
-          has_and_belongs_to_many :contents, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
+          has_and_belongs_to_many :contents, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
         end
         class Text < ActiveFedora::Base
-          has_many :books, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
+          has_many :books, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
         end
         class Image < ActiveFedora::Base
-          has_many :books, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
+          has_many :books, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
         end
       end