enjoy_cms 0.2.0.2 → 0.2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c3bb6808528fe136b6fff4b42014592f21983b8
-  data.tar.gz: 299c68b484d677e16a6c08f1e2b6a154360b92d5
+  metadata.gz: 378d560813a049c82be0a4330904b9322dd23057
+  data.tar.gz: bf67ae38a9c6a3bdf90ea86f31f8948b0a8f2aee
 SHA512:
-  metadata.gz: a34ddbc371a0eddd425be1bb2b49f722f26bd1cc1064e02e543b4e35e231511e6449f8ba5ab110b9a6a587b29dfdbcab9df21ba651a2634f7c917ebe0b39be01
-  data.tar.gz: 745ce880d8b18ccc951c80eec52955d9f1fcf45a0e1df0dc0cfeaabfcc4fc1991a0a2942a15927ec596c47ef33fe9e913d175fca39d1d8d01cdb5d5738ae2c72
+  metadata.gz: ad5e1a8e2fcebec80b7fc7ff612f4a055aca72cdb57ad3ddb2758d04507fdc21004ab5d72ad3e93edb32207796201d2db6acac84a3419f3759f1893795d1e87c
+  data.tar.gz: 0b76e3c33cb4a274216d5e0ac8c50b03046ff6474a28c3ac34f3c3793defa398b013d4dfa552ab6b3c87e3aa23c067ef755682508986e7555c08a73068787574

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enjoy_cms (0.2.0.2)
+    enjoy_cms (0.2.0.3)
       ack_rails_admin_jcrop
       addressable
       ckeditor
@@ -89,7 +89,7 @@ GEM
       execjs
     coffee-script-source (1.10.0)
     concurrent-ruby (1.0.0)
-    devise (3.5.5)
+    devise (3.5.6)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -100,7 +100,7 @@ GEM
     execjs (2.6.0)
     font-awesome-rails (4.5.0.0)
       railties (>= 3.2, < 5.0)
-    geocoder (1.2.14)
+    geocoder (1.3.0)
     glebtv-simple_captcha (0.6.7)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
@@ -221,7 +221,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    stringex (2.5.2)
+    stringex (2.6.0)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.2)
@@ -231,7 +231,7 @@ GEM
       thread_safe (~> 0.1)
     validates_email_format_of (1.6.3)
       i18n
-    warden (1.2.5)
+    warden (1.2.6)
       rack (>= 1.0)
     x-real-ip (0.2.1)
       activesupport

data/app/controllers/concerns/enjoy/errors.rb

@@ -33,13 +33,13 @@ module Enjoy::Errors
           #redirect_to scope.new_user_session_path, alert: "Необходимо авторизоваться"
           authenticate_user!
         else
-          redirect_to '/', alert: t('rs.errors.access_denied')
+          redirect_to '/', alert: t('enjoy.errors.access_denied')
         end
       end
     end
 
     rescue_from ActionController::InvalidAuthenticityToken do |exception|
-      redirect_to '/', alert: t('rs.errors.form_expired')
+      redirect_to '/', alert: t('enjoy.errors.form_expired')
     end
   end
 
@@ -71,7 +71,7 @@ module Enjoy::Errors
     Rails.logger.error "__________________________"
     begin
       if rails_admin?
-        render text: t('rs.errors.internal_error_full', klass: exception.class.name, message: exception.message), status: 500
+        render text: t('enjoy.errors.internal_error_full', klass: exception.class.name, message: exception.message), status: 500
         return
       end
     rescue Exception => e

data/app/controllers/concerns/enjoy/localizeable.rb

@@ -12,7 +12,7 @@ module Enjoy::Localizeable
     {locale: params[:locale]}
   end
   def nav_get_menu_items(type)
-    pages = Enjoy::Menu.find(type.to_s).pages.enabled
+    pages = menu_class.find(type.to_s).pages.enabled
     if Enjoy.mongoid?
       pages = pages.where(:"name.#{I18n.locale}".exists => true)
     elsif Enjoy.active_record?
