active-fedora 11.0.1 → 11.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16ead45129d9f2be4aa17bde6a13d62a1079cf31
-  data.tar.gz: ae8fb524751ba62d38fe12f0f4b3953efaf2a4e1
+  metadata.gz: d30a0af700ab6f5855f2ac0dae9bd20aace608b3
+  data.tar.gz: f2e755860c2c67c4559c339c1468fa0a23b6038f
 SHA512:
-  metadata.gz: f043c0eabd5bc35f273e2d479d01edf61afc4d5987ac3c48eef8fd58eae863f5901d87192fea088c2e4d0c6d0abe6bf93931c8fab2fb80b5d443f870575bc625
-  data.tar.gz: f2eff2fb6b5d014e6c6ec7a1f97cb4dd152ee92218526040bc78a6fbe53463018b15009d620677fefe29e6aef9183d882f6f4a818a89e725578523a0e38760ac
+  metadata.gz: 61d91bdf7413839f75fa6be613786888dd74fd0a19253cc911886fbf6877d6b2d1903cb924c6312d0e92c5cc7d719f7394e5d5ab1c6d9d960a40b15c7d885125
+  data.tar.gz: f11e71036ebc0316ebc79bef415d98e0f0fa09036f3ce7438cf6839baf3cca87a168f1ec53e83366913e24d33d246d3d394647ac21a9c5480a1f92610a67a030

data/.travis.yml

@@ -1,15 +1,12 @@
 language: ruby
 cache: bundler
 sudo: false
-rvm:
-  - 2.3.0
-
-notifications:
-  irc: "irc.freenode.org#projecthydra"
-
-env:
-  - "RAILS_VERSION=4.2.6"
-
+rvm: 2.4.0
+matrix:
+  include:
+    - rvm: 2.3.3
+      env: "RAILS_VERSION=4.2.7.1"
+    - env: "RSOLR_VERSION=2.0.0.pre1"
 global_env:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 before_script:

data/Gemfile

@@ -8,6 +8,7 @@ gem 'byebug' unless ENV['TRAVIS']
 gem 'pry-byebug' unless ENV['CI']
 
 gem 'activemodel', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
+gem 'rsolr', ENV['RSOLR_VERSION'] if ENV['RSOLR_VERSION']
 
 group :test do
   gem 'simplecov', require: false

data/History.txt

@@ -1,3 +1,37 @@
+v11.1.0
+2017-01-12: Casting an RDF::URI to a RDF::URI is unnecessary [Justin Coyne]
+
+2017-01-06: Replace deprecated Fixnum with Integer [Justin Coyne]
+
+2017-01-06: Pin rubocop-rspec to 1.8.0 [Justin Coyne]
+
+2017-01-06: Add Ruby 2.4.0 to the test matrix [Justin Coyne]
+
+2016-12-19: Removing invalid namespaces from tests [Esmé Cowles]
+
+2016-12-16: Correct the documentation [Justin Coyne]
+
+2016-11-14: Use base_uri instead of relying on id_to_uri [Chris Colvard]
+
+2016-11-14: Add base_uri convenience method [Chris Colvard]
+
+2016-11-09: There is no need to pin rake anylonger [Justin Coyne]
+
+2016-10-28: Allow logger to be set by default. Fixes #1170 [Justin Coyne]
+
+2016-10-28: Add return value YARD doc [Justin Coyne]
+
+2016-10-28: Update to latest Rubocop [Adam Wead]
+
+2016-10-27: Stop spamming IRC with Travis builds [Michael J. Giarlo]
+
+2016-10-19: Changing file to accept any object that responds to URI including
+another File object or a Version [Carolyn Cole]
+
+2016-09-30: Test with rsolr 2.x [Chris Beer]
+
+2016-09-22: Use ActiveFedora::NullLogger [Adam Wead]
+
 v9.10.1
 2016-03-26: Fix #reflect_on_association. [Trey Pendragon]
 

data/active-fedora.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.license = "APACHE2"
   s.required_ruby_version = '~> 2.0'
 
-  s.add_dependency 'rsolr', '~> 1.1', '>= 1.1.2'
+  s.add_dependency 'rsolr', '>= 1.1.2', '< 3'
   s.add_dependency 'solrizer', '~> 3.4'
   s.add_dependency "activesupport", '>= 4.2.4', '< 6'
   s.add_dependency "activemodel", '>= 4.2', '< 6'
@@ -25,8 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rails"
   s.add_development_dependency "rdoc"
   s.add_development_dependency "yard"
-  # Pin rake to 10.0 due to https://github.com/lsegal/yard/issues/947
-  s.add_development_dependency "rake", '~> 10.0'
+  s.add_development_dependency "rake"
   s.add_development_dependency "solr_wrapper", "~> 0.15"
   s.add_development_dependency 'fcrepo_wrapper', '~> 0.2'
   s.add_development_dependency "rspec", "~> 3.0"
