archangel 0.3.0 → 0.4.0

data/spec/{models → unit/models}/archangel/metatag_spec.rb

@@ -4,7 +4,7 @@ require "rails_helper"
 
 module Archangel
   RSpec.describe Metatag, type: :model do
-    context "validations" do
+    context "with validations" do
       it "has a unique name scoped to metatagable_type and metatagable_id" do
         resource = build(:metatag)
 
@@ -14,9 +14,5 @@ module Archangel
         )
       end
     end
-
-    context "associations" do
-      it { is_expected.to belong_to(:metatagable) }
-    end
   end
 end

data/spec/{models → unit/models}/archangel/page_spec.rb

@@ -4,39 +4,29 @@ require "rails_helper"
 
 module Archangel
   RSpec.describe Page, type: :model do
-    context "callbacks" do
-      it { is_expected.to callback(:parameterize_slug).before(:validation) }
-
-      it { is_expected.to callback(:build_page_path).before(:save) }
-
-      it { is_expected.to callback(:homepage_reset).after(:save) }
-
-      it { is_expected.to callback(:column_reset).after(:destroy) }
-    end
-
-    context "validations" do
+    context "with validations" do
       it { is_expected.to validate_presence_of(:content) }
       it { is_expected.to validate_presence_of(:slug) }
       it { is_expected.to validate_presence_of(:title) }
 
-      it { is_expected.to allow_value("{{ foo }}").for(:content) }
-
       it { is_expected.to allow_value(true).for(:homepage) }
       it { is_expected.to allow_value(1).for(:homepage) }
       it { is_expected.to allow_value(false).for(:homepage) }
       it { is_expected.to allow_value(0).for(:homepage) }
 
-      it { is_expected.to_not allow_value(nil).for(:homepage) }
+      it { is_expected.not_to allow_value(nil).for(:homepage) }
 
       it { is_expected.to allow_value(nil).for(:published_at) }
       it { is_expected.to allow_value(Time.current).for(:published_at) }
 
-      it { is_expected.to_not allow_value("invalid").for(:published_at) }
+      it { is_expected.not_to allow_value("invalid").for(:published_at) }
 
-      it "has a unique path scoped to Site" do
+      it "has a unique permalink scoped to Site" do
         resource = build(:page)
 
-        expect(resource).to validate_uniqueness_of(:path).scoped_to(:site_id)
+        expect(resource).to(
+          validate_uniqueness_of(:permalink).scoped_to(:site_id)
+        )
       end
 
       it "has a unique slug scoped to Parent and Site" do
@@ -49,27 +39,39 @@ module Archangel
       end
 
       it { is_expected.to allow_value("{{ foo }}").for(:content) }
-      it { is_expected.to_not allow_value("{{ foo }").for(:content) }
+      it { is_expected.not_to allow_value("{{ foo }").for(:content) }
     end
 
-    context "associations" do
-      it { is_expected.to belong_to(:site) }
-      it { is_expected.to belong_to(:parent).class_name("Archangel::Page") }
-      it { is_expected.to belong_to(:template).conditions(partial: false) }
+    context "with scopes" do
+      context "with .available" do
+        it "returns all where published_at <= now" do
+          page = create(:page)
 
-      it { is_expected.to have_many(:metatags) }
-    end
+          expect(described_class.available.first).to eq(page)
+        end
 
-    context "scopes" do
-      context ".published" do
+        it "returns all where published_at <= now not in the future" do
+          page = create(:page, :future)
+
+          expect(described_class.available.first).not_to eq(page)
+        end
+      end
+
+      context "with .published" do
         it "returns all where published_at <= now" do
           page = create(:page)
 
           expect(described_class.published.first).to eq(page)
         end
+
+        it "returns all where published_at <= now in the future" do
+          page = create(:page, :future)
+
+          expect(described_class.published.first).to eq(page)
+        end
       end
 
-      context ".unpublished" do
+      context "with .unpublished" do
         it "returns all where published_at is nil" do
           page = create(:page, :unpublished)
 
@@ -83,7 +85,7 @@ module Archangel
         end
       end
 
-      context ".homepage" do
+      context "with .homepage" do
         it "returns all where homepage is true" do
           page = create(:page, :homepage)
 
@@ -92,47 +94,47 @@ module Archangel
       end
     end
 
-    context ".published?" do
+    context "with .published?" do
       it "is published" do
         page = build(:page)
 
-        expect(page.published?).to be_truthy
+        expect(page).to be_published
       end
 
       it "is published for the future" do
         page = build(:page, published_at: 1.week.from_now)
 
-        expect(page.published?).to be_truthy
+        expect(page).to be_published
       end
 
       it "is not published" do
         page = build(:page, :unpublished)
 
