active-fedora 9.2.0 → 9.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d06c266076a65780ab8db396bf9940d5c2350be2
-  data.tar.gz: dc1ce79ba0ef5591a8fa580a77e70caa2785bbc5
+  metadata.gz: 912cef8852fb193d0e8c55b2996b060608b04426
+  data.tar.gz: a9b6e0994fbd8edefb197a93ca5031a3bd439f9f
 SHA512:
-  metadata.gz: 54d49974e1ac5efc17a321e51455d0778e2712055acec83bd1efbf424f8c9302d98e8d4186d8cb1fb095d225e1a5075ac9549f0172fd13669423e170d0d6eb11
-  data.tar.gz: 89731055f7e3b7f50873d26e9905926a4bd86f2da837a5e2903f017a52099750857de5a2ec3692641febc648023d3eb0299bd6281ff35f604276ba517702e952
+  metadata.gz: 0a8e668c4d8ce320ada6b10a9104a61ced5901802f24f9aeca5fbd5381ddb30573ef270dbbc0e42c9c0b0f51bd70df8d108deb285e34e15ce229abe644d48edd
+  data.tar.gz: 5a9bb242cf7d205c5f853457f4d458afdbfdf0862f041610ffc2705c9e2e32c04ca7c0fb32cf0730be078f3e4da22a3de37efe55137b0ba2673898822fe513b6

data/.travis.yml

@@ -3,19 +3,17 @@ cache: bundler
 sudo: false
 rvm:
   - 2.2.1
-
 gemfile:
   - gemfiles/rails4.1.gemfile
   - gemfiles/rails4.2.gemfile
-
 matrix:
   include:
     - rvm: 2.1
       gemfile: gemfiles/rails4.2.gemfile
-
 notifications:
   irc: "irc.freenode.org#projecthydra"
-
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+before_script:
+  - jdk_switcher use oraclejdk8

data/History.txt

@@ -1,3 +1,15 @@
+v9.2.1
+  2015-07-20: Don't delete objects not part of the association. [Trey Terrell]
+
+  2015-07-19: Improve handling of imperfect profile_json when loading instances
+  from Solr. [Olli Lyytinen]
+
+  2015-07-16: ChangeSet shouldn't record other subjects. [Trey Terrell]
+
+  2015-07-15: Update unit test style [Mike Giarlo]
+
+  2015-07-09: Relation should respond to enumerable methods [Justin Coyne]
+
 v9.2.0
   2015-07-08: Add comments to FedoraAttributes [ci skip] [Justin Coyne]
 

data/lib/active_fedora/associations/collection_association.rb

@@ -354,7 +354,7 @@ module ActiveFedora
         end
 
         def delete_or_destroy(records, method)
-          records = records.flatten
+          records = records.flatten.select{|x| load_target.include?(x)}
           records.each { |record| raise_on_type_mismatch(record) }
           existing_records = records.select { |r| r.persisted? }
 

data/lib/active_fedora/change_set.rb

@@ -22,14 +22,14 @@ module ActiveFedora
       @changes ||= changed_attributes.each_with_object({}) do |key, result|
         if object.respond_to?(:association) && object.association(key.to_sym).present?
           predicate = object.association(key.to_sym).reflection.predicate
-          result[predicate] = graph.query(predicate: predicate)
+          result[predicate] = graph.query(subject: object.rdf_subject, predicate: predicate)
         elsif object.class.properties.keys.include?(key)
           predicate = graph.reflections.reflect_on_property(key).predicate
-          result[predicate] = graph.query(predicate: predicate)
+          result[predicate] = graph.query(subject: object.rdf_subject, predicate: predicate)
         elsif key == 'type'.freeze
           # working around https://github.com/ActiveTriples/ActiveTriples/issues/122
           predicate = ::RDF.type
-          result[predicate] = graph.query(predicate: predicate)
+          result[predicate] = graph.query(subject: object.rdf_subject, predicate: predicate)
         elsif object.local_attributes.include?(key)
           raise "Unable to find a graph predicate corresponding to the attribute: \"#{key}\""
         end

data/lib/active_fedora/loadable_from_json.rb

@@ -117,7 +117,7 @@ module ActiveFedora
         attached_files[key] = SolrBackedMetadataFile.new
       end
       @resource = SolrBackedResource.new(self.class)
-      self.attributes = attrs.slice(*self.class.attribute_names)
+      self.attributes = adapt_attributes(attrs)
       # TODO Should we clear the change tracking, or make this object Read-only?
 
       run_callbacks :find
