kms 0.9.0 → 1.0.0

data/app/models/ability.rb

@@ -10,6 +10,7 @@ class Ability
     else
       can :manage, Kms::Page
       can :manage, Kms::Asset
+      can :index, Kms::Template
       Kms::AbilityService.abilities.each do |ability_block|
         instance_eval(&ability_block)
       end

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

@@ -6,7 +6,7 @@ module Kms
     def permalink
       templatable_page = Kms::Page.where(templatable_type: self.class.name).first
       if templatable_page
-        Pathname.new(templatable_page.parent.fullpath).join(self.slug.to_s).to_s
+        Pathname.new(templatable_page.parent.fullpath).join(slug.to_s).to_s
       end
     end
   end

data/app/models/kms/page.rb

@@ -4,8 +4,9 @@ module Kms
     include CompileTemplates
     include Positioned
 
-    INDEX_SLUG = "index".freeze
-    INDEX_FULLPATH = ""
+    INDEX_SLUG = 'index'.freeze
+    INDEX_FULLPATH = ''
+    NOT_FOUND_SLUG = '404'.freeze
 
     scope :published, lambda { where(published: true) }
     scope :listed, lambda { where(hidden: false) }
@@ -19,10 +20,18 @@ module Kms
 
     has_ancestry
 
+    def self.not_found_page
+      where(slug: NOT_FOUND_SLUG).first
+    end
+
     def index?
       slug == INDEX_SLUG
     end
 
+    def not_found?
+      slug == NOT_FOUND_SLUG
+    end
+
     def build_fullpath
       if index?
         self.fullpath = INDEX_FULLPATH # self.slug
@@ -39,9 +48,9 @@ module Kms
     end
 
     # fetch item by slug
-    def fetch_item!(slug)
+    def fetch_item(slug)
       return nil unless templatable?
-      templatable_type.constantize.find_by_slug!(slug)
+      templatable_type.constantize.find_by_slug(slug)
     end
 
   end

data/app/serializers/kms/asset_serializer.rb

@@ -0,0 +1,6 @@
+module Kms
+  class AssetSerializer < ActiveModel::Serializer
+    attributes :id, :content_type, :filename, :url
+    attribute :text, if: -> { object.stylesheet_or_javascript? }
+  end
+end

data/app/serializers/kms/page_serializer.rb

@@ -0,0 +1,5 @@
+module Kms
+  class PageSerializer < ActiveModel::Serializer
+    attributes :id, :title, :slug, :template_id, :parent_id, :content, :published, :hidden, :templatable, :templatable_type
+  end
+end

data/app/serializers/kms/template_serializer.rb

@@ -0,0 +1,5 @@
+module Kms
+  class TemplateSerializer < ActiveModel::Serializer
+    attributes :id, :name, :content
+  end
+end

data/app/serializers/kms/user_serializer.rb

@@ -0,0 +1,5 @@
+module Kms
+  class UserSerializer < ActiveModel::Serializer
+    attributes :id, :email, :role, :localized_role
+  end
+end

data/app/services/kms/page_fetcher.rb

@@ -0,0 +1,30 @@
+module Kms
+  class PageFetcher
+    def initialize(path)
+      @path = path
+    end
+
+    def fetch!
+      page = Page.published.find_by_fullpath(@path) || fetch_templatable_page! || fetch_404_page
+      page ? page.to_drop : raise(ActiveRecord::RecordNotFound)
+    end
+
+    private
+
+    # finds templatable page that works for path
+    def fetch_templatable_page!
+      parent_page_path = File.dirname(@path)
+      parent_page_path = Kms::Page::INDEX_FULLPATH if parent_page_path == "."
+      parent_page = Kms::Page.published.find_by_fullpath!(parent_page_path)
+      templatable_pages = parent_page.children.where(templatable: true)
+      templatable_pages.detect do |templatable_page|
+        templatable_page.fetch_item(File.basename(@path))
+      end
+    end
+
+    # find special page with '404' slug
+    def fetch_404_page
+      Kms::Page.not_found_page
+    end
+  end
+end