@@ -27,7 +27,17 @@ module Enjoy::Localizeable
     page_class.enabled.where(fullpath: path.gsub(/(\/ru|\/en)/, "")).first
   end
 
+  def page_class_name
+    "Enjoy::Page"
+  end
   def page_class
-    Enjoy::Page
+    page_class_name.constantize
+  end
+
+  def menu_class_name
+    "Enjoy::Menu"
+  end
+  def menu_class
+    menu_class_name.constantize
   end
 end

data/app/controllers/concerns/enjoy/seo_pages.rb

@@ -22,10 +22,10 @@ module Enjoy::SeoPages
       path = path[0..-2]
       do_redirect = true
     end
-    page = Enjoy::Page.enabled.where(fullpath: path).first
+    page = page_class.enabled.where(fullpath: path).first
 
     if page.nil? && !params[:slug].blank?
-      page = Enjoy::Page.enabled.where(fullpath: "/" + params[:slug]).first
+      page = page_class.enabled.where(fullpath: "/" + params[:slug]).first
     end
 
     if page.nil?
@@ -57,12 +57,12 @@ module Enjoy::SeoPages
       do_redirect = true
     end
 
-    page = Page.enabled.any_of({fullpath: path}, {redirect: path}).first
+    page = page_class.enabled.any_of({fullpath: path}, {redirect: path}).first
     if page.nil?
       do_redirect = true
       spath = path.chomp(File.extname(path))
       if spath != path
-        page = Enjoy::Page.enabled.any_of({fullpath: spath}, {redirect: spath}).first
+        page = page_class.enabled.any_of({fullpath: spath}, {redirect: spath}).first
       end
     end
     if !page.nil? && do_redirect
@@ -77,6 +77,13 @@ module Enjoy::SeoPages
     nil
   end
 
+  def page_class_name
+    "Enjoy::Page"
+  end
+  def page_class
+    page_class_name.constantize
+  end
+
   def rails_admin?
     self.is_a?(RailsAdmin::ApplicationController) || self.is_a?(RailsAdmin::MainController)
   end

data/app/models/concerns/enjoy/mappable.rb

@@ -88,8 +88,4 @@ module Enjoy::Mappable
       map_address
     end
   end
-
-  def self.admin
-    Enjoy.map_config
-  end
 end

data/app/models/concerns/enjoy/model_localizeable.rb

@@ -0,0 +1,30 @@
+module Enjoy::ModelLocalizeable
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    def convert2localize
+      self.all.to_a.map do |p|
+        p.convert2localize
+      end
+    end
+  end
+
+  def convert2localize
+    arr = {}
+    self.localized_fields.keys.each do |f|
+      next if self[f].is_a?(Hash)
+      arr[f] = self.remove_attribute(f)
+      self[f] = {}
+    end
+    self.save
+
+    I18n.available_locales.each do |l|
+      I18n.with_locale(l) do
+        arr.each_pair do |f, v|
+          self.send(f + "=", v)
+        end
+      end
+    end
+    self.save
+  end
+end

data/app/models/concerns/enjoy/seoable.rb

@@ -4,7 +4,7 @@ module Enjoy::Seoable
   FIELDS = LOCALIZED_FIELDS + [:og_image, :robots]
 
   included do
-    has_one :seo, as: :seoable, autosave: true, class_name: seo_class_name
+    has_one :seo, as: :seoable, autosave: true, class_name: "Enjoy::Seo"
     accepts_nested_attributes_for :seo
 
     delegate *FIELDS, to: :seo
@@ -15,7 +15,6 @@ module Enjoy::Seoable
       delegate *(LOCALIZED_FIELDS.map {|f| "#{f}_translations=".to_sym }), to: :seo
     end
 
-
     alias seo_without_build seo
     def seo
       seo_without_build || build_seo
@@ -34,20 +33,4 @@ module Enjoy::Seoable
     {aspectRation: 800.0/600.0}
   end
 
