active-fedora 9.2.0.rc2 → 9.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bada647c029b7bff0f7068d8226fe256996f091a
-  data.tar.gz: 1c240deeaff193cdca424a8ec0d9c01ab2aefd13
+  metadata.gz: d06c266076a65780ab8db396bf9940d5c2350be2
+  data.tar.gz: dc1ce79ba0ef5591a8fa580a77e70caa2785bbc5
 SHA512:
-  metadata.gz: e402d06c32089846dc47542963fccdcf38e512e10c203fb27220e6a7df1e770c805a9aa8435f50729abec853fea9fc83263c20ae885530132236a96cd9024376
-  data.tar.gz: ef787677ed7601618bdf0c989f2298fff0bf43da788a01f5ac94031f296e1f7e1ee2bb8bf0c3b436a37c30d4e169cce19474520529a1957179a33610510c8cf3
+  metadata.gz: 54d49974e1ac5efc17a321e51455d0778e2712055acec83bd1efbf424f8c9302d98e8d4186d8cb1fb095d225e1a5075ac9549f0172fd13669423e170d0d6eb11
+  data.tar.gz: 89731055f7e3b7f50873d26e9905926a4bd86f2da837a5e2903f017a52099750857de5a2ec3692641febc648023d3eb0299bd6281ff35f604276ba517702e952

data/History.txt

@@ -1,3 +1,9 @@
+v9.2.0
+  2015-07-08: Add comments to FedoraAttributes [ci skip] [Justin Coyne]
+
+  2015-07-01: Remove has_many_versions This no longer does anything meaninful, so
+  it has been removed to prevent confusion. [Justin Coyne]
+
 v9.2.0.rc2
   2015-06-30: Allow the FixityService to accept an RDF::URI [Justin Coyne]
 

data/lib/active_fedora/fedora_attributes.rb

@@ -6,6 +6,8 @@ module ActiveFedora
     included do
       include ActiveTriples::Properties
       include ActiveTriples::Reflection
+
+      # get_values() is called by ActiveTriples in the PropertyBuilder
       delegate :rdf_subject, :get_values, :type, to: :resource
 
       property :has_model, predicate: ActiveFedora::RDF::Fcrepo::Model.hasModel

data/lib/active_fedora/version.rb

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

data/lib/active_fedora/versionable.rb

@@ -1,6 +1,7 @@
 module ActiveFedora
   module Versionable
     extend ActiveSupport::Concern
+    extend Deprecation
 
     included do
       class_attribute :versionable
@@ -8,7 +9,8 @@ module ActiveFedora
 
     module ClassMethods
       def has_many_versions
-        self.versionable = true
+        Deprecation.warn Versionable, "has_many_versions is deprecated and will be removed in ActiveFedora 11."
+        # self.versionable = true
       end
     end
 
@@ -26,7 +28,7 @@ module ActiveFedora
       if reload
         @versions = ActiveFedora::VersionsGraph.new << ::RDF::Reader.for(:ttl).new(versions_request)
       else
-        @versions ||= ActiveFedora::VersionsGraph.new << ::RDF::Reader.for(:ttl).new(versions_request)     
+        @versions ||= ActiveFedora::VersionsGraph.new << ::RDF::Reader.for(:ttl).new(versions_request)
       end
     end
 
@@ -36,10 +38,9 @@ module ActiveFedora
       resp.success?
     end
 
-    # This method does not rely on the internal versionable flag of the object, instead
-    # it queries Fedora directly to figure out if there are versions for the resource.
+    # Queries Fedora to figure out if there are versions for the resource.
     def has_versions?
-      ActiveFedora.fedora.connection.head(versions_uri) 
+      ActiveFedora.fedora.connection.head(versions_uri)
       true
     rescue Ldp::NotFound
       false

data/spec/integration/directly_contains_one_association_spec.rb

@@ -5,22 +5,21 @@ describe ActiveFedora::Base do
     class PageImage < ActiveFedora::Base
       directly_contains :files, has_member_relation: ::RDF::URI.new("http://example.com/hasFiles"), class_name:"FileWithMetadata"
       directly_contains_one :primary_file, through: :files, type: ::RDF::URI.new("http://example.com/primaryFile"), class_name:"FileWithMetadata"
