kms 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3376e353187d1fcbd9033b374380f744467c2e3
-  data.tar.gz: ac386e50234dfa6e1c5830f1193412a4c8e8957b
+  metadata.gz: c7a60114d095d742beb0d36848becbcdddf79bc8
+  data.tar.gz: 614ac6dc07bf7781306c107c97c3438a43b88877
 SHA512:
-  metadata.gz: c9108885e35beeaea1ed0f8bd2b4b86da47814736ae204c194385e9b2a0aff4436406ce0c06a7f01c48e6855086959e51d2dffe207e98fb2a68bdf441ea564e5
-  data.tar.gz: bc3e1331a225a5bfe633dfd04d8fa2a4ebb180bc17b57ce5138a7b7aacd528c8d9530a565163d64501b5b429d916187cf9d2c9cf01c2a7c07da17faa38f9c9ff
+  metadata.gz: 3155d389e80cac754afd5ac0d1d3d05e9e6d6574754a74ddb150ca52869b321e7a195b8d36d40d0889aae6240a958acb167ecf51f1dda3f52db127c91928162e
+  data.tar.gz: 689ce17498530639bd86c95f03c486f6ffadd65c29ce4ab04ebccb01848bf91d510e6a14ea2971b98f5fed4e00d7ccb1ee31b4487f0e49bf0c44837439c92ae6

data/app/assets/javascripts/kms/application/controllers/pages_controller.coffee.erb

