enjoy_cms 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a343ff214ab5a895ad91cf3eb897a3692420bef
-  data.tar.gz: e0d4ebd8b92e5182325c8dc2c0373c8517f8dfc3
+  metadata.gz: e1cde68353de729109469314593280868f16f916
+  data.tar.gz: 8d710c2d7de38ddf701c9069f8b03ef7481a794b
 SHA512:
-  metadata.gz: 9f444d9a1b1e6c99a0de9d94e6d826ceaa73d48ab658a22dc8b17d2e23a9895a690353fa6c8a36e958433c22f294177d3ad31198f7943b34588fe341e829dd8e
-  data.tar.gz: f53e6b513f7a9004ddda3fcbda789827ed922f67b1da1cc39e1083daf282986d69dbad1a92c5ebd2abdf00dce77ee73771d3c7e5621dc4a83667fc04bc6c9073
+  metadata.gz: dbcd938f54fdc7fa3d5e58c74fcdaa0f2082a8b8defcd3999adb845f6146ff12b03ac2dec980514a04f06b17f56a729b449ffd98f3f4397178eae632fcc5f6a6
+  data.tar.gz: 1c9120a4a121b5cbdd346f4e801e6695438a7e4ad7e2af9604cf236686e36581cebcf4e34b5b9f128179aea86ac477ce0a94edbc5454328cc8f9471dd7f5b7fa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enjoy_cms (0.3.3)
+    enjoy_cms (0.3.4)
       ack_rails_admin_jcrop
       addressable
       ckeditor

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

@@ -16,7 +16,7 @@ module Enjoy::NavMenu
         }
       end
     end
-    cr = item.clean_regexp
+    # cr = item.clean_regexp
     navigation_item(primary, item, block)
   end
 
@@ -52,7 +52,23 @@ module Enjoy::NavMenu
   end
 
   def nav_get_url(item)
-    item.redirect.blank? ? item.fullpath : item.redirect
+    _connectable = item.connectable
+    if _connectable and _connectable.enabled
+      begin
+        _routes_namespace = _connectable.respond_to?(:routes_namespace) ? _connectable.routes_namespace : :main_app
+        send(_routes_namespace.to_sym).url_for(_connectable)
+      rescue Exception => exception
+        Rails.logger.error exception.message
+        Rails.logger.error exception.backtrace.join("\n")
+        puts exception.message
+        puts exception.backtrace.join("\n")
+        capture_exception(exception) if respond_to?(:capture_exception)
+        
+        item.redirect.blank? ? item.fullpath : item.redirect
+      end
+    else
+      item.redirect.blank? ? item.fullpath : item.redirect
+    end
   end
   def nav_get_menu_items(type)
     menu = menu_class.find(type.to_s)

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

@@ -0,0 +1,36 @@
+module Enjoy::Connectable
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    def enjoy_connectable_field (name = :connected_pages, opts = {})
+      class_name = opts.delete(:class_name)
+      class_name ||= "Enjoy::Page"
+      routes_namespace = opts.delete(:routes_namespace)
+      routes_namespace ||= :main_app
+      autocreate_page = opts.delete(:autocreate_page)
+      autocreate_page = true if autocreate_page.nil?
+
+      has_many name, as: :connectable, class_name: "Enjoy::Page"
+      class_eval <<-EVAL
+        def routes_namespace
+          :#{routes_namespace}
+        end
+      EVAL
+
+      if autocreate_page
+        attr_accessor :enjoy_connectable_autocreate_page
+        _name_attr = Enjoy.config.localize ? "name_translations" : "name"
+        class_eval <<-EVAL
+          after_create do
+            if self.enjoy_connectable_autocreate_page
+              _p = #{class_name}.new
+              _p.#{_name_attr} = self.#{_name_attr}
+              _p.connectable = self
+              _p.save
+            end
+          end
+        EVAL
+      end
+    end
+  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_cms.contacts_path do |f|
+  = simple_form_for @contact_message, url: contacts_path do |f|
     = f.input :name
     = f.input :email
     = f.input :phone

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

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

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

