enjoy_cms 0.3.0.4 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ae5da74a58d1eb3e17743f4c15776d9d7c4aff2
-  data.tar.gz: 38dd9e7610598eea2e5db3a8ca6123a8916fc5d2
+  metadata.gz: a1d161c901fcad77111f3812b158201ac4a9f1e1
+  data.tar.gz: 3c94d129878ee36a5c0ab63d2bfe96b4bef846d0
 SHA512:
-  metadata.gz: a419713fdc0e06afb71897a2913160fad87572d66f50111c2da4916121d977fbeb9b98088a849cef0142cbadb1114e114e451e04aff1815763eb1aa56d3eb9b7
-  data.tar.gz: b77afda381a54a93dbdd2158b5744bf49f61c9c16c58539cf6660e0e8b19b1183caebb3fbd2c95eddde8da69ef5245b3344e3e96eb3124d52e6a2705bb02e747
+  metadata.gz: b7269789b50e12233a1958fe60e84f9b199e75db62ade20ba653672be54583484cce0c098c4cb11cd21f260da642424d61722a335d1eadd758072944f73f85b6
+  data.tar.gz: 01e548a6a35a178cac39af26a8d6c8e07d51c639cc07c7549f5311fb78de2d34b8d6afdd49f667f60ab18fece0e61603f9c16b3a86408d35dae55cf092458187

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enjoy_cms (0.3.0.4)
+    enjoy_cms (0.3.1)
       ack_rails_admin_jcrop
       addressable
       ckeditor
@@ -76,7 +76,7 @@ GEM
     addressable (2.4.0)
     arel (6.0.3)
     bcrypt (3.1.10)
-    bson (4.0.2)
+    bson (4.0.3)
     builder (3.2.2)
     ckeditor (4.1.6)
       cocaine
@@ -92,7 +92,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
-    concurrent-ruby (1.0.0)
+    concurrent-ruby (1.0.1)
     devise (3.5.6)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -247,7 +247,7 @@ GEM
     sprockets (3.5.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.1)
+    sprockets-rails (3.0.3)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)

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

@@ -0,0 +1,37 @@
+module Enjoy::Blocksetable
+  extend ActiveSupport::Concern
+  included do
+    helper_method :render_blockset
+  end
+
+  private
+  def render_blockset(view, type)
+    ret = []
+    begin
+      blocks = blockset_get_blocks(type)
+      blocks.each do |block|
+        ret << block.render_or_content_html(view)
+      end
+    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)
+      # ret << blocks || []
+    end
+    ret.join.html_safe
+  end
+
+  def blockset_get_blocks(type)
+    blockset = blockset_class.find(type.to_s)
+    blockset.blocks.enabled.sorted.to_a if blockset
+  end
+
+  def blockset_class_name
+    "Enjoy::PageBlockset"
+  end
+  def blockset_class
+    blockset_class_name.constantize
+  end
+end

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

@@ -6,7 +6,7 @@ if Enjoy.mongoid?
       def enjoy_cms_html_field(name, opts = {})
         clear_by_default = opts.delete(:clear_by_default)
         clear_by_default = false unless clear_by_default == true
-        
+
         field "#{name}_html", opts
         field "#{name}_clear", type: Boolean, default: clear_by_default
 

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

@@ -37,6 +37,7 @@ if Enjoy.mongoid?
             true
           end
         EVAL
+        jcrop_options ||= {}
         if jcrop_options
           class_eval <<-EVAL
             def #{name}_jcrop_options

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

@@ -6,8 +6,10 @@ ruby:
       customConfig: field.config_js ? field.config_js : field.base_location + "config.js"
     }
   }
-= form.text_area "#{field.method_name}_html", field.html_attributes.reverse_merge(data: { richtext: 'ckeditor', options: js_data.to_json }).reverse_merge({ value: field.form_value[:html] })
+  _html_attributes = field.html_attributes.reverse_merge(data: { richtext: 'ckeditor', options: js_data.to_json, value: field.form_value[:html] })
+= form.text_area field.html_method, _html_attributes
 
 label{style='display: block;'}
