ddr-models 3.0.0.beta.16 → 3.0.0.beta.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e1ca66b83074e8dd2c014ce69a602ae357ac407
-  data.tar.gz: db35414bf84d7b875cff7968057bc307c8d3f1d7
+  metadata.gz: 5ada8e4f7256516690e6fc879f9c7a76ff85d254
+  data.tar.gz: f6de430ff6b09be6010d34456a1e5a4e5ee59f86
 SHA512:
-  metadata.gz: 0e359eb61c8ebe5622cee6b59029d8ae06d53b8df87316d46ec83ac712227e350158786fde911c44730bcdb4322070ffaabe3a02036558ebc1690046daa6fce1
-  data.tar.gz: 4696be8707a0ee9a9630691a53482b6ee6e87b3f7805b632c4059b62785bb05155035fe61de247c1a13cdd4bffd8e6666733ffbdc7ba01e2997bec50cabae688
+  metadata.gz: 95c1a3beb7903628cfabe5968fa3ac91b1101fbdb3ab0a35ab6a7a67b79bd394e28d91a6758983b4d44fdba83bcf168f6a3a027f3b3a9facc5e299c29b4c99ae
+  data.tar.gz: cc7cb67e7e46437ad4d1c7f48dfcd673de6673b3d37bd1edbdb3e6459df0c5d14d29d65bdb481b6f4afb0c43445297ebe6298298327fda9f11f86e9c4acd32fd

data/config/initializers/active_fedora_base.rb

@@ -17,7 +17,7 @@ ActiveFedora::Base.class_eval do
     end
 
     def can_have_content?
-      datastreams.key? "content"
+      attached_files.key? "content"
     end
 
     def has_content?
@@ -38,7 +38,7 @@ ActiveFedora::Base.class_eval do
     end
 
     def can_have_struct_metadata?
-      datastreams.key? Ddr::Models::File::STRUCT_METADATA
+      attached_files.key? Ddr::Models::File::STRUCT_METADATA
     end
 
     def has_struct_metadata?
@@ -52,9 +52,9 @@ ActiveFedora::Base.class_eval do
     def has_multires_image?
       can_have_multires_image? && multires_image_file_path.present?
     end
-    
+
     def can_have_thumbnail?
-      datastreams.key? "thumbnail"
+      attached_files.key? "thumbnail"
     end
 
     def has_thumbnail?

data/ddr-models.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency "devise", "~> 3.4"
   s.add_dependency "omniauth-shibboleth", "~> 1.2.0"
   s.add_dependency "grouper-rest-client"
-  s.add_dependency "ezid-client", "~> 1.4.1"
+  s.add_dependency "ezid-client", "~> 1.4.2"
   s.add_dependency "resque", "~> 1.25"
   s.add_dependency "rdf-vocab", "~> 0.8"
   s.add_dependency "net-ldap", "~> 0.11"

data/lib/ddr/models/file.rb

@@ -45,9 +45,9 @@ module Ddr::Models
                               content_digest(algorithm)
                             end
       if checksum_value == calculated_checksum
-        "The checksum #{algorithm}:#{checksum_value} is valid for file #{dsid}."
+        "The checksum #{algorithm}:#{checksum_value} is valid for file #{::File.basename(id)}."
       else
-        raise ChecksumInvalid, "The checksum #{algorithm}:#{checksum_value} is not valid for file #{dsid}."
+        raise ChecksumInvalid, "The checksum #{algorithm}:#{checksum_value} is not valid for file #{::File.basename(id)}."
       end
     end
 

data/lib/ddr/models/has_struct_metadata.rb

@@ -10,8 +10,8 @@ module Ddr
 
       def structure
         unless @structure
-          if datastreams[Ddr::Models::File::STRUCT_METADATA].content
-            @structure = Ddr::Models::Structure.new(Nokogiri::XML(datastreams[Ddr::Models::File::STRUCT_METADATA].content))
+          if attached_files[Ddr::Models::File::STRUCT_METADATA].content
+            @structure = Ddr::Models::Structure.new(Nokogiri::XML(attached_files[Ddr::Models::File::STRUCT_METADATA].content))
           end
         end
         @structure

data/lib/ddr/models/solr_document.rb

@@ -53,7 +53,7 @@ module Ddr::Models
     end
 
     def access_roles
-      get(Ddr::Index::Fields::ACCESS_ROLE)
+      fetch(Ddr::Index::Fields::ACCESS_ROLE)
     end
 
     def object_profile
@@ -90,7 +90,7 @@ module Ddr::Models
     end
 
     def has_datastream?(dsID)
-      datastreams.key?(dsID) && datastreams[dsID]["size"].present?
+      attached_files.key?(dsID) && attached_files[dsID]["size"].present?
     end
 
     def has_admin_policy?

data/lib/ddr/models/struct_div.rb

@@ -23,7 +23,7 @@ module Ddr
       end
 
       def docs
-        query = ActiveFedora::SolrService.construct_query_for_pids(pids)
+        query = ActiveFedora::SolrQueryBuilder.construct_query_for_ids(pids)
         results = ActiveFedora::SolrService.query(query, rows: 999999)
         results.each_with_object({}) do |r, memo|
           memo[r["id"]] = ::SolrDocument.new(r)
@@ -60,4 +60,4 @@ module Ddr
 
     end
   end
-end
+end

data/lib/ddr/models/structure.rb

@@ -25,6 +25,10 @@ module Ddr
         xpath("//xmlns:structMap[@TYPE='#{type}']").first
       end
 
