archangel 0.0.8 → 0.3.0

data/lib/archangel/version.rb

@@ -4,7 +4,7 @@ module Archangel
   ##
   # Archangel gem version
   #
-  VERSION = "0.0.8".freeze
+  VERSION = "0.3.0".freeze
 
   ##
   # Archangel version

data/lib/generators/archangel/install/templates/config/archangel.yml

@@ -1,37 +1,52 @@
-# Auth root path.
-# Default is "account"
-#
-auth_path: "account"
-
-# Backend root path.
-# Default is "backend"
-#
-backend_path: "backend"
-
-# File extension whitelist of asset uploads.
-# Default is ['gif', 'jpeg', 'jpg', 'png']
-#
-asset_extension_whitelist:
-  - gif
-  - jpeg
-  - jpg
-  - png
-
-# Maximum file size of for asset uploads.
-# Default is `2.megabytes`
-#
-asset_maximum_file_size: 2.megabytes
-
-# File extension whitelist of general image uploads.
-# Default is ['gif', 'jpeg', 'jpg', 'png']
-#
-image_extension_whitelist:
-  - gif
-  - jpeg
-  - jpg
-  - png
-
-# Maximum file size of for general image uploads.
-# Default is `2.megabytes`
-#
-image_maximum_file_size: 2.megabytes
+default: &default
+  # Auth root path.
+  # Default is "account"
+  #
+  auth_path: "account"
+
+  # Allow user registrations.
+  # Default is `false`
+  #
+  allow_registration: false
+
+  # Backend root path.
+  # Default is "backend"
+  #
+  backend_path: "backend"
+
+  # File extension whitelist of asset uploads.
+  # Default is ['gif', 'jpeg', 'jpg', 'png']
+  #
+  asset_extension_whitelist:
+    - gif
+    - jpeg
+    - jpg
+    - png
+
+  # Maximum file size of for asset uploads.
+  # Default is `2097152` (2 Mb) (1024 b * 1024 Kb * 2 Mb)
+  #
+  asset_maximum_file_size: <%= 1024 * 1024 * 2 %>
+
+  # File extension whitelist of general image uploads.
+  # Default is ['gif', 'jpeg', 'jpg', 'png']
+  #
+  image_extension_whitelist:
+    - gif
+    - jpeg
+    - jpg
+    - png
+
+  # Maximum file size of for general image uploads.
+  # # Default is `2097152` (2 Mb) (1024 b * 1024 Kb * 2 Mb)
+  #
+  image_maximum_file_size: <%= 1024 * 1024 * 2 %>
+
+development:
+  <<: *default
+
+test:
+  <<: *default
+
+production:
+  <<: *default

data/spec/controllers/archangel/backend/entries_controller_spec.rb

@@ -50,7 +50,7 @@ module Archangel
       end
 
       describe "POST #create" do
-        let!(:collection) { create(:collection) }
+        let(:collection) { create(:collection) }
         let!(:field) do
           create(:field, collection: collection, slug: "slug", required: true)
         end
@@ -137,7 +137,7 @@ module Archangel
       end
 
       describe "PUT #update" do
-        let!(:collection) { create(:collection) }
+        let(:collection) { create(:collection) }
         let!(:field) do
           create(:field, collection: collection, slug: "slug", required: true)
         end
@@ -240,7 +240,7 @@ module Archangel
       end
 
       describe "POST #sort" do
-        let!(:collection) { create(:collection) }
+        let(:collection) { create(:collection) }
         let!(:field) do
           create(:field, collection: collection, slug: "slug", required: true)
         end

data/spec/controllers/archangel/backend/pages_controller_spec.rb

@@ -45,7 +45,17 @@ module Archangel
             {
               title: "New Page Title",
               content: "<p>New page content</p>",
-              slug: "awesome-page"
+              slug: "awesome-page",
+              metatags_attributes: [
+                {
+                  name: "description",
+                  content: "Description for the Page"
+                },
+                {
+                  name: "keywords",
+                  content: "keywords,for,the,Page"
+                }
+              ]
             }
           end
 
@@ -55,6 +65,12 @@ module Archangel
             end.to change(Page, :count).by(1)
           end
 
+          it "creates Metatag resources" do
+            expect do
+              post :create, params: { page: params }
+            end.to change(Metatag, :count).by(2)
+          end
+
           it "assigns a newly created resource as @page" do
             post :create, params: { page: params }
 