@@ -1,6 +1,6 @@
 .enjoy-search-results
   h1 Результаты поиска
-  = form_tag enjoy.search_path, method: :get, class: 'nav_search' do
+  = form_tag search_path, method: :get, class: 'nav_search' do
     = text_field_tag 'query', params[:query], placeholder: "Поиск"
     = submit_tag 'Найти'
   ol

data/app/views/rails_admin/main/_check_boxes.html.slim

@@ -1,7 +1,7 @@
 - if params[:associations].nil?
   = render 'rails_admin/main/enum_check_boxes', field: field, form: form
 - else  
-  :ruby
+  ruby:
     related_id = params[:associations] && params[:associations][field.name.to_s]
     config = field.associated_model_config
     source_abstract_model = RailsAdmin.config(form.object.class).abstract_model

data/app/views/rails_admin/main/_enjoy_connectable.html.slim

@@ -0,0 +1,56 @@
+ruby:
+  related_id = params[:associations] && params[:associations][field.name.to_s]
+  config = field.associated_model_config
+  source_abstract_model = RailsAdmin.config(form.object.class).abstract_model
+
+  if form.object.new_record? && related_id.present? && related_id != 'new'
+    selected = [config.abstract_model.get(related_id)]
+  else
+    selected = form.object.send(field.name)
+  end
+  selected_ids = selected.map{|s| s.send(field.associated_primary_key)}
+
+  current_action = params[:action].in?(['create', 'new']) ? 'create' : 'update'
+
+  xhr = !field.associated_collection_cache_all
+
+  collection = if xhr
+    selected.map { |o| [o.send(field.associated_object_label_method), o.send(field.associated_primary_key)] }
+  else
+    i = 0
+    controller.list_entries(config, :index, field.associated_collection_scope, false).map { |o| [o.send(field.associated_object_label_method), o.send(field.associated_primary_key)] }.sort_by {|a| [selected_ids.index(a[1]) || selected_ids.size, i+=1] }
+  end
+
+  js_data = {
+    xhr: xhr,
+    :'edit-url' => (authorized?(:edit, config.abstract_model) ? edit_path(model_name: config.abstract_model.to_param, id: '__ID__') : ''),
+    remote_source: index_path(config.abstract_model, source_object_id: form.object.id, source_abstract_model: source_abstract_model.to_param, associated_collection: field.name, current_action: current_action, compact: true),
+    sortable: !!field.orderable,
+    removable: !!field.removable,
+    cacheAll: !!field.associated_collection_cache_all,
+    regional: {
+      chooseAll: t("admin.misc.chose_all"),
+      chosen: t("admin.misc.chosen", name: config.label_plural),
+      clearAll: t("admin.misc.clear_all"),
+      search: t("admin.misc.search"),
+      up: t("admin.misc.up"),
+      down: t("admin.misc.down")
+    }
+  }
+
+input{name="#{form.dom_name(field)}" type="hidden" value=""}
+
+- if field.bindings[:object].new_record? and field.bindings[:object].respond_to?(field.autocreate_page_attr)
+  p
+    span{style='float: left'}= form.check_box field.autocreate_page_attr, checked: true, class: "form-control"
+    div{style='margin-left: 35px; line-height: 40px;'} Автоматически создать пункт меню
+    
+- selected_ids = (hdv = field.form_default_value).nil? ? selected_ids : hdv
+= form.select field.method_name, collection, { selected: selected_ids, object: form.object }, field.html_attributes.reverse_merge({data: { filteringmultiselect: true, options: js_data.to_json }, multiple: true})
+- if authorized?(:new, config.abstract_model) && field.inline_add
+  - path_hash = { model_name: config.abstract_model.to_param, modal: true }
+  - path_hash.merge!({ associations: { field.inverse_of => (form.object.persisted? ? form.object.id : 'new') } }) if field.inverse_of
+  = link_to "<i class=\"icon-plus icon-white\"></i> ".html_safe + wording_for(:link, :new, config.abstract_model), '#', data: { link: new_path(path_hash) }, class: "create btn btn-info", style: 'margin-left:10px'
+
+
+  