+      def fptr_nodes(type='default')
+        structMap_node(type).xpath('//xmlns:fptr')
+      end
+
       def as_xml_document
         __getobj__
       end
@@ -57,4 +61,4 @@ module Ddr
 
     end
   end
-end
+end

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "3.0.0.beta.16"
+    VERSION = "3.0.0.beta.17"
   end
 end

data/spec/auth/ability_spec.rb

@@ -19,7 +19,7 @@ module Ddr::Auth
 
       DatastreamAbilityDefinitions::DATASTREAM_DOWNLOAD_ABILITIES.each do |dsid, permission|
         describe "\"#{dsid}\"" do
-          let(:ds) { obj.datastreams[dsid] }
+          let(:ds) { obj.attached_files[dsid] }
           describe "can #{permission.inspect} object" do
             before { subject.can permission, obj.id }
             it { should be_able_to(:download, ds) }
@@ -31,10 +31,10 @@ module Ddr::Auth
         end
       end
 
-      describe "non-downloadable datastreams" do
+      describe "non-downloadable attached_files" do
         (Component.ds_specs.keys.map(&:to_s) - DatastreamAbilityDefinitions::DATASTREAM_DOWNLOAD_ABILITIES.keys).each do |dsid|
           describe "\"#{dsid}\"" do
-            let(:ds) { obj.datastreams[dsid] }
+            let(:ds) { obj.attached_files[dsid] }
             before { subject.can :download, obj.id }
             it { should_not be_able_to(:download, ds) }
           end

data/spec/managers/derivatives_manager_spec.rb

@@ -93,10 +93,10 @@ module Ddr
         describe "thumbnail" do
           let(:object) { ContentBearing.create }
           it "should create content in the thumbnail datastream" do
-            expect(object.datastreams[Ddr::Models::File::THUMBNAIL]).to_not be_present
+            expect(object.attached_files[Ddr::Models::File::THUMBNAIL]).to_not be_present
             object.derivatives.generate_derivative Ddr::Derivatives::DERIVATIVES[:thumbnail]
-            expect(object.datastreams[Ddr::Models::File::THUMBNAIL]).to be_present
-            expect(object.datastreams[Ddr::Models::File::THUMBNAIL].size).to be > 0
+            expect(object.attached_files[Ddr::Models::File::THUMBNAIL]).to be_present
+            expect(object.attached_files[Ddr::Models::File::THUMBNAIL].size).to be > 0
           end
         end
         describe "ptif" do

data/spec/models/active_fedora_base_spec.rb

@@ -55,7 +55,7 @@ RSpec.describe ActiveFedora::Base do
   describe "children", children: true do
     before do
       class Childrenable < ActiveFedora::Base
-        has_many :children, property: :is_member_of, class_name: 'ActiveFedora::Base'
+        has_many :children, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOf, class_name: 'ActiveFedora::Base'
       end
     end
     after do
@@ -95,7 +95,7 @@ RSpec.describe ActiveFedora::Base do
     end
     describe "#has_thumbnail?" do
       let(:thumbnailable) { Thumbnailable.new }
-      before { allow(thumbnailable.datastreams[Ddr::Models::File::THUMBNAIL]).to receive(:has_content?).and_return(true) }
+      before { allow(thumbnailable.attached_files[Ddr::Models::File::THUMBNAIL]).to receive(:has_content?).and_return(true) }
       it "should return true if object has a thumbnail, else false" do
         expect(thumbnailable).to have_thumbnail
         expect(Thumbnailable.new).not_to have_thumbnail
@@ -121,7 +121,7 @@ RSpec.describe ActiveFedora::Base do
     end
     describe "#has_content?" do
       let(:contentable) { Contentable.new }
-      before { allow(contentable.datastreams[Ddr::Models::File::CONTENT]).to receive(:has_content?).and_return(true) }
+      before { allow(contentable.attached_files[Ddr::Models::File::CONTENT]).to receive(:has_content?).and_return(true) }
       it "should return true if object has content, else false" do
         expect(contentable).to have_content
         expect(Contentable.new).not_to have_content

data/spec/models/has_struct_metadata_spec.rb

@@ -13,7 +13,7 @@ module Ddr
           end
         end
         context "existing structural metadata" do
-          before { item.datastreams[Ddr::Models::File::STRUCT_METADATA].content = simple_structure }
+          before { item.attached_files[Ddr::Models::File::STRUCT_METADATA].content = simple_structure }
           it "should return the structural metadata" do
             expect(item.structure.to_xml).to be_equivalent_to(simple_structure)
           end
@@ -35,7 +35,7 @@ module Ddr
 
       describe "indexing" do
         let(:expected_json) { multiple_struct_maps_structure_to_json }
-        before { item.datastreams[Ddr::Models::File::STRUCT_METADATA].content = multiple_struct_maps_structure }
+        before { item.attached_files[Ddr::Models::File::STRUCT_METADATA].content = multiple_struct_maps_structure }
         it "should index the JSON representation of the structure" do
           indexing = item.to_solr
           expect(indexing.keys).to include(Ddr::Index::Fields::STRUCT_MAPS)

data/spec/models/structure_spec.rb

@@ -111,6 +111,16 @@ module Ddr
         end
       end
 
+      describe "#fptr_nodes" do
+        let(:structure) { FactoryGirl.build(:nested_structure) }
+        it "should return all fptr nodes" do
+          results = structure.fptr_nodes
+          expect(results.size).to eq(3)
+          ids = results.map { |entry| entry['CONTENTIDS'] }
+          expect(ids).to match_array([ 'test_5', 'test_6', 'test_7' ])
+        end
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.16
+  version: 3.0.0.beta.17
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement