hancock_cms_gallery 1.0.0 → 1.0.2

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

@@ -4,20 +4,51 @@ module Hancock::Gallery::Watermarkable
   module ClassMethods
     def paperclip_with_watermark(field = :image, original_image_class_name = "Hancock::Gallery::OriginalImage")
 
-      attr_accessor "#{field}_autocropped".to_sym
+      attr_accessor "process_watermark_#{field}".to_sym
+
+      hancock_cms_attached_file field, processors: -> (instance) {
+        _processors = (instance.try("#{field}_default_processors") || []).dup
+        p_o = _processors.delete :paperclip_optimizer
+        if p_o
+          __processors = _processors.dup.uniq
+          _processors.clear
+          # _processors << :thumbnail
+          _processors << p_o
+          __processors.each do |p|
+            _processors << p
+          end
+        end
+
+        # p_w = _processors.delete :watermark
+        if ['1', 'true', 't', 'yes', 'y', true, 1, :true, :yes].include?(instance.try("process_watermark_#{field}"))
+          _processors << :watermark
+        end
+        _processors.uniq
+      }
 
-      hancock_cms_attached_file field, processors: [:watermark]
       # field "original_#{field}", type: BSON::Binary
-      has_one "original_#{field}_data", as: :originable, class_name: original_image_class_name
+      has_one "original_#{field}_data", as: :originable, class_name: original_image_class_name, dependent: :destroy
 
       class_eval %{
         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
 
           if File.exists?(self.#{field}.path)
             auto_rails_admin_jcrop(:#{field})
 
+          # original file in object`s original_image as file
+          elsif self.original_#{field}_data and !self.original_#{field}_data.image.blank?
+            _dir = File.dirname(self.#{field}.path)
+            FileUtils.mkdir_p(_dir) unless File.exists?(_dir)
+            File.unlink(self.#{field}.path) if File.symlink?(self.#{field}.path)
+            File.symlink(self.original_#{field}_data.image.path, self.#{field}.path)
+            self.class.skip_callback(:save, :after, "save_original_#{field}".to_sym)
+            self.#{field}.reprocess!
+            self.class.set_callback(:save, :after, "save_original_#{field}".to_sym)
+            File.unlink(self.#{field}.path)
+
           elsif (_data = self.original_#{field})
             _old_filename = self.#{field}_file_name
             if _data
@@ -25,6 +56,8 @@ module Hancock::Gallery::Watermarkable
               _temp = Tempfile.new(_old_filename)
               _temp.binmode
               _temp.write _data
+              _dir = File.dirname(self.#{field}.path)
+              FileUtils.mkdir_p(_dir) unless File.exists?(_dir)
               File.unlink(self.#{field}.path) if File.symlink?(self.#{field}.path)
               File.symlink(_temp.path, self.#{field}.path)
               # self.#{field} = _temp
@@ -32,65 +65,108 @@ module Hancock::Gallery::Watermarkable
               self.class.skip_callback(:save, :after, "original_#{field}_to_db".to_sym)
               auto_rails_admin_jcrop(:#{field})
               self.class.set_callback(:save, :after, "original_#{field}_to_db".to_sym)
+              File.unlink(self.#{field}.path)
               _temp.unlink
             end
           end
         end
 
-        before_#{field}_post_process do
-          p_o = self.#{field}.processors.delete :paperclip_optimizer
-          # if p_o
-          #   _processors = self.#{field}.processors.dup
-          #   self.#{field}.processors.clear
-          #   self.#{field}.processors = [:thumbnail, p_o]
-          #   _processors.each do |p|
-          #     self.#{field}.processors << p
-          #   end
-          # end
-
-          p_w = self.#{field}.processors.delete :watermark
-          self.#{field}.processors << p_w if p_w
-
-          true
-        end
+        # before_#{field}_post_process do
+        #   p_o = self.#{field}.processors.delete :paperclip_optimizer
+        #   if p_o
+        #     _processors = self.#{field}.processors.dup
+        #     self.#{field}.processors.clear
+        #     # self.#{field}.processors << :thumbnail
+        #     self.#{field}.processors << p_o
+        #     _processors.each do |p|
+        #       self.#{field}.processors << p
+        #     end
+        #   end
+        #
+        #   p_w = self.#{field}.processors.delete :watermark
+        #   if p_w and self.process_watermark_#{field}
+        #     self.#{field}.processors << p_w
+        #   end
+        #   self.#{field}.processors.uniq!
+        #
+        #
+        #   true
+        # end
 
         def original_#{field}
-          original_#{field}_data.original if original_#{field}_data
+          original_#{field}_data and original_#{field}_data.original
         end
         def original_#{field}_base64
-          _original = self.original_#{field}
-          if _original
-            _data = Base64.encode64(_original.data)
-            _content_type = self.#{field}_content_type
-          else
-            _data = ''
-            _content_type = 'jpg'
-          end
-          "data:\#{_content_type};base64,\#{_data}"
+          original_#{field}_data and original_#{field}_data.original_as_base64(self.#{field}_content_type)
+        end
+        def original_#{field}_image
+          original_#{field}_data and original_#{field}_data.original_as_image(self.#{field}_content_type)
         end
 
-        after_save :original_#{field}_to_db
+        # after_save :original_#{field}_to_db
         def original_#{field}_to_db
-          if self.#{field}_file_name
+          unless self.#{field}.blank?
             if File.exists?(self.#{field}.path)
               _original = self.original_#{field}_data
               unless _original
                 _original = #{original_image_class_name}.new
                 _original.originable = self
               end
+              _original.image = nil
               _original.original = BSON::Binary.new(File.binread(self.#{field}.path))
               if _original.save
                 File.unlink(self.#{field}.path)
               end
             end
+          else
+            self.original_#{field}_data and self.original_#{field}_data.delete
           end
         end
 
+        after_save :save_original_#{field}
+        def save_original_#{field}
+          unless self.#{field}.blank?
+            if File.exists?(self.#{field}.path)
+              _original = self.original_#{field}_data
+              unless _original
+                _original = #{original_image_class_name}.new
+                _original.originable = self
+              end
+              _original.image = self.#{field}
+              _original.original = nil
+              if _original.save
+                File.unlink(self.#{field}.path) if File.exists?(self.#{field}.path)
+              end
+            end
+          else
+            self.original_#{field}_data and self.original_#{field}_data.delete
+          end
+        end
+
+        def reprocess_#{field}_with_watermark
+          self.process_watermark_#{field} = true
+          self.reprocess_#{field}
+        end
+
         def reprocess_#{field}
           return if self.#{field}.blank?
 
+          # original file in object
           if File.exists?(self.#{field}.path)
             self.#{field}.reprocess!
+
+          # original file in object`s original_image as file
+          elsif self.original_#{field}_data and !self.original_#{field}_data.image.blank?
+            _dir = File.dirname(self.#{field}.path)
+            FileUtils.mkdir_p(_dir) unless File.exists?(_dir)
+            File.unlink(self.#{field}.path) if File.symlink?(self.#{field}.path)
+            File.symlink(self.original_#{field}_data.image.path, self.#{field}.path)
+            self.class.skip_callback(:save, :after, "save_original_#{field}".to_sym)
+            self.#{field}.reprocess!
+            self.class.set_callback(:save, :after, "save_original_#{field}".to_sym)
+            File.unlink(self.#{field}.path)
+
+          # original file in object`s original_image as db field
           elsif (_data = self.original_#{field})
             _old_filename = self.#{field}_file_name
             if _data
@@ -98,15 +174,18 @@ module Hancock::Gallery::Watermarkable
               _temp = Tempfile.new(_old_filename)
               _temp.binmode
               _temp.write _data
+              _dir = File.dirname(self.#{field}.path)
+              FileUtils.mkdir_p(_dir) unless File.exists?(_dir)
               File.unlink(self.#{field}.path) if File.symlink?(self.#{field}.path)
               File.symlink(_temp.path, self.#{field}.path)
-              self.#{field} = _temp
-              self.#{field}.instance_write(:file_name, "\#{SecureRandom.hex}\#{File.extname(_old_filename)}")
+              # self.#{field} = _temp
+              # self.#{field}.instance_write(:file_name, "\#{SecureRandom.hex}\#{File.extname(_old_filename)}")
               self.class.skip_callback(:save, :after, "original_#{field}_to_db".to_sym)
               self.#{field}.reprocess!
               self.class.set_callback(:save, :after, "original_#{field}_to_db".to_sym)
               _temp.unlink
-              self.save
+              File.unlink(self.#{field}.path)
+              # self.save
             end
           end
         end

data/app/views/rails_admin/jcrop/edit.html.slim

@@ -7,9 +7,18 @@
   = form_tag nil, @form_options.merge({class: "form-horizontal denser"}) do
     - if File.exists?(@object.send(@field).path) 
       = image_tag @object.send(@field).url, @image_tag_options
+    - elsif @object.respond_to?("original_#{@field}_data") and !@object.send("original_#{@field}_data").image.blank?
+      = image_tag @object.send("original_#{@field}_data").image.url, @image_tag_options
     - elsif @object.respond_to?("original_#{@field}_base64".to_sym)
       = image_tag @object.send("original_#{@field}_base64".to_sym), @image_tag_options
       
+      
+    - if @object.respond_to?("process_watermark_#{@field}")
+      label{style='display: block; line-height: 40px;'}
+        - _html_attributes = {class: 'form-control'}
+        span{style='float: left'}= check_box_tag "process_watermark_#{@field}", true, _html_attributes
+        div{style='margin-left: 15px; '} Добавлять водяной знак?
+        
     = hidden_field_tag :crop_x
     = hidden_field_tag :crop_y
     = hidden_field_tag :crop_w

data/app/views/rails_admin/main/_form_hancock_image.html.slim

@@ -0,0 +1,56 @@
+- if field.jcrop_options.is_a?(Hash)
+  - rails_admin_jcrop_options = field.jcrop_options.to_json
+- else
+  - _method = field.jcrop_options.to_sym
+  - if form.object.respond_to?(_method)
+    - rails_admin_jcrop_options = form.object.send(field.jcrop_options.to_sym).to_json
+  - else
+    - rails_admin_jcrop_options = {}
+
+= stylesheet_link_tag 'rails_admin/jquery.Jcrop'
+= stylesheet_link_tag 'rails_admin/ra.jcrop'
+= javascript_include_tag 'rails_admin/jquery.Jcrop'
+= javascript_include_tag 'rails_admin/ra.jcrop'
+
+- file = form.object.send(field.method_name).presence
+
+- _add_class = (field.pretty_value and !field.svg? ? "jcrop_data_value" : "")
+.toggle{class="#{_add_class}" style=('display:none;' if file and field.delete_method and form.object.send(field.delete_method) == '1')}
+  - if value = field.pretty_value
+    .preview
+      - unless field.svg?
+        .title_link_hint= "Обрезать"
+      .image_block
+        = value
+  = form.file_field(field.name, field.html_attributes.reverse_merge({data: {fileupload: true, rails_admin_jcrop_options: rails_admin_jcrop_options } }))
+
+  - model_name = form.object.class.to_param.gsub("::", "~").underscore
+  - url = jcrop_path(model_name: model_name, modal: true, id: form.object.id, field: field.name, fit_image: field.fit_image)
+  - link_data = {link: url, thumb: field.thumb_method || "original"}
+  = link_to 'Edit Image', '#', data: link_data, style: 'display:none', class: "jcrop_handle"
+
+  - if field.try(:process_watermark_toggler)
+    label{style='display: block;'}
+      - _html_attributes = {checked: field.process_watermark_default, class: 'form-control'}
+      span{style='float: left'}= form.check_box field.process_watermark_toggler_method, _html_attributes
+      div{style='margin-left: 35px; line-height: 40px;'} Добавлять водяной знак?
+      
+      
+- if field.cancel_perform_autocrop_method
+  label{style='display: block;'}
+    - _html_attributes = {class: 'form-control'}
+    span{style='float: left'}= form.check_box field.cancel_perform_autocrop_method, _html_attributes
+    div{style='margin-left: 35px; line-height: 40px;'} Отменить автоматическую обрезку
+
+
+- if field.optional? and field.errors.blank? and file and field.delete_method
+  - onclick = "$(this).siblings('[type=checkbox]').click(); $(this).siblings('.toggle').toggle('slow'); jQuery(this).toggleClass('btn-danger btn-info'); return false;"
+  br
+  = link_to "#", data: {toggle:'button'}, onclick: onclick, class: "btn btn-info" do
+    i.icon-white.icon-trash
+    = "#{I18n.t('admin.actions.delete.menu').capitalize} #{field.method_name}"
+
+  = form.check_box field.delete_method, style: 'display:none;'
+  br
+- if field.cache_method
+  = form.hidden_field field.cache_method

data/config/initializers/hancock_gallery.rb

@@ -1,23 +1,3 @@
-Hancock.rails_admin_configure do |config|
-  config.action_visible_for :nested_set, 'Hancock::Gallery::Gallery'
-  config.action_visible_for :nested_set, 'Hancock::Gallery::Image'
-
-  if defined?(RailsAdminComments)
-    config.action_visible_for :comments, 'Hancock::Gallery::Gallery'
-    config.action_visible_for :comments, 'Hancock::Gallery::Image'
-
-    config.action_visible_for :model_comments, 'Hancock::Gallery::Gallery'
-    config.action_visible_for :model_comments, 'Hancock::Gallery::Image'
-  end
-
-  if defined?(RailsAdminMultipleFileUpload)
-    if true or Hancock::Catalog.active_record?
-      config.action_visible_for :multiple_file_upload, 'Hancock::Gallery::Gallery'
-      config.action_visible_for :multiple_file_upload_collection, 'Hancock::Gallery::Image'
-    end
-  end
-end
-
 if defined?(RailsAdmin)
   RailsAdmin.config do |config|
     config.excluded_models ||= []

data/hancock_cms_gallery.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_dependency 'hancock_cms', [">=1.0", "<=2.0"]
-  # spec.add_dependency 'hancock_cms', ["~> 1.0", "~> 2.0"]
+  spec.add_dependency 'hancock_cms', [">=1.0.2", "<2.1.x"]
+  # spec.add_dependency 'hancock_cms', ["~> 1.0.2", "~> 2.1.x"]
 
   spec.add_dependency 'ack_rails_admin_jcrop', '~> 0.2.0'
 end

data/lib/generators/hancock/gallery/config/templates/hancock_gallery.erb

@@ -2,8 +2,14 @@ Hancock::Gallery.configure do |config|
   ##### defaults #####
   # config.localize = Hancock.config.localize
   #
+  # config.cache_support  = defined?(Hancock::Cache)
+  #
   # config.model_settings_support = defined?(RailsAdminModelSettings)
   # config.user_abilities_support = defined?(RailsAdminUserAbilities)
   # config.ra_comments_support = defined?(RailsAdminComments)
   # config.watermark_support = defined?(PaperclipWatermark)
+  #
+  # config.original_image_hash_secret = Rails.application.secrets.secret_key_base
+  #
+  # config.default_convert_options = {all: ["-quality", "75", "-strip"]}
 end

data/lib/generators/hancock/gallery/migrations/{migration_generator.rb → migrations_generator.rb}

@@ -2,7 +2,7 @@ require 'rails/generators'
 require 'rails/generators/active_record'
 
 module Hancock::Gallery
-  class MigrationGenerator < Rails::Generators::Base
+  class MigrationsGenerator < Rails::Generators::Base
     include ActiveRecord::Generators::Migration
     source_root File.expand_path('../templates', __FILE__)
 

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

@@ -37,7 +37,7 @@ module Hancock::Gallery::Models
     end
 
     def camelcased_class_name
-      gallery_class_name.camelcase
+      class_name.camelcase
     end
 
     def underscored_image_class_name

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

@@ -28,19 +28,19 @@ class <%= camelcased_class_name %> < Hancock::Gallery::EmbeddedImage
     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/generators/hancock/gallery/models/templates/gallery.erb

@@ -17,6 +17,13 @@ class <%= camelcased_class_name %> < Hancock::Gallery::Gallery
   # end
 
   ############# rails_admin ##############
+  # def self.rails_admin_name_synonyms
+  #   super
+  # end
+  # def self.rails_admin_navigation_icon
+  #   ''.freeze
+  # end
+
   def self.rails_admin_add_fields
     super
   end
@@ -25,19 +32,19 @@ class <%= camelcased_class_name %> < Hancock::Gallery::Gallery
     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/generators/hancock/gallery/models/templates/image.erb

@@ -17,6 +17,13 @@ class <%= camelcased_class_name %> < Hancock::Gallery::Image
   # end
 
   ############# rails_admin ##############
+  # def self.rails_admin_name_synonyms
+  #   super
+  # end
+  # def self.rails_admin_navigation_icon
+  #   'icon-picture'.freeze
+  # end
+
   def self.rails_admin_add_fields
     super
   end
@@ -25,19 +32,19 @@ class <%= camelcased_class_name %> < Hancock::Gallery::Image
     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