archangel 0.0.7 → 0.0.8

data/app/views/archangel/backend/entries/_entry.html.erb

@@ -0,0 +1,13 @@
+<tr class="entry-<%= entry.status %>" data-id="<%= entry.id %>">
+  <td class="text-center"><%= fa_icon("sort", title: Archangel.t(:sort)) %></td>
+  <% fields.each do |field| %>
+    <td><%= entry.value[field] %></td>
+  <% end %>
+  <td><%= entry.available_at %></td>
+  <td class="actions text-right">
+    <%= link_to(fa_icon("info-circle", text: Archangel.t(:show)), backend_collection_entry_path(entry.collection, entry), class: "btn btn-info btn-sm") %>
+    <%= link_to(fa_icon("check-circle", text: Archangel.t(:edit)), edit_backend_collection_entry_path(entry.collection, entry), class: "btn btn-warning btn-sm") %>
+    <%= link_to(fa_icon("times-circle", text: Archangel.t(:destroy)), backend_collection_entry_path(entry.collection, entry), class: "btn btn-danger btn-sm",
+                                        method: :delete, data: { confirm: Archangel.t(:are_you_sure) }) %>
+  </td>
+</tr>

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

@@ -33,21 +33,7 @@
                 </thead>
 
                 <tbody id="sortable">
-                  <% @entries.each do |entry| %>
-                    <tr class="<%= entry.available_status %>" data-id="<%= entry.id %>">
-                      <td class="text-center"><%= fa_icon("sort", title: Archangel.t(:sort)) %></td>
-                      <% fields.each do |field| %>
-                        <td><%= entry.value[field] %></td>
-                      <% end %>
-                      <td><%= entry.available_at %></td>
-                      <td class="actions text-right">
-                        <%= link_to(fa_icon("info-circle", text: Archangel.t(:show)), backend_collection_entry_path(entry.collection, entry), class: "btn btn-info btn-sm") %>
-                        <%= link_to(fa_icon("check-circle", text: Archangel.t(:edit)), edit_backend_collection_entry_path(entry.collection, entry), class: "btn btn-warning btn-sm") %>
-                        <%= link_to(fa_icon("times-circle", text: Archangel.t(:destroy)), backend_collection_entry_path(entry.collection, entry), class: "btn btn-danger btn-sm",
-                                                            method: :delete, data: { confirm: Archangel.t(:are_you_sure) }) %>
-                      </td>
-                    </tr>
-                  <% end %>
+                  <%= render partial: "entry", collection: @entries, locals: { fields: fields } %>
                 </tbody>
               </table>
             </div>

data/app/views/archangel/backend/pages/_page.html.erb

@@ -0,0 +1,17 @@
+<tr class="page-<%= page.status %>">
+  <td>
+    <%= page.title %>
+
+    <%= fa_icon("home") if page.homepage? %>
+  </td>
+  <td>
+    <%= URI.decode(frontend_page_path(page.path)) %>
+  </td>
+  <td><%= page.published_at %></td>
+  <td class="actions text-right">
+    <%= link_to(fa_icon("info-circle", text: Archangel.t(:show)), backend_page_path(page), class: "btn btn-info btn-sm") %>
+    <%= link_to(fa_icon("check-circle", text: Archangel.t(:edit)), edit_backend_page_path(page), class: "btn btn-warning btn-sm") %>
+    <%= link_to(fa_icon("times-circle", text: Archangel.t(:destroy)), backend_page_path(page), class: "btn btn-danger btn-sm",
+                                        method: :delete, data: { confirm: Archangel.t(:are_you_sure) }) %>
+  </td>
+</tr>

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

@@ -29,25 +29,7 @@
                 </thead>
 
                 <tbody>
