archangel 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d09b2b524c0d918a1098d8f77e7c4e41b3614bffe7703a28df6f26932dcf0d19
-  data.tar.gz: d5d7a79459ce16ab1a8109b803cff19dce14b1f3b813ddf716edb71c2c2b638a
+  metadata.gz: ffb41416bed166dc7a839e962bd30c941dbc5a617a082bafd8b53c9dfce8dfb1
+  data.tar.gz: 21ee7b769a7678816b1668800714dac78292c07aa60d6abc3a86f807c5302c56
 SHA512:
-  metadata.gz: baffd2cd0808981ad90eeb76a4925d3dd7a843da6f38a77894cca076d6a1a00f602e8a07741023c9882be15e7b1f2b633ef9e8470dbf4bb9d3a26f6017240587
-  data.tar.gz: 1d81da1349524ed0ac92dedd88abd93620b78b7b09fb3057d4927b39cadb7c4f3a1da9a9b13820212ff804332eccbc95509793466d9ac9fcb6f8e1f9c85d5b3f
+  metadata.gz: 6b0381d552c49d82b3ee4bc5fe1501e06e7aa809e7ae9f1209e6761d2252c262b507ab18ede3136310b241d8b7eedbd459f7fa9ac5630c6922ec3f18a6bd9e10
+  data.tar.gz: 4156e91ffcf03d124aad5654b773d39d92a1e1733f817246eda137dcb964695fceedbbcee63a51c672168fa464cc4ae9da11fa3cf57eacaacd0bad39aafad92e

data/.jshintrc

@@ -2,12 +2,12 @@
   "globals": {
     "$": true,
     "Archangel": true,
+    "Sortable": true,
+    "XMLHttpRequest": true,
     "document": true,
     "jQuery": true,
     "localStorage": true,
-    "Sortable": true,
-    "window": true,
-    "XMLHttpRequest": true
+    "window": true
   },
   "boss": true,
   "curly": true,

data/.reek

@@ -30,6 +30,15 @@ UtilityFunction:
     enabled: false
   UtilityFunction:
     enabled: false
+"app/inputs":
+  InstanceVariableAssumption:
+    enabled: false
 "app/mailers":
   InstanceVariableAssumption:
     enabled: false
+"app/policies":
+  InstanceVariableAssumption:
+    enabled: false
+"app/uploaders":
+  UtilityFunction:
+    enabled: false

data/Gemfile

@@ -33,4 +33,5 @@ group :test do
   gem "shoulda-callback-matchers", "~> 1.1"
   gem "shoulda-matchers", "~> 3.1"
   gem "simplecov", "~> 0.14"
+  gem "timecop", "~> 0.9"
 end

data/app/assets/javascripts/archangel/object/flash.js

@@ -28,7 +28,7 @@
     },
 
     flashMessage: function(type, message) {
-      if (message == '' || message == undefined) {
+      if (message === '' || message === undefined) {
         return false;
       }
 
@@ -37,7 +37,7 @@
       var messagesContainer = document.querySelector('#alert-messages'),
           msgContainer = document.createElement('div');
 
-      msgContainer.setAttribute('class', 'alert alert-' + type + ' alert-link');
+      msgContainer.setAttribute('class', 'alert alert-' + type + ' alert-link alert-dismissable fade-in');
       msgContainer.setAttribute('role', 'alert');
       msgContainer.innerHTML = message;
 

data/app/assets/javascripts/archangel/object/routes.js.erb

@@ -75,6 +75,10 @@
     return '/' + finalPath;
   };
 
+  object.rootUrl = function() {
+    return window.location.origin + object.rootPath();
+  };
+
   object.route = {
     rootPath: object.rootPath()
   };

data/app/assets/javascripts/archangel/object/routes/backend.js

@@ -5,15 +5,26 @@
     return object.pathBuilder([object.mountScope(), object.backendScope()]);
   };
 
+  object.backendUrl = function () {
+    return [object.rootUrl(), object.backendPath()].join('/');
+  };
+
   object.backendPathFor = function (path, args) {
     return object.pathFor([object.backendScope(), path], args);
   };
 
