hydra-head 3.1.5 → 3.2.0.pre1

data/.gitignore

@@ -12,6 +12,7 @@ tmtags
 
 ## VIM
 *.swp
+*.swo
 
 ## OSX
 .DS_Store

data/CREATE_RAILS_APP.textile

@@ -299,7 +299,6 @@ git commit -m "Adding hydra-jetty submodule"
 h4. (3) Run Jetty
 
 _Stop any copies of jetty (or anything else using port 8983) before running this command._
-(Note that java 1.6 must be invoked by the "java" command or Fedora won't work.)
 
 The following will copy Solr and Fedora configuration files over to jetty in addition to starting it:
 
@@ -310,7 +309,7 @@ rake hydra:jetty:load
 h2. XI. Run Your New Hydra Application
 
 <pre>
-  script/server
+  rails server
 </pre>
 
 You should now be able to go to your application at http://localhost:3000.
@@ -319,5 +318,5 @@ Note that there are no objects pre-installed into Fedora (or Solr).
 
 h2. XII. Develop your Hydra Application with ActiveFedora and OM
 
-See "HOW_TO_GET_STARTED":https://github.com/mediashelf/om/blob/master/HOW_TO_GET_STARTED.textile.
+See "GETTING_STARTED":https://github.com/mediashelf/om/blob/master/GETTING_STARTED.textile.
 

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    hydra-head (3.1.5)
+    hydra-head (3.2.0.pre1)
       RedCloth (= 4.2.3)
-      active-fedora (~> 3.1.4)
+      active-fedora (>= 3.2.0.pre5)
       blacklight (= 3.0.0)
       block_helpers
       builder (= 2.1.2)
@@ -32,7 +32,7 @@ PATH
       sanitize
       solr-ruby
       solrizer (>= 1.1.0)
-      solrizer-fedora (>= 1.2.0)
+      solrizer-fedora (>= 1.2.2)
       term-ansicolor
       trollop
       will_paginate
@@ -56,19 +56,19 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    active-fedora (3.1.4)
-      activeresource (~> 3.0.0)
-      activesupport (~> 3.0.0)
+    active-fedora (3.2.0.pre5)
+      activeresource (>= 3.0.0)
+      activesupport (>= 3.0.0)
       equivalent-xml
       facets
       mediashelf-loggable
       mime-types (>= 1.16)
       multipart-post (= 1.1.2)
       nokogiri
-      om (>= 1.4.3)
+      om (>= 1.4.4)
       rdf
       rdf-rdfxml
-      rubydora (~> 0.2.6)
+      rubydora (~> 0.3.0)
       solr-ruby (>= 0.0.6)
       solrizer (> 1.0.0)
       xml-simple (>= 1.0.12)
@@ -109,20 +109,20 @@ GEM
       xpath (~> 0.1.4)
     childprocess (0.2.3)
       ffi (~> 1.0.6)
-    columnize (0.3.5)
+    columnize (0.3.6)
     crack (0.3.1)
-    cucumber (1.1.3)
+    cucumber (1.1.4)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.6.7)
+      gherkin (~> 2.7.1)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
-    cucumber-rails (1.2.0)
-      capybara (>= 1.1.1)
-      cucumber (>= 1.1.1)
+    cucumber-rails (1.2.1)
+      capybara (>= 1.1.2)
+      cucumber (>= 1.1.3)
       nokogiri (>= 1.5.0)
     curb (0.7.15)
-    daemons (1.1.4)
+    daemons (1.1.5)
     database_cleaner (0.7.0)
     diff-lcs (1.1.3)
     equivalent-xml (0.2.8)
@@ -134,27 +134,29 @@ GEM
       activesupport
     fastercsv (1.5.4)
     ffi (1.0.11)
-    gherkin (2.6.8)
+    gherkin (2.7.1)
       json (>= 1.4.6)
     gyoku (0.4.4)
       builder (>= 2.1.2)
-    haml (3.1.3)
+    haml (3.1.4)
     httparty (0.8.1)
       multi_json
       multi_xml
     httpi (0.9.5)
       rack
     i18n (0.5.0)