data/app/views/rails_admin/main/_enum_check_boxes.html.slim

@@ -1,4 +1,4 @@
-:ruby
+ruby:
   values = form.object.class.send(field.method_name).values.map { |v|
     [t("enumerize.#{form.object.class.name.downcase}.#{field.method_name}.#{v}", default: t("enumerize.defaults.#{field.method_name}.#{v}")), v]
   }

data/app/views/rails_admin/main/_enum_radio_buttons.html.slim

@@ -1,4 +1,4 @@
-:ruby
+ruby:
   values = form.object.class.send(field.method_name).values.map { |v|
     [t("enumerize.#{form.object.class.name.downcase}.#{field.method_name}.#{v}", default: t("enumerize.defaults.#{field.method_name}.#{v}")), v]
   }

data/lib/enjoy/admin/news.rb

@@ -13,6 +13,7 @@ module Enjoy
             sort_reverse true
           end
           field :name
+          field :connected_pages, :enjoy_connectable
           unless Enjoy.config.news_image_styles.nil?
             field :image, :jcrop do
               jcrop_options :image_jcrop_options

data/lib/enjoy/admin/page.rb

@@ -10,6 +10,7 @@ module Enjoy
             field :enabled,  :toggle
             field :menus, :menu
             field :name
+            field :connectable
             field :fullpath do
               pretty_value do
                 bindings[:view].content_tag(:a, bindings[:object].fullpath, href: bindings[:object].fullpath)
@@ -21,6 +22,9 @@ module Enjoy
 
           edit do
             field :name
+            field :connectable do
+              read_only true
+            end
 
             group :content do
               active false
@@ -49,7 +53,7 @@ module Enjoy
             end
 
             Enjoy::RailsAdminGroupPatch::enjoy_cms_group(self, fields)
-            
+
             group :seo do
               active false
               field :seo do

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

@@ -11,6 +11,24 @@ module Enjoy
             include RailsAdminComments::Commentable
           end
 
+          belongs_to :connectable, polymorphic: true
+          scope :connected, -> {
+            where(:connectable_id.ne => nil)
+          }
+          scope :unconnected, -> (except_this = nil) {
+            if except_this
+              where({"$or" =>[
+                {:connectable_id => nil},
+                {"$and" => [
+                  {connectable_type: except_this.class.to_param},
+                  {connectable_id: except_this._id}
+                ]}
+              ]})
+            else
+              where(:connectable_id => nil)
+            end
+          }
+
           field :name, type: String, localize: Enjoy.config.localize, default: ""
 
           field :regexp, type: String, default: ""

data/lib/enjoy/models/news.rb

@@ -7,6 +7,7 @@ module Enjoy
       include Enjoy::Seoable
       include Enjoy::Enableable
       include Enjoy::SitemapDataField
+      include Enjoy::Connectable
 
       include Enjoy.orm_specific('News')
 
@@ -15,6 +16,7 @@ module Enjoy
       # end
 
       included do
+        enjoy_connectable_field :connected_pages, routes_namespace: :enjoy_cms
 
         unless Enjoy.config.news_image_styles.nil?
           validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/, if: :image?

data/lib/enjoy/rails_admin_ext/enjoy_connectable.rb

@@ -0,0 +1,33 @@
+require 'rails_admin/config/fields/types/has_many_association'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class EnjoyConnectable < RailsAdmin::Config::Fields::Types::HasManyAssociation
+          RailsAdmin::Config::Fields::Types::register(self)
+          include RailsAdmin::Engine.routes.url_helpers
+
+          register_instance_option :partial do
+            :enjoy_connectable
+          end
+
+          register_instance_option :autocreate_page_attr do
+            :enjoy_connectable_autocreate_page
+          end
+
+          register_instance_option :allowed_methods do
+            [method_name, autocreate_page_attr]
+          end
+
+          register_instance_option :associated_collection_scope do
+            me = bindings[:object]
+            Proc.new do |scope|
+              scope.unconnected(me).enabled.sorted
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/enjoy/{rails_admin_enjoy_hash.rb → rails_admin_ext/enjoy_hash.rb}

