sufia-models 6.2.0 → 6.3.0

data/lib/sufia/models/stats/user_stat_importer.rb

@@ -1,9 +1,8 @@
 module Sufia
   class UserStatImporter
-
     UserRecord = Struct.new("UserRecord", :id, :user_key, :last_stats_update)
 
-    def initialize(options={})
+    def initialize(options = {})
       @verbose = options[:verbose]
       @logging = options[:logging]
       @delay_secs = options[:delay_secs].to_f
@@ -35,94 +34,93 @@ module Sufia
     end
 
     # Returns an array of users sorted by the date of their last
-    # stats update. Users that have not been recently updated 
+    # stats update. Users that have not been recently updated
     # will be at the top of the array.
     def sorted_users
       users = []
       ::User.find_each do |user|
         users.push(UserRecord.new(user.id, user.user_key, date_since_last_cache(user)))
       end
-      users.sort {|a, b| a.last_stats_update <=> b.last_stats_update}
+      users.sort { |a, b| a.last_stats_update <=> b.last_stats_update }
     end
 
-private
+    private
 
-    def delay 
-      sleep @delay_secs
-    end
+      def delay
+        sleep @delay_secs
+      end
 
-    def rescue_and_retry(fail_message)
-      retry_count = 0
-      begin
-        return yield
-      rescue StandardError => e
-        retry_count += 1
-        if retry_count < @number_of_retries
-          delay
-          retry
-        else
-          log_message fail_message
-          log_message "Last exception #{e}"
+      def rescue_and_retry(fail_message)
+        retry_count = 0
+        begin
+          return yield
+        rescue StandardError => e
+          retry_count += 1
+          if retry_count < @number_of_retries
+            delay
+            retry
+          else
+            log_message fail_message
+            log_message "Last exception #{e}"
+          end
         end
       end
-    end
 
-    def date_since_last_cache(user)
-      last_cached_stat = UserStat.where(user_id: user.id).order(date: :asc).last
+      def date_since_last_cache(user)
+        last_cached_stat = UserStat.where(user_id: user.id).order(date: :asc).last
 
-      if last_cached_stat
-        last_cached_stat.date + 1.day
-      else
-        Sufia.config.analytic_start_date
+        if last_cached_stat
+          last_cached_stat.date + 1.day
+        else
+          Sufia.config.analytic_start_date
+        end
       end
-    end
 
-    def file_ids_for_user(user)
-      ids = []
-      ::GenericFile.find_in_batches("#{Solrizer.solr_name('depositor', :symbol)}:\"#{user.user_key}\"", fl:"id") do |group|
-        ids.concat group.map { |doc| doc["id"] }
+      def file_ids_for_user(user)
+        ids = []
+        ::GenericFile.find_in_batches("#{Solrizer.solr_name('depositor', :symbol)}:\"#{user.user_key}\"", fl: "id") do |group|
+          ids.concat(group.map { |doc| doc["id"] })
+        end
+        ids
       end
-      ids
-    end
 
-    # For each date, add the view and download counts for this
-    # file to the view & download sub-totals for that day.
-    # The resulting hash will look something like this:
-    # {"2014-11-30 00:00:00 UTC" => {:views=>2, :downloads=>5},
-    #  "2014-12-01 00:00:00 UTC" => {:views=>4, :downloads=>4}}
-    def tally_results(file_stats, stat_name, total_stats)
-      file_stats.each do |stats|
-        # Exclude the stats from today since it will only be a partial day's worth of data
-        break if stats.date == Date.today
-
-        date_key = stats.date.to_s
-        old_count = total_stats[date_key] ? total_stats[date_key].fetch(stat_name) { 0 } : 0
-        new_count = old_count + stats.method(stat_name).call
-
-        old_values = total_stats[date_key] || {}
-        total_stats.store(date_key, old_values)
-        total_stats[date_key].store(stat_name, new_count)
+      # For each date, add the view and download counts for this
+      # file to the view & download sub-totals for that day.
+      # The resulting hash will look something like this:
+      # {"2014-11-30 00:00:00 UTC" => {:views=>2, :downloads=>5},
+      #  "2014-12-01 00:00:00 UTC" => {:views=>4, :downloads=>4}}
+      def tally_results(file_stats, stat_name, total_stats)
+        file_stats.each do |stats|
+          # Exclude the stats from today since it will only be a partial day's worth of data
+          break if stats.date == Date.today
+
+          date_key = stats.date.to_s
+          old_count = total_stats[date_key] ? total_stats[date_key].fetch(stat_name) { 0 } : 0
+          new_count = old_count + stats.method(stat_name).call
+
+          old_values = total_stats[date_key] || {}
+          total_stats.store(date_key, old_values)
+          total_stats[date_key].store(stat_name, new_count)
+        end
+        total_stats
       end
