active-fedora 8.7.0 → 9.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: e224662430e191129b3b26e5f18164a477895bd5614adeb0e5527b9e42ae7808
-  data.tar.gz: 98a03c1090684b44d694915d2bcd64738eb79027fdf2636b4eb12ccb3588d55a
+SHA1:
+  metadata.gz: 23fac3b5c068cdb6deef749ef858f484dc5e5e6d
+  data.tar.gz: d8b17b361ea94983e72bcbaad7625600389cf05f
 SHA512:
-  metadata.gz: f522ce58af5f522b67c765e387c816ba3f2de6d0e62e88aea1f375d3e243d4e0b43e41bd9e9753e29db770d95357adfcc3cf5df943249fce036b12cba4f12422
-  data.tar.gz: fe1228ca8d1921bc7e97a1e1bde1d9a3bb274c9a4c5fcfd2ca8b2c8dc786512da8ff8b0ef21875e0011075f291f6aee37df07ce1c12101c41d09ae5bed0e2608
+  metadata.gz: f17f40b3dee2c5d3944fe722bb716726d27da32144c6445cda25e83076ad9a3c3122ea32e1e687cf2431eee90721a32a6cad7ffebccf8c6ab0f4c89992013854
+  data.tar.gz: ff15b6b7406fccac6f782e488bef7ea595aef525af56f38a2dd1f5fee0b63f16d4511fa79414297022a4baaca171a5a969864b2f39b293286d4f91e149467bd4

data/.travis.yml

@@ -1,22 +1,15 @@
 language: ruby
 rvm:
-  - 2.5.1
+  - 2.1
 
-matrix:
-  include:
-    - rvm: 2.5.1
-      env: RAILS_VERSION=5.2.0
-    - rvm: 2.4.4
-      env: RAILS_VERSION=5.1.6
-    - rvm: 2.3.7
-      env: RAILS_VERSION=5.0.7
-    - rvm: 2.2.10
-      env: RAILS_VERSION=4.2.10
-    - rvm: 2.1.10
-      env: RAILS_VERSION=4.2.10
+gemfile:
+  - gemfiles/rails4.1.gemfile
+  - gemfiles/rails4.2.beta.gemfile
+
+
+notifications:
+  irc: "irc.freenode.org#projecthydra"
 
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-
-jdk: oraclejdk8

data/Gemfile

@@ -2,13 +2,13 @@ source "https://rubygems.org"
 
 # Bundler will rely on active-fedora.gemspec for dependency information.
 
-gemspec
+gemspec path: File.expand_path('..', __FILE__)
+
+gem 'byebug' unless ENV['TRAVIS']
 
 group :test do
   gem 'simplecov', require: false
+  gem 'coveralls', require: false
 end
 
-gem 'jruby-openssl', :platform=> :jruby
-gem 'activemodel', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
-gem 'linkeddata', '~> 1.99'
-gem 'rsolr', '~> 1.x'
+gem 'jruby-openssl', platform: :jruby

data/History.txt

