sufia-models 6.2.0 → 6.3.0

data/app/models/concerns/sufia/generic_file/full_text_indexing.rb

@@ -14,30 +14,27 @@ module Sufia
 
       private
 
-      def extract_content
-        uri = URI("#{connection_url}/update/extract?extractOnly=true&wt=json&extractFormat=text")
-        req = Net::HTTP.new(uri.host, uri.port)
-        resp = req.post(uri.to_s, self.content.content, {
-            'Content-type' => "#{self.mime_type};charset=utf-8",
-            'Content-Length' => self.content.content.size.to_s
-          })
-        raise "URL '#{uri}' returned code #{resp.code}" unless resp.code == "200"
-        self.content.content.rewind if self.content.content.respond_to?(:rewind)
-        extracted_text = JSON.parse(resp.body)[''].rstrip
-        full_text.content = extracted_text if extracted_text.present?
-      rescue => e
-        logger.error("Error extracting content from #{self.id}: #{e.inspect}")
-      end
+        def extract_content
+          uri = URI("#{connection_url}/update/extract?extractOnly=true&wt=json&extractFormat=text")
+          req = Net::HTTP.new(uri.host, uri.port)
+          resp = req.post(uri.to_s, content.content,             'Content-type' => "#{mime_type};charset=utf-8",
+                                                                 'Content-Length' => content.content.size.to_s)
+          raise "URL '#{uri}' returned code #{resp.code}" unless resp.code == "200"
+          content.content.rewind if content.content.respond_to?(:rewind)
+          extracted_text = JSON.parse(resp.body)[''].rstrip
+          full_text.content = extracted_text if extracted_text.present?
+        rescue => e
+          logger.error("Error extracting content from #{id}: #{e.inspect}")
+        end
 
-      def connection_url
-        case
+        def connection_url
+          case
           when Blacklight.connection_config[:url] then Blacklight.connection_config[:url]
           when Blacklight.connection_config["url"] then Blacklight.connection_config["url"]
           when Blacklight.connection_config[:fulltext] then Blacklight.connection_config[:fulltext]["url"]
           else Blacklight.connection_config[:default]["url"]
+          end
         end
-      end
-
     end
   end
 end

data/app/models/concerns/sufia/generic_file/metadata.rb

@@ -4,7 +4,6 @@ module Sufia
       extend ActiveSupport::Concern
 
       included do
-
         property :label, predicate: ActiveFedora::RDF::Fcrepo::Model.downloadFilename, multiple: false
 
         property :depositor, predicate: ::RDF::URI.new("http://id.loc.gov/vocabulary/relators/dpt"), multiple: false do |index|
@@ -95,7 +94,6 @@ module Sufia
         end
         type ::RDF::URI.new('http://pcdm.org/models#Object')
       end
-
     end
   end
 end

data/app/models/concerns/sufia/generic_file/mime_types.rb

@@ -4,23 +4,23 @@ module Sufia
       extend ActiveSupport::Concern
 
       def pdf?
-        self.class.pdf_mime_types.include? self.mime_type
+        self.class.pdf_mime_types.include? mime_type
       end
 
       def image?
-        self.class.image_mime_types.include? self.mime_type
+        self.class.image_mime_types.include? mime_type
       end
 
       def video?
-        self.class.video_mime_types.include? self.mime_type
+        self.class.video_mime_types.include? mime_type
       end
 
       def audio?
-        self.class.audio_mime_types.include? self.mime_type
+        self.class.audio_mime_types.include? mime_type
       end
 
       def office_document?
-        self.class.office_document_mime_types.include? self.mime_type
+        self.class.office_document_mime_types.include? mime_type
       end
 
       def collection?
@@ -28,10 +28,10 @@ module Sufia
       end
 
       def file_format
-        return nil if self.mime_type.blank? and self.format_label.blank?
-        return self.mime_type.split('/')[1]+ " ("+self.format_label.join(", ")+")" unless self.mime_type.blank? or self.format_label.blank?
-        return self.mime_type.split('/')[1] unless self.mime_type.blank?
-        return self.format_label
+        return nil if mime_type.blank? && format_label.blank?
+        return mime_type.split('/')[1] + " (" + format_label.join(", ") + ")" unless mime_type.blank? || format_label.blank?
+        return mime_type.split('/')[1] unless mime_type.blank?
+        format_label
       end
 
       module ClassMethods

