hancock_cms 1.0.0.4 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c73c9919e423af71ff0ea336d745c1cf035c5bac
-  data.tar.gz: 438396bab11dc25461ac958065000a3b40f1c971
+  metadata.gz: 19baf49e53520cfd21f5fa52f69780c6177548d5
+  data.tar.gz: c0deb75181d16ba64cb694bdcff052ebe4d78f87
 SHA512:
-  metadata.gz: 5dc52a2fb69be182e8035d79380f51a1d7b2e0570aad51d446d0ba3a240840fff6bf84cdbe6d7bcbe90fa21b3d3084e35ef39df9d2ef76543043fde2a9ec695d
-  data.tar.gz: 56ee7a7d603e9009310b58baca2cac4da51ad1810c4280308f5dd9519f9f87ea8c3349e389d2d884213e29d1c094951311205b2a7f1728e044b63fcee4e4c4f4
+  metadata.gz: 434e073c7e5b703a15fbf259d1801d4eba911c3e026f997f2294e7ccd91aa49db9dd8676eed601038806e5ea191fd4ca127fed3eb9317db41db7a5add0d9deb2
+  data.tar.gz: 39105092e18dad6dd92ebfdb4e2f073d0b388d5c09dda03a0d1bc9b2d3544792cc87730217827115e1c0672af6107c27fa07eb146d004b9b9358fe2fd5234a95

data/app/assets/javascripts/hancock/rails_admin/cms.ui.coffee

@@ -8,7 +8,7 @@ window.hancock_cms.multiselect_dblclick = (selector)->
   $(document).delegate selector + ' .ra-multiselect-right select option', 'dblclick', (e)->
     $(e.currentTarget).closest('.ra-multiselect').find('.ra-multiselect-center .ra-multiselect-item-remove').click()
 
-window.hancock_cms.multiselect_dblclick("select.hancock_multiselect + .ra-multiselect")
+window.hancock_cms.multiselect_dblclick("select.hancock_multiselect + .ra-multiselect, select.hancock_enum + .ra-multiselect")
 
 
 $(document).delegate '.toolbar .nav .dropdown-header', 'click', (e)->
@@ -40,4 +40,4 @@ $(window).on 'load', ->
   mscroll()
 
 $(document).bind "page:load", ->
-  mscroll()
+  mscroll()

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

@@ -0,0 +1,18 @@
+- unless field.multiple?
+  = form.select field.method_name, field.enum, { include_blank: true }.reverse_merge({ selected: field.form_value }), field.html_attributes.reverse_merge({ data: { enumeration: true }, placeholder: t('admin.misc.search'), class: 'hancock_enum'})
+- else
+  ruby:
+    js_data = {
+      xhr: false,
+      sortable: false,
+      cacheAll: true,
+      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")
+      }
+    }
+  = form.select field.method_name, field.enum, { selected: field.form_value, object: form.object }, field.html_attributes.reverse_merge({data: { filteringmultiselect: true, options: js_data.to_json }, multiple: true, class: 'hancock_enum'})

data/app/views/shared/_admin_link.html.slim

@@ -1,3 +1,4 @@
 - if user_signed_in? && respond_to?(:can?) && can?(:access, :rails_admin) && can?(:edit, obj)
-  .admin_link
-    = link_to t('hancock.edit'), rails_admin.edit_path(obj.class.model_name.i18n_key.to_s.gsub('/', '~'), obj.id), 'data-no-turbolink' => true
+  - cache [current_user, obj] do
+    .admin_link
+      = link_to t('hancock.edit'), rails_admin.edit_path(obj.class.model_name.i18n_key.to_s.gsub('/', '~'), obj.id), 'data-no-turbolink' => true

data/config/locales/ru.hancock.yml

@@ -2,17 +2,15 @@ ru:
   hancock:
     url: URL
     content: "Контент"
-    cache: Кеширование
-    gallery: "Галерея"
     cms: "CMS"