-  module ClassMethods
-    def seo_class_name
-      "Enjoy::Seo"
-    end
-
-    def seo_class
-      seo_class_name.constantize
-    end
-  end
-  def seo_class_name
-    self.class.seo_class_name
-  end
-
-  def seo_class
-    self.class.seo_class
-  end
 end

data/app/models/concerns/enjoy/sitemap_data_field.rb

@@ -3,7 +3,7 @@ module Enjoy::SitemapDataField
   FIELDS = [:sitemap_show, :sitemap_lastmod, :sitemap_changefreq, :sitemap_priority]
 
   included do
-    has_one :sitemap_data, as: :sitemap_data_field, autosave: true, class_name: sitemap_data_class_name
+    has_one :sitemap_data, as: :sitemap_data_field, autosave: true, class_name: "Enjoy::SitemapData"
     accepts_nested_attributes_for :sitemap_data
 
     delegate *FIELDS, to: :sitemap_data
@@ -14,22 +14,4 @@ module Enjoy::SitemapDataField
       sitemap_data_without_build || build_sitemap_data
     end
   end
-
-  module ClassMethods
-    def sitemap_data_class_name
-      "Enjoy::SitemapData"
-    end
-
-    def sitemap_data_class
-      sitemap_data_class_name.constantize
-    end
-  end
-
-  def sitemap_data_class_name
-    self.class.sitemap_data_class_name
-  end
-
-  def sitemap_data_class
-    self.class.sitemap_data_class
-  end
 end

data/app/models/enjoy/contact_message.rb

@@ -6,7 +6,7 @@ module Enjoy
 
   class ContactMessage
     include Enjoy::Models::ContactMessage
-    Enjoy.apply_patches self
-    rails_admin &Enjoy.contact_message_config
+    
+    rails_admin &Enjoy::Admin::ContactMessage.config
   end
 end

data/app/models/enjoy/embedded_element.rb

@@ -2,10 +2,10 @@ module Enjoy
   if Enjoy.mongoid?
     class EmbeddedElement
       include Enjoy::Models::EmbeddedElement
-      Enjoy.apply_patches self
+      
 
       # use it in inherited model
-      #rails_admin &Enjoy.embedded_image_config
+      # rails_admin &Enjoy::Admin::EmbeddedElement.config
 
       # use it in rails_admin in parent model for sort
       # sort_embedded({fields: [:embedded_field_1, :embedded_field_2...]})

data/app/models/enjoy/embedded_gallery_image.rb

@@ -2,10 +2,10 @@ module Enjoy
   if Enjoy.mongoid?
     class EmbeddedGalleryImage < Enjoy::EmbeddedElement
       include Enjoy::Models::EmbeddedGalleryImage
-      Enjoy.apply_patches self
+      
 
       # use it in inherited model
-      #rails_admin &Enjoy.embedded_image_config
+      # rails_admin &Enjoy::Admin::EmbeddedGalleryImage.config
 
       # use it in rails_admin in parent model for sort
       # sort_embedded({fields: [:embedded_field_1, :embedded_field_2...]})

data/app/models/enjoy/gallery.rb

@@ -2,9 +2,9 @@ module Enjoy
   if Enjoy.mongoid?
     class Gallery
       include Enjoy::Models::Gallery
-      Enjoy.apply_patches self
+      
 
-      rails_admin &Enjoy.gallery_config
+      rails_admin &Enjoy::Admin::Gallery.config
     end
   end
 end

data/app/models/enjoy/gallery_image.rb

@@ -2,9 +2,9 @@ module Enjoy
   if Enjoy.mongoid?
     class GalleryImage
       include Enjoy::Models::GalleryImage
-      Enjoy.apply_patches self
+      
 
-      rails_admin &Enjoy.image_config
+      rails_admin &Enjoy::Admin::GalleryImage.config
     end
   end
 end

data/app/models/enjoy/menu.rb

@@ -6,7 +6,7 @@ module Enjoy
 
   class Menu
     include Enjoy::Models::Menu
-    Enjoy.apply_patches self
-    rails_admin &Enjoy.menu_config
+
+    rails_admin &Enjoy::Admin::Menu.config
   end
 end

