enjoy_cms 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1cde68353de729109469314593280868f16f916
-  data.tar.gz: 8d710c2d7de38ddf701c9069f8b03ef7481a794b
+  metadata.gz: 7396a7e0de757550c9c23cd91c1a04cfa089a67b
+  data.tar.gz: 35134eb111a84278479d77e1f4f1d85f56da950b
 SHA512:
-  metadata.gz: dbcd938f54fdc7fa3d5e58c74fcdaa0f2082a8b8defcd3999adb845f6146ff12b03ac2dec980514a04f06b17f56a729b449ffd98f3f4397178eae632fcc5f6a6
-  data.tar.gz: 1c9120a4a121b5cbdd346f4e801e6695438a7e4ad7e2af9604cf236686e36581cebcf4e34b5b9f128179aea86ac477ce0a94edbc5454328cc8f9471dd7f5b7fa
+  metadata.gz: 71d0e398cf285ef3da4687a6ec70d09c9350611413a8d11af1f4eb4271b16e2309ddbe5fff4b733d5ba5a1a5827459c3bd5e75ecba6c2c3b8960043f8cf53b05
+  data.tar.gz: c8f2350501b3add07a6b876a1295bb4b92dfc4dcd9c4b35004c24e26d4c30e90f59810663dd90c72b6dbdab7280821695bcd42c357606943758a214b5efac8c1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enjoy_cms (0.3.4)
+    enjoy_cms (0.3.5)
       ack_rails_admin_jcrop
       addressable
       ckeditor
@@ -72,8 +72,8 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.4.0)
     arel (6.0.3)
-    bcrypt (3.1.10)
-    bson (4.0.3)
+    bcrypt (3.1.11)
+    bson (4.0.4)
     builder (3.2.2)
     ckeditor (4.1.6)
       cocaine

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

@@ -21,10 +21,28 @@ module Enjoy::Localizeable
     pages.sorted.to_a
   end
   def nav_get_url(item)
-    (params[:locale].blank? ? "" : "/#{params[:locale]}") + (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
+        _url = send(_routes_namespace.to_sym).url_for([_connectable, {only_path: true}])
+      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)
+
+        _url = item.redirect.blank? ? item.fullpath : item.redirect
+      end
+    else
+      _url = item.redirect.blank? ? item.fullpath : item.redirect
+    end
+    (params[:locale].blank? ? "" : "/#{params[:locale]}") + _url
   end
   def find_seo_extra(path)
-    page_class.enabled.where(fullpath: path.gsub(/(\/ru|\/en)/, "")).first
+    _localizable_regexp = Regexp.new("^(#{I18n.available_locales.map { |l| "\\/#{l}"}.join("|")})")
+    page_class.enabled.where(fullpath: path.sub(_localizable_regexp, "")).first
   end
 
   def page_class_name

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

@@ -56,14 +56,14 @@ module Enjoy::NavMenu
     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)
+        send(_routes_namespace.to_sym).url_for([_connectable, {only_path: true}])
       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

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: contacts_path do |f|
+  = simple_form_for @contact_message, url: enjoy_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: contacts_path do |f|
+  = simple_form_for @contact_message, url: enjoy_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 search_path, method: :get, class: 'nav_search' do
+  = form_tag enjoy_search_path, method: :get, class: 'nav_search' do
     = text_field_tag 'query', params[:query], placeholder: "Поиск"
     = submit_tag 'Найти'
   ol

data/lib/enjoy/configuration.rb

@@ -32,8 +32,6 @@ module Enjoy
 
     attr_accessor :recreate_contact_message_action
 