-    menu: "Меню"
+    # menu: "Меню"
     settings: 'Настройки'
     with_final_slash: "c начальным слешем"
     page_url_regex: "Регулярное выражение, по которому определяется является ли этот пункт активным"
     final_in_menu: "В меню сразу отдается конечная ссылка"
     map: 'Карта'
-    sitemap: 'Карта сайта'
-    sitemap_data: 'Данные для карты сайта'
+    # sitemap: 'Карта сайта'
+    # sitemap_data: 'Данные для карты сайта'
     edit: Редактировать
     send: Отправить
     format_time: "%d.%m.%Y"

data/hancock_cms.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rails_admin_nested_set'
   spec.add_dependency 'rails_admin_toggleable'
 
-  spec.add_dependency 'ack_rails_admin_settings', '~> 1.2'
+  spec.add_dependency 'ack_rails_admin_settings', '~> 1.2.1'
 
   spec.add_dependency 'kaminari'
 

data/lib/generators/hancock/cms/setup_generator.rb

@@ -177,7 +177,7 @@ inject_into_file 'app/models/user.rb', before: /^end/ do <<-TEXT
     self.roles.reject! { |r| r.blank? }
   end
 
-  AVAILABLE_ROLES = ["admin", "manager", "client"]
+  AVAILABLE_ROLES = ["admin", "manager", "client"].freeze
 
   AVAILABLE_ROLES.each do |r|
     class_eval <<-EVAL
@@ -252,9 +252,9 @@ inject_into_file 'app/models/user.rb', before: /^end/ do <<-TEXT
 
       group :roles do
         active false
-        field :roles, :enum do
+        field :roles, :hancock_enum do
           enum do
-            AVAILABLE_ROLES
+            ::User::AVAILABLE_ROLES
           end
 
           multiple do

data/lib/generators/hancock/cms/templates/model.erb

@@ -1,19 +1,19 @@
 class <%= camelcased_class_name %>
   include Hancock::Model
   # include Hancock::Enableable
-  # include Hancock::Cacheable
   # include ManualSlug
 
+  # include Hancock::Cache::Cacheable
+  # def self.default_cache_keys
+  #   []
+  # end
+
   # acts_as_nested_set
   # scope :sorted, -> { order_by([:lft, :asc]) }
 
   field :name
   # manual_slug :name
 
-  # def self.default_cache_keys
-  #   []
-  # end
-
   ############# rails_admin ##############
   #
   # def self.admin_can_user_defined_actions
@@ -36,7 +36,6 @@ class <%= camelcased_class_name %>
     # field :enabled, :toggle
     field :name
     # group :url, &Hancock::Admin.url_block
-    # group :cache, &Hancock::Admin.caching_block
   end
 
 end

data/lib/generators/hancock/cms/templates/scripts/server.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 
 PORT=3000
-echo 'server will by started at '$PORT
+echo 'server will be started at '$PORT
 rails s -b 0.0.0.0 -p $PORT -e development

data/lib/generators/hancock/cms/templates/scripts/server_alt.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 
 PORT=4000
-echo 'server will by started at '$PORT
+echo 'server will be started at '$PORT
 rails s -b 0.0.0.0 -p $PORT -e development

data/lib/hancock/admin.rb

@@ -20,19 +20,6 @@ module Hancock
       }
     end
 
