papercrop 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Zjk4MGM0YzdiN2Q3NjNjNGEwN2UzMmI3OGExOWU3YzA5NjNlYzcyYQ==
+  data.tar.gz: !binary |-
+    OTU0MDE4ODM4YmNkNjQ5MTIxMDFiOWJhOGZjMzM0MzE3ZTBmNmUwZQ==
+SHA512:
+  metadata.gz: !binary |-
+    YjRjOTM4MDZkYThjZTNlZGUwMTJmMzQxYjFlMGYxNzdjYzg2MGY3YTEzMDY1
+    OGI5MTY0NTI0ZDA5NzEzMTZlNTdhYWUzMjU3MDE1YmE2YzVjNDYxZjViZTJi
+    ODZmNTY2MWY1OTcwYTBmM2FhOTc0NDA3ZjJlYmU4YzAxN2UzNzA=
+  data.tar.gz: !binary |-
+    M2YzNmQ1NjUwMjEyMDY2MTIxMWIyYjQ0Yzk3NGM4ZTg2NmNkNjM4Mjk5ODkz
+    ZjM3NGQ4ZTAzMWU2MjFkZGE5ZGQ4OTBlMTg4MGJiMmFjYjJhZGY1NWE4NWQ3
+    MDNhNDEzZmQ1YmU3YTRhNDgwYmFmMzc2NzE1NmMzMmMyYzYwYmY=

data/Appraisals

@@ -0,0 +1,10 @@
+
+appraise "rails_3_2" do
+  gem "rails",     "3.2.13"
+  gem "paperclip", "3.4.0"
+end
+
+appraise "rails_4" do
+  gem "rails",     "4.0.2"
+  gem "paperclip", "4.1.0"
+end

data/README.md

@@ -50,13 +50,37 @@ Regardless of the width, the preview box and the cropping area will have the asp
 
 If you're rendering it on ajax ensure to call init_papercrop() in js after loading the crop form to make things work properly.  
 
+### Advanced features
+
+**Unlock aspect ratio**
+
+You can unlock the aspect ratio if you pass false as argument. NOTE: *preview will be disabled*
+
+    crop_attached_file :snapshot, :aspect => false
+
+Regardless the model, you can always redefine/unlock aspect from the helper if you need to.
+
+    f.cropbox :snapshot, :width => 500, :aspect => 4..3
+
+**Chaining processors**
+
+Maybe you want to chain some custom processors to do amazing effects like crop+rotate images. Papercrop will add its processor in last place unless you declare it in the attachment definition
+
+    has_attached_file :landscape, :styles => {:big => '2000x1500'}, 
+                                  :processors => [:papercrop, :rotator]
+
 ### Running the Tests
 
