hydra-works 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ebd42d5d4c7bf8bdd3b2dab8dfce732125c35ed
-  data.tar.gz: 3bd2bc2c16daac53f092b7435218906b3f0fcb6d
+  metadata.gz: dccbd98c61c1d4f18a6638c637c52adb8414c39b
+  data.tar.gz: 898863dcf45f52862fddebd401c31d31a7384ee2
 SHA512:
-  metadata.gz: b2eda186b0a5c27a5c6901e6f9be86079f47076035d485b01d6cebb31df724dc23ba3da8cd39296b66273796df2278e85f0cb222e2a25673bd9e2edf9f47f456
-  data.tar.gz: b29ccf5e084c04bc7e51dda1e1c236a03a52f1a65de0f9cbc69894d72b449259e0d723239e55c079279cc32d1598f26553e9a3e2d06a969e8c70e9d51ec578a2
+  metadata.gz: 5b895ae5c78efa14c537173445f3d8b70304e4ff5462912839ffae55bb96162c867066b15c55d0315cd7de2146da6bcf911f27c3a7b2502fd0228a05bf532d80
+  data.tar.gz: 526f699b440f37454b043a1e8127c93e42ff31a404ec9c487f0eeb15471feeda07abaf02aea2382e063360a25c06962a9d3bef79bc61107573ac6d8b74717838

data/hydra-works.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['justin@curationexperts.com']
   spec.summary       = %q{Fundamental repository data model for hydra}
   spec.description   = %q{Using this data model should enable easy collaboration amongst hydra projects.}
-  spec.homepage      = ''
+  spec.homepage      = 'https://github.com/projecthydra-labs/hydra-works'
   spec.license       = 'APACHE2'
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/hydra/works.rb

@@ -28,22 +28,17 @@ module Hydra
       autoload :Collection
       autoload :FileSet
       autoload :GenericWork
-      autoload :GenericFile # Deprecated. Remove in 0.4.0
     end
 
     autoload_under 'models/concerns' do
       autoload :CollectionBehavior
       autoload :FileSetBehavior
-      autoload :GenericWorkBehavior # Deprecated. Remove in 0.4.0
-      autoload :GenericFileBehavior # Deprecated. Remove in 0.4.0
       autoload :WorkBehavior
     end
 
     autoload_under 'services' do
       autoload :AddFileToFileSet
-      autoload :AddFileToGenericFile # Deprecated. Remove in 0.4.0
       autoload :UploadFileToFileSet
-      autoload :UploadFileToGenericFile # Deprecated. Remove in 0.4.0
       autoload :PersistDerivative
       autoload :CharacterizationService
     end

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

@@ -15,15 +15,10 @@ module Hydra::Works
   #   9) Hydra::Works::Collection can have access metadata
   module CollectionBehavior
     extend ActiveSupport::Concern
-    extend Deprecation
-    self.deprecation_horizon = "Hydra::Works 0.4.0"
     include Hydra::PCDM::CollectionBehavior
 
     included do
       type [Hydra::PCDM::Vocab::PCDMTerms.Collection, Vocab::WorksTerms.Collection]
-
-      alias_method :generic_works, :works
-      deprecation_deprecate :generic_works
     end
 
     def ordered_works
@@ -47,23 +42,14 @@ module Hydra::Works
       true
     end
 
-    alias_method :works_collection?, :collection?
-    deprecation_deprecate :works_collection?
-
     # @return [Boolean] whether this instance is a Hydra::Works Generic Work.
     def work?
       false
     end
 
-    alias_method :works_generic_work?, :work?
-    deprecation_deprecate :works_generic_work?
-
     # @return [Boolean] whether this instance is a Hydra::Works::FileSet.
     def file_set?
       false
     end
-
-    alias_method :works_generic_file?, :file_set?
-    deprecation_deprecate :works_generic_file?
   end
 end

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

@@ -10,8 +10,6 @@ module Hydra::Works
   #   6) Hydra::Works::FileSet can have access metadata
   module FileSetBehavior
     extend ActiveSupport::Concern