data/app/models/concerns/sufia/generic_file/permissions.rb

@@ -5,7 +5,6 @@ module Sufia
 
       include Sufia::Permissions::Writable
       include Sufia::Permissions::Readable
-
     end
   end
 end

data/app/models/concerns/sufia/generic_file/proxy_deposit.rb

@@ -16,7 +16,6 @@ module Sufia
         after_create :create_transfer_request
       end
 
-
       def create_transfer_request
         Sufia.queue.push(ContentDepositorChangeEventJob.new(id, on_behalf_of)) if on_behalf_of.present?
       end

data/app/models/concerns/sufia/generic_file/querying.rb

@@ -7,15 +7,19 @@ module Sufia
         # query to find generic files created during the time range
         # @param [DateTime] start_datetime starting date time for range query
         # @param [DateTime] end_datetime ending date time for range query
-        def find_by_date_created(start_datetime, end_datetime=nil)
-          return [] if start_datetime.blank?  # no date just return nothing
-          start_date_str =  start_datetime.utc.strftime(self.date_format)
+        def find_by_date_created(start_datetime, end_datetime = nil)
+          return [] if start_datetime.blank? # no date just return nothing
+          where(build_date_query(start_datetime, end_datetime))
+        end
+
+        def build_date_query(start_datetime, end_datetime)
+          start_date_str =  start_datetime.utc.strftime(date_format)
           end_date_str = if end_datetime.blank?
                            "*"
                          else
-                           end_datetime.utc.strftime(self.date_format)
+                           end_datetime.utc.strftime(date_format)
                          end
-          where "system_create_dtsi:[#{start_date_str} TO #{end_date_str}]"
+          "system_create_dtsi:[#{start_date_str} TO #{end_date_str}]"
         end
 
         def where_private

data/app/models/concerns/sufia/generic_file/trophies.rb

@@ -7,7 +7,7 @@ module Sufia
       end
 
       def cleanup_trophies
-        Trophy.destroy_all(generic_file_id: self.id)
+        Trophy.destroy_all(generic_file_id: id)
       end
     end
   end

data/app/models/concerns/sufia/generic_file/versions.rb

@@ -1,16 +1,12 @@
 module Sufia
   module GenericFile
     module Versions
-      @@count = 0
       def record_version_committer(user)
         version = content.latest_version
         # content datastream not (yet?) present
         return if version.nil?
-        @@count += 1
-        # raise "Recording #{@@count} #{version.uri} for #{user.user_key}" if @@count == 3
         VersionCommitter.create(version_id: version.uri, committer_login: user.user_key)
       end
-
     end
   end
 end

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

@@ -15,6 +15,5 @@ module Sufia
         "No Title"
       end
     end
-
   end
 end

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

@@ -43,7 +43,7 @@ module Sufia::User
   end
 
   def zotero_token
-    self[:zotero_token].blank? ? nil : Marshal::load(self[:zotero_token])
+    self[:zotero_token].blank? ? nil : Marshal.load(self[:zotero_token])
   end
 
   def zotero_token=(value)
@@ -51,7 +51,7 @@ module Sufia::User
       # Resetting the token
       self[:zotero_token] = value
     else
-      self[:zotero_token] = Marshal::dump(value)
+      self[:zotero_token] = Marshal.dump(value)
     end
   end
 
@@ -72,14 +72,14 @@ module Sufia::User
     #   1. validation has already flagged the ORCID as invalid
     #   2. the orcid field is blank
     #   3. the orcid is already in its normalized form
-    return if self.errors[:orcid].first.present? || self.orcid.blank? || self.orcid.starts_with?('http://orcid.org/')
-    bare_orcid = Sufia::OrcidValidator.match(self.orcid).string
+    return if errors[:orcid].first.present? || orcid.blank? || orcid.starts_with?('http://orcid.org/')
+    bare_orcid = Sufia::OrcidValidator.match(orcid).string
     self.orcid = "http://orcid.org/#{bare_orcid}"
   end
 
   # Format the json for select2 which requires just an id and a field called text.
   # If we need an alternate format we should probably look at a json template gem
-  def as_json(opts = nil)
+  def as_json(_opts = nil)
     { id: user_key, text: display_name ? "#{display_name} (#{user_key})" : user_key }
   end
 