-    jettywrapper (1.1.0)
+    jettywrapper (1.2.0)
       activesupport (>= 3.0.0)
       childprocess
       i18n
       logger
       mediashelf-loggable
-    json (1.6.2)
-    json_pure (1.6.2)
-    kaminari (0.12.4)
-      rails (>= 3.0.0)
+    json (1.6.3)
+    json_pure (1.6.4)
+    kaminari (0.13.0)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
     launchy (2.0.5)
       addressable (~> 2.2.6)
     linecache (0.46)
@@ -176,7 +178,7 @@ GEM
     multipart-post (1.1.2)
     nokogiri (1.5.0)
     nori (1.0.2)
-    om (1.4.3)
+    om (1.4.4)
       mediashelf-loggable
       nokogiri (>= 1.4.2)
     polyglot (0.3.3)
@@ -206,7 +208,7 @@ GEM
     rdf-rdfxml (0.3.5)
       nokogiri (>= 1.4.4)
       rdf (>= 0.3.4)
-    rdoc (3.11)
+    rdoc (3.12)
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -232,7 +234,7 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    rubydora (0.2.6)
+    rubydora (0.3.1)
       activemodel
       activesupport
       fastercsv
@@ -251,10 +253,10 @@ GEM
       nokogiri (>= 1.4.0)
       nori (~> 1.0)
       wasabi (~> 2.0)
-    selenium-webdriver (2.13.0)
+    selenium-webdriver (2.15.0)
       childprocess (>= 0.2.1)
       ffi (~> 1.0.9)
-      json_pure
+      multi_json (~> 1.0.4)
       rubyzip
     solr-ruby (0.0.8)
     solrizer (1.1.2)
@@ -264,15 +266,15 @@ GEM
       om (>= 1.4.0)
       stomp
       xml-simple
-    solrizer-fedora (1.2.0)
-      active-fedora (~> 3.1.0)
+    solrizer-fedora (1.2.2)
+      active-fedora (>= 3.1.0)
       activesupport
       fastercsv
-      jettywrapper (~> 1.1.0)
+      jettywrapper (>= 1.1.0)
       rsolr
       solr-ruby (>= 0.0.6)
       solrizer (>= 1.0.0)
-    stomp (1.1.10)
+    stomp (1.2.0)
     term-ansicolor (1.0.7)
     thor (0.14.6)
     treetop (1.4.10)
@@ -287,7 +289,7 @@ GEM
     xml-simple (1.1.1)
     xpath (0.1.4)
       nokogiri (~> 1.3)
-    yard (0.7.3)
+    yard (0.7.4)
 
 PLATFORMS
   ruby

data/HISTORY.textile

@@ -1,5 +1,13 @@
+h3. 3.2.0
+* Update to ActiveFedora 3.2.0
+* Update to solrizer-fedora 1.2.2
+* Remove calls to has_relationship 
+* File assets no longer check collection_member relationship (for container)
+
 h3. 3.1.5
 * Update to ActiveFedora 3.1.4
+* Update to solrizer-fedora 1.2.0
+* Fix problems where Datastreamr#attributes["mimeType"] was being called (changed to Datastream#mimeType)
 
 
 h3. 3.1.4

data/app/models/file_asset.rb

@@ -1,115 +1,5 @@
 # model for a FileAsset   ActiveFedora object 
 #   a file asset is a generic notion of a file, which could have, for example, image or text or video behaviors.
 class FileAsset < ActiveFedora::Base
