archangel 0.0.8 → 0.3.0

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

@@ -14,6 +14,7 @@ module Archangel
     # Record limt count
     #
     # @return [Integer] the record count limit
+    #
     def per_page
       params.fetch(:per, per_page_default).to_i
     end
@@ -21,6 +22,7 @@ module Archangel
     # Current page number
     #
     # @return [Integer] the page number
+    #
     def page_num
       params.fetch(Kaminari.config.param_name, 1).to_i
     end

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

@@ -15,24 +15,25 @@ module Archangel
     # Set meta tags
     #
     # @param meta_tags [Hash] list of meta tags
+    #
     def apply_meta_tags(meta_tags = {})
-      set_meta_tags(meta_tags.reject { |_name, value| value.blank? })
+      meta = meta_tags.reject { |_name, value| value.blank? }
+
+      set_meta_tags(meta)
     end
 
     protected
 
     def apply_default_meta_tags
-      apply_meta_tags default_meta_tags
+      apply_meta_tags(default_meta_tags)
     end
 
     def default_meta_tags
       {
-        reverse:     true,
-        site:        current_site.name,
-        canonical:   request.url,
-        image_src:   current_site.logo.url,
-        description: current_site.meta_description,
-        keywords:    current_site.meta_keywords.to_s.split(",")
+        reverse: true,
+        site: current_site.name,
+        canonical: request.url,
+        image_src: current_site.logo.url
       }
     end
   end

data/app/models/archangel/metatag.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Archangel
+  ##
+  # Metatag model
+  #
+  class Metatag < ApplicationRecord
+    validates :name, uniqueness: { scope: %i[metatagable_type metatagable_id] }
+
+    belongs_to :metatagable, polymorphic: true
+  end
+end

data/app/models/archangel/page.rb

@@ -22,7 +22,8 @@ module Archangel
     validates :homepage, inclusion: { in: [true, false] }
     validates :path, uniqueness: { scope: :site_id }
     validates :published_at, allow_blank: true, date: true
-    validates :slug, presence: true, uniqueness: { scope: :parent_id }
+    validates :slug, presence: true,
+                     uniqueness: { scope: %i[parent_id site_id] }
     validates :title, presence: true
 
     validate :valid_liquid_content
@@ -32,6 +33,11 @@ module Archangel
     belongs_to :site
     belongs_to :template, -> { where(partial: false) }, optional: true
 
+    has_many :metatags, as: :metatagable
+
+    accepts_nested_attributes_for :metatags, reject_if: :all_blank,
+                                             allow_destroy: true
+
     scope :published, (lambda do
       where.not(published_at: nil).where("published_at <= ?", Time.now)
     end)

data/app/models/archangel/site.rb

@@ -17,15 +17,20 @@ module Archangel
     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
 
+    has_many :metatags, as: :metatagable
+
+    accepts_nested_attributes_for :metatags, reject_if: :all_blank,
+                                             allow_destroy: true
+
     ##
     # Current site
     #

data/app/models/archangel/user.rb

@@ -9,6 +9,11 @@ module Archangel
 
     mount_uploader :avatar, Archangel::AvatarUploader
 
+    typed_store :preferences, coder: JSON do |s|
+      s.boolean :newsletter, default: false
+      s.datetime :preferred_at, default: Time.now
+    end
+
     before_validation :parameterize_username
 
     after_initialize :column_default
@@ -31,6 +36,8 @@ module Archangel
     validates :role, presence: true, inclusion: { in: Archangel::ROLES }
     validates :username, presence: true, uniqueness: { scope: :site_id }
 
+    validates :newsletter, inclusion: { in: [true, false] }
+
     belongs_to :site
 
     ##

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

@@ -8,9 +8,19 @@
     <%= f.association :parent, prompt: :translate %>
     <%= f.association :template, prompt: :translate %>
     <%= f.input :content, as: :wysiwyg %>
-    <%= f.input :meta_keywords, as: :meta_keywords %>
-    <%= f.input :meta_description %>
     <%= f.input :published_at, as: :date_time_picker %>
