carrierwave-crop-on-fly 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae1c3a2e5a28db8ec8637636e47c30ce399cec08
-  data.tar.gz: 774ed5cf3dcea2d7449ecf19b4182d3d3cee036b
+  metadata.gz: f927f9ed855671678507c3161d27858bf319b856
+  data.tar.gz: 1e7f42e6eaa650022d24d1d2779c1fdb2fe7f012
 SHA512:
-  metadata.gz: 984cf12d64ed99cecd102d500c7158629b765046fc90b6c353736eb79b553fc9e5e3e1443a8866353f0cc44066fd39241a8af3299f29fafac5369195d437edb4
-  data.tar.gz: 7b6dd94b32cc06e866c83a276664b910dceaf9a7c7590ab8691ce71e640410c4b8c73b7f7e5583aaef9e47dfb5d745470fe7bd4ab6596577a6250c5bac9ff8d3
+  metadata.gz: 63b28fa20eb4e74a03efaae32e3f8f10ab17ea4816dcaf34f93fe0dfcdd9d32b0a0a78e23e5e02eef31356f093f805046b82036bc6217604057e03e9030427f4
+  data.tar.gz: 203a5878dabdcbc68b539e2959e89203f5f7242555a239f111b73cddc3410d6fbc4bd5602a9333565713d57190a6de3ffb7bf57aa1978ea5562328a808a7e7ba

data/README.md

@@ -8,19 +8,33 @@ this gem based on [carrierwave-crop](https://github.com/kirtithorat/carrierwave-
 
 Install the latest stable release:
 
+```Shell
     $[sudo] gem install carrierwave-crop-on-fly
+```
 
 In Rails, add it to your Gemfile:
 
+```Ruby
     gem 'carrierwave-crop-on-fly'
+```
     
-Also you must add mini_magick gem
+Also you must add mini_magick or rmagick gem
 
+```Ruby
     gem 'mini_magick'
+```
+
+or
+
+```Ruby
+    gem 'rmagick'
+```
 
 And then execute:
 
+```Shell
     $ bundle
+```
 
 Finally, restart the server to apply the changes.
 
@@ -30,6 +44,7 @@ Add the required files in assets
 
 In .js file
 
+```javascript
     //= require jquery
     //= require jcrop.js
     //= require_self
@@ -37,35 +52,48 @@ In .js file
     $(document).ready(function() {
         document.jcrop.init({ file_input_id: 'user_avatar' });
     });
+```
 
 In .css file
 
+```css
     *= require jquery.jcrop
     *= require jcrop_fix
+```
 
 ## Usage
 
 Open your model file and add the CarrierWave uploader:
 
+```Ruby
     class User < ActiveRecord::Base
       mount_uploader :avatar, AvatarUploader
     end
+```
 
 In the CarrierWave uploader:
 
-    class BaseUploader < CarrierWave::Uploader::Base
+```Ruby
+    class AvatarUploader < CarrierWave::Uploader::Base
+      # use mini_magick
       include CarrierWave::MiniMagick
+      # or you may use rmagick:
+      # include CarrierWave::RMagick
+
       process crop: [100, 100]
     end
+```
 
 In the view:
 
+```erb
     <%= form_for @user do |f| %>
       <%= f.file_field :avatar %>
       <%= f.cropbox :avatar, width: 300, height: 300 %>
       <%= f.previewbox :avatar %>
       <%= f.submit 'Crop' %>
     <% end %>
+```
 
 ### Credits and resources
 * [CarrierWave](https://github.com/carrierwaveuploader/carrierwave)

data/lib/carrierwave/crop/uploader_additions.rb

@@ -6,26 +6,33 @@ module CarrierWave
       #  Resizes the original image to 600x600 and then performs cropping
       #  process crop: [600, 600]
       def crop(width = nil, height = nil)
-        if self.respond_to? "resize_to_limit"
-          begin
-            manipulate! do |img|
-              if crop_w.present? && crop_h.present?
-                w = crop_w
-                h = crop_h
-              else
-                orig_w = img['width']
-                orig_h = img['height']
+        raise_missing_processor  unless defined?(CarrierWave::MiniMagick) || defined?(CarrierWave::RMagick)
 
-                ratio = width.to_f / height
-                orig_ratio = orig_w / orig_h
+        proc = ->(original_height, original_width) do
+          if crop_w.present? && crop_h.present?
+            w = crop_w
+            h = crop_h
+          else
+            ratio = width.to_f / height
+            orig_ratio = original_height / original_width
 
-                w = h = [orig_w, orig_h].min
-                if ratio < orig_ratio
-                  w = orig_h * ratio
-                elsif ratio > orig_ratio
-                  h = orig_w * ratio
-                end
-              end
+            w = h = [original_height, original_width].min
+            if ratio < orig_ratio
+              w = original_width * ratio
+            elsif ratio > orig_ratio
+              h = original_height * ratio
+            end
+          end
+
+          { width: w, height: h }
+        end
+
+        if self.is_a?(CarrierWave::MiniMagick)
+          begin
+            manipulate! do |img|
+              sizes = proc.call(img['width'], img['height'])
+              h = sizes[:height]
+              w = sizes[:width]
 
               if crop_x.blank? && crop_y.blank?
                 img.combine_options do |op|
@@ -43,18 +50,34 @@ module CarrierWave
             raise CarrierWave::Crop::ProcessingError, "Failed to crop - #{e.message}"
           end
 
+        elsif self.is_a?(CarrierWave::RMagick)
+          begin
+            manipulate! do |img|
+              sizes = proc.call(img.columns, img.rows)
+              h = sizes[:height]
+              w = sizes[:width]
+
+              if crop_x.blank? && crop_y.blank?
+                img.crop! 'Center', 0, 0, w.to_i, h.to_i
+              else
+                img.crop! crop_x.to_i, crop_y.to_i, w.to_i, h.to_i
+              end
+              img.resize! width, height
+            end
+
+          rescue Exception => e
+            raise CarrierWave::Crop::ProcessingError, "Failed to crop - #{e.message}"
+          end
         else
-          raise CarrierWave::Crop::MissingProcessorError, "Failed to crop #{attachment}. Add mini_magick."
+          raise_missing_processor
         end
       end
 
-      # Checks if the attachment received cropping attributes
-      # @param  attachment [Symbol] Name of the attribute to be croppedv
-      #
-      # @return [Boolean]
-      # def cropping?
-      #   crop_x.present? && crop_y.present? && crop_w.present? && crop_h.present?
-      # end
+      private
+
+      def raise_missing_processor
+        raise CarrierWave::Crop::MissingProcessorError, "Failed to crop #{attachment}. Add mini_magick or rmagick."
+      end
 
     end ## End of UploaderAdditions
   end ## End of Crop

data/lib/carrierwave/crop/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module Crop
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-crop-on-fly
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - evg2108
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-24 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: CarrierWave extension for on fly specifying crop area with preview and cropping