-  
-  include Hydra::ModelMethods
-  
-  has_relationship "is_member_of_collection", :has_collection_member, :inbound => true
-  has_bidirectional_relationship "part_of", :is_part_of, :has_part
-
-  # deletes the object identified by pid if it does not have any objects asserting has_collection_member
-  def self.garbage_collect(pid)
-    begin 
-      obj = FileAsset.load_instance(pid)
-      if obj.containers.empty?
-        obj.delete
-      end
-    rescue
-    end
-  end
-  
-  # Returns a human readable filesize appropriate for the given number of bytes (ie. automatically chooses 'bytes','KB','MB','GB','TB')
-  # Based on a bit of python code posted here: http://blogmag.net/blog/read/38/Print_human_readable_file_size
-  # @param [Numeric] file size in bits
-  def bits_to_human_readable(num)
-      ['bytes','KB','MB','GB','TB'].each do |x|
-        if num < 1024.0
-          return "#{num.to_i} #{x}"
-        else
-          num = num/1024.0
-        end
-      end
-  end
-  
-  has_metadata :name => "descMetadata", :type => ActiveFedora::QualifiedDublinCoreDatastream do |m|
-  end
-
-  def label
-    descMetadata.title_values.first
-  end
-      
-  def label=(label)
-    super
-    descMetadata.title_values = label
-  end    
-  
-  # augments add_file_datastream to also put file size (in bytes/KB/MB/GB/TB) in dc:extent 
-  def add_file_datastream(file, opts={})
-    super
-    if file.respond_to?(:size)
-      size = bits_to_human_readable(file.size)
-    elsif file.kind_of?(File)
-      size = bits_to_human_readable(File.size(file))
-    else
-      size = ""
-    end
-    datastreams["descMetadata"].extent_values = size
-  end
-
-  # Mimic the relationship accessor that would be created if a containers relationship existed
-  # Decided to create this method instead because it combines more than one relationship list
-  # from is_member_of_collection and part_of
-  # @param [Hash] opts The options hash that can contain a :response_format value of :id_array, :solr, or :load_from_solr
-  # @return [Array] Objects found through inbound has_collection_member and part_of relationships
-  def containers(opts={})
-    is_member_array = is_member_of_collection(:response_format=>:id_array)
-      
-    if !is_member_array.empty?
-      logger.warn "This object has inbound collection member assertions.  hasCollectionMember will no longer be used to track file_object relationships after active_fedora 1.3.  Use isPartOf assertions in the RELS-EXT of child objects instead."
-      if opts[:response_format] == :solr || opts[:response_format] == :load_from_solr
-        logger.warn ":solr and :load_from_solr response formats for containers search only uses parts relationships (usage of hasCollectionMember is no longer supported)"
-        result = part_of(opts)
-      else
-        con_result = is_member_of_collection(opts)
-        part_of_result = part_of(opts)
-        ary = con_result+part_of_result
-        result = ary.uniq
-      end
-    else
-      result = part_of(opts)
-    end
-    return result
-  end
-
-  # Calls +containers+ with the :id_array option to return a list of pids for containers found.
-  # @return [Array] Container ids (via is_member_of_collection and part_of relationships)
-  def containers_ids
-    containers(:response_format => :id_array)
-  end
-  
-  # Calls +containers+ with the option to load objects found from solr instead of Fedora.      
-  # @return [Array] ActiveFedora::Base objects populated via solr
-  def containers_from_solr
-    containers(:response_format => :load_from_solr)
-  end
-
-   # Override ActiveFedora::Base.to_solr to...
-  # Check if we are dealing with a child of FileAsset and if so when calling to_solr from Solrizer indexer we want to skip loading parent metadata again 
-  #
-  # if known models greater than one (without ActiveFedora::Base) and
-  #   known models contains a child of FileAsset and
-  #   opts[:model_only] == true and
-  #   current object class is FileAsset
-  # that means that the child already has had to_solr called which included metadata from FileAsset
-  # if any of the above is false then call to_solr as normal
-  def to_solr(solr_doc=Hash.new, opts={})
-
-    active_fedora_model_s = solr_doc["active_fedora_model_s"] if solr_doc["active_fedora_model_s"]
-    actual_class = active_fedora_model_s.constantize if active_fedora_model_s
-    if actual_class && actual_class != self.class && actual_class.superclass == FileAsset
-      solr_doc
-    else
-      super(solr_doc,opts)
-    end
-  end
+  include Hydra::Models::FileAsset
 end

data/app/models/mods_asset.rb

