Merge pull request #145 from mitre/remove_imagemagick

removed imagemagick

Gemfile

@@ -45,7 +45,6 @@ gem 'cancancan', '~> 2.0'
 gem 'pdfkit'
 gem 'render_anywhere'
 gem 'wkhtmltopdf-binary', '0.12.3.1'
-gem 'rmagick'
 gem 'carrierwave'
 gem 'nokogiri-happymapper'
 gem "nokogiri", ">= 1.10.4"

Gemfile.lock

@@ -522,7 +522,6 @@ GEM
       actionpack (>= 5.0)
       railties (>= 5.0)
     retriable (2.1.0)
-    rmagick (4.1.2)
     rolify (5.2.0)
     roo (2.8.2)
       nokogiri (~> 1)
@@ -796,7 +795,6 @@ DEPENDENCIES
   rails_best_practices
   rake-version (~> 1.0)
   render_anywhere
-  rmagick
   rolify
   roo
   rspec-rails (~> 3.6)
@@ -821,4 +819,4 @@ RUBY VERSION
    ruby 2.6.6p146
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

app/controllers/users_controller.rb

@@ -1,7 +1,6 @@
 class UsersController < ApplicationController
   authorize_resource only: [:index, :show, :edit, :destroy, :upload, :image]
   before_action :set_user, only: [:show, :edit, :update, :destroy, :add_role, :remove_role]
-  before_action :rotate, only: :update
   before_action :must_be_admin, only: [:index, :add_role, :remove_role]
 
   # GET /users
@@ -54,12 +53,6 @@ def remove_role
     redirect_to users_url, notice: 'Role was deleted.'
   end
 
-  def rotate
-    rotate = params[:user].delete(:rotate)
-    logger.debug "rotate = #{rotate}"
-    ImageUploader.rotation = rotate.to_f
-  end
-
   # PATCH/PUT /users/1
   # PATCH/PUT /users/1.json
   def update
@@ -112,6 +105,6 @@ def set_user
 
   # Never trust parameters from the scary internet, only allow the white list through.
   def user_params
-    params.require(:user).permit(:first_name, :last_name, :image, :api_key, :rotate)
+    params.require(:user).permit(:first_name, :last_name, :image, :api_key)
   end
 end

app/uploaders/image_uploader.rb

@@ -1,6 +1,5 @@
 class ImageUploader < CarrierWave::Uploader::Base
   # Include RMagick or MiniMagick support:
-  include CarrierWave::RMagick
   # include CarrierWave::MiniMagick
 
   # Choose what kind of storage to use for this uploader:
@@ -18,14 +17,6 @@ def store_dir
     "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
   end
 
-  process :auto_orient # this should go before all other "process" steps
-
-  def auto_orient
-    manipulate! do |image|
-      image.rotate ImageUploader.rotation
-    end
-  end
-
   # Provide a default URL as a default if there hasn't been a file uploaded:
   # def default_url(*args)
   #   # For Rails 3.1+ asset pipeline compatibility:
@@ -43,7 +34,7 @@ def auto_orient
 
   # Create different versions of your uploaded files:
   version :thumb do
-    process resize_to_fit: [50, 50]
+    #process resize_to_fit: [50, 50]
   end
 
   # Add a white list of extensions which are allowed to be uploaded.

app/views/users/show.html.erb

@@ -89,12 +89,6 @@
                     <div class="form-group">
                       <%= f.file_field :image, class: "form-control" %>
                     </div>
-                    <div class="form-group">
-                      <label>
-                        <%= f.check_box("rotate", {:id=> "rotate", :checked=>false}, 90.0, nil) %>
-                        Rotate Image 90 degrees on upload
-                      </label>
-                    </div>
                     <div class="form-group">
                       <%= button_tag(type: "submit", class: "btn btn-primary margin-right") do %>
                         <i class="fa fa-edit"></i> Upload Image