@@ -126,5 +126,38 @@ module ActiveFedora
       self
     end
 
+    private
+
+      # Adapt attributes read from Solr to possible minor changes in data model
+      # since the attributes were saved.
+      # @param attrs [Hash] attributes read from Solr
+      # @return [Hash] the adapted attributes
+      def adapt_attributes(attrs)
+        self.class.attribute_names.each_with_object({}) do |attribute_name, new_attributes|
+          new_attributes[attribute_name] = adapt_attribute_value(attrs, attribute_name)
+        end
+      end
+
+      # Adapts a single attribute value from the given attributes hash to match
+      # minor changes in the data model.
+      # @param attrs [Hash] attributes read from Solr
+      # @param attribute_name [String] the name of the attribute to adapt
+      # @return [Object] the adapted value
+      def adapt_attribute_value(attrs, attribute_name)
+        reflection = self.class.reflect_on_property(attribute_name)
+        if !reflection
+          return attrs[attribute_name] # if this isn't a property, copy value verbatim
+        else
+          multiple = reflection.multiple?
+          if !attrs.key?(attribute_name)
+            # value is missing in attrs, add [] or nil
+            return multiple ? [] : nil
+          else
+            # convert an existing scalar to an array if needed
+            return multiple ? Array(attrs[attribute_name]) : attrs[attribute_name]
+          end
+        end
+      end
+
   end
 end

data/lib/active_fedora/relation.rb

@@ -1,6 +1,7 @@
 module ActiveFedora
   class Relation
 
+    include Enumerable
     include FinderMethods, Calculations, SpawnMethods, QueryMethods, Delegation
 
 

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.2.0"
+  VERSION = "9.2.1"
 end

data/spec/integration/collection_association_spec.rb

@@ -42,6 +42,22 @@ describe ActiveFedora::Base do
     end
   end
 