-                  <% @pages.each do |page| %>
-                    <tr class="<%= page.published_status %>">
-                      <td>
-                        <%= page.title %>
-
-                        <%= fa_icon("home") if page.homepage? %>
-                      </td>
-                      <td>
-                        <%= URI.decode(frontend_page_path(page.path)) %>
-                      </td>
-                      <td><%= page.published_at %></td>
-                      <td class="actions text-right">
-                        <%= link_to(fa_icon("info-circle", text: Archangel.t(:show)), backend_page_path(page), class: "btn btn-info btn-sm") %>
-                        <%= link_to(fa_icon("check-circle", text: Archangel.t(:edit)), edit_backend_page_path(page), class: "btn btn-warning btn-sm") %>
-                        <%= link_to(fa_icon("times-circle", text: Archangel.t(:destroy)), backend_page_path(page), class: "btn btn-danger btn-sm",
-                                                            method: :delete, data: { confirm: Archangel.t(:are_you_sure) }) %>
-                      </td>
-                    </tr>
-                  <% end %>
+                  <%= render partial: "page", collection: @pages %>
                 </tbody>
               </table>
             </div>

data/app/views/archangel/backend/sites/_form.html.erb

@@ -21,12 +21,6 @@
     <%= f.input :theme, as: :theme %>
     <%= f.input :locale, as: :language %>
 
-    <%= f.input :favicon, as: :file %>
-    <%= f.input :favicon_cache, as: :hidden %>
-    <%= f.input :remove_favicon, as: :boolean,
-                                 checked_value: true,
-                                 unchecked_value: false if f.object.favicon? %>
-
     <%= f.input :meta_keywords, as: :meta_keywords %>
     <%= f.input :meta_description %>
   </div>

data/app/views/archangel/backend/templates/_template.html.erb

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

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

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

data/app/views/archangel/backend/users/_user.html.erb

@@ -0,0 +1,11 @@
+<tr>
+  <td class="text-center"><%= image_tag(user.avatar.tiny.url, class: "img-center img-circle img-responsive", alt: user.username) %></td>
+  <td><%= user.name %></td>
+  <td><%= user.username %></td>
+  <td class="actions text-right">
+    <%= link_to(fa_icon("info-circle", text: Archangel.t(:show)), backend_user_path(user), class: "btn btn-info btn-sm") %>
+    <%= link_to(fa_icon("check-circle", text: Archangel.t(:edit)), edit_backend_user_path(user), class: "btn btn-warning btn-sm") %>
+    <%= link_to(fa_icon("times-circle", text: Archangel.t(:destroy)), backend_user_path(user), class: "btn btn-danger btn-sm",
+                                        method: :delete, data: { confirm: Archangel.t(:are_you_sure) }) %>
+  </td>
+</tr>

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

@@ -29,19 +29,7 @@
                 </thead>
 
                 <tbody>
-                  <% @users.each do |user| %>
-                    <tr>
-                      <td class="text-center"><%= image_tag(user.avatar.tiny.url, class: "img-center img-circle img-responsive", alt: user.username) %></td>
-                      <td><%= user.name %></td>
-                      <td><%= user.username %></td>
-                      <td class="actions text-right">
-                        <%= link_to(fa_icon("info-circle", text: Archangel.t(:show)), backend_user_path(user), class: "btn btn-info btn-sm") %>
-                        <%= link_to(fa_icon("check-circle", text: Archangel.t(:edit)), edit_backend_user_path(user), class: "btn btn-warning btn-sm") %>
-                        <%= link_to(fa_icon("times-circle", text: Archangel.t(:destroy)), backend_user_path(user), class: "btn btn-danger btn-sm",
-                                                            method: :delete, data: { confirm: Archangel.t(:are_you_sure) }) %>
-                      </td>
-                    </tr>
-                  <% end %>
+                  <%= render partial: "user", collection: @users %>
                 </tbody>
               </table>
             </div>

data/app/views/archangel/backend/widgets/_widget.html.erb

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

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

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

data/bin/citest

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+bin/test

data/bin/test

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+bundle exec rake dummy_app
+bundle exec rake test

data/config/locales/active_record.en.yml

@@ -53,12 +53,10 @@ en:
         template_id: Template
         title: Title
       archangel/site:
-        favicon: Favicon
         logo: Logo
         meta_description: META Description
         meta_keywords: META Keywords
         name: Name
-        remove_favicon: Remove Favicon
         remove_logo: Remove Logo
         theme: Theme
       archangel/template:

data/config/locales/en.yml

@@ -24,9 +24,9 @@ en:
       cancel: Cancel
       custom_range: Custom
       date_format: "%Y-%m-%d"
-      date_format_js: YYYY-MM-DD
+      date_format_js: "YYYY-MM-DD"
       datetime_format: "%Y-%m-%d %H:%M"
-      datetime_format_js: YYYY-MM-DD HH:MM
+      datetime_format_js: "YYYY-MM-DD HH:MM"
       days:
         sunday: Sun
         monday: Mon
@@ -51,7 +51,7 @@ en:
         december: December
       separator: " - "
       time_format: "%H:%M"
-      time_format_js: HH:MM
+      time_format_js: "HH:MM"
       to: To
       week: W
     destroy: Destroy

data/db/migrate/20171003191001_create_archangel_sites.rb

@@ -5,7 +5,6 @@ class CreateArchangelSites < ActiveRecord::Migration[5.1]
       t.string :theme
       t.string :locale, null: false, default: "en"
       t.string :logo
-      t.string :favicon
       t.string :meta_keywords
       t.string :meta_description
       t.datetime :deleted_at

data/docs/Developers.md

@@ -16,21 +16,12 @@ Generate a dummy application. You will be required to generate a dummy applicati
 $ bundle exec rake dummy_app
 ```
 
-Run tests
+Run tests with any of the following
 
 ```
 $ bundle exec rake
-```
-
-or
-
-```
 $ bundle exec rake spec
-```
-
-or
-
-```
+$ bundle exec rake test
 $ bundle exec rspec spec
 ```
 

data/docs/Extension/Developers.md

@@ -2,7 +2,7 @@
 
 Extensions are meant to extend the functionality of Archangel. Documentation for theme development is [also available](https://github.com/archangel/archangel/blob/master/docs/Theme/Developers.md).
 
-Feeling bored? Looking for ideas? Take a look at possible [ideas for extensions](https://github.com/archangel/archangel/blob/master/docs/Extension/Ideas.md).
+Bored? Take a look at the [TODO list for Archangel](https://trello.com/b/iAeANJRl).
 
 ## Generate an extension
 

data/docs/Release.md

@@ -14,7 +14,13 @@
     * `1.3.0-beta`
     * `2.0.0-rc.1`
 
-2. Build the gem
+  a. If this is a major or minor version update, change the `README.md` file to reflect the version
+
+      ```
+      gem "archangel", "~> x.y"
+      ```
+
+3. Build the gem
 
    ```
    $ bundle exec rake build

data/lib/archangel.rb

@@ -88,5 +88,18 @@ module Archangel
     def themes
       [THEME_DEFAULT] + THEMES
     end
+
+    ##
+    # Reserved keywords for page slugs
+    #
+    # This is an array keywords that are not allowed to be used for Page slugs.
+    #
+    # Example
+    #     Archangel.reserved_page_keywords #=> ["auth", "backend", ""]
+    #
+    # @return [Array] reserved keywords for page slugs
+    def reserved_page_keywords
+      %i[auth_path backend_path frontend_path]
+    end
   end
 end

data/lib/archangel/command/templates/extension/Gemfile

@@ -16,7 +16,6 @@ end
 
 group :test do
   gem "capybara", "~> 2.17"
-  gem "coveralls", "~> 0.8"
   gem "database_cleaner", "~> 1.6"
   gem "factory_bot_rails", "~> 4.8"
   gem "launchy", "~> 2.4"

data/lib/archangel/command/templates/extension/README.md

@@ -46,21 +46,12 @@ First, generate a dummy application. You will be required to generate a dummy ap
 $ bundle exec rake dummy_app
 ```
 
-Run tests
+Run tests with any of the following
 
 ```
 $ bundle exec rake