@@ -34,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "equivalent-xml"
   s.add_development_dependency "simplecov", '~> 0.8'
   s.add_development_dependency "rubocop", '~> 0.42.0'
-  s.add_development_dependency "rubocop-rspec", '~> 1.6'
+  s.add_development_dependency "rubocop-rspec", '~> 1.8.0'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")

data/lib/active_fedora.rb

@@ -89,6 +89,7 @@ module ActiveFedora #:nodoc:
     autoload :ModelClassifier
     autoload :NestedAttributes
     autoload :NullRelation
+    autoload :NullLogger
     autoload :Orders
     autoload :Pathing
     autoload :Persistence

data/lib/active_fedora/associations/collection_association.rb

@@ -204,7 +204,7 @@ module ActiveFedora
       # Note that this method will _always_ remove records from the database
       # ignoring the +:dependent+ option.
       def destroy(*records)
-        records = find(records) if records.any? { |record| record.is_a?(Fixnum) || record.is_a?(String) }
+        records = find(records) if records.any? { |record| record.is_a?(Integer) || record.is_a?(String) }
         delete_or_destroy(records, :destroy)
       end
 
@@ -305,7 +305,7 @@ module ActiveFedora
           records.each { |record| set_inverse_instance(record) }
           records
         rescue ObjectNotFoundError, Ldp::Gone => e
-          ActiveFedora::Base.logger.error "Solr and Fedora may be out of sync:\n" + e.message if ActiveFedora::Base.logger
+          ActiveFedora::Base.logger.error "Solr and Fedora may be out of sync:\n" + e.message
           reset
           []
         end

data/lib/active_fedora/associations/collection_proxy.rb

@@ -115,7 +115,7 @@ module ActiveFedora
       end
 
       # Finds an object in the collection responding to the +id+. Uses the same
-      # rules as <tt>ActiveFedora::Base.find</tt>. Returns <tt>ActiveFedora::RecordNotFound</tt>
+      # rules as <tt>ActiveFedora::Base.find</tt>. Returns <tt>ActiveFedora::ObjectNotFoundError</tt>
       # error if the object can not be found.
       #
       #   class Person < ActiveFedora::Base
@@ -130,7 +130,7 @@ module ActiveFedora
       #   #    ]
       #
       #   person.pets.find(1) # => #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>
-      #   person.pets.find(4) # => ActiveFedora::RecordNotFound: Couldn't find Pet with id=4
+      #   person.pets.find(4) # => ActiveFedora::ObjectNotFoundError: Couldn't find Pet with id=4
       #
       #   person.pets.find(2) { |pet| pet.name.downcase! }
       #   # => #<Pet id: 2, name: "fancy-fancy", person_id: 1>
@@ -394,7 +394,7 @@ module ActiveFedora
       #   #    ]
       #
       #   Pet.find(1, 2, 3)
-      #   # => ActiveFedora::RecordNotFound
+      #   # => ActiveFedora::ObjectNotFoundError
       #
       # If it is set to <tt>:delete_all</tt>, all the objects are deleted
       # *without* calling their +destroy+ method.
@@ -419,7 +419,7 @@ module ActiveFedora
       #   #    ]
       #
       #   Pet.find(1, 2, 3)
-      #   # => ActiveFedora::RecordNotFound
+      #   # => ActiveFedora::ObjectNotFoundError
       def delete_all
         @association.delete_all
       end
@@ -511,7 +511,7 @@ module ActiveFedora
       #   # => [#<Pet id: 2, name: "Spook", person_id: 1>]
       #
       #   Pet.find(1, 3)
-      #   # => ActiveFedora::RecordNotFound: Couldn't find all Pets with IDs (1, 3)
+      #   # => ActiveFedora::ObjectNotFoundError: Couldn't find all Pets with IDs (1, 3)
       #
       # If it is set to <tt>:delete_all</tt>, all the +records+ are deleted
       # *without* calling their +destroy+ method.
@@ -539,9 +539,9 @@ module ActiveFedora
       #   #    ]
       #
       #   Pet.find(1)
-      #   # => ActiveFedora::RecordNotFound: Couldn't find Pet with id=1
+      #   # => ActiveFedora::ObjectNotFoundError: Couldn't find Pet with id=1
       #
-      # You can pass +Fixnum+ or +String+ values, it finds the records
+      # You can pass +Integer+ or +String+ values, it finds the records
       # responding to the +id+ and executes delete on them.
       #
       #   class Person < ActiveFedora::Base
@@ -603,9 +603,9 @@ module ActiveFedora
       #   person.pets.size  # => 0
       #   person.pets       # => []
       #
-      #   Pet.find(1, 2, 3) # => ActiveFedora::RecordNotFound: Couldn't find all Pets with IDs (1, 2, 3)
+      #   Pet.find(1, 2, 3) # => ActiveFedora::ObjectNotFoundError: Couldn't find all Pets with IDs (1, 2, 3)
       #