-    attr_accessor :routes_config
-
     def initialize
       @news_image_styles = {
           main:  '400x200>',
@@ -58,15 +56,6 @@ module Enjoy
       @recreate_contact_message_action = "new"
 
       @localize = false
-
-      @routes_config = {
-        use_contacts_path: true,
-        use_search_path: true,
-        use_news_path: true,
-        root_path: "home#index",
-        use_slug_path: true,
-        use_pages_path: true
-      }
     end
 
     def search_enabled=(val)

data/lib/enjoy/engine.rb

@@ -1,6 +1,6 @@
 module Enjoy
   class Engine < ::Rails::Engine
-    isolate_namespace Enjoy
+    # isolate_namespace Enjoy
 
     rake_tasks do
       require File.expand_path('../tasks', __FILE__)

data/lib/enjoy/models/news.rb

@@ -16,7 +16,7 @@ module Enjoy
       # end
 
       included do
-        enjoy_connectable_field :connected_pages, routes_namespace: :enjoy_cms
+        enjoy_connectable_field :connected_pages
 
         unless Enjoy.config.news_image_styles.nil?
           validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/, if: :image?

data/lib/enjoy/routes.rb

@@ -0,0 +1,45 @@
+module ActionDispatch::Routing
+  class Mapper
+
+    def enjoy_cms_routes(config = {})
+      routes_config = {
+        use_contacts_path: true,
+        use_search_path: true,
+        use_news_path: true,
+        root_path: "home#index",
+        use_slug_path: true,
+        use_pages_path: true
+      }
+      routes_config.merge!(config)
+
+      scope module: 'enjoy' do
+        if routes_config[:use_contacts_path]
+          get 'contacts' => 'contacts#new', as: :enjoy_contacts
+          post 'contacts' => 'contacts#create', as: :enjoy_create_contacts
+          get 'contacts/sent' => 'contacts#sent', as: :enjoy_contacts_sent
+        end
+
+        if routes_config[:use_search_path]
+          get 'search' => 'search#index', as: :enjoy_search
+        end
+
+        if routes_config[:use_news_path]
+          resources :news, only: [:index, :show], as: :enjoy_news
+        end
+
+        if routes_config[:root_path]
+          root to: routes_config[:root_path]
+        end
+
+        if routes_config[:use_slug_path]
+          get '*slug' => 'pages#show'
+        end
+        if routes_config[:use_pages_path]
+          resources :pages, only: [:show], as: :enjoy_pages
+        end
+      end
+
+    end
+
+  end
+end

data/lib/enjoy/version.rb

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

data/lib/enjoy_cms.rb

@@ -5,6 +5,7 @@ end
 
 require 'enjoy/version'
 require 'devise'
+require 'enjoy/routes'
 
 require 'simple_form'
 require 'enjoy/simple_form_patch'

data/lib/generators/enjoy/config/install_generator.rb

@@ -0,0 +1,13 @@
+require 'rails/generators'
+
+module Enjoy::Config
+  class InstallGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+
+    desc 'Enjoy::CMS Config generator'
+    def install
+      template 'enjoy_cms.erb', "config/initializers/enjoy_cms.rb"
+    end
+
+  end
+end

data/lib/generators/enjoy/config/templates/enjoy_cms.erb

@@ -0,0 +1,27 @@
+Enjoy.configure do |config|
+  ##### defaults #####
+  # config.news_image_styles = {
+  #     main:  '400x200>',
+  #     thumb: '200x100>'
+  # }
+  # config.news_per_page = 10
+  # config.news_excerpt = 12
+  # config.news_content_required = true
+  #
+  # config.error_layout = 'application'
+  # config.menu_max_depth = 2
+  #
+  # config.search_enabled = false
+  # config.search_per_page = 10
+  # config.search_models = []
+  #
+  # config.contacts_captcha = false
+  # config.contacts_fields = {}
+  # config.contacts_message_required = true
+  #
+  # config.contacts_captcha_error_message = "Код проверки введен неверно"
+  # config.recreate_contact_message_action = "new"
+  #
+  # config.localize = false
+
+end

data/template.rb

@@ -106,6 +106,7 @@ create_file '.gitignore' do <<-TEXT
 /tmp/*
 /public/assets
 /public/ckeditor_assets
+Gemfile.lock
 TEXT
 end
 
@@ -414,7 +415,7 @@ Rails.application.routes.draw do
   mount RailsAdmin::Engine => '/admin', as: 'rails_admin'
   mount Ckeditor::Engine => '/ckeditor'
 
-  mount Enjoy::Engine => '/', as: 'enjoy_cms'
+  enjoy_cms_routes
 end
 TEXT
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -520,7 +520,6 @@ files:
 - config/locales/ru.rails_admin.yml
 - config/locales/ru.simple_captcha.yml
 - config/locales/ru.simple_form.yml
-- config/routes.rb
 - enjoy_cms.gemspec
 - lib/enjoy/admin.rb
 - lib/enjoy/admin/contact_message.rb
@@ -581,6 +580,7 @@ files:
 - 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/routes.rb
 - lib/enjoy/simple_form_patch.rb
 - lib/enjoy/tasks.rb
 - lib/enjoy/version.rb
@@ -589,6 +589,8 @@ files:
 - lib/generators/enjoy/ability_generator.rb
 - lib/generators/enjoy/admin_generator.rb
 - lib/generators/enjoy/capify_generator.rb
+- lib/generators/enjoy/config/install_generator.rb
+- lib/generators/enjoy/config/templates/enjoy_cms.erb
 - lib/generators/enjoy/layout_generator.rb
 - lib/generators/enjoy/migration_generator.rb
 - lib/generators/enjoy/templates/Capfile

data/config/routes.rb

@@ -1,28 +0,0 @@
-Enjoy::Engine.routes.draw do
-  routes_config = Enjoy.configuration.routes_config
-
-  if !routes_config or routes_config[:use_contacts_path]
-    get 'contacts' => 'contacts#new', as: :contacts
-    post 'contacts' => 'contacts#create', as: :create_contacts
-    get 'contacts/sent' => 'contacts#sent', as: :contacts_sent
-  end
-
-  if !routes_config or routes_config[:use_search_path]
-    get 'search' => 'search#index', as: :search
-  end
-
-  if !routes_config or routes_config[:use_news_path]
-    resources :news, only: [:index, :show]
-  end
-
-  if routes_config and routes_config[:root_path]
-    root to: routes_config[:root_path]
-  end
-
-  if !routes_config or routes_config[:use_slug_path]
-    get '*slug' => 'pages#show'
-  end
-  if !routes_config or routes_config[:use_pages_path]
-    resources :pages, only: [:show]
-  end
-end