data/app/services/kms/search_service.rb

@@ -1,11 +1,36 @@
 module Kms
   class SearchService
     cattr_accessor :resources do
-      []
+      {}
     end
 
-    def self.register(resource)
-      self.resources << resource
+    def initialize(query='')
+      @query = query
     end
+
+    # resource is a class
+    # attributes_map is a Hash
+    # where keys are SearchItem attributes like "title", "link" and "content"
+    # and values are corresponding resource attributes
+    def self.register(resource, attributes_map)
+      self.resources[resource] = attributes_map
+    end
+
+    def search
+      return [] if @query.blank?
+
+      search_results = Kms::SearchService.resources.map do |resource, attributes_map|
+        resource_items = resource.advanced_search(keywords.join('|'))
+        resource_items.map {|resource_item| Kms::SearchItem.item_for_searchable(resource_item, keywords, attributes_map) }
+      end
+      search_results.flatten
+    end
+
+    private
+
+    def keywords
+      @query.split(' ')
+    end
+
   end
 end

data/app/services/kms/template_processor.rb

@@ -0,0 +1,19 @@
+module Kms
+  class TemplateProcessor
+    def initialize(template)
+      @template = template
+    end
+
+    def process
+      template_document = Nokogiri::HTML @template.content
+      template_document.search('script, link[rel="stylesheet"]').each do |tag|
+        tag.replace "{{ '#{File.basename(tag['src'] || tag['href'])}' | asset_tag }}"
+      end
+      # can't use Nokogiri for images because of Nokogiri escaping
+      template_document.search('img').each do |tag|
+        tag.replace %Q(<img src="{{ '#{File.basename(tag['src'])}' | asset_path }}" alt="#{tag['alt']}">)
+      end
+      template_document.to_html.gsub(/(%7B|%7D|%20|%7C)/,'%7B' => '{', '%7D' => '}', '%20' => ' ', '%7C' => '|')
+    end
+  end
+end

data/app/views/devise/passwords/edit.html.erb

@@ -1,7 +1,7 @@
 <div class="wrapper">
 
   <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: 'form-signin', method: :put }) do |f| %>
-     <h2 class="form-signin-heading">KMS</h2>
+     <h2 class="form-signin-heading">APIQ</h2>
      <h4>Change your password</h4>
     <%= devise_error_messages! %>
     <%= f.hidden_field :reset_password_token %>

data/app/views/devise/passwords/new.html.erb

@@ -1,6 +1,6 @@
 <div class="wrapper">
    <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: 'form-signin', method: :post }) do |f| %>
-     <h2 class="form-signin-heading">KMS</h2>
+     <h2 class="form-signin-heading">APIQ</h2>
      <%= devise_error_messages! %>
 
      <h4>Forgot your password?</h4>

data/app/views/devise/registrations/new.html.erb

@@ -1,7 +1,7 @@
 <div class="wrapper">
 
   <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: {class: "form-signin"}) do |f| %>
-    <h2 class="form-signin-heading">KMS</h2>
+    <h2 class="form-signin-heading">APIQ</h2>
     <%= devise_error_messages! %>
 
       <%= f.email_field :email, autofocus: true, class: 'form-control', placeholder: Kms::User.human_attribute_name(:email), required: '' %>

data/app/views/devise/sessions/new.html.erb

@@ -1,6 +1,6 @@
 <div class="wrapper">
   <%= form_for(resource, as: resource_name, url: session_path(resource_name), html: {class: "form-signin"}) do |f| %>
-    <h2 class="form-signin-heading">KMS</h2>
+    <h2 class="form-signin-heading">APIQ</h2>
       <%= f.email_field :email, autofocus: true, class: 'form-control', placeholder: Kms::User.human_attribute_name(:email), required: '' %>
       <%= f.password_field :password, autocomplete: "off", class: 'form-control', placeholder: Kms::User.human_attribute_name(:password), required: '' %>
       <% if devise_mapping.rememberable? -%>

