enjoy_cms 0.2.0.2 → 0.2.0.3

data/lib/enjoy/models/gallery.rb

@@ -7,21 +7,11 @@ module Enjoy
       include Enjoy::Enableable
       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
 
-        has_many :gallery_images, class_name: gallery_image_class_name
+        has_many :gallery_images, class_name: "Enjoy::GalleryImage"
         field :name, type: String, localize: Enjoy.configuration.localize
 
         validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/, if: :image?

data/lib/enjoy/models/gallery_image.rb

@@ -5,21 +5,11 @@ module Enjoy
       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
 
-        belongs_to :gallery, class_name: gallery_class_name
+        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?

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

@@ -8,15 +8,13 @@ module Enjoy
         included do
 
           enjoy_cms_mongoid_attached_file(:image,
-                    styles: image_styles,
+                    styles: lambda { |attachment| attachment.instance.image_styles },
                     content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
           )
         end
 
-        module ClassMethods
-          def image_styles
-            {}
-          end
+        def image_styles
+          {}
         end
       end
     end

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

@@ -13,15 +13,13 @@ module Enjoy
           scope :sorted, -> { order_by([:lft, :asc]) }
 
           enjoy_cms_mongoid_attached_file(:image,
-                    styles: image_styles,
+                    styles: lambda { |attachment| attachment.instance.image_styles },
                     content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
           )
         end
 
-        module ClassMethods
-          def image_styles
-            {}
-          end
+        def image_styles
+          {}
         end
       end
     end

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

@@ -11,15 +11,13 @@ module Enjoy
           scope :sorted, -> { order_by([:lft, :asc]) }
 
           enjoy_cms_mongoid_attached_file(:image,
-                    styles: image_styles,
+                    styles: lambda { |attachment| attachment.instance.image_styles },
                     content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
           )
         end
 
-        module ClassMethods
-          def image_styles
-            {}
-          end
+        def image_styles
+          {}
         end
       end
     end

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

@@ -4,18 +4,8 @@ module Enjoy
       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
+          has_and_belongs_to_many :pages, inverse_of: :menus, class_name: "Enjoy::Page"
           alias_method :items, :pages
 
           field :name, type: String, default: ""

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

@@ -4,16 +4,6 @@ module Enjoy
       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: ""
 
@@ -23,7 +13,7 @@ module Enjoy
           field :content, type: String, localize: Enjoy.config.localize, default: ""
           field :fullpath, type: String, default: ""
 
-          has_and_belongs_to_many :menus, inverse_of: :pages, class_name: menu_class_name
+          has_and_belongs_to_many :menus, inverse_of: :pages, class_name: "Enjoy::Menu"
           acts_as_nested_set
 
           scope :sorted, -> { order_by([:lft, :asc]) }

data/lib/enjoy/models/news.rb

@@ -34,8 +34,6 @@ module Enjoy
         end
         smart_excerpt :excerpt, :content, Enjoy.config.news_excerpt
         manual_slug :report_slug
-
-        Enjoy.apply_patches self
       end
 
       def report_slug

data/lib/enjoy/models/seo.rb

@@ -8,6 +8,8 @@ module Enjoy
       include Enjoy.orm_specific('Seo')
 
       included do
+        belongs_to :seoable, polymorphic: true
+
         validates_attachment_content_type :og_image, content_type: /\Aimage\/.*\Z/, if: :og_image?
       end
     end

data/lib/enjoy/models/sitemap_data.rb

@@ -8,6 +8,10 @@ module Enjoy
       include Enjoy.orm_specific('SitemapData')
 
       SITEMAP_CHANGEFREQ_ARRAY = %w(always hourly daily weekly monthly yearly never)
+
+      included do
+        belongs_to :sitemap_data_field, polymorphic: true
+      end
     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?
-                Enjoy::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
-                Enjoy::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|
@@ -84,7 +84,7 @@ module RailsAdmin
             if params['id'].present?
               begin
                 @object = @abstract_model.model.find(params['id'])
-                @menu = ::Menu.find(params[:menu])
+                @menu = ::Enjoy::Menu.find(params[:menu])
                 if params[:on] == 'true'
                   @object.menus << @menu
                 else

data/lib/enjoy/version.rb

@@ -1,3 +1,3 @@
 module Enjoy
-  VERSION = "0.2.0.2"
+  VERSION = "0.2.0.3"
 end

data/lib/enjoy_cms.rb

@@ -29,10 +29,7 @@ require 'turbolinks'
 require 'simple-navigation'
 require 'ack_rails_admin_jcrop'
 
-# require 'enjoy/seo_helpers'
 require 'enjoy/configuration'