-        expect(page.published?).to be_falsey
+        expect(page).not_to be_published
       end
     end
 
-    context "#status" do
-      it "returns `unpublished` for Pages not published" do
-        page = build(:page, :unpublished)
+    context "with .available?" do
+      it "is available when published in the past" do
+        page = build(:page, published_at: 1.week.ago)
 
-        expect(page.status).to eq("unpublished")
+        expect(page).to be_available
       end
 
-      it "returns `future-published` for Pages published in the future" do
-        page = build(:page, :future)
+      it "is unavailable when published in the future" do
+        page = build(:page, published_at: 1.week.from_now)
 
-        expect(page.status).to eq("future-published")
+        expect(page).not_to be_available
       end
 
-      it "returns `published` for Pages published in the past" do
-        page = build(:page)
+      it "is unavailable not published" do
+        page = build(:page, :unpublished)
 
-        expect(page.status).to eq("published")
+        expect(page).not_to be_available
       end
     end
 
-    context "#to_liquid" do
+    context "with #to_liquid" do
       it "returns a Liquid object" do
         resource = build(:page)
 
@@ -140,7 +142,7 @@ module Archangel
       end
     end
 
-    context "#column_reset" do
+    context "with #column_reset" do
       it "resets `slug` to `slug` + current time" do
         resource = create(:page)
 

data/spec/{models → unit/models}/archangel/site_spec.rb

@@ -4,39 +4,46 @@ require "rails_helper"
 
 module Archangel
   RSpec.describe Site, type: :model do
-    context "validations" do
+    subject(:resource) { described_class.new }
+
+    context "with validations" do
       it { is_expected.to validate_presence_of(:locale) }
       it { is_expected.to validate_presence_of(:name) }
 
       it { is_expected.to allow_value("").for(:theme) }
 
       it "allows certain languages" do
-        expect(subject)
+        expect(resource)
           .to validate_inclusion_of(:locale).in_array(Archangel::LANGUAGES)
       end
 
-      it "allows certain languages" do
-        expect(subject)
+      it "allows certain themes" do
+        expect(resource)
           .to validate_inclusion_of(:theme).in_array(Archangel.themes)
       end
     end
 
     it { is_expected.to have_many(:assets) }
     it { is_expected.to have_many(:collections) }
+    it { is_expected.to have_many(:designs) }
     it { is_expected.to have_many(:metatags) }
     it { is_expected.to have_many(:pages) }
-    it { is_expected.to have_many(:templates) }
     it { is_expected.to have_many(:users) }
     it { is_expected.to have_many(:widgets) }
 
     it { is_expected.to have_many(:entries).through(:collections) }
     it { is_expected.to have_many(:fields).through(:collections) }
 
-    context ".current" do
+    context "with .current" do
       it "returns an existing object" do
-        resource = create(:site, name: "My Awesome New Site")
+        resource = create(:site)
 
         expect(described_class.current).to eq(resource)
+      end
+
+      it "returns an object value" do
+        create(:site, name: "My Awesome New Site")
+
         expect(described_class.current.name).to eq("My Awesome New Site")
       end
 
@@ -45,7 +52,7 @@ module Archangel
       end
     end
 
-    context "#to_liquid" do
+    context "with #to_liquid" do
       it "returns a Liquid object" do
         resource = build(:site)
 

data/spec/{models → unit/models}/archangel/user_spec.rb

@@ -4,27 +4,35 @@ require "rails_helper"
 
 module Archangel
   RSpec.describe User, type: :model do
-    context "callbacks" do
-      let(:resource) { create(:user) }
+    subject(:resource) { described_class.new }
 
-      it { is_expected.to callback(:parameterize_username).before(:validation) }
-
-      it { is_expected.to callback(:column_default).after(:initialize) }
-
-      it { is_expected.to callback(:column_reset).after(:destroy) }
-    end
+    context "with validations" do
+      let(:allowed_emails) do
+        [
+          "foo@example.com",
+          "foo.bar@example.com",
+          "foo_bar@example.com",
+          "foo+bar@example.com",
+          "~!\#$%^&*_+{}|\?`-='@example.com"
+        ]
+      end
+      let(:not_allowed_emails) do
+        [
+          nil,
+          "",
+          "@",
+          "foo@",
+          "@example",
+          "@example.com",
+          "foo bar@example.com"
+        ]
+      end
 
-    context "validations" do
       it { is_expected.to validate_presence_of(:email) }
       it { is_expected.to validate_presence_of(:name) }
-      it { is_expected.to validate_presence_of(:password).on(:create) }
       it { is_expected.to validate_presence_of(:role) }
       it { is_expected.to validate_presence_of(:username) }
 
