ack_rails_admin_jcrop 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dda7fe91b561d2f47b8db348d74ac936201dfb1
-  data.tar.gz: 9cf0765f2b515a8111fe4a9721c77ff1cbb7dfae
+  metadata.gz: 480d79fca9fce84dfe089209e3c3db69641e8fb9
+  data.tar.gz: 75aa8bc7d96a71a7003dc3dac908c77fc8248e01
 SHA512:
-  metadata.gz: 03cfe60e3d081c9930584fd747f61fe244b4f3c72d367fc6bd255a4dc48d4c9dfcb8fffa661d6a3c3570869a3615bdfff152eb920c2c397719fa02f2d51d3c39
-  data.tar.gz: 336fa5f79efe08c07936cb60b61d07172af73d32ed8b65eb4c26b01c5f1d9a86ae09652de657639c9286046b4380abe3365941a363bba64788f9be2c6a77fe07
+  metadata.gz: 34478a1aed642baa8398205be298c45269287cbbfbff5575e805a395ad0d0ae9572cb0b4b4a982ee186f209cb7b29c0c3193d4da884f2a88ad589af1421262b2
+  data.tar.gz: 72685f588f1d23fee353e57a1f544a06aa1d540852ec19efe01972867cd131921a3d1def3a9c6a53d65abb1a57e7c5700e306d1bd7931273290e8aab89d8acf7

data/app/assets/javascripts/rails_admin/ra.jcrop.js

@@ -172,5 +172,6 @@
 })(jQuery);
 
 $(function() {
-  $('div.jcrop_type, div.enjoy_image_type').jcropForm();
+  // EnjoyCMS and HancockCMS support - temporary
+  $('div.jcrop_type, div.enjoy_image_type, div.hancock_image_type').jcropForm();
 });

data/lib/rails_admin_jcrop/asset_engine/paperclip.rb

@@ -6,7 +6,15 @@ module RailsAdminJcrop
       end
 
       def crop!(obj, field)
-        obj.send(field).reprocess!
+        _field = obj.send(field)
+        _field.reprocess!(*(_field.styles.keys - [:original]))
+        # _field.reprocess_without_saving_instance(*(_field.styles.keys - [:original]))
+      end
+
+      def crop(obj, field)
+        _field = obj.send(field)
+        # _field.reprocess!(*(_field.styles.keys - [:original]))
+        _field.reprocess_without_saving_instance(*(_field.styles.keys - [:original]))
       end
     end
   end
@@ -14,6 +22,25 @@ end
 
 module Paperclip
 
+  class Attachment
+    # remaded from reprocess!
+    def reprocess_without_saving_instance(*style_args)
+      saved_only_process, @options[:only_process] = @options[:only_process], style_args
+      saved_preserve_files, @options[:preserve_files] = @options[:preserve_files], true
+      begin
+        assign(self)
+        save
+        # instance.save
+      rescue Errno::EACCES => e
+        warn "#{e} - skipping file."
+        false
+      ensure
+        @options[:only_process] = saved_only_process
+        @options[:preserve_files] = saved_preserve_files
+      end
+    end
+  end
+
   module RailsAdminJcropperMethods
     def has_attached_file(*args)
       super
@@ -34,7 +61,7 @@ module Paperclip
 
   class RailsAdminJcropper < Thumbnail
     def transformation_command
-      if @attachment.instance.rails_admin_cropping?
+      if @attachment.instance.rails_admin_cropping? and @options[:style] != :original
         ary = super
         if i = ary.index('-crop')
           ary.delete_at i+1

data/lib/rails_admin_jcrop/orm.rb

@@ -19,26 +19,38 @@ module RailsAdminJcrop
         ::RailsAdminJcrop::AssetEngine.crop!(self, self.crop_field) if self.rails_admin_cropping?
       end
 
+      def rails_admin_crop(params)
+        CropFields.each {|f| self.send "#{f}=", params[f] }
+        ::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")
+      # use it like this:
+      # after_save do
+      #   auto_rails_admin_jcrop(:image)
+      # end
+      # def image_default_crop_params
+      #   if image and !image_file_name.blank?
+      #     default_crop_params_for_center(:image, 40, 40)
+      #   end
+      # end
+      def auto_rails_admin_jcrop(_field_name)
+        if !rails_admin_cropping? and self.try("#{_field_name}_updated_at_changed?") and (_crop_params = self.try("#{_field_name}_default_crop_params"))
+          rails_admin_crop _crop_params
         end
       end
 
-      def default_crop_params_for_left_top(field, width, height, left_offset = 0, top_offset = 0)
+      def default_crop_params_for_left_top(_field_name, 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_x: left_offset, crop_y: left_offset, crop_w: width, crop_h: height, crop_field: _field_name,
           crop_process_before: '+repage', crop_process_after: '+repage'
         }
       end
 
-
-      def default_crop_params_for_center(field, width, height, left_offset = 0, top_offset = 0)
+      def default_crop_params_for_center(_field_name, 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_x: left_offset, crop_y: top_offset, crop_w: width, crop_h: height, crop_field: _field_name,
           crop_process_before: '-gravity Center', crop_process_after: '+repage'
         }
       end

data/lib/rails_admin_jcrop/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ack_rails_admin_jcrop
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Alexander Kiseliev
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails_admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.1
 - !ruby/object:Gem::Dependency
@@ -42,7 +42,7 @@ dependencies:
 description: Jcrop plugin for rails admin. Forked from https://github.com/janx/rails_admin_jcrop
   Image cropping made easy!
 email:
-- dev@enjoycreate.ru
+- dev@redrocks.pro
 - jan.h.xie@gmail.com
 executables: []
 extensions: []
@@ -79,7 +79,7 @@ files:
 - vendor/assets/stylesheets/rails_admin/Jcrop.gif
 - vendor/assets/stylesheets/rails_admin/jquery.Jcrop.css
 - vendor/assets/stylesheets/rails_admin/jquery.Jcrop.min.css
-homepage: https://github.com/enjoycreative/rails_admin_jcrop
+homepage: https://github.com/red-rocks/rails_admin_jcrop
 licenses: []
 metadata: {}
 post_install_message: 
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Jcrop plugin for rails admin. Forked from https://github.com/janx/rails_admin_jcrop