enjoy_cms 0.1.0.beta1 → 0.2.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c91e2c1674c4bb1bb096be9fd64088bf83806348
-  data.tar.gz: b2907dcd0e29d94170dac29ab220a2f7005fb21a
+  metadata.gz: 5d5c04ee3315ba7a3fb3752388af5ecbf888c664
+  data.tar.gz: 0ac404aa2c4572cb2c6a851e91e6fdb1bf252780
 SHA512:
-  metadata.gz: b5fcbf1ee7a9d011724f07b1218ee9ac03e9f9822957d97af9ce4cf6189e3f768751d57a19b753ef68b5dddeb434ffb30d568514dffd4a0a2af3f9b2ab78f5d1
-  data.tar.gz: 6a210f4e87e3367e8e7d73dff28f8a33766793ede0b2dd54bda880168e9d0d4c58a2217f7a18a4172772178de9c536a64098608f2b53b3e051a2023d8845e262
+  metadata.gz: 34c6bc123f19a7dfe62b36079c2f548a1db8d2e6dc84e00c5ddecc1b173fc70d54f75681111a421dad0471829073419449508e5334a99ec40a9a57c3e2d5bc75
+  data.tar.gz: d4731e9a2e3c93b501407a91f0a5983f74a3479ea6eecfca802600beda07fd6f6451a45880928140a70f386be731b312fde87b882386fcdfc6b8b90b6e4673fb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enjoy_cms (0.1.0.beta1)
+    enjoy_cms (0.2.0.beta)
       ack_rails_admin_jcrop
       addressable
       ckeditor
@@ -72,9 +72,9 @@ GEM
     addressable (2.4.0)
     arel (6.0.3)
     bcrypt (3.1.10)
-    bson (4.0.0)
+    bson (4.0.1)
     builder (3.2.2)
-    ckeditor (4.1.5)
+    ckeditor (4.1.6)
       cocaine
       orm_adapter (~> 0.5.0)
     climate_control (0.0.3)
@@ -89,7 +89,7 @@ GEM
       execjs
     coffee-script-source (1.10.0)
     concurrent-ruby (1.0.0)
-    devise (3.5.3)
+    devise (3.5.5)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -108,7 +108,7 @@ GEM
       tilt
     htmlentities (4.3.4)
     i18n (0.7.0)
-    jquery-rails (4.0.5)
+    jquery-rails (4.1.0)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -125,18 +125,18 @@ GEM
     mime-types (2.99)
     mini_magick (4.3.6)
     mini_portile2 (2.0.0)
-    minitest (5.8.3)
-    mongo (2.2.1)
+    minitest (5.8.4)
+    mongo (2.2.2)
       bson (~> 4.0)
-    mongoid (5.0.2)
+    mongoid (5.1.0)
       activemodel (~> 4.0)
       mongo (~> 2.1)
-      origin (~> 2.1)
+      origin (~> 2.2)
       tzinfo (>= 0.3.37)
     nested_form (0.3.2)
-    nokogiri (1.6.7.1)
+    nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
-    origin (2.1.1)
+    origin (2.2.0)
     orm_adapter (0.5.0)
     rack (1.6.4)
     rack-pjax (0.8.0)
@@ -161,7 +161,7 @@ GEM
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     rails_admin (0.8.1)
       builder (~> 3.1)
@@ -192,12 +192,12 @@ GEM
       activesupport (= 4.2.4)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
+    rake (10.5.0)
     remotipart (1.2.1)
     responders (2.1.1)
       railties (>= 4.2.0, < 5.1)
     safe_yaml (1.0.4)
-    sass (3.4.20)
+    sass (3.4.21)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
@@ -224,7 +224,7 @@ GEM
     stringex (2.5.2)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (2.0.1)
+    tilt (2.0.2)
     turbolinks (2.5.3)
       coffee-rails
     tzinfo (1.2.2)

data/README.md

@@ -1,4 +1,4 @@
-# EnjoyCms
+# EnjoyCMS
 
 # DEVELOPMENT VERSION. DO NOT USE IT
 

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

@@ -11,7 +11,9 @@ module Enjoy::NavMenu
       block = nil
     else
       block = Proc.new do |sub_nav|
-        subs.each { |sub| render_with_subs(items, sub_nav, sub) }
+        subs.each { |sub|
+          render_with_subs(items, sub_nav, sub)
+        }
       end
     end
     cr = item.clean_regexp
