avatars_for_rails 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63ef1090f4e07e335c723459840581f7def14992
-  data.tar.gz: 774ff99df0041eac6cb9102cd0bfa782087a2d25
+  metadata.gz: 4ebebb8262563aef39e2d376b00a5d2f2839ef29
+  data.tar.gz: 6f0b38c248043d84f949d73d2d5307b3851abed9
 SHA512:
-  metadata.gz: 1ad93d034158dc05bc6df8bae686ead9c6d0eb2df439b6d8c426c3c799785acf47c742758cb073f3414a7790f233a0ee9930be98d71143b9b76c092e7cd163a5
-  data.tar.gz: 3a7dfb5677270b6c0471d77cb11cb0b0c57af8d0520fcc9eb85c3b2878171d897a0fc5cb62b37d680fb0c5293f5413b9795b9cbd92478139d06fe1c3275404ac
+  metadata.gz: 0473b4237bdba0f6e32462b4b13fe98ddc0ae568d4878914ef9528e96986a94e48b9f34eb658fa0a1a1af362b2aeedfe94447453fd42de667ff7e4862d29a18c
+  data.tar.gz: f2fce31f7c0490717adbf2df9e42238b9b0c793386e68ebce7d39891a69e1acf841efea49f228f754b4a104583b1fc729e44d9261934ab7c2c6625b2df4c22c0

data/app/assets/javascripts/avatars_for_rails.js

@@ -46,13 +46,20 @@ var AvatarForRails = AvatarForRails || (function($, undefined) {
   };
 
   var initCrop = function(data) {
-    var div = $('section.avatar .update');
+    var div = $('section.avatar .update'),
+        img,
+        ar;
+
     div.html(data);
-    div.find('img.crop').Jcrop({
+
+    img = div.find('img.crop'),
+    ar  = parseInt(img.attr('data-aspect_ratio'), 10);
+   
+    img.Jcrop({
       bgColor:     'clear',
       bgOpacity:   0.6,
-      setSelect:   [ 0, 0, 200, 200 ],
-      aspectRatio: 1,
+      setSelect:   [ 0, 0, 200, 200 / ar ],
+      aspectRatio: ar,
       onSelect: updateCrop,
       onChange: updateCrop
     });
@@ -71,7 +78,6 @@ var AvatarForRails = AvatarForRails || (function($, undefined) {
     $('input[name*="logo_crop_x"]').val(coords.x / iW);
     $('input[name*="logo_crop_y"]').val(coords.y / iH);
     $('input[name*="logo_crop_w"]').val(coords.w / iW);
-    $('input[name*="logo_crop_h"]').val(coords.h / iH);
   };
 
   addEditCallback(initFileUpload);

data/app/views/avatars/_crop.html.erb

@@ -1,7 +1,7 @@
-<%= image_tag avatarable.avatar_tmp_public_path(root_path), class: 'crop' %>
+<%= image_tag avatarable.avatar_tmp_public_path(root_path), class: 'crop', "data-aspect_ratio" => avatarable.class.logo_aspect_ratio %>
 
 <%= form_for avatarable, url: avatar_path, multipart: true do |f| %>
-  <% %w( x y w h ).each do |attr| %>
+  <% %w( x y w ).each do |attr| %>
     <%= f.hidden_field "logo_crop_#{ attr }" %>
   <% end %>
     <%= f.hidden_field :avatar_tmp_basename %>

data/lib/avatars_for_rails/avatarable.rb

@@ -3,6 +3,9 @@ module AvatarsForRails
     extend ActiveSupport::Concern
 
     included do
+      cattr_accessor :logo_aspect_ratio
+      self.logo_aspect_ratio = 1
+
       attr_accessor :logo_crop, :logo_crop_x, :logo_crop_y, :logo_crop_w, :logo_crop_h,
                     :avatar_tmp_basename
 
@@ -43,7 +46,7 @@ module AvatarsForRails
     def validate_crop_params
       return if logo_crop_x.blank?
 
-      %w( x y w h ).each do |attr|
+      %w( x y w ).each do |attr|
         send "logo_crop_#{ attr }=", send("logo_crop_#{ attr }").to_f
       end
 
@@ -57,10 +60,12 @@ module AvatarsForRails
 
       width, height = avatar_tmp_file_dimensions
 
-      avatar_magick_image.crop!(logo_crop_x * width,
-                                logo_crop_y * height,
-                                logo_crop_w * width,
-                                logo_crop_h * height)
+      crop_x = (logo_crop_x * width).round
+      crop_y = (logo_crop_y * height).round
+      crop_w = (logo_crop_w * width).round
+      crop_h = crop_w / self.class.logo_aspect_ratio
+
+      avatar_magick_image.crop!(crop_x, crop_y, crop_w, crop_h)
 
       avatar_magick_image.write(avatar_tmp_full_path)
 

data/lib/avatars_for_rails/version.rb

@@ -1,3 +1,3 @@
 module AvatarsForRails
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avatars_for_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Jaime Castro Montero
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails