active-fedora 11.1.5 → 11.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b127c21e13c24e017a536d3babf9e442bd1ae4eb
-  data.tar.gz: c75ce470aac8faf4a8b729f624f0ee8062997610
+  metadata.gz: a4288e97d72b9829adfa9892a3013ddc587624bc
+  data.tar.gz: 78a3834e826d71206fae523c8c70c48538bc3f0c
 SHA512:
-  metadata.gz: ae7951d53fb1f44bdd749e953c12e53c3984f9161fe8988ae6c92bd3ccc8ef0505fb2c27764f46c88a880d5ed5af7e9019aa4d52e1d68747ac36db58fc05640d
-  data.tar.gz: 5a664cea927d252abe59a7993b9ba3ea63ad5e89e360cfea72f1281722c965062a9a08ab8340b3d0fd301278c053a6f6b57b17ac1028de9f24e093f5dec8a75e
+  metadata.gz: 2b0fbfc067535245ae40b410fcc8641b4a042c84c2d07ae248225cb2998ed2dc4728d2dcfef81f8cb5540771c2afd7578bdb5c8584e9e438ee4725bb9289c610
+  data.tar.gz: 3111010745fb585c75009fd10e7d221e6339c588fa907374966186641135d5f21114b10680cccd0844a7de1b89f57ca3da35ef0ed605a8bb81e924afbe6f42b1

data/.rubocop.yml

@@ -106,7 +106,6 @@ Style/AndOr:
 Style/AccessorMethodName:
   Exclude:
     - 'lib/active_fedora/with_metadata/metadata_node.rb'
-    - 'lib/active_fedora/predicates.rb'
     - 'lib/active_fedora/fedora_attributes.rb'
     - 'lib/active_fedora/attribute_methods/dirty.rb'
     - 'lib/active_fedora/associations/has_many_association.rb'
@@ -207,7 +206,6 @@ Style/ClassVars:
     - 'spec/unit/finder_methods_spec.rb'
     - 'spec/unit/base_spec.rb'
     - 'spec/integration/indexing_spec.rb'
-    - 'lib/active_fedora/predicates.rb'
     - 'lib/active_fedora/identifiable.rb'
 
 Style/SignalException:

data/README.md

@@ -81,7 +81,7 @@ solr_wrapper
 To start FCRepo, open another shell and run:
 
 ```bash
-fcrepo_wrapper -p 8984
+fcrepo_wrapper -p 8986
 ```
 
 Now you’re ready to run the tests. In the directory where active\_fedora

data/lib/active_fedora/aggregation/list_source.rb

@@ -80,7 +80,7 @@ module ActiveFedora
           # Set node subjects to a term in AF JUST so that AF will persist the
           # sub-graphs.
           # TODO: Find a way to fix this.
-          self.nodes = nil
+          resource.set_value(:nodes, [])
           self.nodes += graph.subjects.to_a
           ordered_self.changes_committed!
         end

data/lib/active_fedora/attributes/property_builder.rb

@@ -16,7 +16,7 @@ module ActiveFedora::Attributes
       mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
         def #{name}=(value)
           if value.present? && !value.respond_to?(:each)
