enjoy_cms 0.2.0.3.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd4ec57e1e47baccfe849e9572ff7728a34c7a11
-  data.tar.gz: 23692ddf8e0deec91f79516ca69d6d97b0e5ff70
+  metadata.gz: a9058168d3e015e9c7618246f623a9c5f2a324be
+  data.tar.gz: 3823a3981ad52b1620ff1e0618acfc3c6ce3ce44
 SHA512:
-  metadata.gz: d3517b3951508d390e50e6f2e7a184ed18cdf83d3d98cb5a0705608627c2ce670ba75cda90d1059ad927491091a9144402f40565adf0e96c2729f4ac7597c75a
-  data.tar.gz: 5e17ce46c0808c0e3b8eaf6928d0768045286b8359a9e582b5f01df6c3c37537f3e0f440a29ef1e04922635012acb8aef346fd4014e49d51470e09474fc2fc95
+  metadata.gz: 772b57c08786e0be58c5accbefc841ee8317e9d91349b89aafc73dc4885d9e674cbdc291e9e6175a5d7ae2e5cb09a89ce566c6d28ddb0e5e8669f9182b755e80
+  data.tar.gz: be0678b89c1ae435d21e9d19352ea2d1b7f7d5974defcc4dddb76f9adb6f7aa27f7407258a12e8204d24983d901b96074ea373e16c8ebc224bacdce0131677b8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enjoy_cms (0.2.0.3.2)
+    enjoy_cms (0.2.1)
       ack_rails_admin_jcrop
       addressable
       ckeditor
@@ -30,7 +30,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ack_rails_admin_jcrop (0.0.6)
+    ack_rails_admin_jcrop (0.0.7)
       mini_magick
       rails (>= 3.0.0)
       rails_admin (>= 0.3.0)

data/app/models/concerns/enjoy/decorators/contact_message.rb

@@ -0,0 +1,5 @@
+module Enjoy::Decorators
+  module ContactMessage
+    extend ActiveSupport::Concern
+  end
+end

data/app/models/concerns/enjoy/decorators/embedded_element.rb

@@ -0,0 +1,5 @@
+module Enjoy::Decorators
+  module EmbeddedElement
+    extend ActiveSupport::Concern
+  end
+end

data/app/models/concerns/enjoy/decorators/embedded_gallery_image.rb

@@ -0,0 +1,5 @@
+module Enjoy::Decorators
+  module EmbeddedGalleryImage
+    extend ActiveSupport::Concern
+  end
+end

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

@@ -0,0 +1,5 @@
+module Enjoy::Decorators
+  module Gallery
+    extend ActiveSupport::Concern
+  end
+end

data/app/models/concerns/enjoy/decorators/gallery_image.rb

@@ -0,0 +1,5 @@
+module Enjoy::Decorators
+  module GalleryImage
+    extend ActiveSupport::Concern
+  end
+end

data/app/models/concerns/enjoy/decorators/menu.rb

@@ -0,0 +1,5 @@
+module Enjoy::Decorators
+  module Menu
+    extend ActiveSupport::Concern
+  end
+end

data/app/models/concerns/enjoy/decorators/news.rb

@@ -0,0 +1,5 @@
+module Enjoy::Decorators
+  module News
+    extend ActiveSupport::Concern
+  end
+end

data/app/models/concerns/enjoy/decorators/page.rb

@@ -0,0 +1,5 @@
+module Enjoy::Decorators
+  module Page
+    extend ActiveSupport::Concern
+  end
+end

data/app/models/concerns/enjoy/decorators/seo.rb

@@ -0,0 +1,5 @@
+module Enjoy::Decorators
+  module Seo
+    extend ActiveSupport::Concern
+  end
+end

data/app/models/concerns/enjoy/decorators/sitemap_data.rb

@@ -0,0 +1,5 @@
+module Enjoy::Decorators
+  module SitemapData
+    extend ActiveSupport::Concern
+  end
+end

data/app/models/enjoy/contact_message.rb

@@ -6,7 +6,11 @@ module Enjoy
 
   class ContactMessage
     include Enjoy::Models::ContactMessage
-    
-    rails_admin &Enjoy::Admin::ContactMessage.config
+
+    include Enjoy::Decorators::ContactMessage
+
+    rails_admin(&Enjoy::Admin::ContactMessage.config(rails_admin_add_fields) { |config|
+      rails_admin_add_config(config)
+    })
   end
 end

data/app/models/enjoy/embedded_element.rb

@@ -2,7 +2,9 @@ module Enjoy
   if Enjoy.mongoid?
     class EmbeddedElement
       include Enjoy::Models::EmbeddedElement