data/spec/controllers/archangel/backend/profiles_controller_spec.rb

@@ -7,7 +7,7 @@ module Archangel
     RSpec.describe ProfilesController, type: :controller do
       before { stub_authorization! profile }
 
-      let!(:profile) { create(:user) }
+      let(:profile) { create(:user) }
 
       describe "GET #show" do
         it "assigns the current user as @profile" do

data/spec/controllers/archangel/backend/sites_controller_spec.rb

@@ -7,10 +7,10 @@ module Archangel
     RSpec.describe SitesController, type: :controller do
       before { stub_authorization! profile }
 
-      let!(:site) { create(:site) }
+      let(:site) { create(:site) }
 
       describe "GET #show" do
-        let!(:profile) { create(:user, :editor, site: site) }
+        let(:profile) { create(:user, :editor, site: site) }
 
         it "assigns the requested site as @site" do
           get :show
@@ -37,7 +37,7 @@ module Archangel
 
       describe "GET #edit" do
         context "with permissions" do
-          let!(:profile) { create(:user, :admin, site: site) }
+          let(:profile) { create(:user, :admin, site: site) }
 
           it "assigns the requested site as @site" do
             get :edit
@@ -47,7 +47,7 @@ module Archangel
         end
 
         context "without permissions" do
-          let!(:profile) { create(:user, :editor, site: site) }
+          let(:profile) { create(:user, :editor, site: site) }
 
           it "redirects to site" do
             get :edit
@@ -60,7 +60,7 @@ module Archangel
 
       describe "PUT #update" do
         context "with permissions" do
-          let!(:profile) { create(:user, :admin, site: site) }
+          let(:profile) { create(:user, :admin, site: site) }
 
           context "with valid params" do
             let(:params) do
@@ -106,7 +106,7 @@ module Archangel
         end
 
         context "without permissions" do
-          let!(:profile) { create(:user, :editor, site: site) }
+          let(:profile) { create(:user, :editor, site: site) }
 
           it "redirects to site" do
             put :update, params: { site: {} }

data/spec/controllers/archangel/backend/users_controller_spec.rb

@@ -7,8 +7,8 @@ module Archangel
     RSpec.describe UsersController, type: :controller do
       before { stub_authorization! user }
 
-      let!(:site) { create(:site) }
-      let!(:user) { create(:user, site: site) }
+      let(:site) { create(:site) }
+      let(:user) { create(:user, site: site) }
 
       describe "GET #index" do
         it "assigns all users as @users" do

data/spec/controllers/archangel/frontend/pages_controller_spec.rb

@@ -5,10 +5,10 @@ require "rails_helper"
 module Archangel
   module Frontend
     RSpec.describe PagesController, type: :controller do
+      let(:page) { create(:page) }
+
       describe "loads correct layout" do
         it "loads correct view" do
-          page = create(:page)
-
           get :show, params: { path: page.path }
 
           expect(response).to render_with_layout("frontend")
@@ -17,8 +17,6 @@ module Archangel
 
       describe "GET #show" do
         it "assigns the requested page as @page" do
-          page = create(:page)
-
           get :show, params: { path: page.path }
 
           expect(response.content_type).to eq "text/html"
@@ -26,8 +24,6 @@ module Archangel
         end
 
         it "assigns the requested page as @page for JSON request" do
-          page = create(:page)
-
           get :show, params: { path: page.path }, format: :json
 
           expect(response.content_type).to eq "application/json"