data/app/models/enjoy/news.rb

@@ -6,7 +6,7 @@ module Enjoy
 
   class News
     include Enjoy::Models::News
-    Enjoy.apply_patches self
-    rails_admin &Enjoy.news_config
+
+    rails_admin &Enjoy::Admin::News.config
   end
 end

data/app/models/enjoy/page.rb

@@ -6,7 +6,7 @@ module Enjoy
 
   class Page
     include Enjoy::Models::Page
-    Enjoy.apply_patches self
-    rails_admin &Enjoy.page_config
+
+    rails_admin &Enjoy::Admin::Page.config
   end
 end

data/app/models/enjoy/seo.rb

@@ -6,8 +6,7 @@ module Enjoy
 
   class Seo
     include Enjoy::Models::Seo
-    Enjoy.apply_patches self
-    rails_admin &Enjoy.seo_config
-    belongs_to :seoable, polymorphic: true
+    
+    rails_admin &Enjoy::Admin::Seo.config
   end
 end

data/app/models/enjoy/sitemap_data.rb

@@ -6,8 +6,7 @@ module Enjoy
 
   class SitemapData
     include Enjoy::Models::SitemapData
-    Enjoy.apply_patches self
-    rails_admin &Enjoy.sitemap_data_config
-    belongs_to :sitemap_data_field, polymorphic: true
+    
+    rails_admin &Enjoy::Admin::SitemapData.config
   end
 end

data/app/views/shared/_obj.html.slim

@@ -8,6 +8,7 @@
         = raw @seo_page.page_content
     - else
       = raw obj.content
+  .admin_button
     - if !obj.nil?
       = render 'shared/admin_link', obj: obj
     - if !@seo_page.nil? && (@seo_page.id != obj.id || @seo_page.class.name != obj.class.name)

data/app/views/simple_captcha/_simple_captcha.html.slim

@@ -3,7 +3,7 @@ label.form-label
 .input_image_block
   .image
     = simple_captcha_options[:image]
-  .input
+  .field
     = simple_captcha_options[:field]
 
 - unless simple_captcha_options[:error_messages].blank?

data/lib/enjoy/admin/contact_message.rb

@@ -1,35 +1,31 @@
 module Enjoy
   module Admin
     module ContactMessage
-      extend ActiveSupport::Concern
-      include Enjoy::Model
-      include Enjoy.orm_specific('ContactMessage')
-
-      included do
-
-        apply_simple_captcha message: Enjoy.configuration.contacts_captcha_error_message
-
-        validates_email_format_of :email, unless: 'email.blank?'
-        if Enjoy.config.contacts_message_required
-          validates_presence_of :content
-        end
-        validate do
-          if email.blank? && phone.blank?
-            errors.add(:email, I18n.t('rs.no_contact_info'))
+      def self.config
+        Proc.new {
+          # navigation_label I18n.t('enjoy.contact_message')
+          field :c_at do
+            read_only true
           end
-        end
+          field :name
+          field :content, :text
+          field :email
+          field :phone
 
-        after_create do
-          mailer_class.send(mailer_method, self).deliver
-        end
+          Enjoy.config.contacts_fields.each_pair do |fn, ft|
+            next if ft.nil?
+            if ft.is_a?(Array)
+              field fn, ft[1].to_sym
+            else
+              field fn
+            end
+          end
 
-        def mailer_class
-          Enjoy::ContactMailer
-        end
+          if block_given?
+            yield self
+          end
 
-        def mailer_method
-          :new_message_email
-        end
+        }
       end
     end
   end

data/lib/enjoy/admin/embedded_element.rb

@@ -1,11 +1,28 @@
 module Enjoy
   module Admin
     module EmbeddedElement
-      extend ActiveSupport::Concern
-      include Enjoy::Model
-      include Enjoy::Enableable
-      include Enjoy::Sortable
-      include Enjoy.orm_specific('EmbeddedElement')
+      def self.config(_navigation_label = I18n.t('enjoy.cms'), fields = {})
+        Proc.new {
+          # 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
+            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
+        }
+      end
     end
   end
 end

