archangel 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f93fdac4c77817cecce54f5e7858937109ca282476a44d9700ab80be221de8b
-  data.tar.gz: 47a9de320b4483ade84a1daad9b4323293c539ab311b59def727f4592334d8e1
+  metadata.gz: 1ada0c8ed4af07cb9635a364c3ac186aaeff079823aa2d63113b9386faa5dd74
+  data.tar.gz: 59820ae9c8fed07aef979c3f44eec939645e611bb05ce104b53ff54c9f4904f2
 SHA512:
-  metadata.gz: 7edcc97f656802011fc4fdfc841334706393bd7415badc423e22dcc98c6de14390071e2b05326f25341867f9804bf7276a74456275f216f8506625e73c3c4345
-  data.tar.gz: 727fc92ce25f28c0f41fd935952d86f90cb4593ac60b02935e26a812fdab36ea28638d179c037f2b59f829ea0e8cb3bea2d0a77d3c8c8eac536f2e260f322a37
+  metadata.gz: f6169656cff9ed37878dc356ce5a47a61745e3829ed2d94fc646f5ede5017c84fa5587e28a7bffe1e3e0ed798ebfc3fb50b8b0a1b50a699fdc53c024fb80cc82
+  data.tar.gz: 5c6be4b10f12046913e9723f42fbb96cd28ccf138b938fa30cc0152b0570a0dc8a9f99aef3b293281855fa9da1031782d3330ec517922b3731c5b780e712a9b9

data/.travis.yml

@@ -2,14 +2,22 @@ sudo: false
 language: ruby
 cache:
   bundler: true
+env:
+  global:
+    - CC_TEST_REPORTER_ID=10625f04e4c8c9fe7c22d49639163f1427fe16bc253aabcb316edbe43c41270b
 bundler_args: --without production --jobs=3 --retry=3
 before_install:
   - gem update --system
   - gem --version
 install: ruby -S bundle install
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
 script:
-  - bundle exec rake dummy_app
-  - bundle exec rake spec
+  - bin/citest
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 rvm:
   - 2.2.10
   - 2.3.7

data/Gemfile

@@ -18,13 +18,13 @@ end
 
 group :development, :test do
   gem "launchy", "~> 2.4"
+  gem "pg", "~> 1.0"
   gem "pry-byebug", "~> 3.5"
   gem "sqlite3", ">= 1.3", platforms: %i[ruby mswin mswin64 mingw x64_mingw]
 end
 
 group :test do
   gem "capybara", "~> 3.0"
-  gem "coveralls", "~> 0.8"
   gem "database_cleaner", "~> 1.6"
   gem "factory_bot_rails", "~> 4.8"
   gem "poltergeist", "~> 1.18"

data/README.md