-      total_stats
-    end
 
-    def create_or_update_user_stats(stats, user)
-      stats.each do |date_string, data|
-        date = Time.zone.parse(date_string)
+      def create_or_update_user_stats(stats, user)
+        stats.each do |date_string, data|
+          date = Time.zone.parse(date_string)
 
-        user_stat = UserStat.where(user_id: user.id).where(date: date).first
-        user_stat ||= UserStat.new(user_id: user.id, date: date)
+          user_stat = UserStat.where(user_id: user.id).where(date: date).first
+          user_stat ||= UserStat.new(user_id: user.id, date: date)
 
-        user_stat.file_views = data[:views] || 0
-        user_stat.file_downloads = data[:downloads] || 0
-        user_stat.save!
+          user_stat.file_views = data[:views] || 0
+          user_stat.file_downloads = data[:downloads] || 0
+          user_stat.save!
+        end
       end
-    end
-
-    def log_message(message)
-      puts message if @verbose
-      Rails.logger.info "#{self.class}: #{message}" if @logging
-    end
 
+      def log_message(message)
+        puts message if @verbose
+        Rails.logger.info "#{self.class}: #{message}" if @logging
+      end
   end
 end

data/lib/sufia/models/user_local_directory_behavior.rb

@@ -1,29 +1,25 @@
-# To enable local file ingest, 
-# - Make User model define .directory method that returns a String corresponding to the User's personal import directory on the server. This can be a simple ActiveRecord attribute on the User model, or it can be something more elaborate. 
+# To enable local file ingest,
+# - Make User model define .directory method that returns a String corresponding to the User's personal import directory on the server. This can be a simple ActiveRecord attribute on the User model, or it can be something more elaborate.
 # - Include this module in your User model, or define a .files() method that behaves the same
 # - Set Sufia.config.enable_local_ingest to true
-# 
+#
 module Sufia::UserLocalDirectoryBehavior
-  
   # You can use this validator in your User model.
-  # Ensures that a string defining the path to the user's directory has been provided 
+  # Ensures that a string defining the path to the user's directory has been provided
   # and corresponds to a real directory on the server.
   # @example
   #   validate :directory_must_exist
   def directory_must_exist
-    unless directory.blank? || File.directory?(directory)
-      errors.add(:directory, "must be an existing directory")
-    end
+    return if directory.blank? || File.directory?(directory)
+    errors.add(:directory, "must be an existing directory")
   end
 
   # List the contents of the user's directory on the server
   # Indicates whether each item is a directory or not.
   def files
     return [] unless directory.present? && File.directory?(directory)
-    Dir[File.join(directory, '*')].inject([]) do |accum, val|
-      accum << { name: File.basename(val), directory: File.directory?(val)}
-      accum
+    Dir[File.join(directory, '*')].each_with_object([]) do |val, accum|
+      accum << { name: File.basename(val), directory: File.directory?(val) }
     end
   end
-  
-end
+end

data/lib/sufia/models/utils.rb

@@ -15,7 +15,6 @@ module Sufia
     end
 
     module ClassMethods
-
       # retry the block if the conditional call is true unless we hit the maximum tries
       #
       # @param number_of_tries [enumerator] maximum number of times to retry the block
@@ -32,7 +31,7 @@ module Sufia
           return result unless condition.call
           sleep(Sufia.config.retry_unless_sleep) if Sufia.config.retry_unless_sleep > 0
         end
-        raise RuntimeError, "retry_unless could not complete successfully. Try upping the # of tries?"
+        raise "retry_unless could not complete successfully. Try upping the # of tries?"
       end
     end
   end

data/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "6.2.0"
+    VERSION = "6.3.0"
   end
 end

data/lib/sufia/permissions.rb

@@ -4,6 +4,5 @@ module Sufia
 
     autoload :Writable
     autoload :Readable
-
   end
 end

data/lib/sufia/permissions/readable.rb

@@ -14,7 +14,6 @@ module Sufia
       def private?
         !(public? || registered?)
       end
-
     end
   end
 end

data/lib/sufia/permissions/writable.rb

@@ -3,7 +3,7 @@ module Sufia
     module Writable
       extend ActiveSupport::Concern
 