+
+    <div class="form-group page_metatags">
+      <h3><%= Archangel.t(:metatags) %></h3>
+
+      <%= f.simple_fields_for :metatags do |metatag| %>
+        <%= render "metatag_fields", f: metatag %>
+      <% end %>
+
+      <div class="links">
+        <%= link_to_add_association Archangel.t(:add_metatag), f, :metatags %>
+      </div>
+    </div>
   </div>
 
   <div class="form-actions text-right">

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

@@ -0,0 +1,6 @@
+<div class="nested-fields">
+  <%= f.input :name %>
+  <%= f.input :content %>
+
+  <%= link_to_remove_association Archangel.t(:remove_metatag), f %>
+</div>

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

@@ -28,16 +28,6 @@
             <%= @page.slug %>
           </p>
 
-          <p>
-            <strong><%= Archangel.t(:meta_keywords) %>:</strong>
-            <%= @page.meta_keywords %>
-          </p>
-
-          <p>
-            <strong><%= Archangel.t(:meta_description) %>:</strong>
-            <%= @page.meta_description %>
-          </p>
-
           <p>
             <strong><%= Archangel.t(:content) %>:</strong>
             <%= @page.content %>

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

@@ -23,6 +23,8 @@
 
     <%= f.input :password, as: :password %>
     <%= f.input :password_confirmation, as: :password %>
+
+    <%= f.input :newsletter, as: :boolean, inline_label: Archangel.t(:subscribe_to_newsletter) %>
   </div>
 
   <div class="form-actions text-right">

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

@@ -21,8 +21,17 @@
     <%= f.input :theme, as: :theme %>
     <%= f.input :locale, as: :language %>
 
-    <%= f.input :meta_keywords, as: :meta_keywords %>
-    <%= f.input :meta_description %>
+    <div class="form-group site_metatags">
+      <h3><%= Archangel.t(:metatags) %></h3>
+
+      <%= f.simple_fields_for :metatags do |metatag| %>
+        <%= render "metatag_fields", f: metatag %>
+      <% end %>
+
+      <div class="links">
+        <%= link_to_add_association Archangel.t(:add_metatag), f, :metatags %>
+      </div>
+    </div>
   </div>
 
   <div class="form-actions text-right">

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

@@ -0,0 +1,6 @@
+<div class="nested-fields">
+  <%= f.input :name %>
+  <%= f.input :content %>
+
+  <%= link_to_remove_association Archangel.t(:remove_metatag), f %>
+</div>

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

@@ -31,16 +31,6 @@
             <strong><%= Archangel.t(:locale) %>:</strong>
             <%= @site.locale %>
           </p>
-
-          <p>
-            <strong><%= Archangel.t(:meta_keywords) %>:</strong>
-            <%= @site.meta_keywords %>
-          </p>
-
-          <p>
-            <strong><%= Archangel.t(:meta_description) %>:</strong>
-            <%= @site.meta_description %>
-          </p>
         </div>
       </div>
     </div>

data/app/views/archangel/frontend/pages/show.json.jbuilder

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 json.page do
-  json.extract! @page, :id, :title, :path, :content, :meta_keywords,
-                :meta_description
+  json.extract! @page, :id, :title, :path, :content
 
   json.published_at @page.published_at.strftime("%F %T")
   json.published_at_timestamp @page.published_at.to_time.to_i

data/archangel.gemspec

@@ -14,6 +14,14 @@ Gem::Specification.new do |s|
   s.summary     = "Archangel CMS"
   s.description = "Archangel is a Rails CMS"
   s.license     = "MIT"
+  s.metadata    = {
+    "bug_tracker_uri" => "https://github.com/archangel/archangel/issues",
+    "documentation_uri" =>
+      "https://www.rubydoc.info/github/archangel/archangel/master",
+    "homepage_uri" => "https://github.com/archangel/archangel",
+    "source_code_uri" => "https://github.com/archangel/archangel",
+    "wiki_uri" => "https://github.com/archangel/archangel/wiki"
+  }
   s.files       = `git ls-files -z`.split("\x0")
   s.executables = ["archangel"]
 
@@ -21,31 +29,30 @@ Gem::Specification.new do |s|
 
   s.add_dependency "jquery-rails", "~> 4.1", ">= 4.1.0"
   s.add_dependency "rails", "~> 5.1", ">= 5.1.4"