-  span{style='float: left'}= form.send field.boolean_view_helper, "#{field.method_name}_clear", field.html_attributes.reverse_merge({ value: field.form_value[:clear], checked: field.form_value[:clear].in?([true, '1']), required: field.required, class: "form-control"})
+  - _html_attributes = field.html_attributes.reverse_merge({ value: field.form_value[:clear], checked: field.form_value[:clear].in?([true, '1']), required: false, class: "form-control"})
+  span{style='float: left'}= form.send field.boolean_view_helper, field.clear_method, _html_attributes
   div{style='margin-left: 35px; line-height: 40px;'} Убирать теги

data/enjoy_cms.gemspec

@@ -51,7 +51,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor'
   spec.add_dependency 'smart_excerpt'
 
-
   spec.add_dependency 'rails_admin_sort_embedded'
   spec.add_dependency 'image_optim'
   spec.add_dependency 'image_optim_pack'

data/lib/enjoy/admin/news.rb

@@ -19,6 +19,8 @@ module Enjoy
             end
           end
           field :excerpt, :enjoy_html
+          # field :excerpt_html, :ck_editor
+          # field :excerpt_clear, :toggle
           field :slugs, :enum do
             enum_method do
               :slugs
@@ -38,6 +40,8 @@ module Enjoy
 
           edit do
             field :content, :enjoy_html
+            # field :content_html, :ck_editor
+            # field :content_clear, :toggle
             fields.each_pair do |name, type|
               if type.nil?
                 field name

data/lib/enjoy/admin/page.rb

@@ -22,7 +22,11 @@ module Enjoy
           edit do
             field :name
             field :excerpt, :enjoy_html
+            # field :excerpt_html, :ck_editor
+            # field :excerpt_clear, :toggle
             field :content, :enjoy_html
+            # field :content_html, :ck_editor
+            # field :content_clear, :toggle
 
             group :menu do
               label I18n.t('enjoy.menu')

data/lib/enjoy/admin/page_block.rb

@@ -6,8 +6,13 @@ module Enjoy
           # navigation_label 'CMS'
 
           field :enabled, :toggle
+          field :partial, :toggle
           field :name
+          field :file_path, :string
+
           field :content, :enjoy_html
+          # field :content_html, :ck_editor
+          # field :content_clear, :toggle
 
           fields.each_pair do |name, type|
             if type.nil?

data/lib/enjoy/admin/page_blockset.rb

@@ -6,9 +6,9 @@ module Enjoy
           # navigation_label 'CMS'
 
           field :enabled, :toggle
+          field :text_slug
           field :name
 
-
           field :blocks
 
           fields.each_pair do |name, type|
@@ -36,6 +36,12 @@ module Enjoy
           #   end
           # end
 
+          sort_embedded(
+              {
+                  fields: [:blocks]
+              }
+          )
+
           if block_given?
             yield self
           end

data/lib/enjoy/controller.rb

@@ -5,6 +5,7 @@ module Enjoy::Controller
     include Enjoy::SeoPages
     include Enjoy::NavMenu
     include Enjoy::Fancybox
+    include Enjoy::Blocksetable
     protect_from_forgery with: :exception
     helper_method :page_title
     helper_method :hide_ym_ga

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

@@ -4,6 +4,9 @@ module Enjoy
       module ContactMessage
         extend ActiveSupport::Concern
         included do
+          if defined?(RailsAdminComments)
+            include RailsAdminComments::Commentable
+          end
 
           field :name, type: String
           field :email, type: String

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

@@ -6,6 +6,10 @@ module Enjoy
         include Enjoy::MongoidPaperclip
 
         included do
+          if defined?(RailsAdminComments)
+            include RailsAdminComments::Commentable
+          end
+
 
           manual_slug :name
 

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

@@ -6,6 +6,10 @@ module Enjoy
         include Enjoy::MongoidPaperclip
 
         included do
+          if defined?(RailsAdminComments)
+            include RailsAdminComments::Commentable
+          end
+
 
           acts_as_nested_set
           scope :sorted, -> { order_by([:lft, :asc]) }

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

@@ -5,6 +5,10 @@ module Enjoy
         extend ActiveSupport::Concern
 
         included do
+          if defined?(RailsAdminComments)
+            include RailsAdminComments::Commentable
+          end
+
           has_and_belongs_to_many :pages, inverse_of: :menus, class_name: "Enjoy::Page"
           alias_method :items, :pages
 

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