-We are using a dummy application to handle some of our test cases. You can find this in the `/test_app` directory and should be able to run this as a regular Rails 4 app _(using the `rails s` command)_ if you're interested in taking a look. You may need to create the mock database for the `test_app` before your tests will start to pass. This means you need to run `rake db:create db:migrate db:test:prepare` from within the `test_app` directory.
+We are using dummy applications to handle some of our test cases with different Gemfiles using [Appraisal](https://github.com/thoughtbot/appraisal). You can find them in the `/test_apps` directory and should be able to run them as a regular Rails app _(using the `rails s` command)_ if you're interested in taking a look. You may need to create mock databases for the `test_apps` before your tests will start to pass. This means you need to run the classics `rake db:create db:migrate db:test:prepare` through appraisal from the root directory.
+
+    appraisal rails_3_2 rake db:create db:migrate
+    appraisal rails_4 rake db:create db:migrate
+
+Append RAILS_ENV=test to both commands to prepare each database for testing
 
 In order to fully test our gem, we needed to use [Selenium](http://docs.seleniumhq.org/download/). Getting this setup is beyond the scope of this Readme.
 
-Once you have everything setup, you should be able `bundle exec rake` from the root directory have everything run. If you've installed Selenium properly, you should see an automated instance of your browser _(eg. Firefox)_ pop up and run through some of the integration tests.
+Once you have everything setup, you should be able `appraisal rake` from the root directory have everything run. If you've installed Selenium properly, you should see an automated instance of your browser _(eg. Firefox)_ pop up and run through some of the integration tests.
 
 That's all!
 

data/lib/assets/javascripts/papercrop.js

@@ -9,10 +9,14 @@
       var aspect     = $("input#" + attachment + "_aspect").val();
       var width      = $(this).width();
 
+      if (aspect === 'false') {
+        aspect = false
+      }
+
       update_crop = function(coords) {
         var preview_width, rx, ry;
 
-        if (preview) {
+        if (preview && aspect) {
           preview_width = $("#" + attachment + "_crop_preview_wrapper").width();
 
           rx = preview_width / coords.w;
@@ -36,7 +40,7 @@
         onChange    : update_crop,
         onSelect    : update_crop,
         setSelect   : [0, 0, 250, 250],
-        aspectRatio : aspect,
+        aspectRatio : aspect === false ? undefined : aspect,
         boxWidth    : $("input[id$='_" + attachment + "_box_w']").val()
       }, function() {
         jcrop_api = this;

data/lib/paperclip_processors/papercrop.rb

@@ -0,0 +1,33 @@
+require "paperclip"
+
+module Paperclip
+  class Papercrop < Thumbnail
+
+    def transformation_command
+      if crop_command
+        crop_command + super.join(' ').sub(/ -crop \S+/, '').split(' ')
+      else
+        super
+      end
+    end
+
+
+    def crop_command
+      target = @attachment.instance
+
+      if target.cropping?(@attachment.name)
+        begin
+          w = Integer(target.send :"#{@attachment.name}_crop_w")
+          h = Integer(target.send :"#{@attachment.name}_crop_h")
+          x = Integer(target.send :"#{@attachment.name}_crop_x")
+          y = Integer(target.send :"#{@attachment.name}_crop_y")
+          ["-crop", "#{w}x#{h}+#{x}+#{y}"]
+        rescue Exception => e
+          ::Papercrop.log("[papercrop] #{@attachment.name} crop w/h/x/y were non-integer. Error: #{e.to_s}")
+          return 
+        end
+      end
+    end
+
+  end
+end

data/lib/papercrop.rb

@@ -2,4 +2,5 @@ require 'papercrop/engine'
 require 'papercrop/reg_exp'
 require 'papercrop/model_extension'
 require 'papercrop/helpers'
-require 'paperclip_processors/cropper'
+require 'papercrop/logger'
+require 'paperclip_processors/papercrop'

data/lib/papercrop/helpers.rb

@@ -1,10 +1,10 @@
 module Papercrop
   module Helpers
-    
+
     # Form helper to render the cropping preview box of an attachment.
-    # Box width can be handled by setting the :width option. 
+    # Box width can be handled by setting the :width option.
     # Width is 100 by default. Height is calculated by the aspect ratio.
-    # 
+    #
     #   crop_preview :avatar
     #   crop_preview :avatar, :width => 150
     #
@@ -13,7 +13,7 @@ module Papercrop
     def crop_preview(attachment, opts = {})
       attachment = attachment.to_sym
       width      = opts[:width] || 100
-      height     = (width / self.object.send(:"#{attachment}_aspect")).round 
+      height     = (width / self.object.send(:"#{attachment}_aspect")).round
 
       if self.object.send(attachment).class == Paperclip::Attachment
         wrapper_options = {
@@ -34,20 +34,26 @@ module Papercrop
     #
     #   cropbox :avatar, :width => 650
     #
+    # You can override the aspect ratio used by Jcrop, and even unlock it by setting :aspect to a new value or false
+    # 
+    #   cropbox :avatar, :width => 650, :aspect => false
+    #
     # @param attachment [Symbol] attachment name
     # @param opts [Hash]
     def cropbox(attachment, opts = {})
       attachment      = attachment.to_sym
-      original_width  = self.object.image_geometry(attachment, :original).width
-      original_height = self.object.image_geometry(attachment, :original).height
-      box_width       = opts[:width] || original_width
+      original_width  = self.object.image_geometry(attachment, :original).width.to_i
+      original_height = self.object.image_geometry(attachment, :original).height.to_i
+      box_width       = opts.fetch :width,  original_width
+      aspect          = opts.fetch :aspect, self.object.send(:"#{attachment}_aspect")
 
       if self.object.send(attachment).class == Paperclip::Attachment
         box  = self.hidden_field(:"#{attachment}_original_w", :value => original_width)
         box << self.hidden_field(:"#{attachment}_original_h", :value => original_height)
         box << self.hidden_field(:"#{attachment}_box_w",      :value => box_width)
-
-        for attribute in [:crop_x, :crop_y, :crop_w, :crop_h, :aspect] do
+        box << self.hidden_field(:"#{attachment}_aspect",     :value => aspect, :id => "#{attachment}_aspect")
+        
+        for attribute in [:crop_x, :crop_y, :crop_w, :crop_h] do
           box << self.hidden_field(:"#{attachment}_#{attribute}", :id => "#{attachment}_#{attribute}")
         end
 
@@ -64,4 +70,4 @@ if defined? ActionView::Helpers::FormBuilder
   ActionView::Helpers::FormBuilder.class_eval do
     include Papercrop::Helpers
   end
-end
+end

data/lib/papercrop/logger.rb

@@ -0,0 +1,7 @@
+module Papercrop
+
+  # Paperclip log wrapper
+  def self.log(text)
+    Paperclip.log(text)
+  end
+end

data/lib/papercrop/model_extension.rb

@@ -7,42 +7,63 @@ module Papercrop
       #
       #   crop_attached_file :avatar
       #
-      # You can also define an aspect ratio for the crop and preview box through opts[:aspect]
+      # You can also define an initial aspect ratio for the crop and preview box through opts[:aspect]
       #
       #   crop_attached_file :avatar, :aspect => "4:3"
+      # 
+      # Or unlock it
+      # 
+      #   crop_attached_file :avatar, :aspect => false
       #
       # @param attachment_name [Symbol] Name of the desired attachment to crop
       # @param opts [Hash]
+      # @option opts [Range, String, FlaseClass] :aspect
       def crop_attached_file(attachment_name, opts = {})
+        opts = opts.dup
+
         [:crop_x, :crop_y, :crop_w, :crop_h, :original_w, :original_h, :box_w, :aspect, :cropped_geometries].each do |a|
           attr_accessor :"#{attachment_name}_#{a}"
         end
 
-        if opts[:aspect].kind_of?(String) && opts[:aspect] =~ Papercrop::RegExp::ASPECT
-          opts[:aspect] = Range.new *opts[:aspect].split(':').map(&:to_i)
-        end
-
-        unless opts[:aspect].kind_of?(Range)
-          opts[:aspect] = 1..1
-        end
+        aspect = normalize_aspect opts[:aspect]
 
         send :define_method, :"#{attachment_name}_aspect" do
-          opts[:aspect].first.to_f / opts[:aspect].last.to_f
+          aspect.first.to_f / aspect.last.to_f if aspect
         end
 
         if respond_to? :attachment_definitions
-          # for Paperclip <= 3.4 
+          # for Paperclip <= 3.4
           definitions = attachment_definitions
         else
           # for Paperclip >= 3.5
           definitions = Paperclip::Tasks::Attachments.instance.definitions_for(self)
         end
 
-        definitions[attachment_name][:processors] ||= []
-        definitions[attachment_name][:processors] << :cropper
+        processors = definitions[attachment_name][:processors] ||= []
+        unless processors.include? :papercrop
+          processors << :papercrop
+        end
 
         after_update :"reprocess_to_crop_#{attachment_name}_attachment"
       end
+
+
+      # Returns a valid and normalized value for aspect ratio
+      # It will return 1.. if aspect is nil or a invalid string
+      # @param aspect [Range, String, FalseClass]
+      # 
+      # @return [Range]
+      def normalize_aspect(aspect)
+        if aspect.kind_of?(String) && aspect =~ Papercrop::RegExp::ASPECT
+          Range.new *aspect.split(':').map(&:to_i)
+        elsif aspect.kind_of?(Range)
+          return aspect.first.to_i..aspect.last.to_i
+        elsif aspect == false
+          return aspect
+        else
+          1..1
+        end
+      end
     end
 
 
@@ -50,7 +71,7 @@ module Papercrop
 
       # Asks if the attachment received a crop process
       # @param  attachment_name [Symbol]
-      # 
+      #
       # @return [Boolean]
       def cropping?(attachment_name)
         !self.send(:"#{attachment_name}_crop_x").blank? &&
@@ -66,9 +87,12 @@ module Papercrop
       # @param style = :original [Symbol] attachment style
       # @return [Paperclip::Geometry]
       def image_geometry(attachment_name, style = :original)
-        @geometry ||= {}
-        path = (self.send(attachment_name).options[:storage] == :s3) ? self.send(attachment_name).url(style) : self.send(attachment_name).path(style)
-        @geometry[style] ||= Paperclip::Geometry.from_file(path)
+        @geometry                  ||= {}
+        @geometry[attachment_name] ||= {}
+        
+        path = (self.send(attachment_name).options[:storage] == :filesystem) ? self.send(attachment_name).path(style) : self.send(attachment_name).url(style)
+        
+        @geometry[attachment_name][style] ||= Paperclip::Geometry.from_file(path)
       end
 
 
@@ -121,7 +145,7 @@ end
 
 
 # Mongoid support
-if defined? Mongoid::Document 
+if defined? Mongoid::Document
   Mongoid::Document::ClassMethods.module_eval do
     include Papercrop::ModelExtension::ClassMethods
   end

data/spec/helpers/form_helpers_spec.rb

@@ -4,7 +4,7 @@ describe "Form Helpers" do
 
   before do
     @landscape         = Landscape.new(:name => "Mountains")
-    @landscape.picture = open("test_app/test/fixtures/matterhorn.jpg")
+    @landscape.picture = open(mountains_img_path)
     @landscape.save
 
     @box = nil
@@ -17,10 +17,10 @@ describe "Form Helpers" do
     end
     @box = HTML::Document.new(@box)
 
-    assert_select @box.root, 'input#landscape_picture_original_w', :value => "1024.0"
-    assert_select @box.root, 'input#landscape_picture_original_h', :value => "768.0"
-    assert_select @box.root, 'input#landscape_picture_box_w',      :value => "1024.0"
-    assert_select @box.root, 'input#picture_aspect',               :value => @landscape.picture_aspect.to_s
+    assert_select @box.root, 'input#landscape_picture_original_w[value="1024"]'
+    assert_select @box.root, 'input#landscape_picture_original_h[value="768"]'
+    assert_select @box.root, 'input#landscape_picture_box_w[value="1024"]'
+    assert_select @box.root, "input#picture_aspect[value=\"#{@landscape.picture_aspect.to_s}\"]"
     assert_select @box.root, 'input#picture_crop_x'
     assert_select @box.root, 'input#picture_crop_y'
     assert_select @box.root, 'input#picture_crop_w'
@@ -38,7 +38,17 @@ describe "Form Helpers" do
     end
     @box = HTML::Document.new(@box)
 
-    assert_select @box.root, 'input#landscape_picture_box_w', :value => "400"
+    assert_select @box.root, 'input#landscape_picture_box_w[value="400"]'
+  end
+
+
+  it "builds the crop box with unlocked aspect flag" do
+    form_for @landscape do |f|
+      @box = f.cropbox(:picture, :width => 400, :aspect => false)
+    end
+    @box = HTML::Document.new(@box)
+
+    assert_select @box.root, 'input#picture_aspect[value="false"]'
   end
 
 
@@ -48,8 +58,8 @@ describe "Form Helpers" do
     end
     @box = HTML::Document.new(@box)
 
-    assert_select @box.root, 'div#picture_crop_preview_wrapper', :style => "width:100px; height:75px; overflow:hidden" do
-      assert_select 'img#picture_crop_preview', :src => @landscape.picture.path(:original)
+    assert_select @box.root, 'div#picture_crop_preview_wrapper[style="width:100px; height:75px; overflow:hidden"]' do
+      assert_select "img#picture_crop_preview[src=\"#{@landscape.picture.url(:original)}\"]"
     end
   end
 
@@ -60,6 +70,6 @@ describe "Form Helpers" do
     end
     @box = HTML::Document.new(@box)
 
-    assert_select @box.root, 'div#picture_crop_preview_wrapper', :style => "width:40px; height:30px; overflow:hidden"
+    assert_select @box.root, 'div#picture_crop_preview_wrapper[style="width:40px; height:30px; overflow:hidden"]'
   end
-end
+end

data/spec/integration/papercrop_js_spec.rb

@@ -8,7 +8,7 @@ describe "Image crop with JS", :js => true do
     click_link "New Landscape"
 
     fill_in "Name", :with => "Mountains"
-    find("#landscape_picture").native.send_keys(File.expand_path("../../../test_app/test/fixtures/matterhorn.jpg", __FILE__))
+    find("#landscape_picture").native.send_keys(File.expand_path("../../../#{mountains_img_path}", __FILE__))
     click_button "Create Landscape"
 
     sleep 2
@@ -19,7 +19,7 @@ describe "Image crop with JS", :js => true do
     click_button "Crop image"
 
     sleep 1
-    compare_images(CROPPED_IMG_PATH, Landscape.last.picture.path(:medium)).round(2).should eq(0.0)
+    compare_images(expected_mountains_img_path, Landscape.last.picture.path(:medium)).round(2).should eq(0.0)
   end
 
 
@@ -29,7 +29,7 @@ describe "Image crop with JS", :js => true do
     click_link "New Landscape"
 
     fill_in "Name", :with => "Mountains"
-    find("#landscape_picture").native.send_keys(File.expand_path("../../../test_app/test/fixtures/matterhorn.jpg", __FILE__))
+    find("#landscape_picture").native.send_keys(File.expand_path(File.expand_path("../../../#{mountains_img_path}", __FILE__), __FILE__))
     click_button "Create Landscape"
 
     click_button "Crop image"
@@ -45,6 +45,6 @@ describe "Image crop with JS", :js => true do
     click_button "Crop image"
 
     sleep 1
-    compare_images(CROPPED_IMG_PATH, Landscape.last.picture.path(:medium)).round(2).should eq(0.0)
+    compare_images(expected_mountains_img_path, Landscape.last.picture.path(:medium)).round(2).should eq(0.0)
   end
 end

data/spec/integration/papercrop_spec.rb

@@ -8,7 +8,7 @@ describe "Image crop" do
     click_link "New Landscape"
 
     fill_in      "Name", :with => "Mountains"
-    attach_file  "Picture", "test_app/test/fixtures/matterhorn.jpg"
+    attach_file  "Picture", mountains_img_path
     click_button "Create Landscape"
 
     page.should have_css("#picture_crop_preview_wrapper")
@@ -17,18 +17,18 @@ describe "Image crop" do
 
     page.should have_css("#landscape_picture_original_w")
 
-    find("#landscape_picture_original_w").value.should eq("1024.0")
-    find("#landscape_picture_original_h").value.should eq("768.0")
+    find("#landscape_picture_original_w").value.should eq("1024")
+    find("#landscape_picture_original_h").value.should eq("768")
     find("#landscape_picture_box_w").value.should      eq("600")
     find("#picture_aspect").value.should               eq((4.0 / 3.0).to_s)
 
-    find("#picture_crop_x").set "300.0"
-    find("#picture_crop_y").set "200.0"
+    find("#picture_crop_x").set "300"
+    find("#picture_crop_y").set "200"
     find("#picture_crop_w").set "400"
     find("#picture_crop_h").set "300"
 
     click_button "Crop image"
     
-    compare_images(CROPPED_IMG_PATH, Landscape.last.picture.path(:medium)).round(2).should eq(0.0)
+    compare_images(expected_mountains_img_path, Landscape.last.picture.path(:medium)).round(2).should eq(0.0)
   end
 end

data/spec/model_extensions/model_extension_spec.rb

@@ -4,14 +4,19 @@ describe "Model Extension" do
 
   before do
     @landscape         = Landscape.new(:name => "Mountains")
-    @landscape.picture = open("test_app/test/fixtures/matterhorn.jpg")
+    @landscape.picture = open(mountains_img_path)
     @landscape.save
+
+    @user = User.new(:name => "Bert", :email => "bert@sesame.street")
+    @user.avatar    = open(bert_img_path)
+    @user.signature = open(mountains_img_path)
+    @user.save
   end
 
 
   it "clears the crop attributes" do
-    @landscape.picture_crop_x = 0.0
-    @landscape.picture_crop_y = 0.0
+    @landscape.picture_crop_x = 0
+    @landscape.picture_crop_y = 0
     @landscape.picture_crop_w = 400
     @landscape.picture_crop_h = 300
     @landscape.reset_crop_attributes_of(:picture)
@@ -24,13 +29,13 @@ describe "Model Extension" do
 
 
   it "crops images" do
-    @landscape.picture_crop_x = 300.0
-    @landscape.picture_crop_y = 200.0
+    @landscape.picture_crop_x = 300
+    @landscape.picture_crop_y = 200
     @landscape.picture_crop_w = 400
     @landscape.picture_crop_h = 300
     @landscape.save
     # Rounding to account for different versions of imagemagick
-    compare_images(CROPPED_IMG_PATH, @landscape.picture.path(:medium)).round(2).should eq(0.0)
+    compare_images(expected_mountains_img_path, @landscape.picture.path(:medium)).round(2).should eq(0.0)
   end
 
 
@@ -51,25 +56,73 @@ describe "Model Extension" do
   
   it "knows when to crop" do
     @landscape.cropping?(:picture).should be(false)
-    @landscape.picture_crop_x = 0.0
-    @landscape.picture_crop_y = 0.0
+    @landscape.picture_crop_x = 0
+    @landscape.picture_crop_y = 0
     @landscape.picture_crop_w = 400
     @landscape.picture_crop_h = 300
     @landscape.cropping?(:picture).should be(true)
   end
 
 
+  it "normalizes aspect ratio" do 
+    Landscape.normalize_aspect(4..3).should     eq(4..3)
+    Landscape.normalize_aspect("4:3").should    eq(4..3)
+    Landscape.normalize_aspect("4".."3").should eq(4..3)
+    Landscape.normalize_aspect(4.0..3.0).should eq(4..3)
+    Landscape.normalize_aspect(false).should    eq(false)
+    Landscape.normalize_aspect(nil).should      eq(1..1)
+    Landscape.normalize_aspect(true).should     eq(1..1)
+    Landscape.normalize_aspect("foo").should    eq(1..1)
+  end
+
+
   it "registers the post processor" do
-    definitions = Paperclip::AttachmentRegistry.definitions_for(Landscape)
-    definitions[:picture][:processors].should eq([:cropper])
+    definitions = retrieve_attachment_definitions_for(Landscape)
+
+    definitions[:picture][:processors].should eq([:papercrop])
+  end
+
+
+  it "does not register the processor if it's already there" do
+    Landscape.has_attached_file :processed, :styles => {:medium => "200x200#"}, :processors => [:papercrop, :rotator]
+    Landscape.crop_attached_file :processed
+
+    definitions = retrieve_attachment_definitions_for(Landscape)
+
+    definitions[:processed][:processors].should eq([:papercrop, :rotator])
+
+    Landscape._update_callbacks.delete_if {|e| e.instance_values['filter'] == :reprocess_to_crop_processed_attachment } 
   end
 
 
   it "returns image properties" do
     @landscape.picture_aspect.should eq(4.0 / 3.0)
 
-    @landscape.image_geometry(:picture).width.should  eq(1024.0)
-    @landscape.image_geometry(:picture).height.should eq(768.0)
+    @landscape.image_geometry(:picture).width.should  eq(1024)
+    @landscape.image_geometry(:picture).height.should eq(768)
+  end
+
+
+  it "returns image geometry for two attachments" do
+    @user.image_geometry(:avatar).width.should              eq(900)
+    @user.image_geometry(:avatar).height.should             eq(900)
+    @user.image_geometry(:avatar, :medium).width.should     eq(200)
+    @user.image_geometry(:avatar, :medium).height.should    eq(200)
+    @user.image_geometry(:signature).width.should           eq(1024)
+    @user.image_geometry(:signature).height.should          eq(768)
+    @user.image_geometry(:signature, :medium).width.should  eq(496)
+    @user.image_geometry(:signature, :medium).height.should eq(279)
+  end
+
+
+  it "sanitizes processor" do  
+    Papercrop.expects(:log).with('[papercrop] picture crop w/h/x/y were non-integer. Error: invalid value for Integer(): "evil code"').twice
+  
+    @landscape.picture_crop_x = "evil code"
+    @landscape.picture_crop_y = 200
+    @landscape.picture_crop_w = 400
+    @landscape.picture_crop_h = 300
+    @landscape.save
   end
 
 
@@ -80,4 +133,13 @@ describe "Model Extension" do
 
     @landscape.image_geometry(:picture)
   end
+
+
+  it "returns url for fog storage" do
+    @landscape.picture.expects(:url).returns("http://some-aws-s3-fog-storage-url").once
+    @landscape.picture.expects(:options).returns(:storage => :fog).once
+    Paperclip::Geometry.expects(:from_file).with("http://some-aws-s3-fog-storage-url").once
+
+    @landscape.image_geometry(:picture)
+  end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] = 'test'
-require File.expand_path("../../test_app/config/environment", __FILE__)
+ENV["TEST_APP"]  ||= 'rails_4'
+
+require File.expand_path("../../test_apps/#{ENV["TEST_APP"]}/config/environment", __FILE__)
 require 'rspec/rails'
 require 'rspec/autorun'
 require 'database_cleaner'
@@ -9,9 +11,6 @@ require 'database_cleaner'
 # in spec/support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-# Previously cropped image. Used for comparing test cropped images with RMagick
-CROPPED_IMG_PATH = "test_app/test/fixtures/test_img.jpg"
-
 RSpec.configure do |config|
   # ## Mock Framework
   #

data/spec/support/compare_images.rb

@@ -5,4 +5,28 @@ def compare_images(test_image_path, cropped_image_path)
   target_img = Magick::Image::read(cropped_image_path).first
   
   test_img.compare_channel(target_img, Magick::MeanAbsoluteErrorMetric).second
+end
+
+
+def retrieve_attachment_definitions_for(model_class)
+  if model_class.respond_to?(:attachment_definitions)
+    model_class.attachment_definitions
+  else
+    Paperclip::AttachmentRegistry.definitions_for(model_class)
+  end
+end
+
+
+def mountains_img_path
+  "spec/fixtures/mountains.jpg"
+end
+
+
+def expected_mountains_img_path
+  "spec/fixtures/mountains_expected_result.jpg"
+end
+
+
+def bert_img_path
+  "spec/fixtures/bert.jpg"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: papercrop
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Ruben Santamaria
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -182,7 +160,20 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -193,21 +184,26 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/assets/images/Jcrop.gif
-- lib/assets/javascripts/jquery.jcrop.js
 - lib/assets/javascripts/papercrop.js
-- lib/assets/stylesheets/jquery.jcrop.css
-- lib/paperclip_processors/cropper.rb
+- lib/paperclip_processors/papercrop.rb
 - lib/papercrop/engine.rb
 - lib/papercrop/helpers.rb
+- lib/papercrop/logger.rb
 - lib/papercrop/model_extension.rb
 - lib/papercrop/reg_exp.rb
 - lib/papercrop.rb
-- vendor/jcrop-v0.9.10/css/Jcrop.gif
-- vendor/jcrop-v0.9.10/css/jquery.Jcrop.css
-- vendor/jcrop-v0.9.10/js/jquery.Jcrop.js
-- vendor/jcrop-v0.9.10/MIT-LICENSE.txt
+- vendor/assets/images/Jcrop.gif
+- vendor/assets/javascripts/jquery.jcrop.js
+- vendor/assets/stylesheets/jquery.jcrop.css
+- vendor/src.jcrop-v0.9.10/css/Jcrop.gif
+- vendor/src.jcrop-v0.9.10/css/jquery.Jcrop.css
+- vendor/src.jcrop-v0.9.10/js/jquery.Jcrop.js
+- vendor/src.jcrop-v0.9.10/MIT-LICENSE.txt
 - README.md
+- Appraisals
+- spec/fixtures/bert.jpg
+- spec/fixtures/mountains.jpg
+- spec/fixtures/mountains_expected_result.jpg
 - spec/helpers/form_helpers_spec.rb
 - spec/integration/papercrop_js_spec.rb
 - spec/integration/papercrop_spec.rb
@@ -218,35 +214,31 @@ files:
 homepage: https://github.com/rsantamaria/papercrop
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3120983817575737500
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3120983817575737500
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Paperclip extension for cropping images
 test_files:
+- spec/fixtures/bert.jpg
+- spec/fixtures/mountains.jpg
+- spec/fixtures/mountains_expected_result.jpg
 - spec/helpers/form_helpers_spec.rb
 - spec/integration/papercrop_js_spec.rb
 - spec/integration/papercrop_spec.rb

data/lib/paperclip_processors/cropper.rb

@@ -1,28 +0,0 @@
-require "paperclip"
-
-module Paperclip
-  class Cropper < Thumbnail
-
-    def transformation_command
-      if crop_command
-        crop_command + super.join(' ').sub(/ -crop \S+/, '').split(' ')
-      else
-        super
-      end
-    end
-
-
-    def crop_command
-      target = @attachment.instance
-
-      if target.cropping?(@attachment.name)
-        w = target.send :"#{@attachment.name}_crop_w"
-        h = target.send :"#{@attachment.name}_crop_h"
-        x = target.send :"#{@attachment.name}_crop_x"
-        y = target.send :"#{@attachment.name}_crop_y"
-        ["-crop", "#{w}x#{h}+#{x}+#{y}"]
-      end
-    end
-
-  end
-end