-```
-
-or
-
-```
 $ bundle exec rake spec
-```
-
-or
-
-```
+$ bundle exec rake test
 $ bundle exec rspec spec
 ```
 

data/lib/archangel/command/templates/extension/Rakefile

@@ -19,7 +19,11 @@ task default: :spec
 
 desc "Generates a dummy app for testing"
 task :dummy_app do
+  # ENV["DB"] = "sqlite3" # mysql, postgresql, sqlite3, etc
   ENV["LIB_NAME"] = "<%= extension_name %>"
 
   Rake::Task["dummy:generate"].invoke
 end
+
+desc "Run RSpec tests"
+task test: :spec

data/lib/archangel/config.rb

@@ -9,13 +9,15 @@ module Archangel
 
     attr_config allow_registration: false,
                 asset_maximum_file_size: 2.megabytes,
-                asset_extension_whitelist: %i[css gif jpeg jpg js png],
+                asset_extension_whitelist: %i[gif jpeg jpg png],
                 auth_path: "account",
                 backend_path: "backend",
-                favicon_extension_whitelist: %i[gif ico jpeg jpg png],
-                favicon_maximum_file_size: 2.megabytes,
                 frontend_path: "",
                 image_extension_whitelist: %i[gif jpeg jpg png],
                 image_maximum_file_size: 2.megabytes
+
+    def keys_in(keys)
+      to_h.select { |key| keys.include?(key) }
+    end
   end
 end

data/lib/archangel/engine.rb

@@ -6,7 +6,7 @@ module Archangel
   #
   class Engine < ::Rails::Engine
     isolate_namespace Archangel
-    engine_name "archangel"
+    engine_name :archangel
 
     require "responders"
 

data/lib/archangel/liquid/drop.rb

@@ -10,8 +10,8 @@ module Archangel
     #
     class Drop < ::Liquid::Drop
       class << self
-        attr_accessor :_attributes
         attr_accessor :_associations
+        attr_accessor :_attributes
       end
 
       def self.inherited(base)
@@ -31,68 +31,6 @@ module Archangel
         end
       end
 
-      def self.drop_class_for(resource)
-        if self == Archangel::Liquid::Drop
-          resource.drop_class || Archangel::Liquid::Drop
-        else
-          self
-        end
-      end
-
-      def self.dropify(resource, options = {})
-        class_name = options[:class_name]
-
-        drop_class = if class_name
-                       class_name.constantize
-                     else
-                       drop_class_for(resource)
-                     end
-
-        drop_class.new(resource, options.except(:class_name))
-      end
-
-      def self.belongs_to(*attrs)
-        associate(:belongs_to, attrs)
-      end
-
-      def self.has_many(*attrs)
-        associate(:has_many, attrs)
-      end
-
-      def self.associate(type, attrs)
-        self._associations = _associations.dup
-
-        associate_attributes(type, attrs)
-      end
-
-      def self.associate_attributes(type, attrs)
-        options = attrs.extract_options!
-
-        attrs.each do |attr|
-          next if method_defined?(attr)
-
-          define_method_attribute(attr)
-
-          _associations[attr] = { type: type, options: options }
-        end
-      end
-
-      def self.define_method_attribute(attr)
-        options = attrs.extract_options!
-
-        define_method attr do
-          value = instance_variable_get("@_#{attr}")
-          return value if value
-
-          association = object.send(attr)
-          return nil if association.blank?
-
-          drop_instance = Archangel::Liquid::Drop.dropify(association, options)
-
-          instance_variable_set("@_#{attr}", drop_instance)
-        end
-      end
-
       def initialize(object, _options = {})
         @object = object
       end
@@ -112,10 +50,6 @@ module Archangel
         as_json.to_json(options)
       end
 
-      def before_method(method)
-        attributes[method.to_s]
-      end
-
       def inspect
         "#<#{self.class.name} " \
           "@object: #{object.inspect} @attributes: #{attributes.inspect}>"