enjoy_cms 0.3.6.2 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c158c7ee68ca2a611f66332947e0139f9b61b9bd
-  data.tar.gz: 3bdb3f23ee1119a132168dfa34a6bac5b20308e9
+  metadata.gz: d1498d8db8ce0758077a4c20c2cec3ea63c0c228
+  data.tar.gz: cb2ef030d270a5be3c8d80c5562cd0573a4fddff
 SHA512:
-  metadata.gz: 96f31a367452269b83a3ed89a43ffcba7a8ad283c4480ca3707d59c2072d22abfabb7259b65f48a4ec109545ec7d117380368f38aac9fec49df4676b294061d2
-  data.tar.gz: ecf0efcd23fd851673fe725ddcdef0146a011483ddb1fce4602fef41a0a7f571795d45e2fb280cabff4a30c245e3eeaa650b0c11584ba7cad5407e21632953b1
+  metadata.gz: 5c48c1f6b9eacfd8d2b06dcd842250d1278480cb55cb144dc0db6216dfc9365270147214950189f6a85a12bbdf05b8af81ce50dd59c7768f3ecf582e7170f5ba
+  data.tar.gz: d06dcaae72d76c9f9ceed2b0a984249be281891bbddf7d809ee10219ad7afed42c1e87a21aefe2093efd7c37dcaf31ed0d21761360ec10db66c907006358df91

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enjoy_cms (0.3.6.2)
+    enjoy_cms (0.3.7)
       ack_rails_admin_jcrop
       addressable
       ckeditor
@@ -12,7 +12,7 @@ PATH
       jquery-rails
       kaminari
       rails (= 4.2.4)
-      rails_admin
+      rails_admin (~> 0.8.1)
       rails_admin_mongoid_localize_field
       rails_admin_nested_set
       rails_admin_settings
@@ -195,7 +195,7 @@ GEM
       activesupport (= 4.2.4)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.0.1)
+    rake (11.1.1)
     remotipart (1.2.1)
     responders (2.1.1)
       railties (>= 4.2.0, < 5.1)

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

@@ -9,7 +9,7 @@ module Enjoy::Localizeable
   end
   private
   def default_url_options(options={})
-    {locale: params[:locale]}
+    {locale: I18n.locale}
   end
   def nav_get_menu_items(type)
     pages = menu_class.find(type.to_s).pages.enabled
@@ -38,11 +38,16 @@ module Enjoy::Localizeable
     else
       _url = item.redirect.blank? ? item.fullpath : item.redirect
     end