@@ -10,6 +10,10 @@ module Enjoy
         include Enjoy::HtmlField
 
         included do
+          if defined?(RailsAdminComments)
+            include RailsAdminComments::Commentable
+          end
+
           field :name, type: String, localize: Enjoy.config.localize, default: ""
 
           field :time, type: Time

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

@@ -7,6 +7,10 @@ module Enjoy
         include Enjoy::HtmlField
 
         included do
+          if defined?(RailsAdminComments)
+            include RailsAdminComments::Commentable
+          end
+
           field :name, type: String, localize: Enjoy.config.localize, default: ""
 
           field :regexp, type: String, default: ""

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

@@ -7,10 +7,49 @@ module Enjoy
         include Enjoy::HtmlField
 
         included do
-          has_and_belongs_to_many :blocksets, inverse_of: :blocks, class_name: "Enjoy::PageBlockset"
+          field :file_path, type: String, localize: Enjoy.config.localize, default: ""
+          field :partial, type: Boolean, default: true
+          embedded_in :blockset, inverse_of: :blocks, class_name: "Enjoy::PageBlockset"
 
           enjoy_cms_html_field :content, type: String, localize: Enjoy.config.localize, default: ""
         end
+
+        def file_pathname_as_partial
+          self.file_pathname.dirname.join("_#{self.file_pathname.basename}")
+        end
+
+        def file_pathname_for_fs
+          self.partial ? self.file_path_as_partial : self.file_pathname
+        end
+
+        def render_or_content_html(view, opts = {})
+          unless self.file_path.blank?
+            opts.merge!(partial: self.file_path)
+            view.render(opts) rescue self.content_html.html_safe
+          else
+            self.content_html.html_safe
+          end
+        end
+
+        def render_or_content(view, opts = {})
+          unless self.file_path.blank?
+            opts.merge!(partial: self.file_path)
+            view.render(opts) rescue self.content
+          else
+            self.content
+          end
+        end
+
+        def file_fullpath(with_ext = false, ext = ".html.slim")
+          ret = nil
+          unless self.file_path.blank?
+            res_filename = self.file_pathname_for_fs.to_s
+            res_filename += ext if with_ext
+            ret = Rails.root.join("views", res_filename)
+          end
+          return ret
+        end
+
       end
     end
   end

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

@@ -5,12 +5,14 @@ module Enjoy
         extend ActiveSupport::Concern
 
         included do
-          field :name, type: String, default: ""
+          if defined?(RailsAdminComments)
+            include RailsAdminComments::Commentable
+          end
 
-          has_and_belongs_to_many :blocks, inverse_of: :blocksets, class_name: "Enjoy::PageBlock"
+          field :name, type: String, default: ""
 
-          scope :sorted, -> { order_by([:lft, :asc]) }
-          scope :blockset, ->(block_id) { enabled.sorted.where(block_ids: block_id) }
+          embeds_many :blocks, inverse_of: :blockset, class_name: "Enjoy::PageBlock"
+          accepts_nested_attributes_for :blocks
         end
       end
     end

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

@@ -6,6 +6,10 @@ module Enjoy
         include Enjoy::MongoidPaperclip
         included do
 
+          if defined?(RailsAdminComments)
+            include RailsAdminComments::Commentable
+          end
+
           field :name, type: String, localize: Enjoy.config.localize
           field :h1, type: String, localize: Enjoy.config.localize
 
@@ -28,7 +32,7 @@ module Enjoy
         def og_image_convert_options
           {}
         end
-        
+
       end
     end
   end

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

@@ -3,8 +3,13 @@ module Enjoy
     module Mongoid
       module SitemapData
         extend ActiveSupport::Concern
-        
+
         included do
+
+          if defined?(RailsAdminComments)
+            include RailsAdminComments::Commentable
+          end
+
           field :sitemap_show,        type: Boolean, default: true
           field :sitemap_lastmod,     type: DateTime
           field :sitemap_changefreq,  type: String,   default: 'daily'

data/lib/enjoy/models/news.rb

@@ -22,7 +22,7 @@ module Enjoy
 
         validates_presence_of :name
         if Enjoy.config.news_content_required