@@ -1,83 +1,3 @@
-8.1.0
-
-  2015-04-27: Patches casting behavior [David Chandek-Stark]
-  See https://github.com/projecthydra/active_fedora/wiki/Patching-ActiveFedora-7.x-&-8.x-Casting-Behavior
-  for detailed information on the problem.
-    
-  The solution offered in this patch preserves the most-specific-class algorithm
-  of `ActiveFedora::ContentModel.best_model_for` and raises a new execption,
-  `ActiveFedora::ModelNotAsserted` in `ActiveFedora::Core#adapt_to_cmodel`.
-    
-  Note that a repository object can still be loaded into a model class not asserted,
-  for example, by using `.find` with `cast: false`.
-    
-  Closes #746 (although not really a backport)
-
-8.0.1
-
-  2015-03-11: Backport solr escape patch [Chris Colvard]
-
-8.0.0
-
-  2015-01-07: Can assign single ActiveTriples::Resource to single-valued attribute
-  (fixes #653) [David Chandek-Stark]
-
-  2014-12-04: point to FCRepo 3.x stable branch [Benjamin Armintor]
-
-  2013-02-28: github issue 48 tests and YARD [Benjamin Armintor]
-
-  2014-12-02: Removed pending deprecations omitted in 8.0.0.rc1 Bumped version to
-  8.0.0.rc2 [David Chandek-Stark]
-
-  2014-12-02: Bumped version to 8.0.0.rc1 [David Chandek-Stark]
-
-  2014-11-28: Removed pending deprecations for version 8.0.0. [David
-  Chandek-Stark]
-
-  2014-11-19: add RDF::Vocabulary subclasses for Fcrepo and ProjectHydra [Benjamin
-  Armintor]
-
-  2014-11-24: rename ActiveFedora::Rdf to ActiveFedora::RDF [Benjamin Armintor]
-
-  2014-11-21: Adding optional yml paramters as comments so people know they exist
-  [Carolyn Cole]
-
-  2014-11-18: Makes sure all values are handled as arrays [Hector Correa]
-
-  2014-11-17: Bumped version to 8.0.0.pre1 [David Chandek-Stark]
-
-  2014-10-02: Remove ObjectResource from RdfDatastream [Tom Johnson]
-
-  2014-09-22: Factors out behavior from ActiveFedora::Rdf::ObjectResource to mixin
-  ActiveFedora::Rdf::Persistence. [David Chandek-Stark]
-
-v7.1.2
-
-  2014-11-05: Revert "clarified a comment" [Adam Wead]
-
-  2014-11-04: clarified a comment [Brian Maddy]
-
-  2014-10-21: Correction to comment example [Joe Atzberger]
-
-  2014-10-07: Bug #479: Typo in XSD filename value stuck in config generator
-  templates [Joe Atzberger]
-
-v7.1.1
-
-  2014-09-16: RdfDatastream#deserialize should always return an RDF::Graph. Fixes
-  #471 [Justin Coyne]
-
-  2014-08-15: Set default mimeType for NtriplesRDFDatastream to
-  'application/n-triples' per W3C recommendation.
-  http://www.w3.org/TR/n-triples/#n-triples-mediatype Fixes #464 [David
-  Chandek-Stark]
-
-  2014-08-04: RDFDatastream#content= patched to accept IO, matching
-  Rubydora::Datastream API Fixes #461 [David Chandek-Stark]
-
-  2014-07-30: Only set ds content in #create_datastream for managed and inline
-  [David Chandek-Stark]
-
 v7.1.0
 
   2014-07-17: Update Om and Rubydora depencencies [Justin Coyne]

data/README.md