-      
+
+      include Enjoy::Decorators::EmbeddedElement
+
 
       # use it in inherited model
       # rails_admin &Enjoy::Admin::EmbeddedElement.config

data/app/models/enjoy/embedded_gallery_image.rb

@@ -2,7 +2,8 @@ module Enjoy
   if Enjoy.mongoid?
     class EmbeddedGalleryImage < Enjoy::EmbeddedElement
       include Enjoy::Models::EmbeddedGalleryImage
-      
+
+      include Enjoy::Decorators::EmbeddedGalleryImage
 
       # use it in inherited model
       # rails_admin &Enjoy::Admin::EmbeddedGalleryImage.config

data/app/models/enjoy/gallery.rb

@@ -2,9 +2,12 @@ module Enjoy
   if Enjoy.mongoid?
     class Gallery
       include Enjoy::Models::Gallery
-      
 
-      rails_admin &Enjoy::Admin::Gallery.config
+      include Enjoy::Decorators::Gallery
+
+      rails_admin(&Enjoy::Admin::Gallery.config(rails_admin_add_fields) { |config|
+        rails_admin_add_config(config)
+      })
     end
   end
 end

data/app/models/enjoy/gallery_image.rb

@@ -2,9 +2,12 @@ module Enjoy
   if Enjoy.mongoid?
     class GalleryImage
       include Enjoy::Models::GalleryImage
-      
 
-      rails_admin &Enjoy::Admin::GalleryImage.config
+      include Enjoy::Decorators::GalleryImage
+
+      rails_admin(&Enjoy::Admin::GalleryImage.config(rails_admin_add_fields) { |config|
+        rails_admin_add_config(config)
+      })
     end
   end
 end

data/app/models/enjoy/menu.rb

@@ -7,6 +7,10 @@ module Enjoy
   class Menu
     include Enjoy::Models::Menu
 
-    rails_admin &Enjoy::Admin::Menu.config
+    include Enjoy::Decorators::Menu
+
+    rails_admin(&Enjoy::Admin::Menu.config(rails_admin_add_fields) { |config|
+      rails_admin_add_config(config)
+    })
   end
 end

data/app/models/enjoy/news.rb

@@ -7,6 +7,10 @@ module Enjoy
   class News
     include Enjoy::Models::News
 
-    rails_admin &Enjoy::Admin::News.config
+    include Enjoy::Decorators::News
+
+    rails_admin(&Enjoy::Admin::News.config(rails_admin_add_fields) { |config|
+      rails_admin_add_config(config)
+    })
   end
 end

data/app/models/enjoy/page.rb

@@ -7,6 +7,10 @@ module Enjoy
   class Page
     include Enjoy::Models::Page
 
-    rails_admin &Enjoy::Admin::Page.config
+    include Enjoy::Decorators::Page
+
+    rails_admin(&Enjoy::Admin::Page.config(rails_admin_add_fields) { |config|
+      rails_admin_add_config(config)
+    })
   end
 end

data/app/models/enjoy/seo.rb

@@ -6,7 +6,11 @@ module Enjoy
 
   class Seo
     include Enjoy::Models::Seo
-    
-    rails_admin &Enjoy::Admin::Seo.config
+
+    include Enjoy::Decorators::Seo
+
+    rails_admin(&Enjoy::Admin::Seo.config(false, rails_admin_add_fields) { |config|
+      rails_admin_add_config(config)
+    })
   end
 end

data/app/models/enjoy/sitemap_data.rb

@@ -6,7 +6,11 @@ module Enjoy
 
   class SitemapData
     include Enjoy::Models::SitemapData
-    
-    rails_admin &Enjoy::Admin::SitemapData.config
+
+    include Enjoy::Decorators::SitemapData
+
+    rails_admin(&Enjoy::Admin::SitemapData.config(false, rails_admin_add_fields) { |config|
+      rails_admin_add_config(config)
+    })
   end
 end

data/lib/enjoy/admin/contact_message.rb

@@ -1,7 +1,7 @@
 module Enjoy
   module Admin
     module ContactMessage
