active-fedora 7.0.4 → 7.1.0

data/lib/active_fedora/railtie.rb

@@ -4,10 +4,14 @@ module ActiveFedora
       load "tasks/active_fedora.rake"
     end
 
-   initializer 'activefedora.autoload', :before => :set_autoload_paths do |app|
+   initializer 'active_fedora.autoload', :before => :set_autoload_paths do |app|
      app.config.autoload_paths << 'app/models/datastreams'
     end
 
+   initializer "active_fedora.logger" do
+      ActiveSupport.on_load(:active_fedora) { self.logger ||= ::Rails.logger }
+    end
+
     generators do
       require(
         'generators/active_fedora/config/config_generator'

data/lib/active_fedora/rdf.rb

@@ -1,17 +1,19 @@
 module ActiveFedora
   module Rdf
     extend ActiveSupport::Autoload
-    autoload :NestedAttributes
-    autoload :NodeConfig
     autoload :Indexing
-    autoload :Configurable
-    autoload :Properties
     autoload :Identifiable
-    autoload :Repositories
-    autoload :Resource
-    autoload :VocabularyLoader
     autoload :ObjectResource
-    autoload :Term
-    autoload :List
+
+    # Aliases for deprecated ActiveFedora::Rdf Classes/Modules
+    # TODO: Remove in 8.0.0
+    Resource = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('ActiveFedora::Rdf::Resource', 'ActiveTriples::Resource')
+    Term = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('ActiveFedora::Rdf::Term', 'ActiveTriples::Term')
+    List = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('ActiveFedora::Rdf::List', 'ActiveTriples::List')
+    Configurable = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('ActiveFedora::Rdf::Configurable', 'ActiveTriples::Configurable')
+    Properties = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('ActiveFedora::Rdf::Properties', 'ActiveTriples::Properties')
+    Repositories = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('ActiveFedora::Rdf::Repositories', 'ActiveTriples::Repositories')
+    NodeConfig = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('ActiveFedora::Rdf::NodeConfig', 'ActiveTriples::NodeConfig')
+    NestedAttributes = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('ActiveFedora::Rdf::NestedAttributes', 'ActiveTriples::NestedAttributes')
   end
 end

data/lib/active_fedora/rdf/indexing.rb

@@ -20,7 +20,7 @@ module ActiveFedora
           Array(values).each do |val|
             if val.kind_of? RDF::URI
               val = val.to_s 
-            elsif val.kind_of? Rdf::Resource
+            elsif val.kind_of? ActiveTriples::Resource
               val = val.solrize
             end
             self.class.create_and_insert_terms(apply_prefix(field_key), val, field_info[:behaviors], solr_doc)

data/lib/active_fedora/rdf/object_resource.rb

@@ -4,7 +4,7 @@ module ActiveFedora::Rdf
   # with a Datastream and ActiveFedora::Base object.
   #
   # @see ActiveFedora::RDFDatastream
-  class ObjectResource < Resource
+  class ObjectResource < ActiveTriples::Resource
     configure :base_uri => 'info:fedora/'
     attr_accessor :datastream
 

data/lib/active_fedora/rdf/rdf_datastream.rb

@@ -1,9 +1,9 @@
 module ActiveFedora
   class RDFDatastream < ActiveFedora::Datastream
     include Solrizer::Common
-    include ActiveFedora::Rdf::NestedAttributes
+    include ActiveTriples::NestedAttributes
     include Rdf::Indexing
-    extend Rdf::Properties
+    extend ActiveTriples::Properties
 
     delegate :rdf_subject, :set_value, :get_values, :attributes=, :to => :resource
 
@@ -25,7 +25,7 @@ module ActiveFedora
 
     before_save do
       if content.blank?
-        logger.warn "Cowardly refusing to save a datastream with empty content: #{self.inspect}"
+        ActiveFedora::Base.logger.warn "Cowardly refusing to save a datastream with empty content: #{self.inspect}" if ActiveFedora::Base.logger
         false
       end
     end

data/lib/active_fedora/relation/finder_methods.rb

@@ -60,14 +60,22 @@ module ActiveFedora
       end
     end
 
-    # Returns true if the pid exists in the repository
-    # @param[String] pid
+    # Returns true if object having the pid or matching the conditions exists in the repository
+    # Returns false if param is false (or nil) 
+    # @param[ActiveFedora::Base, String, Hash] object, pid or hash of conditions
     # @return[boolean]
     def exists?(conditions)
       conditions = conditions.id if Base === conditions
       return false if !conditions
-      !!DigitalObject.find(self.klass, conditions)
-    rescue ActiveFedora::ObjectNotFoundError
+      case conditions
+      when Hash
+        find_with_conditions(conditions, {rows: 1}).present?
+      when String
+        !!DigitalObject.find(self.klass, conditions) 
+      else
+        raise ArgumentError, "`conditions' argument must be ActiveFedora::Base, String, or Hash: #{conditions.inspect}"
+      end
+    rescue ActiveFedora::ObjectNotFoundError 
       false
     end
 
@@ -99,7 +107,7 @@ module ActiveFedora
           begin 
             yield(load_from_fedora(hit[SOLR_DOCUMENT_ID], cast))
           rescue ActiveFedora::ObjectNotFoundError
-            logger.error "Although #{hit[SOLR_DOCUMENT_ID]} was found in Solr, it doesn't seem to exist in Fedora. The index is out of synch."
+            ActiveFedora::Base.logger.error "Although #{hit[SOLR_DOCUMENT_ID]} was found in Solr, it doesn't seem to exist in Fedora. The index is out of synch." if ActiveFedora::Base.logger
           end
         end
       end
@@ -160,14 +168,12 @@ module ActiveFedora
     protected
 
     def load_from_fedora(pid, cast)
-      cast = true if self == ActiveFedora::Base && cast.nil?
-      inner = DigitalObject.find(@klass, pid)
-      af_base = @klass.allocate.init_with(inner)
+      cast = true if klass == ActiveFedora::Base && cast.nil?
+      inner = DigitalObject.find(klass, pid)
+      af_base = klass.allocate.init_with_object(inner)
       cast ? af_base.adapt_to_cmodel : af_base
-
     end
 
-
     def find_with_ids(ids, cast)
       expects_array = ids.first.kind_of?(Array)
       return ids.first if expects_array && ids.first.empty?

data/lib/active_fedora/solr_instance_loader.rb

@@ -28,7 +28,7 @@ module ActiveFedora
     private
 
     def allocate_object
-      active_fedora_class.allocate.init_with(solr_digital_object)
+      active_fedora_class.allocate.init_with_object(solr_digital_object)
     end
 
     def solr_digital_object

data/lib/active_fedora/solr_service.rb

@@ -4,8 +4,6 @@ module ActiveFedora
   class SolrService 
     extend Deprecation
     
-    include Loggable
-    
     attr_reader :conn
 
     def initialize(host, args)
@@ -76,7 +74,7 @@ module ActiveFedora
           end
         end
 
-        logger.warn "Could not find a model for #{hit["id"]}, defaulting to ActiveFedora::Base" unless best_model_match
+        ActiveFedora::Base.logger.warn "Could not find a model for #{hit["id"]}, defaulting to ActiveFedora::Base" unless best_model_match if ActiveFedora::Base.logger
         best_model_match || ActiveFedora::Base
       end
       

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "7.0.4"
+  VERSION = "7.1.0"
 end

data/spec/integration/attributes_spec.rb

@@ -21,12 +21,12 @@ describe "delegating attributes" do
       obj
     end
     it "should keep a list of changes after a successful save" do
-      subject.previous_changes.should_not be_empty
-      subject.previous_changes.keys.should include("title")
+      expect(subject.previous_changes).to_not be_empty
+      expect(subject.previous_changes.keys).to include("title")
     end
     it "should clean out changes" do
-      subject.title_changed?.should be_false
-      subject.changes.should be_empty
+      expect(subject).to_not be_title_changed
+      expect(subject.changes).to be_empty
     end
   end
 end

data/spec/integration/base_spec.rb

@@ -104,7 +104,7 @@ describe "A base object with metadata" do
   end
 
   describe '#reload' do
-    before(:each) do
+    before do
       @object = MockAFBaseRelationship.new
       @object.foo.person = 'bob'
       @object.save
@@ -114,17 +114,15 @@ describe "A base object with metadata" do
       @object2.foo.person = 'dave'
       @object2.save
     end
+
     it 'should requery Fedora' do
       @object.reload
       @object.foo.person.should == ['dave']
     end
+
     it 'should raise an error if not persisted' do
       @object = MockAFBaseRelationship.new
-      # You will want this stub or else it will be really chatty in your STDERR
-      @object.inner_object.logger.stub(:error)
-      expect {
-        @object.reload
-      }.to raise_error(ActiveFedora::ObjectNotFoundError)
+      expect { @object.reload }.to raise_error(ActiveFedora::ObjectNotFoundError)
     end
   end
 end
@@ -271,7 +269,7 @@ describe ActiveFedora::Base do
   describe ".datastreams" do
     it "should return a Hash of datastreams from fedora" do
       datastreams = @test_object.datastreams
-      datastreams.should be_a_kind_of(Hash) 
+      datastreams.should be_a_kind_of(ActiveFedora::DatastreamHash) 
       datastreams.each_value do |ds| 
         ds.should be_a_kind_of(ActiveFedora::Datastream)
       end
@@ -433,18 +431,39 @@ describe ActiveFedora::Base do
 
   
   describe "#exists?" do
+    let(:obj) { ActiveFedora::Base.create } 
     it "should return true for objects that exist" do
-      @obj = ActiveFedora::Base.create
-      ActiveFedora::Base.exists?(@obj.pid).should be_true
+      expect(ActiveFedora::Base.exists?(obj)).to be true
+    end
+    it "should return true for pids that exist" do
+      expect(ActiveFedora::Base.exists?(obj.pid)).to be true
     end
-    it "should return false for objects that don't exist" do
-      ActiveFedora::Base.exists?('test:missing_object').should be_false
+    it "should return false for pids that don't exist" do
+      expect(ActiveFedora::Base.exists?('test:missing_object')).to be false
     end
     it "should return false for nil" do
-      ActiveFedora::Base.exists?(nil).should be_false
+      expect(ActiveFedora::Base.exists?(nil)).to be false
+    end
+    it "should return false for false" do
+      expect(ActiveFedora::Base.exists?(false)).to be false
     end
     it "should return false for empty" do
-      ActiveFedora::Base.exists?('').should be_false
+      expect(ActiveFedora::Base.exists?('')).to be false
+    end
+    context "when passed a hash of conditions" do
+      let(:conditions) { {foo: "bar"} }
+      context "and at least one object matches the conditions" do
+        it "should return true" do
+          allow(ActiveFedora::SolrService).to receive(:query) { [double("solr document")] }
+          expect(ActiveFedora::Base.exists?(conditions)).to be true
+        end
+      end
+      context "and no object matches the conditions" do
+        it "should return false" do
+          allow(ActiveFedora::SolrService).to receive(:query) { [] }
+          expect(ActiveFedora::Base.exists?(conditions)).to be false
+        end
+      end
     end
   end
 end

data/spec/integration/complex_rdf_datastream_spec.rb

@@ -6,7 +6,7 @@ describe "Nested Rdf Objects" do
       class SpecDatastream < ActiveFedora::NtriplesRDFDatastream
         property :parts, predicate: RDF::DC.hasPart, class_name: 'Component'
 
-        class Component < ActiveFedora::Rdf::Resource
+        class Component < ActiveTriples::Resource
           property :label, predicate: RDF::DC.title
         end
       end
@@ -134,7 +134,7 @@ END
         class SpecDatastream < ActiveFedora::NtriplesRDFDatastream
           property :mediator, predicate: RDF::DC.mediator, class_name: 'MediatorUser'
 
-          class MediatorUser < ActiveFedora::Rdf::Resource
+          class MediatorUser < ActiveTriples::Resource
             configure type: RDF::DC.AgentClass
             property :title, predicate: RDF::DC.title
           end
@@ -189,12 +189,12 @@ END
           property :series, predicate: EbuCore.isEpisodeOf, class_name: 'Series'
           property :program, predicate: EbuCore.isEpisodeOf, class_name: 'Program'
 
-          class Series < ActiveFedora::Rdf::Resource
+          class Series < ActiveTriples::Resource
             configure type: 'http://www.ebu.ch/metadata/ontologies/ebucore#Series'
             property :title, predicate: EbuCore.title
           end
 
-          class Program  < ActiveFedora::Rdf::Resource
+          class Program  < ActiveTriples::Resource
             configure type: 'http://www.ebu.ch/metadata/ontologies/ebucore#Programme'
             property :title, predicate: EbuCore.title
           end

data/spec/integration/delete_all_spec.rb

@@ -46,7 +46,7 @@ describe ActiveFedora::Base do
         end
       end
       it "should be able to skip a missing model" do 
-        ActiveFedora::Relation.logger.should_receive(:error).with("Although #{pid} was found in Solr, it doesn't seem to exist in Fedora. The index is out of synch.")
+        expect(ActiveFedora::Base.logger).to receive(:error).with("Although #{pid} was found in Solr, it doesn't seem to exist in Fedora. The index is out of synch.")
         SpecModel::Basic.destroy_all
         SpecModel::Basic.count.should == 1 
       end

data/spec/integration/load_from_solr_spec.rb

@@ -52,7 +52,7 @@ describe "Loading from solr" do
     expect(obj.date_uploaded).to eq [Date.parse('1959-01-01')]
     expect(obj.identifier).to eq 12345
     expect{obj.part}.to raise_error KeyError, "Tried to fetch `part' from solr, but it isn't indexed."
-    ActiveFedora::DatastreamAttribute.logger.should_receive(:info).with "Couldn't get duck out of solr, because the datastream 'MyOmDatastream' doesn't respond to 'primary_solr_name'. Trying another way."
+    expect(ActiveFedora::Base.logger).to receive(:info).with "Couldn't get duck out of solr, because the datastream 'MyOmDatastream' doesn't respond to 'primary_solr_name'. Trying another way."
     expect(obj.duck).to eq 'quack'
   end
 

data/spec/integration/rdf_nested_attributes_spec.rb

@@ -32,16 +32,16 @@ describe "Nesting attribute behavior of RDFDatastream" do
 
           accepts_nested_attributes_for :topic, :personalName
 
-          class Topic < ActiveFedora::Rdf::Resource
+          class Topic < ActiveTriples::Resource
             property :elementList, predicate: DummyMADS.elementList, class_name: "ComplexRDFDatastream::ElementList"
             accepts_nested_attributes_for :elementList
           end
-          class PersonalName < ActiveFedora::Rdf::Resource
+          class PersonalName < ActiveTriples::Resource
             property :elementList, predicate: DummyMADS.elementList, class_name: "ComplexRDFDatastream::ElementList"
             property :extraProperty, predicate: DummyMADS.elementValue, class_name: "ComplexRDFDatastream::Topic"
             accepts_nested_attributes_for :elementList, :extraProperty
           end
-          class ElementList < ActiveFedora::Rdf::List
+          class ElementList < ActiveTriples::List
             configure type: DummyMADS.elementList
             property :topicElement, predicate: DummyMADS.TopicElement, class_name: "ComplexRDFDatastream::MadsTopicElement"
             property :temporalElement, predicate: DummyMADS.TemporalElement
@@ -51,7 +51,7 @@ describe "Nesting attribute behavior of RDFDatastream" do
             property :elementValue, predicate: DummyMADS.elementValue
             accepts_nested_attributes_for :topicElement
           end
-          class MadsTopicElement < ActiveFedora::Rdf::Resource
+          class MadsTopicElement < ActiveTriples::Resource
             configure :type => DummyMADS.TopicElement
             property :elementValue, predicate: DummyMADS.elementValue
           end

data/spec/integration/scoped_query_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "scoped queries" do
 
-  before(:each) do 
+  before do 
     module ModelIntegrationSpec
       class Basic < ActiveFedora::Base
         has_metadata "properties", type: ActiveFedora::SimpleDatastream do |m|
@@ -24,7 +24,7 @@ describe "scoped queries" do
 
   end
   
-  after(:each) do
+  after do
     Object.send(:remove_const, :ModelIntegrationSpec)
   end
 
@@ -56,9 +56,9 @@ describe "scoped queries" do
   end
 
   describe "with multiple objects" do
-    let!(:test_instance1) { ModelIntegrationSpec::Basic.create!(:foo=>'Beta', :bar=>'Chips')}
-    let!(:test_instance2) { ModelIntegrationSpec::Basic.create!(:foo=>'Alpha', :bar=>'Peanuts')}
-    let!(:test_instance3) { ModelIntegrationSpec::Basic.create!(:foo=>'Sigma', :bar=>'Peanuts')}
+    let!(:test_instance1) { ModelIntegrationSpec::Basic.create!(foo: ['Beta'], bar: ['Chips']) }
+    let!(:test_instance2) { ModelIntegrationSpec::Basic.create!(foo: ['Alpha'], bar: ['Peanuts']) }
+    let!(:test_instance3) { ModelIntegrationSpec::Basic.create!(foo: ['Sigma'], bar: ['Peanuts']) }
 
     describe "when the objects are in fedora" do
       after do
@@ -124,7 +124,7 @@ describe "scoped queries" do
         test_instance3.delete
       end
       it "should log an error" do
-        ActiveFedora::Relation.logger.should_receive(:error).with("Although #{pid} was found in Solr, it doesn't seem to exist in Fedora. The index is out of synch.")
+        expect(ActiveFedora::Base.logger).to receive(:error).with("Although #{pid} was found in Solr, it doesn't seem to exist in Fedora. The index is out of synch.")
         ModelIntegrationSpec::Basic.all.should == [test_instance1, test_instance3]
       end
     end

data/spec/spec_helper.rb

@@ -12,13 +12,16 @@ end
 
 require 'active-fedora'
 require 'rspec'
+require 'rspec/its'
 require 'equivalent-xml/rspec_matchers'
+require 'logger'
+
+ActiveFedora::Base.logger = Logger.new(STDERR);
+ActiveFedora::Base.logger.level = Logger::WARN
 
 Dir[File.expand_path("../support/**/*.rb", __FILE__)].each {|f| require f }
 require 'samples/samples'
 
-
-logger.level = Logger::WARN if logger.respond_to? :level ###MediaShelf StubLogger doesn't have a level= method
 $VERBOSE=nil
 
 # This loads the Fedora and Solr config info from /config/fedora.yml
@@ -32,7 +35,6 @@ restore_spec_configuration
 ActiveSupport::Deprecation.behavior= Proc.new { |message, callstack| }
 
 RSpec.configure do |config|
-  config.color_enabled = true
 end
 
 def fixture(file)

data/spec/unit/attributes_spec.rb

@@ -99,7 +99,25 @@ describe ActiveFedora::Base do
       end
     end
 
-
+    describe "deprecated behavior" do
+      before(:all) do
+        @behavior = ActiveFedora::Attributes.deprecation_behavior
+        ActiveFedora::Attributes.deprecation_behavior = :raise
+      end
+      after(:all) do
+        ActiveFedora::Attributes.deprecation_behavior = @behavior
+      end
+      it "should deprecate passing a string to a multiple attribute writer" do
+        expect { subject.fubar = "Quack" }.to raise_error
+        expect { subject.fubar = ["Quack"] }.not_to raise_error
+        expect { subject.fubar = nil }.not_to raise_error
+      end
+      it "should deprecate passing an enumerable to a unique attribute writer" do
+        expect { subject.cow = "Low" }.not_to raise_error
+        expect { subject.cow = ["Low"] }.to raise_error
+        expect { subject.cow = nil }.not_to raise_error
+      end
+    end
 
     it "should reveal the unique properties" do
       BarHistory2.unique?(:horse).should be_false