active-fedora 7.0.0.rc2 → 7.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a37149e295c1dc3110b4fc70371e8bb25f980a8
-  data.tar.gz: b66fcc86fa8132818a1b40e8b1e9f06588d5d2a4
+  metadata.gz: 227fe9f2bd7222d69978ee4274e4be82f7d8f801
+  data.tar.gz: b12967fce3d7391ef17032c9ee105581a21efe85
 SHA512:
-  metadata.gz: 2c50f3f783e44031480f8f284e6bb3c18ec480e391785cfb000e03856b047bdc0d0aa45b481e30500a2f98b23a571e75b7922080edd4085f7abbb4d72675704a
-  data.tar.gz: 8b70aa1d294dc6768a4e9e25c2d39835d6a73ff0e2ec7cce6101ca314837c7c87c8bc6366f3f909eb70d3a5c87131de96bf35d585740d43988a505b1e030f655
+  metadata.gz: 1e3c90b8b1ff58175a17ea84c1bb72671ae9c0d14bbcb944e0e542d89af4de8e2d36ab938bdbb314aa203f4908f6da6a75738b4973ced0c2ce02e879607b1f36
+  data.tar.gz: 048679b8db7f8393a59cd04c7dd0b5b04b7b5fe1988d0997abbdffc3d3d603aa30ed14e58171ebc46cb7fd51d39c605f2db58a6af2c29f84a4624ba81b86c0d5

data/.travis.yml

@@ -1,12 +1,22 @@
 language: ruby
 rvm:
-  - 2.1.0
-  - 2.0.0
-  - 1.9.3
+  - 2.1.1
 
 gemfile:
   - gemfiles/rails3.gemfile
   - gemfiles/rails4.gemfile
+  - gemfiles/rails4.1.gemfile
+
+    
+matrix:
+  include:
+    - rvm: 2.1.0
+      gemfile: gemfiles/rails4.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails4.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails4.gemfile
+      
 
 notifications:
   irc: "irc.freenode.org#projecthydra"

data/CONTRIBUTORS.md

@@ -23,4 +23,5 @@ Contributors to this project:
 *  Thomas Johnson
 *  mpc3c
 *  Steven Anderson
+*  Trey Terrell
 

data/Gemfile

@@ -4,9 +4,8 @@ source "https://rubygems.org"
 
 gemspec
 
-group :development, :test do
-  gem 'simplecov', :platforms => [:mri_19]#, :mri_20]
-  gem 'simplecov-rcov', :platforms => [:mri_19]#, :mri_20]
+group :test do
+  gem 'simplecov', require: false
 end
 
 gem 'jruby-openssl', :platform=> :jruby

data/active-fedora.gemspec

@@ -19,8 +19,8 @@ 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.7.0')
-  s.add_dependency("rdf")
+  s.add_dependency("rubydora", '~>1.7.4')
+  s.add_dependency("linkeddata")
   s.add_dependency("rdf-rdfxml", '~>1.1.0')
   s.add_dependency("deprecation")
   s.add_development_dependency("rdoc")
@@ -31,7 +31,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency("equivalent-xml")
   s.add_development_dependency("rest-client")
   s.add_development_dependency("webmock")
-  
+  s.add_development_dependency("simplecov", '~> 0.7.1')
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/gemfiles/rails3.gemfile

@@ -1,11 +1,5 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec :path=>"../"
 
 gem 'activemodel', '~> 3.2.13'
-
-group :development, :test do
-  gem 'rcov', :platform => :mri_18
-  gem 'simplecov', :platform => :mri_19
-  gem 'simplecov-rcov', :platform => :mri_19
-end

data/gemfiles/rails4.1.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec :path=>"../"
+
+gem 'activemodel', '4.1.0.rc1'

data/gemfiles/rails4.gemfile

@@ -1,10 +1,5 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec :path=>"../"
 
 gem 'activemodel', '~> 4.0.0'