-          validates_presence_of :content
+          validates_presence_of :content_html
         end
 
         before_validation do

data/lib/enjoy/models/page_block.rb

@@ -6,6 +6,16 @@ module Enjoy
       include Enjoy.orm_specific('PageBlock')
 
       included do
+        validates :file_path, format: {
+          # with: /\A(?!layouts\/).*\Z/,
+          without: /\Alayouts\/.*\Z/,
+          message: "Недопустимый путь к файлу"
+        }
+
+        attr_accessor :file_pathname
+        after_initialize do
+          self.file_pathname = Pathname.new(file_path) unless file_path.nil?
+        end
       end
     end
   end

data/lib/enjoy/models/page_blockset.rb

@@ -4,11 +4,21 @@ module Enjoy
       extend ActiveSupport::Concern
       include Enjoy::Model
       include Enjoy::Enableable
+      include ManualSlug
 
       include Enjoy.orm_specific('PageBlockset')
 
       included do
+        manual_slug :name
+
+        # after_save do
+        #   Rails.cache.delete 'blocksets'
+        # end
+        # after_destroy do
+        #   Rails.cache.delete 'blocksets'
+        # end
       end
+
     end
   end
 end

data/lib/enjoy/rails_admin_enjoy_html.rb

@@ -7,17 +7,26 @@ module RailsAdmin
           RailsAdmin::Config::Fields::Types::register(self)
           include RailsAdmin::Engine.routes.url_helpers
 
+          register_instance_option :html_method do
+            "#{name}_html"
+          end
+
+          register_instance_option :clear_method do
+            "#{name}_clear"
+          end
+
           register_instance_option :pretty_value do
-            bindings[:object].send(name + "_html")
+            bindings[:object].send(html_method)
           end
 
           register_instance_option :form_value do
             {
-              html: bindings[:object].send("#{name}_html"),
-              clear: bindings[:object].send("#{name}_clear")
+              html: bindings[:object].send(html_method),
+              clear: bindings[:object].send(clear_method)
             }
           end
 
+
           register_instance_option :formatted_value do
             pretty_value
           end
@@ -25,11 +34,16 @@ module RailsAdmin
           register_instance_option :export_value do
             pretty_value
           end
+          
 
           register_instance_option :boolean_view_helper do
             :check_box
           end
 
+          register_instance_option :allowed_methods do
+            [html_method, clear_method]
+          end
+
           register_instance_option :partial do
             :enjoy_html
           end

data/lib/enjoy/version.rb

@@ -1,3 +1,3 @@
 module Enjoy
-  VERSION = "0.3.0.4"
+  VERSION = "0.3.1"
 end

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

@@ -39,7 +39,8 @@ class Ability
   def manager_models
     [
       Enjoy::Page, Enjoy::News,
-      Enjoy::Seo, Enjoy::SitemapData
+      Enjoy::Seo, Enjoy::SitemapData,
+      RailsAdminSettings::Settings
     ]
   end
 end

data/template.rb

@@ -22,7 +22,7 @@ gem 'sass-rails'
 gem 'compass-rails'
 gem 'compass'
 
-#{if mongoid then "gem 'enjoy_cms_mongoid'" else "gem 'enjoy_cms_activerecord'" end}, '~> 0.3.0'
+#{if mongoid then "gem 'enjoy_cms_mongoid'" else "gem 'enjoy_cms_activerecord'" end}, '~> 0.3.1'
 
 gem 'devise'
 
@@ -74,7 +74,6 @@ end
 gem 'slim'
 gem 'sprockets'
 
-
 gem 'sitemap_generator'
 gem 'rails_admin_sitemap'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms
 version: !ruby/object:Gem::Version
-  version: 0.3.0.4
+  version: 0.3.1
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -455,6 +455,7 @@ files:
 - app/assets/stylesheets/enjoy_cms/flash.sass
 - app/assets/stylesheets/enjoy_cms/normalize.scss
 - app/assets/stylesheets/enjoy_cms/powered.sass
+- app/controllers/concerns/enjoy/blocksetable.rb
 - app/controllers/concerns/enjoy/decorators/contacts.rb
 - app/controllers/concerns/enjoy/decorators/home.rb
 - app/controllers/concerns/enjoy/decorators/news.rb