hancock_cms_gallery 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c0f7db85fb9be1c12a8016104a2cc11813af011
-  data.tar.gz: f5fe4b2a2c9bc6716dd99d5a08c2686c08989963
+  metadata.gz: 217745205e47c842bde5680420df5862059b7fc6
+  data.tar.gz: 28373af543958270bcca2cb752a6e589e0ae1850
 SHA512:
-  metadata.gz: ed47a304c6ab2305013a033a2020683f9506fcf34c8886fd7ed6299e747d939fc760243d89c353797323b941a922926147ac6a97d943bc098dd48827388fe18f
-  data.tar.gz: dac044323b0fa221019099313f8da29829d077e2427c7f9c131cba39d01ef2fa0edcf5543e47084d49fc476e2305fa0d51466ed47122aaced65f140c4caba2ba
+  metadata.gz: 1447c26606da3b523312a9364d585d36a8302e92dff37ba5a23cf86aaccb30cc2284a67f6e26f7a02c72cba4248c3bebba4ae440662b87799901bdcf63e98b22
+  data.tar.gz: a6fbf407dcda493c007fc4a3c944d4bb73bc80ebd0201722a4c2d9748b1b90383a30fd5392e99b967ee726dbf609c4e130febe4c2bea697b0bebf0c7b0086960

data/app/controllers/concerns/hancock/gallery/load_gallery.rb

@@ -61,7 +61,11 @@ module Hancock::Gallery::LoadGallery
 
   def hancock_gallery_gallery_load_images
     if @gallery
-      hancock_gallery_gallery_images_scope.page(params[:page]).per(hancock_gallery_render_gallery_images_per_page)
+      if hancock_gallery_render_gallery_images_load_all_the_rest and params[:page].to_i > 1
+        hancock_gallery_gallery_images_scope.page.skip(hancock_gallery_render_gallery_images_per_page).all
+      else
+        hancock_gallery_gallery_images_scope.page(params[:page]).per(hancock_gallery_render_gallery_images_per_page)
+      end
     else
       []
     end
@@ -71,4 +75,8 @@ module Hancock::Gallery::LoadGallery
     4
   end
 
+  def hancock_gallery_render_gallery_images_load_all_the_rest
+    false
+  end
+
 end

data/app/controllers/concerns/hancock/gallery/load_gallery_images.rb

@@ -47,12 +47,20 @@ module Hancock::Gallery::LoadGalleryImages
   end
 
   def hancock_gallery_load_gallery_images
-    hancock_gallery_gallery_image_scope.page(params[:page]).per(hancock_gallery_gallery_images_per_page)
+    if hancock_gallery_gallery_images_load_all_the_rest and params[:page].to_i > 1
+      hancock_gallery_gallery_image_scope.page.skip(hancock_gallery_gallery_images_per_page).all
+    else
+      hancock_gallery_gallery_image_scope.page(params[:page]).per(hancock_gallery_gallery_images_per_page)
+    end
   end
 
   def hancock_gallery_gallery_images_per_page
     4
   end
 
+  def hancock_gallery_gallery_images_load_all_the_rest
+    false
+  end
+
 
 end

data/app/controllers/{concerns/rails_admin → rails_admin}/jcrop_controller.rb

@@ -3,7 +3,7 @@ require 'mini_magick'
 module RailsAdmin
 
   class JcropController < RailsAdmin::ApplicationController
-    skip_before_action :get_model
+    skip_before_action :get_model rescue nil # prevent undefined method error
     before_action :get_model, :get_object, :get_field, :get_fit_image
 
     helper_method :abstract_model, :geometry
@@ -48,6 +48,21 @@ module RailsAdmin
           @image_tag_options[:style] << "border: 1px solid #AAA !important;"
         end
 
+      # original file in object`s original_image as file
+      elsif @object.try("original_#{@field}_data") and !@object.send("original_#{@field}_data").image.blank?
+        @image_tag_options[:'data-geometry'] = geometry(@object.send("original_#{@field}_data").image.path).join(",")
+
+        if @fit_image_geometry
+          fit_image_geometry = fit_image_geometry(@object.send("original_#{@field}_data").image.path)
+
+          @form_options[:'style'] = "margin-left: #{375 - (fit_image_geometry[0]/2) - 15}px;"
+
+          @image_tag_options[:style] = ""
+          @image_tag_options[:style] << "width: #{fit_image_geometry[0]}px !important;"
+          @image_tag_options[:style] << "height: #{fit_image_geometry[1]}px !important;"
+          @image_tag_options[:style] << "border: 1px solid #AAA !important;"
+        end
+
       elsif @object.respond_to?("original_#{@field}")
         _data = @object.send("original_#{@field}")
         if _data