-      # You can pass +Fixnum+ or +String+ values, it finds the records
+      # You can pass +Integer+ or +String+ values, it finds the records
       # responding to the +id+ and then deletes them from the database.
       #
       #   person.pets.size # => 3
@@ -635,7 +635,7 @@ module ActiveFedora
       #   person.pets.size  # => 0
       #   person.pets       # => []
       #
-      #   Pet.find(4, 5, 6) # => ActiveFedora::RecordNotFound: Couldn't find all Pets with IDs (4, 5, 6)
+      #   Pet.find(4, 5, 6) # => ActiveFedora::ObjectNotFoundError: Couldn't find all Pets with IDs (4, 5, 6)
       def destroy(*records)
         @association.destroy(*records)
       end

data/lib/active_fedora/associations/has_and_belongs_to_many_association.rb

@@ -21,7 +21,7 @@ module ActiveFedora
         if reflection.options[:inverse_of]
           inverse = reflection.inverse_of
           if owner.new_record?
-            ActiveFedora::Base.logger.warn("has_and_belongs_to_many #{reflection.inspect} is cowardly refusing to insert the inverse relationship into #{record}, because #{owner} is not persisted yet.") if ActiveFedora::Base.logger
+            ActiveFedora::Base.logger.warn("has_and_belongs_to_many #{reflection.inspect} is cowardly refusing to insert the inverse relationship into #{record}, because #{owner} is not persisted yet.")
           elsif inverse.has_and_belongs_to_many?
             record[inverse.foreign_key] ||= []
             record[inverse.foreign_key] += [owner.id]

data/lib/active_fedora/attribute_methods.rb

@@ -235,7 +235,7 @@ module ActiveFedora
     #   person = Person.new
     #   person[:age] = '22'
     #   person[:age] # => 22
-    #   person[:age] # => Fixnum
+    #   person[:age] # => Integer
     def []=(attr_name, value)
       write_attribute(attr_name, value)
     end

data/lib/active_fedora/attributes.rb

@@ -138,7 +138,7 @@ module ActiveFedora
           def warn_duplicate_predicates(new_name, new_properties)
             new_predicate = new_properties[:predicate]
             properties.select { |_k, existing| existing.predicate == new_predicate }.each do |key, _value|
-              ActiveFedora::Base.logger.warn "Same predicate (#{new_predicate}) used for properties #{key} and #{new_name}" if ActiveFedora::Base.logger
+              ActiveFedora::Base.logger.warn "Same predicate (#{new_predicate}) used for properties #{key} and #{new_name}"
             end
           end
 

data/lib/active_fedora/cleaner.rb

@@ -48,7 +48,7 @@ module ActiveFedora
     end
 
     def self.log(message)
-      ActiveFedora::Base.logger.debug message if ActiveFedora::Base.logger
+      ActiveFedora::Base.logger.debug message
     end
   end
 end

data/lib/active_fedora/core.rb

@@ -8,13 +8,19 @@ module ActiveFedora
     autoload :FedoraUriTranslator
 
     included do
-      ##
-      # :singleton-method:
-      #
+      mattr_accessor :belongs_to_required_by_default, instance_accessor: false
+
       # Accepts a logger conforming to the interface of Log4r which can be
       # retrieved on both a class and instance level by calling +logger+.
-      mattr_accessor :logger, instance_writer: false
-      mattr_accessor :belongs_to_required_by_default, instance_accessor: false
+      class_attribute :logger
+
+      # Use NullLogger as the default and all messages sent to it are retuned as nil
+      self.logger = ActiveFedora::NullLogger.new
+
+      # All instances default to the class-level logger
+      def logger
+        self.class.logger
+      end
     end
 
     # Constructor.  You may supply a custom +:id+, or we call the Fedora Rest API for the

data/lib/active_fedora/fedora.rb

@@ -23,11 +23,15 @@ module ActiveFedora
     end
 
     def host
-      @config[:url]
+      @config[:url].sub(/\/$/, BLANK)
     end
 
     def base_path
-      @config[:base_path] || '/'
+      @config[:base_path] || SLASH
+    end
+
+    def base_uri
+      host + base_path.sub(/\/$/, BLANK)
     end
 
     def user
@@ -86,7 +90,7 @@ module ActiveFedora
 
     def validate_options
       unless host.downcase.end_with?("/rest")
-        ActiveFedora::Base.logger.warn "Fedora URL (#{host}) does not end with /rest. This could be a problem. Check your fedora.yml config" if ActiveFedora::Base.logger
+        ActiveFedora::Base.logger.warn "Fedora URL (#{host}) does not end with /rest. This could be a problem. Check your fedora.yml config"
       end
     end
   end

data/lib/active_fedora/file.rb

@@ -31,6 +31,7 @@ module ActiveFedora
     # @yieldparam [File] self the newly created file
     def initialize(identifier = nil, &_block)
       identifier = identifier.delete(:id) if identifier.is_a? Hash