+  object.backendUrlFor = function (path, args) {
+    return object.backendUrl() + object.backendPathFor(path, args);
+  };
+
   object.route.backend = {
-    // Dashboard
+    // Dashboard (path)
     rootPath: object.backendPath(),
 
-    // Assets
+    // Dashboard (url)
+    rootUrl: object.backendUrl(),
+
+    // Assets (path)
     assetsPath: object.backendPathFor('assets'),
     newAssetPath: object.backendPathFor('assets/new'),
     assetPath: function (id) {

data/app/helpers/archangel/flash_helper.rb

@@ -16,7 +16,7 @@ module Archangel
 
       {
         success: "success", error: "danger", alert: "warning", notice: "info"
-      }[flash_type.to_sym] || flash_type
+      }.fetch(flash_type.to_sym, flash_type)
     end
   end
 end

data/app/models/archangel/asset.rb

@@ -34,7 +34,7 @@ module Archangel
     end
 
     def valid_file_name
-      return if /^[\w-]+\.[A-Za-z]{3}$/ =~ file_name
+      return if /^[\w-]+\.[A-Za-z]{2,}$/ =~ file_name
 
       errors.add(:file_name, Archangel.t(:file_name_invalid))
     end

data/app/models/archangel/collection.rb

@@ -12,10 +12,10 @@ module Archangel
     after_destroy :column_reset
 
     validates :name, presence: true
-    validates :slug, presence: true, uniqueness: true
+    validates :slug, presence: true, uniqueness: { scope: :site_id }
 
-    has_many :entries, inverse_of: :collection, dependent: :destroy
-    has_many :fields, inverse_of: :collection, dependent: :destroy
+    has_many :entries, inverse_of: :collection
+    has_many :fields, inverse_of: :collection
 
     accepts_nested_attributes_for :fields, reject_if: :all_blank,
                                            allow_destroy: true

data/app/models/archangel/page.rb

@@ -20,7 +20,7 @@ module Archangel
 
     validates :content, presence: true
     validates :homepage, inclusion: { in: [true, false] }
-    validates :path, uniqueness: true
+    validates :path, uniqueness: { scope: :site_id }
     validates :published_at, allow_blank: true, date: true
     validates :slug, presence: true, uniqueness: { scope: :parent_id }
     validates :title, presence: true

data/app/models/archangel/site.rb

@@ -18,18 +18,17 @@ module Archangel
       less_than_or_equal_to: Archangel.config.image_maximum_file_size
     }
     validates :name, presence: true
-    validates :theme, presence: true,
-                      inclusion: { in: Archangel.themes },
-                      allow_blank: true
+    validates :theme, inclusion: { in: Archangel.themes }, allow_blank: true
 
     has_many :assets
-    has_many :collections
     has_many :pages
     has_many :templates
     has_many :users
     has_many :widgets
 
+    has_many :collections
     has_many :entries, through: :collections
+    has_many :fields, through: :collections
 
     ##
     # Current site

data/app/models/archangel/user.rb

@@ -22,12 +22,14 @@ module Archangel
     validates :avatar, file_size: {
       less_than_or_equal_to: Archangel.config.image_maximum_file_size
     }
-    validates :email, presence: true, uniqueness: true, email: true
+    validates :email, presence: true,
+                      email: true,
+                      uniqueness: { scope: :site_id }
     validates :name, presence: true
     validates :password, presence: true, length: { minimum: 8 }, on: :create
     validates :password, allow_blank: true, length: { minimum: 8 }, on: :update
     validates :role, presence: true, inclusion: { in: Archangel::ROLES }
-    validates :username, presence: true, uniqueness: true
+    validates :username, presence: true, uniqueness: { scope: :site_id }
 
     belongs_to :site
 

data/app/models/archangel/widget.rb

@@ -13,7 +13,7 @@ module Archangel
 
     validates :content, presence: true
     validates :name, presence: true
-    validates :slug, presence: true, uniqueness: true
+    validates :slug, presence: true, uniqueness: { scope: :site_id }
 
     validate :valid_liquid_content
 

data/app/services/archangel/render_service.rb

@@ -58,17 +58,11 @@ module Archangel
     #
     def call
       liquid = ::Liquid::Template.parse(template)
-      liquid.send(liquid_renderer,
-                  stringify_assigns,
-                  liquid_options).html_safe
+      liquid.send(:render, stringify_assigns, liquid_options).html_safe
     end
 
     protected
 