-    extend Deprecation
-    self.deprecation_horizon = "Hydra::Works 0.4.0"
     include Hydra::PCDM::ObjectBehavior
 
     included do
@@ -28,30 +26,18 @@ module Hydra::Works
       false
     end
 
-    alias_method :works_collection?, :collection?
-    deprecation_deprecate :works_collection?
-
     # @return [Boolean] whether this instance is a Hydra::Works Generic Work.
     def work?
       false
     end
 
-    alias_method :works_generic_work?, :work?
-    deprecation_deprecate :works_generic_work?
-
     # @return [Boolean] whether this instance is a Hydra::Works::FileSet.
     def file_set?
       true
     end
 
-    alias_method :works_generic_file?, :file_set?
-    deprecation_deprecate :works_generic_file?
-
     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
   end
 end

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

@@ -14,17 +14,10 @@ module Hydra::Works
   #   10) Hydra::Works::Work can have access metadata
   module WorkBehavior
     extend ActiveSupport::Concern
-    extend Deprecation
-    self.deprecation_horizon = "Hydra::Works 0.4.0"
     include Hydra::PCDM::ObjectBehavior
 
     included do
       type [Hydra::PCDM::Vocab::PCDMTerms.Object, Vocab::WorksTerms.Work]
-
-      alias_method :generic_works, :ordered_works
-      deprecation_deprecate :generic_works
-
-      alias_method :generic_files, :ordered_file_sets
     end
 
     def works
@@ -64,30 +57,18 @@ module Hydra::Works
       false
     end
 
-    alias_method :works_collection?, :collection?
-    deprecation_deprecate :works_collection?
-
     # @return [Boolean] whether this instance is a Hydra::Works Generic Work.
     def work?
       true
     end
 
-    alias_method :works_generic_work?, :work?
-    deprecation_deprecate :works_generic_work?
-
     # @return [Boolean] whether this instance is a Hydra::Works::FileSet.
     def file_set?
       false
     end
 
-    alias_method :works_generic_file?, :file_set?
-    deprecation_deprecate :works_generic_file?
-
     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
   end
 end

data/lib/hydra/works/models/generic_work.rb

@@ -5,16 +5,5 @@ module Hydra::Works
   #  include Hydra::Works::WorkBehavior
   class GenericWork < ActiveFedora::Base
     include Hydra::Works::WorkBehavior
-
-    # @deprecated Base class for creating objects that behave like Hydra::Works::GenericWorks
-    class Base < ActiveFedora::Base
-      extend Deprecation
-      after_initialize :deprecated_warning
-      include Hydra::Works::WorkBehavior
-
-      def deprecated_warning
-        Deprecation.warn(Base, "GenericWork is deprecated and will be removed in Hydra::Works 0.4.0. Use Hydra::Works::GenericWork instead")
-      end
-    end
   end
 end

data/lib/hydra/works/services/upload_file_to_file_set.rb

@@ -1,22 +1,22 @@
 module Hydra::Works
   class UploadFileToFileSet
-    # Sets a file as the primary file (original_file) of the generic_file
-    # @param [Hydra::PCDM::FileSet] generic_file the file will be added to
+    # Sets a file as the primary file (original_file) of the file_set
+    # @param [Hydra::PCDM::FileSet] file_set the file will be added to
     # @param [IO,File,Rack::Multipart::UploadedFile, #read] object that will be the contents. If file responds to :mime_type or :original_name, those will be called to provide technical metadata.
-    # @param [Array] additional_services (ie Generating Thumbnails) to call with generic_file after adding the file as its original_file
-    # @param [Boolean] update_existing whether to update an existing file if there is one. When set to true, performs a create_or_update. When set to false, always creates a new file within generic_file.files.
+    # @param [Array] additional_services (ie Generating Thumbnails) to call with file_set after adding the file as its original_file
+    # @param [Boolean] update_existing whether to update an existing file if there is one. When set to true, performs a create_or_update. When set to false, always creates a new file within file_set.files.
     # @param [Boolean] versioning whether to create new version entries (only applicable if +type+ corresponds to a versionable file)
 
