active-fedora 3.2.2 → 3.3.0

data/Gemfile

@@ -4,5 +4,5 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'ruby-debug', :platform => :ruby_18
-gem 'ruby-debug19', :platform => :ruby_19
+# gem 'ruby-debug', :platform => :ruby_18
+# gem 'ruby-debug19', :platform => :ruby_19

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (3.2.2)
+    active-fedora (3.3.0)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       equivalent-xml
@@ -10,38 +10,36 @@ PATH
       mime-types (>= 1.16)
       multipart-post (= 1.1.2)
       nokogiri
-      om (>= 1.4.4)
+      om (>= 1.5.1)
       rdf
       rdf-rdfxml
-      rubydora (~> 0.4.1)
+      rubydora (~> 0.5.1)
       solr-ruby (>= 0.0.6)
-      solrizer (> 1.0.0)
+      solrizer (~> 1.2.0)
       xml-simple (>= 1.0.12)
 
 GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)
       builder (~> 3.0.0)
+    activeresource (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+    activesupport (3.2.1)
       i18n (~> 0.6)
-    activeresource (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-    activesupport (3.1.3)
       multi_json (~> 1.0)
     addressable (2.2.6)
     akami (1.0.0)
       gyoku (>= 0.4.0)
-    archive-tar-minitar (0.5.2)
     builder (3.0.0)
-    childprocess (0.2.3)
+    childprocess (0.3.0)
       ffi (~> 1.0.6)
-    columnize (0.3.6)
-    daemons (1.1.5)
+    daemons (1.1.6)
     diff-lcs (1.1.3)
-    equivalent-xml (0.2.8)
+    equivalent-xml (0.2.9)
       nokogiri (>= 1.4.3)
     facets (2.9.3)
     fastercsv (1.5.4)
@@ -51,33 +49,27 @@ GEM
     httpi (0.9.5)
       rack
     i18n (0.6.0)
-    jettywrapper (1.2.0)
+    jettywrapper (1.2.1)
       activesupport (>= 3.0.0)
       childprocess
       i18n
       logger
       mediashelf-loggable
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
     logger (1.2.8)
     mediashelf-loggable (0.4.9)
     metaclass (0.0.1)
     mime-types (1.17.2)
-    mocha (0.10.0)
+    mocha (0.10.3)
       metaclass (~> 0.0.1)
     multi_json (1.0.4)
     multipart-post (1.1.2)
     nokogiri (1.5.0)
     nori (1.0.2)
-    om (1.4.4)
+    om (1.5.1)
       mediashelf-loggable
       nokogiri (>= 1.4.2)
-    rack (1.4.0)
+    rack (1.4.1)
     rake (0.9.2.2)
-    rbx-require-relative (0.0.5)
-    rcov (0.9.11)
     rdf (0.3.4.1)
       addressable (>= 2.2.6)
     rdf-rdfxml (0.3.5)
@@ -87,30 +79,15 @@ GEM
       mime-types (>= 1.16)
     rsolr (1.0.6)
       builder (>= 2.1.2)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
-    rubydora (0.4.1)
+    rspec-mocks (2.8.0)
+    rubydora (0.5.1)
       activemodel
       activesupport
       fastercsv
@@ -127,16 +104,18 @@ GEM
       nori (~> 1.0)
       wasabi (~> 2.0)
     solr-ruby (0.0.8)
-    solrizer (1.1.2)
+    solrizer (1.2.0)
       daemons
-      mediashelf-loggable
+      mediashelf-loggable (~> 0.4.7)
       nokogiri
-      om (>= 1.4.0)
+      om (>= 1.5.0)
       stomp
       xml-simple
-    solrizer-fedora (1.1.3)
-      active-fedora (>= 2.3.0)
+    solrizer-fedora (1.2.3)
+      active-fedora (>= 3.1.0)
+      activesupport
       fastercsv
+      jettywrapper (>= 1.1.0)
       rsolr
       solr-ruby (>= 0.0.6)
       solrizer (>= 1.0.0)
@@ -155,9 +134,6 @@ DEPENDENCIES
   jettywrapper (>= 1.2.0)
   mocha (>= 0.9.8)
   rake
-  rcov
   rspec (~> 2.0)
-  ruby-debug
-  ruby-debug19
-  solrizer-fedora (>= 1.1.3)
+  solrizer-fedora (~> 1.2.3)
   yard

data/History.txt

@@ -1,3 +1,12 @@
+3.3.0
+A label set on an unsaved datastream should be saved in the repository
+Should be able to add checksumType parameter when creating a datastream
+Upgrade rubydora to 0.5.1 so we can do checksum verification
+Pass checksumVerification parameter to rubydora
+Allow you to override the class of file datastream that gets created by using ActiveFedora::Base.has_file_datastream
+Allow `predicate_mappings.yml` to specify explicit namespace prefixes to use instead of ns0, ns1, ..., nsN when serializing a `RelsExtDatastream`.
+HYDRA-737 fixes for tests failing under ree 1.8.7-2011.12
+
 3.2.2
 Rubydora 0.4.1
 Fixed bugs where updating datastream properties would overwrite content.

data/active-fedora.gemspec

@@ -20,21 +20,21 @@ Gem::Specification.new do |s|
   s.add_dependency('mime-types', '>= 1.16')
   s.add_dependency('multipart-post', "= 1.1.2")
   s.add_dependency('nokogiri')
-  s.add_dependency('om', '>= 1.4.4')
-  s.add_dependency('solrizer', '>1.0.0')
+  s.add_dependency('om', '>= 1.5.1')
+  s.add_dependency('solrizer', '~>1.2.0')
   s.add_dependency("activeresource", '>= 3.0.0')
   s.add_dependency("activesupport", '>= 3.0.0')
   s.add_dependency("mediashelf-loggable")
   s.add_dependency("equivalent-xml")
   s.add_dependency("facets")
-  s.add_dependency("rubydora", '~>0.4.1')
+  s.add_dependency("rubydora", '~>0.5.1')
   s.add_dependency("rdf")
   s.add_dependency("rdf-rdfxml")
   s.add_development_dependency("yard")
   s.add_development_dependency("RedCloth") # for RDoc formatting
   s.add_development_dependency("rake")
-  s.add_development_dependency("rcov")
-  s.add_development_dependency("solrizer-fedora", ">=1.1.3") # used by the fixtures rake tasks
+#  s.add_development_dependency("rcov") # not ruby 1.9 compatible
+  s.add_development_dependency("solrizer-fedora", "~>1.2.3") # used by the fixtures rake tasks
   s.add_development_dependency("jettywrapper", ">=1.2.0")
   s.add_development_dependency("rspec", "~> 2.0")
   s.add_development_dependency("mocha", ">= 0.9.8")

data/lib/active_fedora.rb

@@ -4,6 +4,7 @@ require 'active_fedora/solr_service'
 require 'active_fedora/rubydora_connection'
 require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/object'
+require 'active_support/core_ext/hash/indifferent_access'
 
 SOLR_DOCUMENT_ID = ActiveFedora::SolrService.id_field unless defined?(SOLR_DOCUMENT_ID)
 ENABLE_SOLR_UPDATES = true unless defined?(ENABLE_SOLR_UPDATES)
@@ -22,6 +23,7 @@ module ActiveFedora #:nodoc:
     autoload :FileManagement
     autoload :RelationshipGraph
     autoload :Datastream
+    autoload :DCRDFDatastream
     autoload :Datastreams
     autoload :Delegating
     autoload :DigitalObject
@@ -31,9 +33,11 @@ module ActiveFedora #:nodoc:
     autoload :MetadataDatastream
     autoload :MetadataDatastreamHelper
     autoload :NokogiriDatastream
+    autoload :NtriplesRDFDatastream
     autoload :Property
     autoload :Persistence
     autoload :QualifiedDublinCoreDatastream
+    autoload :RDFDatastream
     autoload :RelsExtDatastream
     autoload :ServiceDefinitions
     autoload :SemanticNode
@@ -84,6 +88,14 @@ module ActiveFedora #:nodoc:
   # 1. look in config_options[:fedora_config_path].  If it finds a solr.yml there, it will use it.
   # 2. If it does not find a solr.yml and the fedora.yml contains a solr url, it will raise an configuration error 
   # 3. If it does not find a solr.yml and the fedora.yml does not contain a solr url, it will look in: +Rails.root+/config, +current working directory+/config, then the solr.yml shipped with gem
+
+  # Options allowed in fedora.yml
+  # first level is the environment (e.g. development, test, production and any custom environments you may have) 
+  # the second level has these keys:
+  # 1. url: url including protocol, user/pass, host, port and path (e.g. http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora)
+  # 2. validateChecksum:  indicates to the fedora server whether you want to validate checksums when the datastreams are queried.  
+
+
   def self.init( options={} )
     # Make config_options into a Hash if nil is passed in as the value
     options = {} if options.nil?
@@ -128,8 +140,8 @@ module ActiveFedora #:nodoc:
     config_path = self.send("#{config_type}_config_path".to_sym)
 
     logger.info("#{config_type.upcase}: loading ActiveFedora.#{config_type}_config from #{File.expand_path(config_path)}")
-    config = YAML::load(File.open(config_path))
-    raise "The #{@config_env.to_s} environment settings were not found in the #{config_type}.yml config.  If you already have a #{config_type}.yml file defined, make sure it defines settings for the #{@config_env} environment" unless config[@config_env]
+    config = YAML.load(File.open(config_path)).symbolize_keys
+    raise "The #{@config_env.to_sym} environment settings were not found in the #{config_type}.yml config.  If you already have a #{config_type}.yml file defined, make sure it defines settings for the #{@config_env} environment" unless config[@config_env.to_sym]
     
     config[:url] = determine_url(config_type,config)
 
@@ -137,30 +149,45 @@ module ActiveFedora #:nodoc:
     config
   end
 
+  def self.config_for_environment
+    fedora_config[@config_env.to_sym].symbolize_keys
+  end
+
   # Determines and sets the fedora_config[:url] or solr_config[:url]
   # @param [String] config_type Either 'fedora' or 'solr'
   # @param [Hash] config The config hash 
   # @return [String] the solr or fedora url
   def self.determine_url(config_type,config)  
+    c = config[environment.to_sym]
+    c.symbolize_keys!
     if config_type == "fedora"
       # support old-style config
-      if config[environment].fetch("fedora",nil)
-        return config[environment]["fedora"]["url"] if config[environment].fetch("fedora",nil)
+      url = if c.fetch(:fedora,nil)
+        ActiveSupport::Deprecation.warn("Using \"fedora\" in the fedora.yml file is no longer supported") 
+        c[:fedora]["url"] if config[environment.to_sym].fetch(:fedora,nil)
       else
-        return config[environment]["url"]
+        c[:url]
+      end
+      if url && !c[:user]
+        u = URI.parse url
+        c[:user] = u.user
+        c[:password] = u.password
+        c[:url] = "#{u.scheme}://#{u.host}:#{u.port}#{u.path}"
+        url = c[:url]
       end
+      return url
     else
-      return get_solr_url(config[environment]) if config_type == "solr"
+      return get_solr_url(c) if config_type == "solr"
     end
   end
 
   # Given the solr_config that's been loaded for this environment, 
   # determine which solr url to use
   def self.get_solr_url(solr_config)
-    if @index_full_text == true && solr_config.has_key?('fulltext') && solr_config['fulltext'].has_key?('url')
-      return solr_config['fulltext']['url']
-    elsif solr_config.has_key?('default') && solr_config['default'].has_key?('url')
-      return solr_config['default']['url']
+    if @index_full_text == true && solr_config.has_key?(:fulltext) && solr_config[:fulltext].has_key?('url')
+      return solr_config[:fulltext]['url']
+    elsif solr_config.has_key?(:default) && solr_config[:default].has_key?('url')
+      return solr_config[:default]['url']
     elsif solr_config.has_key?('url')
       return solr_config['url']
     elsif solr_config.has_key?(:url)

data/lib/active_fedora/base.rb

@@ -66,16 +66,6 @@ module ActiveFedora
     end
 
 
-    # class_attribute  :ds_specs
-    # 
-    # def self.inherited(p)
-    #   # each subclass should get a copy of the parent's datastream definitions, it should not add to the parent's definition table.
-    #   p.ds_specs = p.ds_specs.dup
-    #   super
-    # end
-    # 
-    # self.ds_specs = {'RELS-EXT'=> {:type=> ActiveFedora::RelsExtDatastream, :label=>"", :label=>"Fedora Object-to-Object Relationship Metadata", :control_group=>'X', :block=>nil}}
-
     # Has this object been saved?
     def new_object?
       inner_object.new?
@@ -147,14 +137,6 @@ module ActiveFedora
       ds_specs[dsid] ? ds_specs[dsid][:type] : ActiveFedora::Datastream
     end
 
-    #This method is used to specify the details of a datastream. 
-    #args must include :name. Note that this method doesn't actually
-    #execute the block, but stores it at the class level, to be executed
-    #by any future instantiations.
-    def self.has_metadata(args, &block)
-      ds_specs[args[:name]]= {:type => args[:type], :label =>  args.fetch(:label,""), :control_group => args.fetch(:control_group,"X"), :disseminator => args.fetch(:disseminator,""), :url => args.fetch(:url,""),:block => block}
-    end
-
     def self.create(args = {})
       obj = self.new(args)
       obj.save

data/lib/active_fedora/datastream.rb

@@ -7,9 +7,10 @@ module ActiveFedora
     attr_accessor :dirty, :last_modified, :fields
     before_create :add_mime_type, :add_ds_location
   
-    def initialize(digital_object, dsid)
-      @fields={}
-      @dirty = false
+    def initialize(digital_object, dsid, options={})
+      ## When you use the versions feature of rubydora (0.5.x), you need to have a 3 argument constructor
+      self.fields={}
+      self.dirty = false
       super
     end
     
@@ -26,6 +27,10 @@ module ActiveFedora
       end
     end
 
+    def inspect
+      "#<#{self.class}:#{self.hash} @pid=\"#{pid}\" @dsid=\"#{dsid}\" @controlGroup=\"#{controlGroup}\" @dirty=\"#{dirty}\" @mimeType=\"#{mimeType}\" >"
+    end
+
     #compatibility method for rails' url generators. This method will 
     #urlescape escape dots, which are apparently
     #invalid characters in a dsid.
@@ -35,7 +40,7 @@ module ActiveFedora
     
     # Test whether this datastream been modified since it was last saved
     def dirty?
-      @dirty || changed?
+      dirty || changed?
     end
 
     def new_object?
@@ -71,7 +76,7 @@ module ActiveFedora
     # @param [Nokogiri::XML::Node] node the "foxml:datastream" node from a FOXML file
     def self.from_xml(tmpl, node)
       tmpl.instance_variable_set(:@dirty, false)
-      tmpl.control_group= node['CONTROL_GROUP']
+      tmpl.controlGroup= node['CONTROL_GROUP']
       tmpl
     end
     

data/lib/active_fedora/datastreams.rb

@@ -30,7 +30,7 @@ module ActiveFedora
       self.class.ds_specs.each do |name,ds_config|
         ds = datastreams[name]
         if ds && ds.controlGroup == 'E' && ds_config[:disseminator].present?
-          ds.dsLocation= "#{RubydoraConnection.instance.options[:url]}/objects/#{pid}/methods/#{ds_config[:disseminator]}"
+          ds.dsLocation= "#{ActiveFedora.config_for_environment[:url]}/objects/#{pid}/methods/#{ds_config[:disseminator]}"
         end
       end
       true
@@ -180,7 +180,7 @@ module ActiveFedora
     # Add the given file as a datastream in the object
     #
     # @param [File] file the file to add
-    # @param [Hash] opts options: :dsid, :label, :mimeType, :prefix
+    # @param [Hash] opts options: :dsid, :label, :mimeType, :prefix, :checksumType
     def add_file_datastream(file, opts={})
       label = opts.has_key?(:label) ? opts[:label] : ""
       attrs = {:dsLabel => label, :controlGroup => 'M', :blob => file, :prefix=>opts[:prefix]}
@@ -191,7 +191,8 @@ module ActiveFedora
       elsif opts.has_key?(:content_type)
         attrs.merge!({:mimeType=>opts[:content_type]})
       end
-      ds = create_datastream(ActiveFedora::Datastream, opts[:dsid], attrs)
+      attrs[:checksumType] = opts[:checksumType] if opts[:checksumType]
+      ds = create_datastream(self.class.datastream_class_for_name(opts[:dsid]), opts[:dsid], attrs)
       add_datastream(ds)
     end
     
@@ -201,10 +202,9 @@ module ActiveFedora
       klass = type.kind_of?(Class) ? type : type.constantize
       raise ArgumentError, "Argument dsid must be of type string" unless dsid.kind_of?(String) || dsid.kind_of?(NilClass)
       ds = klass.new(inner_object, dsid)
-      ds.mimeType = opts[:mimeType] 
-      ds.controlGroup = opts[:controlGroup] 
-      ds.dsLabel = opts[:dsLabel] 
-      ds.dsLocation = opts[:dsLocation] if opts[:dsLocation]
+      [:mimeType, :controlGroup, :dsLabel, :dsLocation, :checksumType].each do |key|
+        ds.send("#{key}=".to_sym, opts[key]) if opts[key]
+      end
       blob = opts[:blob] 
       if blob 
         if !ds.mimeType.present? 
@@ -236,5 +236,31 @@ module ActiveFedora
       end
     end
 
+
+    module ClassMethods
+      #This method is used to specify the details of a datastream. 
+      #args must include :name. Note that this method doesn't actually
+      #execute the block, but stores it at the class level, to be executed
+      #by any future instantiations.
+      def has_metadata(args, &block)
+        ds_specs[args[:name]]= {:type => args[:type], :label =>  args.fetch(:label,""), :control_group => args.fetch(:control_group,"X"), :disseminator => args.fetch(:disseminator,""), :url => args.fetch(:url,""),:block => block}
+      end
+
+      # Specify the attributes of a file bearing datastream 
+      #
+      # === Options
+      # [:name]
+      #   The dsid of the datastream
+      # [:type]
+      #   The class the datastream should have
+      # [:label]
+      #   The default value to put in the dsLabel field
+      # [:control_group]
+      #   The type of controlGroup to store the datastream as. Defaults to M
+      def has_file_datastream(args)
+        ds_specs[args.fetch(:name, "content")]= {:type => args[:type], :label =>  args.fetch(:label,"File Datastream"), :control_group => args.fetch(:control_group,"M")}
+      end
+    end
+
   end
 end