enjoy_cms 0.2.0.2 → 0.2.0.3

data/lib/enjoy/admin/news.rb

@@ -1,56 +1,73 @@
 module Enjoy
   module Admin
     module News
-      extend ActiveSupport::Concern
-      include Enjoy::Model
-      include Seoable
-      include Enableable
-      include ManualSlug
-      include SitemapData
-      include Enjoy.orm_specific('News')
+      def self.config(fields = {})
+        Proc.new {
+          # navigation_label I18n.t('enjoy.cms')
+          list do
+            scopes [:by_date, :enabled, nil]
+          end
 
-      if Enjoy.config.search_enabled
-        include Enjoy::ElasticSearch
-      end
-
-      included do
-
-        unless Enjoy.config.news_image_styles.nil?
-          validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/, if: :image?
-        end
+          field :enabled, :toggle
+          field :time do
+            sort_reverse true
+          end
+          field :name
+          unless Enjoy.config.news_image_styles.nil?
+            field :image, :jcrop do
+              jcrop_options :image_jcrop_options
+            end
+          end
+          field :excerpt, :ck_editor
+          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
 
-        validates_presence_of :name
-        if Enjoy.config.news_content_required
-          validates_presence_of :content
-        end
+          list do
+            sort_by :time
+          end
 
-        before_validation do
-          self.time = Time.now if self.time.blank?
-        end
-        scope :recent, ->(count = 5) { enabled.after_now.by_date.limit(count) }
-        unless Enjoy.config.news_per_page.nil?
-          paginates_per Enjoy.config.news_per_page
-        end
-        smart_excerpt :excerpt, :content, Enjoy.config.news_excerpt
-        manual_slug :report_slug
+          edit do
+            field :content, :ck_editor
+            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
 
-        Enjoy.apply_patches self
-      end
+            group :seo do
+              active false
+              field :seo do
+                active true
+              end
+            end
+            group :sitemap_data do
+              active false
+              field :sitemap_data do
+                active true
+              end
+            end
+          end
 
-      def report_slug
-        if time.blank?
-          name
-        elsif name.blank?
-          time.strftime('%Y-%m-%d')
-        else
-          time.strftime('%Y-%m-%d') + '-' + name[0..20]
-        end
-      end
-      def html5_date
-        time.strftime('%Y-%m-%d')
-      end
-      def format_date
-        time.strftime(I18n.t('rs.format_time'))
+          if block_given?
+            yield self
+          end
+        }
       end
     end
   end

data/lib/enjoy/admin/page.rb

@@ -1,80 +1,77 @@
 module Enjoy
   module Admin
     module Page
-      extend ActiveSupport::Concern
-      include Enjoy::Model
-      include Enableable
-      include Seoable
-      include ManualSlug
-      include SitemapData
+      def self.config(fields = {})
+        Proc.new {
+          # navigation_label I18n.t('enjoy.cms')
+          list do
+            scopes [:sorted, :enabled, nil]
 
-      include Enjoy.orm_specific('Page')
-
-      if Enjoy.config.search_enabled
-        include Enjoy::ElasticSearch
-      end
-
-      included do
-
-        has_and_belongs_to_many :menus, inverse_of: :pages, class_name: "Enjoy::Menu"
-        validates_uniqueness_of :fullpath
-        validates_presence_of :name
-        manual_slug :name
-        before_validation do
-          self.fullpath = "/pages/#{slug}" if self.fullpath.blank?
-        end
-      end
-
-      def get_fullpath
-        redirect.blank? ? fullpath : redirect
-      end
-
-      def has_content?
-        @content_used.nil? && !content.blank?
-      end
-
-      def page_content
-        if @content_used.nil?
-          @content_used = true
-          if content.nil?
-            ''
-          else
-            content.gsub(/\{\{(.*?)\}\}/) do
-              Settings ? Settings.get($1).val : "" #temp
+            field :enabled,  :toggle
+            field :menus, :menu
+            field :name
+            field :fullpath do
+              pretty_value do
+                bindings[:view].content_tag(:a, bindings[:object].fullpath, href: bindings[:object].fullpath)
+              end
             end
+            field :redirect
+            field :slug
           end
-        else
-          ''
-        end
-      end
+          
+          edit do
+            field :name
+            field :excerpt, :ck_editor
+            field :content, :ck_editor
 
-      def is_current?(url)
-        if fullpath == '/'
-          url == '/'
-        else
-          url.match(clean_regexp)
-        end
-      end
+            group :menu do
+              label I18n.t('enjoy.menu')
+              field :menus
+              field :fullpath, :string do
+                help I18n.t('enjoy.with_final_slash')
+              end
+              field :regexp, :string do
+                help I18n.t('enjoy.page_url_regex')
+              end
+              field :redirect, :string do
+                help I18n.t('enjoy.final_in_menu')
+              end
+              field :text_slug
+            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
+            group :seo do
+              active false
+              field :seo do
+                active true
+              end
+            end
+            group :sitemap_data do
+              active false
+              field :sitemap_data do
+                active true
+              end
+            end
+          end
 
-      def regexp_prefix
-        ""
-      end
+          nested_set({
+            max_depth: Enjoy.config.menu_max_depth,
+            scopes: []
+          })
 
-      def clean_regexp
-        if regexp.blank?
-          /^#{regexp_prefix}#{Regexp.escape(fullpath)}$/
-        else
-          begin
-            /#{regexp}/
-          rescue
-            # not a valid regexp - treat as literal search string
-            /#{Regexp.escape(regexp)}/
+          if block_given?
+            yield self
           end
-        end
-      end
-
-      def nav_options
-        {highlights_on: clean_regexp}
+        }
       end
     end
   end