data/app/views/layouts/kms/devise.html.erb

@@ -8,7 +8,7 @@
     <meta name="author" content="">
     <link rel="icon" href="../../favicon.ico">
 
-    <title>KMS</title>
+    <title>APIQ</title>
 
     <%= stylesheet_link_tag    'kms/application', media: 'all', 'data-turbolinks-track' => true %>
     <%= csrf_meta_tags %>

data/app/views/layouts/kms/kms.html.erb

@@ -4,7 +4,7 @@
 	<meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
-	<title>{{ 'KMS - ' + ($state.current.views['header'] || $state.current.views['header@']).template || 'KMS' }}</title>
+	<title>{{ 'APIQ - ' + ($state.current.views['header'] || $state.current.views['header@']).template || 'APIQ' }}</title>
   <%= stylesheet_link_tag    'kms/application', media: 'all', 'data-turbolinks-track' => true %>
   <script type="text/javascript">
      var CKEDITOR_BASEPATH = '/assets/ng-ckeditor/libs/ckeditor/';
@@ -18,7 +18,7 @@
 
 </head>
 <body>
-  <div id="page-wrapper" ng-controller="SidebarController" ng-class="{'active': toggle}" >
+  <div id="page-wrapper" ng-controller="SidebarController" ng-class="{'open': toggle}" ng-cloak>
 
     <!-- Sidebar -->
 
@@ -26,7 +26,43 @@
       <ul class="sidebar">
         <li class="sidebar-main">
           <a href="#" ng-click="toggleSidebar()">
-            Kms
+						<svg
+						xmlns:dc="http://purl.org/dc/elements/1.1/"
+						xmlns:cc="http://creativecommons.org/ns#"
+						xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+						xmlns:svg="http://www.w3.org/2000/svg"
+						xmlns="http://www.w3.org/2000/svg"
+						viewBox="0 0 1250 1250"
+						height="70"
+						width="70"
+						xml:space="preserve"
+						version="1.1"
+						preserveAspectRation="none"
+						id="svg2" class="logo"><metadata
+						id="metadata8"><rdf:RDF><cc:Work
+						rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+						rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+						id="defs6"><clipPath
+						id="clipPath16"
+						clipPathUnits="userSpaceOnUse"><path
+						id="path18"
+						d="m 0,1000 1000,0 L 1000,0 0,0 0,1000 Z" /></clipPath></defs><g
+						transform="matrix(1.25,0,0,-1.25,0,1250)"
+						id="g10"><g
+						id="g12"><g
+						clip-path="url(#clipPath16)"
+						id="g14"><g
+						transform="translate(448.853,608.1104)"
+						id="g20"><path
+						id="path22"
+						style="fill:#ff5274;fill-opacity:1;fill-rule:nonzero;stroke:none"
+						d="m 0,0 48.851,25.155 c 1.443,0.743 3.157,0.743 4.601,-0.001 L 102.295,0 c 3.633,-1.87 3.632,-7.063 0,-8.933 L 53.447,-34.088 c -1.443,-0.743 -3.157,-0.743 -4.6,0 L 0,-8.934 C -3.632,-7.063 -3.632,-1.871 0,0" /></g><g
+						transform="translate(512.4707,338.8955)"
+						id="g24"><path
+						id="path26"
+						style="fill:#ff5274;fill-opacity:1;fill-rule:nonzero;stroke:none"
+						d="m 0,0 c -7.808,-4.021 -17.133,-4.021 -24.94,0 l -240.019,123.607 62.093,31.978 161.765,-83.31 c 8.965,-4.617 18.798,-6.925 28.633,-6.925 9.832,0 19.666,2.308 28.626,6.925 L 177.926,155.585 240.02,123.607 0,0 Z m -138.643,226.155 36.404,-18.748 61.138,-31.487 c 8.965,-4.617 18.798,-6.926 28.633,-6.926 9.832,0 19.666,2.309 28.626,6.926 l 61.144,31.487 36.405,18.746 62.091,-31.975 -36.405,-18.749 -139.394,-71.784 c -7.808,-4.033 -17.13,-4.021 -24.941,0 l -139.389,71.784 -36.405,18.749 62.093,31.977 z m 112.084,95.218 1.622,0.835 c 7.807,4.025 17.129,4.014 24.94,0 L 1.626,321.372 111.576,264.748 77.3,247.097 75.171,246 38.766,227.252 -0.001,207.289 c -7.808,-4.026 -17.13,-4.015 -24.941,0 l -38.763,19.963 -36.403,18.747 -2.132,1.098 -34.275,17.651 109.956,56.625 z m 297.835,-174.174 -56.722,29.213 c 4.34,4.79 6.883,11.046 6.883,17.766 0,9.975 -5.507,19.015 -14.382,23.592 l -56.722,29.211 c 4.342,4.792 6.886,11.049 6.886,17.767 0,9.976 -5.51,19.015 -14.386,23.592 l -126.67,65.236 c -17.929,9.235 -39.337,9.24 -57.26,0 l -126.674,-65.236 -0.007,0 c -8.869,-4.577 -14.38,-13.616 -14.38,-23.592 0,-6.718 2.545,-12.975 6.889,-17.767 l -56.722,-29.211 -0.006,0 c -8.87,-4.571 -14.382,-13.611 -14.382,-23.592 0,-6.72 2.543,-12.975 6.883,-17.765 l -56.726,-29.214 c -8.868,-4.577 -14.379,-13.616 -14.379,-23.592 0,-9.975 5.511,-19.015 14.387,-23.592 L -41.098,-31.369 c 8.965,-4.617 18.795,-6.926 28.629,-6.926 9.832,0 19.665,2.309 28.627,6.926 l 255.126,131.39 c 8.867,4.571 14.375,13.611 14.375,23.586 0,9.976 -5.508,19.015 -14.383,23.592" /></g></g></g></g></svg>
+            APIQ
             <span class="menu-icon glyphicon glyphicon-transfer"></span>
           </a>
         </li>