-      def self.config
+      def self.config(fields = {})
         Proc.new {
           # navigation_label I18n.t('enjoy.contact_message')
           field :c_at do
@@ -21,6 +21,18 @@ module Enjoy
             end
           end
 
+          fields.each_pair do |name, type|
+            if type.nil?
+              field name
+            else
+              if type.is_a?(Array)
+                field name, type[0], &type[1]
+              else
+                field name, type
+              end
+            end
+          end
+
           if block_given?
             yield self
           end

data/lib/enjoy/admin/embedded_element.rb

@@ -6,6 +6,7 @@ module Enjoy
           # navigation_label(_navigation_label) unless _navigation_label.nil?
           field :enabled, :toggle
           field :name, :string
+
           fields.each_pair do |name, type|
             if type.nil?
               field name

data/lib/enjoy/admin/embedded_gallery_image.rb

@@ -6,7 +6,7 @@ module Enjoy
           jcrop_options :image_jcrop_options
         end
 
-        fields = {image: [:jcrop, jcrop_proc]}.merge(fields)
+        fields.reverse_merge!({image: [:jcrop, jcrop_proc]})
         if block_given?
           Enjoy::Admin::EmbeddedElement.config(nil, fields) do |config|
             yield config

data/lib/enjoy/admin/gallery.rb

@@ -1,7 +1,7 @@
 module Enjoy
   module Admin
     module Gallery
-      def self.config
+      def self.config(fields = {})
         Proc.new {
           # navigation_label I18n.t('enjoy.gallery')
           field :enabled, :toggle
@@ -24,6 +24,18 @@ module Enjoy
             jcrop_options :image_jcrop_options
           end
 
+          fields.each_pair do |name, type|
+            if type.nil?
+              field name
+            else
+              if type.is_a?(Array)
+                field name, type[0], &type[1]
+              else
+                field name, type
+              end
+            end
+          end
+
           if block_given?
             yield self
           end

data/lib/enjoy/admin/gallery_image.rb

@@ -12,6 +12,7 @@ module Enjoy
           field :image, :jcrop do
             jcrop_options :image_jcrop_options
           end
+          
           fields.each_pair do |name, type|
             if type.nil?
               field name

data/lib/enjoy/admin/menu.rb

@@ -1,7 +1,7 @@
 module Enjoy
   module Admin
     module Menu
-      def self.config
+      def self.config(fields = {})
         Proc.new {
           # navigation_label 'CMS'
 
@@ -9,6 +9,18 @@ module Enjoy
           field :text_slug
           field :name
 
+          fields.each_pair do |name, type|
+            if type.nil?
+              field name
+            else
+              if type.is_a?(Array)
+                field name, type[0], &type[1]
+              else
+                field name, type
+              end
+            end
+          end
+
           if block_given?
             yield self
           end

data/lib/enjoy/admin/seo.rb

@@ -1,7 +1,7 @@
 module Enjoy
   module Admin
     module Seo
-      def self.config(is_active = true)
+      def self.config(is_active = true, fields = {})
         Proc.new {
           navigation_label 'SEO'
           field :seoable do
@@ -19,6 +19,18 @@ module Enjoy
             jcrop_options :og_image_jcrop_options
           end
 
+          fields.each_pair do |name, type|
+            if type.nil?
+              field name
+            else
+              if type.is_a?(Array)
+                field name, type[0], &type[1]
+              else
+                field name, type
+              end
+            end
+          end
+
           if block_given?
             yield self
           end

data/lib/enjoy/admin/sitemap_data.rb

@@ -1,7 +1,7 @@
 module Enjoy
   module Admin
     module SitemapData
-      def self.config(is_active = false)
+      def self.config(is_active = false, fields = {})
         Proc.new {
           navigation_label 'SEO'
           label I18n.t('enjoy.sitemap_data')
@@ -17,6 +17,18 @@ module Enjoy
           end
           field :sitemap_priority
 
+          fields.each_pair do |name, type|
+            if type.nil?
+              field name
+            else
+              if type.is_a?(Array)
+                field name, type[0], &type[1]
+              else
+                field name, type
+              end
+            end
+          end
+
           if block_given?
             yield self
           end

data/lib/enjoy/models/contact_message.rb

@@ -21,17 +21,30 @@ module Enjoy
         end
 
         after_create do
-          mailer_class.send(mailer_method, self).deliver
+          mailer_class.send(mailer_method, self).deliver if send_emails?
         end
+      end
 
-        def mailer_class
-          ContactMailer
+      module ClassMethods
+        def rails_admin_add_fields
+          {}
         end
 
-        def mailer_method
-          :new_message_email
+        def rails_admin_add_config(config)
         end
       end
+
+      def send_emails?
+        true
+      end
+
+      def mailer_class
+        ContactMailer
+      end
+
+      def mailer_method
+        :new_message_email
+      end
     end
   end
 end

data/lib/enjoy/models/embedded_element.rb

@@ -5,8 +5,17 @@ module Enjoy
       include Enjoy::Model
       include Enjoy::Enableable
       include Enjoy::Sortable
-      
+
       include Enjoy.orm_specific('EmbeddedElement')
+
+      module ClassMethods
+        def rails_admin_add_fields
+          {}
+        end
+
+        def rails_admin_add_config(config)
+        end
+      end
     end
   end
 end

data/lib/enjoy/models/embedded_gallery_image.rb

@@ -11,6 +11,15 @@ module Enjoy
       included do
         validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/, if: :image?
       end
+
+      module ClassMethods
+        def rails_admin_add_fields
+          {}
+        end
+
+        def rails_admin_add_config(config)
+        end
+      end
     end
   end
 end

data/lib/enjoy/models/gallery.rb

@@ -16,6 +16,15 @@ module Enjoy
 
         validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/, if: :image?
       end
+
+      module ClassMethods
+        def rails_admin_add_fields
+          {}
+        end
+
+        def rails_admin_add_config(config)
+        end
+      end
     end
   end
 end

data/lib/enjoy/models/gallery_image.rb

@@ -14,6 +14,15 @@ module Enjoy
 
         validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/, if: :image?
       end
+
+      module ClassMethods
+        def rails_admin_add_fields
+          {}
+        end
+
+        def rails_admin_add_config(config)
+        end
+      end
     end
   end
 end

data/lib/enjoy/models/menu.rb

@@ -7,6 +7,7 @@ module Enjoy
       include Enjoy::Enableable
 
       include Enjoy.orm_specific('Menu')
+
       included do
 
         field :name, type: String
@@ -19,6 +20,15 @@ module Enjoy
           Rails.cache.delete 'menus'
         end
       end
+
+      module ClassMethods
+        def rails_admin_add_fields
+          {}
+        end
+
+        def rails_admin_add_config(config)
+        end
+      end
     end
   end
 end

data/lib/enjoy/models/news.rb

@@ -36,6 +36,15 @@ module Enjoy
         manual_slug :report_slug
       end
 
+      module ClassMethods
+        def rails_admin_add_fields
+          {}
+        end
+
+        def rails_admin_add_config(config)
+        end
+      end
+
       def report_slug
         if time.blank?
           name

data/lib/enjoy/models/page.rb

@@ -23,6 +23,15 @@ module Enjoy
         end
       end
 
+      module ClassMethods
+        def rails_admin_add_fields
+          {}
+        end
+
+        def rails_admin_add_config(config)
+        end
+      end
+
       def page_h1
         _ret = seo ? seo.h1 : nil
         _ret = name   if _ret.blank?

data/lib/enjoy/models/seo.rb

@@ -12,6 +12,15 @@ module Enjoy
 
         validates_attachment_content_type :og_image, content_type: /\Aimage\/.*\Z/, if: :og_image?
       end
+
+      module ClassMethods
+        def rails_admin_add_fields
+          {}
+        end
+
+        def rails_admin_add_config(config)
+        end
+      end
     end
   end
 end

data/lib/enjoy/models/sitemap_data.rb

@@ -12,6 +12,15 @@ module Enjoy
       included do
         belongs_to :sitemap_data_field, polymorphic: true
       end
+
+      module ClassMethods
+        def rails_admin_add_fields
+          {}
+        end
+
+        def rails_admin_add_config(config)
+        end
+      end
     end
   end
 end

data/lib/enjoy/version.rb

@@ -1,3 +1,3 @@
 module Enjoy
-  VERSION = "0.2.0.3.2"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms
 version: !ruby/object:Gem::Version
-  version: 0.2.0.3.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -414,6 +414,16 @@ files:
 - app/helpers/enjoy/powered_helper.rb
 - app/mailers/enjoy/contact_mailer.rb
 - app/models/concerns/enjoy/boolean_field.rb
+- app/models/concerns/enjoy/decorators/contact_message.rb
+- app/models/concerns/enjoy/decorators/embedded_element.rb
+- app/models/concerns/enjoy/decorators/embedded_gallery_image.rb
+- app/models/concerns/enjoy/decorators/gallery.rb
+- app/models/concerns/enjoy/decorators/gallery_image.rb
+- app/models/concerns/enjoy/decorators/menu.rb
+- app/models/concerns/enjoy/decorators/news.rb
+- app/models/concerns/enjoy/decorators/page.rb
+- app/models/concerns/enjoy/decorators/seo.rb
+- app/models/concerns/enjoy/decorators/sitemap_data.rb
 - app/models/concerns/enjoy/enableable.rb
 - app/models/concerns/enjoy/geocodeable.rb
 - app/models/concerns/enjoy/mappable.rb