data/lib/enjoy/admin/embedded_gallery_image.rb

@@ -1,14 +1,19 @@
 module Enjoy
   module Admin
     module EmbeddedGalleryImage
-      extend ActiveSupport::Concern
-      include Enjoy::Model
-      include Enjoy::Enableable
-      include Enjoy::Sortable
-      include Enjoy.orm_specific('EmbeddedGalleryImage')
+      def self.config(fields = {})
+        jcrop_proc = Proc.new do
+          jcrop_options :image_jcrop_options
+        end
 
-      included do
-        validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/, if: :image?
+        fields = {image: [:jcrop, jcrop_proc]}.merge(fields)
+        if block_given?
+          Enjoy::Admin::EmbeddedElement.config(nil, fields) do |config|
+            yield config
+          end
+        else
+          Enjoy::Admin::EmbeddedElement.config(nil, fields)
+        end
       end
     end
   end

data/lib/enjoy/admin/gallery.rb

@@ -1,19 +1,33 @@
 module Enjoy
   module Admin
     module Gallery
-      extend ActiveSupport::Concern
-      include Enjoy::Model
-      include ManualSlug
-      include Enjoy::Enableable
-      include Enjoy::SitemapData
-      include Enjoy.orm_specific('Gallery')
+      def self.self.config
+        Proc.new {
+          # navigation_label I18n.t('enjoy.gallery')
+          field :enabled, :toggle
 
-      included do
+          field :name, :string
+          field :slugs, :enum do
+            enum_method do
+              :slugs
+            end
+            visible do
+              bindings[:view].current_user.admin?
+            end
+            multiple do
+              true
+            end
+          end
+          field :text_slug
 
-        has_many :gallery_images, class_name: "Enjoy::GalleryImage"
-        field :name, type: String, localize: Enjoy.configuration.localize
+          field :image, :jcrop do
+            jcrop_options :image_jcrop_options
+          end
 
-        validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/, if: :image?
+          if block_given?
+            yield self
+          end
+        }
       end
     end
   end

data/lib/enjoy/admin/gallery_image.rb

@@ -1,17 +1,29 @@
 module Enjoy
   module Admin
     module GalleryImage
-      extend ActiveSupport::Concern
-      include Enjoy::Model
-      include Enableable
-      include Enjoy.orm_specific('GalleryImage')
+      def self.config(without_gallery = false, fields = {})
+        Proc.new {
+          # navigation_label I18n.t('enjoy.gallery')
+          field :enabled, :toggle
+          unless without_gallery
+            field :gallery
+          end
+          field :name, :string
+          field :image, :jcrop do
+            jcrop_options :image_jcrop_options
+          end
+          fields.each_pair do |name, type|
+            if type.nil?
+              field name
+            else
+              field name, type
+            end
+          end
 
-      included do
-
-        belongs_to :gallery, class_name: "Enjoy::Gallery"
-        field :name, type: String, localize: Enjoy.configuration.localize
-
-        validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/, if: :image?
+          if block_given?
+            yield self
+          end
+        }
       end
     end
   end

data/lib/enjoy/admin/menu.rb

@@ -1,26 +1,18 @@
 module Enjoy
   module Admin
     module Menu
-      extend ActiveSupport::Concern
-      include Enjoy::Model
-      include Enableable
-      include ManualSlug
-      include Enjoy.orm_specific('Menu')
+      def self.config
+        Proc.new {
+          # navigation_label 'CMS'
 
-      included do
+          field :enabled, :toggle
+          field :text_slug
+          field :name
 
-        field :name, type: String
-        manual_slug :name
-
-        after_save do
-          Rails.cache.delete 'menus'
-        end
-        after_destroy do
-          Rails.cache.delete 'menus'
-        end
-
-        has_and_belongs_to_many :pages, inverse_of: :menus, class_name: "Enjoy::Page"
-        alias_method :items, :pages
+          if block_given?
+            yield self
+          end
+        }
       end
     end
   end