-      directly_contains_one :special_versioned_file, through: :files, type: ::RDF::URI.new("http://example.com/featuredFile"), class_name:'VersionedFileWithMetadata'
+      directly_contains_one :alternative_file, through: :files, type: ::RDF::URI.new("http://example.com/featuredFile"), class_name:'AlternativeFileWithMetadata'
     end
 
     class FileWithMetadata < ActiveFedora::File
       include ActiveFedora::WithMetadata
     end
-    class VersionedFileWithMetadata < ActiveFedora::File
+    class AlternativeFileWithMetadata < ActiveFedora::File
       include ActiveFedora::WithMetadata
-      has_many_versions
     end
   end
 
   after do
     Object.send(:remove_const, :PageImage)
     Object.send(:remove_const, :FileWithMetadata)
-    Object.send(:remove_const, :VersionedFileWithMetadata)
+    Object.send(:remove_const, :AlternativeFileWithMetadata)
   end
 
   let(:page_image)              { PageImage.create }
@@ -28,7 +27,7 @@ describe ActiveFedora::Base do
 
   let(:a_file)                  { page_image.files.build }
   let(:primary_file)            { page_image.build_primary_file }
-  let(:special_versioned_file)  { page_image.build_special_versioned_file }
+  let(:alternative_file)        { page_image.build_alternative_file }
   let(:primary_sub_image)       { page_image.build_primary_sub_image }
 
 
@@ -70,13 +69,13 @@ describe ActiveFedora::Base do
     context "if class_name is set" do
       before do
         a_file.content = "I'm a file"
-        special_versioned_file.content = "I am too"
+        alternative_file.content = "I am too"
         page_image.save!
       end
-      subject { reloaded_page_image.special_versioned_file }
+      subject { reloaded_page_image.alternative_file }
       it "uses the specified class to load objects" do
-        expect(subject).to eq special_versioned_file
-        expect(subject).to be_instance_of VersionedFileWithMetadata
+        expect(subject).to eq alternative_file
+        expect(subject).to be_instance_of AlternativeFileWithMetadata
       end
     end
   end

data/spec/integration/versionable_spec.rb

@@ -1,9 +1,21 @@
 require 'spec_helper'
 
+describe "deprecated behavior" do
+  it "has a warning" do
+    expect(Deprecation).to receive(:warn)
+    class WithVersions < ActiveFedora::Base
+      has_many_versions
+    end
+  end
+
+  after do
+    Object.send(:remove_const, :WithVersions)
+  end
+end
+
 describe "a versionable class" do
   before do
     class WithVersions < ActiveFedora::Base
-      has_many_versions
       property :title, predicate: ::RDF::DC.title
     end
   end
@@ -16,8 +28,6 @@ describe "a versionable class" do
 
   let(:current_year) { DateTime.now.year.to_s }
 
-  it { is_expected.to be_versionable }
-
   describe 'sorting versions' do
     before do
       allow(subject).to receive(:fedora_versions) { versions }
@@ -116,15 +126,14 @@ describe "a versionable class" do
   end
 end
 
-describe "a versionable rdf datastream" do
+describe "a versionable rdf file" do
   before(:all) do
     class VersionableDatastream < ActiveFedora::NtriplesRDFDatastream
-      has_many_versions
       property :title, predicate: ::RDF::DC.title
     end
 
     class MockAFBase < ActiveFedora::Base
-      has_metadata "descMetadata", type: VersionableDatastream, autocreate: true
+      contains "descMetadata", class_name: 'VersionableDatastream', autocreate: true
     end
   end
 
@@ -144,11 +153,7 @@ describe "a versionable rdf datastream" do
   context "that exists in the repository" do
     let(:test_object) { MockAFBase.create }
 
-    it "should be versionable" do
-      expect(subject).to be_versionable
-    end
-
-    context "before creating the datastream" do
+    context "before creating the file" do
       it "should not have versions" do
         expect(subject.versions).to be_empty
       end
@@ -157,7 +162,7 @@ describe "a versionable rdf datastream" do
       end
     end
 
-    context "after creating the datastream" do
+    context "after creating the file" do
       before do
         subject.title = "Greetings Earthlings"
         subject.save
@@ -215,11 +220,11 @@ describe "a versionable rdf datastream" do
             expect(subject.versions.all.size).to eq 2
           end
 
-          it "should load the restored datastream's content" do
+          it "should load the restored file's content" do
             expect(subject.title).to eql(["Greetings Earthlings"])
           end
 