-
-group :development, :test do
-  gem 'simplecov', :platform => :mri_19
-  gem 'simplecov-rcov', :platform => :mri_19
-end

data/lib/active_fedora.rb

@@ -47,7 +47,6 @@ module ActiveFedora #:nodoc:
     autoload :Model
     autoload :NestedAttributes
     autoload :NomDatastream
-    autoload :NtriplesRDFDatastream
     autoload :NullRelation
     autoload :OmDatastream
     autoload :Property
@@ -55,13 +54,14 @@ module ActiveFedora #:nodoc:
     autoload :QualifiedDublinCoreDatastream
     autoload :Querying
     autoload :Rdf
-    autoload :RDFDatastream
-    autoload :RdfList
-    autoload :RdfNode
-    autoload :RdfObject
-    autoload :RdfxmlRDFDatastream
+    autoload_under 'rdf' do
+      autoload :RDFDatastream
+      autoload :RdfxmlRDFDatastream
+      autoload :NtriplesRDFDatastream
+    end
     autoload :Reflection
     autoload :Relation
+    autoload :ReloadOnSave
 
     autoload_under 'relation' do
       autoload :Calculations

data/lib/active_fedora/associations/association_scope.rb

@@ -23,7 +23,7 @@ module ActiveFedora
           if reflection.source_macro == :belongs_to
           elsif reflection.source_macro == :has_and_belongs_to_many
           else
-            scope = scope.where( association.send(:find_predicate) => owner.internal_uri)
+            scope = scope.where( ActiveFedora::SolrService.construct_query_for_rel(association.send(:find_predicate) => owner.internal_uri))
           end
 
           

data/lib/active_fedora/base.rb

@@ -45,6 +45,8 @@ module ActiveFedora
     include Serialization
     include Core
     include FedoraAttributes
+    include ReloadOnSave
+    include Rdf::Identifiable
   end
 
 end

data/lib/active_fedora/datastream.rb

@@ -6,9 +6,21 @@ module ActiveFedora
     attr_writer :digital_object
     attr_accessor :last_modified
 
+    # @param digital_object [DigitalObject] the digital object that this object belongs to
+    # @param dsid [String] the datastream id, if this is nil, a datastream id will be generated.
+    # @param options [Hash]
+    # @option options [String,IO] :content the content for the datastream
+    # @option options [String] :dsLabel label for the datastream
+    # @option options [String] :dsLocation location for an external or redirect datastream
+    # @option options [String] :controlGroup a controlGroup for the datastream
+    # @option options [String] :mimeType the mime-type of the content
+    # @option options [String] :prefix the prefix for the auto-generated DSID (not to be confused with the solr prefix)
+    # @option options [Boolean] :versionable is the datastream versionable
     def initialize(digital_object=nil, dsid=nil, options={})
-      ## When you use the versions feature of rubydora (0.5.x), you need to have a 3 argument constructor
-      super
+      prefix = options.delete(:prefix)
+      dsid = nil if dsid == ''
+      dsid ||= generate_dsid(digital_object, prefix || "DS")
+      super(digital_object, dsid, options)
     end
 
     alias_method :realLabel, :label
@@ -81,6 +93,21 @@ module ActiveFedora
     end
 
     protected