-      #we're overriding the permissions= method which is in Hydra::AccessControls::Permissions
+      # we're overriding the permissions= method which is in Hydra::AccessControls::Permissions
       include Hydra::AccessControls::Permissions
       include Hydra::AccessControls::Visibility
 
@@ -14,20 +14,19 @@ module Sufia
       def paranoid_permissions
         valid = true
         paranoid_edit_permissions.each do |validation|
-          if validation[:condition].call(self)
-            errors[validation[:key]] ||= []
-            errors[validation[:key]] << validation[:message]
-            valid = false
-          end
+          next unless validation[:condition].call(self)
+          errors[validation[:key]] ||= []
+          errors[validation[:key]] << validation[:message]
+          valid = false
         end
-        return valid
+        valid
       end
 
       def paranoid_edit_permissions
         [
-          {key: :edit_users, message: 'Depositor must have edit access', condition: lambda { |obj| !obj.edit_users.include?(obj.depositor) }},
-          {key: :edit_groups, message: 'Public cannot have edit access', condition: lambda { |obj| obj.edit_groups.include?('public') }},
-          {key: :edit_groups, message: 'Registered cannot have edit access', condition: lambda { |obj| obj.edit_groups.include?('registered') }}
+          { key: :edit_users, message: 'Depositor must have edit access', condition: ->(obj) { !obj.edit_users.include?(obj.depositor) } },
+          { key: :edit_groups, message: 'Public cannot have edit access', condition: ->(obj) { obj.edit_groups.include?('public') } },
+          { key: :edit_groups, message: 'Registered cannot have edit access', condition: ->(obj) { obj.edit_groups.include?('registered') } }
         ]
       end
 
@@ -56,20 +55,18 @@ module Sufia
 
       private
 
-      def permission_hash
-        old_perms = self.permissions
-        user_perms =  {}
-        old_perms.select{|r| r[:type] == 'user'}.each do |r|
-          user_perms[r[:name]] = r[:access]
-        end
-        user_perms
-        group_perms =  {}
-        old_perms.select{|r| r[:type] == 'group'}.each do |r|
-          group_perms[r[:name]] = r[:access]
+        def permission_hash
+          old_perms = permissions
+          user_perms = {}
+          old_perms.select { |r| r[:type] == 'user' }.each do |r|
+            user_perms[r[:name]] = r[:access]
+          end
+          group_perms = {}
+          old_perms.select { |r| r[:type] == 'group' }.each do |r|
+            group_perms[r[:name]] = r[:access]
+          end
+          { 'person' => user_perms, 'group' => group_perms }
         end
-        {'person'=>user_perms, 'group'=>group_perms}
-      end
-
     end
   end
 end

data/lib/tasks/sufia-models_tasks.rake

@@ -1,5 +1,9 @@
 require 'net/http'
 
+# Pull in tasks from AF::Noid
+af_noid = Gem::Specification.find_by_name 'active_fedora-noid'
+load "#{af_noid.gem_dir}/lib/tasks/noid_tasks.rake"
+
 namespace :solr do
   desc "Enqueue a job to resolrize the repository objects"
   task reindex: :environment do
@@ -8,6 +12,14 @@ namespace :solr do
 end
 
 namespace :sufia do
+  namespace :noid do
+    desc 'Migrate minter state file'
+    task migrate_statefile: :environment do
+      ENV['AFNOID_STATEFILE'] = Sufia.config.minter_statefile
+      Rake::Task['active_fedora:noid:migrate_statefile'].invoke if needs_migration?(Sufia.config.minter_statefile)
+    end
+  end
+
   namespace :user do
     desc 'Populate user tokens'
     task tokens: :environment do
@@ -94,3 +106,9 @@ def download_from_maven url, dst
     end
   end
 end
+
+def needs_migration?(statefile)
+  !!YAML.load(File.open(statefile).read)
+rescue Psych::SyntaxError, Errno::ENOENT
+  false
+end

data/sufia-models.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "active-fedora", "~> 9.1", ">= 9.1.1"
   spec.add_dependency "hydra-collections", [">= 5.0.2", "< 6.0"]
   spec.add_dependency 'hydra-derivatives', '~> 1.0'
-  spec.add_dependency 'active_fedora-noid', '~> 0.1'
+  spec.add_dependency 'active_fedora-noid', '~> 1.0'
   spec.add_dependency 'nest', '~> 1.1'
   spec.add_dependency 'resque', '~> 1.23'
   spec.add_dependency 'resque-pool', '~> 0.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.3.0
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,14 +140,14 @@ dependencies:
     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: nest
   requirement: !ruby/object:Gem::Requirement
@@ -482,7 +482,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Models and services for sufia