papercrop 0.1.1 → 0.2.0

data/README.md

@@ -50,6 +50,14 @@ 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.  
 
+### 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.
+
+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.
+
 That's all!
 
 ### Credits and resources

data/lib/assets/javascripts/papercrop.js

@@ -1,51 +1,51 @@
-var jcrop_api;
-
-window.init_papercrop = function() {
-  $("div[id$=_cropbox]").each(function() {
-
-    var attachment = $(this).attr("id").replace("_cropbox", "");
-    var preview    = !!$("#" + attachment + "_crop_preview").length;
-    var aspect     = $("input#" + attachment + "_aspect").val();
-    var width      = $(this).width();
-    
-    console.log($(this));
-
-    update_crop = function(coords) {
-      var preview_width, rx, ry;
-
-      if (preview) {
-        preview_width = $("#" + attachment + "_crop_preview_wrapper").width();
-        
-        rx = preview_width / coords.w;
-        ry = preview_width / coords.h;
-
-        $("img#" + attachment + "_crop_preview").css({
-          width      : Math.round(rx * $("input[id$='_" + attachment + "_original_w']").val()) + "px",
-          height     : Math.round((ry * $("input[id$='_" + attachment + "_original_h']").val()) / aspect) + "px",
-          marginLeft : "-" + Math.round(rx * coords.x) + "px",
-          marginTop  : "-" + Math.round((ry * coords.y) / aspect) + "px"
-        });
-      }
-
-      $("#" + attachment + "_crop_x").val(Math.round(coords.x));
-      $("#" + attachment + "_crop_y").val(Math.round(coords.y));
-      $("#" + attachment + "_crop_w").val(Math.round(coords.w));
-      $("#" + attachment + "_crop_h").val(Math.round(coords.h));
-    };
-
-    $(this).find("img").Jcrop({
-      onChange    : update_crop,
-      onSelect    : update_crop,
-      setSelect   : [0, 0, 250, 250],
-      aspectRatio : aspect,
-      boxWidth    : $("input[id$='_" + attachment + "_box_w']").val()
-    }, function() {
-      jcrop_api = this;
+(function ($) {
+  window.jcrop_api = null;
+
+  window.init_papercrop = function() {
+    $("div[id$=_cropbox]").each(function() {
+
+      var attachment = $(this).attr("id").replace("_cropbox", "");
+      var preview    = !!$("#" + attachment + "_crop_preview").length;
+      var aspect     = $("input#" + attachment + "_aspect").val();
+      var width      = $(this).width();
+
+      update_crop = function(coords) {
+        var preview_width, rx, ry;
+
+        if (preview) {
+          preview_width = $("#" + attachment + "_crop_preview_wrapper").width();
+
+          rx = preview_width / coords.w;
+          ry = preview_width / coords.h;
+
+          $("img#" + attachment + "_crop_preview").css({
+            width      : Math.round(rx * $("input[id$='_" + attachment + "_original_w']").val()) + "px",
+            height     : Math.round((ry * $("input[id$='_" + attachment + "_original_h']").val()) / aspect) + "px",
+            marginLeft : "-" + Math.round(rx * coords.x) + "px",
+            marginTop  : "-" + Math.round((ry * coords.y) / aspect) + "px"
+          });
+        }
+
+        $("#" + attachment + "_crop_x").val(Math.round(coords.x));
+        $("#" + attachment + "_crop_y").val(Math.round(coords.y));
+        $("#" + attachment + "_crop_w").val(Math.round(coords.w));
+        $("#" + attachment + "_crop_h").val(Math.round(coords.h));
+      };
+
+      $(this).find("img").Jcrop({
+        onChange    : update_crop,
+        onSelect    : update_crop,
+        setSelect   : [0, 0, 250, 250],
+        aspectRatio : aspect,
+        boxWidth    : $("input[id$='_" + attachment + "_box_w']").val()
+      }, function() {
+        jcrop_api = this;
+      });
     });
-  });
-};
+  };
 
+  $(document).ready(function() {
+    init_papercrop();
+  });
 
-$(document).ready(function() {
-  init_papercrop();
-});
+}(jQuery));

data/lib/papercrop.rb

@@ -1,5 +1,5 @@
 require 'papercrop/engine'
 require 'papercrop/reg_exp'
-require 'papercrop/active_record_extension'
+require 'papercrop/model_extension'
 require 'papercrop/helpers'
 require 'paperclip_processors/cropper'

data/lib/papercrop/{active_record_extension.rb → model_extension.rb}

@@ -1,10 +1,5 @@
 module Papercrop
-  module ActiveRecordExtension
-  
-    def self.included(base)
-      base.extend ClassMethods
-    end
-
+  module ModelExtension
 
     module ClassMethods
 
@@ -116,9 +111,22 @@ module Papercrop
 end
 
 
+# ActiveRecord support
 if defined? ActiveRecord::Base
   ActiveRecord::Base.class_eval do
-    include Papercrop::ActiveRecordExtension
-    include Papercrop::ActiveRecordExtension::InstanceMethods
+    extend  Papercrop::ModelExtension::ClassMethods
+    include Papercrop::ModelExtension::InstanceMethods
   end
-end
+end
+
+
+# Mongoid support
+if defined? Mongoid::Document 
+  Mongoid::Document::ClassMethods.module_eval do
+    include Papercrop::ModelExtension::ClassMethods
+  end
+
+  Mongoid::Document.module_eval do
+    include Papercrop::ModelExtension::InstanceMethods
+  end
+end

data/spec/integration/papercrop_js_spec.rb

@@ -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)).should eq(0.0)
+    compare_images(CROPPED_IMG_PATH, Landscape.last.picture.path(:medium)).round(2).should eq(0.0)
   end
 
 
