hancock_cms_gallery 1.0.0 → 1.0.2

data/lib/generators/hancock/gallery/models/templates/original_image.erb

@@ -9,19 +9,19 @@ class <%= camelcased_class_name %> < Hancock::Gallery::OriginalImage
     super(config)
   end
 
-  def admin_can_user_defined_actions
+  def self.admin_can_user_defined_actions
     [].freeze
   end
-  def admin_cannot_user_defined_actions
+  def self.admin_cannot_user_defined_actions
     [].freeze
   end
-  def manager_can_user_defined_actions
+  def self.manager_can_user_defined_actions
     [].freeze
   end
-  def manager_cannot_user_defined_actions
+  def self.manager_cannot_user_defined_actions
     [].freeze
   end
-  def rails_admin_user_defined_visible_actions
+  def self.rails_admin_user_defined_visible_actions
     [].freeze
   end
 

data/lib/hancock/gallery/admin.rb

@@ -1,20 +1,41 @@
 module Hancock::Gallery
   module Admin
 
-    def self.images_block(is_active = false, fields = [:images])
+    # images_block(is_active = false, fields = [:images], options = {})
+    # images_block(is_active = false, options = {field: [:images]})
+    # images_block(fields = [:images], options = {active: false})
+    # images_block(options = {fields: [:images], active: false})
+    # images_block(is_active = false, fields = [:images], options = {})
+
+    def self.images_block(is_active = false, fields = [:images], options = {})
       if is_active.is_a?(Array) or is_active.is_a?(String) or is_active.is_a?(Symbol)
         is_active, fields = false, [is_active].flatten
       elsif is_active.is_a?(Hash)
         is_active, fields = (is_active[:active] || false), (is_active[:fields] || [:images])
+      elsif fields.is?(Hash)
+        is_active, fields, options = (fields[:active] || false), (is_active[:fields] || [:images]), fields
+      end
+      if fields.is_a?(Array)
+        fields.map! { |f|
+          if f.is_a?(Hash)
+            f
+          elsif f.is_a?(Array)
+            _ret = {"#{f.first}" => f[1..-1]}
+          else
+            { "#{f}": nil }
+          end
+        }
+        fields = fields.reduce({}, :merge)
+
       end
 