-      it { is_expected.to validate_length_of(:password).is_at_least(8) }
-
-      it { is_expected.to validate_presence_of(:password).on(:update) }
-
       it "has a unique username scoped to Site" do
         resource = build(:user)
 
@@ -34,42 +42,24 @@ module Archangel
       end
 
       it "allows certain roles" do
-        expect(subject)
+        expect(resource)
           .to validate_inclusion_of(:role).in_array(Archangel::ROLES)
       end
 
       it "allows values for email" do
-        [
-          "foo@example.com",
-          "foo.bar@example.com",
-          "foo_bar@example.com",
-          "foo+bar@example.com",
-          "~!\#$%^&*_+{}|\?`-='@example.com"
-        ].each do |email|
-          expect(subject).to allow_value(email).for(:email)
+        allowed_emails.each do |email|
+          expect(resource).to allow_value(email).for(:email)
         end
       end
 
       it "does not allows values for email" do
-        [
-          nil,
-          "",
-          "@",
-          "foo@",
-          "@example",
-          "@example.com",
-          "foo bar@example.com"
-        ].each do |email|
-          expect(subject).to_not allow_value(email).for(:email)
+        not_allowed_emails.each do |email|
+          expect(resource).not_to allow_value(email).for(:email)
         end
       end
     end
 
-    context "associations" do
-      it { is_expected.to belong_to(:site) }
-    end
-
-    context "#to_param" do
+    context "with #to_param" do
       it "uses `slug` as the identifier for routes" do
         resource = build(:user, username: "foo")
 
@@ -77,7 +67,7 @@ module Archangel
       end
     end
 
-    context "#column_reset" do
+    context "with #column_reset" do
       it "resets `slug` to `slug` + current time" do
         resource = create(:user)
 

data/spec/{models → unit/models}/archangel/widget_spec.rb

@@ -4,19 +4,15 @@ require "rails_helper"
 
 module Archangel
   RSpec.describe Widget, type: :model do
-    context "callbacks" do
-      it { is_expected.to callback(:parameterize_slug).before(:validation) }
+    subject(:resource) { described_class.new }
 
-      it { is_expected.to callback(:column_reset).after(:destroy) }
-    end
-
-    context "validations" do
+    context "with validations" do
       it { is_expected.to validate_presence_of(:content) }
       it { is_expected.to validate_presence_of(:name) }
       it { is_expected.to validate_presence_of(:slug) }
 
       it { is_expected.to allow_value("{{ foo }}").for(:content) }
-      it { is_expected.to_not allow_value("{{ foo }").for(:content) }
+      it { is_expected.not_to allow_value("{{ foo }").for(:content) }
 
       it "has a unique slug scoped to Site" do
         resource = build(:widget)
@@ -26,18 +22,7 @@ module Archangel
       end
     end
 
-    context "associations" do
-      it { is_expected.to belong_to(:site) }
-
-      it "belongs to Template" do
-        expect(subject).to(
-          belong_to(:template).conditions(partial: true)
-                              .class_name("Archangel::Template")
-        )
-      end
-    end
-
-    context "#to_param" do
+    context "with #to_param" do
       it "uses `slug` as the identifier for routes" do
         resource = build(:widget, slug: "foo")
 
@@ -45,7 +30,7 @@ module Archangel
       end
     end
 
-    context "#column_reset" do
+    context "with #column_reset" do
       it "resets `slug` to `slug` + current time" do
         resource = create(:widget)
 

data/spec/{policies/archangel/template_policy_spec.rb → unit/policies/archangel/design_policy_spec.rb}

@@ -3,10 +3,10 @@
 require "rails_helper"
 
 module Archangel
-  RSpec.describe TemplatePolicy, type: :policy do
+  RSpec.describe DesignPolicy, type: :policy do
     subject { described_class.new(user, record) }
 
-    let(:record) { create(:template) }
+    let(:record) { create(:design) }
 
     context "with `admin` role" do
       let(:user) { create(:user, :admin) }

data/spec/{policies → unit/policies}/archangel/site_policy_spec.rb

@@ -14,8 +14,6 @@ module Archangel
       it { is_expected.to permit(:show) }
       it { is_expected.to permit(:update) }
       it { is_expected.to permit(:edit) }
-
-      it { is_expected.to permit(:sample) }
     end
 
     context "with `editor` role" do
@@ -23,10 +21,8 @@ module Archangel
 
       it { is_expected.to permit(:show) }
 
-      it { is_expected.to permit(:sample) }
-
-      it { is_expected.to_not permit(:update) }
-      it { is_expected.to_not permit(:edit) }
+      it { is_expected.not_to permit(:update) }
+      it { is_expected.not_to permit(:edit) }
     end
   end
 end