@@ -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)).should eq(0.0)
+    compare_images(CROPPED_IMG_PATH, Landscape.last.picture.path(:medium)).round(2).should eq(0.0)
   end
 end

data/spec/integration/papercrop_spec.rb

@@ -29,6 +29,6 @@ describe "Image crop" do
 
     click_button "Crop image"
     
-    compare_images(CROPPED_IMG_PATH, Landscape.last.picture.path(:medium)).should eq(0.0)
+    compare_images(CROPPED_IMG_PATH, Landscape.last.picture.path(:medium)).round(2).should eq(0.0)
   end
 end

data/spec/model_extensions/{active_record_spec.rb → model_extension_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe "Active Record Extension" do
+describe "Model Extension" do
 
   before do
     @landscape         = Landscape.new(:name => "Mountains")
@@ -29,8 +29,8 @@ describe "Active Record Extension" do
     @landscape.picture_crop_w = 400
     @landscape.picture_crop_h = 300
     @landscape.save
-
-    compare_images(CROPPED_IMG_PATH, @landscape.picture.path(:medium)).should eq(0.0)
+    # Rounding to account for different versions of imagemagick
+    compare_images(CROPPED_IMG_PATH, @landscape.picture.path(:medium)).round(2).should eq(0.0)
   end
 
 
@@ -60,7 +60,8 @@ describe "Active Record Extension" do
 
 
   it "registers the post processor" do
-    @landscape.attachment_definitions[:picture][:processors].should eq([:cropper])
+    definitions = Paperclip::AttachmentRegistry.definitions_for(Landscape)
+    definitions[:picture][:processors].should eq([:cropper])
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: papercrop
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -171,6 +171,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An easy extension for Paperclip to crop your image uploads using jCrop
 email: rsantamaria.dev@gmail.com
 executables: []
@@ -182,9 +198,9 @@ files:
 - lib/assets/javascripts/papercrop.js
 - lib/assets/stylesheets/jquery.jcrop.css
 - lib/paperclip_processors/cropper.rb
-- lib/papercrop/active_record_extension.rb
 - lib/papercrop/engine.rb
 - lib/papercrop/helpers.rb
+- lib/papercrop/model_extension.rb
 - lib/papercrop/reg_exp.rb
 - lib/papercrop.rb
 - vendor/jcrop-v0.9.10/css/Jcrop.gif
@@ -195,12 +211,13 @@ files:
 - spec/helpers/form_helpers_spec.rb
 - spec/integration/papercrop_js_spec.rb
 - spec/integration/papercrop_spec.rb
-- spec/model_extensions/active_record_spec.rb
+- spec/model_extensions/model_extension_spec.rb
 - spec/model_extensions/reg_exp_spec.rb
 - spec/spec_helper.rb
 - spec/support/compare_images.rb
 homepage: https://github.com/rsantamaria/papercrop
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -211,15 +228,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !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.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Paperclip extension for cropping images
@@ -227,8 +250,7 @@ test_files:
 - spec/helpers/form_helpers_spec.rb
 - spec/integration/papercrop_js_spec.rb
 - spec/integration/papercrop_spec.rb
-- spec/model_extensions/active_record_spec.rb
+- spec/model_extensions/model_extension_spec.rb
 - spec/model_extensions/reg_exp_spec.rb
 - spec/spec_helper.rb
 - spec/support/compare_images.rb
-has_rdoc: