curation_concerns 0.14.0 → 1.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7127b05e9a9109e92a2781d2e82010ebfc58bd40
-  data.tar.gz: b646ef71a42e4fcd0debd50953cd189cfcbcc7ee
+  metadata.gz: 82ff29ee951976ef550ed0a64a07495a4eacad37
+  data.tar.gz: c2537a3a7611199f193a9643a53e98dacccb2d96
 SHA512:
-  metadata.gz: 67ac875f8235ed5dfc2bbe3826c8fa4bd223e40d84051774f509432c65111514f4bf3eedbd9a60b87881dba9c331c0c2aeb51eb17800c8f6ed0c82cee8993541
-  data.tar.gz: dbc29e4c2628fec8e03c5f79adf694b115c951266bc6ed809e22c398a07b619e2f945f619dd46daffb6300e917ddc13b2e295ff3beeaaed8eedb6dfe21bd106c
+  metadata.gz: 6b97ceab4d2982f871070aa678f66e8d37dfb04f1184a22b66b0d34d07fc08269e3ac0817a2fbc0fce55767bddfa952eed57871141d2f3ceadacee084336bf34
+  data.tar.gz: e1b11872f569fe9a090a35a71984374812b85de8cdcbd022fe2a0f3f8a0ea22203b57a3e802ae51c7bbe3f55f72dd37880606d8e334703463855f8bd250ed34a

data/app/models/concerns/curation_concerns/file_set/full_text_indexing.rb

@@ -4,7 +4,7 @@ module CurationConcerns
       extend ActiveSupport::Concern
 
       included do
-        contains 'full_text'
+        has_subresource 'full_text'
       end
     end
   end

data/curation_concerns.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'hydra-head', '~> 9.9'
+  spec.add_dependency 'hydra-head', '>= 10.0.0.beta1', '< 11'
   spec.add_dependency 'blacklight', '~> 6.1'
   spec.add_dependency "breadcrumbs_on_rails", "~> 2.3"
   spec.add_dependency "jquery-ui-rails"
@@ -30,16 +30,17 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'kaminari_route_prefix', '~> 0.0.1'
   spec.add_dependency 'active_attr'
   spec.add_dependency 'hydra-works', '~> 0.8', '>= 0.8.1'
+  # This allows bundler to resolve a dependency tree.
+  # TODO: I suspect we can remove it when hydra-pcdm 0.8.0 is released.
+  spec.add_dependency 'hydra-pcdm', '>= 0.8.0.beta1', '< 1'
   spec.add_dependency 'active_fedora-noid', '~> 1.0'
   spec.add_dependency 'qa', '~> 0.5'
   spec.add_dependency 'redlock', '~> 0.1.2'
   spec.add_dependency 'solrizer', '~> 3.4'
-  spec.add_dependency 'active-fedora', '~> 9.9'
-  spec.add_dependency 'deprecation', '~> 0.1'
+  spec.add_dependency 'deprecation', '~> 1.0'
   spec.add_dependency 'rdf', '~> 1.99'
   spec.add_dependency 'rdf-vocab', '~> 0'
   spec.add_dependency 'awesome_nested_set', '~> 3.0'
-  
 
   spec.add_development_dependency 'solr_wrapper', '~> 0.4'
   spec.add_development_dependency 'fcrepo_wrapper', '~> 0.1'

data/lib/curation_concerns/configuration.rb

@@ -91,11 +91,6 @@ module CurationConcerns
       @minter_statefile ||= '/tmp/minter-state'
     end
 
-    attr_writer :redis_namespace
-    def redis_namespace
-      @redis_namespace ||= 'curation_concerns'
-    end
-
     attr_writer :display_media_download_link
     def display_media_download_link
       return @display_media_download_link unless @display_media_download_link.nil?

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "0.14.0".freeze
+  VERSION = "1.0.0.beta1".freeze
 end

data/lib/generators/curation_concerns/templates/config/curation_concerns.rb

@@ -46,9 +46,6 @@ CurationConcerns.configure do |config|
   # If you use a multi-server architecture, this MUST be on a shared volume.
   # config.minter_statefile = '/tmp/minter-state'
 