+      identifier = identifier.uri if identifier.respond_to? :uri
       run_callbacks(:initialize) do
         case identifier
         when nil, ::RDF::URI

data/lib/active_fedora/file_configurator.rb

@@ -99,7 +99,7 @@ module ActiveFedora
     def load_fedora_config
       return @fedora_config unless @fedora_config.empty?
       @fedora_config_path = config_path(:fedora)
-      ActiveFedora::Base.logger.info("ActiveFedora: loading fedora config from #{::File.expand_path(@fedora_config_path)}") if ActiveFedora::Base.logger
+      ActiveFedora::Base.logger.info("ActiveFedora: loading fedora config from #{::File.expand_path(@fedora_config_path)}")
 
       begin
         config_erb = ERB.new(IO.read(@fedora_config_path)).result(binding)
@@ -124,7 +124,7 @@ module ActiveFedora
       return @solr_config unless @solr_config.empty?
       @solr_config_path = config_path(:solr)
 
-      ActiveFedora::Base.logger.info "ActiveFedora: loading solr config from #{::File.expand_path(@solr_config_path)}" if ActiveFedora::Base.logger
+      ActiveFedora::Base.logger.info "ActiveFedora: loading solr config from #{::File.expand_path(@solr_config_path)}"
       begin
         config_erb = ERB.new(IO.read(@solr_config_path)).result(binding)
       rescue StandardError
@@ -188,7 +188,7 @@ module ActiveFedora
       # Last choice, check for the default config file
       config_path = ::File.join(ActiveFedora.root, "config", "#{config_type}.yml")
       if ::File.file? config_path
-        ActiveFedora::Base.logger.warn "Using the default #{config_type}.yml that comes with active-fedora.  If you want to override this, pass the path to #{config_type}.yml to ActiveFedora - ie. ActiveFedora.init(:#{config_type}_config_path => '/path/to/#{config_type}.yml') - or set Rails.root and put #{config_type}.yml into \#{Rails.root}/config." if ActiveFedora::Base.logger
+        ActiveFedora::Base.logger.warn "Using the default #{config_type}.yml that comes with active-fedora.  If you want to override this, pass the path to #{config_type}.yml to ActiveFedora - ie. ActiveFedora.init(:#{config_type}_config_path => '/path/to/#{config_type}.yml') - or set Rails.root and put #{config_type}.yml into \#{Rails.root}/config."
         return config_path
       else
         raise ConfigurationError, "Couldn't load #{config_type} config file!"

data/lib/active_fedora/indexing.rb

@@ -83,7 +83,7 @@ module ActiveFedora
         end
 
         def reindex_everything
-          descendants = descendant_uris(ActiveFedora::Base.id_to_uri(''))
+          descendants = descendant_uris(ActiveFedora.fedora.base_uri)
           descendants.shift # Discard the root uri
           descendants.each do |uri|
             logger.debug "Re-index everything ... #{uri}"

data/lib/active_fedora/initializing_connection.rb

@@ -54,7 +54,7 @@ module ActiveFedora
         return if @initialized
 
         connection.head(root_resource_path)
-        ActiveFedora::Base.logger.info "Attempted to init base path `#{root_resource_path}`, but it already exists" if ActiveFedora::Base.logger
+        ActiveFedora::Base.logger.info "Attempted to init base path `#{root_resource_path}`, but it already exists"
         @initialized = true
         false
       rescue Ldp::NotFound

data/lib/active_fedora/loadable_from_json.rb

@@ -176,7 +176,7 @@ module ActiveFedora
       def property_reflection(attribute_name)
         self.class.reflect_on_property(attribute_name)
       rescue ActiveTriples::UndefinedPropertyError
-        ActiveFedora::Base.logger.info "Undefined property #{attribute_name} reflected." if ActiveFedora::Base.logger
+        ActiveFedora::Base.logger.info "Undefined property #{attribute_name} reflected."
         nil
       end
 

data/lib/active_fedora/model_classifier.rb

@@ -60,7 +60,7 @@ module ActiveFedora
 
       def classify(model_value)
         unless class_exists?(model_value)
-          ActiveFedora::Base.logger.warn "'#{model_value}' is not a real class" if ActiveFedora::Base.logger
+          ActiveFedora::Base.logger.warn "'#{model_value}' is not a real class"
           return nil
         end
         ActiveFedora::ModelClassifier.class_from_string(model_value)

data/lib/active_fedora/null_logger.rb

@@ -0,0 +1,10 @@
+module ActiveFedora
+  class NullLogger < Logger
+    def initialize(*)
+    end
+
+    # allows all the usual logger method calls (warn, info, error, etc.)
+    def add(*)
+    end
+  end
+end

data/lib/active_fedora/orders/ordered_list.rb

@@ -174,7 +174,7 @@ module ActiveFedora
       def proxy_in
         proxies = to_a.map(&:proxy_in_id).compact.uniq
         if proxies.length > 1