-    def self.call(generic_file, file, additional_services: [], update_existing: true, versioning: true)
-      Hydra::Works::AddFileToFileSet.call(generic_file, file, :original_file, update_existing: update_existing, versioning: versioning)
+    def self.call(file_set, file, additional_services: [], update_existing: true, versioning: true)
+      Hydra::Works::AddFileToFileSet.call(file_set, file, :original_file, update_existing: update_existing, versioning: versioning)
 
       # Call any additional services
       additional_services.each do |service|
-        service.call(generic_file)
+        service.call(file_set)
       end
 
-      generic_file.save
-      generic_file
+      file_set.save
+      file_set
     end
   end
 end

data/lib/hydra/works/version.rb

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

data/lib/tasks/hydra-works_tasks.rake

@@ -38,17 +38,26 @@ namespace :hydra_works do
       )
 
     desc 'Configure jetty with full-text indexing'
-    task config: :download_jars do
+    task config: [:generate_config, :download_jars] do
       Rake::Task['jetty:config'].invoke
     end
 
-    desc 'Download Solr full-text extraction jars'
-    task :download_jars do
-      puts "Copying new solrconfig.xml"
+    desc 'Generate a Solr config with full-text extraction'
+    task :generate_config do
+      puts "Generating a solrconfig.xml configured for full-text extraction"
       source = File.join(File.dirname(__FILE__), '..', '..', 'config', 'solrconfig.xml')
       dest = File.join('solr_conf','conf')
       FileUtils.mkdir_p(dest) unless File.directory?(dest)
-      cp source, dest
+      dest_file = File.join(dest, 'solrconfig.xml')
+      if File.exist?(dest_file)
+        puts "Skipping. #{dest_file} already exists."
+      else
+        cp source, dest
+      end
+    end
+
+    desc 'Download Solr full-text extraction jars'
+    task :download_jars do
       puts "Downloading full-text jars from maven.org ..."
       fulltext_dir = 'jetty/solr/lib/contrib/extraction/lib'
       FileUtils.mkdir_p(fulltext_dir) unless File.directory?(fulltext_dir)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-works
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-pcdm
@@ -212,19 +212,14 @@ files:
 - lib/hydra/works/models/concerns/file_set/versioned_content.rb
 - lib/hydra/works/models/concerns/file_set/virus_check.rb
 - lib/hydra/works/models/concerns/file_set_behavior.rb
-- lib/hydra/works/models/concerns/generic_file_behavior.rb
-- lib/hydra/works/models/concerns/generic_work_behavior.rb
 - lib/hydra/works/models/concerns/work_behavior.rb
 - lib/hydra/works/models/file_set.rb
-- lib/hydra/works/models/generic_file.rb
 - lib/hydra/works/models/generic_work.rb
 - lib/hydra/works/models/work.rb
 - lib/hydra/works/services/add_file_to_file_set.rb
-- lib/hydra/works/services/add_file_to_generic_file.rb
 - lib/hydra/works/services/characterization_service.rb
 - lib/hydra/works/services/persist_derivative.rb
 - lib/hydra/works/services/upload_file_to_file_set.rb
-- lib/hydra/works/services/upload_file_to_generic_file.rb
 - lib/hydra/works/version.rb
 - lib/hydra/works/vocab/works_terms.rb
 - lib/tasks/hydra-works_tasks.rake
@@ -255,7 +250,7 @@ files:
 - spec/hydra/works/models/concerns/file_set/versioned_content_spec.rb
 - spec/hydra/works/models/concerns/file_set/virus_check_spec.rb
 - spec/hydra/works/models/concerns/file_set_behavior_spec.rb
-- spec/hydra/works/models/generic_file_spec.rb
+- spec/hydra/works/models/file_set_spec.rb
 - spec/hydra/works/models/generic_work_spec.rb
 - spec/hydra/works/services/add_file_to_file_set_spec.rb
 - spec/hydra/works/services/characterization_service_spec.rb