-            raise ArgumentError, "You attempted to set the property `#{name}' to a scalar value. However, this property is declared as being multivalued."
+            raise ArgumentError, "You attempted to set the property `#{name}' of \#{id} to a scalar value. However, this property is declared as being multivalued."
           end
           set_value(:#{name}, value)
         end
@@ -28,7 +28,7 @@ module ActiveFedora::Attributes
         def #{name}(*args)
           vals = get_values(:#{name})
           return nil unless vals
-          raise ActiveFedora::ConstraintError, "Expected \\"#{name}\\" to have 0-1 statements, but there are \#{vals.size}" if vals.size > 1
+          raise ActiveFedora::ConstraintError, "Expected \\"#{name}\\" of \#{id} to have 0-1 statements, but there are \#{vals.size}" if vals.size > 1
           vals.first
         end
       CODE
@@ -46,7 +46,7 @@ module ActiveFedora::Attributes
       mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
         def #{name}=(value)
           if value.respond_to?(:each) # singular
-            raise ArgumentError, "You attempted to set the property `#{name}' to an enumerable value. However, this property is declared as singular."
+            raise ArgumentError, "You attempted to set the property `#{name}' of \#{id} to an enumerable value. However, this property is declared as singular."
           end
           set_value(:#{name}, value)
         end

data/lib/active_fedora/inheritance.rb

@@ -12,7 +12,7 @@ module ActiveFedora
       # If B < A and C < B and if A is an abstract_class then both B.base_class
       # and C.base_class would return B as the answer since A is an abstract_class.
       def base_class
-        return File if self == File || superclass == File
+        return File if self <= File
 
         unless self <= Base
           raise ActiveFedoraError, "#{name} doesn't belong in a hierarchy descending from ActiveFedora"

data/lib/active_fedora/rake_support.rb

@@ -12,7 +12,7 @@ def with_server(environment)
   # setting port: nil assigns a random port.
   solr_defaults = { port: nil, verbose: true, managed: true }
   fcrepo_defaults = { port: nil, verbose: true, managed: true,
-                      enable_jms: false, fcrepo_home_dir: "fcrepo4-#{environment}-data" }
+                      enable_jms: false, fcrepo_home_dir: "tmp/fcrepo4-#{environment}-data" }
 
   SolrWrapper.wrap(load_config(:solr, environment, solr_defaults)) do |solr|
     ENV["SOLR_#{environment.upcase}_PORT"] = solr.port.to_s

data/lib/active_fedora/relation/finder_methods.rb

@@ -189,7 +189,8 @@ module ActiveFedora
     protected
 
       def load_from_fedora(id, cast)
-        raise ActiveFedora::ObjectNotFoundError if id.empty?
+        raise ActiveFedora::ObjectNotFoundError, "No ID provided for #{klass.name}." if id.empty?
+
         resource = ActiveFedora.fedora.ldp_resource_service.build(klass, id)
         raise_record_not_found_exception!(id) if resource.new?
         class_to_load(resource, cast).allocate.init_with_resource(resource) # Triggers the find callback

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "11.1.5".freeze
+  VERSION = "11.1.6".freeze
 end

data/spec/unit/attributes_spec.rb

@@ -16,7 +16,7 @@ describe ActiveFedora::Base do
     end
 
     subject(:history) { obj }
-    let(:obj) { BarHistory4.new(title: ['test1']) }
+    let(:obj) { BarHistory4.new(title: ['test1'], id: 'test:123') }
 
     describe "#attribute_names" do
       context "on an instance" do
@@ -34,15 +34,7 @@ describe ActiveFedora::Base do
 
     describe "#inspect" do
       it "shows the attributes" do
-        expect(history.inspect).to eq "#<BarHistory4 id: nil, title: [\"test1\"], abstract: nil>"
-      end
-
-      describe "with a id" do
-        before { allow(history).to receive(:id).and_return('test:123') }
-
-        it "shows a id" do
-          expect(history.inspect).to eq "#<BarHistory4 id: \"test:123\", title: [\"test1\"], abstract: nil>"
-        end
+        expect(history.inspect).to eq "#<BarHistory4 id: \"test:123\", title: [\"test1\"], abstract: nil>"
       end
 
       describe "with no attributes" do
@@ -98,7 +90,7 @@ describe ActiveFedora::Base do
               history.resource[:abstract] = ['foo', 'bar']
             end
             it "raises an error if just returning the first value would cause data loss" do
-              expect { history[:abstract] }.to raise_error ActiveFedora::ConstraintError, "Expected \"abstract\" to have 0-1 statements, but there are 2"
+              expect { history[:abstract] }.to raise_error ActiveFedora::ConstraintError, "Expected \"abstract\" of test:123 to have 0-1 statements, but there are 2"
             end
           end
         end
@@ -144,7 +136,7 @@ describe ActiveFedora::Base do
       it "does not allow an enumerable to a unique attribute writer" do
         expect { history.abstract = "Low" }.not_to raise_error
         expect { history.abstract = ["Low"]
-        }.to raise_error ArgumentError, "You attempted to set the property `abstract' to an enumerable value. However, this property is declared as singular."
+        }.to raise_error ArgumentError, "You attempted to set the property `abstract' of test:123 to an enumerable value. However, this property is declared as singular."
         expect { history.abstract = nil }.not_to raise_error
       end
     end

data/spec/unit/inheritance_spec.rb

@@ -8,6 +8,9 @@ describe ActiveFedora::Base do
     class MySample < ActiveFedora::File
     end
 
+    class MyDeepSample < MySample
+    end
+
     class Foo < ActiveFedora::Base
       has_subresource 'foostream', class_name: 'MyDS'
       has_subresource 'dcstream', class_name: 'MySample'
@@ -16,6 +19,9 @@ describe ActiveFedora::Base do
     class Bar < ActiveFedora::Base
       has_subresource 'barstream', class_name: 'MyDS'
     end
+
+    class Baz < Bar
+    end
   end
 
   subject(:attached_files) { f.attached_files }
@@ -25,10 +31,30 @@ describe ActiveFedora::Base do
     expect(attached_files.values).to match_array [MyDS, MySample]
   end
 
+  context 'base_class' do
+    it 'shallow < Base' do
+      expect(Bar.base_class).to eq(Bar)
+    end
+
+    it 'deep < Base' do
+      expect(Baz.base_class).to eq(Bar)
+    end
+
+    it 'shallow < File' do
+      expect(MySample.base_class).to eq(ActiveFedora::File)
+    end
+
+    it 'deep < File' do
+      expect(MyDeepSample.base_class).to eq(ActiveFedora::File)
+    end
+  end
+
   after do
+    Object.send(:remove_const, :Baz)
     Object.send(:remove_const, :Bar)
     Object.send(:remove_const, :Foo)
     Object.send(:remove_const, :MyDS)
+    Object.send(:remove_const, :MyDeepSample)
     Object.send(:remove_const, :MySample)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 11.1.5
+  version: 11.1.6
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -684,7 +684,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.