sufia 3.6.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 600ffd64ac5050922d558df0919adff82b5c86e9
-  data.tar.gz: 1c3206cbd65b85dfdbc75c37a0fd539aa577518e
+  metadata.gz: b53a899aa9c270ada0aab595ca8da81fc10d7325
+  data.tar.gz: 2acd0577db3a932cc963588569d7bde1e96a8bb5
 SHA512:
-  metadata.gz: f5b565ade76f51e2b2a89d291c0bea3413c90c4e7a3769fdf5d87baa16d727aa7bc3bd76719cb8722975402540187c703ec7df09adbc1d8f8c30a0eec84b25b6
-  data.tar.gz: 40a89c2d24aa9a953991eeb6d7453ab3de9e4e935445a122680f791172c45aa85971c6ec977f84dfe010bf0817cf51668bdd264174f15e529847b14b4272baa4
+  metadata.gz: a85c16093df9b3a1baded8276f9bdd8f38f93c45c448c36658cba440fc4d5527c0b7fa031a0a8f78d01c89cd73deb2930df1be6eaa36721b949233f3c8339be0
+  data.tar.gz: 81ef3a1faa2ceba2551cf4039ae9fffc8a87e78b853fc8eeb250ffac73579f15d75edf6f62b829b08a936ee9bc3403d4f63108c72edd16d9c4f058330e490c90

data/SUFIA_VERSION

@@ -1 +1 @@
-3.6.0
+3.6.1

data/app/views/users/edit.html.erb

@@ -9,10 +9,9 @@ $("a[rel=popover]").popover({ html: true });
     <div class="control-group">
       <%= f.label :avatar, '<i class="icon-camera-retro"></i> Change picture'.html_safe, :class => "control-label" %>
       <div class="controls">
-        <% if @user.avatar? %>
-          <%= image_tag @user.avatar.url(:thumb) %>
-        <% end %>
+        <%= image_tag @user.avatar.url(:thumb) if @user.avatar? %>
         <%= f.file_field :avatar %>
+        <%= f.hidden_field :avatar_cache %>
         <span class="label label-important">JPG, GIF, or PNG (less than 2MB)</span>
       </div>
     </div>
@@ -21,7 +20,7 @@ $("a[rel=popover]").popover({ html: true });
       <%= f.label :delete_avatar, '<i class="icon-remove"></i> Delete picture'.html_safe, :class => 'control-label' %>
       <div class="controls">
         <label class="checkbox">
-          <%= check_box_tag 'delete_avatar' %> Yes
+          <%= f.check_box :remove_avatar %> Yes
           <a href="#" id="delete_picture_help" rel="popover" data-content="If you would like to remove your picture entirely, check the box and save your profile." data-original-title="Delete Picture"><i class="icon-question-sign icon-large"></i></a>
         </label>
       </div>
@@ -60,7 +59,6 @@ $("a[rel=popover]").popover({ html: true });
 
     <%= render :partial => 'trophy_edit', :locals => {:trophies => @trophies} %>
 
-
     <div class="form-actions">
       <%= f.button '<i class="icon-save"></i> Save Profile'.html_safe, :type => 'submit', :class => "btn-primary btn-large" %>
     </div>
@@ -78,4 +76,3 @@ $("a[rel=popover]").popover({ html: true });
     <i class="icon-caret-right"></i> <%= g %><br />
   <% end %>
 </div>
-

data/lib/sufia/version.rb

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

data/spec/controllers/users_controller_spec.rb

@@ -69,7 +69,7 @@ describe UsersController do
       flash[:alert].should include("Permission denied: cannot access this page.")
     end
     it "should set an avatar and redirect to profile" do
-      @user.avatar.file?.should be_false
+      @user.avatar?.should be_false
       s1 = double('one')
       UserEditProfileEventJob.should_receive(:new).with(@user.user_key).and_return(s1)
       Sufia.queue.should_receive(:push).with(s1).once
@@ -77,23 +77,21 @@ describe UsersController do
       post :update, id: @user.user_key, user: { avatar: f }
       response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@user.user_key,'@.')))
       flash[:notice].should include("Your profile has been updated")
-      User.find_by_user_key(@user.user_key).avatar.file?.should be_true
+      User.find_by_user_key(@user.user_key).avatar?.should be_true
     end
     it "should validate the content type of an avatar" do
-      #Resque.should_receive(:enqueue).with(UserEditProfileEventJob, @user.user_key).never
       Sufia.queue.should_receive(:push).never
       f = fixture_file_upload('/image.jp2', 'image/jp2')
       post :update, id: @user.user_key, user: { avatar: f }
       response.should redirect_to(@routes.url_helpers.edit_profile_path(URI.escape(@user.user_key,'@.')))
-      flash[:alert].should include("Avatar content type is invalid")
+      flash[:alert].should include("Avatar You are not allowed to upload \"jp2\" files, allowed types: jpg, jpeg, png, gif, bmp, tif, tiff")
     end
     it "should validate the size of an avatar" do
       f = fixture_file_upload('/4-20.png', 'image/png')
-      #Resque.should_receive(:enqueue).with(UserEditProfileEventJob, @user.user_key).never
       Sufia.queue.should_receive(:push).never
       post :update, id: @user.user_key, user: { avatar: f }
       response.should redirect_to(@routes.url_helpers.edit_profile_path(URI.escape(@user.user_key,'@.')))
-      flash[:alert].should include("Avatar file size must be less than 2097152 Bytes")
+      flash[:alert].should include("Avatar file size must be less than 2MB")
     end
     it "should delete an avatar" do
       s1 = double('one')
@@ -102,7 +100,7 @@ describe UsersController do
       post :update, id: @user.user_key, delete_avatar: true
       response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@user.user_key,'@.')))
       flash[:notice].should include("Your profile has been updated")
-      @user.avatar.file?.should be_false
+      @user.avatar?.should be_false
     end
     it "should refresh directory attributes" do
       s1 = double('one')
@@ -132,11 +130,11 @@ describe UsersController do
       file_id = f.pid.split(":").last
       Trophy.create(:generic_file_id => file_id, :user_id => @user.id)
       @user.trophy_ids.length.should == 1
-      post :update, id: @user.user_key,  'remove_trophy_'+file_id=> 'yes' 
+      post :update, id: @user.user_key,  'remove_trophy_'+file_id=> 'yes'
       response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@user.user_key,'@.')))
       flash[:notice].should include("Your profile has been updated")
       @user.trophy_ids.length.should == 0
-      f.destroy 
+      f.destroy
     end
   end
   describe "#follow" do

data/sufia-models/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/sufia-models/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/sufia-models/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/sufia-models/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/sufia-models/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/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/sufia-models/lib/sufia/models/version.rb

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

data/sufia-models/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
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Justin Coyne
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.6.1
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -613,6 +613,8 @@ files:
 - sufia-models/app/models/local_authority_entry.rb
 - sufia-models/app/models/single_use_link.rb
 - sufia-models/app/models/subject_local_authority_entry.rb
+- sufia-models/app/models/sufia/avatar_uploader.rb
+- sufia-models/app/models/sufia/avatar_validator.rb
 - sufia-models/app/models/trophy.rb
 - sufia-models/app/models/version_committer.rb
 - sufia-models/config/locales/sufia.en.yml