sufia-models 3.6.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 473c65f0756556119b1e9710330f297de48b7515
-  data.tar.gz: 12f4b8a3380a9f839afab703e225e0fafbc6fad1
+  metadata.gz: b91fa92969ab94424eb6e9233e404c26ac564568
+  data.tar.gz: 60b9e09af7c7dba110f6184b840070654de5d390
 SHA512:
-  metadata.gz: 3b5892c1e42e9fefa5f9b64a75cae761c37ff06fba9a8a92b198f20c06982f79943af6f6020a76946b82f81c78f71fc479111da93aa24a850ae71adeb5fc163f
-  data.tar.gz: 534a0750f304ec5600b9eafabfec6fe527241b7e1780d6fe32b01299d186d9d5fce0941ef5aa64986f626318ab998d803d9833e47b47efbe6d07c24f1a2fb17b
+  metadata.gz: e2737bec3c1758c69607aab903e4a4d29a793f8121c8a8ade9d0959c57353c818f6a2c17db8e09028397037819dc2078b9b6dfd5f38e9169b96ead0e1f02b762
+  data.tar.gz: 2e5941ee1cf398cfbba3c6b2714cbe79e72628f5f7dbbd6a3bc7816ef50a53717f723caeadd5c21e21a5522598ccef80cdd00c7e6ae81c26b1f358e209d7eec6

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

@@ -21,14 +21,11 @@ module Sufia::User
     # Setup accessible (or protected) attributes for your model
     deprecated_attr_accessible  *permitted_attributes
 
-    # Add user avatar (via paperclip library)
-    has_attached_file :avatar, :styles => { medium: "300x300>", thumb: "100x100>" }, :default_url => '/assets/missing_:style.png'
-    validates :avatar, :attachment_content_type => { :content_type => /^image\/(jpg|jpeg|pjpeg|png|x-png|gif)$/ }, :if => Proc.new { |p| p.avatar.file? }
-    validates :avatar, :attachment_size => { :less_than => 2.megabytes }, :if => Proc.new { |p| p.avatar.file? }
-
+    mount_uploader :avatar, AvatarUploader, :mount_on => :avatar_file_name
+    validates_with AvatarValidator
   end
 
-  # Format the json for select2 which requires just an id and a field called text. 
+  # 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)
     {id: user_key, text: display_name ? "#{display_name} (#{user_key})" : user_key}
@@ -76,8 +73,8 @@ module Sufia::User
   module ClassMethods
 
     def permitted_attributes
-      [:email, :login, :display_name, :address, :admin_area, 
-        :department, :title, :office, :chat_id, :website, :affiliation, 
+      [:email, :login, :display_name, :address, :admin_area,
+        :department, :title, :office, :chat_id, :website, :affiliation,
         :telephone, :avatar, :group_list, :groups_last_update, :facebook_handle,
         :twitter_handle, :googleplus_handle]
     end

data/app/models/sufia/avatar_uploader.rb

@@ -0,0 +1,22 @@
+class Sufia::AvatarUploader < CarrierWave::Uploader::Base
+  include CarrierWave::MiniMagick
+  include CarrierWave::Compatibility::Paperclip
+
+  process convert: 'png'
+
+  version :medium do
+    process resize_to_limit: [300, 300]
+  end
+
+  version :thumb do
+    process resize_to_limit: [100, 100]
+  end
+
+  def default_url
+    "/assets/missing_#{version_name}.png"
+  end
+
+  def extension_white_list
+    %w(jpg jpeg png gif bmp tif tiff)
+  end
+end

data/app/models/sufia/avatar_validator.rb

@@ -0,0 +1,8 @@
+module Sufia
+  class AvatarValidator < ActiveModel::Validator
+    def validate(record)
+      return unless record.avatar?
+      record.errors.add(:avatar_file_size, 'must be less than 2MB') if record.avatar.size > 2.megabytes.to_i
+    end
+  end
+end

data/lib/generators/sufia/models/templates/migrations/add_avatars_to_users.rb

@@ -1,9 +1,15 @@
 class AddAvatarsToUsers < ActiveRecord::Migration
   def self.up
-    add_attachment :users, :avatar
+    add_column :users, "avatar_file_name",    :string
+    add_column :users, "avatar_content_type", :string
+    add_column :users, "avatar_file_size",    :integer
+    add_column :users, "avatar_updated_at",   :datetime
   end
 
   def self.down
-    remove_attachment :users, :avatar
+    remove_column :users, "avatar_file_name"
+    remove_column :users, "avatar_content_type"
+    remove_column :users, "avatar_file_size"
+    remove_column :users, "avatar_updated_at"
   end
 end

data/lib/sufia/models/engine.rb

@@ -22,7 +22,7 @@ module Sufia
       config.fits_path = "fits.sh"
       config.enable_contact_form_delivery = false
       config.dropbox_api_key = nil
-      config.enable_local_ingest = nil      
+      config.enable_local_ingest = nil
       config.queue = Sufia::Resque::Queue
 
       config.autoload_paths += %W(

data/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "3.6.0"
+    VERSION = "3.6.1"
   end
 end

data/lib/sufia/models.rb

@@ -4,7 +4,7 @@ require 'hydra/head'
 require 'nest'
 require 'mailboxer'
 require 'acts_as_follower'
-require 'paperclip'
+require 'carrierwave'
 require "active_resource" # used by GenericFile to catch errors & by GeoNamesResource
 require 'resque/server'
 

data/sufia-models.gemspec

@@ -29,20 +29,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rails', '> 4.0.0', '< 5.0'
   spec.add_dependency 'activeresource' # No longer a dependency of rails 4.0
 
-  # spec.add_dependency "hydra", "6.1.0.rc2"
-  # Since hydra 6.1 isn't out yet, we'll just build it so that it's compatible
-  # without an explicit dependency
-  spec.add_dependency "active-fedora", "~> 6.7.0"
-  spec.add_dependency "blacklight", "~> 4.5.0"
-  spec.add_dependency "hydra-head", "~> 6.4.0"
-
+  spec.add_dependency "hydra", "6.1.0"
   spec.add_dependency 'nest', '~> 1.1.1'
   spec.add_dependency 'resque', '~> 1.23'
   spec.add_dependency 'resque-pool', '0.3.0'
   spec.add_dependency 'noid', '~> 0.6.6'
   spec.add_dependency 'mailboxer', '~> 0.11.0'
   spec.add_dependency 'acts_as_follower', '>= 0.1.1', '< 0.3'
-  spec.add_dependency 'paperclip', '~> 3.4.0'
+  spec.add_dependency 'carrierwave', '~> 0.9.0'
   spec.add_dependency 'hydra-derivatives', '~> 0.0.5'
   spec.add_dependency 'activerecord-import'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Jeremy Friesen
@@ -73,47 +73,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: active-fedora
+  name: hydra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 6.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 6.7.0
-- !ruby/object:Gem::Dependency
-  name: blacklight
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.5.0
-- !ruby/object:Gem::Dependency
-  name: hydra-head
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: nest
   requirement: !ruby/object:Gem::Requirement
@@ -205,19 +177,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: paperclip
+  name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: hydra-derivatives
   requirement: !ruby/object:Gem::Requirement
@@ -276,6 +248,8 @@ files:
 - app/models/local_authority_entry.rb
 - app/models/single_use_link.rb
 - app/models/subject_local_authority_entry.rb
+- app/models/sufia/avatar_uploader.rb
+- app/models/sufia/avatar_validator.rb
 - app/models/trophy.rb
 - app/models/version_committer.rb
 - config/locales/sufia.en.yml