@@ -89,18 +89,18 @@ module Sufia::User
   end
 
   def email_address
-    self.email
+    email
   end
 
   def name
-    self.display_name.titleize || raise
+    display_name.titleize || raise
   rescue
-    self.user_key
+    user_key
   end
 
   # Redefine this for more intuitive keys in Redis
   def to_param
-    # hack because rails doesn't like periods in urls.
+    # HACK: because rails doesn't like periods in urls.
     user_key.gsub(/\./, '-dot-')
   end
 
@@ -116,20 +116,20 @@ module Sufia::User
   end
 
   # method needed for messaging
-  def mailboxer_email(obj=nil)
+  def mailboxer_email(_obj = nil)
     nil
   end
 
   # The basic groups method, override or will fallback to Sufia::Ldap::User
   def groups
-    @groups ||= self.group_list ? self.group_list.split(";?;") : []
+    @groups ||= group_list ? group_list.split(";?;") : []
   end
 
   def ability
     @ability ||= ::Ability.new(self)
   end
 
-  def get_all_user_activity( since = DateTime.now.to_i - 8640)
+  def all_user_activity(since = DateTime.now.to_i - 8640)
     events = self.events.reverse.collect { |event| event if event[:timestamp].to_i > since }.compact
     profile_events = self.profile_events.reverse.collect { |event| event if event[:timestamp].to_i > since }.compact
     events.concat(profile_events).sort { |a, b| b[:timestamp].to_i <=> a[:timestamp].to_i }
@@ -146,7 +146,7 @@ module Sufia::User
 
     # Override this method if you aren't using email/password
     def audituser
-      User.find_by_user_key(audituser_key) || User.create!(Devise.authentication_keys.first => audituser_key, password: Devise.friendly_token[0,20])
+      User.find_by_user_key(audituser_key) || User.create!(Devise.authentication_keys.first => audituser_key, password: Devise.friendly_token[0, 20])
     end
 
     # Override this method if you aren't using email as the userkey
@@ -156,7 +156,7 @@ module Sufia::User
 
     # Override this method if you aren't using email/password
     def batchuser
-      User.find_by_user_key(batchuser_key) || User.create!(Devise.authentication_keys.first => batchuser_key, password: Devise.friendly_token[0,20])
+      User.find_by_user_key(batchuser_key) || User.create!(Devise.authentication_keys.first => batchuser_key, password: Devise.friendly_token[0, 20])
     end
 
     # Override this method if you aren't using email as the userkey
@@ -170,7 +170,7 @@ module Sufia::User
 
     def recent_users(start_date, end_date = nil)
       end_date ||= DateTime.now # doing or eq here so that if the user passes nil we still get now
-      return User.where(created_at: start_date..end_date)
+      User.where(created_at: start_date..end_date)
     end
   end
 end

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

@@ -1,5 +1,4 @@
 module Sufia::UserUsageStats
-
   def stats
     @stats ||= UserStat.where(user_id: id).order(date: :asc)
   end
@@ -11,5 +10,4 @@ module Sufia::UserUsageStats
   def total_file_downloads
     stats.reduce(0) { |total, stat| total + stat.file_downloads }
   end
-
 end

data/app/models/datastreams/fits_datastream.rb

@@ -5,13 +5,13 @@ class FitsDatastream < ActiveFedora::OmDatastream
     t.root(path: "fits",
            xmlns: "http://hul.harvard.edu/ois/xml/ns/fits/fits_output",
            schema: "http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd")