@@ -37,8 +73,8 @@
           <% resources.each do |resource_class, tab_icon_class| %>
             <% if can? :index, resource_class %>
               <li class="sidebar-list">
-                <a ui-sref="<%= defined?(Kms::Model) && resource_class.is_a?(Kms::Model) ? "models.entries({modelId: #{resource_class.name}})" : resource_class.name.demodulize.tableize %>">
-                  <%= resource_class.model_name.human(count: 1.1) %>
+                <a ui-sref="<%= defined?(Kms::Model) && resource_class.is_a?(Kms::Model) ? "models.entries({modelId: #{resource_class.name}})" : resource_class.name.demodulize.tableize %>" title="<%= resource_class.model_name.human(count: 1.1) %>">
+                  <%= truncate(resource_class.model_name.human(count: 1.1), length: 22) %>
                   <span class="menu-icon fa <%= tab_icon_class %>"></span>
                 </a>
               </li>
@@ -47,23 +83,16 @@
         <% end %>
       </ul>
       <div class="sidebar-footer">
-        <div class="col-xs-4">
-          <a href="http://webgradus.ru" target="_blank">
-            &copy;Градус
+        <div class="col-xs-6">
+          <a href="mailto:hello@apiq.io">
+            <%= t(:need_help) %>
           </a>
         </div>
-        <div class="col-xs-4">
+        <div class="col-xs-6">
           <a ui-sref="help">
-            <%= t(:help) %>
+            <%= t(:documentation) %>
           </a>
         </div>
-        <!--
-        <div class="col-xs-4">
-          <a href="#">
-            Support
-          </a>
-        </div>
-        -->
       </div>
     </div>
 
@@ -79,7 +108,7 @@
             <div class="user pull-right">
               <div class="item dropdown">
                 <a href="#" class="dropdown-toggle">
-                  <img src="<%= asset_path "Responsive-Dashboard/src/img/avatar.jpg" %>">
+									<%= image_tag "avatar.jpg" %>
                 </a>
                 <ul class="dropdown-menu dropdown-menu-right">
                   <li class="dropdown-header">

data/config/initializers/externals.rb

@@ -1,42 +1,16 @@
-include ActionView::Helpers::TextHelper
 Kms::ExternalsRegistry.register(:request) {|request, controller| Liquor::Rails::Request.new(request, controller) }
 Kms::ExternalsRegistry.register(:index) {|_,_| Kms::Page.find_by_slug!("index").to_drop }
 Kms::ExternalsRegistry.register(:page) do |request,_|
-    page = Kms::Page.published.find_by_fullpath(request.params[:path] || Kms::Page::INDEX_FULLPATH)
-    unless page # in case of templatable page
-      page_path = request.params[:path] || ''
-      parent_page_path = File.dirname(page_path)
-      parent_page_path = Kms::Page::INDEX_FULLPATH if parent_page_path == "."
-      parent_page = Kms::Page.published.find_by_fullpath!(parent_page_path)
-      templatable_pages = parent_page.children.where(templatable: true)
-      page = templatable_pages.detect do |templatable_page|
-        templatable_page.fetch_item!(File.basename(page_path))
-      end
-    end
-    page ? page.to_drop : raise(ActiveRecord::RecordNotFound)
+    page_fetcher = Kms::PageFetcher.new(request.params[:path] || Kms::Page::INDEX_FULLPATH)
+    page_fetcher.fetch!
 end
 Kms::ExternalsRegistry.register(:item) do |request,controller|
   page = Kms::ExternalsRegistry.externals[:page].call(request, controller)
   if page && page.source.templatable?
-    page.source.fetch_item!(File.basename(request.params[:path])).try(:to_drop)
+    page.source.fetch_item(File.basename(request.params[:path])).try(:to_drop)
   end
 end
-Kms::ExternalsRegistry.register(:search) do |request,controller|
-    results = []
-    if request.params[:query].present?
-        key_words = request.params[:query].split(' ')
-        results_ids = Kms::Page.published.advanced_search(key_words.join('|')).map(&:id)
-        results = Kms::Page.published.where('id IN (?)', results_ids).map {|page| Kms::SearchItem.new(title: highlight(page.title, key_words, highlighter: '<span class="highlight">\1</span>'), link: page.fullpath, content: highlight(page.content, key_words, highlighter: '<span class="highlight">\1</span>'))}
-
-        Kms::SearchService.resources.each do |resource|
-            resource_ids = resource.advanced_search(request.params[:query].split(' ').join('|')).map(&:id)
-            resource_items = resource.where('id IN (?)', resource_ids)
-            parent_page = Kms::Page.published.find_by_templatable_type(resource)
-            resource_items.each do |item|
-                results << Kms::SearchItem.new(title: highlight(item.title, key_words, highlighter: '<span class="highlight">\1</span>'), link: parent_page.parent.fullpath + '/' + item.slug, content: highlight(item.content, key_words, highlighter: '<span class="highlight">\1</span>'))
-            end if parent_page && parent_page.templatable
-        end
-    end
-
-    results
+Kms::ExternalsRegistry.register(:search) do |request,_|
+  search_service = Kms::SearchService.new(request.params[:query])
+  search_service.search
 end

data/config/initializers/search.rb

@@ -0,0 +1 @@
+Kms::SearchService.register(Kms::Page, {title: :title, link: :fullpath, content: :content})

data/config/locales/en.yml

@@ -6,10 +6,12 @@ en:
   remember_me: "Remember me"
   content_management: "Content management"
   add_template: "Add template"
+  create_first_template: "Create first template"
   new_template: "New Template"
   edit_template: "Edit Template"
   update_template: "Update template"
   add_page: "Add page"
+  create_first_page: "Create first page"
   new_page: "New Page"
   edit_page: "Edit Page"
   update_page: "Update page"
@@ -26,10 +28,12 @@ en:
   new_user: "New User"
   toggle_fullscreen_mode_instruction: "Press F11 when cursor is in the editor to toggle full screen editing. ESC can also be used to exit full screen editing."
   add_snippet: "Add snippet"
+  create_first_snippet: "Create first snippet"
   new_snippet: "New Snippet"
   edit_snippet: "Edit Snippet"
   update_snippet: "Update snippet"
-  help: "Help"
+  documentation: "Documentation"
+  need_help: "Need help?"
   settings: "Settings"
   update_settings: "Update settings"
   no_settings: "No settings specified"
@@ -42,6 +46,12 @@ en:
   javascripts: "Javascript"
   fonts: "Fonts"
   other_assets: "Other"
+  templates_description: "Templates are where your common HTML code should be placed"
+  pages_description: "Pages represent your website hierarchy and their content embeds in Templates"
+  no_templates_yet: "Looks like you don't have templates yet"
+  snippets_description: "Snippets are pieces of HTML that you could include in templates or pages"
+  assets_description: "Upload stylesheets, javascripts, images and other files here (you can even pick multiple)"
+  assets_drop_description: "or just drag and drop them"
   roles:
     admin: "Admin"
     content_manager: "Content manager"
@@ -150,6 +160,12 @@ en:
       currency:
         main_description: 'Formats currency values. Possible options: precision, delimiter, separator, format, unit:'
   activerecord:
+    errors:
+      models:
+        kms/page:
+          attributes:
+            template:
+              required: "can't be blank"
     models:
       kms/template:
         one: "Template"

data/config/locales/ru.yml

@@ -6,10 +6,12 @@ ru:
   remember_me: "Запомнить меня"
   content_management: "Управление контентом"
   add_template: "Добавить шаблон"
+  create_first_template: "Создать первый шаблон"
   new_template: "Новый Шаблон"
   edit_template: "Редактирование Шаблона"
   update_template: "Обновить шаблон"
   add_page: "Добавить страницу"
+  create_first_page: "Создать первую страницу"
   new_page: "Новая Страница"
   edit_page: "Редактирование Страницы"
   update_page: "Обновить страницу"
@@ -26,10 +28,12 @@ ru:
   new_user: "Новый Пользователь"
   toggle_fullscreen_mode_instruction: "Используйте F11 для включения/выключения полноэкранного редактирования, когда курсор находится внутри поля. Также можно использовать ESC для выхода из этого режима."
   add_snippet: "Добавить сниппет"
+  create_first_snippet: "Создать первый сниппет"
   new_snippet: "Новый Сниппет"
   edit_snippet: "Редактирование Сниппета"
   update_snippet: "Обновить сниппет"
-  help: "Справка"
+  documentation: "Документация"
+  need_help: "Нужна помощь?"
   settings: "Настройки"
   update_settings: "Обновить настройки"
   no_settings: "Нет настроек для отображения"
@@ -42,6 +46,12 @@ ru:
   javascripts: "Javascript"
   fonts: "Шрифты"
   other_assets: "Другое"
+  templates_description: "В Шаблонах размещается общий для всего сайта HTML код"
+  pages_description: "Страницы представляют структуру сайта и их содержимое встраивается в Шаблоны"
+  no_templates_yet: "Кажется у вас ещё нет ни одного шаблона"
+  snippets_description: "Сниппеты это части HTML кода (например, 'Меню' или 'Галерея'), которые могут включаться в Страницы или Шаблоны"
+  assets_description: "Здесь можно загрузить файлы CSS, Javascript, изображений и другие файлы (возможна загрузка сразу нескольких)"
+  assets_drop_description: "или просто перетащить их мышкой"
   roles:
     admin: "Администратор"
     content_manager: "Контент-менеджер"
@@ -150,6 +160,12 @@ ru:
       currency:
         main_description: 'Форматирование полей, хранящих денежные значения. Возможные опции - precision, delimiter, separator, format, unit:'
   activerecord:
+    errors:
+      models:
+        kms/page:
+          attributes:
+            template:
+              required: 'не может быть пустым'
     models:
       kms/template:
         one: "Шаблон"