@@ -273,7 +268,7 @@ files:
 - use-cases/scholarsphere_use_case.md
 - use-cases/stanford_data_model_use_case.md
 - use-cases/ucin_linked_resource_use_case.md
-homepage: ''
+homepage: https://github.com/projecthydra-labs/hydra-works
 licenses:
 - APACHE2
 metadata: {}
@@ -293,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Fundamental repository data model for hydra
@@ -324,7 +319,7 @@ test_files:
 - spec/hydra/works/models/concerns/file_set/versioned_content_spec.rb
 - spec/hydra/works/models/concerns/file_set/virus_check_spec.rb
 - spec/hydra/works/models/concerns/file_set_behavior_spec.rb
-- spec/hydra/works/models/generic_file_spec.rb
+- spec/hydra/works/models/file_set_spec.rb
 - spec/hydra/works/models/generic_work_spec.rb
 - spec/hydra/works/services/add_file_to_file_set_spec.rb
 - spec/hydra/works/services/characterization_service_spec.rb
@@ -333,4 +328,3 @@ test_files:
 - spec/hydra/works_spec.rb
 - spec/spec_helper.rb
 - spec/support/file_set_helper.rb
-has_rdoc: 

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

@@ -1,12 +0,0 @@
-module Hydra::Works
-  # @deprecated use FileSetBehavior instead
-  module GenericFileBehavior
-    extend ActiveSupport::Concern
-    extend Deprecation
-
-    included do
-      Deprecation.warn GenericFileBehavior, "GenericFileBehavior is deprecated. Use FileSetBehavior instead. This will be removed in Hydra::Works 0.4.0"
-      include FileSetBehavior
-    end
-  end
-end

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

@@ -1,12 +0,0 @@
-module Hydra::Works
-  # @deprecated use Hydra::Works::WorkBehavior instead
-  module GenericWorkBehavior
-    extend ActiveSupport::Concern
-    extend Deprecation
-    self.deprecation_horizon = "Hydra::Works 0.4.0"
-    included do
-      Deprecation.warn self, "GenericWorkBehavior is deprecated. Use WorkBehavior instead. This module will be removed in Hydra::Works 0.4.0"
-      include Hydra::Works::WorkBehavior
-    end
-  end
-end

data/lib/hydra/works/models/generic_file.rb

@@ -1,17 +0,0 @@
-module Hydra::Works
-  # Namespace for Modules with functionality specific to GenericFiles
-  module GenericFile
-    extend ActiveSupport::Concern
-
-    # @deprecated Base class for creating objects that behave like Hydra::Works::GenericFiles
-    class Base < ActiveFedora::Base
-      extend Deprecation
-      include Hydra::Works::FileSetBehavior
-      after_initialize :deprecation_warning
-
-      def deprecation_warning
-        Deprecation.warn Base, "Hydra::Works::FileSet is deprecated and will be removed in 0.4.0. Use Hydra::Works::FileSet instead"
-      end
-    end
-  end
-end

data/lib/hydra/works/services/add_file_to_generic_file.rb

@@ -1,8 +0,0 @@
-module Hydra::Works
-  class AddFileToGenericFile
-    def self.call(*args)
-      Deprecation.warn(AddFileToGenericFile, "AddFileToGenericFile is deprecated use AddFileToFileSet. This will be removed in 0.4.0")
-      AddFileToFileSet.call(*args)
-    end
-  end
-end

data/lib/hydra/works/services/upload_file_to_generic_file.rb

@@ -1,8 +0,0 @@
-module Hydra::Works
-  class UploadFileToGenericFile
-    def self.call(*args)
-      Deprecation.warn(UploadFileToGenericFile, "UploadFileToGenericFile is deprecated use UploadFileToFileSet. This will be removed in 0.4.0")
-      UploadFileToFileSet.call(*args)
-    end
-  end
-end