@@ -64,9 +79,24 @@ module RailsAdmin
     end
 
     def update
+      @object.try("process_watermark_#{params[:crop_field]}=", params["process_watermark_#{params[:crop_field]}".to_sym])
+
       if File.exists?(@object.send(params[:crop_field]).path)
         @object.rails_admin_crop! params.merge(crop_process_before: '+repage', crop_process_after: '+repage')
 
+      # original file in object`s original_image as file
+      elsif @object.try("original_#{params[:crop_field]}_data") and !@object.send("original_#{params[:crop_field]}_data").image.blank?
+        _dir = File.dirname(@object.send(params[:crop_field]).path)
+        FileUtils.mkdir_p(_dir) unless File.exists?(_dir)
+        File.unlink(@object.send(params[:crop_field]).path) if File.symlink?(@object.send(params[:crop_field]).path)
+        File.symlink(@object.send("original_#{params[:crop_field]}_data").image.path, @object.send(params[:crop_field]).path)
+        @object.class.skip_callback(:save, :after, "save_original_#{params[:crop_field]}".to_sym)
+        @object.save
+        @object.class.set_callback(:save, :after, "save_original_#{params[:crop_field]}".to_sym)
+        @object.send("#{params[:crop_field]}_autocropped=", true)
+        @object.rails_admin_crop! params.merge(crop_process_before: '+repage', crop_process_after: '+repage')
+        File.unlink(@object.send(params[:crop_field]).path) if File.exists?(@object.send(params[:crop_field]).path)
+
       elsif @object.try("original_#{params[:crop_field]}")
         _old_filename = @object.send("#{params[:crop_field]}_file_name")
         _data = @object.send("original_#{params[:crop_field]}")
@@ -75,6 +105,8 @@ module RailsAdmin
           _temp = Tempfile.new(_old_filename)
           _temp.binmode
           _temp.write _data
+          _dir = File.dirname(@object.send(params[:crop_field]).path)
+          FileUtils.mkdir_p(_dir) unless File.exists?(_dir)
           File.unlink(@object.send(params[:crop_field]).path) if File.symlink?(@object.send(params[:crop_field]).path)
           File.symlink(_temp.path, @object.send(params[:crop_field]).path)
           # @object.send("#{params[:crop_field]}=", _temp)
@@ -82,6 +114,7 @@ module RailsAdmin
           @object.class.skip_callback(:save, :after, "original_#{params[:crop_field]}_to_db".to_sym)
           @object.save
           @object.class.set_callback(:save, :after, "original_#{params[:crop_field]}_to_db".to_sym)
+          @object.send("#{params[:crop_field]}_autocropped=", true)
           @object.rails_admin_crop! params.merge(crop_process_before: '+repage', crop_process_after: '+repage')
           _temp.unlink
         end

data/app/models/concerns/hancock/gallery/active_record_paperclip.rb

@@ -19,14 +19,25 @@ if Hancock.active_record?
         end
 
         if is_image
-          if defined?(::PaperclipOptimizer)
-            opts[:processors] ||= []
-            opts[:processors] << :paperclip_optimizer
-            opts[:processors].flatten!
-            opts[:processors].uniq!
+          cattr_accessor "#{name}_default_processors".to_sym
+          instance_eval <<-RUBY
+            self.#{name}_default_processors = []
+            if defined?(::PaperclipOptimizer)
+              self.#{name}_default_processors << :paperclip_optimizer
+              self.#{name}_default_processors.flatten!
+              self.#{name}_default_processors.uniq!
+            end
+          RUBY
+          unless opts[:processors].is_a?(Proc)
+            if defined?(::PaperclipOptimizer)
+              opts[:processors] ||= []
+              opts[:processors] << :paperclip_optimizer
+              opts[:processors].flatten!
+              opts[:processors].uniq!
+            end
           end
 
-          opts[:convert_options] = {all: "-quality 75 -strip"} if opts[:convert_options].blank?
+          opts[:convert_options] = Hancock::Gallery.config.default_convert_options if opts[:convert_options].blank?
 
           if opts[:styles].blank?
             styles_method_name = "#{name}_styles"
@@ -40,56 +51,87 @@ if Hancock.active_record?
         # validates_attachment name, content_type: content_type unless content_type.blank?
         validates_attachment_content_type name, content_type: /\Aimage\/.*\Z/ if is_image
 