-  # Specify the prefix for Redis keys:
-  # config.redis_namespace = "curation_concerns"
-
   # Specify whether the media display partial should render a download link
   # config.display_media_download_link = true
 

data/lib/generators/curation_concerns/templates/config/redis_config.rb

@@ -1,26 +1,3 @@
-if defined?(PhusionPassenger)
-  PhusionPassenger.on_event(:starting_worker_process) do |forked|
-    # We're in smart spawning mode.
-    if forked
-      # Re-establish redis connection
-      require 'redis'
-      config = YAML.load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
-
-      # The important two lines
-      Redis.current.disconnect!
-      Redis.current = begin
-                        Redis.new(config.merge(thread_safe: true))
-                      rescue
-                        nil
-                      end
-    end
-  end
-else
-  config = YAML.load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
-  require 'redis'
-  Redis.current = begin
-             Redis.new(config.merge(thread_safe: true))
-           rescue
-             nil
-           end
-end
+require 'redis'
+config = YAML.load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
+Redis.current = Redis.new(config.merge(thread_safe: true))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,22 +10,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '9.9'
+        version: 10.0.0.beta1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 10.0.0.beta1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '9.9'
+        version: '11'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -186,6 +192,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.1
+- !ruby/object:Gem::Dependency
+  name: hydra-pcdm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0.beta1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0.beta1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: active_fedora-noid
   requirement: !ruby/object:Gem::Requirement
@@ -242,34 +268,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: active-fedora
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '9.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '9.9'
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
@@ -1002,7 +1014,6 @@ files:
 - lib/generators/curation_concerns/work/templates/model_spec.rb.erb
 - lib/generators/curation_concerns/work/work_generator.rb
 - lib/tasks/curation_concerns.rake
-- lib/tasks/migrate.rake
 - lib/tasks/solr_reindex.rake
 - solr/config/_rest_managed.json
 - solr/config/admin-extra.html
@@ -1164,7 +1175,6 @@ files:
 - spec/support/shared/shared_examples_has_dc_metadata.rb
 - spec/support/shared/shared_examples_is_embargoable.rb
 - spec/support/shared/shared_examples_with_access_rights.rb
-- spec/tasks/rake_spec.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/catalog/_action_menu_partials/_default.html.erb_spec.rb
@@ -1211,9 +1221,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -1366,7 +1376,6 @@ test_files:
 - spec/support/shared/shared_examples_has_dc_metadata.rb
 - spec/support/shared/shared_examples_is_embargoable.rb
 - spec/support/shared/shared_examples_with_access_rights.rb
-- spec/tasks/rake_spec.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/catalog/_action_menu_partials/_default.html.erb_spec.rb

data/lib/tasks/migrate.rake

@@ -1,11 +0,0 @@
-namespace :curation_concerns do
-  namespace :migrate do
-    desc "Migrate audit logs"
-    task audit_logs: :environment do
-      ChecksumAuditLog.all.each do |cs|
-        cs.file_set_id = cs.file_set_id.delete "#{CurationConcerns.config.redis_namespace}:"
-        cs.save
-      end
-    end
-  end
-end

data/spec/tasks/rake_spec.rb

@@ -1,22 +0,0 @@
-require 'spec_helper'
-require 'rake'
-
-describe 'Rake tasks' do
-  describe 'curation_concerns:migrate' do
-    let(:namespaced_id) { 'curation_concerns:123' }
-    let(:corrected_id)  { '123' }
-    before do
-      load File.expand_path('../../../lib/tasks/migrate.rake', __FILE__)
-      Rake::Task.define_task(:environment)
-    end
-
-    describe 'deleting the namespace from ChecksumAuditLog#file_set_id' do
-      before do
-        ChecksumAuditLog.create(file_set_id: namespaced_id)
-        Rake::Task['curation_concerns:migrate:audit_logs'].invoke
-      end
-      subject { ChecksumAuditLog.first.file_set_id }
-      it { is_expected.to eql corrected_id }
-    end
-  end
-end