enjoy_cms_gallery 0.4.0.1 → 0.4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00c0e1f36e556ece09d0d90a5493f4752679af22
-  data.tar.gz: c3b947cb8fd2ee714cd64831696ccd99c6863da9
+  metadata.gz: bd0be9a73f8d96fcfd0bb20d8b2259a0d0cef929
+  data.tar.gz: cc0a730f4dab94e2ef39578de352519bad718f3a
 SHA512:
-  metadata.gz: 632ac29c44d5c842f8448a4b486aaacf16fb1a8a0ffc80b54f79f9210242bf1bd9e04027760749a4ed52f40bc5f457aa57a0a4a41e0b3dc54f85ae912a52ebc7
-  data.tar.gz: 11907bd019e601ad28aa0dcf3612420077803d34b14790bcb27566933705cbf3c865e72673a484484e404c2ccb2118e8303f886533d8fbf7278a73016b5da1bf
+  metadata.gz: e0c64f99d6430e85e134507d3dd37bfc7cbc05fd644daa18da7e259c7891198bcb9f35d734f1f34d0b4e02468ba91531e42e4e31e919c865190586909eb46d80
+  data.tar.gz: 10b9025bf73313a46664c5c125c0e0b28fc4a1f35db51a69b2f803a74ef1c7174ec8f2b807dbd28cbb537ff1e567006552cf2fb2522b11437dd7bc03da2bd1ca

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

@@ -7,6 +7,8 @@ if Enjoy.active_record?
     module ClassMethods
       def enjoy_cms_active_record_attached_file(name, opts = {})
         name = name.to_sym
+        is_image = true
+        styles_method_name = nil
         unless opts.blank?
           content_type = opts.delete(:content_type)
           jcrop_options = opts.delete(:jcrop_options)
@@ -21,11 +23,17 @@ if Enjoy.active_record?
           opts[:processors].uniq!
 
           opts[:convert_options] = {all: "-quality 75 -strip"} if opts[:convert_options].blank?
+
+          if opts[:styles].blank?
+            styles_method_name = "#{name}_styles"
+            opts[:styles] = lambda { |attachment| attachment.instance.send(styles_method_name) }
+          end
         end
 
         has_attached_file name, opts
         # 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
           def #{name}_file_name=(val)
             return self[:#{name}_file_name] = ""  if val == ""
@@ -62,6 +70,14 @@ if Enjoy.active_record?
             end
           EVAL
         end
+        if styles_method_name
+          class_eval <<-EVAL
+            def #{styles_method_name}
+              {}
+            end
+          EVAL
+        end
+
       end
     end
   end

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

@@ -8,6 +8,7 @@ if Enjoy.mongoid?
       def enjoy_cms_mongoid_attached_file(name, opts = {})
         name = name.to_sym
         is_image = true
+        styles_method_name = nil
         unless opts.blank?
           content_type = opts.delete(:content_type)
           jcrop_options = opts.delete(:jcrop_options)
@@ -22,11 +23,17 @@ if Enjoy.mongoid?
           opts[:processors].uniq!
 
           opts[:convert_options] = {all: "-quality 75 -strip"} if opts[:convert_options].blank?
+
+          if opts[:styles].blank?
+            styles_method_name = "#{name}_styles"
+            opts[:styles] = lambda { |attachment| attachment.instance.send(styles_method_name) }
+          end
         end
 
         has_mongoid_attached_file name, opts
         # 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
           def #{name}_file_name=(val)
             return self[:#{name}_file_name] = ""  if val == ""
@@ -63,6 +70,14 @@ if Enjoy.mongoid?
             end
           EVAL
         end
+        if styles_method_name
+          class_eval <<-EVAL
+            def #{styles_method_name}
+              {}
+            end
+          EVAL
+        end
+
       end
     end
   end

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

@@ -8,17 +8,7 @@ module Enjoy::Gallery
         include Enjoy::Gallery.orm_specific('EmbeddedImage')
 
         included do
-          enjoy_cms_attached_file(:image,
-                    styles: lambda { |attachment| attachment.instance.image_styles }
-          )
-        end
-
-        def image_jcrop_options
-          {}
-        end
-
-        def image_styles
-          {}
+          enjoy_cms_attached_file(:image)
         end
       end
     end

data/lib/enjoy/gallery/models/gallery.rb

@@ -17,20 +17,10 @@ module Enjoy::Gallery
 
         acts_as_nested_set
 
-        enjoy_cms_attached_file(:image,
-                  styles: lambda { |attachment| attachment.instance.image_styles }
-        )
+        enjoy_cms_attached_file(:image)
 
         # has_many :connected_objects, as: :enjoy_gallerable
       end
-
-      def image_jcrop_options
-        {}
-      end
-
-      def image_styles
-        {}
-      end
     end
   end
 end

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

@@ -13,17 +13,7 @@ module Enjoy::Gallery
 
         acts_as_nested_set
 
-        enjoy_cms_attached_file(:image,
-                  styles: lambda { |attachment| attachment.instance.image_styles }
-        )
-      end
-
-      def image_jcrop_options
-        {}
-      end
-
-      def image_styles
-        {}
+        enjoy_cms_attached_file(:image)
       end
     end
   end

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

@@ -5,9 +5,6 @@ module Enjoy::Gallery
         extend ActiveSupport::Concern
 
         included do
-          if defined?(RailsAdminComments)
-            include RailsAdminComments::Commentable
-          end
           field :name, type: String, localize: Enjoy::Gallery.configuration.localize
 
           scope :sorted, -> { order_by([:lft, :asc]) }

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

@@ -5,9 +5,6 @@ module Enjoy::Gallery
         extend ActiveSupport::Concern
 
         included do
-          if defined?(RailsAdminComments)
-            include RailsAdminComments::Commentable
-          end
           field :name, type: String, localize: Enjoy::Gallery.configuration.localize
 
           scope :sorted, -> { order_by([:lft, :asc]) }

data/lib/enjoy/gallery/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms_gallery
 version: !ruby/object:Gem::Version
-  version: 0.4.0.1
+  version: 0.4.0.2
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler