hydra-works 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f59d9e4057f3221480712f84c8c1eca414d64c1
-  data.tar.gz: 9aaa3a1afbcb5e27e5998822959d988f34d01101
+  metadata.gz: 5ebd42d5d4c7bf8bdd3b2dab8dfce732125c35ed
+  data.tar.gz: 3bd2bc2c16daac53f092b7435218906b3f0fcb6d
 SHA512:
-  metadata.gz: 539c2c4c03e59c2e4d1ee667ad087bf0aa28551b7862acf32df477d42a137e03f1024b7f94fad1bb1fc12bbab6a82338f443b568762470c0f092c8d6c86934bf
-  data.tar.gz: 43ae1663d7070c525b6be37a1cb03ded81c4a7fa135ecb243d8fe639806414325ff4401c5d5fcde35415a153479daa7a3c6185b55281328dc705ad6f4fe32b42
+  metadata.gz: b2eda186b0a5c27a5c6901e6f9be86079f47076035d485b01d6cebb31df724dc23ba3da8cd39296b66273796df2278e85f0cb222e2a25673bd9e2edf9f47f456
+  data.tar.gz: b29ccf5e084c04bc7e51dda1e1c236a03a52f1a65de0f9cbc69894d72b449259e0d723239e55c079279cc32d1598f26553e9a3e2d06a969e8c70e9d51ec578a2

data/lib/hydra/works/characterization/schema/document_schema.rb

@@ -1,9 +1,9 @@
 module Hydra::Works::Characterization
   class DocumentSchema < ActiveTriples::Schema
-    property :file_title, predicate: RDF::DC11.title
-    property :file_author, predicate: RDF::DC11.creator
+    property :file_title, predicate: RDF::Vocab::DC11.title
+    property :file_author, predicate: RDF::Vocab::DC11.creator
     property :page_count, predicate: RDF::Vocab::NFO.pageCount
-    property :file_language, predicate: RDF::DC11.language
+    property :file_language, predicate: RDF::Vocab::DC11.language
     property :word_count, predicate: RDF::Vocab::NFO.wordCount
     property :character_count, predicate: RDF::Vocab::NFO.characterCount
     property :line_count, predicate: RDF::Vocab::NFO.lineCount

data/lib/hydra/works/models/concerns/collection_behavior.rb

@@ -65,35 +65,5 @@ module Hydra::Works
 
     alias_method :works_generic_file?, :file_set?
     deprecation_deprecate :works_generic_file?
-
-    def parents
-      Deprecation.warn CollectionBehavior, '`parents` is deprecated in Hydra::Works.  Please use `member_of` instead.  This has a target date for removal of 10-31-2015'
-      member_of
-    end
-
-    def parent_collections
-      Deprecation.warn CollectionBehavior, '`parent_collections` is deprecated in Hydra::Works.  Please use `in_collections` instead.  This has a target date for removal of 10-31-2015'
-      in_collections
-    end
-
-    def child_collections
-      Deprecation.warn CollectionBehavior, '`child_collections` is deprecated in Hydra::Works.  Please use `collections` instead.  This has a target date for removal of 10-31-2015'
-      collections
-    end
-
-    def child_collection_ids
-      Deprecation.warn CollectionBehavior, '`child_collection_ids` is deprecated in Hydra::Works.  Please use `collection_ids` instead.  This has a target date for removal of 10-31-2015'
-      collection_ids
-    end
-
-    def child_generic_works
-      Deprecation.warn CollectionBehavior, '`child_generic_works` is deprecated in Hydra::Works.  Please use `works` instead.  This has a target date for removal of 10-31-2015'
-      works
-    end
-
-    def child_generic_work_ids
-      Deprecation.warn CollectionBehavior, '`child_generic_work_ids` is deprecated in Hydra::Works.  Please use `work_ids` instead.  This has a target date for removal of 10-31-2015'
-      work_ids
-    end
   end
 end

data/lib/hydra/works/models/concerns/file_set/virus_check.rb

@@ -12,7 +12,7 @@ module Hydra::Works
 
       path = original_file.is_a?(String) ? original_file : local_path_for_file(original_file)
       unless defined?(ClamAV)
-        warn "Virus checking disabled, #{path} not checked"
+        warning "Virus checking disabled, #{path} not checked"
         return
       end
 
@@ -21,7 +21,7 @@ module Hydra::Works
         true
       else
         virus_message = "A virus was found in #{path}: #{scan_result}"
-        warn(virus_message)
+        warning(virus_message)
         errors.add(:base, virus_message)
         false
       end
@@ -29,6 +29,10 @@ module Hydra::Works
 
     private
 
+      def warning(msg)
+        ActiveFedora::Base.logger.warn msg if ActiveFedora::Base.logger
+      end
+
       # Returns a path for reading the content of +file+
       # @param [File] file object to retrieve a path for
       def local_path_for_file(file)

data/lib/hydra/works/models/concerns/file_set_behavior.rb

@@ -47,21 +47,11 @@ module Hydra::Works
     alias_method :works_generic_file?, :file_set?
     deprecation_deprecate :works_generic_file?
 