-    t.identification {
-      t.identity {
-        t.format_label(path: {attribute: "format"})
-        t.mime_type(path: {attribute: "mimetype"})
-      }
-    }
-    t.fileinfo {
+    t.identification do
+      t.identity do
+        t.format_label(path: { attribute: "format" })
+        t.mime_type(path: { attribute: "mimetype" })
+      end
+    end
+    t.fileinfo do
       t.file_size(path: "size")
       t.last_modified(path: "lastmodified")
       t.filename(path: "filename")
@@ -19,14 +19,14 @@ class FitsDatastream < ActiveFedora::OmDatastream
       t.rights_basis(path: "rightsBasis")
       t.copyright_basis(path: "copyrightBasis")
       t.copyright_note(path: "copyrightNote")
-    }
-    t.filestatus {
+    end
+    t.filestatus do
       t.well_formed(path: "well-formed")
       t.valid(path: "valid")
       t.status_message(path: "message")
-    }
-    t.metadata {
-      t.document {
+    end
+    t.metadata do
+      t.document do
         t.file_title(path: "title")
         t.file_author(path: "author")
         t.file_language(path: "language")
@@ -37,8 +37,8 @@ class FitsDatastream < ActiveFedora::OmDatastream
         t.line_count(path: "lineCount")
         t.table_count(path: "tableCount")
         t.graphics_count(path: "graphicsCount")
-      }
-      t.image {
+      end
+      t.image do
         t.byte_order(path: "byteOrder")
         t.compression(path: "compressionScheme")
         t.width(path: "imageWidth")
@@ -55,28 +55,28 @@ class FitsDatastream < ActiveFedora::OmDatastream
         t.gps_timestamp(path: "gpsTimeStamp")
         t.latitude(path: "gpsDestLatitude")
         t.longitude(path: "gpsDestLongitude")
-      }
-      t.text {
+      end
+      t.text do
         t.character_set(path: "charset")
         t.markup_basis(path: "markupBasis")
         t.markup_language(path: "markupLanguage")
-      }
-      t.audio {
+      end
+      t.audio do
         t.duration(path: "duration")
         t.bit_depth(path: "bitDepth")
         t.sample_rate(path: "sampleRate")
         t.channels(path: "channels")
         t.data_format(path: "dataFormatType")
         t.offset(path: "offset")
-      }
-      t.video {
+      end
+      t.video do
         t.width(path: "imageWidth")
         t.height(path: "imageHeight")
         t.duration(path: "duration")
         t.sample_rate(path: "sampleRate")
         t.frame_rate(path: "frameRate")
-      }
-    }
+      end
+    end
     t.format_label(proxy: [:identification, :identity, :format_label])
     t.mime_type(proxy: [:identification, :identity, :mime_type])
     t.file_size(proxy: [:fileinfo, :file_size])
@@ -102,7 +102,7 @@ class FitsDatastream < ActiveFedora::OmDatastream
     t.byte_order(proxy: [:metadata, :image, :byte_order])
     t.compression(proxy: [:metadata, :image, :compression])
     t.width(proxy: [:metadata, :image, :width])
-    t.video_width( proxy: [:metadata, :video, :width])
+    t.video_width(proxy: [:metadata, :video, :width])
     t.height(proxy: [:metadata, :image, :height])
     t.video_height(proxy: [:metadata, :video, :height])
     t.color_space(proxy: [:metadata, :image, :color_space])
@@ -139,9 +139,9 @@ class FitsDatastream < ActiveFedora::OmDatastream
     "http://hul.harvard.edu/ois/xml/ns/fits/fits_output
     http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd",
                version: "0.6.0",
-               timestamp: "1/25/12 11:04 AM") {
+               timestamp: "1/25/12 11:04 AM") do
         xml.identification { xml.identity(toolname: 'FITS') }
-      }
+      end
     end
     builder.doc
   end

data/app/models/domain_term.rb

@@ -1,5 +1,4 @@
 class DomainTerm < ActiveRecord::Base
-
-  # TODO we should add an index on this join table and remove the uniq query
-  has_and_belongs_to_many :local_authorities, -> {uniq}
+  # TODO: we should add an index on this join table and remove the uniq query
+  has_and_belongs_to_many :local_authorities, -> { uniq }
 end

data/app/models/featured_work.rb

@@ -1,14 +1,13 @@
 class FeaturedWork < ActiveRecord::Base
   FEATURE_LIMIT = 5
   validate :count_within_limit, on: :create
-  validates :order, inclusion: { in: Proc.new{ 0..FEATURE_LIMIT } }
+  validates :order, inclusion: { in: proc { 0..FEATURE_LIMIT } }
 
   default_scope { order(:order) }
 
   def count_within_limit
-    unless FeaturedWork.can_create_another?
-      errors.add(:base, "Limited to #{FEATURE_LIMIT} featured works.")
-    end
+    return if FeaturedWork.can_create_another?
+    errors.add(:base, "Limited to #{FEATURE_LIMIT} featured works.")
   end
 
   attr_accessor :generic_file_solr_document
@@ -19,4 +18,3 @@ class FeaturedWork < ActiveRecord::Base
     end
   end
 end
-