-require 'enjoy/patch'
-require 'enjoy/admin'
 require 'enjoy/elastic_search'
 require 'enjoy/model'
 require 'enjoy/rails_admin_menu'
@@ -62,6 +59,22 @@ module Enjoy
   #   autoload :Paperclip  'enjoy/mongoid/paperlcip'
   # end
 
+  autoload :Admin,  'enjoy/admin'
+  module Admin
+    autoload :SitemapData,  'enjoy/admin/sitemap_data'
+    autoload :Seo,  'enjoy/admin/seo'
+    autoload :Menu, 'enjoy/admin/menu'
+    autoload :Page, 'enjoy/admin/page'
+    autoload :News, 'enjoy/admin/news'
+    autoload :ContactMessage, 'enjoy/admin/contact_message'
+
+    autoload :EmbeddedElement,      'enjoy/admin/embedded_element'
+
+    autoload :EmbeddedGalleryImage, 'enjoy/admin/embedded_gallery_image'
+    autoload :GalleryImage,         'enjoy/admin/gallery_image'
+    autoload :Gallery,              'enjoy/admin/gallery'
+  end
+
   module Models
     autoload :SitemapData,  'enjoy/models/sitemap_data'
     autoload :Seo,  'enjoy/models/seo'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms
 version: !ruby/object:Gem::Version
-  version: 0.2.0.2
+  version: 0.2.0.3
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -417,6 +417,7 @@ files:
 - app/models/concerns/enjoy/enableable.rb
 - app/models/concerns/enjoy/geocodeable.rb
 - app/models/concerns/enjoy/mappable.rb
+- app/models/concerns/enjoy/model_localizeable.rb
 - app/models/concerns/enjoy/mongoid_paperclip.rb
 - app/models/concerns/enjoy/seoable.rb
 - app/models/concerns/enjoy/sitemap_data_field.rb
@@ -489,12 +490,14 @@ files:
 - lib/enjoy/admin/news.rb
 - lib/enjoy/admin/page.rb
 - lib/enjoy/admin/seo.rb
+- lib/enjoy/admin/sitemap_data.rb
 - lib/enjoy/configuration.rb
 - lib/enjoy/controller.rb
 - lib/enjoy/controllers/contacts.rb
 - lib/enjoy/controllers/news.rb
 - lib/enjoy/controllers/pages.rb
 - lib/enjoy/controllers/search.rb
+- lib/enjoy/controllers/sitemap_data.rb
 - lib/enjoy/elastic_search.rb
 - lib/enjoy/engine.rb
 - lib/enjoy/migration.rb
@@ -525,7 +528,6 @@ files:
 - 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
 - lib/enjoy/tasks.rb

data/lib/enjoy/patch.rb

@@ -1,58 +0,0 @@
-module Enjoy
-  class PatchDSL
-    def self.call(&blk)
-      instance = new
-      instance.instance_eval(&blk)
-      instance.instance_variables.inject({}) { |result_hash, instance_variable|
-        result_hash[instance_variable[1..-1].to_sym] = instance.instance_variable_get(instance_variable)
-        result_hash
-      }
-    end
-    
-    def initialize
-      @model  = Proc.new {}
-      @admin  = Proc.new {}
-      @list   = Proc.new {}
-      @show   = Proc.new {}
-      @edit   = Proc.new {}
-      @export = Proc.new {}
-    end
-    
-    def model(&blk);  @model = blk;  end
-    def admin(&blk);  @admin = blk;  end
-    def list(&blk);   @list = blk;   end
-    def show(&blk);   @show = blk;   end
-    def edit(&blk);   @edit = blk;   end
-    def export(&blk); @export = blk; end
-  end
-  
-  @@patches = {}
-  
-  def self.only_patches(s, sections)
-    s.instance_eval do
-      sections.each do |section|
-        send section do
-          Enjoy.apply_patches self
-        end
-      end
-    end
-  end
-  
-  def self.apply_patches(s)
-    if s.class.name.index('RailsAdmin::Config::Sections::').nil?
-      if s.class.name == 'RailsAdmin::Config::Model'
-        s.instance_eval(&@@patches[s.abstract_model.model_name][:admin]) unless @@patches[s.abstract_model.model_name].nil?
-      else
-        s.instance_eval(&@@patches[s.name][:model]) unless @@patches[s.name].nil?
-      end
-    else
-      model = s.abstract_model.model_name
-      action = s.class.name.split('::')[-1].downcase.to_sym
-      s.instance_eval(&@@patches[model][action]) unless @@patches[model].nil?
-    end
-  end
-  
-  def self.patch(model, &blk)
-     @@patches[model] = PatchDSL.call(&blk)
-  end
-end