+
+    # return a valid dsid that is not currently in use.  Uses a prefix (default "DS") and an auto-incrementing integer
+    # Example: if there are already datastreams with IDs DS1 and DS2, this method will return DS3.  If you specify FOO as the prefix, it will return FOO1.
+    def generate_dsid(digital_object, prefix)
+      return unless digital_object
+      matches = digital_object.datastreams.keys.map {|d| data = /^#{prefix}(\d+)$/.match(d); data && data[1].to_i}.compact
+      val = matches.empty? ? 1 : matches.max + 1
+      format_dsid(prefix, val)
+    end
+    
+    ### Provided so that an application can override how generated pids are formatted (e.g DS01 instead of DS1)
+    def format_dsid(prefix, suffix)
+      sprintf("%s%i", prefix,suffix)
+    end    
+
     # The string to prefix all solr fields with. Override this method if you want
     # a prefix other than the default
     def prefix

data/lib/active_fedora/datastream_collections.rb

@@ -215,8 +215,8 @@ module ActiveFedora
         assert_kind_of 'datastream',  ds, ActiveFedora::Datastream
         #make sure dsid is nil so that it uses the prefix for mapping purposes
         #check dsid works for the prefix if it is set
-        if !ds.dsid.nil? && opts.has_key?(:prefix)
-          raise "dsid supplied does not conform to pattern #{opts[:prefix]}[number]" unless ds.dsid =~ /#{opts[:prefix]}[0-9]/
+        if ds.dsid && opts.has_key?(:prefix)
+          raise "dsid supplied (#{ds.dsid}) does not conform to pattern #{opts[:prefix]}[number]" unless ds.dsid =~ /#{opts[:prefix]}[0-9]/
         end
         
         add_datastream(ds,opts)

data/lib/active_fedora/datastream_hash.rb

@@ -15,7 +15,7 @@ module ActiveFedora
     end 
 
     def []= (key, val)
-      @obj.inner_object.datastreams[key]=val# unless @obj.inner_object.new?
+      @obj.inner_object.datastreams[key]=val
       super
     end 
 

data/lib/active_fedora/datastreams.rb

@@ -2,7 +2,7 @@ module ActiveFedora
   module Datastreams
     extend ActiveSupport::Concern
 
-    autoload :NokogiriDatastreams,           'active_fedora/datastreams/nokogiri_datastreams'
+    autoload :NokogiriDatastreams, 'active_fedora/datastreams/nokogiri_datastreams'
 
     included do
       class_attribute :ds_specs
@@ -81,15 +81,9 @@ module ActiveFedora
       end
     end      
 
-    # Adds datastream to the object.  Saves the datastream to fedora upon adding.
-    # If datastream does not have a DSID, a unique DSID is generated
-    # :prefix option will set the prefix on auto-generated DSID
+    # Adds datastream to the object.
     # @return [String] dsid of the added datastream
     def add_datastream(datastream, opts={})
-      if datastream.dsid == nil || datastream.dsid.empty?
-        prefix = opts.has_key?(:prefix) ? opts[:prefix] : "DS"
-        datastream.instance_variable_set :@dsid, generate_dsid(prefix)
-      end
       datastreams[datastream.dsid] = datastream
       datastream.dsid
     end
@@ -99,18 +93,6 @@ module ActiveFedora
       datastreams.select { |k, ds| ds.metadata? }.reject { |k, ds| ds.kind_of?(ActiveFedora::RelsExtDatastream) }.values
     end
     
-    # return a valid dsid that is not currently in use.  Uses a prefix (default "DS") and an auto-incrementing integer
-    # Example: if there are already datastreams with IDs DS1 and DS2, this method will return DS3.  If you specify FOO as the prefix, it will return FOO1.
-    def generate_dsid(prefix="DS")
-      matches = datastreams.keys.map {|d| data = /^#{prefix}(\d+)$/.match(d); data && data[1].to_i}.compact
-      val = matches.empty? ? 1 : matches.max + 1
-      format_dsid(prefix, val)
-    end
-    
-    ### Provided so that an application can override how generated pids are formatted (e.g DS01 instead of DS1)
-    def format_dsid(prefix, suffix)
-      sprintf("%s%i", prefix,suffix)
-    end    
 
     # Returns the RELS-EXT Datastream
     # Tries to grab from in-memory datastreams first
@@ -153,10 +135,9 @@ module ActiveFedora
     
     
     def create_datastream(type, dsid, opts={})
-      dsid ||= generate_dsid(opts[:prefix] || "DS")
       klass = type.kind_of?(Class) ? type : type.constantize
-      raise ArgumentError, "Argument dsid must be of type string" unless dsid.kind_of?(String)
-      ds = klass.new(inner_object, dsid)
+      raise ArgumentError, "Argument dsid must be of type string" if dsid && !dsid.kind_of?(String)
+      ds = klass.new(inner_object, dsid, prefix: opts[:prefix])
       [:mimeType, :controlGroup, :dsLabel, :dsLocation, :checksumType, :versionable].each do |key|
         ds.send("#{key}=".to_sym, opts[key]) unless opts[key].nil?
       end

data/lib/active_fedora/file_configurator.rb

@@ -1,5 +1,5 @@
 require 'erb'
-require 'active_fedora/yaml_adaptor'
+require 'yaml'
 
 module ActiveFedora
   class FileConfigurator
@@ -110,9 +110,10 @@ module ActiveFedora
       end
 
       begin
-        fedora_yml = YAMLAdaptor.load(config_erb)
-      rescue StandardError => e
-        raise("fedora.yml was found, but could not be parsed.\n")
+        fedora_yml = YAML.load(config_erb)
+      rescue Psych::SyntaxError => e
+        raise "fedora.yml was found, but could not be parsed. " \
+              "Error #{e.message}"
       end
 
       config = fedora_yml.symbolize_keys
@@ -133,7 +134,7 @@ module ActiveFedora
       end
 
       begin
-        solr_yml = YAMLAdaptor.load(config_erb)
+        solr_yml = YAML.load(config_erb)
       rescue StandardError => e
         raise("solr.yml was found, but could not be parsed.\n")
       end
@@ -209,7 +210,7 @@ module ActiveFedora
 
     def predicate_config
       @predicate_config_path ||= build_predicate_config_path
-      YAMLAdaptor.load(File.open(@predicate_config_path)) if File.exist?(@predicate_config_path)
+      YAML.load(File.open(@predicate_config_path)) if File.exist?(@predicate_config_path)
     end
 
     protected
@@ -223,7 +224,7 @@ module ActiveFedora
     end
 
     def valid_predicate_mapping?(testfile)
-      mapping = YAMLAdaptor.load(File.open(testfile))
+      mapping = YAML.load(File.open(testfile))
       return false unless mapping.has_key?(:default_namespace) && mapping[:default_namespace].is_a?(String)
       return false unless mapping.has_key?(:predicate_mapping) && mapping[:predicate_mapping].is_a?(Hash)
       true

data/lib/active_fedora/om_datastream.rb

@@ -186,7 +186,7 @@ module ActiveFedora
     end
 
     def generate_solr_symbol(base, data_type)
-      ActiveFedora::SolrService.solr_name(base.to_sym, type: data_type)
+      ActiveFedora::SolrService.solr_name([prefix,base].join, type: data_type)
     end
 
     # ** Experimental **

data/lib/active_fedora/rdf.rb

@@ -4,5 +4,14 @@ module ActiveFedora
     autoload :NestedAttributes
     autoload :NodeConfig
     autoload :Indexing
+    autoload :Configurable
+    autoload :Properties
+    autoload :Identifiable
+    autoload :Repositories
+    autoload :Resource
+    autoload :VocabularyLoader
+    autoload :ObjectResource
+    autoload :Term
+    autoload :List
   end
 end

data/lib/active_fedora/rdf/configurable.rb

@@ -0,0 +1,59 @@
+module ActiveFedora::Rdf
+  ##
+  # Module to include configurable class-wide properties common to
+  # Resource and RDFDatastream. It does its work at the class level,
+  # and is meant to be extended.
+  #
+  # Define properties at the class level with:
+  #
+  #    configure base_uri: "http://oregondigital.org/resource/", repository: :parent
+  # Available properties are base_uri, rdf_label, type, and repository
+  module Configurable
+    extend Deprecation
+
+    def base_uri
+      nil
+    end
+
+    def rdf_label
+      nil
+    end
+
+    def type
+      nil
+    end
+
+    def rdf_type(value)
+      Deprecation.warn Configurable, "rdf_type is deprecated and will be removed in active-fedora 8.0.0. Use configure type: instead.", caller
+      configure type: value
+    end
+
+    def repository
+      :parent
+    end
+
+    # API method for configuring class properties an RDF Resource may need.
+    # This is an alternative to overriding the methods extended with this module.
+    def configure(options = {})
+      {
+        base_uri: options[:base_uri],
+        rdf_label: options[:rdf_label],
+        type: options[:type],
+        repository: options[:repository]
+      }.each do |name, value|
+        if value
+          value = self.send("transform_#{name}", value) if self.respond_to?("transform_#{name}")
+          define_singleton_method(name) do
+            value
+          end
+        end
+      end
+    end
+
+    def transform_type(value)
+      RDF::URI.new(value).tap do |value|
+        Resource.type_registry[value] = self
+      end
+    end
+  end
+end

data/lib/active_fedora/rdf/identifiable.rb

@@ -0,0 +1,59 @@
+##
+# This module is included to allow for an ActiveFedora::Base object to be set as the class_name for a Resource.
+# Enables functionality like:
+#   base = ActiveFedora::Base.new('oregondigital:1')
+#   base.title = 'test'
+#   base.save
+#   subject.descMetadata.set = base
+#   subject.descMetadata.set # => <ActiveFedora::Base>
+#   subject.descMetadata.set.title # => 'test'
+module ActiveFedora::Rdf::Identifiable
+  extend ActiveSupport::Concern
+  delegate :parent, :dump, :query, :rdf_type, :to => :resource
+
+  ##
+  # Defines which resource defines this ActiveFedora object.
+  # This is required for ActiveFedora::Rdf::Resource#set_value to append graphs.
+  # If there is no RdfResource, make a dummy one and freeze its graph.
+  def resource
+    return self.send(self.class.resource_datastream).resource unless self.class.resource_datastream.nil?
+    ActiveFedora::Rdf::ObjectResource.new(self.pid).freeze
+  end
+
+  module ClassMethods
+    ##
+    # Returns the datastream whose ActiveFedora::Rdf::Resource is used
+    # for the identifiable object. This supports delegating methods to
+    # the Resource and #from_uri.  Defaults to :descMetadata if it
+    # responds to #rdf_subject, otherwise looks for the first
+    # registered datastream that does.
+    def resource_datastream(ds=nil)
+      @resource_datastream ||= ds ? ds : nil
+      return @resource_datastream unless @resource_datastream.nil?
+      return :descMetadata if self.ds_specs['descMetadata'][:type].respond_to? :rdf_subject
+      self.ds_specs.each do |dsid, conf|
+        return dsid.to_sym if conf[:type].respond_to? :rdf_subject
+      end
+      nil
+    end
+
+    ##
+    # Finds the appropriate ActiveFedora::Base object given a URI from a graph.
+    # Expected by the API in ActiveFedora::Rdf::Resource
+    # @TODO: Generalize this.
+    # @see ActiveFedora::Rdf::Resource.from_uri
+    # @param [RDF::URI] uri URI that is being looked up.
+    def from_uri(uri,_)
+      self.find(pid_from_subject(uri))
+    end
+
+    ##
+    # Finds the pid of an object from its RDF subject, override this
+    # for URI configurations not of form base_uri + pid
+    # @param [RDF::URI] uri URI to convert to pid
+    def pid_from_subject(uri)
+      base_uri = resource_datastream ? self.ds_specs[resource_datastream.to_s][:type].resource_class.base_uri : ActiveFedora::Rdf::ObjectResource.base_uri
+      uri.to_s.gsub(base_uri, "")
+    end
+  end
+end