-  s.add_dependency "sass-rails", "~> 5.0", ">= 5.0.0"
   s.add_dependency "thor", "~> 0.19", ">= 0.19.0"
-  s.add_dependency "uglifier", "~> 4.1", ">= 4.1.8"
 
+  s.add_dependency "activerecord-typedstore", "~> 1.2"
   s.add_dependency "acts_as_list", "~> 0.9"
-  s.add_dependency "acts_as_tree", "~> 2.7"
-  s.add_dependency "anyway_config", "~> 1.2"
+  s.add_dependency "acts_as_tree", "~> 2.8"
+  s.add_dependency "anyway_config", "~> 1.4"
   s.add_dependency "bootstrap", "~> 4.1"
   s.add_dependency "carrierwave", "~> 1.2"
   s.add_dependency "cocoon", "~> 1.2"
   s.add_dependency "date_validator", "~> 0.9"
-  s.add_dependency "devise", "~> 4.4"
+  s.add_dependency "devise", "~> 4.5"
   s.add_dependency "devise_invitable", "~> 1.7"
-  s.add_dependency "file_validators", "~> 2.1"
+  s.add_dependency "file_validators", "~> 2.3"
   s.add_dependency "font-awesome-rails", "~> 4.7"
-  s.add_dependency "highline", "~> 1.7"
+  s.add_dependency "highline", "~> 2.0"
   s.add_dependency "jbuilder", "~> 2.7"
   s.add_dependency "kaminari", "~> 1.1"
   s.add_dependency "liquid", "~> 4.0"
-  s.add_dependency "meta-tags", "~> 2.9"
-  s.add_dependency "mini_magick", "~> 4.8"
+  s.add_dependency "meta-tags", "~> 2.10"
+  s.add_dependency "mini_magick", "~> 4.9"
   s.add_dependency "momentjs-rails", "~> 2.20"
   s.add_dependency "paranoia", "~> 2.4"
-  s.add_dependency "popper_js", "~> 1.12"
-  s.add_dependency "pundit", "~> 1.1"
+  s.add_dependency "popper_js", "~> 1.14"
+  s.add_dependency "pundit", "~> 2.0"
   s.add_dependency "responders", "~> 2.4"
   s.add_dependency "selectize-rails", "~> 0.12"
   s.add_dependency "simple_form", "~> 4.0"

data/bin/archangel

@@ -5,13 +5,15 @@ require "thor/group"
 
 require "archangel/version"
 
-case ARGV.first.downcase
-when "extension"
-  require "archangel/command/extension"
+command = ARGV.first.downcase
+
+case command
+when "extension", "theme"
+  require "archangel/commands/#{command}_command"
 
   ARGV.shift
 
-  Archangel::Command::Extension.start
+  Object.const_get("Archangel::Commands::#{command.capitalize}Command").start
 else
   puts "Unknown Archangel command."
 end

data/config/locales/active_record.en.yml

@@ -42,11 +42,12 @@ en:
         required: Required
         slug: Slug
         value: Default Value
+      archangel/metatag:
+        content: Content
+        name: Name
       archangel/page:
         content: Content
         homepage: Homepage
-        meta_description: META Description
-        meta_keywords: META Keywords
         parent_id: Parent
         published_at: Published At
         slug: Slug
@@ -54,8 +55,6 @@ en:
         title: Title
       archangel/site:
         logo: Logo
-        meta_description: META Description
-        meta_keywords: META Keywords
         name: Name
         remove_logo: Remove Logo
         theme: Theme

data/config/locales/en.yml

@@ -3,6 +3,7 @@ en:
     actions: Actions
     add_entry: Add Entry
     add_field: Add Field
+    add_metatag: Add Meta Tag
     are_you_sure: Are you sure?
     archangel: Archangel
     assets: Assets
@@ -68,6 +69,8 @@ en:
         asset: "Syntax Error in 'asset' - Valid syntax: {% asset '[name]' %}"
         collection: "Syntax Error in 'collection' - Valid syntax: {% collection [key] = '[value]' %}"
         gist: "Syntax Error in 'gist' - Valid syntax: {% gist '[key]' %}"