@@ -53,7 +55,8 @@ module Enjoy::NavMenu
     item.redirect.blank? ? item.fullpath : item.redirect
   end
   def nav_get_menu_items(type)
-    Enjoy::Menu.find(type.to_s).pages.enabled.sorted.to_a
+    menu = menu_class.find(type.to_s)
+    menu.pages.enabled.sorted.to_a if menu
   end
   def nav_extra_data_before(type, primary)
     # override for additional config or items
@@ -61,4 +64,11 @@ module Enjoy::NavMenu
   def nav_extra_data_after(type, primary)
     # override for additional config or items
   end
+
+  def menu_class_name
+    "Enjoy::Menu"
+  end
+  def menu_class
+    menu_class_name.constantize
+  end
 end

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

@@ -4,18 +4,22 @@ module Enjoy::Seoable
   FIELDS = LOCALIZED_FIELDS + [:og_image, :robots]
 
   included do
-    has_one :seo, as: :seoable, autosave: true
+    has_one :seo, as: :seoable, autosave: true, class_name: seo_class_name
     accepts_nested_attributes_for :seo
+
     delegate *FIELDS, to: :seo
     delegate *(FIELDS.map {|f| "#{f}=".to_sym }), to: :seo
-    alias seo_without_build seo
-    def seo
-      seo_without_build || build_seo
-    end
+
     if Enjoy.config.localize
       delegate *(LOCALIZED_FIELDS.map {|f| "#{f}_translations".to_sym }), to: :seo
       delegate *(LOCALIZED_FIELDS.map {|f| "#{f}_translations=".to_sym }), to: :seo
     end
+
+
+    alias seo_without_build seo
+    def seo
+      seo_without_build || build_seo
+    end
   end
 
   def page_title
@@ -26,11 +30,24 @@ module Enjoy::Seoable
     og_title.blank? ? name : og_title
   end
 