@@ -1,3 +1,5 @@
+require 'rails_admin/config/fields/types/text'
+
 module RailsAdmin
   module Config
     module Fields

data/lib/enjoy/{rails_admin_enjoy_html.rb → rails_admin_ext/enjoy_html.rb}

@@ -1,3 +1,5 @@
+require 'rails_admin/config/fields/types/ck_editor'
+
 module RailsAdmin
   module Config
     module Fields
@@ -34,7 +36,7 @@ module RailsAdmin
           register_instance_option :export_value do
             pretty_value
           end
-          
+
 
           register_instance_option :boolean_view_helper do
             :check_box

data/lib/enjoy/{rails_admin_menu.rb → rails_admin_ext/menu.rb}

@@ -1,3 +1,5 @@
+require 'rails_admin/config/fields/base'
+
 module RailsAdmin
   module Config
     module Fields

data/lib/enjoy/version.rb

@@ -1,3 +1,3 @@
 module Enjoy
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/lib/enjoy_cms.rb

@@ -15,10 +15,18 @@ require 'glebtv-simple_captcha'
 require 'validates_email_format_of'
 require 'smart_excerpt'
 require 'filename_to_slug'
+
 require 'rails_admin'
+
+require 'enjoy/rails_admin_ext/enjoy_connectable'
+require 'enjoy/rails_admin_ext/enjoy_hash'
+require 'enjoy/rails_admin_ext/enjoy_html'
+require 'enjoy/rails_admin_ext/group_patch'
+require 'enjoy/rails_admin_ext/menu'
+
 require 'rails_admin_nested_set'
 require 'rails_admin_toggleable'
-# require 'rails_admin_settings'
+require 'rails_admin_settings'
 require 'rails_admin_sort_embedded'
 
 require 'x-real-ip'
@@ -35,10 +43,6 @@ require 'ack_rails_admin_jcrop'
 require 'enjoy/configuration'
 require 'enjoy/elastic_search'
 require 'enjoy/model'
-require 'enjoy/rails_admin_menu'
-require 'enjoy/rails_admin_enjoy_html'
-require 'enjoy/rails_admin_enjoy_hash'
-require 'enjoy/rails_admin_group_patch'
 require 'enjoy/engine'
 require 'enjoy/controller'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -434,6 +434,7 @@ files:
 - app/helpers/enjoy/powered_helper.rb
 - app/mailers/enjoy/contact_mailer.rb
 - app/models/concerns/enjoy/boolean_field.rb
+- app/models/concerns/enjoy/connectable.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
@@ -493,6 +494,7 @@ files:
 - app/views/errors/error_500.html.slim
 - app/views/layouts/application.html.slim
 - app/views/rails_admin/main/_check_boxes.html.slim
+- app/views/rails_admin/main/_enjoy_connectable.html.slim
 - app/views/rails_admin/main/_enjoy_hash.html.slim
 - app/views/rails_admin/main/_enjoy_html.html.slim
 - app/views/rails_admin/main/_enum_check_boxes.html.slim
@@ -574,10 +576,11 @@ files:
 - lib/enjoy/models/page_blockset.rb
 - lib/enjoy/models/seo.rb
 - lib/enjoy/models/sitemap_data.rb
-- lib/enjoy/rails_admin_enjoy_hash.rb
-- lib/enjoy/rails_admin_enjoy_html.rb
-- lib/enjoy/rails_admin_group_patch.rb
-- lib/enjoy/rails_admin_menu.rb
+- lib/enjoy/rails_admin_ext/enjoy_connectable.rb
+- lib/enjoy/rails_admin_ext/enjoy_hash.rb
+- lib/enjoy/rails_admin_ext/enjoy_html.rb
+- lib/enjoy/rails_admin_ext/group_patch.rb
+- lib/enjoy/rails_admin_ext/menu.rb
 - lib/enjoy/simple_form_patch.rb
 - lib/enjoy/tasks.rb
 - lib/enjoy/version.rb