remove some of the crop code.

3 files changed, 1 insertions, 72 deletions

diff --git a/app/models/photo.rb b/app/models/photo.rb
index ddbcfa0f..b32e61f0 100644
--- a/app/models/photo.rb
+++ b/app/models/photo.rb
@@ -4,27 +4,11 @@ class Photo < ActiveRecord::Base
   validates :image,  :presence => true
   mount_uploader :image, PhotoUploader
   process_in_background :image
-  #attr_accessor :crop_x, :crop_y, :crop_h, :crop_w
-  #after_update :reprocess_image, :if => :cropping?
-
-  #after_save :enqueue
-
-  #def reprocess_image
-    #begin
-      #self.image.recreate_versions!
-    #rescue Exception => e
-      #logger.error e.message
-      #logger.error e.backtrace.inspect
-    #end
-  #end
-  #def cropping?
-    #!crop_x.blank? && !crop_y.blank? && !crop_w.blank? && !crop_h.blank?
-  #end
 
   def watermark
     creation.watermark
   end
-  
+
   def to_s
     "#{id} #{image}"
   end
diff --git a/app/uploaders/photo_uploader.rb b/app/uploaders/photo_uploader.rb
index 5e39fcc3..f2b0c0c5 100644
--- a/app/uploaders/photo_uploader.rb
+++ b/app/uploaders/photo_uploader.rb
@@ -1,8 +1,6 @@
 # encoding: utf-8
-#require File.join(Rails.root, "lib", "carrier_wave", "delayed_job")
 
 class PhotoUploader < CarrierWave::Uploader::Base
-  #include CarrierWave::Delayed::Job
   include CarrierWave::RMagick
   include CarrierWave::MimeTypes
   include ::CarrierWave::Backgrounder::Delay
@@ -27,7 +25,6 @@ class PhotoUploader < CarrierWave::Uploader::Base
   # Create different versions of your uploaded files:
   version :large do 
     process :resize_to_fit => [910, 630]
-    #process :manualcrop
     process :watermark
   end
   version :thumb, :from_version => :large do
@@ -51,12 +48,6 @@ class PhotoUploader < CarrierWave::Uploader::Base
     end
   end
 
-  def manualcrop
-    manipulate! do |img|
-      img = img.crop(model.crop_x.to_i, model.crop_y.to_i, model.crop_w.to_i, model.crop_h.to_i)
-    end
-  end
-
   # Add a white list of extensions which are allowed to be uploaded.
   # For images you might use something like this:
   def extension_white_list
diff --git a/lib/carrier_wave/delayed_job.rb b/lib/carrier_wave/delayed_job.rb
deleted file mode 100644
index a155f30f..00000000
--- a/lib/carrier_wave/delayed_job.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-module CarrierWave
-  module Delayed
-    module Job
-      module ActiveRecordInterface
-        def delay_carrierwave
-          @delay_carrierwave ||= true
-        end
-
-        def delay_carrierwave=(delay)
-          @delay_carrierwave = delay
-        end
-
-        def perform
-          asset_name = self.class.uploader_options.keys.first
-          self.send(asset_name).versions.each_pair do |key, value|
-            value.process_without_delay!
-          end
-        end
-
-        private
-
-        def enqueue
-          ::Delayed::Job.enqueue self
-        end
-      end
-
-      def self.included(base)
-        base.extend ClassMethods
-      end
-
-      module ClassMethods
-        def self.extended(base)
-          base.send(:include, InstanceMethods)
-          base.alias_method_chain :process!, :delay
-          ::ActiveRecord::Base.send(:include, CarrierWave::Delayed::Job::ActiveRecordInterface)
-        end
-
-        module InstanceMethods
-          def process_with_delay!(new_file)
-            process_without_delay!(new_file) unless model.delay_carrierwave
-          end
-        end
-      end
-    end
-  end
-end