sufia-models 6.5.0 → 6.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb23478c793f2a811406c6a0300325276c116bb8
-  data.tar.gz: 671a29122bf7e91f98cbf19907ff40d10865ed41
+  metadata.gz: 5003a564167c7def27510e562932d48c1da6d9de
+  data.tar.gz: 042427fade03dc5c1db99556b1ba5ed5d4588497
 SHA512:
-  metadata.gz: e51fb60eba9f67dcff1df790fa046fe9d1d7aa30f0bdcc0fbfd2a1019ccc0ae9996591ea45d568c75d1810cfebbaa8ba17dbc9be95c7ee788c613afc93db0f92
-  data.tar.gz: 10ec3b2d84b8e8b78541070b2702a0f237bad8958f1ae696e3d638364b3313bdfcd95316a588e4045a6dbbd859bb45137931571fcc0943283e079070a08ae563
+  metadata.gz: 654344b3315b6676b8930f570551e9c80c1894a2d6cecb51720415bf670757401a9b10eba279b9e4f3f4be19b29e95c8736e49a4923d350abdccdb1f1b9df59d
+  data.tar.gz: ac5f4c4950ef94041df7b28f598bc429e2eca52c642877a53dbf956ac04321e0076759bc9bac329e4927e9e09935de9de3fe03ae8b7f395fe58ec0228c83c6fd

data/app/actors/sufia/generic_file/actor.rb

@@ -1,6 +1,8 @@
 module Sufia::GenericFile
   # Actions are decoupled from controller logic so that they may be called from a controller or a background job.
   class Actor
+    include Sufia::Lockable
+
     attr_reader :generic_file, :user
 
     def initialize(generic_file, user)
@@ -42,9 +44,9 @@ module Sufia::GenericFile
 
     def add_file_to_collection(collection_id)
       return if collection_id.nil? || collection_id == "-1"
-      collection = Collection.find(collection_id)
-      return unless user.can? :edit, collection
       acquire_lock_for(collection_id) do
+        collection = ::Collection.find(collection_id)
+        return unless user.can? :edit, collection
         collection.add_members [generic_file.id]
         collection.save
       end
@@ -142,16 +144,5 @@ module Sufia::GenericFile
         featured_work = FeaturedWork.find_by_generic_file_id(generic_file.id)
         featured_work.destroy unless featured_work.nil?
       end
-
-      def acquire_lock_for(lock_key, &block)
-        lock_manager.lock(lock_key, &block)
-      end
-
-      def lock_manager
-        @lock_manager ||= Sufia::LockManager.new(
-          Sufia.config.lock_time_to_live,
-          Sufia.config.lock_retry_count,
-          Sufia.config.lock_retry_delay)
-      end
   end
 end

data/app/jobs/active_fedora_id_based_job.rb

@@ -13,8 +13,8 @@ class ActiveFedoraIdBasedJob
     @object ||= ActiveFedora::Base.find(id)
   end
 
-  alias_method :generic_file, :object
-  alias_method :generic_file_id, :id
+  alias generic_file object
+  alias generic_file_id id
 
   def run
     raise "Define #run in a subclass"

data/app/jobs/audit_job.rb

@@ -3,8 +3,8 @@ class AuditJob < ActiveFedoraIdBasedJob
     :audit
   end
 
-  PASS = 'Passing Audit Run'
-  FAIL = 'Failing Audit Run'
+  PASS = 'Passing Audit Run'.freeze
+  FAIL = 'Failing Audit Run'.freeze
 
   attr_accessor :uri, :id, :path
 

data/app/jobs/batch_update_job.rb

@@ -44,6 +44,7 @@ class BatchUpdateJob
   # @param [GenericFile] gf
   def queue_additional_jobs(gf)
     Sufia.queue.push(ContentUpdateEventJob.new(gf.id, login))
+    Sufia.queue.push(ResolrizeGenericFileJob.new(gf.id)) unless Sufia.config.collection_facet.nil?
   end
 
   def send_user_success_message

data/app/models/batch.rb

@@ -2,6 +2,7 @@ class Batch < ActiveFedora::Base
   include Hydra::AccessControls::Permissions
   include Sufia::ModelMethods
   include Sufia::Noid
+  extend Sufia::Lockable
 
   has_many :generic_files, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
 
@@ -9,22 +10,14 @@ class Batch < ActiveFedora::Base
   property :title, predicate: ::RDF::DC.title
   property :status, predicate: ::RDF::DC.type
 
-  def self.find_or_create(id)
-    Batch.find(id)
-  rescue ActiveFedora::ObjectNotFoundError
-    safe_create(id)
-  end
-
   # This method handles most race conditions gracefully.
-  # If a batch with the same ID is created by another thread
-  # we fetch the batch that was created (rather than throwing
-  # an error) and continute.
-  def self.safe_create(id)
-    Batch.create(id: id)
-  rescue ActiveFedora::IllegalOperation
-    # This is the exception thrown by LDP when we attempt to
-    # create a duplicate object. If we can find the object
-    # then we are good to go.
-    Batch.find(id)
+  def self.find_or_create(id)
+    acquire_lock_for(id) do
+      begin
+        Batch.find(id)
+      rescue ActiveFedora::ObjectNotFoundError
+        Batch.create(id: id)
+      end
+    end
   end
 end