data/spec/controllers/concerns/archangel/controllers/backend/resourceful_concern_spec.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+module Archangel
+  RSpec.describe BackendController, type: :controller do
+    before { stub_authorization! }
+
+    controller do
+      include Archangel::Controllers::Backend::ResourcefulConcern
+      include Archangel::SkipAuthorizableConcern
+
+      def location_after_save
+        backend_root_path
+      end
+    end
+
+    describe "GET #index" do
+      it "assigns all resources as empty array" do
+        get :index, format: :json
+
+        expect(JSON.parse(response.body)).to eq([])
+      end
+    end
+
+    describe "GET #show" do
+      it "assigns the requested resource as blank" do
+        get :show, params: { id: 1 }
+
+        expect(response.body).to eq("")
+      end
+    end
+
+    describe "GET #new" do
+      it "assigns a new resource as nil" do
+        get :new
+
+        expect(assigns(:backend)).to be_nil
+      end
+    end
+
+    describe "POST #create" do
+      context "with params" do
+        let(:params) do
+          {
+            foo: "bar"
+          }
+        end
+
+        it "redirects after creating resource" do
+          post :create, params: { backend: params }
+
+          expect(response).to redirect_to(backend_root_path)
+        end
+      end
+    end
+
+    describe "GET #edit" do
+      it "assigns the requested resource as blank" do
+        get :edit, params: { id: 1 }
+
+        expect(response.body).to eq("")
+      end
+    end
+
+    describe "PUT #update" do
+      context "with valid params" do
+        let(:params) do
+          {
+            foo: "bar"
+          }
+        end
+
+        it "redirects after updating resource" do
+          put :update, params: { id: 1, backend: params }
+
+          expect(response).to redirect_to(backend_root_path)
+        end
+      end
+    end
+
+    describe "DELETE #destroy" do
+      it "redirects to the listing" do
+        delete :destroy, params: { id: 1 }
+
+        expect(response).to redirect_to(backend_root_path)
+      end
+    end
+  end
+end

data/spec/features/auth/registration_spec.rb

@@ -23,5 +23,23 @@ RSpec.feature "Auth registration", type: :feature do
       expect(page).to have_selector("input[type=text][id='user_name']")
       expect(page).to have_selector("input[type=text][id='user_username']")
     end
+
+    it "allows successful registration" do
+      allow(Archangel.config).to receive(:allow_registration) { true }
+
+      create(:page, homepage: true, content: "Welcome to the homepage")
+
+      visit archangel.new_user_registration_path
+
+      fill_in "Name", with: "John Doe"
+      fill_in "Username", with: "john_doe"
+      fill_in "Email", with: "me@example.com"
+      fill_in "Password", with: "password"
+      fill_in "Confirm Password", with: "password"
+
+      click_button "Sign up"
+
+      expect(page).to have_content("Welcome to the homepage")
+    end
   end
 end

data/spec/features/frontend/liquid_drop_variables_spec.rb

@@ -3,33 +3,29 @@
 require "rails_helper"
 
 RSpec.feature "Default variables", type: :feature do
-  describe "for $current_page" do
-    let(:site) { create(:site) }
+  let(:site) { create(:site) }
 
+  describe "for `current_page`" do
     it "knows the current page at root level" do
-      content = <<-CONTENT
-        Current Page: {{ current_page }}
-      CONTENT
+      content = "Current Page: {{ current_page }}"
 
-      post = create(:page, site: site, slug: "foo", content: content)
+      resource = create(:page, site: site, slug: "foo", content: content)
 
-      visit archangel.frontend_page_path(post.path)
+      visit archangel.frontend_page_path(resource.path)
 
       expect(page).to have_content("Current Page: /foo")
     end
 
     it "knows the current page at child level" do
-      content = <<-CONTENT
-        Current Page: {{ current_page }}
-      CONTENT
+      content = "Current Page: {{ current_page }}"
 
-      parent_post = create(:page, site: site, slug: "foo")
-      post = create(:page, site: site,
-                           parent: parent_post,
-                           slug: "bar",
-                           content: content)
+      parent_resource = create(:page, site: site, slug: "foo")
+      resource = create(:page, site: site,
+                               parent: parent_resource,
+                               slug: "bar",
+                               content: content)
 
-      visit CGI.unescape(archangel.frontend_page_path(post.path))
+      visit CGI.unescape(archangel.frontend_page_path(resource.path))
 
       expect(page).to have_content("Current Page: /foo/bar")
     end
@@ -37,9 +33,9 @@ RSpec.feature "Default variables", type: :feature do
     it "knows it is on the current page" do
       content = <<-CONTENT
         {% if current_page == page.path %}
-          Is Current Page?: Yup!
+          Current Page?: Yup!
         {% else %}
-          Is Current Page?: Nope!
+          Current Page?: Nope!
         {% endif %}
       CONTENT
 
@@ -47,16 +43,16 @@ RSpec.feature "Default variables", type: :feature do
 
       visit archangel.frontend_page_path(post.path)
 
-      expect(page).to have_content("Is Current Page?: Yup!")
-      expect(page).not_to have_content("Is Current Page?: Nope!")
+      expect(page).to have_content("Current Page?: Yup!")
+      expect(page).not_to have_content("Current Page?: Nope!")
     end
 
     it "knows it is not on the current page" do
       content = <<-CONTENT
         {% if current_page == '/some-other-page' %}