+
       Proc.new {
         active is_active
-        label I18n.t('hancock.images')
+        label options[:label] || I18n.t('hancock.images')
         field :image, :hancock_image
-        fields.map { |f|
-          field f
-        }
+
+        Hancock::RailsAdminGroupPatch::hancock_cms_group(self, fields)
 
         if block_given?
           yield self

data/lib/hancock/gallery/admin/gallery.rb

@@ -10,6 +10,7 @@ module Hancock::Gallery
 
         Proc.new {
           navigation_label(!nav_label.blank? ? nav_label : I18n.t('hancock.gallery'))
+
           field :enabled, :toggle do
             searchable false
           end
@@ -30,6 +31,10 @@ module Hancock::Gallery
             read_only true
           end
 
+          if Hancock::Gallery.config.cache_support
+            group :caching, &Hancock::Cache::Admin.caching_block
+          end
+
           nested_set({max_depth: 1, scopes: []})
 
           if defined?(RailsAdminMultipleFileUpload)

data/lib/hancock/gallery/admin/image.rb

@@ -16,6 +16,7 @@ module Hancock::Gallery
 
         Proc.new {
           navigation_label(!nav_label.blank? ? nav_label : I18n.t('hancock.gallery'))
+
           field :enabled, :toggle do
             searchable false
           end
@@ -29,7 +30,9 @@ module Hancock::Gallery
           end
           field :image, :hancock_image
 
-          group :caching, &Hancock::Admin.caching_block
+          if Hancock::Gallery.config.cache_support
+            group :caching, &Hancock::Cache::Admin.caching_block
+          end
 
           nested_set({max_depth: 1, scopes: []})
 

data/lib/hancock/gallery/admin/original_image.rb

@@ -20,6 +20,13 @@ module Hancock::Gallery
 
           field :originable
           field :original
+          field :original_as_image do
+            pretty_value do
+              _value = value.sub(/\>\s*\z/, " style='max-width: 100%; max-height: 100%;'>")
+              "<div style='max-width: 300px; height: 100px;'>#{_value}</div>".html_safe
+            end
+            read_only true
+          end
 
           Hancock::RailsAdminGroupPatch::hancock_cms_group(self, fields)
 

data/lib/hancock/gallery/configuration.rb

@@ -9,18 +9,30 @@ module Hancock::Gallery
 
     attr_accessor :localize
 
+    attr_accessor :cache_support
+
     attr_accessor :model_settings_support
     attr_accessor :user_abilities_support
     attr_accessor :ra_comments_support
     attr_accessor :watermark_support
 
+    attr_accessor :original_image_hash_secret
+
+    attr_accessor :default_convert_options
+
     def initialize
       @localize = Hancock.config.localize
 
+      @cache_support  = defined?(Hancock::Cache)
+
       @model_settings_support = defined?(RailsAdminModelSettings)
       @user_abilities_support = defined?(RailsAdminUserAbilities)
       @ra_comments_support = defined?(RailsAdminComments)
       @watermark_support = defined?(PaperclipWatermark)
+
+      @original_image_hash_secret = Rails.application.secrets.secret_key_base
+
+      @default_convert_options = {all: ["-quality", "75", "-strip"]}
     end
   end
 end

data/lib/hancock/gallery/models/gallery.rb

@@ -12,6 +12,10 @@ module Hancock::Gallery
       #   include Hancock::Gallery::Watermarkable
       # end
 
+      if Hancock::Gallery.config.cache_support
+        include Hancock::Cache::Cacheable
+      end
+
       include Hancock::Gallery.orm_specific('Gallery')
 
       included do
@@ -37,20 +41,28 @@ module Hancock::Gallery
           belongs_to :gallerable, polymorphic: true, optional: true
         end
 
+        def self.rails_admin_name_synonyms
+          "".freeze
+        end
+        def self.rails_admin_navigation_icon
+          ''.freeze
+        end
 
         def self.manager_can_add_actions
-          ret = [:nested_set]
+          ret = [:nested_set, :multiple_file_upload]
           # ret += [:multiple_file_upload, :sort_embedded] if Hancock::Gallery.mongoid?
           ret << :model_settings if Hancock::Gallery.config.model_settings_support
-          ret << :model_accesses if Hancock::Gallery.config.user_abilities_support
+          # ret << :model_accesses if Hancock::Gallery.config.user_abilities_support
+          ret << :hancock_touch if Hancock::Gallery.config.cache_support
           ret += [:comments, :model_comments] if Hancock::Gallery.config.ra_comments_support
           ret.freeze
         end
         def self.rails_admin_add_visible_actions
-          ret = [:nested_set]
+          ret = [:nested_set, :multiple_file_upload]
           # ret += [:multiple_file_upload, :sort_embedded] if Hancock::Gallery.mongoid?
           ret << :model_settings if Hancock::Gallery.config.model_settings_support
           ret << :model_accesses if Hancock::Gallery.config.user_abilities_support
+          ret << :hancock_touch if Hancock::Gallery.config.cache_support
           ret += [:comments, :model_comments] if Hancock::Gallery.config.ra_comments_support
           ret.freeze
         end

data/lib/hancock/gallery/models/image.rb

@@ -11,7 +11,9 @@ module Hancock::Gallery
       #   include Hancock::Gallery::Watermarkable
       # end
 
-      include Hancock::Cacheable
+      if Hancock::Gallery.config.cache_support
+        include Hancock::Cache::Cacheable
+      end
 
       include Hancock::Gallery.orm_specific('Image')
 
@@ -33,11 +35,19 @@ module Hancock::Gallery
         #   hancock_cms_attached_file(:image)
         # end
 
+        def self.rails_admin_name_synonyms
+          "Photo Картинки Картинка Изображение Изображения".freeze
+        end
+        def self.rails_admin_navigation_icon
+          'icon-picture'.freeze
+        end
+
         def self.manager_can_add_actions
-          ret = [:nested_set, :multiple_file_upload_collection]
+          ret = [:nested_set]
           # ret += [:multiple_file_upload, :sort_embedded] if Hancock::Gallery.mongoid?
           ret << :model_settings if Hancock::Gallery.config.model_settings_support
-          ret << :model_accesses if Hancock::Gallery.config.user_abilities_support
+          # ret << :model_accesses if Hancock::Gallery.config.user_abilities_support
+          ret << :hancock_touch if Hancock::Gallery.config.cache_support
           ret += [:comments, :model_comments] if Hancock::Gallery.config.ra_comments_support
           ret.freeze
         end
@@ -46,6 +56,7 @@ module Hancock::Gallery
           # ret += [:multiple_file_upload, :sort_embedded] if Hancock::Gallery.mongoid?
           ret << :model_settings if Hancock::Gallery.config.model_settings_support
           ret << :model_accesses if Hancock::Gallery.config.user_abilities_support
+          ret << :hancock_touch if Hancock::Gallery.config.cache_support
           ret += [:comments, :model_comments] if Hancock::Gallery.config.ra_comments_support
           ret.freeze
         end

data/lib/hancock/gallery/models/mongoid/gallery.rb

@@ -5,6 +5,9 @@ module Hancock::Gallery
         extend ActiveSupport::Concern
 
         included do
+          index({gallerable_id: 1, gallerable_type: 1}, {background: true})
+          index({enabled: 1, lft: 1}, {background: true})
+
           field :name, type: String, localize: Hancock::Gallery.configuration.localize
 
           scope :sorted, -> { order_by([:lft, :asc]) }

data/lib/hancock/gallery/models/mongoid/image.rb

@@ -5,6 +5,9 @@ module Hancock::Gallery
         extend ActiveSupport::Concern
 
         included do
+          index({gallery_id: 1}, {background: true})
+          index({enabled: 1, lft: 1}, {background: true})
+
           field :name, type: String, localize: Hancock::Gallery.configuration.localize
 
           scope :sorted, -> { order_by([:lft, :asc]) }

data/lib/hancock/gallery/models/mongoid/original_image.rb

@@ -5,7 +5,14 @@ module Hancock::Gallery
         extend ActiveSupport::Concern
 
         included do
+          index({originable_id: 1, originable_type: 1}, {background: true})
+
           field :original, type: BSON::Binary
+
+          hancock_cms_attached_file(:image, url: "/system/:class/:attachment/:id_partition/:style/:hash.:extension",
+                                            hash_data: ":class/:attachment/:id/:style/:created_at",
+                                            hash_secret: Hancock::Gallery.config.original_image_hash_secret
+          )
         end
 
       end

data/lib/hancock/gallery/models/original_image.rb

@@ -4,18 +4,68 @@ module Hancock::Gallery
       extend ActiveSupport::Concern
 
       include Hancock::Model
+      include Hancock::Gallery::Paperclipable
       include Hancock::Gallery.orm_specific('OriginalImage')
 
       included do
+        if Hancock.rails4?
+          belongs_to :originable, polymorphic: true
+        else
+          belongs_to :originable, polymorphic: true, optional: true
+        end
+
+        def from_db_to_fs
+          unless self.original.blank?
+            _paperclip_obj = Paperclip.io_adapters.for(self.original_as_base64)
+            mime_type = MIME::Types[_paperclip_obj.content_type].first
+            _paperclip_obj.original_filename = "#{_paperclip_obj.original_filename}.#{mime_type.extensions.first}" if mime_type
+            self.image = _paperclip_obj
+            self.original = nil
+            return self
+          end
+          return false
+        end
+        def from_db_to_fs!
+          self.from_db_to_fs and self.save
+        end
 
-        belongs_to :originable, polymorphic: true
+        def relocate_original
+          unless File.exists? self.image.path
+            _path = self.image.path
+            _old_file = Dir[File.dirname(self.image.path) + "/*#{File.extname(self.image.path)}"].first
+            if _old_file
+              return File.rename _old_file, _path
+            end
+            return nil
+          end
+          return false
+        end
+        def relocate_original!
+          self.relocate_original and self.image.reprocess!
+        end
 
-        def self.admin_can_default_actions
-          [:show, :read].freeze
+
+        def original_as_base64(content_type = nil)
+          _original = self.original
+          if _original
+            _data = Base64.encode64(_original.data)
+            _content_type = content_type
+          else
+            _data = ''
+            _content_type = content_type || 'jpg'
+          end
+          "data:#{_content_type};base64,#{_data}"
         end
-        def self.manager_can_default_actions
-          [:show, :read].freeze
+        def original_as_image(content_type = nil)
+          "<img src='#{original_as_base64(content_type)}'>".html_safe
         end
+
+        # def self.admin_can_default_actions
+        #   [:show, :read].freeze
+        # end
+        # def self.manager_can_default_actions
+        #   [:show, :read].freeze
+        # end
         def self.admin_cannot_actions
           [:new, :create, :edit, :update].freeze
         end

data/lib/hancock/gallery/paperclip_patch.rb

@@ -0,0 +1,34 @@
+if defined?(Paperclip)
+
+  module Paperclip
+    class Attachment
+
+      def inline_data(style=:original)
+        if queued_for_write[style]
+          queued_for_write[style].read.force_encoding("UTF-8").html_safe rescue ""
+        elsif !path(style).blank? and File.exists?(path(style))
+          File.read(path(style)).force_encoding("UTF-8").html_safe rescue ""
+        end
+      end
+
+      def base64(style=:original)
+        _data = inline_data(style)
+        Base64.encode64(_data) if _data
+      end
+      def base64_as_src(style=:original)
+        _base64 = base64(style)
+        "data:#{content_type};base64,#{_base64}" unless _base64.blank?
+      end
+
+      def inline_svg
+        inline_data if svg?
+      end
+
+      def svg?
+        !!(content_type =~ /svg/)
+      end
+
+    end
+  end
+
+end

data/lib/hancock/gallery/rails_admin_ext/hancock_image.rb

@@ -8,14 +8,54 @@ module RailsAdmin
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types::register(self)
 
+          register_instance_option(:partial) do
+            :form_hancock_image
+          end
+
+          register_instance_option :process_watermark_toggler_method do
+            "process_watermark_#{name}"
+          end
+          register_instance_option :cancel_perform_autocrop_method do
+            "#{name}_autocropped" if bindings[:object].respond_to?("#{name}_autocropped")
+          end
+
+          register_instance_option :process_watermark_default do
+            true
+          end
+
+          register_instance_option :process_watermark_toggler do
+            # bindings[:object].send(name).processors.include?(:watermark) and bindings[:object].respond_to?(process_watermark_toggler_method)
+            bindings[:object].respond_to?(process_watermark_toggler_method)
+          end
+
+
+          register_instance_option :allowed_methods do
+            if process_watermark_toggler
+              [method_name, delete_method, cache_method, cancel_perform_autocrop_method, process_watermark_toggler_method].compact
+            else
+              [method_name, delete_method, cache_method, cancel_perform_autocrop_method].compact
+            end
+          end
+
           register_instance_option :help do
-            "SVG не изменяется."
+            "SVG не изменяется. #{(required? ? I18n.translate('admin.form.required') : I18n.translate('admin.form.optional')) + '. '}"
           end
 
           register_instance_option :jcrop_options do
             "#{name}_jcrop_options".to_sym
           end
 
+          register_instance_option :svg? do
+            (url = resource_url.to_s) && url.split('.').last =~ /svg/i
+          end
+          register_instance_option :thumb_method do
+            if svg?
+              :original
+            else
+              @thumb_method ||= ((styles = bindings[:object].send(name).styles.keys).find{|k| k.in?([:thumb, :thumbnail, 'thumb', 'thumbnail'])} || styles.first.to_s)
+            end
+          end
+
         end
       end
     end