+  describe "#delete" do
+    context "when given items not in collection" do
+      it "should return an empty set" do
+        expect(library.books.delete(Book.new)).to eq []
+      end
+      it "should not act on it" do
+        b = Book.new
+        allow(b).to receive(:persisted?).and_return(true)
+
+        library.books.delete(b)
+
+        expect(b).not_to have_received(:persisted?)
+      end
+    end
+  end
+
   describe "#destroy_all" do
     it "should delete em" do
       expect {

data/spec/integration/relation_spec.rb

@@ -17,10 +17,14 @@ describe ActiveFedora::Base do
 
   subject { Library.all }
 
-  it "should be a relation" do
+  it "is a relation" do
     expect(subject.class).to be ActiveFedora::Relation
   end
 
+  it "is enumerable" do
+    expect(subject).to respond_to(:each_with_index)
+  end
+
   context "when some records exist" do
     before do
       Library.create

data/spec/integration/solr_instance_loader_spec.rb

@@ -87,12 +87,37 @@ describe ActiveFedora::SolrInstanceLoader do
     end
   end
 
-  context "when the model has extra values in its json" do
-    let(:profile) { { "foo"=>["baz"], "bar"=>"quix", "title"=>"My Title", "extra_value"=>"Bonus values!"}.to_json }
+  context "when the model has imperfect json" do
     let(:doc) { { 'id' => 'test-123', 'has_model_ssim'=>['Foo'], 'object_profile_ssm' => profile } }
     let(:loader) { ActiveFedora::SolrInstanceLoader.new(Foo, obj.id, doc) }
-    it "should load the object without trouble" do
-      expect(loader.object).to be_instance_of Foo
+    context "when the json has extra values in it" do
+      let(:profile) { { "foo"=>["baz"], "bar"=>"quix", "title"=>"My Title", "extra_value"=>"Bonus values!"}.to_json }
+      it "should load the object without trouble" do
+        expect(loader.object).to be_instance_of Foo
+      end
+    end
+
+    context "when the json is missing values" do
+      let(:profile) { { "foo"=>["baz"], "bar"=>"quix" }.to_json }
+      it "should load the object without trouble" do
+        expect(loader.object).to be_instance_of Foo
+      end
+      it "missing scalar should be nil" do
+        expect(loader.object.title).to be_nil
+      end
+      it "missing multi-value should be []" do
+        expect(loader.object.description).to eql( [] )
+      end
+    end
+
+    context "when the json has scalar where multi-value is expected" do
+      let(:profile) { { "foo"=>["baz"], "bar"=>"quix", "description"=>"test description" }.to_json }
+      it "should load the object without trouble" do
+        expect(loader.object).to be_instance_of Foo
+      end
+      it "should convert the scalar to an array" do
+        expect(loader.object.description).to eql( ["test description"] )
+      end
     end
   end
 end

data/spec/unit/change_set_spec.rb

@@ -41,6 +41,11 @@ describe ActiveFedora::ChangeSet do
       it "should have three elements" do
         expect(subject.size).to eq 3
       end
+      it "should not include URIs from other objects" do
+        base.resource << RDF::Statement.new(RDF::URI("http://wrong.com"), RDF::DC.title, "bad")
+        base.title = nil
+        expect(subject[RDF::DC.title].to_a).to eq []
+      end
     end
 
     it { is_expected.to_not be_empty }

data/spec/unit/file_spec.rb

@@ -1,39 +1,48 @@
 require 'spec_helper'
 
-describe ActiveFedora::Datastream do
-  let(:datastream) { ActiveFedora::Datastream.new }
+describe ActiveFedora::File do
+  let(:file) { described_class.new }
 
-  subject { datastream }
+  subject { file }
 
-  it { should_not be_metadata }
+  it { is_expected.not_to be_metadata }
 
   describe "#behaves_like_io?" do
-    subject { datastream.send(:behaves_like_io?, object) }
+    subject { file.send(:behaves_like_io?, object) }
 
     context "with a File" do
       let(:object) { File.new __FILE__ }
-      it { should be true }
+      it { is_expected.to be true }
     end
 
     context "with a Tempfile" do
       after { object.close; object.unlink }
       let(:object) { Tempfile.new('foo') }
-      it { should be true }
+      it { is_expected.to be true }
     end
 
     context "with a StringIO" do
       let(:object) { StringIO.new('foo') }
-      it { should be true }
+      it { is_expected.to be true }
     end
   end
 
   describe "#uri" do
-    let(:parent) { ActiveFedora::Base.new(id: '1234') }
-    before { allow(Deprecation).to receive(:warn) }
-    subject { ActiveFedora::Datastream.new(parent, 'FOO1') }
 
-    it "should set the uri" do
-      expect(subject.uri).to eq "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/1234/FOO1"
+    subject { file.uri }
+
+    context "when the file is in an ldp:BasicContainer" do
+      let(:parent) { ActiveFedora::Base.new(id: '1234') }
+      before { allow(Deprecation).to receive(:warn) }
+      let(:file) { described_class.new(parent, 'FOO1') }
+
+      it "sets the uri using the parent as the base" do
+        expect(subject).to eq "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/1234/FOO1"
+      end
+    end
+
+    context "when the file doesn't have a uri" do
+      it { is_expected.to eq ::RDF::URI(nil) }
     end
   end
 
@@ -64,7 +73,7 @@ describe ActiveFedora::Datastream do
     end
 
     describe '#persisted_size' do
-      it 'should load the datastream size attribute from the fedora repository' do
+      it 'should load the file size attribute from the fedora repository' do
         expect(subject.size).to eq 9999
       end
 
@@ -152,25 +161,25 @@ describe ActiveFedora::Datastream do
     end
   end
 
-  context "when the datastream has local content" do
+  context "when the file has local content" do
 
     before do
-      datastream.uri = "http://localhost:8983/fedora/rest/test/1234/abcd"
-      datastream.content = "hi there"
+      file.uri = "http://localhost:8983/fedora/rest/test/1234/abcd"
+      file.content = "hi there"
     end
 
     describe "#inspect" do
-      subject { datastream.inspect }
-      it { should eq "#<ActiveFedora::Datastream uri=\"http://localhost:8983/fedora/rest/test/1234/abcd\" >" }
+      subject { file.inspect }
+      it { is_expected.to eq "#<ActiveFedora::File uri=\"http://localhost:8983/fedora/rest/test/1234/abcd\" >" }
     end
   end
 
   context "original_name" do
-    subject { datastream.original_name }
+    subject { file.original_name }
 
-    context "on a new datastream" do
+    context "on a new file" do
       context "that has a name set locally" do
-        before { datastream.original_name = "my_image.png" }
+        before { file.original_name = "my_image.png" }
         it { is_expected.to eq "my_image.png" }
       end
 
@@ -204,10 +213,10 @@ describe ActiveFedora::Datastream do
   end
 
   context "digest" do
-    subject { datastream.digest }
+    subject { file.digest }
 
-    context "on a new datastream" do
-      it { should be_empty }
+    context "on a new file" do
+      it { is_expected.to be_empty }
     end
 
     context "when it's saved" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.2.0
+  version: 9.2.1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -603,7 +603,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.