-          ActiveFedora::Base.logger.warn "WARNING: List contains nodes aggregated under different URIs. Returning only the first." if ActiveFedora::Base.logger
+          ActiveFedora::Base.logger.warn "WARNING: List contains nodes aggregated under different URIs. Returning only the first."
         end
         proxies.first
       end

data/lib/active_fedora/relation/finder_methods.rb

@@ -130,7 +130,7 @@ module ActiveFedora
           begin
             yield(load_from_fedora(hit[ActiveFedora.id_field], cast))
           rescue Ldp::Gone
-            ActiveFedora::Base.logger.error "Although #{hit[ActiveFedora.id_field]} was found in Solr, it doesn't seem to exist in Fedora. The index is out of synch." if ActiveFedora::Base.logger
+            ActiveFedora::Base.logger.error "Although #{hit[ActiveFedora.id_field]} was found in Solr, it doesn't seem to exist in Fedora. The index is out of synch."
           end
         end
       end
@@ -240,11 +240,13 @@ module ActiveFedora
 
       # Returns a solr query for the supplied conditions
       # @param[Hash,String,Array] conditions solr conditions to match
+      # @return [String]
       def create_query(conditions)
         build_query(build_where(conditions))
       end
 
       # @param [Array<String>] conditions
+      # @return [String]
       def build_query(conditions)
         clauses = search_model_clause ? [search_model_clause] : []
         clauses += conditions.reject(&:blank?)

data/lib/active_fedora/solr_hit.rb

@@ -36,7 +36,7 @@ module ActiveFedora
 
     def model(opts = {})
       best_model_match = classifier.best_model(opts)
-      ActiveFedora::Base.logger.warn "Could not find a model for #{id}, defaulting to ActiveFedora::Base" if ActiveFedora::Base.logger && best_model_match == ActiveFedora::Base
+      ActiveFedora::Base.logger.warn "Could not find a model for #{id}, defaulting to ActiveFedora::Base" if best_model_match == ActiveFedora::Base
       best_model_match
     end
 

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "11.0.1".freeze
+  VERSION = "11.1.0".freeze
 end

data/lib/active_fedora/with_metadata/metadata_node.rb

@@ -10,6 +10,7 @@ module ActiveFedora
       # this class rather than being in the DefaultSchema.
       property :mime_type, predicate: ::RDF::Vocab::EBUCore.hasMimeType
 
+      # @param file [ActiveFedora::File]
       def initialize(file)
         @file = file
         super(file.uri, ldp_source.graph)
@@ -44,7 +45,7 @@ module ActiveFedora
 
       def save
         raise "Save the file first" if file.new_record?
-        SparqlInsert.new(changes_for_update, ::RDF::URI.new(file.uri)).execute(metadata_uri)
+        SparqlInsert.new(changes_for_update, file.uri).execute(metadata_uri)
         @ldp_source = nil
         true
       end

data/spec/integration/attached_files_spec.rb

@@ -46,7 +46,7 @@ describe ActiveFedora::AttachedFiles do
       Object.send(:remove_const, :DSTest)
     end
 
-    it { should == 'XXX' }
+    it { is_expected.to eq('XXX') }
 
     context "After updating" do
       before do

data/spec/integration/base_spec.rb

@@ -48,12 +48,12 @@ describe ActiveFedora::Base do
 
     describe "#errors" do
       subject { obj.errors }
-      it { should be_empty }
+      it { is_expected.to be_empty }
     end
 
     describe "#id" do
       subject { obj.id }
-      it { should_not be_nil }
+      it { is_expected.to_not be_nil }
     end
 
     context "when updated with changes after one second" do
@@ -71,12 +71,12 @@ describe ActiveFedora::Base do
 
     describe "#create_date" do
       subject { obj.create_date }
-      it { should_not be_nil }
+      it { is_expected.to_not be_nil }
     end
 
     describe "#modified_date" do
       subject { obj.modified_date }
-      it { should_not be_nil }
+      it { is_expected.to_not be_nil }
     end
 
     describe "delete" do
@@ -130,7 +130,7 @@ describe ActiveFedora::Base do
       expect(described_class.exists?(obj.id)).to be true
     end
     it "returns false for ids that don't exist" do
-      expect(described_class.exists?('test:missing_object')).to be false
+      expect(described_class.exists?('test_missing_object')).to be false
     end
     it "returns false for nil" do
       expect(described_class.exists?(nil)).to be false

data/spec/integration/file_spec.rb

@@ -84,7 +84,7 @@ describe ActiveFedora::File do
         allow_any_instance_of(SampleResource).to receive(:content_changed?).and_return(true)
       end
       subject { descMetadata.described_by }
-      it { should eq descMetadata.uri + '/fcr:metadata' }
+      it { is_expected.to eq descMetadata.uri + '/fcr:metadata' }
     end
   end
 