-        class_eval <<-EVAL
+        class_eval <<-RUBY
           def #{name}_file_name=(val)
             return self[:#{name}_file_name] = ""  if val == ""
             return self[:#{name}_file_name] = nil if val == nil
             val = val.to_s
             extension = File.extname(val)[1..-1]
+            if extension.blank?
+              mime_type = MIME::Types[self.#{name}.content_type].first
+              extension = mime_type.extensions.first if mime_type
+              val = [val, extension].join(".") unless extension.blank?
+            end
             file_name = val[0..val.size-extension.size-1]
             self[:#{name}_file_name] = "\#{file_name.filename_to_slug}.\#{extension.filename_to_slug}"
           end
 
           def #{name}_svg?
-            #{name}_content_type =~ /svg/
+            # !!(#{name}_content_type =~ /svg/)
+            #{name}.svg?
           end
 
-          def #{name}_url(opts)
+          def #{name}_url(style=:original, opts = {})
             if #{name}_svg?
               #{name}.url
             else
-              #{name}.url(opts)
+              #{name}.url(style, opts)
             end
           end
-        EVAL
+
+          def reprocess_#{name}
+            return if self.#{name}.blank?
+            self.#{name}.reprocess! if File.exists?(self.#{name}.path)
+          end
+
+          def self.reprocess_all_#{name.to_s.pluralize}
+            self.all.map(&:reprocess_#{name})
+          end
+        RUBY
         if defined?(::PaperclipOptimizer)
-          class_eval <<-EVAL
+          class_eval <<-RUBY
             before_#{name}_post_process do
               p_o = self.#{name}.processors.delete :paperclip_optimizer
               self.#{name}.processors << p_o if p_o
               true
             end
-          EVAL
+          RUBY
         end
         jcrop_options ||= {}
         if jcrop_options
-          class_eval <<-EVAL
+          class_eval <<-RUBY
             def #{name}_jcrop_options
               #{jcrop_options}
             end
-          EVAL
+          RUBY
         end
         if styles_method_name
-          class_eval <<-EVAL
+          class_eval <<-RUBY
             def #{styles_method_name}
               {
                 thumb: '128x128'
               }
             end
-          EVAL
+          RUBY
         end
 
       end
+
+      def paperclip_style_aliases_for(name, opts = {})
+        name = name.to_sym
+        _styles = opts[:styles]
+        _styles ||= self.send("#{name}_styles") if self.respond_to?("#{name}_styles")
+        _styles = _styles.keys if _styles.is_a?(Hash)
+        _styles.each do |_style|
+          class_eval <<-RUBY
+            def #{name}_url_#{_style}
+              #{name}.url(#{_style.to_sym})
+            end
+          RUBY
+        end
+
+      end
+
     end
   end
 end

data/app/models/concerns/hancock/gallery/auto_crop.rb

@@ -8,13 +8,17 @@ module Hancock::Gallery::AutoCrop
       crop_area = [_width, _height].compact
       _default_method = opts.delete(:default_method) || :default_crop_params_for_center
 
+      attr_accessor "#{field}_autocropped".to_sym
       cattr_accessor "#{field}_default_max_crop_area".to_sym, "#{field}_default_auto_crop_method".to_sym
       self.send("#{field}_default_max_crop_area=".to_sym, crop_area)
       self.send("#{field}_default_auto_crop_method=".to_sym, _default_method.to_sym)
 
-      class_eval <<-EVAL
+      class_eval <<-RUBY
         after_save :#{field}_auto_rails_admin_jcrop
         def #{field}_auto_rails_admin_jcrop
+          self.#{field}_autocropped = false if self.#{field}_autocropped == "0"
+          return if self.#{field}.blank? or !self.#{field}_updated_at_changed? or self.#{field}_autocropped
+          self.#{field}_autocropped = true
           auto_rails_admin_jcrop(:#{field})
         end
 
@@ -79,7 +83,7 @@ module Hancock::Gallery::AutoCrop
             end
           end
         end
-      EVAL
+      RUBY
     end
 
   end

data/app/models/concerns/hancock/gallery/decorators/gallery.rb

@@ -17,6 +17,13 @@ module Hancock::Gallery::Decorators
       # end
 
       ############# rails_admin ##############
+      # def self.rails_admin_name_synonyms
+      #   ''.freeze #super
+      # end
+      # def self.rails_admin_navigation_icon
+      #   ''.freeze
+      # end
+      #
       # def self.rails_admin_add_fields
       #   [] #super
       # end

data/app/models/concerns/hancock/gallery/decorators/image.rb

@@ -22,6 +22,13 @@ module Hancock::Gallery::Decorators
       # end
 
       ############# rails_admin ##############
+      # def self.rails_admin_name_synonyms
+      #   "Photo Картинки Картинка Изображение Изображения".freeze
+      # end
+      # def self.rails_admin_navigation_icon
+      #   'icon-picture'.freeze
+      # end
+      #
       # def self.rails_admin_add_fields
       #   [] #super
       # end

data/app/models/concerns/hancock/gallery/mongoid_paperclip.rb

@@ -19,15 +19,27 @@ if Hancock.mongoid?
         end
 
         if is_image
-          opts[:processors] ||= []
-          opts[:processors] << :rails_admin_jcropper
-          if defined?(::PaperclipOptimizer)
-            opts[:processors] << :paperclip_optimizer
-            opts[:processors].flatten!
-            opts[:processors].uniq!
+          cattr_accessor "#{name}_default_processors".to_sym
+          instance_eval <<-RUBY
+            self.#{name}_default_processors = []
+            #{name}_default_processors << :rails_admin_jcropper
+            if defined?(::PaperclipOptimizer)
+              self.#{name}_default_processors << :paperclip_optimizer
+              self.#{name}_default_processors.flatten!
+              self.#{name}_default_processors.uniq!
+            end
+          RUBY
+          unless opts[:processors].is_a?(Proc)
+            opts[:processors] ||= []
+            opts[:processors] << :rails_admin_jcropper
+            if defined?(::PaperclipOptimizer)
+              opts[:processors] << :paperclip_optimizer
+              opts[:processors].flatten!
+              opts[:processors].uniq!
+            end
           end
 
-          opts[:convert_options] = {all: "-quality 75 -strip"} if opts[:convert_options].blank?
+          opts[:convert_options] = Hancock::Gallery.config.default_convert_options if opts[:convert_options].blank?
 
           if opts[:styles].blank?
             styles_method_name = "#{name}_styles"
@@ -41,56 +53,88 @@ if Hancock.mongoid?
         # validates_attachment name, content_type: content_type unless content_type.blank?
         validates_attachment_content_type name, content_type: /\Aimage\/.*\Z/ if is_image
 
-        class_eval <<-EVAL
+        class_eval <<-RUBY
           def #{name}_file_name=(val)
             return self[:#{name}_file_name] = ""  if val == ""
             return self[:#{name}_file_name] = nil if val == nil
             val = val.to_s
             extension = File.extname(val)[1..-1]
+            if extension.blank?
+              mime_type = MIME::Types[self.#{name}.content_type].first
+              extension = mime_type.extensions.first if mime_type
+              val = [val, extension].join(".") unless extension.blank?
+            end
             file_name = val[0..val.size-extension.size-1]
             self[:#{name}_file_name] = "\#{file_name.filename_to_slug}.\#{extension.filename_to_slug}"
           end
 
           def #{name}_svg?
-            #{name}_content_type =~ /svg/
+            # !!(#{name}_content_type =~ /svg/)
+            #{name}.svg?
           end
 
-          def #{name}_url(opts)
+          def #{name}_url(style=:original, opts = {})
             if #{name}_svg?
               #{name}.url
             else
-              #{name}.url(opts)
+              #{name}.url(style, opts)
             end
           end
-        EVAL
+
+          def reprocess_#{name}
+            return if self.#{name}.blank?
+            self.#{name}.reprocess! if File.exists?(self.#{name}.path)
+          end
+
+          def self.reprocess_all_#{name.to_s.pluralize}
+            self.all.map(&:reprocess_#{name})
+          end
+        RUBY
         if defined?(::PaperclipOptimizer)
-          class_eval <<-EVAL
+          class_eval <<-RUBY
             before_#{name}_post_process do
               p_o = self.#{name}.processors.delete :paperclip_optimizer
               self.#{name}.processors << p_o if p_o
               true
             end
-          EVAL
+          RUBY
         end
         jcrop_options ||= {}
         if jcrop_options
-          class_eval <<-EVAL
+          class_eval <<-RUBY
             def #{name}_jcrop_options
               #{jcrop_options}
             end
-          EVAL
+          RUBY
         end
         if styles_method_name
-          class_eval <<-EVAL
+          class_eval <<-RUBY
             def #{styles_method_name}
               {
                 thumb: '128x128'
               }
             end
-          EVAL
+          RUBY
         end
 
       end
+    
+
+      def paperclip_style_aliases_for(name, opts = {})
+        name = name.to_sym
+        _styles = opts[:styles]
+        _styles ||= self.send("#{name}_styles") if self.respond_to?("#{name}_styles")
+        _styles = _styles.keys if _styles.is_a?(Hash)
+        _styles.each do |_style|
+          class_eval <<-RUBY
+            def #{name}_url_#{_style}
+              #{name}.url(#{_style.to_sym})
+            end
+          RUBY
+        end
+
+      end
+
     end
   end
 end