-    def liquid_renderer
-      %w[development test].include?(Rails.env) ? :render! : :render
-    end
-
     def stringify_assigns
       assigns.deep_stringify_keys
     end

data/app/services/archangel/template_render_service.rb

@@ -14,9 +14,7 @@ module Archangel
       template_content = build_template(template)
 
       liquid = ::Liquid::Template.parse(template_content)
-      liquid.send(liquid_renderer,
-                  stringify_assigns,
-                  liquid_options).html_safe
+      liquid.send(:render, stringify_assigns, liquid_options).html_safe
     end
 
     protected

data/app/themes/default/assets/javascripts/default/backend.js

@@ -44,7 +44,5 @@
 //  Theme assets
 //= require default/common/cards
 //= require default/common/flash
-//= require default/common/navigation
-//= require default/common/sidebar
 //
 //= require default/backend/core

data/app/themes/default/assets/javascripts/default/backend/core.js

@@ -1,7 +1,76 @@
 (function () {
   'use strict';
 
-  document.addEventListener('DOMContentLoaded', function() {
-    // Nothing
+  jQuery(function() {
+
+    function resizeBroadcast() {
+      var timesRun = 0,
+          interval = setInterval(function() {
+            timesRun += 1;
+            if (timesRun === 5) {
+              clearInterval(interval);
+            }
+            window.dispatchEvent(new Event('resize'));
+          }, 62.5);
+    }
+
+    // Add class .active to current link
+    $('nav > ul.nav').find('a').each(function() {
+      var currentUrl = String(window.location).split('?')[0],
+          rootUrl = Archangel.route.backend.rootUrl,
+          itemHref = $($(this))[0].href;
+
+      if (currentUrl.substr(currentUrl.length - 1) === '#') {
+        currentUrl = currentUrl.slice(0, -1);
+      }
+
+      // Dashboard
+      if (itemHref === rootUrl && itemHref === currentUrl) {
+        $(this).addClass('active');
+
+        return;
+      }
+
+      // All other items
+      if (itemHref !== rootUrl && currentUrl.lastIndexOf(itemHref, 0) === 0) {
+        $(this).addClass('active');
+      }
+    });
+
+    // Dropdown Menu
+    $('nav > ul.nav').on('click', 'a', function(evt) {
+      if ($.ajaxLoad) {
+        evt.preventDefault();
+      }
+
+      if ($(this).hasClass('nav-dropdown-toggle')) {
+        $(this).parent().toggleClass('open');
+
+        resizeBroadcast();
+      }
+    });
+
+    $('.sidebar-toggler').click(function(){
+      $('body').toggleClass('sidebar-hidden');
+
+      resizeBroadcast();
+    });
+
+    $('.sidebar-minimizer').click(function(){
+      $('body').toggleClass('sidebar-minimized');
+
+      resizeBroadcast();
+    });
+
+    $('.brand-minimizer').click(function(){
+      $('body').toggleClass('brand-minimized');
+    });
+
+    $('.mobile-sidebar-toggler').click(function(){
+      $('body').toggleClass('sidebar-mobile-show');
+
+      resizeBroadcast();
+    });
+
   });
 }());

data/app/themes/default/assets/javascripts/default/common/flash.js

@@ -21,7 +21,7 @@
 
           clearInterval(fadeInternal);
 
-          if (typeof callback == 'function') callback(true);
+          if (typeof callback === 'function') { callback(true); }
         }
 
         else {

data/app/themes/default/views/layouts/auth.html.erb

@@ -22,6 +22,8 @@
             <div class="card-body">
               <%= render "archangel/shared/flash_messages" %>
 
+              <%= image_tag(current_site.logo.medium.url, alt: current_site.name, class: "mx-auto d-block") %>
+
               <%= yield %>
             </div>
           </div>

data/app/themes/default/views/layouts/backend/_sidebar.html.erb

@@ -34,12 +34,14 @@
       </li>
 
       <% if current_site.collections.present? %>
-        <li class="nav-title">
-          <%= Archangel.t(:collections) %>
-        </li>
-
-        <% for item in current_site.collections %>
+        <% current_site.collections.each_with_index do |item, index| %>
           <% if item.persisted? %>
+            <% if index.zero? %>
+              <li class="nav-title">
+                <%= Archangel.t(:collections) %>
+              </li>
+            <% end %>
+
             <li class="nav-item">
               <a class="nav-link" href="<%= backend_collection_entries_path(item) %>"><%= fa_icon("circle") %> <%= item.name %></a>
             </li>

data/app/views/archangel/shared/_flash_messages.html.erb

@@ -1,8 +1,8 @@
 <div id="alert-messages">
   <% unless flash.empty? %>
-    <% flash.delete(:timedout).each do |key, value| %>
-      <div class="alert alert-<%= flash_class_for(key) %> alert-link" role="alert">
-        <%= value %>
+    <% flash.delete(:timedout).each do |type, message| %>
+      <div class="alert alert-<%= flash_class_for(type) %> alert-link alert-dismissable" role="alert">
+        <%= message %>
       </div>
     <% end %>
   <% end %>

data/app/views/devise/shared/_links.html.erb

@@ -1,30 +1,30 @@
-<ul class="nav justify-content-center">
+<ul class="list-inline text-center">
   <%- if controller_name != "sessions" %>
-    <li class="nav-item">
+    <li class="list-inline-item">
       <%= link_to("Log in", new_session_path(resource_name), class: "nav-link") %>
     </li>
   <% end -%>
 
   <%- if Archangel.config.allow_registration && devise_mapping.registerable? && controller_name != "registrations" %>
-    <li class="nav-item">
+    <li class="list-inline-item">
       <%= link_to("Sign up", new_registration_path(resource_name), class: "nav-link") %>
     </li>
   <% end -%>
 
   <%- if devise_mapping.recoverable? && controller_name != "passwords" && controller_name != "registrations" %>
-    <li class="nav-item">
+    <li class="list-inline-item">
       <%= link_to("Forgot your password?", new_password_path(resource_name), class: "nav-link") %>
     </li>
   <% end -%>
 
   <%- if devise_mapping.confirmable? && controller_name != "confirmations" %>
-    <li class="nav-item">
+    <li class="list-inline-item">
       <%= link_to("Didn't receive confirmation instructions?", new_confirmation_path(resource_name), class: "nav-link") %>
     </li>
   <% end -%>
 
   <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != "unlocks" %>
-    <li class="nav-item">
+    <li class="list-inline-item">
       <%= link_to("Didn't receive unlock instructions?", new_unlock_path(resource_name), class: "nav-link") %>
     </li>
   <% end -%>
@@ -33,7 +33,7 @@
 <%- if devise_mapping.omniauthable? %>
   <ul class="nav justify-content-center">
     <%- resource_class.omniauth_providers.each do |provider| %>
-      <li class="nav-item">
+      <li class="list-inline-item">
         <%= link_to("Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), class: "nav-link") %>
       </li>
     <% end -%>

data/db/migrate/20171003210347_create_archangel_users.rb

@@ -52,7 +52,7 @@ class CreateArchangelUsers < ActiveRecord::Migration[5.1]
       t.timestamps null: false
     end
 
-    add_index :archangel_users, :email,                unique: true
+    add_index :archangel_users, :email
     add_index :archangel_users, :reset_password_token, unique: true
     add_index :archangel_users, :confirmation_token,   unique: true
     add_index :archangel_users, :unlock_token,         unique: true
@@ -60,7 +60,7 @@ class CreateArchangelUsers < ActiveRecord::Migration[5.1]
     add_index :archangel_users, :name
     add_index :archangel_users, :role
     add_index :archangel_users, :site_id
-    add_index :archangel_users, :username,             unique: true
+    add_index :archangel_users, :username
     add_index :archangel_users, :invitations_count
     add_index :archangel_users, :invitation_token,     unique: true
     add_index :archangel_users, :invited_by_id

data/db/migrate/20171005224054_create_archangel_pages.rb

@@ -20,7 +20,7 @@ class CreateArchangelPages < ActiveRecord::Migration[5.1]
     add_index :archangel_pages, :deleted_at
     add_index :archangel_pages, :homepage
     add_index :archangel_pages, :parent_id
-    add_index :archangel_pages, :path, unique: true
+    add_index :archangel_pages, :path
     add_index :archangel_pages, :published_at
     add_index :archangel_pages, :site_id
     add_index :archangel_pages, :slug