@@ -108,7 +108,7 @@ describe ActiveFedora::File do
 
     describe "the metadata file" do
       subject { descMetadata }
-      it { should be_a_kind_of(described_class) }
+      it { is_expected.to be_a_kind_of(described_class) }
     end
 
     context "a binary file" do
@@ -145,19 +145,19 @@ describe ActiveFedora::File do
           subject { str = ''; test_object.webm.stream(range).each { |chunk| str << chunk }; str }
           context "whole thing" do
             let(:range) { 'bytes=0-15' }
-            it { should eq 'one1two2threfour' }
+            it { is_expected.to eq 'one1two2threfour' }
           end
           context "open ended" do
             let(:range) { 'bytes=0-' }
-            it { should eq 'one1two2threfour' }
+            it { is_expected.to eq 'one1two2threfour' }
           end
           context "not starting at the beginning" do
             let(:range) { 'bytes=3-15' }
-            it { should eq '1two2threfour' }
+            it { is_expected.to eq '1two2threfour' }
           end
           context "not ending at the end" do
             let(:range) { 'bytes=4-11' }
-            it { should eq 'two2thre' }
+            it { is_expected.to eq 'two2thre' }
           end
         end
 
@@ -168,7 +168,7 @@ describe ActiveFedora::File do
             test_object.save!
           end
           subject { str = ''; test_object.redirector.stream.each { |chunk| str << chunk }; str }
-          it { should eq 'one1two2threfour' }
+          it { is_expected.to eq 'one1two2threfour' }
         end
 
         context "when there are more than 3 requests because of redirects" do

data/spec/integration/has_and_belongs_to_many_associations_spec.rb

@@ -171,14 +171,14 @@ describe ActiveFedora::Base do
 
       describe "#empty?" do
         subject { book.collections }
-        it { should_not be_empty }
+        it { is_expected.to_not be_empty }
       end
     end
 
     context "when a book isn't in a collection" do
       describe "#empty?" do
         subject { book.collections }
-        it { should be_empty }
+        it { is_expected.to be_empty }
       end
     end
   end

data/spec/integration/scoping_spec.rb

@@ -27,16 +27,16 @@ describe ActiveFedora::Scoping::Named do
   describe '#find' do
     describe "#find with a valid id without cast" do
       subject { ActiveFedora::Base.find(test_instance.id) }
-      it { should be_instance_of TestClass }
+      it { is_expected.to be_instance_of TestClass }
     end
     describe "#find with a valid id with cast of false" do
       subject { ActiveFedora::Base.find(test_instance.id, cast: false) }
-      it { should be_instance_of ActiveFedora::Base }
+      it { is_expected.to be_instance_of ActiveFedora::Base }
     end
 
     describe "#find with a valid id without cast on a model extending Base" do
       subject { TestClass.find(test_instance.id) }
-      it { should be_instance_of TestClass }
+      it { is_expected.to be_instance_of TestClass }
     end
   end
 end

data/spec/unit/base_spec.rb

@@ -165,11 +165,11 @@ describe ActiveFedora::Base do
     context "before saving" do
       context "#to_param" do
         subject { @test_object.to_param }
-        it { should be_nil }
+        it { is_expected.to be_nil }
       end
       context "#to_key" do
         subject { @test_object.to_key }
-        it { should be_nil }
+        it { is_expected.to be_nil }
       end
     end
 
@@ -181,12 +181,12 @@ describe ActiveFedora::Base do
 
       context "#to_param" do
         subject { @test_object.to_param }
-        it { should eq 'one/two/three' }
+        it { is_expected.to eq 'one/two/three' }
       end
 
       context "#to_key" do
         subject { @test_object.to_key }
-        it { should eq ['one/two/three'] }
+        it { is_expected.to eq ['one/two/three'] }
       end
     end
     ### end ActiveModel::Conversions
@@ -253,7 +253,7 @@ describe ActiveFedora::Base do
             end
 
             it "updates the resource" do
-              expect(test_object.resource.rdf_subject).to eq ::RDF::URI.new("#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/#{@this_id}")
+              expect(test_object.resource.rdf_subject).to eq ::RDF::URI.new("#{ActiveFedora.fedora.base_uri}/#{@this_id}")
               expect(test_object.title).to eq ['foo']
             end
           end

data/spec/unit/builder/has_and_belongs_to_many_spec.rb

@@ -3,6 +3,6 @@ require 'spec_helper'
 describe ActiveFedora::Associations::Builder::HasAndBelongsToMany do
   describe "valid_options" do
     subject { described_class.valid_options({}) }
-    it { should match_array [:class_name, :predicate, :type_validator, :before_add, :after_add, :before_remove, :after_remove, :inverse_of, :solr_page_size, :autosave] }
+    it { is_expected.to match_array [:class_name, :predicate, :type_validator, :before_add, :after_add, :before_remove, :after_remove, :inverse_of, :solr_page_size, :autosave] }
   end
 end