data/lib/enjoy/admin/seo.rb

@@ -1,16 +1,28 @@
 module Enjoy
   module Admin
     module Seo
-      extend ActiveSupport::Concern
-      include Enjoy::Model
-      include Enableable
-      include Enjoy.orm_specific('Seo')
-      include Enjoy::SeoHelpers
+      def self.config(is_active = true)
+        Proc.new {
+          navigation_label 'SEO'
+          field :seoable do
+            read_only true
+          end
+          field :h1, :string
+          field :title, :string
+          field :keywords, :text
+          field :description, :text
+          field :robots, :string
 
-      included do
+          field :og_title, :string
 
-        Enjoy.apply_patches self
-        validates_attachment_content_type :og_image, content_type: /\Aimage\/.*\Z/, if: :og_image?
+          field :og_image, :jcrop do
+            jcrop_options :og_image_jcrop_options
+          end
+
+          if block_given?
+            yield self
+          end
+        }
       end
     end
   end

data/lib/enjoy/admin/sitemap_data.rb

@@ -0,0 +1,27 @@
+module Enjoy
+  module Admin
+    module SitemapData
+      def self.config(is_active = false)
+        Proc.new {
+          navigation_label 'SEO'
+          label I18n.t('enjoy.sitemap_data')
+          field :sitemap_data_field do
+            read_only true
+          end
+          field :sitemap_show, :toggle
+          field :sitemap_lastmod
+          field :sitemap_changefreq, :enum do
+            enum do
+              Enjoy::SitemapData::SITEMAP_CHANGEFREQ_ARRAY
+            end
+          end
+          field :sitemap_priority
+
+          if block_given?
+            yield self
+          end
+        }
+      end
+    end
+  end
+end

data/lib/enjoy/admin.rb

@@ -1,6 +1,6 @@
 module Enjoy