-    def parents
-      Deprecation.warn GenericFileBehavior, '`parents` is deprecated in Hydra::Works.  Please use `member_of` instead.  This has a target date for removal of 10-31-2015'
-      member_of
-    end
-
     def in_works
       ordered_by.select { |parent| parent.class.included_modules.include?(Hydra::Works::WorkBehavior) }.to_a
     end
 
     alias_method :in_generic_works, :in_works
     deprecation_deprecate :in_generic_works
-
-    def generic_works
-      Deprecation.warn GenericFileBehavior, '`generic_works` is deprecated in Hydra::Works.  Please use `in_works` instead.  This has a target date for removal of 10-31-2015'
-      in_works
-    end
   end
 end

data/lib/hydra/works/models/concerns/work_behavior.rb

@@ -83,36 +83,11 @@ module Hydra::Works
     alias_method :works_generic_file?, :file_set?
     deprecation_deprecate :works_generic_file?
 
-    def parents
-      Deprecation.warn WorkBehavior, '`parents` is deprecated in Hydra::Works.  Please use `member_of` instead.  This has a target date for removal of 10-31-2015'
-      member_of
-    end
-
     def in_works
       ordered_by.select { |parent| parent.class.included_modules.include?(Hydra::Works::WorkBehavior) }.to_a
     end
 
     alias_method :in_generic_works, :in_works
     deprecation_deprecate :in_generic_works
-
-    def parent_generic_works
-      Deprecation.warn WorkBehavior, '`parent_generic_works` is deprecated in Hydra::Works.  Please use `in_works` instead.  This has a target date for removal of 10-31-2015'
-      in_works
-    end
-
-    def parent_collections
-      Deprecation.warn WorkBehavior, '`parent_collections` is deprecated in Hydra::Works.  Please use `in_collections` instead.  This has a target date for removal of 10-31-2015'
-      in_collections
-    end
-
-    def child_generic_works
-      Deprecation.warn WorkBehavior, '`child_generic_works` is deprecated in Hydra::Works.  Please use `ordered_works` instead.  This has a target date for removal of 10-31-2015'
-      ordered_works
-    end
-
-    def child_generic_work_ids
-      Deprecation.warn WorkBehavior, '`child_generic_work_ids` is deprecated in Hydra::Works.  Please use `ordered_work_ids` instead.  This has a target date for removal of 10-31-2015'
-      ordered_work_ids
-    end
   end
 end

data/lib/hydra/works/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Works
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

data/spec/hydra/works/models/collection_spec.rb

@@ -249,20 +249,4 @@ describe Hydra::Works::Collection do
       expect(collection2.in_collections).to eq [collection1]
     end
   end
-
-  describe 'make sure deprecated methods still work' do
-    it 'deprecated methods should pass' do
-      Deprecation.silence(Hydra::Works::CollectionBehavior) do
-        collection1.ordered_members << collection2
-        collection1.ordered_members << generic_work1
-        expect(collection1.child_collections).to eq [collection2]
-        expect(collection1.child_collection_ids).to eq [collection2.id]
-        expect(collection1.child_generic_works).to eq [generic_work1]
-        expect(collection1.child_generic_work_ids).to eq [generic_work1.id]
-        collection1.save # required until issue AF-Agg-75 is fixed
-        expect(collection2.parent_collections).to eq [collection1]
-        expect(collection2.parents).to eq [collection1]
-      end
-    end
-  end
 end

data/spec/hydra/works/models/generic_file_spec.rb

@@ -220,18 +220,4 @@ describe Hydra::Works::FileSet do
       expect(generic_file1.in_works).to eq [generic_work1]
     end
   end
-
-  describe 'make sure deprecated methods still work' do
-    let(:generic_work1) { Hydra::Works::GenericWork.create }
-    before do
-      generic_work1.ordered_members << generic_file1
-      generic_work1.save # required until issue AF-Agg-75 is fixed
-    end
-    it 'deprecated methods should pass' do
-      Deprecation.silence(Hydra::Works::GenericFileBehavior) do
-        expect(generic_file1.generic_works).to eq [generic_work1]
-        expect(generic_file1.parents).to eq [generic_work1]
-      end
-    end
-  end
 end

data/spec/hydra/works/models/generic_work_spec.rb

@@ -374,21 +374,4 @@ describe Hydra::Works::GenericWork do
       expect(generic_work2.in_works).to eq [generic_work1]
     end
   end
-
-  describe 'make sure deprecated methods still work' do
-    let(:collection1) { Hydra::Works::Collection.new }
-    it 'deprecated methods should pass' do
-      Deprecation.silence(Hydra::Works::WorkBehavior) do
-        collection1.ordered_members << generic_work1
-        generic_work1.ordered_members << generic_work2
-        expect(generic_work1.child_generic_works).to eq [generic_work2]
-        expect(generic_work1.child_generic_work_ids).to eq [generic_work2.id]
-        generic_work1.save # required until issue AF-Agg-75 is fixed
-        collection1.save
-        expect(generic_work2.parent_generic_works).to eq [generic_work1]
-        expect(generic_work1.parent_collections).to eq [collection1]
-        expect(generic_work2.parents).to eq [generic_work1]
-      end
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-works
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-pcdm