ack_rails_admin_jcrop 0.0.10 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2f7aaffc29570a30e8fa6b2ef6ed85fb267eda0
-  data.tar.gz: 70aa9d5bf1d36dd87a9ac6eafd7523ee7395339d
+  metadata.gz: 3dda7fe91b561d2f47b8db348d74ac936201dfb1
+  data.tar.gz: 9cf0765f2b515a8111fe4a9721c77ff1cbb7dfae
 SHA512:
-  metadata.gz: 5cfdb44457a1a47d4168573cc0b57011be867fc130bbb599c22eb04a75bdec6a961f85df6beb03d64c6882b8279f8e63e5a2daac1b436fde31b0d3fe0326f686
-  data.tar.gz: 01c72b6b95acd9705ed5c85011965dad1ba682f417e00278a460a448384a0f1455017be417b48be6bdda56d6da3bd2f4038f9311728e688ebc74233049b7242c
+  metadata.gz: 03cfe60e3d081c9930584fd747f61fe244b4f3c72d367fc6bd255a4dc48d4c9dfcb8fffa661d6a3c3570869a3615bdfff152eb920c2c397719fa02f2d51d3c39
+  data.tar.gz: 336fa5f79efe08c07936cb60b61d07172af73d32ed8b65eb4c26b01c5f1d9a86ae09652de657639c9286046b4380abe3365941a363bba64788f9be2c6a77fe07

data/app/controllers/rails_admin/jcrop_controller.rb

@@ -58,7 +58,7 @@ module RailsAdmin
     end
 
     def update
-      @object.rails_admin_crop! params
+      @object.rails_admin_crop! params.merge(crop_process_before: '+repage', crop_process_after: '+repage')
 
       respond_to do |format|
         format.html { redirect_to_on_success }

data/lib/rails_admin_jcrop/asset_engine/paperclip.rb

@@ -40,10 +40,12 @@ module Paperclip
           ary.delete_at i+1
           ary.delete_at i
         end
-        repage_before = ['+repage']
-        crop          = ['-crop', crop_params]
-        repage_after  = ['+repage']
-        repage_before + crop + repage_after + ary
+
+        process_before  = [@attachment.instance.crop_process_before]
+        crop            = ['-crop', crop_params]
+        process_after   = [@attachment.instance.crop_process_after]
+
+        process_before + crop + process_after + ary
       else
         super
       end
@@ -51,7 +53,17 @@ module Paperclip
 
     def crop_params
       target = @attachment.instance
-      "'#{target.crop_w.to_i}x#{target.crop_h.to_i}+#{target.crop_x.to_i}+#{target.crop_y.to_i}'"
+
+      w = target.crop_w.to_i
+      h = target.crop_h.to_i
+      x = target.crop_x.to_i
+      y = target.crop_y.to_i
+
+      x = "+#{x}" if x >= 0
+      y = "+#{y}" if y >= 0
+      geometry = "#{w}x#{h}#{x}#{y}"
+
+      geometry
     end
   end
 

data/lib/rails_admin_jcrop/image_helper.rb

@@ -8,7 +8,10 @@ module RailsAdminJcrop
       end
 
       def minimagick_crop(img, w, h, x, y)
-        geometry = "#{w}x#{h}+#{x}+#{y}"
+        x = "+#{x}" if x >= 0
+        y = "+#{y}" if y >= 0
+        geometry = "#{w}x#{h}#{x}#{y}"
+
         img.crop geometry
       end
 

data/lib/rails_admin_jcrop/orm.rb

@@ -2,12 +2,14 @@ module RailsAdminJcrop
   module Orm
     module Extension
 
-      CropFields = [:crop_x, :crop_y, :crop_w, :crop_h, :crop_field]
+      CropFields = [:crop_x, :crop_y, :crop_w, :crop_h, :crop_field, :crop_process_before, :crop_process_after]
 
       def self.included(base)
         base.send :attr_accessor, *CropFields
       end
 
+
+
       def rails_admin_cropping?
         CropFields.all? {|f| send(f).present?}
       end
@@ -17,6 +19,30 @@ module RailsAdminJcrop
         ::RailsAdminJcrop::AssetEngine.crop!(self, self.crop_field) if self.rails_admin_cropping?
       end
 
+
+
+
+      def auto_rails_admin_jcrop(field)
+        if !rails_admin_cropping? and self.try("#{field}_default_crop_params") and self.try("#{field}_updated_at_changed?")
+          rails_admin_crop! self.send("#{field}_default_crop_params")
+        end
+      end
+
+      def default_crop_params_for_left_top(field, width, height, left_offset = 0, top_offset = 0)
+        {
+          crop_x: left_offset, crop_y: left_offset, crop_w: width, crop_h: height, crop_field: field,
+          crop_process_before: '+repage', crop_process_after: '+repage'
+        }
+      end
+
+
+      def default_crop_params_for_center(field, width, height, left_offset = 0, top_offset = 0)
+        {
+          crop_x: left_offset, crop_y: top_offset, crop_w: width, crop_h: height, crop_field: :image,
+          crop_process_before: '-gravity Center', crop_process_after: '+repage'
+        }
+      end
+
     end
   end
 end

data/lib/rails_admin_jcrop/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminJcrop
-  VERSION = "0.0.10"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ack_rails_admin_jcrop
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors:
 - Alexander Kiseliev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails_admin