hancock_cms_pages 1.0.0 → 1.0.2

data/lib/hancock/pages/rails_admin_ext/hancock_connectable.rb

@@ -5,6 +5,7 @@ module RailsAdmin
     module Fields
       module Types
         class HancockConnectable < RailsAdmin::Config::Fields::Types::HasManyAssociation
+
           RailsAdmin::Config::Fields::Types::register(self)
           include RailsAdmin::Engine.routes.url_helpers
 
@@ -26,6 +27,7 @@ module RailsAdmin
               scope.unconnected(me).enabled.sorted
             end
           end
+
         end
       end
     end

data/lib/hancock/pages/rails_admin_ext/menu.rb

@@ -12,15 +12,19 @@ module RailsAdmin
           register_instance_option :pretty_value do
             obj = bindings[:object]
             ret = []
-            menus = Rails.cache.fetch 'menus' do
-              if Hancock.mongoid?
+            cache_opts = {}
+            unless ::Hancock::Pages.config.cache_support
+              cache_opts = {expires_in: 10.minutes}
+            end
+            menus = Rails.cache.fetch 'menus', cache_opts do
+              if ::Hancock.mongoid?
                 ::Hancock::Pages::Menu.all.map { |m| {id: m.id.to_s, name: m.name } }
               else
                 ::Hancock::Pages::Menu.all.map { |m| {id: m.id, name: m.name } }
               end
             end
             menus.each do |m|
-              if Hancock.mongoid?
+              if ::Hancock.mongoid?
                 on = obj.menu_ids.include?(BSON::ObjectId.from_string(m[:id]))
               else
                 on = obj.menu_ids.include?(m[:id].to_i)
@@ -109,28 +113,28 @@ module RailsAdmin
                   end
                 else
                   if params['ajax'].present?
-                    render text: @object.errors.full_messages.join(', '), layout: false, status: 422
+                    render plain: @object.errors.full_messages.join(', '), layout: false, status: 422
                   else
                     flash[:error] = @object.errors.full_messages.join(', ')
                   end
                 end
               rescue Exception => e
                 if params['ajax'].present?
-                  render text: I18n.t('hancock.menu.error', err: e.to_s), status: 422
+                  render plain: I18n.t('hancock.menu.error', err: e.to_s), status: 422
                 else
                   flash[:error] = I18n.t('hancock.menu.error', err: e.to_s)
                 end
               end
             else
               if params['ajax'].present?
-                render text: I18n.t('hancock.menu.no_id'), status: 422
+                render plain: I18n.t('hancock.menu.no_id'), status: 422
               else
                 flash[:error] = I18n.t('hancock.menu.no_id')
               end
 
             end
 
-            redirect_to :back unless params['ajax'].present?
+            redirect_back(fallback_location: dashboard_path) unless params['ajax'].present?
           end
         end
 

data/lib/hancock/pages/version.rb

@@ -1,5 +1,5 @@
 module Hancock
   module Pages
-    VERSION = "1.0.0".freeze
+    VERSION = "1.0.2".freeze
   end
 end

data/lib/hancock/pages/views_whitelist.rb

@@ -0,0 +1,103 @@
+module Hancock::Pages::ViewsWhitelist
+
+  def self.included(base)
+
+    class << base
+      def whitelist
+        Settings.hancock_pages_blocks_whitelist
+      end
+      def whitelist_obj
+        Settings.getnc(:hancock_pages_blocks_whitelist)
+      end
+      def whitelist_as_array(exclude_blacklist = false)
+        _list = whitelist.lines.map(&:strip).uniq
+        (exclude_blacklist ? (_list - blacklist_as_array) : _list)
+      end
+      def can_render_in_block?(path)
+        whitelist_as_array(true).include?(path)
+      end
+
+      def blacklist
+        Settings.ns('admin').hancock_pages_blocks_blacklist
+      end
+      def blacklist_obj
+        Settings.ns('admin').getnc(:hancock_pages_blocks_blacklist)
+      end
+      def blacklist_as_array
+        blacklist.lines.map(&:strip).uniq
+      end
+
+      def whitelist_human_names
+        Settings.hancock_pages_blocks_human_names
+      end
+      def whitelist_human_names_obj
+        Settings.getnc(:hancock_pages_blocks_human_names)
+      end
+
+      def format_virtual_path(virtual_path, is_partial = nil)
+        if virtual_path.is_a?(Hash)
+          virtual_path, is_partial = virtual_path[:virtual_path], virtual_path[:is_partial]
+        end
+        _virtual_path = virtual_path.clone
+        path_parts = _virtual_path.split("/")
+        is_partial = path_parts.last[0] == "_" if is_partial.nil?
+        if is_partial
+          fname = path_parts.pop
+          _virtual_path = (path_parts << fname[1..-1]).join("/")
+        end
+        _virtual_path
+      end
+
+
+      def whitelist_enum
+        # whitelist_as_array.map do |f|
+        (whitelist_as_array - blacklist_as_array).uniq.map do |f|
+          whitelist_human_names[f] ? ["#{whitelist_human_names[f]} (#{f})", f] : f
+        end
+      end
+
+
+      def add_view_in_whitelist(path = "", name = "")
+        if path.is_a?(Hash)
+          path, name = path[:path], path[:name]
+        end
+        return nil if path.blank?
+        path.strip!
+        current_whitelist_array = whitelist_as_array
+        ret = true
+        unless current_whitelist_array.include?(path)
+          ret = false
+          current_whitelist_array << path
+          whitelist_obj.update(raw: current_whitelist_array.join("\n"))
+        end
+        unless name.blank?
+          current_whitelist_human_names = whitelist_human_names
+          unless current_whitelist_human_names.keys.include?(path)
+            current_whitelist_human_names[path] = name
+            whitelist_human_names_obj.update(raw: current_whitelist_human_names.to_yaml)
+          end
+        end
+        return ret
+      end
+
+      def add_view_in_blacklist(path)
+        if path.is_a?(Hash)
+          path = path[:path]
+        end
+        return nil if path.blank?
+        path.strip!
+        current_blacklist_array = blacklist_as_array
+        ret = true
+        if current_blacklist_array.include?(path)
+          ret = false
+          current_blacklist_array << path
+          blacklist_obj.update(raw: current_blacklist_array.join("\n"))
+        end
+        return ret
+      end
+
+    end
+
+  end
+
+end