data/app/models/concerns/sufia/user.rb

@@ -47,12 +47,12 @@ module Sufia::User
   end
 
   def zotero_token=(value)
-    if value.blank?
-      # Resetting the token
-      self[:zotero_token] = value
-    else
-      self[:zotero_token] = Marshal.dump(value)
-    end
+    self[:zotero_token] = if value.blank?
+                            # Resetting the token
+                            value
+                          else
+                            Marshal.dump(value)
+                          end
   end
 
   def set_arkivo_token

data/app/services/sufia/lock_manager.rb

@@ -18,13 +18,12 @@ module Sufia
 
     # Blocks until lock is acquired or timeout.
     def lock(key)
+      returned_from_block = nil
       client.lock(key, @ttl) do |locked|
-        if locked
-          yield
-        else
-          raise UnableToAcquireLockError
-        end
+        raise UnableToAcquireLockError unless locked
+        returned_from_block = yield
       end
+      returned_from_block
     end
 
     private

data/app/services/sufia/lockable.rb

@@ -0,0 +1,16 @@
+module Sufia
+  module Lockable
+    extend ActiveSupport::Concern
+
+    def acquire_lock_for(lock_key, &block)
+      lock_manager.lock(lock_key, &block)
+    end
+
+    def lock_manager
+      @lock_manager ||= Sufia::LockManager.new(
+        Sufia.config.lock_time_to_live,
+        Sufia.config.lock_retry_count,
+        Sufia.config.lock_retry_delay)
+    end
+  end
+end

data/lib/generators/sufia/models/abstract_migration_generator.rb

@@ -12,11 +12,11 @@ class Sufia::Models::AbstractMigrationGenerator < Rails::Generators::Base
       @prev_migration_nr += 1
     else
       last_migration = Dir[File.join(path, '*.rb')].sort.last
-      if last_migration
-        @prev_migration_nr = last_migration.sub(File.join(path, '/'), '').to_i + 1
-      else
-        @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-      end
+      @prev_migration_nr = if last_migration
+                             last_migration.sub(File.join(path, '/'), '').to_i + 1
+                           else
+                             Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
+                           end
     end
     @prev_migration_nr.to_s
   end

data/lib/sufia/models/engine.rb

@@ -71,6 +71,7 @@ module Sufia
         require 'sufia/analytics'
         require 'sufia/pageview'
         require 'sufia/download'
+        require 'sufia/lockable'
       end
 
       initializer 'configure' do

data/lib/sufia/models/utils.rb

@@ -22,12 +22,12 @@ module Sufia
       # @yeild block [] code you want to run and retry
       #
       # @return result of the block call
-      def retry_unless(number_of_tries, condition, &block)
+      def retry_unless(number_of_tries, condition, &_block)
         raise ArgumentError, "First argument must be an enumerator" unless number_of_tries.is_a? Enumerator
         raise ArgumentError, "Second argument must be a lambda" unless condition.respond_to? :call
         raise ArgumentError, "Must pass a block of code to retry" unless block_given?
         number_of_tries.each do
-          result = block.call
+          result = yield
           return result unless condition.call
           sleep(Sufia.config.retry_unless_sleep) if Sufia.config.retry_unless_sleep > 0
         end

data/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "6.5.0"
+    VERSION = "6.6.0".freeze
   end
 end

data/sufia-models.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rails', '~> 4.0'
   spec.add_dependency 'activeresource', "~> 4.0" # No longer a dependency of rails 4.0
 
-  spec.add_dependency "hydra-head", "~> 9.0"
+  spec.add_dependency "hydra-head", "< 9.6"
   spec.add_dependency "active-fedora", "~> 9.4"
   spec.add_dependency "hydra-collections", [">= 5.0.3", "< 6.0"]
   spec.add_dependency 'hydra-derivatives', '~> 1.0'
@@ -41,7 +41,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'acts_as_follower', '>= 0.1.1', '< 0.3'
   spec.add_dependency 'carrierwave', '~> 0.9'
   spec.add_dependency 'oauth2', '~> 0.9'
-  spec.add_dependency 'google-api-client', '~> 0.7'
+  spec.add_dependency 'google-api-client', '~> 0.7', '< 0.9'
   spec.add_dependency 'legato', '~> 0.3'
   spec.add_dependency 'activerecord-import', '~> 0.5'
   if RUBY_VERSION < '2.1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 6.5.0
+  version: 6.6.0
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +70,16 @@ dependencies:
   name: hydra-head
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '9.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '9.6'
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
@@ -253,6 +253,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -260,6 +263,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: legato
   requirement: !ruby/object:Gem::Requirement
@@ -395,6 +401,7 @@ files:
 - app/services/sufia/generic_file_csv_service.rb
 - app/services/sufia/generic_file_indexing_service.rb
 - app/services/sufia/lock_manager.rb
+- app/services/sufia/lockable.rb
 - app/services/sufia/noid.rb
 - app/services/sufia/repository_audit_service.rb
 - config/locales/sufia.en.yml
@@ -500,7 +507,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Models and services for sufia