-  def self.admin
-    Enjoy.seo_config
-  end
-
   def og_image_jcrop_options
     {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

@@ -0,0 +1,35 @@
+module Enjoy::SitemapDataField
+  extend ActiveSupport::Concern
+  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
+    accepts_nested_attributes_for :sitemap_data
+
+    delegate *FIELDS, to: :sitemap_data
+    delegate *(FIELDS.map {|f| "#{f}=".to_sym }), to: :sitemap_data
+
+    alias sitemap_data_without_build sitemap_data
+    def sitemap_data
+      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/embedded_element.rb

@@ -1,7 +1,7 @@
 module Enjoy
   if Enjoy.mongoid?
-    class Enjoy
-      include Enjoy::Models::Enjoy
+    class EmbeddedElement
+      include Enjoy::Models::EmbeddedElement
       Enjoy.apply_patches self
 
       # use it in inherited model

data/app/models/enjoy/embedded_gallery_image.rb

@@ -1,6 +1,6 @@
 module Enjoy
   if Enjoy.mongoid?
-    class EmbeddedGalleryImage < Enjoy
+    class EmbeddedGalleryImage < Enjoy::EmbeddedElement
       include Enjoy::Models::EmbeddedGalleryImage
       Enjoy.apply_patches self
 

data/app/models/enjoy/sitemap_data.rb

@@ -0,0 +1,13 @@
+module Enjoy
+  if Enjoy.active_record?
+    class SitemapData < ActiveRecord::Base
+    end
+  end
+
+  class SitemapData
+    include Enjoy::Models::SitemapData
+    Enjoy.apply_patches self
+    rails_admin &Enjoy.sitemap_data_config
+    belongs_to :sitemap_data_field, polymorphic: true
+  end
+end

data/app/views/enjoy/contacts/index.html.slim

@@ -1,7 +1,7 @@
 = render 'shared/obj', obj: @seo_page
 
 #enjoy_cms_contact_form
-  = simple_form_for @contact_message, url: enjoy.contacts_path do |f|
+  = simple_form_for @contact_message, url: enjoy_cms.contacts_path do |f|
     = f.input :name
     = f.input :email
     = f.input :phone

data/app/views/enjoy/contacts/new.html.slim

@@ -1,10 +1,10 @@
 = render 'shared/obj', obj: @seo_page
 
 #enjoy_cms_contact_form
-  = simple_form_for @contact_message, url: enjoy.contacts_path do |f|
+  = simple_form_for @contact_message, url: enjoy_cms.contacts_path do |f|
     = f.input :name
     = f.input :email
     = f.input :phone
     = f.input :content
-    = f.input :captcha
+    = f.input :captcha, as: :simple_captcha
     = f.submit t('enjoy.send')

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

@@ -1,7 +1,8 @@
 - unless obj.nil?
   .text_content
-    - if (!defined?(h1) || h1) && !obj.h1.blank?
-      h1= obj.h1
+    - seo = obj.seo
+    - if (!defined?(h1) || h1) && seo and !seo.h1.blank?
+      h1= seo.h1
     - if obj.content.blank?
       - unless @seo_page.nil?
         = raw @seo_page.page_content
@@ -18,4 +19,4 @@
 
   - content_for :title do
     - if obj.title
-      title= obj.title
+      title= obj.title

data/lib/enjoy/admin.rb

@@ -3,7 +3,7 @@ module Enjoy
     def map_config(is_active = true)
       Proc.new {
         active is_active
-        label I18n.t('rs.map')
+        label I18n.t('enjoy.map')
         field :address, :string
         field :map_address, :string
         field :map_hint, :string
@@ -22,18 +22,10 @@ module Enjoy
 
     def seo_config(is_active = true)
       Proc.new {
-        if respond_to?(:active)
-          active is_active
-          label "SEO"
-        else
-          visible false
+        navigation_label 'SEO'
+        field :seoable do
+          read_only true
         end
-        Enjoy.seo_fields(self)
-      }
-    end
-
-    def seo_fields(s)
-      s.instance_eval do
         field :h1, :string
         field :title, :string
         field :keywords, :text
@@ -49,7 +41,7 @@ module Enjoy
         if block_given?
           yield
         end
-      end
+      }
     end
 
     def page_config(fields = {})
@@ -77,16 +69,16 @@ module Enjoy
           field :content, :ck_editor
           Enjoy.apply_patches self
           group :menu do
-            label I18n.t('rs.menu')
+            label I18n.t('enjoy.menu')
             field :menus
             field :fullpath, :string do
-              help I18n.t('rs.with_final_slash')
+              help I18n.t('enjoy.with_final_slash')
             end
             field :regexp, :string do
-              help I18n.t('rs.page_url_regex')
+              help I18n.t('enjoy.page_url_regex')
             end
             field :redirect, :string do
-              help I18n.t('rs.final_in_menu')
+              help I18n.t('enjoy.final_in_menu')
             end
             field :text_slug
           end
@@ -102,12 +94,17 @@ module Enjoy
             end
           end
           group :seo do
-            active true
+            active false
             field :seo do
               active true
             end
           end
-          group :sitemap_data, &Enjoy.sitemap_data_config
+          group :sitemap_data do
+            active false
+            field :sitemap_data do
+              active true
+            end
+          end
         end
         Enjoy.only_patches self, [:show, :export]
         nested_set({
@@ -139,7 +136,7 @@ module Enjoy
 
     def contact_message_config
       Proc.new {
-        # navigation_label I18n.t('rs.settings')
+        # navigation_label I18n.t('enjoy.settings')
         field :c_at do
           read_only true
         end
@@ -218,8 +215,18 @@ module Enjoy
             end
           end
           Enjoy.apply_patches self
-          group :seo, &Enjoy.seo_config
-          group :sitemap_data, &Enjoy.sitemap_data_config
+          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]
@@ -232,13 +239,16 @@ module Enjoy
 
     def sitemap_data_config(is_active = false)
       Proc.new {
-        active is_active
-        label I18n.t('rs.sitemap_data')
-        field :sitemap_show
+        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
-            SitemapData::SITEMAP_CHANGEFREQ_ARRAY
+            Enjoy::SitemapData::SITEMAP_CHANGEFREQ_ARRAY
           end
         end
         field :sitemap_priority
@@ -295,7 +305,7 @@ module Enjoy
 
     def gallery_config
       Proc.new {
-        # navigation_label I18n.t('rs.gallery')
+        # navigation_label I18n.t('enjoy.gallery')
         field :enabled, :toggle
 
         field :name, :string
@@ -324,7 +334,7 @@ module Enjoy
 
     def image_config(without_gallery = false, fields = {})
       Proc.new {
-        # navigation_label I18n.t('rs.gallery')
+        # navigation_label I18n.t('enjoy.gallery')
         field :enabled, :toggle
         unless without_gallery
           field :gallery

data/lib/enjoy/controller.rb

@@ -7,6 +7,7 @@ module Enjoy::Controller
     include Enjoy::Fancybox
     protect_from_forgery with: :exception
     helper_method :page_title
+    helper_method :hide_ym_ga
   end
 
   protected
@@ -23,9 +24,8 @@ module Enjoy::Controller
     redirect_to '/' unless user_signed_in? && current_user.has_role?('admin')
   end
 
-  
+
   def hide_ym_ga
     false
   end
-  helper_method :hide_ym_ga
 end

data/lib/enjoy/models/active_record/sitemap_data.rb

@@ -0,0 +1,11 @@
+module Enjoy
+  module Models
+    module ActiveRecord
+      module SitemapData
+        extend ActiveSupport::Concern
+        included do
+        end
+      end
+    end
+  end
+end

data/lib/enjoy/models/contact_message.rb

@@ -3,7 +3,7 @@ module Enjoy
     module ContactMessage
       extend ActiveSupport::Concern
       include Enjoy::Model
-      
+
       include Enjoy.orm_specific('ContactMessage')
 
       included do
@@ -16,7 +16,7 @@ module Enjoy
         end
         validate do
           if email.blank? && phone.blank?
-            errors.add(:email, I18n.t('rs.no_contact_info'))
+            errors.add(:email, I18n.t('enjoy.no_contact_info'))
           end
         end
 

data/lib/enjoy/models/embedded_gallery_image.rb

@@ -5,7 +5,7 @@ module Enjoy
       include Enjoy::Model
       include Enjoy::Enableable
       include Enjoy::Sortable
-      
+
       include Enjoy.orm_specific('EmbeddedGalleryImage')
 
       included do

data/lib/enjoy/models/gallery.rb

@@ -5,8 +5,18 @@ module Enjoy
       include Enjoy::Model
       include ManualSlug
       include Enjoy::Enableable
-      include Enjoy::SitemapData
-      
+      include Enjoy::SitemapDataField
+
+      module ClassMethods
+        def gallery_image_class_name
+          "Enjoy::GalleryImage"
+        end
+
+        def gallery_image_class
+          gallery_image_class_name.constantize
+        end
+      end
+
       include Enjoy.orm_specific('Gallery')
 
       included do
@@ -16,14 +26,6 @@ module Enjoy
 
         validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/, if: :image?
       end
-
-      def gallery_image_class_name
-        "Enjoy::GalleryImage"
-      end
-
-      def image_styles
-        {}
-      end
     end
   end
 end

data/lib/enjoy/models/gallery_image.rb

@@ -4,7 +4,17 @@ module Enjoy
       extend ActiveSupport::Concern
       include Enjoy::Model
       include Enjoy::Enableable
-      
+
+      module ClassMethods
+        def gallery_class_name
+          "Enjoy::Gallery"
+        end
+
+        def gallery_class
+          gallery_class_name.constantize
+        end
+      end
+
       include Enjoy.orm_specific('GalleryImage')
 
       included do
@@ -14,10 +24,6 @@ module Enjoy
 
         validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/, if: :image?
       end
-
-      def gallery_class_name
-        "Enjoy::Gallery"
-      end
     end
   end
 end

data/lib/enjoy/models/menu.rb

@@ -5,7 +5,7 @@ module Enjoy
       include Enjoy::Model
       include ManualSlug
       include Enjoy::Enableable
-      
+
       include Enjoy.orm_specific('Menu')
       included do
 
@@ -19,10 +19,6 @@ module Enjoy
           Rails.cache.delete 'menus'
         end
       end
-
-      def page_class_name
-        "Enjoy::Page"
-      end
     end
   end
 end

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

@@ -4,15 +4,20 @@ module Enjoy
       module EmbeddedGalleryImage
         extend ActiveSupport::Concern
         include Enjoy::MongoidPaperclip
-        include Enjoy::EmbeddedElement
 
         included do
 
-          enjoy_mongoid_attached_file(:image,
+          enjoy_cms_mongoid_attached_file(:image,
                     styles: image_styles,
                     content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
           )
         end
+
+        module ClassMethods
+          def image_styles
+            {}
+          end
+        end
       end
     end
   end

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

@@ -12,11 +12,17 @@ module Enjoy
           acts_as_nested_set
           scope :sorted, -> { order_by([:lft, :asc]) }
 
-          enjoy_mongoid_attached_file(:image,
+          enjoy_cms_mongoid_attached_file(:image,
                     styles: image_styles,
                     content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
           )
         end
+
+        module ClassMethods
+          def image_styles
+            {}
+          end
+        end
       end
     end
   end

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

@@ -10,11 +10,17 @@ module Enjoy
           acts_as_nested_set
           scope :sorted, -> { order_by([:lft, :asc]) }
 
-          enjoy_mongoid_attached_file(:image,
+          enjoy_cms_mongoid_attached_file(:image,
                     styles: image_styles,
                     content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
           )
         end
+
+        module ClassMethods
+          def image_styles
+            {}
+          end
+        end
       end
     end
   end

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

@@ -3,6 +3,17 @@ module Enjoy
     module Mongoid
       module Menu
         extend ActiveSupport::Concern
+
+        module ClassMethods
+          def page_class_name
+            "Enjoy::Page"
+          end
+
+          def page_class
+            page_class_name.constantize
+          end
+        end
+        
         included do
           has_and_belongs_to_many :pages, inverse_of: :menus, class_name: page_class_name
           alias_method :items, :pages

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

@@ -6,12 +6,14 @@ module Enjoy
         unless Enjoy.config.news_image_styles.nil?
           include Enjoy::MongoidPaperclip
         end
-        included do
 
+        included do
+          field :name, type: String, localize: Enjoy.config.localize, default: ""
+          
           field :time, type: Time
           index({enabled: 1, time: 1})
           unless Enjoy.config.news_image_styles.nil?
-            enjoy_mongoid_attached_file(:image,
+            enjoy_cms_mongoid_attached_file(:image,
                       styles: Enjoy.configuration.news_image_styles,
                       content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
             )

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

@@ -3,7 +3,19 @@ module Enjoy
     module Mongoid
       module Page
         extend ActiveSupport::Concern
+
+        module ClassMethods
+          def menu_class_name
+            "Enjoy::Menu"
+          end
+
+          def menu_class
+            menu_class_name.constantize
+          end
+        end
+
         included do
+          field :name, type: String, localize: Enjoy.config.localize, default: ""
 
           field :regexp, type: String, default: ""
           field :redirect, type: String, default: ""
@@ -14,8 +26,6 @@ module Enjoy
           has_and_belongs_to_many :menus, inverse_of: :pages, class_name: menu_class_name
           acts_as_nested_set
 
-          manual_slug :name
-
           scope :sorted, -> { order_by([:lft, :asc]) }
           scope :menu, ->(menu_id) { enabled.sorted.where(menu_ids: menu_id) }
         end

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

@@ -3,7 +3,7 @@ module Enjoy
     module Mongoid
       module Seo
         extend ActiveSupport::Concern
-        include ::Mongoid::Paperclip
+        include Enjoy::MongoidPaperclip
         included do
 
           field :name, type: String, localize: Enjoy.config.localize
@@ -15,11 +15,15 @@ module Enjoy
           field :robots, type: String, localize: Enjoy.config.localize
 
           field :og_title, type: String, localize: Enjoy.config.localize
-          unless Enjoy.config.news_image_styles.nil?
-            enjoy_mongoid_attached_file(:image,
-                      styles: og_image_styles,
-                      content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
-            )
+          enjoy_cms_mongoid_attached_file(:og_image,
+                    styles: og_image_styles,
+                    content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
+          )
+        end
+
+        module ClassMethods
+          def og_image_styles
+            {thumb: "800x600>"}
           end
         end
       end

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

@@ -0,0 +1,20 @@
+module Enjoy
+  module Models
+    module Mongoid
+      module SitemapData
+        extend ActiveSupport::Concern
+        
+        included do
+          field :sitemap_show,        type: Boolean, default: true
+          field :sitemap_lastmod,     type: DateTime
+          field :sitemap_changefreq,  type: String,   default: 'daily'
+          field :sitemap_priority,    type: Float
+
+          scope :sitemap_show,    -> { where(sitemap_show: true) }
+          scope :for_sitemap,     -> { sitemap_show }
+          scope :show_in_sitemap, -> { sitemap_show }
+        end
+      end
+    end
+  end
+end

data/lib/enjoy/models/news.rb

@@ -6,8 +6,8 @@ module Enjoy
       include ManualSlug
       include Enjoy::Seoable
       include Enjoy::Enableable
-      include Enjoy::SitemapData
-      
+      include Enjoy::SitemapDataField
+
       include Enjoy.orm_specific('News')
 
       # if Enjoy.config.search_enabled

data/lib/enjoy/models/page.rb

@@ -6,7 +6,7 @@ module Enjoy
       include ManualSlug
       include Enjoy::Enableable
       include Enjoy::Seoable
-      include Enjoy::SitemapData
+      include Enjoy::SitemapDataField
 
       include Enjoy.orm_specific('Page')
 
@@ -24,16 +24,12 @@ module Enjoy
       end
 
       def page_h1
-        _ret = h1
+        _ret = seo ? seo.h1 : nil
         _ret = name   if _ret.blank?
         _ret = title  if _ret.blank?
         _ret
       end
 
-      def menu_class_name
-        "Enjoy::Menu"
-      end
-
       def get_fullpath
         redirect.blank? ? fullpath : redirect
       end

data/lib/enjoy/models/seo.rb

@@ -4,19 +4,12 @@ module Enjoy
       extend ActiveSupport::Concern
       include Enjoy::Model
       include Enjoy::Enableable
-      include Enjoy::Seoable
-      
+
       include Enjoy.orm_specific('Seo')
 
       included do
-
-        Enjoy.apply_patches self
         validates_attachment_content_type :og_image, content_type: /\Aimage\/.*\Z/, if: :og_image?
       end
-
-      def og_image_styles
-        {thumb: "800x600>"}
-      end
     end
   end
 end

data/lib/enjoy/models/sitemap_data.rb

@@ -0,0 +1,13 @@
+module Enjoy
+  module Models
+    module SitemapData
+      extend ActiveSupport::Concern
+      include Enjoy::Model
+      include Enjoy::Enableable
+
+      include Enjoy.orm_specific('SitemapData')
+
+      SITEMAP_CHANGEFREQ_ARRAY = %w(always hourly daily weekly monthly yearly never)
+    end
+  end
+end

data/lib/enjoy/rails_admin_menu.rb

@@ -12,9 +12,9 @@ module RailsAdmin
             ret = []
             menus = Rails.cache.fetch 'menus', expires_in: 10.minutes do
               if Enjoy.mongoid?
-                ::Menu.all.map { |m| {id: m.id.to_s, name: m.name } }
+                Enjoy::Menu.all.map { |m| {id: m.id.to_s, name: m.name } }
               else
-                ::Menu.all.map { |m| {id: m.id, name: m.name } }
+                Enjoy::Menu.all.map { |m| {id: m.id, name: m.name } }
               end
             end
             menus.each do |m|
@@ -125,9 +125,9 @@ module RailsAdmin
               else
                 flash[:error] = I18n.t('rs.m.no_id')
               end
-              
+
             end
-            
+
             redirect_to :back unless params['ajax'].present?
           end
         end

data/lib/enjoy/tasks.rb

@@ -4,7 +4,7 @@ require 'rake'
 # Require generator at runtime. If we don't do this the ActionView helpers are included
 # before the Rails environment can be loaded by other Rake tasks, which causes problems
 # for those tasks when rendering using ActionView.
-namespace :rs do
+namespace :enjoy do
   # Require generator only. When installed as a plugin the require will fail, so in
   # that case, load the environment first.
   task :require do

data/lib/enjoy/version.rb

@@ -1,3 +1,3 @@
 module Enjoy
-  VERSION = "0.1.0.beta1"
+  VERSION = "0.2.0.beta"
 end

data/lib/enjoy_cms.rb

@@ -1,5 +1,5 @@
 unless defined?(Enjoy) && Enjoy.respond_to?(:orm) && [:active_record, :mongoid].include?(Enjoy.orm)
-  puts "please use Enjoy_mongoid or Enjoy_activerecord and not enjoy directly"
+  puts "please use enjoy_cms_mongoid or enjoy_cms_activerecord and not enjoy directly"
   exit 1
 end
 
@@ -39,8 +39,6 @@ require 'enjoy/rails_admin_menu'
 require 'enjoy/engine'
 require 'enjoy/controller'
 
-require 'manual_slug'
-
 
 module Enjoy
   class << self
@@ -65,26 +63,28 @@ module Enjoy
   # end
 
   module Models
+    autoload :SitemapData,  'enjoy/models/sitemap_data'
     autoload :Seo,  'enjoy/models/seo'
     autoload :Menu, 'enjoy/models/menu'
     autoload :Page, 'enjoy/models/page'
     autoload :News, 'enjoy/models/news'
     autoload :ContactMessage, 'enjoy/models/contact_message'
 
-    autoload :Enjoy,      'enjoy/models/embedded_element'
+    autoload :EmbeddedElement,      'enjoy/models/embedded_element'
 
     autoload :EmbeddedGalleryImage, 'enjoy/models/embedded_gallery_image'
     autoload :GalleryImage,         'enjoy/models/gallery_image'
     autoload :Gallery,              'enjoy/models/gallery'
 
     module Mongoid
+      autoload :SitemapData,  'enjoy/models/mongoid/sitemap_data'
       autoload :Seo,  'enjoy/models/mongoid/seo'
       autoload :Menu, 'enjoy/models/mongoid/menu'
       autoload :Page, 'enjoy/models/mongoid/page'
       autoload :News, 'enjoy/models/mongoid/news'
       autoload :ContactMessage, 'enjoy/models/mongoid/contact_message'
 
-      autoload :Enjoy,      'enjoy/models/mongoid/embedded_element'
+      autoload :EmbeddedElement,      'enjoy/models/mongoid/embedded_element'
 
       autoload :EmbeddedGalleryImage, 'enjoy/models/mongoid/embedded_gallery_image'
       autoload :GalleryImage,         'enjoy/models/mongoid/gallery_image'
@@ -92,6 +92,7 @@ module Enjoy
     end
 
     module ActiveRecord
+      autoload :SitemapData,  'enjoy/models/active_record/sitemap_data'
       autoload :Seo,  'enjoy/models/active_record/seo'
       autoload :Menu, 'enjoy/models/active_record/menu'
       autoload :Page, 'enjoy/models/active_record/page'
@@ -107,3 +108,5 @@ module Enjoy
     autoload :Search, 'enjoy/controllers/search'
   end
 end
+
+require 'manual_slug'

data/lib/generators/enjoy/templates/ability.erb

@@ -6,11 +6,15 @@ class Ability
       can :read, :all
       can :access, :rails_admin   # grant access to rails_admin
       can :dashboard              # grant access to the dashboard
+
       if user.admin?
         admin_ui(user)
       elsif user.manager?
         manager_ui(user)
       end
+
+      cannot [:new, :create], Enjoy::Seo
+      cannot [:new, :create], Enjoy::SitemapData
     end
   end
 
@@ -19,8 +23,23 @@ class Ability
   end
 
   def manager_ui(user)
-    cannot :manage, Menu
+    cannot :manage, Enjoy::Menu
     cannot [:edit, :destroy, :new, :create], User
     can :edit, user
+
+    manager_models.each do |model|
+      can manager_actions, model
+    end
+  end
+
+  def manager_actions
+    [:edit, :new, :create, :nested_set, :sort_embedded]
+  end
+
+  def manager_models
+    [
+      Enjoy::Page, Enjoy::News,
+      Enjoy::Seo, Enjoy::SitemapData
+    ]
   end
-end
+end

data/lib/generators/enjoy/templates/admin.erb

@@ -42,21 +42,21 @@ RailsAdmin.config do |config|
 
     nested_set do
       visible do
-        ['Page', 'Gallery', 'GalleryImage'].include? bindings[:abstract_model].model_name
+        ['Enjoy::Page', 'Enjoy::Gallery', 'Enjoy::GalleryImage'].include? bindings[:abstract_model].model_name
       end
     end
 
     custom_show_in_app do
       visible do
         #temporary
-        false #['Page', 'News'].include? bindings[:abstract_model].model_name
+        false #['Enjoy::Page', 'Enjoy::News'].include? bindings[:abstract_model].model_name
       end
     end
 
     toggle
     toggle_menu  do
       visible do
-        ['Page'].include? bindings[:abstract_model].model_name
+        ['Enjoy::Page'].include? bindings[:abstract_model].model_name
       end
     end
     sitemap

data/template.rb

@@ -22,7 +22,7 @@ gem 'sass-rails'
 gem 'compass-rails', '~> 2.0.0'
 gem 'compass', '~> 1.0.0'
 
-#{if mongoid then "gem 'Enjoy_mongoid'" else "gem 'Enjoy_activerecord'" end}, '~> 0.1.0.beta1', git: 'https://github.com/enjoycreative/Enjoy'
+#{if mongoid then "gem 'enjoy_cms_mongoid'" else "gem 'enjoy_cms_activerecord'" end}, '~> 0.2.0.beta', git: 'https://github.com/enjoycreative/enjoy_cms'
 
 gem 'devise'
 
@@ -201,11 +201,11 @@ end
 
 create_file 'config/navigation.rb' do <<-TEXT
 # empty file to please simple_navigation, we are not using it
-# See https://github.com/enjoycreative/Enjoy/blob/master/app/controllers/concerns/enjoy/menu.rb
+# See https://github.com/enjoycreative/enjoy_cms/blob/master/app/controllers/concerns/enjoy/menu.rb
 TEXT
 end
 
-create_file 'README.md', "## #{app_name}\nProject generated by Enjoy\nORM: #{if mongoid then 'Mongoid' else 'ActiveRecord' end}\n\n"
+create_file 'README.md', "## #{app_name}\nProject generated by EnjoyCMS\nORM: #{if mongoid then 'Mongoid' else 'ActiveRecord' end}\n\n"
 
 create_file '.ruby-version', "2.2.3\n"
 create_file '.ruby-gemset', "#{app_name}\n"
@@ -386,7 +386,7 @@ Rails.application.routes.draw do
   mount RailsAdmin::Engine => '/admin', as: 'rails_admin'
   mount Ckeditor::Engine => '/ckeditor'
 
-  mount Enjoy::Engine => '/'
+  mount Enjoy::Engine => '/', as: 'enjoy_cms'
 end
 TEXT
 end
@@ -595,7 +595,7 @@ remove_file 'app/assets/stylesheets/application.css'
 remove_file 'app/assets/stylesheets/application.css.sass'
 create_file 'app/assets/stylesheets/application.sass' do <<-TEXT
 @import 'compass'
-@import 'Enjoy'
+@import 'enjoy_cms'
 
 #wrapper
   width: 960px
@@ -615,7 +615,7 @@ end
 remove_file 'app/assets/javascripts/application.js'
 remove_file 'app/assets/javascripts/application.js.coffee'
 create_file 'app/assets/javascripts/application.coffee' do <<-TEXT
-#= require Enjoy
+#= require enjoy_cms
 TEXT
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta1
+  version: 0.2.0.beta
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -419,7 +419,7 @@ files:
 - app/models/concerns/enjoy/mappable.rb
 - app/models/concerns/enjoy/mongoid_paperclip.rb
 - app/models/concerns/enjoy/seoable.rb
-- app/models/concerns/enjoy/sitemap_data.rb
+- app/models/concerns/enjoy/sitemap_data_field.rb
 - app/models/concerns/enjoy/sort_field.rb
 - app/models/concerns/enjoy/sortable.rb
 - app/models/enjoy/contact_message.rb
@@ -431,6 +431,7 @@ files:
 - app/models/enjoy/news.rb
 - app/models/enjoy/page.rb
 - app/models/enjoy/seo.rb
+- app/models/enjoy/sitemap_data.rb
 - app/views/blocks/_favicon.html.slim
 - app/views/blocks/_footer.html.slim
 - app/views/blocks/_seo_block.html.slim
@@ -503,6 +504,7 @@ files:
 - lib/enjoy/models/active_record/news.rb
 - lib/enjoy/models/active_record/page.rb
 - lib/enjoy/models/active_record/seo.rb
+- lib/enjoy/models/active_record/sitemap_data.rb
 - lib/enjoy/models/contact_message.rb
 - lib/enjoy/models/embedded_element.rb
 - lib/enjoy/models/embedded_gallery_image.rb
@@ -518,9 +520,11 @@ files:
 - lib/enjoy/models/mongoid/news.rb
 - lib/enjoy/models/mongoid/page.rb
 - lib/enjoy/models/mongoid/seo.rb
+- lib/enjoy/models/mongoid/sitemap_data.rb
 - lib/enjoy/models/news.rb
 - lib/enjoy/models/page.rb
 - lib/enjoy/models/seo.rb
+- lib/enjoy/models/sitemap_data.rb
 - lib/enjoy/patch.rb
 - lib/enjoy/rails_admin_menu.rb
 - lib/enjoy/simple_form_patch.rb

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

@@ -1,23 +0,0 @@
-module Enjoy::SitemapData
-  extend ActiveSupport::Concern
-
-  SITEMAP_CHANGEFREQ_ARRAY = %w(always hourly daily weekly monthly yearly never)
-
-  included do
-    if Enjoy.mongoid?
-      field :sitemap_show,        type: Boolean, default: true
-      field :sitemap_lastmod,     type: DateTime
-      field :sitemap_changefreq,  type: String,   default: 'daily'
-      field :sitemap_priority,    type: Float
-
-      scope :sitemap_show,    -> { where(sitemap_show: true) }
-      scope :for_sitemap,     -> { sitemap_show }
-      scope :show_in_sitemap, -> { sitemap_show }
-    elsif Enjoy.active_record?
-    end
-  end
-
-  def self.admin
-    Enjoy.sitemap_data_config
-  end
-end