@@ -88,8 +88,7 @@ PagesController = ($scope, $state, $cookieStore, Restangular, $stateParams, Aler
 
   $scope.treeOptions = {
       dropped: (event) ->
-        Restangular.all('pages').customPOST(angular.toJson($scope.pages),'sorting')
-        $scope.store.getList().then (pages) ->
+        Restangular.all('pages').customPOST(angular.toJson($scope.pages),'sorting').then (pages) ->
           $scope.pages = pages
   }
 

data/app/assets/javascripts/templates/assets/index.html.slim

@@ -21,8 +21,6 @@
                       | {{asset.file.url}}
                     td
                       .btn-group.pull-right
-                        a.btn.btn-sm.btn-info ui-sref="assets.edit({id: asset.id})"
-                          i.fa.fa-pencil
                         a.btn.btn-sm.btn-danger ng-click="destroy(asset)"
                           i.fa.fa-times
           tab
@@ -34,13 +32,12 @@
                 tbody
                   tr ng-repeat="asset in assets.css"
                     td style="width: 40%"
-                      | {{ asset.filename }}
+                      a ui-sref="assets.edit({id: asset.id})"
+                        | {{ asset.filename }}
                     td style="width: 40%"
                       | {{asset.file.url}}
                     td
                       .btn-group.pull-right
-                        a.btn.btn-sm.btn-info ui-sref="assets.edit({id: asset.id})"
-                          i.fa.fa-pencil
                         a.btn.btn-sm.btn-danger ng-click="destroy(asset)"
                           i.fa.fa-times
           tab
@@ -52,13 +49,12 @@
                 tbody
                   tr ng-repeat="asset in assets.javascript"
                     td style="width: 40%"
-                      | {{ asset.filename }}
+                      a ui-sref="assets.edit({id: asset.id})"
+                        | {{ asset.filename }}
                     td style="width: 40%"
                       | {{asset.file.url}}
                     td
                       .btn-group.pull-right
-                        a.btn.btn-sm.btn-info ui-sref="assets.edit({id: asset.id})"
-                          i.fa.fa-pencil
                         a.btn.btn-sm.btn-danger ng-click="destroy(asset)"
                           i.fa.fa-times
           tab
@@ -75,8 +71,6 @@
                       | {{asset.file.url}}
                     td
                       .btn-group.pull-right
-                        a.btn.btn-sm.btn-info ui-sref="assets.edit({id: asset.id})"
-                          i.fa.fa-pencil
                         a.btn.btn-sm.btn-danger ng-click="destroy(asset)"
                           i.fa.fa-times
           tab
@@ -93,8 +87,6 @@
                       | {{asset.file.url}}
                     td
                       .btn-group.pull-right
-                        a.btn.btn-sm.btn-info ui-sref="assets.edit({id: asset.id})"
-                          i.fa.fa-pencil
                         a.btn.btn-sm.btn-danger ng-click="destroy(asset)"
                           i.fa.fa-times
           li.pull-right

data/app/assets/javascripts/templates/help/scopes.html.slim

@@ -0,0 +1,74 @@
+h4 = I18n.t("liquor_help.scopes_title")
+p
+  ul
+    li
+      var find_by
+      p
+        span = I18n.t('liquor_help.scopes.find_by.main_description')
+      p
+        code
+          | {% assign news_page = index.children.find_by(title: 'News') %}
+    li
+      var find_all_by
+      p
+        span = I18n.t('liquor_help.scopes.find_all_by.main_description')
+      p
+        code
+          | {% for p in: index.children.find_all_by(published: true) do: %}
+    li
+      var except
+      p
+        span = I18n.t('liquor_help.scopes.except.main_description')
+      p
+        code
+          | {% assign correct_pages = index.children.except(excepted_page) %}
+    li
+      var find_except_by
+      p
+        span = I18n.t('liquor_help.scopes.find_except_by.main_description')
+      p
+        code
+          | {% for p in: index.children.find_except_by(hidden: true) do: %}
+    li
+      var limit
+      p
+        span = I18n.t('liquor_help.scopes.limit.main_description')
+      p
+        code
+          | {% for post in: models.posts.limit(3) do: %}
+    li
+      var offset
+      p
+        span = I18n.t('liquor_help.scopes.offset.main_description')
+      p
+        code
+          | {% for post in: models.posts.limit(3).offset(3) do: %}
+    li
+      var first
+      p
+        span = I18n.t('liquor_help.scopes.first.main_description')
+      p
+        code
+          | {% assign first_post = models.posts.first %}
+    li
+      var last
+      p
+        span = I18n.t('liquor_help.scopes.last.main_description')
+      p
+        code
+          | {% assign last_post = models.posts.last %}
+    li
+      var
+        | []
+      p
+        span = I18n.t('liquor_help.scopes.by_index.main_description')
+      p
+        code
+          | {% assign third_post = models.posts[2] %}
+    li
+      var pluck
+      p
+        span = I18n.t('liquor_help.scopes.pluck.main_description')
+      p
+        code
+          | {% for post_title in: models.posts.pluck('title') %}

data/app/assets/javascripts/templates/pages/index.html.slim

@@ -4,13 +4,14 @@ script type="text/ng-template" id="nodes_renderer.html"
     div style="width:50%;float:left;height:30px;line-height:30px;" ng-class="{'not-published': !node.published}"
       a data-nodrag="" ng-click="toggle(node)" ng-if="node.children" style="padding-right:5px;"
         i.fa ng-class="{'fa-plus': collapsed, 'fa-minus': !collapsed}"
-      | {{node.title}} 
+      a ui-sref="pages.edit({id: node.id})" data-nodrag=""
+        | {{node.title}} 
       i.fa.fa-cogs style="font-size:18px !important" ng-if="node.templatable"
     div style="width:30%;float:left;height:30px;line-height:30px;"
       | {{ node.fullpath }}
     .btn-group.pull-right
-      a.btn.btn-sm.btn-info data-nodrag="" ui-sref="pages.edit({id: node.id})"
-        i.fa.fa-pencil
+      /a.btn.btn-sm.btn-info data-nodrag="" ui-sref="pages.edit({id: node.id})"
+        /i.fa.fa-pencil
       a.btn.btn-sm.btn-danger data-nodrag="" ng-click="destroy(node)" style="margin-right: 8px;"
           i.fa.fa-times
   ol ui-tree-nodes="pages" ng-model="node.children" ng-class="{hidden: collapsed}"

data/app/assets/javascripts/templates/snippets/index.html.slim

@@ -13,10 +13,11 @@
             tbody
               tr ng-repeat="snippet in snippets"
                 td style="width: 80%"
-                  | {{ snippet.name }}
+                  a ui-sref="snippets.edit({id: snippet.id})"
+                    | {{ snippet.name }}
                 td
                   .btn-group.pull-right
-                    a.btn.btn-sm.btn-info ui-sref="snippets.edit({id: snippet.id})" ng-show="currentUser.admin"
-                      i.fa.fa-pencil
+                    /a.btn.btn-sm.btn-info ui-sref="snippets.edit({id: snippet.id})" ng-show="currentUser.admin"
+                      /i.fa.fa-pencil
                     a.btn.btn-sm.btn-danger ng-click="destroy(snippet)" ng-show="currentUser.admin"
                       i.fa.fa-times

data/app/assets/javascripts/templates/templates/index.html.slim

@@ -13,10 +13,11 @@
             tbody
               tr ng-repeat="template in templates"
                 td style="width: 80%"
-                  | {{ template.name }}
+                  a ui-sref="templates.edit({id: template.id})"
+                    | {{ template.name }}
                 td
                   .btn-group.pull-right
-                    a.btn.btn-sm.btn-info ui-sref="templates.edit({id: template.id})" ng-show="currentUser.admin"
-                      i.fa.fa-pencil
+                    /a.btn.btn-sm.btn-info ui-sref="templates.edit({id: template.id})" ng-show="currentUser.admin"
+                      /i.fa.fa-pencil
                     a.btn.btn-sm.btn-danger ng-click="destroy(template)" ng-show="currentUser.admin"
                       i.fa.fa-times

data/app/assets/javascripts/templates/users/index.html.slim

@@ -17,5 +17,6 @@
                 td
                   | {{ user.localized_role }}
                 td
-                  a.btn.btn-sm.btn-danger ng-click="destroy(user)"
-                    i.fa.fa-times
+                  .btn-group.pull-right
+                    a.btn.btn-sm.btn-danger ng-click="destroy(user)"
+                      i.fa.fa-times

data/app/assets/stylesheets/kms/custom.css.scss

@@ -83,3 +83,6 @@ table td {
 .nav-tabs li a {
   cursor: pointer;
 }
+.widget .widget-header table i {
+  margin-right: 0px;
+}

data/app/controllers/kms/pages_controller.rb

@@ -5,7 +5,7 @@ module Kms
 
     def index
       #render json: Page.order("created_at asc").to_json(methods: :parent_id, except: :ancestry)
-      render json: Page.arrange_serializable(:order => :position).to_json
+      render json: Page.arrange_serializable(order: :position).to_json
     end
 
     def create
@@ -44,7 +44,7 @@ module Kms
         p.update_attribute(:position, index)
         sort(page["id"], page["children"]) if page["children"].present?
       end
-      render json: Page.arrange_serializable.to_json
+      render json: Page.arrange_serializable(order: :position).to_json
     end
 
     protected

data/app/models/ability.rb

@@ -8,7 +8,6 @@ class Ability
     if user.admin?
       can :manage, :all
     else
-      can :index, Kms::Template
       can :manage, Kms::Page
       can :manage, Kms::Asset
       Kms::AbilityService.abilities.each do |ability_block|

data/app/models/concerns/kms/positioned.rb

@@ -0,0 +1,18 @@
+module Kms
+  module Positioned
+    extend ActiveSupport::Concern
+
+    included do
+      before_create :set_position
+    end
+
+    def set_position
+      if parent.present?
+        max = parent.children.maximum(:position)
+      else
+        max = self.class.where('ancestry IS ?', nil).maximum(:position)
+      end
+      self.position = max ? max + 1 : 0
+    end
+  end
+end

data/app/models/kms/page.rb

@@ -2,8 +2,9 @@ module Kms
   class Page < ActiveRecord::Base
     include Liquor::Dropable
     include CompileTemplates
+    include Positioned
 
-    INDEX_SLUG = "index"
+    INDEX_SLUG = "index".freeze
     INDEX_FULLPATH = ""
 
     scope :published, lambda { where(published: true) }
@@ -16,8 +17,6 @@ module Kms
 
     before_save :build_fullpath
 
-    before_create :set_position
-
     has_ancestry
 
     def index?
@@ -34,15 +33,6 @@ module Kms
       end
     end
 
-    def set_position
-      if parent.present?
-        max = parent.children.maximum(:position)
-      else
-        max = Page.where('ancestry IS ?', nil).maximum(:position)
-      end
-      self.position = max ? max + 1 : 0
-    end
-
     # fetch items for templatable page
     def fetch_items
       templatable_type.constantize.all

data/app/services/kms/functions_registry.rb

@@ -0,0 +1,11 @@
+module Kms
+  class FunctionsRegistry
+    cattr_accessor :modules do
+      [Liquor::Pagination, Kms::Functions::Assets, Kms::Functions::Currency]
+    end
+
+    def self.register(module_const)
+      modules << module_const
+    end
+  end
+end

data/app/uploaders/kms/asset_uploader.rb

@@ -8,7 +8,7 @@ module Kms
     # include CarrierWave::MiniMagick
 
     # Choose what kind of storage to use for this uploader:
-    storage :file
+    storage (ENV['KMS_ASSETS_STORAGE'] && ENV['KMS_ASSETS_STORAGE'].to_sym) || :file
     # storage :fog
 
     # Override the directory where uploaded files will be stored.

data/config/initializers/help.rb

@@ -1 +1 @@
-Kms::HelpService.register_templates Kms::Engine, 'help/filters.html', 'help/variables.html'
+Kms::HelpService.register_templates Kms::Engine, 'help/filters.html', 'help/variables.html', 'help/scopes.html'

data/config/initializers/liquor.rb

@@ -1,49 +1,2 @@
 require 'kms/functions/assets'
 require 'kms/functions/currency'
-#Kms.template_manager = Liquor::Manager.new(import: [Liquor::Pagination, Kms::Functions::Assets, Kms::Functions::Currency])
-
-# if ActiveRecord::Base.connection.tables.include?('kms_templates')
-#   Kms::Template.all.each do |template|
-#     Kms.template_manager.register_layout(template.register_id, template.content || "", Kms::ExternalsRegistry.externals.keys)
-#   end
-# end
-# if ActiveRecord::Base.connection.tables.include?('kms_pages')
-#   Kms::Page.all.each do |page|
-#     Kms.template_manager.register_template(page.register_id, page.content || "", Kms::ExternalsRegistry.externals.keys)
-#   end
-# end
-#Rails.configuration.x.template_manager.register_partial("_pagination", <<-eos
-#{% pagination start: %}
-#<div class='digg_pagination'>
-  #{% if page.is_current then: %}
-  #<span class="disabled previous_page">&#8592; Previous</span>
-  #{% else: %}
-  #<a href="{{ prev_page_path }}" rel="previous" class="previous_page_page">&#8592; Previous</a>
-  #{% end if %}
-#{% page: %}
-  #{% if page.is_current then: %}
-  #<em class="current">{{ page.number }}</em>
-  #{% elsif: page.is_next then: %}
-  #<a href="{{ page.path }}" rel="next">{{ page.number }}</a>
-  #{% elsif: page.is_prev then: %}
-  #<a href="{{ page.path }}" rel="previous">{{ page.number }}</a>
-  #{% else: %}
-  #<a href="{{ page.path }}">3</a>
-  #{% end if %}
-#{% gap: %}
-  #<span class="gap">&hellip;</span>
-#{% end: %}
-  #{% if page.is_current then: %}
-  #<span class="disabled next_page">Next &#8594;</span>
-  #{% else: %}
-  #<a href="{{ next_page_path }}" rel="next" class="next_page">Next &#8594;</a></div>
-  #{% end if %}
-#{% end pagination %}
-#eos
-                                                       #)
-
-# unless Kms.template_manager.compile
-#   Kms.template_manager.errors.each do |error|
-#     puts error
-#   end
-# end

data/config/locales/en.yml

@@ -50,6 +50,7 @@ en:
     tags_title: "Tags"
     filters_title: "Filters"
     variables_title: "Variables"
+    scopes_title: "Scopes"
     endpoints_title: "Endpoints"
     property: "Property of"
     parameter: "Parameter for"
@@ -75,6 +76,27 @@ en:
         main_description: "Tag yield has 3 forms. In the simples case (without arguments) it inserts content of internal template (Page content in terms of this CMS). If string with handle was setup with {% content_for %}, then yield returns this string. If no string with handle, yield returns result of if_none block execution, if such block was specified, or just empty string:"
       include:
         main_description: 'Tag include includes content of Snippet into template. The only argument of include - Snippet ID (field "Slug/ID" that you need to setup on Snippet creation in "Snippets"):'
+    scopes:
+      find_by:
+        main_description: 'find_by allows you to find one element in collection by some condition/criteria'
+      find_all_by:
+        main_description: 'find_all_by finds all collection elements matching criterias'
+      except:
+        main_description: 'except returns you all collection elements except ones provided as argument'
+      find_except_by:
+        main_description: 'find_except_by finds all collection elements not matching provided criterias'
+      limit:
+        main_description: 'limit method is equal to SQL limit so it allows to limit number of collection items'
+      offset:
+        main_description: 'offset method is equal to SQL offset so it allows to fetch records by offset'
+      first:
+        main_description: 'returns first element in collection'
+      last:
+        main_description: 'returns last element in collection'
+      by_index:
+        main_description: 'returns element by its index'
+      pluck:
+        main_description: 'returns collection containing elements specific field values (not full object)'
     variables:
       var_loop:
         main_description: 'Variable giving access to current state of cycle/iteration. Can be used only in "for" cycle. var_loop - common name, for accessing actual cycle variable you need to concatenate cycle variable name and "_loop". Example:'

data/config/locales/ru.yml

@@ -50,6 +50,7 @@ ru:
     tags_title: "Тэги"
     filters_title: "Фильтры"
     variables_title: "Переменные"
+    scopes_title: "Методы коллекций"
     endpoints_title: "Запросы"
     property: "Свойство"
     parameter: "Параметр для"
@@ -75,6 +76,27 @@ ru:
         main_description: "Тэг yield имеет 3 формы написания. В самом простом случае (без аргументов) тэг вставляет содержимое внутреннего шаблона (в данной CMS это страница). Если строка с handle была задана с помощью {% content_for %}, тогда yield возвращает эту строку. Если не было задано строки с этим handle, yield либо возвращает результат выполнения блока if_none, если он задан, или пустую строку:"
       include:
         main_description: 'Тэг include включает в шаблон содержимое Сниппета. Единственный аргумент include - это идентификатор Сниппета (поле "Идентификатор", указанное при создании сниппета в разделе "Сниппеты"):'
+    scopes:
+      find_by:
+        main_description: 'find_by позволяет найти один элемент коллекции по заданному условию'
+      find_all_by:
+        main_description: 'find_all_by находит все элементы коллекции, удовлетворяющие критериям'
+      except:
+        main_description: 'except возвращает элементы коллекции, кроме тех, которые поданы в качестве аргументов'
+      find_except_by:
+        main_description: 'find_except_by находит все элементы коллекции, не удовлетворяющие заданным критериям'
+      limit:
+        main_description: 'limit эквивалентен limit в SQL и позволяет ограничить количество элементов коллекции'
+      offset:
+        main_description: 'offset эквивалентен offset в SQL и позволяет получить данные со смещением'
+      first:
+        main_description: 'возвращает первый элемент коллекции'
+      last:
+        main_description: 'возвращает последний элемент коллекции'
+      by_index:
+        main_description: 'возвращает элемент по индексу'
+      pluck:
+        main_description: 'возвращает коллекцию, содержащую значения определенного свойства'
     variables:
       var_loop:
         main_description: 'Переменная, предоставляющая доступ к текущему состоянию цикла. Может быть использована только внутри цикла for. var_loop - обобщённое имя, для получения настоящего имени переменной нужно сконкатенировать название переменной цикла и "_loop". Например:'