data/lib/hancock_cms_pages.rb

@@ -1,13 +1,9 @@
-# unless defined?(Hancock) && Hancock.respond_to?(:orm) && [:active_record, :mongoid].include?(Hancock.orm)
-#   puts "please use hancock_cms_mongoid or hancock_cms_activerecord"
-#   puts "also: please use hancock_cms_news_mongoid or hancock_cms_news_activerecord and not hancock_cms_news directly"
-#   exit 1
-# end
-
 require "hancock/pages/version"
 require 'hancock/pages/engine'
 require 'hancock/pages/configuration'
 
+require "hancock/pages/views_whitelist"
+
 require "hancock/pages/routes"
 
 require 'hancock/pages/rails_admin_ext/hancock_connectable'
@@ -18,6 +14,8 @@ require 'simple-navigation'
 module Hancock::Pages
   include Hancock::Plugin
 
+  include Hancock::Pages::ViewsWhitelist
+
   autoload :Admin, 'hancock/pages/admin'
   module Admin
     autoload :Page, 'hancock/pages/admin/page'

data/release.sh

@@ -2,5 +2,5 @@
 bundle update
 git add --all .
 git commit -am "${*:1}"
-git push -u origin origin master
+git push -u origin master
 rake release

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hancock_cms_pages
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,20 +44,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<="
+        version: 1.0.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<="
+        version: 1.0.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.1.x
 - !ruby/object:Gem::Dependency
   name: simple-navigation
   requirement: !ruby/object:Gem::Requirement
@@ -72,7 +72,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 'hancock_cms_pages '
+description: hancock_cms_pages
 email:
 - dev@redrocks.pro
 executables: []
@@ -97,8 +97,9 @@ files:
 - app/controllers/concerns/hancock/pages/nav_menu.rb
 - app/controllers/concerns/hancock/pages/seo_pages.rb
 - app/controllers/hancock/pages/pages_controller.rb
+- app/helpers/hancock/pages/blocksets_helper.rb
 - app/helpers/hancock/pages/canonical_helper.rb
-- app/helpers/hancock/pages/pages_helpers.rb
+- app/helpers/hancock/pages/pages_helper.rb
 - app/models/concerns/hancock/pages/canonicalable.rb
 - app/models/concerns/hancock/pages/connectable.rb
 - app/models/concerns/hancock/pages/decorators/block.rb
@@ -109,6 +110,8 @@ files:
 - app/models/hancock/pages/blockset.rb
 - app/models/hancock/pages/menu.rb
 - app/models/hancock/pages/page.rb
+- app/views/blocks/_cached_blockset_navigation.html.slim
+- app/views/blocks/_cached_navigation.html.slim
 - app/views/blocks/_header.html.slim
 - app/views/hancock/pages/pages/show.html.slim
 - app/views/rails_admin/main/_hancock_connectable.html.slim
@@ -118,9 +121,12 @@ files:
 - config/initializers/hancock_pages.rb
 - config/locales/hancock.pages.ru.yml
 - hancock_cms_pages.gemspec
-- lib/generators/hancock/pages/config/install_generator.rb
+- lib/generators/hancock/pages/config/config_generator.rb
 - lib/generators/hancock/pages/config/templates/hancock_pages.erb
-- lib/generators/hancock/pages/migration_generator.rb
+- lib/generators/hancock/pages/controllers/decorators_generator.rb
+- lib/generators/hancock/pages/migrations/migrations_generator.rb
+- lib/generators/hancock/pages/migrations/templates/migration_blocks.rb
+- lib/generators/hancock/pages/migrations/templates/migration_pages.rb
 - lib/generators/hancock/pages/models/block_generator.rb
 - lib/generators/hancock/pages/models/blockset_generator.rb
 - lib/generators/hancock/pages/models/decorators_generator.rb
@@ -130,8 +136,6 @@ files:
 - lib/generators/hancock/pages/models/templates/blockset.erb
 - lib/generators/hancock/pages/models/templates/menu.erb
 - lib/generators/hancock/pages/models/templates/page.erb
-- lib/generators/hancock/pages/templates/migration_blocks.rb
-- lib/generators/hancock/pages/templates/migration_pages.rb
 - lib/hancock/pages/admin.rb
 - lib/hancock/pages/admin/block.rb
 - lib/hancock/pages/admin/blockset.rb
@@ -156,6 +160,7 @@ files:
 - lib/hancock/pages/rails_admin_ext/menu.rb
 - lib/hancock/pages/routes.rb
 - lib/hancock/pages/version.rb
+- lib/hancock/pages/views_whitelist.rb
 - lib/hancock_cms_pages.rb
 - release.sh
 homepage: https://github.com/red-rocks/hancock_cms_pages

data/app/helpers/hancock/pages/pages_helpers.rb

@@ -1,2 +0,0 @@
-module Hancock::Pages::PagesHelper
-end