-          Is Current Page?: Yup!
+          Current Page?: Yup!
         {% else %}
-          Is Current Page?: Nope!
+          Current Page?: Nope!
         {% endif %}
       CONTENT
 
@@ -64,74 +60,72 @@ RSpec.feature "Default variables", type: :feature do
 
       visit archangel.frontend_page_path(post.path)
 
-      expect(page).not_to have_content("Is Current Page?: Yup!")
-      expect(page).to have_content("Is Current Page?: Nope!")
+      expect(page).not_to have_content("Current Page?: Yup!")
+      expect(page).to have_content("Current Page?: Nope!")
     end
-  end
 
-  describe "for $page" do
-    let(:site) { create(:site) }
+    it "knows the current page with all known slug characters" do
+      slug = "abcdefghijklmnopqrstuvwxyz0123456789-_"
+      content = "Current Page: {{ current_page }}"
+
+      resource = create(:page, site: site, slug: slug, content: content)
+
+      visit archangel.frontend_page_path(resource.path)
+
+      expect(page).to have_content("Current Page: /#{slug}")
+    end
+  end
 
-    it "knows the page properties" do
+  describe "for `page`" do
+    it "knows the `page` properties" do
       content = <<-CONTENT
         Page ID: {{ page.id }}
         Page Title: {{ page.title }}
         Page Path: {{ page.path }}
-        Page Meta Keywords: {{ page.meta_keywords }}
-        Page Meta Description: {{ page.meta_description }}
         Page Published At: {{ page.published_at }}
+        Page Unknown: ~{{ page.unknown_variable }}~
       CONTENT
 
-      post = create(:page, site: site, content: content)
+      resource = create(:page, site: site, content: content)
 
-      visit archangel.frontend_page_path(post.path)
+      visit archangel.frontend_page_path(resource.path)
 
-      expect(page).to have_content("Page ID: #{post.id}")
-      expect(page).to have_content("Page Title: #{post.title}")
-      expect(page).to have_content("Page Path: /#{post.path}")
-      expect(page).to have_content("Page Meta Keywords: #{post.meta_keywords}")
+      expect(page).to have_content("Page ID: #{resource.id}")
+      expect(page).to have_content("Page Title: #{resource.title}")
+      expect(page).to have_content("Page Path: /#{resource.path}")
       expect(page)
-        .to have_content("Page Meta Description: #{post.meta_description}")
-      expect(page).to have_content("Page Published At: #{post.published_at}")
+        .to have_content("Page Published At: #{resource.published_at}")
+      expect(page).to have_content("Page Unknown: ~~")
     end
   end
 
-  describe "for site" do
-    let(:site) { create(:site) }
-
-    it "knows the site properties" do
+  describe "for `site`" do
+    it "knows the `site` properties" do
       content = <<-CONTENT
         Site Name: {{ site.name }}
         Site Locale: {{ site.locale }}
-        Site Meta Keywords: {{ site.meta_keywords }}
-        Site Meta Description: {{ site.meta_description }}
         Site Logo: {{ site.logo }}
+        Site Unknown: ~{{ site.unknown_variable }}~
       CONTENT
 
-      post = create(:page, site: site, content: content)
+      resource = create(:page, site: site, content: content)
 
-      visit archangel.frontend_page_path(post.path)
+      visit archangel.frontend_page_path(resource.path)
 
       expect(page).to have_content("Site Name: #{site.name}")
       expect(page).to have_content("Site Locale: #{site.locale}")
-      expect(page).to have_content("Site Meta Keywords: #{site.meta_keywords}")
-      expect(page)
-        .to have_content("Site Meta Description: #{site.meta_description}")
       expect(page).to have_content("Site Logo: #{site.logo}")
+      expect(page).to have_content("Site Unknown: ~~")
     end
   end
 
-  describe "for unknown variable" do
-    let(:site) { create(:site) }
-
+  describe "for general unknown variable" do
     it "responds with blank value" do
-      content = <<-CONTENT
-        Unknown Variable: ~{{ unknown_variable }}~
-      CONTENT
+      content = "Unknown Variable: ~{{ unknown_variable }}~"
 
-      post = create(:page, site: site, content: content)
+      resource = create(:page, site: site, content: content)
 
-      visit archangel.frontend_page_path(post.path)
+      visit archangel.frontend_page_path(resource.path)
 
       expect(page).to have_content("Unknown Variable: ~~")
     end