-    def self.caching_block(is_active = false)
-      Proc.new {
-        active is_active
-        label I18n.t('hancock.cache')
-        field :perform_caching, :toggle
-        field :cache_keys_str, :text
-
-        if block_given?
-          yield self
-        end
-      }
-    end
-
     def self.url_block(is_active = false)
       Proc.new {
         active is_active

data/lib/hancock/controller.rb

@@ -3,7 +3,7 @@ module Hancock::Controller
   included do
     include Hancock::Errors
     include Hancock::Fancybox
-    if !!defined?(Hancock::Pages)
+    if defined?(Hancock::Pages)
       include Hancock::Pages::SeoPages
       include Hancock::Pages::NavMenu
       include Hancock::Pages::Blocksetable

data/lib/hancock/engine.rb

@@ -6,6 +6,10 @@ module Hancock
     #   require File.expand_path('../tasks', __FILE__)
     # end
 
+    initializer "RailsAdminSettingsPatch (CMS)" do
+      ::RailsAdminSettings::Setting.send(:include, Hancock::RailsAdminSettingsPatch)
+    end
+
     initializer "hancock_cms.email_defaults" do
       # Write default email settings to DB so they can be changed.
 

data/lib/hancock/model.rb

@@ -33,7 +33,7 @@ module Hancock
       include Hancock::BooleanField
       include Hancock::SortField
 
-      if Hancock.mongoid? and !!defined?(RailsAdminComments)
+      if Hancock.mongoid? and defined?(RailsAdminComments)
         include RailsAdminComments::Commentable
         include RailsAdminComments::ModelCommentable
       end

data/lib/hancock/rails_admin_ext/hancock_enum.rb

@@ -0,0 +1,23 @@
+require 'rails_admin/config/fields/types/enum'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class HancockEnum < RailsAdmin::Config::Fields::Types::Enum
+          # Register field type for the type loader
+          RailsAdmin::Config::Fields::Types.register(self)
+
+          register_instance_option :partial do
+            :form_hancock_enum
+          end
+
+          register_instance_option :help do
+            'Двойной клик перемещает между списками'
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/hancock/rails_admin_ext/hancock_slugs.rb

@@ -1,10 +1,10 @@
-require 'rails_admin/config/fields/types/enum'
+require 'hancock/rails_admin_ext/hancock_enum'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class HancockSlugs < RailsAdmin::Config::Fields::Types::Enum
+        class HancockSlugs < RailsAdmin::Config::Fields::Types::HancockEnum
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types::register(self)
 

data/lib/hancock/rails_admin_settings_patch.rb

@@ -0,0 +1,32 @@
+module Hancock
+  module RailsAdminSettingsPatch
+    extend ActiveSupport::Concern
+
+    included do
+      include Hancock::RailsAdminPatch
+
+      def self.manager_can_default_actions
+        [:show, :read, :edit, :update]
+      end
+      def self.manager_can_add_actions
+        ret = []
+        ret << :model_accesses if defined?(RailsAdminUserAbilities)
+        ret += [:comments, :model_comments] if defined?(RailsAdminComments)
+        ret << :hancock_touch if defined?(Hancock::Cache::Cacheable)
+        ret.freeze
+      end
+      def self.manager_cannot_actions
+        [:new, :create, :delete, :destroy]
+      end
+
+      def self.rails_admin_add_visible_actions
+        ret = []
+        ret << :model_accesses if defined?(RailsAdminUserAbilities)
+        ret += [:comments, :model_comments] if defined?(RailsAdminComments)
+        ret << :hancock_touch if defined?(Hancock::Cache::Cacheable)
+        ret.freeze
+      end
+    end
+
+  end
+end

data/lib/hancock/version.rb

@@ -1,3 +1,3 @@
 module Hancock
-  VERSION = "1.0.0.4".freeze
+  VERSION = "1.0.1".freeze
 end

data/lib/hancock_cms.rb

@@ -25,6 +25,7 @@ require 'codemirror-rails'
 require 'rails_admin'
 require 'hancock/rails_admin_ext/config'
 
+require 'hancock/rails_admin_ext/hancock_enum'
 require 'hancock/rails_admin_ext/hancock_hash'
 require 'hancock/rails_admin_ext/hancock_html'
 require 'hancock/rails_admin_ext/hancock_slugs'
@@ -40,6 +41,7 @@ require 'rails_admin_nested_set'
 require 'rails_admin_toggleable'
 
 require 'ack_rails_admin_settings'
+require 'hancock/rails_admin_settings_patch'
 
 # require 'x-real-ip'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hancock_cms
 version: !ruby/object:Gem::Version
-  version: 1.0.0.4
+  version: 1.0.1
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2016-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -190,14 +190,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -283,7 +283,6 @@ files:
 - app/controllers/concerns/hancock/decorators/sessions.rb
 - app/controllers/concerns/hancock/errors.rb
 - app/controllers/concerns/hancock/fancybox.rb
-- app/controllers/concerns/hancock/no_cache.rb
 - app/controllers/hancock/home_controller.rb
 - app/controllers/hancock/registrations_controller.rb
 - app/controllers/hancock/sessions_controller.rb
@@ -291,7 +290,6 @@ files:
 - app/helpers/hancock/home_helper.rb
 - app/helpers/hancock/powered_helper.rb
 - app/models/concerns/hancock/boolean_field.rb
-- app/models/concerns/hancock/cacheable.rb
 - app/models/concerns/hancock/decorators/embedded_element.rb
 - app/models/concerns/hancock/embedded_findable.rb
 - app/models/concerns/hancock/enableable.rb
@@ -336,6 +334,7 @@ files:
 - app/views/rails_admin/main/_check_boxes.html.slim
 - app/views/rails_admin/main/_enum_check_boxes.html.slim
 - app/views/rails_admin/main/_enum_radio_buttons.html.slim
+- app/views/rails_admin/main/_form_hancock_enum.html.slim
 - app/views/rails_admin/main/_form_hancock_multiselect.html.slim
 - app/views/rails_admin/main/_form_raw.html.slim
 - app/views/rails_admin/main/_hancock_hash.html.slim
@@ -411,6 +410,7 @@ files:
 - lib/hancock/plugin.rb
 - lib/hancock/plugin_configuration.rb
 - lib/hancock/rails_admin_ext/config.rb
+- lib/hancock/rails_admin_ext/hancock_enum.rb
 - lib/hancock/rails_admin_ext/hancock_hash.rb
 - lib/hancock/rails_admin_ext/hancock_html.rb
 - lib/hancock/rails_admin_ext/hancock_multiselect.rb
@@ -419,6 +419,7 @@ files:
 - lib/hancock/rails_admin_ext/patches/group_patch.rb
 - lib/hancock/rails_admin_ext/patches/hancock_cms_group.rb
 - lib/hancock/rails_admin_ext/patches/new_controller_patch.rb
+- lib/hancock/rails_admin_settings_patch.rb
 - lib/hancock/routes.rb
 - lib/hancock/simple_form_patch.rb
 - lib/hancock/tasks.rb

data/app/controllers/concerns/hancock/no_cache.rb

@@ -1,12 +0,0 @@
-module Hancock::NoCache
-  extend ActiveSupport::Concern
-  included do
-    before_filter :set_cache_buster
-  end
-
-  protected
-  def set_cache_buster
-    expires_now()
-    response.headers["Pragma"] = "no-cache"
-  end
-end

data/app/models/concerns/hancock/cacheable.rb

@@ -1,51 +0,0 @@
-if Hancock.mongoid?
-
-  module Hancock::Cacheable
-    extend ActiveSupport::Concern
-
-    included do
-      field :cache_keys_str, type: String, default: -> { default_cache_keys.join("\n") }
-      def self.default_cache_keys
-        []
-      end
-      def default_cache_keys
-        self.class.default_cache_keys
-      end
-      def set_default_cache_keys(strategy = :append)
-        _old_keys = cache_keys
-
-        _keys = case strategy.to_sym
-        when :append
-          (_old_keys + default_cache_keys).uniq
-        when :overwrite, :replace
-          default_cache_keys
-        else
-          _old_keys
-        end
-        self
-      end
-      def set_default_cache_keys!(strategy = :append)
-        self.set_default_cache_keys(strategy) and self.save
-      end
-
-
-      def cache_keys
-        cache_keys_str.split(/\s+/).map { |k| k.strip }.reject { |k| k.blank? }
-      end
-      field :perform_caching, type: Boolean, default: true
-
-      after_touch :clear_cache
-      after_save :clear_cache
-      after_destroy :clear_cache
-      def clear_cache
-        if perform_caching
-          cache_keys.each do |k|
-            Rails.cache.delete(k)
-          end
-        end
-      end
-
-    end
-  end
-
-end