@@ -4,6 +4,7 @@ Description
 [![Build Status](https://travis-ci.org/projecthydra/active_fedora.png?branch=master)](https://travis-ci.org/projecthydra/active\_fedora)
 [![Version](https://badge.fury.io/rb/active-fedora.png)](http://badge.fury.io/rb/active-fedora)
 [![Dependencies](https://gemnasium.com/projecthydra/active_fedora.png)](https://gemnasium.com/projecthydra/active\_fedora)
+[![Coverage Status](https://img.shields.io/coveralls/projecthydra/active_fedora.svg)](https://coveralls.io/r/projecthydra/active_fedora)
 
 Rubydora and ActiveFedora provide a set of Ruby gems for creating and
 managing objects in the Fedora Repository Architecture

data/Rakefile

@@ -1,8 +1,5 @@
 require 'rake/clean'
-require 'rubygems'
 require 'bundler'
-require "bundler/setup"
-require "active-fedora"
 
 Bundler::GemHelper.install_tasks
 

data/active-fedora.gemspec

@@ -14,23 +14,23 @@ Gem::Specification.new do |s|
   s.license = "APACHE2"
   s.required_ruby_version     = '>= 1.9.3'
 
-  s.add_dependency 'rsolr', ">= 1.0.11", '< 3'
+  s.add_dependency 'rsolr', "~> 1.0.10"
   s.add_dependency 'om', '~> 3.1'
   s.add_dependency 'nom-xml', '>= 0.5.1'
-  s.add_dependency "activesupport", '>= 4.2.10'
-  s.add_dependency "rubydora", '>= 1.8.0', '< 3'
+  s.add_dependency "activesupport", '>= 4.1.0'
   s.add_dependency "active-triples", '~> 0.4.0'
-  s.add_dependency "rdf-rdfxml", '~> 1.1'
+  s.add_dependency "rdf-rdfxml", '~> 1.1.0'
+  s.add_dependency "linkeddata"
   s.add_dependency "deprecation"
+  s.add_dependency "ldp", '~> 0.0.9'
+  s.add_dependency "rdf-ldp"
+
   s.add_development_dependency "rdoc"
   s.add_development_dependency "yard"
   s.add_development_dependency "rake"
   s.add_development_dependency "jettywrapper", ">=1.4.0"
   s.add_development_dependency "rspec", "~> 3.0"
-  s.add_development_dependency "rspec-its"
   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")
@@ -43,3 +43,4 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
 end
+

data/config/fedora.yml

@@ -1,13 +1,14 @@
 development:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: http://127.0.0.1:8983/fedora
+  url: http://127.0.0.1:8983/fedora/rest
+  base_path: /dev
 test:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: http://127.0.0.1:8983/fedora-test
+  url: http://localhost:8983/fedora/rest
+  base_path: /test
 production:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: http://127.0.0.1:8080/fedora
-    
+  url: http://127.0.0.1:8983/fedora/rest

data/config/predicate_mappings.yml

@@ -1,12 +1,12 @@
-# The default namespace maps to the default namespace for generating rels_ext from solr
-:default_namespace: info:fedora/fedora-system:def/relations-external#
+# The default namespace maps to the default namespace for generating relationships from solr
+:default_namespace: http://fedora.info/definitions/v4/rels-ext#
 
 # namespace mappings--- 
 # you can add specific mappings for your institution by providing the following:
 #   namespace_uri:
 #     :relationship_symbol: relationship_identifier
 # 
-# For example, if you have the following element in your rels_ext:
+# For example, if you have the following element in your relationships:
 #  
 #  <oai:itemID>oai:example.edu:changeme:500</oai:itemID>
 # 
@@ -14,7 +14,7 @@
 #   :oai_item_id => ["info:fedora/oai:example.edu:changeme:500"]
 #
 :predicate_mapping:
-  info:fedora/fedora-system:def/relations-external#: 
+  http://fedora.info/definitions/v4/rels-ext#:
     :conforms_to: conformsTo
     :has_annotation: hasAnnotation
     :has_collection_member: hasCollectionMember
@@ -40,7 +40,7 @@
     :is_part_of: isPartOf
     :is_subset_of: isSubsetOf
     :is_topic_of: isTopicOf
-  info:fedora/fedora-system:def/model#:
+  http://fedora.info/definitions/v4/model#:
     :is_contractor_of: isContractorOf
     :is_deployment_of: isDeploymentOf
     :has_service: hasService

data/gemfiles/rails4.1.gemfile

@@ -0,0 +1,10 @@
+source "https://rubygems.org"
+
+file = File.expand_path("../../Gemfile", __FILE__)
+
+if File.exists?(file)
+  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
+  instance_eval File.read(file)
+end
+
+gem 'activemodel', '~> 4.1.1'

data/gemfiles/rails4.2.beta.gemfile

@@ -0,0 +1,10 @@
+source "https://rubygems.org"
+
+file = File.expand_path("../../Gemfile", __FILE__)
+
+if File.exists?(file)
+  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
+  instance_eval File.read(file)
+end
+
+gem 'activemodel', '~> 4.2.0.beta4'

data/lib/active_fedora.rb

@@ -1,49 +1,65 @@
 require 'active_support'
-require "solrizer"
+require 'active_model'
+require 'ldp'
+require 'solrizer'
 require 'active_fedora/file_configurator'
-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'
-require "active_support/core_ext/hash/except"
+require 'active_support/core_ext/hash/except'
 require 'active_triples'
+require 'rdf/ldp'
 
 SOLR_DOCUMENT_ID = Solrizer.default_field_mapper.id_field unless defined?(SOLR_DOCUMENT_ID)
 ENABLE_SOLR_UPDATES = true unless defined?(ENABLE_SOLR_UPDATES)
 
+# Monkey patching RDF::Literal::DateTime to support fractional seconds.
+# See https://github.com/projecthydra/active_fedora/issues/497
+module RDF
+  class Literal
+    class DateTime < Literal
+      ALTERNATIVE_FORMAT   = '%Y-%m-%dT%H:%M:%S'.freeze
+
+      def to_s
+        @string ||= begin
+          nano = @object.strftime('%N').sub(/0+\Z/, '')
+          nano = '.' + nano unless nano.blank?
+          @object.strftime(ALTERNATIVE_FORMAT) + nano + 'Z'
+        end
+      end
+    end
+  end
+end
+
 module ActiveFedora #:nodoc:
   extend ActiveSupport::Autoload
 
-  class ObjectNotFoundError < RuntimeError; end # :nodoc:
-  class PredicateMappingsNotFoundError < RuntimeError; end # :nodoc:
-  class UnknownAttributeError < NoMethodError; end; # :nodoc:
-  class ConfigurationError < RuntimeError; end # :nodoc:
-  class AssociationTypeMismatch < RuntimeError; end # :nodoc:
-  class UnregisteredPredicateError < RuntimeError; end # :nodoc:
-  class RecordNotSaved < RuntimeError; end # :nodoc:
-  class IllegalOperation < RuntimeError; end # :nodoc:
-  class Rollback < RuntimeError; end # :nodoc:
-  class ModelNotAsserted < RuntimeError; end # :nodoc:
-
   eager_autoload do
     autoload :AssociationRelation
     autoload :Associations
+    autoload :AttachedFiles
+    autoload :AttributeMethods
     autoload :Attributes
-    autoload :Auditable
     autoload :AutosaveAssociation
     autoload :Base
-    autoload :ContentModel
     autoload :Callbacks
+    autoload :ChangeSet
     autoload :Config
     autoload :Core
     autoload :Datastream
-    autoload :DatastreamAttribute
-    autoload :DatastreamHash
     autoload :Datastreams
-    autoload :DigitalObject
+    autoload :DelegatedAttribute
+    autoload :Fedora
     autoload :FedoraAttributes
+    autoload :File
     autoload :FileConfigurator
+    autoload :FilePathBuilder
+    autoload :FilesHash
+    autoload :FixityService
     autoload :Indexing
+    autoload :IndexingService
+    autoload :LdpResource
+    autoload :LoadableFromJson
     autoload :Model
     autoload :NestedAttributes
     autoload :NomDatastream
@@ -56,12 +72,12 @@ module ActiveFedora #:nodoc:
     autoload :RDF
     autoload_under 'rdf' do
       autoload :RDFDatastream
-      autoload :RdfxmlRDFDatastream
+      autoload :RDFXMLDatastream
       autoload :NtriplesRDFDatastream
+      autoload :FedoraRdfResource
     end
     autoload :Reflection
     autoload :Relation
-    autoload :ReloadOnSave
 
     autoload_under 'relation' do
       autoload :Calculations
@@ -71,25 +87,38 @@ module ActiveFedora #:nodoc:
       autoload :FinderMethods
     end
 
-    autoload :RelationshipGraph
-    autoload :RelsExtDatastream
     autoload :Scoping
-    autoload :SemanticNode
-    autoload :ServiceDefinitions
     autoload :Serialization
-    autoload :Sharding
     autoload :SimpleDatastream
-    autoload :SolrDigitalObject
+    autoload :SolrInstanceLoader
     autoload :SolrService
-    autoload :UnsavedDigitalObject
-    autoload :FixtureLoader
-    autoload :FixtureExporter
-    autoload :DatastreamCollections
+    autoload :SparqlInsert
     autoload :Predicates
     autoload :Validations
-    autoload :SolrInstanceLoader
+    autoload :Versionable
+    autoload :WithMetadata
+  end
+
+  module AttributeMethods
+    extend ActiveSupport::Autoload
+
+    eager_autoload do
+      autoload :Read
+      autoload :Write
+      autoload :Dirty
+    end
   end
 
+  module Attributes
+    extend ActiveSupport::Autoload
+
+    eager_autoload do
+      autoload :Serializers
+      autoload :PrimaryKey
+    end
+  end
+
+
   module Scoping
     extend ActiveSupport::Autoload
 
@@ -102,101 +131,106 @@ module ActiveFedora #:nodoc:
   class << self
     attr_reader :fedora_config, :solr_config, :config_options
     attr_accessor :configurator
-  end
-  self.configurator ||= ActiveFedora::FileConfigurator.new
-  
-  def self.fedora_config
-    @fedora_config ||= Config.new(configurator.fedora_config)
-  end
-  def self.solr_config;    self.configurator.solr_config;    end
-  def self.config_options; self.configurator.config_options; end
-  def self.config_loaded?; self.configurator.config_loaded?; end
-  
-  def self.init( options={} )
-    # Make config_options into a Hash if nil is passed in as the value
-    options = {} if options.nil?
-    # For backwards compatibility, handle cases where config_path (a String) is passed in as the argument rather than a config_options hash
-    # In all other cases, set config_path to config_options[:config_path], which is ok if it's nil
-    if options.is_a? String
-      raise ArgumentError, "Calling ActiveFedora.init with a path as an argument has been removed.  Use ActiveFedora.init(:fedora_config_path=>#{options})"
-    end
-    @fedora_config = nil
-    SolrService.reset!
-    Predicates.predicate_config = nil
-    self.configurator.init(options)
-  end
 
-  def self.config
-    self.fedora_config
-  end
+    def fedora_config
+      @fedora_config ||= Config.new(configurator.fedora_config)
+    end
+    def solr_config;    configurator.solr_config;    end
+    def config_options; configurator.config_options; end
+    def config_loaded?; configurator.config_loaded?; end
 
-  # Determine what environment we're running in. Order of preference is:
-  # 1. config_options[:environment]
-  # 2. Rails.env
-  # 3. ENV['environment']
-  # 4. ENV['RAILS_ENV']
-  # 5. development
-  # @return [String]
-  # @example 
-  #  ActiveFedora.init(:environment=>"test")
-  #  ActiveFedora.environment => "test"
-  def self.environment
-    if config_options.fetch(:environment,nil)
-      return config_options[:environment]
-    elsif defined?(Rails.env) and !Rails.env.nil?
-      return Rails.env.to_s
-    elsif defined?(ENV['environment']) and !(ENV['environment'].nil?)
-      return ENV['environment']
-    elsif defined?(ENV['RAILS_ENV']) and !(ENV['RAILS_ENV'].nil?)
-      raise RuntimeError, "You're depending on RAILS_ENV for setting your environment. Please use ENV['environment'] for non-rails environment setting: 'rake foo:bar environment=test'"
-    else
-      ENV['environment'] = 'development' 
+    def init( options={} )
+      # Make config_options into a Hash if nil is passed in as the value
+      options = {} if options.nil?
+      # For backwards compatibility, handle cases where config_path (a String) is passed in as the argument rather than a config_options hash
+      # In all other cases, set config_path to config_options[:config_path], which is ok if it's nil
+      if options.is_a? String
+        raise ArgumentError, "Calling ActiveFedora.init with a path as an argument has been removed.  Use ActiveFedora.init(:fedora_config_path=>#{options})"
+      end
+      @fedora_config = nil
+      SolrService.reset!
+      Predicates.predicate_config = nil
+      configurator.init(options)
     end
-  end
-  
-  def self.solr
-    ActiveFedora::SolrService.instance
-  end
-  
-  def self.predicate_config
-    configurator.predicate_config
-  end
-  
-  def self.root
-    File.expand_path('../..', __FILE__)
-  end
-  
-  def self.version
-    ActiveFedora::VERSION
-  end
-  
-  # Convenience method for getting class constant based on a string
-  # @example
-  #   ActiveFedora.class_from_string("Om")
-  #   => Om
-  #   ActiveFedora.class_from_string("ActiveFedora::RdfNode::TermProxy")
-  #   => ActiveFedora::RdfNode::TermProxy
-  # @example Search within ActiveFedora::RdfNode for a class called "TermProxy"
-  #   ActiveFedora.class_from_string("TermProxy", ActiveFedora::RdfNode)
-  #   => ActiveFedora::RdfNode::TermProxy  
-  def self.class_from_string(class_name, container_class=Kernel)
-    container_class = container_class.name if container_class.is_a? Module
-    container_parts = container_class.split('::')
-    (container_parts + class_name.split('::')).flatten.inject(Kernel) do |mod, class_name|
-      if mod == Kernel
-        Object.const_get(class_name)
-      elsif mod.const_defined? class_name.to_sym
-        mod.const_get(class_name)
+
+    def config
+      fedora_config
+    end
+
+    # Determine what environment we're running in. Order of preference is:
+    # 1. config_options[:environment]
+    # 2. Rails.env
+    # 3. ENV['environment']
+    # 4. ENV['RAILS_ENV']
+    # 5. development
+    # @return [String]
+    # @example
+    #  ActiveFedora.init(:environment=>"test")
+    #  ActiveFedora.environment => "test"
+    def environment
+      if config_options.fetch(:environment,nil)
+        return config_options[:environment]
+      elsif defined?(Rails.env) and !Rails.env.nil?
+        return Rails.env.to_s
+      elsif defined?(ENV['environment']) and !(ENV['environment'].nil?)
+        return ENV['environment']
+      elsif defined?(ENV['RAILS_ENV']) and !(ENV['RAILS_ENV'].nil?)
+        raise RuntimeError, "You're depending on RAILS_ENV for setting your environment. Please use ENV['environment'] for non-rails environment setting: 'rake foo:bar environment=test'"
       else
-        container_parts.pop
-        class_from_string(class_name, container_parts.join('::'))
+        ENV['environment'] = 'development'
+      end
+    end
+
+    def solr
+      ActiveFedora::SolrService.instance
+    end
+
+    def fedora
+      @fedora ||= Fedora.new(fedora_config.credentials)
+    end
+
+    def predicate_config
+      configurator.predicate_config
+    end
+
+    def root
+      ::File.expand_path('../..', __FILE__)
+    end
+
+    def version
+      ActiveFedora::VERSION
+    end
+
+    # Convenience method for getting class constant based on a string
+    # @example
+    #   ActiveFedora.class_from_string("Om")
+    #   => Om
+    #   ActiveFedora.class_from_string("ActiveFedora::RdfNode::TermProxy")
+    #   => ActiveFedora::RdfNode::TermProxy
+    # @example Search within ActiveFedora::RdfNode for a class called "TermProxy"
+    #   ActiveFedora.class_from_string("TermProxy", ActiveFedora::RdfNode)
+    #   => ActiveFedora::RdfNode::TermProxy
+    def class_from_string(class_name, container_class=Kernel)
+      container_class = container_class.name if container_class.is_a? Module
+      container_parts = container_class.split('::')
+      (container_parts + class_name.split('::')).flatten.inject(Kernel) do |mod, class_name|
+        if mod == Kernel
+          Object.const_get(class_name)
+        elsif mod.const_defined? class_name.to_sym
+          mod.const_get(class_name)
+        else
+          container_parts.pop
+          class_from_string(class_name, container_parts.join('::'))
+        end
       end
     end
   end
 
+  self.configurator ||= ActiveFedora::FileConfigurator.new
+
 end
 
 
-I18n.load_path << File.dirname(__FILE__) + '/active_fedora/locale/en.yml'
+I18n.load_path << ::File.dirname(__FILE__) + '/active_fedora/locale/en.yml'
 
 require 'active_fedora/railtie' if defined?(Rails)