-          it "should be the same size as the original datastream" do
+          it "should be the same size as the original file" do
             expect(subject.size).to eq @original_size
           end
 
@@ -249,10 +254,9 @@ describe "a versionable rdf datastream" do
   end
 end
 
-describe "a versionable OM datastream" do
+describe "a versionable OM file" do
   before(:all) do
     class VersionableDatastream < ActiveFedora::OmDatastream
-      has_many_versions
       set_terminology do |t|
         t.root(path: "foo")
         t.title
@@ -260,7 +264,7 @@ describe "a versionable OM datastream" do
     end
 
     class MockAFBase < ActiveFedora::Base
-      has_metadata "descMetadata", type: VersionableDatastream, autocreate: true
+      contains "descMetadata", class_name: 'VersionableDatastream', autocreate: true
     end
   end
 
@@ -276,11 +280,7 @@ describe "a versionable OM datastream" do
   context "that exists in the repository" do
     let(:test_object) { MockAFBase.create }
 
-    it "should be versionable" do
-      expect(subject).to be_versionable
-    end
-
-    context "before creating the datastream" do
+    context "before creating the file" do
       it "should not have versions" do
         expect(subject.versions).to be_empty
       end
@@ -289,7 +289,7 @@ describe "a versionable OM datastream" do
       end
     end
 
-    context "after creating the datastream" do
+    context "after creating the file" do
       before do
         subject.title = "Greetings Earthlings"
         subject.save
@@ -349,11 +349,11 @@ describe "a versionable OM datastream" do
             expect(subject.versions.all.size).to eq 2
           end
 
-          it "should load the restored datastream's content" do
+          it "should load the restored file's content" do
             expect(subject.title).to eql(["Greetings Earthlings"])
           end
 
-          it "should be the same size as the original datastream" do
+          it "should be the same size as the original file" do
             expect(subject.size).to eq @original_size
           end
 
@@ -383,14 +383,13 @@ describe "a versionable OM datastream" do
   end
 end
 
-describe "a versionable binary datastream" do
+describe "a versionable binary file" do
   before(:all) do
     class BinaryDatastream < ActiveFedora::File
-      has_many_versions
     end
 
     class MockAFBase < ActiveFedora::Base
-      has_file_datastream "content", type: BinaryDatastream, autocreate: true
+      contains "content", class_name: 'BinaryDatastream', autocreate: true
     end
   end
 
@@ -406,17 +405,13 @@ describe "a versionable binary datastream" do
   context "that exists in the repository" do
     let(:test_object) { MockAFBase.create }
 
-    it "should be versionable" do
-      expect(subject).to be_versionable
-    end
-
-    context "before creating the datastream" do
+    context "before creating the file" do
       it "should not have versions" do
         expect(subject.versions).to be_empty
       end
     end
 
-    context "after creating the datastream" do
+    context "after creating the file" do
       let(:first_file) { File.new(File.join( File.dirname(__FILE__), "../fixtures/dino.jpg" )) }
       let(:first_name) { "dino.jpg" }
       before do
@@ -484,11 +479,11 @@ describe "a versionable binary datastream" do
             expect(subject.versions.all.size).to eq 2
           end
 
-          it "should load the restored datastream's content" do
+          it "should load the restored file's content" do
             expect(subject.content.size).to eq first_file.size
           end
 
-          it "should load the restored datastream's original name" do
+          it "should load the restored file's original name" do
             expect(subject.original_name).to eql(first_name)
           end
 
@@ -517,19 +512,18 @@ describe "a versionable binary datastream" do
   end
 end
 
-describe "a non-versionable resource" do
-  before(:all) do
-    class NotVersionableWithVersions < ActiveFedora::Base
-      # explicitly don't call has_many_versions
+describe "an ActiveFedora::Base" do
+  before do
+    class TestBase < ActiveFedora::Base
       property :title, predicate: ::RDF::DC.title
     end
   end
 
-  after(:all) do
-    Object.send(:remove_const, :NotVersionableWithVersions)
+  after do
+    Object.send(:remove_const, :TestBase)
   end
 
-  subject { NotVersionableWithVersions.new }
+  subject { TestBase.new }
 
   context "saved with no versions" do
     it "should not have versions" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.2.0.rc2
+  version: 9.2.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -598,9 +598,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8