+        noembed: "Syntax Error in 'noembed' - Valid syntax: {% noembed '[url]' %}"
+        noembed_server: Error connecting to noembed server
         vimeo: "Syntax Error in 'vimeo' - Valid syntax: {% vimeo '[key]' width:640 height:480 %}"
         widget: "Syntax Error in 'widget' - Valid syntax: {% widget '[slug]' %}"
         youtube: "Syntax Error in 'youtube' - Valid syntax: {% youtube '[key]' width:640 height:480 %}"
@@ -88,6 +91,7 @@ en:
     logout: Log Out
     meta_description: META Description
     meta_keywords: META Keywords
+    metatags: Meta Tags
     name: Name
     new: New
     new_resource: New %{resource}
@@ -101,6 +105,7 @@ en:
     published: Published
     remove_entry: Remove Entry
     remove_field: Remove Field
+    remove_metatag: Remove Meta Tag
     restricted_path: contains restricted path
     role:
       admin: Admin
@@ -112,6 +117,7 @@ en:
     sort: Sort
     sortable:
       success: Sort order has been updated
+    subscribe_to_newsletter: Subscribe to newsletter
     templates: Templates
     theme: Theme
     title: Title

data/db/migrate/20190101220919_add_preferences_to_archangel_users.rb

@@ -0,0 +1,5 @@
+class AddPreferencesToArchangelUsers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :archangel_users, :preferences, :text
+  end
+end

data/db/migrate/20190113130750_create_archangel_metatags.rb

@@ -0,0 +1,14 @@
+class CreateArchangelMetatags < ActiveRecord::Migration[5.2]
+  def change
+    create_table :archangel_metatags do |t|
+      t.references :metatagable, polymorphic: true, index: false
+      t.string :name
+      t.string :content
+
+      t.timestamps
+    end
+
+    add_index :archangel_metatags, [:metatagable_id, :metatagable_type],
+              name: "index_archangel_metatags_on_metatagable_id_and_type"
+  end
+end

data/db/migrate/20190113130751_remove_meta_keywords_and_meta_description_from_archangel_pages.rb

@@ -0,0 +1,6 @@
+class RemoveMetaKeywordsAndMetaDescriptionFromArchangelPages < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :archangel_pages, :meta_keywords, :string
+    remove_column :archangel_pages, :meta_description, :string
+  end
+end

data/db/migrate/20190113130752_remove_meta_keywords_and_meta_description_from_archangel_sites.rb

@@ -0,0 +1,6 @@
+class RemoveMetaKeywordsAndMetaDescriptionFromArchangelSites < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :archangel_sites, :meta_keywords, :string
+    remove_column :archangel_sites, :meta_description, :string
+  end
+end

data/docs/Developers.md

@@ -2,9 +2,9 @@
 
 This is documentation for developing the Archangel gem
 
-Documentation for theme developers [is available](https://github.com/archangel/archangel/blob/master/docs/Theme/Developers.md).
+Documentation for extension developers [is available](https://github.com/archangel/archangel/blob/master/docs/Extension/Developers.md).
 
-Documentation for theme developers [is available](https://github.com/archangel/archangel/blob/master/docs/Extension/Developers.md).
+Documentation for theme developers [is available](https://github.com/archangel/archangel/blob/master/docs/Theme/Developers.md).
 
 ## Testing
 

data/docs/Extension/Developers.md

@@ -23,5 +23,5 @@ The following are best practice guides for building and managing Archangel exten
 * [Models](https://github.com/archangel/archangel/blob/master/docs/Extension/Models.md)
 * [Policies](https://github.com/archangel/archangel/blob/master/docs/Extension/Policies.md)
 * [Routes](https://github.com/archangel/archangel/blob/master/docs/Extension/Routes.md)
-* [Views](https://github.com/archangel/archangel/blob/master/docs/Extension/Views.md)
 * [Uploaders](https://github.com/archangel/archangel/blob/master/docs/Extension/Uploaders.md)
+* [Views](https://github.com/archangel/archangel/blob/master/docs/Extension/Views.md)