@@ -3,7 +3,7 @@
 ** Archangel is currently under development. It is not ready for production use. **
 
 [![Travis CI](https://travis-ci.org/archangel/archangel.svg?branch=master)](https://travis-ci.org/archangel/archangel)
-[![Coverage Status](https://coveralls.io/repos/github/archangel/archangel/badge.svg?branch=master)](https://coveralls.io/github/archangel/archangel?branch=master)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/ecd913526457e79b49bd/test_coverage)](https://codeclimate.com/github/archangel/archangel/test_coverage)
 [![Code Climate](https://codeclimate.com/github/archangel/archangel/badges/gpa.svg)](https://codeclimate.com/github/archangel/archangel)
 [![Inline docs](http://inch-ci.org/github/archangel/archangel.svg?branch=master)](http://inch-ci.org/github/archangel/archangel)
 
@@ -31,7 +31,7 @@ Deploy a sample application to [Heroku](https://www.heroku.com/) to play with.
 Add to your application's Gemfile
 
 ```
-gem "archangel"
+gem "archangel", "< 1.0"
 ```
 
 Run the bundle command
@@ -52,7 +52,7 @@ Run the install generator with seed data
 $ bundle exec rails g archangel:install --seed
 ```
 
-Seed data can be created separately by running `rake db:seed`
+Seed data can be created separately by running `bundle exec rails db:seed`
 
 ## Updating
 

data/Rakefile

@@ -17,13 +17,6 @@ RSpec::Core::RakeTask.new
 
 task default: :spec
 
-desc "Generates a dummy app for Archangel"
-task :dummy_app do
-  ENV["LIB_NAME"] = "archangel"
-
-  Rake::Task["dummy:generate"].invoke
-end
-
 desc "Remove any generated files and directories"
 task :clean do
   %w[
@@ -34,3 +27,13 @@ task :clean do
     .yardoc coverage doc pkg archangel_* node_modules pkg spec/dummy
   ].each { |directory| rm_rf directory }
 end
+
+desc "Generates a dummy app for Archangel"
+task :dummy_app do
+  ENV["LIB_NAME"] = "archangel"
+
+  Rake::Task["dummy:generate"].invoke
+end
+
+desc "Run RSpec tests"
+task test: :spec

data/app/controllers/archangel/backend/sites_controller.rb

@@ -145,8 +145,7 @@ module Archangel
       protected
 
       def permitted_attributes
-        %w[favicon locale logo meta_description meta_keywords name
-           remove_favicon remove_logo theme]
+        %w[locale logo meta_description meta_keywords name remove_logo theme]
       end
 
       def set_resource

data/app/controllers/archangel/backend/users_controller.rb

@@ -309,6 +309,7 @@ module Archangel
       def set_resources
         @users = current_site.users
                              .where.not(id: current_user.id)
+                             .order(name: :asc)
                              .page(page_num).per(per_page)
 
         authorize @users
@@ -319,7 +320,6 @@ module Archangel
 
         @user = current_site.users
                             .where.not(id: current_user.id)
-                            .order(name: :asc)
                             .find_by!(username: resource_id)
 
         authorize @user

data/app/controllers/concerns/archangel/seoable_concern.rb

@@ -32,8 +32,7 @@ module Archangel
         canonical:   request.url,
         image_src:   current_site.logo.url,
         description: current_site.meta_description,
-        keywords:    current_site.meta_keywords.to_s.split(","),
-        icon:        current_site.favicon.url
+        keywords:    current_site.meta_keywords.to_s.split(",")
       }
     end
   end

data/app/models/archangel/entry.rb

@@ -34,7 +34,7 @@ module Archangel
     #
     # @return [String] available status
     #
-    def available_status
+    def status
       if available?
         if available_at > Time.now
           "future-available"

data/app/models/archangel/page.rb

@@ -57,7 +57,7 @@ module Archangel
     #
     # @return [String] publication status
     #
-    def published_status
+    def status
       if published?
         if published_at > Time.now
           "future-published"
@@ -132,9 +132,7 @@ module Archangel
     end
 
     def reserved_paths
-      Archangel.config.to_h.select do |key, _val|
-        %i[auth_path backend_path frontend_path].include?(key)
-      end.values
+      Archangel.config.keys_in(Archangel.reserved_page_keywords).values
     end
   end
 end

data/app/models/archangel/site.rb

@@ -7,12 +7,8 @@ module Archangel
   class Site < ApplicationRecord
     acts_as_paranoid
 
-    mount_uploader :favicon, Archangel::FaviconUploader
     mount_uploader :logo, Archangel::LogoUploader
 
-    validates :favicon, file_size: {
-      less_than_or_equal_to: Archangel.config.favicon_maximum_file_size
-    }
     validates :locale, presence: true, inclusion: { in: Archangel::LANGUAGES }
     validates :logo, file_size: {
       less_than_or_equal_to: Archangel.config.image_maximum_file_size

data/app/models/archangel/template.rb

@@ -18,6 +18,15 @@ module Archangel
                optional: true
     belongs_to :site
 
+    ##
+    # Return string of partial status.
+    #
+    # @return [String] partial status
+    #
+    def status
+      partial? ? "partial" : "full"
+    end
+
     protected
 
     def valid_liquid_content

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

@@ -46,3 +46,4 @@
 //= require default/common/flash
 //
 //= require default/backend/core
+//= require default/backend/templates

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

@@ -0,0 +1,26 @@
+$(function() {
+  'use strict';
+
+  // New Template
+  $('#template_partial').change(function() {
+    var checked = this.checked;
+
+    if (checked === true) {
+      $('#template_parent_id option:selected').prop('selected', false);
+    }
+
+    $('.new_template .template_parent').toggle(!checked);
+  });
+
+  // Edit Template
+  $('#template_partial').change(function() {
+    var checked = this.checked;
+
+    if (checked === true) {
+      $('#template_parent_id option:selected').prop('selected', false);
+    }
+
+    $('.edit_template .template_parent').toggle(!checked);
+  }).trigger('change');
+
+});

data/app/themes/default/assets/stylesheets/default/auth/core.scss

@@ -1,15 +1,20 @@
-// Bootstrap theme variables
+// Theme variables
 //
 @import '../common/variables';
 //
-// Bootstrap
+// 3rd party (from gems)
 //
 @import 'bootstrap';
+@import 'font-awesome';
+//
+// 3rd party (from vendor)
 //
-// Bootstrap theme
+// none
+//
+// 3rd party overwrites
 //
 @import '../common/bootstrap';
 //
-// 3rd party
+// Theme styles
 //
-@import 'font-awesome';
+// none

data/app/themes/default/assets/stylesheets/default/backend/bootstrap/_tables.scss

@@ -0,0 +1,40 @@
+.table {
+  tr {
+    &.entry-available,
+    &.entry-future-available,
+    &.entry-unavailable,
+    &.page-future-published,
+    &.page-published,
+    &.page-unpublished,
+    &.template-full,
+    &.template-partial {
+      td:first-child {
+        border-left-style: solid;
+        border-left-width: 2px;
+      }
+    }
+
+    &.entry-available,
+    &.page-published,
+    &.template-full {
+      td:first-child {
+        border-left-color: $green;
+      }
+    }
+
+    &.entry-unavailable,
+    &.page-unpublished,
+    &.template-partial {
+      td:first-child {
+        border-left-color: $cyan;
+      }
+    }
+
+    &.entry-future-available,
+    &.page-future-published {
+      td:first-child {
+        border-left-color: $orange;
+      }
+    }
+  }
+}

data/app/themes/default/assets/stylesheets/default/backend/core.scss

@@ -1,18 +1,10 @@
-// Bootstrap theme variables
+// Theme variables
 //
 @import '../common/variables';
 //
-// Bootstrap
-//
-@import 'bootstrap';
-//
-// Bootstrap theme
-//
-@import '../common/bootstrap';
-@import '../common/selectize';
-//
 // 3rd party (from gems)
 //
+@import 'bootstrap';
 @import 'font-awesome';
 //
 // 3rd party (from vendor)
@@ -20,3 +12,12 @@
 @import 'daterangepicker/daterangepicker';
 @import 'trumbowyg/trumbowyg';
 @import 'trumbowyg/plugins/colors/trumbowyg.colors';
+//
+// 3rd party overwrites
+//
+@import '../common/bootstrap';
+@import '../common/selectize';
+//
+// Theme styles
+//
+@import 'bootstrap/tables';

data/app/themes/default/assets/stylesheets/default/frontend/core.scss

@@ -1,15 +1,20 @@
-// Bootstrap theme variables
+// Theme variables
 //
 @import '../common/variables';
 //
-// Bootstrap
+// 3rd party (from gems)
 //
 @import 'bootstrap';
+@import 'font-awesome';
+//
+// 3rd party (from vendor)
 //
-// Bootstrap theme
+// none
+//
+// 3rd party overwrites
 //
 @import '../common/bootstrap';
 //
-// 3rd party
+// Theme styles
 //
-@import 'font-awesome';
+// none

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

@@ -6,8 +6,6 @@
 
     <title><%= content_for?(:title) ? yield(:title) : Archangel.t(:archangel) %></title>
 
-    <link rel="shortcut icon" href="<%= current_site.favicon.url %>">
-
     <%= csrf_meta_tags %>
 
     <%= stylesheet_link_tag "#{current_theme}/auth", media: "all" %>

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

@@ -6,8 +6,6 @@
 
     <title><%= content_for?(:title) ? yield(:title) : Archangel.t(:archangel) %></title>
 
-    <link rel="shortcut icon" href="<%= current_site.favicon.url %>">
-
     <%= csrf_meta_tags %>
 
     <%= stylesheet_link_tag "#{current_theme}/backend", media: "all" %>

data/app/views/archangel/backend/assets/_asset.html.erb

@@ -0,0 +1,12 @@
+<tr>
+  <td><%= image_tag(asset.file.tiny.url, alt: asset.file_name) %></td>
+  <td><%= asset.file_name %></td>
+  <td><%= asset.content_type %></td>
+  <td><%= number_to_human_size(asset.file_size) %></td>
+  <td class="actions text-right">
+    <%= link_to(fa_icon("info-circle", text: Archangel.t(:show)), backend_asset_path(asset), class: "btn btn-info btn-sm") %>
+    <%= link_to(fa_icon("check-circle", text: Archangel.t(:edit)), edit_backend_asset_path(asset), class: "btn btn-warning btn-sm") %>
+    <%= link_to(fa_icon("times-circle", text: Archangel.t(:destroy)), backend_asset_path(asset), class: "btn btn-danger btn-sm",
+                                        method: :delete, data: { confirm: Archangel.t(:are_you_sure) }) %>
+  </td>
+</tr>

data/app/views/archangel/backend/assets/index.html.erb

@@ -30,20 +30,7 @@
                 </thead>
 
                 <tbody>
-                  <% @assets.each do |asset| %>
-                    <tr>
-                      <td><%= image_tag(asset.file.tiny.url, alt: asset.file_name) %></td>
-                      <td><%= asset.file_name %></td>
-                      <td><%= asset.content_type %></td>
-                      <td><%= number_to_human_size(asset.file_size) %></td>
-                      <td class="actions text-right">
-                        <%= link_to(fa_icon("info-circle", text: Archangel.t(:show)), backend_asset_path(asset), class: "btn btn-info btn-sm") %>
-                        <%= link_to(fa_icon("check-circle", text: Archangel.t(:edit)), edit_backend_asset_path(asset), class: "btn btn-warning btn-sm") %>
-                        <%= link_to(fa_icon("times-circle", text: Archangel.t(:destroy)), backend_asset_path(asset), class: "btn btn-danger btn-sm",
-                                                            method: :delete, data: { confirm: Archangel.t(:are_you_sure) }) %>
-                      </td>
-                    </tr>
-                  <% end %>
+                  <%= render partial: "asset", collection: @assets %>
                 </tbody>
               </table>
             </div>

data/app/views/archangel/backend/collections/_collection.html.erb

@@ -0,0 +1,10 @@
+<tr>
+  <td><%= collection.name %></td>
+  <td><%= collection.slug %></td>
+  <td class="actions text-right">
+    <%= link_to(fa_icon("info-circle", text: Archangel.t(:show)), backend_collection_path(collection), class: "btn btn-info btn-sm") %>
+    <%= link_to(fa_icon("check-circle", text: Archangel.t(:edit)), edit_backend_collection_path(collection), class: "btn btn-warning btn-sm") %>
+    <%= link_to(fa_icon("times-circle", text: Archangel.t(:destroy)), backend_collection_path(collection), class: "btn btn-danger btn-sm",
+                                        method: :delete, data: { confirm: Archangel.t(:are_you_sure) }) %>
+  </td>
+</tr>

data/app/views/archangel/backend/collections/index.html.erb

@@ -28,18 +28,7 @@
                 </thead>
 
                 <tbody>
-                  <% @collections.each do |collection| %>
-                    <tr>
-                      <td><%= collection.name %></td>
-                      <td><%= collection.slug %></td>
-                      <td class="actions text-right">
-                        <%= link_to(fa_icon("info-circle", text: Archangel.t(:show)), backend_collection_path(collection), class: "btn btn-info btn-sm") %>
-                        <%= link_to(fa_icon("check-circle", text: Archangel.t(:edit)), edit_backend_collection_path(collection), class: "btn btn-warning btn-sm") %>
-                        <%= link_to(fa_icon("times-circle", text: Archangel.t(:destroy)), backend_collection_path(collection), class: "btn btn-danger btn-sm",
-                                                            method: :delete, data: { confirm: Archangel.t(:are_you_sure) }) %>
-                      </td>
-                    </tr>
-                  <% end %>
+                  <%= render partial: "collection", collection: @collections %>
                 </tbody>
               </table>
             </div>