-    (params[:locale].blank? ? "" : "/#{params[:locale]}") + _url
+    _localizable_regexp = Regexp.new("^(#{I18n.available_locales.map { |l| "\\/#{l}"}.join("|")})")
+    ((params[:locale].blank? or _url != _localizable_regexp) ? "" : "/#{params[:locale]}") + _url
   end
   def find_seo_extra(path)
     _localizable_regexp = Regexp.new("^(#{I18n.available_locales.map { |l| "\\/#{l}"}.join("|")})")
-    page_class.enabled.where(fullpath: path.sub(_localizable_regexp, "")).first
+    _path = path.sub(_localizable_regexp, "")
+    if _path[0] != '/'
+      _path = '/' + _path
+    end
+    page_class.enabled.where(fullpath: _path).first
   end
 
   def page_class_name

data/app/controllers/enjoy/home_controller.rb

@@ -2,6 +2,7 @@ module Enjoy
   class HomeController < ApplicationController
 
     def index
+      render layout: Enjoy.config.main_index_layout
     end
 
     include Enjoy::Decorators::Home

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

@@ -1 +1,8 @@
-= form.text_area field.string_method, rows: 10, cols: 80, class: 'form-control'
+ruby:
+  _opts = {}
+  _opts[:rows] = 10
+  _opts[:cols] = 80
+  _opts[:class] = 'form-control'
+  _opts[:value] = field.formatted_value
+  _opts[:style] = "font-family: monospace"
+= form.text_area field.string_method, _opts

data/config/locales/ru.rails_admin.yml

@@ -2,6 +2,26 @@
 
 ru:
   admin:
+    js:
+      true: Да
+      false: Нет
+      is_present: Существует
+      is_blank: Пустое
+      date: Дата ...
+      between_and_: Между ... и ...
+      today: Сегодня
+      yesterday: Вчера
+      this_week: На этой неделе
+      last_week: На прошлой неделе
+      number: Номер ...
+      contains: Содержит
+      is_exactly: В точности
+      starts_with: Начинается с
+      ends_with: Кончается на
+      too_many_objects: "Слишком много объектов, используйте фильтры и поиск"
+      no_objects: Ничего не найдено
+    loading: Загрузка...
+    toggle_navigation: Скрыть/Показать навигацию
     home:
       name: "Главная"
     pagination:

data/enjoy_cms.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'devise'
   spec.add_dependency 'turbolinks'
   spec.add_dependency 'validates_email_format_of'
-  spec.add_dependency 'rails_admin'
+  spec.add_dependency 'rails_admin', '~> 0.8.1'
   spec.add_dependency 'rails_admin_nested_set'
   spec.add_dependency 'rails_admin_toggleable'
 

data/lib/enjoy/admin/contact_message.rb

@@ -7,10 +7,18 @@ module Enjoy
           field :c_at do
             read_only true
           end
-          field :name
-          field :content, :text
-          field :email
-          field :phone
+          field :name do
+            searchable true
+          end
+          field :content, :text do
+            searchable true
+          end
+          field :email do
+            searchable true
+          end
+          field :phone do
+            searchable true
+          end
 
           Enjoy.config.contacts_fields.each_pair do |fn, ft|
             next if ft.nil?

data/lib/enjoy/admin/embedded_element.rb

@@ -4,8 +4,12 @@ module Enjoy
       def self.config(_navigation_label = I18n.t('enjoy.cms'), fields = {})
         Proc.new {
           # navigation_label(_navigation_label) unless _navigation_label.nil?
-          field :enabled, :toggle
-          field :name, :string
+          field :enabled, :toggle do
+            searchable false
+          end
+          field :name, :string do
+            searchable true
+          end
 
           Enjoy::RailsAdminGroupPatch::enjoy_cms_group(self, fields)
 

data/lib/enjoy/admin/gallery.rb

@@ -4,11 +4,16 @@ module Enjoy
       def self.config(fields = {})
         Proc.new {
           # navigation_label I18n.t('enjoy.gallery')
-          field :enabled, :toggle
+          field :enabled, :toggle do
+            searchable false
+          end
 
-          field :name, :string
+          field :name, :string do
+            searchable true
+          end
           group :URL do
             active false
+            searchable true
             field :slugs, :enum do
               enum_method do
                 :slugs

data/lib/enjoy/admin/gallery_image.rb

@@ -4,11 +4,17 @@ module Enjoy
       def self.config(without_gallery = false, fields = {})
         Proc.new {
           # navigation_label I18n.t('enjoy.gallery')
-          field :enabled, :toggle
+          field :enabled, :toggle do
+            searchable false
+          end
           unless without_gallery
-            field :gallery
+            field :gallery do
+              searchable :name
+            end
+          end
+          field :name, :string do
+            searchable true
           end
-          field :name, :string
           field :image, :jcrop do
             jcrop_options :image_jcrop_options
           end

data/lib/enjoy/admin/menu.rb

@@ -5,9 +5,15 @@ module Enjoy
         Proc.new {
           # navigation_label 'CMS'
 
-          field :enabled, :toggle
-          field :text_slug
-          field :name
+          field :enabled, :toggle do
+            searchable false
+          end
+          field :text_slug do
+            searchable true
+          end
+          field :name do
+            searchable true
+          end
 
           Enjoy::RailsAdminGroupPatch::enjoy_cms_group(self, fields)
 

data/lib/enjoy/admin/news.rb

@@ -8,11 +8,16 @@ module Enjoy
             scopes [:by_date, :enabled, nil]
           end
 
-          field :enabled, :toggle
+          field :enabled, :toggle do
+            searchable false
+          end
           field :time do
+            searchable false
             sort_reverse true
           end
-          field :name
+          field :name do
+            searchable true
+          end
           field :connected_pages, :enjoy_connectable
           unless Enjoy.config.news_image_styles.nil?
             field :image, :jcrop do
@@ -21,13 +26,16 @@ module Enjoy
           end
           group :content do
             active false
-            field :excerpt, :enjoy_html
+            field :excerpt, :enjoy_html do
+              searchable true
+            end
             # field :excerpt_html, :ck_editor
             # field :excerpt_clear, :toggle
           end
           group :URL do
             active false
             field :slugs, :enum do
+              searchable true
               enum_method do
                 :slugs
               end
@@ -38,7 +46,9 @@ module Enjoy
                 true
               end
             end
-            field :text_slug
+            field :text_slug do
+              searchable true
+            end
           end
 
           list do

data/lib/enjoy/admin/page.rb

@@ -7,17 +7,30 @@ module Enjoy
           list do
             scopes [:sorted, :enabled, nil]
 
-            field :enabled,  :toggle
-            field :menus, :menu
-            field :name
-            field :connectable
+            field :enabled, :toggle do
+              searchable false
+            end
+            field :menus, :menu do
+              searchable :name
+            end
+            field :name do
+              searchable true
+            end
+            field :connectable do
+              searchable :name
+            end
             field :fullpath do
+              searchable true
               pretty_value do
                 bindings[:view].content_tag(:a, bindings[:object].fullpath, href: bindings[:object].fullpath)
               end
             end
-            field :redirect
-            field :slug
+            field :redirect do
+              searchable true
+            end
+            field :slug do
+              searchable true
+            end
           end
 
           edit do

data/lib/enjoy/admin/page_block.rb

@@ -5,12 +5,22 @@ module Enjoy
         Proc.new {
           # navigation_label 'CMS'
 
-          field :enabled, :toggle
-          field :partial, :toggle
-          field :name
-          field :file_path, :string
+          field :enabled, :toggle do
+            searchable false
+          end
+          field :partial, :toggle do
+            searchable false
+          end
+          field :name do
+            searchable true
+          end
+          field :file_path, :string do
+            searchable true
+          end
 
-          field :content, :enjoy_html
+          field :content, :enjoy_html do
+            searchable true
+          end
           # field :content_html, :ck_editor
           # field :content_clear, :toggle
 

data/lib/enjoy/admin/page_blockset.rb

@@ -5,11 +5,19 @@ module Enjoy
         Proc.new {
           # navigation_label 'CMS'
 
-          field :enabled, :toggle
-          field :text_slug
-          field :name
+          field :enabled, :toggle do
+            searchable false
+          end
+          field :text_slug do
+            searchable true
+          end
+          field :name do
+            searchable true
+          end
 
-          field :blocks
+          field :blocks do
+            searchable :name
+          end
 
           Enjoy::RailsAdminGroupPatch::enjoy_cms_group(self, fields)
 

data/lib/enjoy/admin/seo.rb

@@ -7,13 +7,23 @@ module Enjoy
           field :seoable do
             read_only true
           end
-          field :h1, :string
-          field :title, :string
-          field :keywords, :text
-          field :description, :text
+          field :h1, :string do
+            searchable true
+          end
+          field :title, :string do
+            searchable true
+          end
+          field :keywords, :text do
+            searchable true
+          end
+          field :description, :text do
+            searchable true
+          end
           field :robots, :string
 
-          field :og_title, :string
+          field :og_title, :string do
+            searchable true
+          end
 
           field :og_image, :jcrop do
             jcrop_options :og_image_jcrop_options

data/lib/enjoy/configuration.rb

@@ -16,6 +16,7 @@ module Enjoy
     attr_accessor :news_excerpt
     attr_accessor :news_content_required
 
+    attr_accessor :main_index_layout
     attr_accessor :error_layout
     attr_accessor :menu_max_depth
 
@@ -41,6 +42,7 @@ module Enjoy
       @news_excerpt = 12
       @news_content_required = true
 
+      @main_index_layout = 'application'
       @error_layout = 'application'
       @menu_max_depth = 2
 

data/lib/enjoy/models/page.rb

@@ -21,6 +21,12 @@ module Enjoy
         before_validation do
           self.fullpath = "/pages/#{slug}" if self.fullpath.blank?
         end
+
+        before_save do
+          self.connectable_id = nil   if self.connectable_type.nil?
+          self.connectable_type = nil if self.connectable_id.nil?
+          self
+        end
       end
 
       def page_h1
@@ -62,7 +68,7 @@ module Enjoy
       end
 
       def regexp_prefix
-        ""
+        Enjoy.config.localize ? "(?:#{I18n.available_locales.map { |l| "\\/#{l}"}.join("|")})?" : ""
       end
 
       def clean_regexp

data/lib/enjoy/rails_admin_ext/enjoy_hash.rb

@@ -1,4 +1,5 @@
 require 'rails_admin/config/fields/types/text'
+require 'json'
 
 module RailsAdmin
   module Config
@@ -20,6 +21,18 @@ module RailsAdmin
           register_instance_option :partial do
             :enjoy_hash
           end
+
+          register_instance_option :formatted_value do
+            begin
+              JSON.pretty_generate(JSON.parse(bindings[:object].send string_method))
+            rescue
+              bindings[:object].send string_method
+            end
+          end
+
+          register_instance_option :pretty_value do
+            ("<pre>" + JSON.pretty_generate(value) + "</pre>").html_safe
+          end
         end
       end
     end

data/lib/enjoy/version.rb

@@ -1,3 +1,3 @@
 module Enjoy
-  VERSION = "0.3.6.2"
+  VERSION = "0.3.7"
 end

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

@@ -8,6 +8,7 @@ Enjoy.configure do |config|
   # config.news_excerpt = 12
   # config.news_content_required = true
   #
+  # config.main_index_layout = 'application'
   # config.error_layout = 'application'
   # config.menu_max_depth = 2
   #
@@ -23,5 +24,4 @@ Enjoy.configure do |config|
   # config.recreate_contact_message_action = "new"
   #
   # config.localize = false
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms
 version: !ruby/object:Gem::Version
-  version: 0.3.6.2
+  version: 0.3.7
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -154,16 +154,16 @@ dependencies:
   name: rails_admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: rails_admin_nested_set
   requirement: !ruby/object:Gem::Requirement