data/spec/unit/core/fedora_id_translator_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe ActiveFedora::Core::FedoraIdTranslator do
   describe ".call" do
     let(:result) { described_class.call(id) }
     context "when given an id" do
-      let(:good_uri) { ActiveFedora.fedora.host + ActiveFedora.fedora.base_path + "/banana" }
+      let(:good_uri) { ActiveFedora.fedora.base_uri + "/banana" }
       let(:id) { "banana" }
       it "returns a fedora URI" do
         expect(result).to eq good_uri
@@ -18,7 +18,7 @@ RSpec.describe ActiveFedora::Core::FedoraIdTranslator do
       end
 
       context "with characters that need escaping" do
-        let(:good_uri) { ActiveFedora.fedora.host + ActiveFedora.fedora.base_path + "/%5Bfrob%5D" }
+        let(:good_uri) { ActiveFedora.fedora.base_uri + "/%5Bfrob%5D" }
         let(:id) { "[frob]" }
         it "returns a good fedora URI" do
           expect(result).to eq good_uri

data/spec/unit/core/fedora_uri_translator_spec.rb

@@ -4,13 +4,13 @@ RSpec.describe ActiveFedora::Core::FedoraUriTranslator do
   describe ".call" do
     let(:result) { described_class.call(uri) }
     context "when given a Fedora URI" do
-      let(:uri) { ActiveFedora.fedora.host + ActiveFedora.fedora.base_path + "/6" }
+      let(:uri) { ActiveFedora.fedora.base_uri + "/6" }
       it "returns the id" do
         expect(result).to eq '6'
       end
     end
     context "when given a URI missing a slash" do
-      let(:uri) { ActiveFedora.fedora.host + ActiveFedora.fedora.base_path + "602-a" }
+      let(:uri) { ActiveFedora.fedora.base_uri + "602-a" }
       it "returns the id" do
         expect(result).to eq "602-a"
       end

data/spec/unit/core/logger_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe ActiveFedora::NullLogger do
+  before { ActiveFedora::Base.logger = described_class.new }
+  describe "::logger" do
+    let(:logger) { ActiveFedora::Base.logger }
+    it "when calling the logger" do
+      expect(logger.warn("warning!")).to be_nil
+    end
+  end
+
+  describe "#logger" do
+    let(:logger) { ActiveFedora::Base.new.logger }
+    it "when calling the logger" do
+      expect(logger.warn("warning!")).to be_nil
+    end
+  end
+end

data/spec/unit/core_spec.rb

@@ -109,7 +109,7 @@ describe ActiveFedora::Base do
     subject(:uri) { described_class.id_to_uri(id) }
 
     context "with no custom proc is set" do
-      it { should eq "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/123456w" }
+      it { is_expected.to eq "#{ActiveFedora.fedora.base_uri}/123456w" }
       it "justs call #translate_id_to_uri" do
         allow(described_class).to receive(:translate_id_to_uri).and_call_original
         allow(ActiveFedora::Core::FedoraIdTranslator).to receive(:call).and_call_original
@@ -122,11 +122,11 @@ describe ActiveFedora::Base do
 
     context "when custom proc is set" do
       before do
-        described_class.translate_id_to_uri = lambda { |id| "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/foo/#{id}" }
+        described_class.translate_id_to_uri = lambda { |id| "#{ActiveFedora.fedora.base_uri}/foo/#{id}" }
       end
       after { described_class.translate_id_to_uri = nil }
 
-      it { should eq "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/foo/123456w" }
+      it { is_expected.to eq "#{ActiveFedora.fedora.base_uri}/foo/123456w" }
     end
 
     context "with an empty base path" do
@@ -145,11 +145,11 @@ describe ActiveFedora::Base do
   end
 
   describe "uri_to_id" do
-    let(:uri) { "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/foo/123456w" }
+    let(:uri) { "#{ActiveFedora.fedora.base_uri}/foo/123456w" }
     subject(:uri_id) { described_class.uri_to_id(uri) }
 
     context "with no custom proc is set" do
-      it { should eq 'foo/123456w' }
+      it { is_expected.to eq 'foo/123456w' }
       it "justs call #translate_uri_to_id" do
         allow(described_class).to receive(:translate_uri_to_id).and_call_original
         allow(ActiveFedora::Core::FedoraUriTranslator).to receive(:call).and_call_original
@@ -166,7 +166,7 @@ describe ActiveFedora::Base do
       end
       after { described_class.translate_uri_to_id = nil }
 
-      it { should eq '123456w' }
+      it { is_expected.to eq '123456w' }
     end
   end
 

data/spec/unit/file_path_builder_spec.rb

@@ -5,14 +5,14 @@ describe ActiveFedora::FilePathBuilder do
     let(:parent) { ActiveFedora::Base.new(id: '1234') }
     subject { described_class.build(parent, nil, 'FOO') }
 