@@ -14,4 +14,4 @@ class ModsAsset < ActiveFedora::Base
   # adds helpful methods for basic hydra objects
   include Hydra::ModelMethods
   
-end
+end

data/hydra-head.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rails", '~> 3.0.10'
   s.add_dependency "rsolr", '1.0.2' ## version 1.0.6 breaks when using blacklight 3.0.0
   s.add_dependency "blacklight", '3.0.0'  
-  s.add_dependency "active-fedora", '~>3.1.4'
+  s.add_dependency "active-fedora", '>=3.2.0.pre5'
   s.add_dependency 'builder', '2.1.2'
   s.add_dependency 'columnize'
   s.add_dependency 'crack'
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'solr-ruby' 
   s.add_dependency 'mediashelf-loggable', '>=0.4.7' ##This can be removed once this dependency is declared in solrizer
   s.add_dependency 'solrizer', '>=1.1.0'
-  s.add_dependency 'solrizer-fedora', '>=1.2.0'
+  s.add_dependency 'solrizer-fedora', '>=1.2.2'
   s.add_dependency 'term-ansicolor'
   s.add_dependency 'trollop'
   s.add_dependency 'will_paginate'

data/lib/hydra-head.rb

@@ -1,5 +1,6 @@
 module HydraHead 
   require 'hydra-head/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
+  require 'hydra-head/railtie' if defined? Rails
   require 'hydra-head/controller'
 
   require 'hydra-head/version'

data/lib/hydra-head/railtie.rb

@@ -0,0 +1,11 @@
+require 'active-fedora'
+require 'rails'
+
+module HydraHead
+  class Railtie < Rails::Railtie
+    initializer "hydra-head.configure_rails_initialization" do
+      ActiveFedora.init
+    end
+  end
+end
+

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "3.1.5"
+  VERSION = "3.2.0.pre1"
 end
 

data/lib/hydra.rb

@@ -3,6 +3,7 @@ require "blacklight"
 module Hydra
   extend Blacklight::Configurable
   extend ActiveSupport::Autoload
+  ## Matz says that autoload is going away, so we ought to discontinue this.
   autoload :Configurable, 'blacklight/configurable'
   autoload :Assets
   autoload :FileAssets
@@ -21,5 +22,6 @@ require 'hydra/rights_metadata'
 require 'hydra/common_mods_index_methods'
 require 'hydra/mods_article'
 require 'hydra/model_methods'
+require 'hydra/models/file_asset'
 
 Dir[File.join(File.dirname(__FILE__), "hydra", "*.rb")].each {|f| require f}

data/lib/hydra/assets.rb

@@ -62,7 +62,7 @@ module Hydra::Assets
     @document.save
     flash[:notice] = "Your changes have been saved."
     
-    logger.debug("returning #{response.inspect}")
+    logger.debug("returning #{@response.inspect}")
     
     respond_to do |want| 
       want.html {

data/lib/hydra/assets_controller_helper.rb

@@ -110,6 +110,7 @@ module Hydra::AssetsControllerHelper
   
   
   # Updates the document based on the provided parameters
+  # This method can be overridden to perform additional update work in the hydra head.
   # @param [ActiveFedora::Base] document
   # @param [Hash] params should be the type expected by ActiveFedora::Base.update_datastream_attributes
   def update_document(document, params)

data/lib/hydra/catalog.rb

@@ -48,11 +48,14 @@ module Hydra::Catalog
   def load_fedora_document
     af_base = ActiveFedora::Base.load_instance(params[:id])
     the_model = ActiveFedora::ContentModel.known_models_for( af_base ).first
-    if the_model.nil?
-      @document_fedora = af_base
-    else
-      @document_fedora = the_model.load_instance(params[:id])
+    unless the_model.include?(ActiveFedora::Relationships)
+      the_model.send :include, ActiveFedora::Relationships
     end
+    unless the_model.include?(ActiveFedora::FileManagement)
+      the_model.send :include, ActiveFedora::FileManagement
+    end
+    
+    @document_fedora = af_base.adapt_to(the_model)
     @file_assets = @document_fedora.file_objects(:response_format=>:solr)
   end