enjoy_cms_gallery 0.4.0 → 0.4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14d385e2e07eed29fe3e2b8dda8d9754e46fff02
-  data.tar.gz: db924613c7e789eeba4a30007f6807c880fb5db3
+  metadata.gz: 00c0e1f36e556ece09d0d90a5493f4752679af22
+  data.tar.gz: c3b947cb8fd2ee714cd64831696ccd99c6863da9
 SHA512:
-  metadata.gz: ca78fe4b6384b3d11de2b8ddb8518c1a354c227ba8888f78a9641a0f090d042ea8bab76f5173621f6340335d47d0c5c22baf7d4efe54b1c4cce970b689133490
-  data.tar.gz: bda39d733b579c7b0b7ca3c1f80a90ac9e838fdffbe3cb0a9e3ac0871d95e155fd082aab9d5d441dfdf3ecab3a3a20528a0c1357c3af4b8bf6cfaa1d1f2a42d1
+  metadata.gz: 632ac29c44d5c842f8448a4b486aaacf16fb1a8a0ffc80b54f79f9210242bf1bd9e04027760749a4ed52f40bc5f457aa57a0a4a41e0b3dc54f85ae912a52ebc7
+  data.tar.gz: 11907bd019e601ad28aa0dcf3612420077803d34b14790bcb27566933705cbf3c865e72673a484484e404c2ccb2118e8303f886533d8fbf7278a73016b5da1bf

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

@@ -41,6 +41,18 @@ if Enjoy.active_record?
             self.#{name}.processors << p_o if p_o
             true
           end
+
+          def #{name}_svg?
+            #{name}_content_type =~ /svg/
+          end
+
+          def #{name}_url(opts)
+            if #{name}_svg?
+              #{name}.url
+            else
+              #{name}.url(opts)
+            end
+          end
         EVAL
         jcrop_options ||= {}
         if jcrop_options

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

@@ -42,6 +42,18 @@ if Enjoy.mongoid?
             self.#{name}.processors << p_o if p_o
             true
           end
+
+          def #{name}_svg?
+            #{name}_content_type =~ /svg/
+          end
+
+          def #{name}_url(opts)
+            if #{name}_svg?
+              #{name}.url
+            else
+              #{name}.url(opts)
+            end
+          end
         EVAL
         jcrop_options ||= {}
         if jcrop_options

data/lib/enjoy/gallery/admin/embedded_image.rb

@@ -2,13 +2,10 @@ module Enjoy::Gallery
   module Admin
     module EmbeddedImage
       def self.config(fields = {})
-        jcrop_proc = Proc.new do
-          jcrop_options :image_jcrop_options
-        end
 
         if fields
           if fields.is_a?(Hash)
-            fields.reverse_merge!({image: [:jcrop, jcrop_proc]})
+            fields.reverse_merge!({image: :enjoy_image})
           else
             finded = false
             fields.each { |g|
@@ -18,7 +15,7 @@ module Enjoy::Gallery
               fields << {
                 name: :image,
                 fields: {
-                  image: [:jcrop, jcrop_proc]
+                  image: :enjoy_image
                 }
               }
             end

data/lib/enjoy/gallery/admin/gallery.rb

@@ -13,24 +13,11 @@ module Enjoy::Gallery
           end
           group :URL do
             active false
-            field :slugs, :enum do
-              searchable true
-              enum_method do
-                :slugs
-              end
-              visible do
-                bindings[:view].current_user.admin?
-              end
-              multiple do
-                true
-              end
-            end
+            field :slugs, :enjoy_slugs
             field :text_slug
           end
 
-          field :image, :jcrop do
-            jcrop_options :image_jcrop_options
-          end
+          field :image, :enjoy_image
 
           # field :gallery_objects do
           #   read_only true

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

@@ -15,9 +15,7 @@ module Enjoy::Gallery
           field :name, :string do
             searchable true
           end
-          field :image, :jcrop do
-            jcrop_options :image_jcrop_options
-          end
+          field :image, :enjoy_image
 
           nested_set({max_depth: 1, scopes: []})
 

data/lib/enjoy/gallery/rails_admin_ext/enjoy_image.rb

@@ -0,0 +1,32 @@
+require 'ack_rails_admin_jcrop'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class EnjoyImage < RailsAdmin::Config::Fields::Types::Jcrop
+          # Register field type for the type loader
+          RailsAdmin::Config::Fields::Types::register(self)
+
+          register_instance_option :help do
+            "SVG не изменяется."
+          end
+
+          register_instance_option :jcrop_options do
+            "#{name}_jcrop_options".to_sym
+          end
+
+        end
+      end
+    end
+  end
+end
+
+RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
+  if (properties.respond_to?(:name) ? properties.name : properties[:name]) == :enjoy_image
+    fields << RailsAdmin::Config::Fields::Types::EnjoyImage.new(parent, :enjoy_image, properties)
+    true
+  else
+    false
+  end
+end

data/lib/enjoy/gallery/version.rb

@@ -1,5 +1,5 @@
 module Enjoy
   module Gallery
-    VERSION = "0.4.0"
+    VERSION = "0.4.0.1"
   end
 end

data/lib/enjoy_cms_gallery.rb

@@ -18,6 +18,8 @@ require "paperclip-optimizer"
 
 require "ack_rails_admin_jcrop"
 
+require "enjoy/gallery/rails_admin_ext/enjoy_image"
+
 require 'enjoy/gallery/configuration'
 require 'enjoy/gallery/engine'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms_gallery
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.0.1
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -174,6 +174,7 @@ files:
 - lib/enjoy/gallery/models/mongoid/embedded_image.rb
 - lib/enjoy/gallery/models/mongoid/gallery.rb
 - lib/enjoy/gallery/models/mongoid/image.rb
+- lib/enjoy/gallery/rails_admin_ext/enjoy_image.rb
 - lib/enjoy/gallery/version.rb
 - lib/enjoy_cms_gallery.rb
 - lib/generators/enjoy/gallery/config/install_generator.rb