-  class << self
-    def map_config(is_active = true)
+  module Admin
+    def self.map_config(is_active = true)
       Proc.new {
         active is_active
         label I18n.t('enjoy.map')
@@ -15,344 +15,7 @@ module Enjoy
         field :lon
 
         if block_given?
-          yield
-        end
-      }
-    end
-
-    def seo_config(is_active = true)
-      Proc.new {
-        navigation_label 'SEO'
-        field :seoable do
-          read_only true
-        end
-        field :h1, :string
-        field :title, :string
-        field :keywords, :text
-        field :description, :text
-        field :robots, :string
-
-        field :og_title, :string
-
-        field :og_image, :jcrop do
-          jcrop_options :og_image_jcrop_options
-        end
-
-        if block_given?
-          yield
-        end
-      }
-    end
-
-    def page_config(fields = {})
-      Proc.new {
-        Enjoy.apply_patches self
-        # navigation_label I18n.t('enjoy.cms')
-        list do
-          scopes [:sorted, :enabled, nil]
-
-          field :enabled,  :toggle
-          field :menus, :menu
-          field :name
-          field :fullpath do
-            pretty_value do
-              bindings[:view].content_tag(:a, bindings[:object].fullpath, href: bindings[:object].fullpath)
-            end
-          end
-          field :redirect
-          field :slug
-          Enjoy.apply_patches self
-        end
-        edit do
-          field :name
-          field :excerpt, :ck_editor
-          field :content, :ck_editor
-          Enjoy.apply_patches self
-          group :menu do
-            label I18n.t('enjoy.menu')
-            field :menus
-            field :fullpath, :string do
-              help I18n.t('enjoy.with_final_slash')
-            end
-            field :regexp, :string do
-              help I18n.t('enjoy.page_url_regex')
-            end
-            field :redirect, :string do
-              help I18n.t('enjoy.final_in_menu')
-            end
-            field :text_slug
-          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
-          group :seo do
-            active false
-            field :seo do
-              active true
-            end
-          end
-          group :sitemap_data do
-            active false
-            field :sitemap_data do
-              active true
-            end
-          end
-        end
-        Enjoy.only_patches self, [:show, :export]
-        nested_set({
-          max_depth: Enjoy.config.menu_max_depth,
-          scopes: []
-        })
-
-        if block_given?
-          yield
-        end
-      }
-    end
-
-    def menu_config
-      Proc.new {
-        # navigation_label 'CMS'
-
-        field :enabled, :toggle
-        field :text_slug
-        field :name
-        Enjoy.apply_patches self
-        Enjoy.only_patches self, [:show, :list, :edit, :export]
-
-        if block_given?
-          yield
-        end
-      }
-    end
-
-    def contact_message_config
-      Proc.new {
-        # navigation_label I18n.t('enjoy.settings')
-        field :c_at do
-          read_only true
-        end
-        field :name
-        field :content, :text
-        field :email
-        field :phone
-
-        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
-
-        if block_given?
-          yield
-        end
-
-        Enjoy.apply_patches self
-        Enjoy.only_patches self, [:show, :list, :edit, :export]
-      }
-    end
-
-    def news_config(fields = {})
-      Proc.new {
-        # navigation_label I18n.t('enjoy.cms')
-        list do
-          scopes [:by_date, :enabled, nil]
-        end
-
-        field :enabled, :toggle
-        field :time do
-          sort_reverse true
-        end
-        field :name
-        unless Enjoy.config.news_image_styles.nil?
-          field :image, :jcrop do
-            jcrop_options :image_jcrop_options
-          end
-        end
-        field :excerpt, :ck_editor
-        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
-
-        Enjoy.apply_patches self
-
-        list do
-          Enjoy.apply_patches self
-          sort_by :time
-        end
-
-        edit do
-          field :content, :ck_editor
-          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
-          Enjoy.apply_patches self
-          group :seo do
-            active false
-            field :seo do
-              active true
-            end
-          end
-          group :sitemap_data do
-            active false
-            field :sitemap_data do
-              active true
-            end
-          end
-        end
-
-        Enjoy.only_patches self, [:show, :list, :export]
-
-        if block_given?
-          yield(self)
-        end
-      }
-    end
-
-    def sitemap_data_config(is_active = false)
-      Proc.new {
-        navigation_label 'SEO'
-        label I18n.t('enjoy.sitemap_data')
-        field :sitemap_data_field do
-          read_only true
-        end
-        field :sitemap_show, :toggle
-        field :sitemap_lastmod
-        field :sitemap_changefreq, :enum do
-          enum do
-            Enjoy::SitemapData::SITEMAP_CHANGEFREQ_ARRAY
-          end
-        end
-        field :sitemap_priority
-
-        if block_given?
-          yield
-        end
-      }
-    end
-
-
-
-    def embedded_element_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
-        end
-      }
-    end
-
-    def embedded_image_config(fields = {})
-      jcrop_proc = Proc.new do
-        jcrop_options :image_jcrop_options
-      end
-
-      if block_given?
-        Enjoy.embedded_element_config(
-          nil,
-          {image: [:jcrop, jcrop_proc]}.merge(fields),
-          yield
-        )
-      else
-        Enjoy.embedded_element_config(
-          nil,
-          {image: [:jcrop, jcrop_proc]}.merge(fields)
-        )
-      end
-    end
-
-    def gallery_config
-      Proc.new {
-        # navigation_label I18n.t('enjoy.gallery')
-        field :enabled, :toggle
-
-        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
-
-        field :image, :jcrop do
-          jcrop_options :image_jcrop_options
-        end
-
-        if block_given?
-          yield
-        end
-      }
-    end
-
-    def image_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
-
-        if block_given?
-          yield
+          yield self
         end
       }
     end

data/lib/enjoy/model.rb

@@ -5,8 +5,12 @@ module Enjoy
       if Enjoy.mongoid?
         include Mongoid::Document
         include Mongoid::Timestamps::Short
+
+        if Enjoy.config.localize
+          include Enjoy::ModelLocalizeable
+        end
       end
-      
+
       include ActiveModel::ForbiddenAttributesProtection
       include Enjoy::BooleanField
       include Enjoy::SortField
@@ -18,5 +22,6 @@ module Enjoy
         include Trackable
       end
     end
+
   end
 end