-    it { should eq 'FOO1' }
+    it { is_expected.to eq 'FOO1' }
 
     context "when some datastreams exist" do
       before do
         allow(parent).to receive(:attached_files).and_return('FOO56' => instance_double(ActiveFedora::File))
       end
 
-      it { should eq 'FOO57' }
+      it { is_expected.to eq 'FOO57' }
     end
   end
 end

data/spec/unit/file_spec.rb

@@ -51,14 +51,14 @@ describe ActiveFedora::File do
       context "and it's initialized with the URI" do
         let(:file) { described_class.new(parent.uri + "/FOO1") }
         it "works" do
-          expect(uri.to_s).to eq "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/1234/FOO1"
+          expect(uri.to_s).to eq "#{ActiveFedora.fedora.base_uri}/1234/FOO1"
         end
       end
 
       context "and it's initialized with an ID" do
         let(:file) { described_class.new(parent.id + "/FOO1") }
         it "works" do
-          expect(uri.to_s).to eq "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/1234/FOO1"
+          expect(uri.to_s).to eq "#{ActiveFedora.fedora.base_uri}/1234/FOO1"
         end
       end
     end
@@ -425,4 +425,36 @@ describe ActiveFedora::File do
       }
     end
   end
+
+  describe "#new" do
+    let(:file2) do
+      described_class.new do |file|
+        file.content = "My Content"
+        file.save!
+      end
+    end
+
+    context "when uri is passed to new" do
+      subject { described_class.new(file2.uri).content }
+
+      it { is_expected.to eq "My Content" }
+    end
+
+    context "when id is passed to new" do
+      subject { described_class.new(file2.id).content }
+
+      it { is_expected.to eq "My Content" }
+    end
+
+    context "when object responding to .uri is passed to new" do
+      subject { described_class.new(file2).content }
+      it { is_expected.to eq "My Content" }
+    end
+
+    context "when Array passed to new" do
+      it "raises an expection" do
+        expect { described_class.new([]) }.to raise_error
+      end
+    end
+  end
 end

data/spec/unit/indexing_spec.rb

@@ -29,12 +29,12 @@ describe ActiveFedora::Indexing do
 
     describe "#create_needs_index?" do
       subject { SpecNode.new.send(:create_needs_index?) }
-      it { should be true }
+      it { is_expected.to be true }
     end
 
     describe "#update_needs_index?" do
       subject { SpecNode.new.send(:update_needs_index?) }
-      it { should be true }
+      it { is_expected.to be true }
     end
   end
 

data/spec/unit/query_spec.rb

@@ -298,10 +298,10 @@ describe ActiveFedora::Base do
 
   describe "#load_from_fedora" do
     let(:relation) { ActiveFedora::Relation.new(described_class) }
-    before { @obj = SpecModel::Basic.create(id: "test:123") }
+    before { @obj = SpecModel::Basic.create(id: "test_123") }
     after { @obj.destroy }
     it "casts when klass == ActiveFedora::Base and cast argument is nil" do
-      expect(relation.send(:load_from_fedora, "test:123", nil)).to be_a SpecModel::Basic
+      expect(relation.send(:load_from_fedora, "test_123", nil)).to be_a SpecModel::Basic
     end
   end
 end

data/spec/unit/validations_spec.rb

@@ -22,7 +22,7 @@ describe ActiveFedora::Base do
       validation_stub.attributes = { fubar: ['here'], swank: 'long enough' }
     end
 
-    it { should be_valid }
+    it { is_expected.to be_valid }
   end
   describe "an invalid object" do
     before do
@@ -36,8 +36,8 @@ describe ActiveFedora::Base do
   end
 
   describe "required terms" do
-    it { should be_required(:fubar) }
-    it { should_not be_required(:swank) }
+    it { is_expected.to be_required(:fubar) }
+    it { is_expected.to_not be_required(:swank) }
   end
 
   describe "#save!" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 11.0.1
+  version: 11.1.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,28 +10,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: solrizer
   requirement: !ruby/object:Gem::Requirement
@@ -174,16 +174,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -288,14 +288,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.8.0
 description: ActiveFedora provides for creating and managing objects in the Fedora
   Repository Architecture.
 email:
@@ -436,6 +436,7 @@ files:
 - lib/active_fedora/log_subscriber.rb
 - lib/active_fedora/model_classifier.rb
 - lib/active_fedora/nested_attributes.rb
+- lib/active_fedora/null_logger.rb
 - lib/active_fedora/null_relation.rb
 - lib/active_fedora/orders.rb
 - lib/active_fedora/orders/collection_proxy.rb
@@ -604,6 +605,7 @@ files:
 - spec/unit/config_spec.rb
 - spec/unit/core/fedora_id_translator_spec.rb
 - spec/unit/core/fedora_uri_translator_spec.rb
+- spec/unit/core/logger_spec.rb
 - spec/unit/core_spec.rb
 - spec/unit/default_model_mapper_spec.rb
 - spec/unit/fedora_spec.rb
@@ -675,7 +677,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.