archangel 0.0.5 → 0.0.6

data/db/migrate/20171006175939_create_archangel_widgets.rb

@@ -14,7 +14,7 @@ class CreateArchangelWidgets < ActiveRecord::Migration[5.1]
     add_index :archangel_widgets, :deleted_at
     add_index :archangel_widgets, :name
     add_index :archangel_widgets, :site_id
-    add_index :archangel_widgets, :slug, unique: true
+    add_index :archangel_widgets, :slug
     add_index :archangel_widgets, :template_id
   end
 end

data/db/migrate/20171006194044_create_archangel_collections.rb

@@ -12,6 +12,6 @@ class CreateArchangelCollections < ActiveRecord::Migration[5.1]
     add_index :archangel_collections, :deleted_at
     add_index :archangel_collections, :name
     add_index :archangel_collections, :site_id
-    add_index :archangel_collections, :slug, unique: true
+    add_index :archangel_collections, :slug
   end
 end

data/db/seeds.rb

@@ -29,20 +29,19 @@ def prompt_for_admin_password
 end
 
 # Site
-site = Archangel::Site.first_or_create! do |item|
+curent_site = Archangel::Site.first_or_create! do |item|
   item.name = "Archangel"
   item.locale = "en"
 end
 
 # User
-unless Archangel::User.first
+unless curent_site.users.first
   email    = prompt_for_admin_email
   name     = prompt_for_admin_name
   username = prompt_for_admin_username
   password = prompt_for_admin_password
 
   attributes = {
-    site: site,
     email: email,
     username: username,
     name: name,
@@ -52,14 +51,80 @@ unless Archangel::User.first
     confirmed_at: Time.current
   }
 
-  Archangel::User.create!(attributes)
+  curent_site.users.create!(attributes)
 end
 
 # Homepage
-Archangel::Page.published
-               .find_or_create_by!(site: site, homepage: true) do |item|
+curent_site.pages.published.find_or_create_by(homepage: true) do |item|
   item.slug = "homepage-#{Time.now.to_i}"
   item.title = "Welcome to Archangel"
-  item.content = "<p>Welcome to your new site.</p>"
+  item.content = %(
+    <p>Welcome to your new site.</p>
+  )
   item.published_at = Time.current
 end
+
+# Page Template
+page_template = curent_site.templates
+                           .find_or_create_by!(partial: false) do |item|
+  item.name = "Example Page Template"
+  item.content = %(
+    <p>I think this is the beginning of a beautiful page template.</p>
+    {{ content_for_layout }}
+    <p>I think this is the end of a beautiful page template.</p>
+  )
+end
+
+# Page
+curent_site.pages.find_or_create_by!(slug: "example-page",
+                                     template: page_template,
+                                     homepage: false) do |item|
+  item.title = "Example Page"
+  item.content = %(
+    <p>I think this is the content of the page.</p>
+  )
+  item.published_at = Time.now
+end
+
+# Template
+widget_template = curent_site.templates
+                             .find_or_create_by!(partial: true) do |item|
+  item.name = "Example Widget Template"
+  item.content = %(
+    <p>I think this is the beginning of a beautiful widget template.</p>
+    {{ content_for_layout }}
+    <p>I think this is the end of a beautiful widget template.</p>
+  )
+end
+
+# Widget
+curent_site.widgets.find_or_create_by!(slug: "example-widget",
+                                       template: widget_template) do |item|
+  item.name = "Example Widget"
+  item.content = %(
+    <p>I think this is the content of the widget.</p>
+  )
+end
+
+# Collection
+collection = curent_site.collections.find_or_create_by!(
+  slug: "example-collection"
+) do |item|
+  item.name = "Example Collection"
+end
+
+# Fields
+collection.fields.find_or_create_by!(
+  collection: collection,
+  slug: "field1",
+  required: true
+) do |item|
+  item.label = "Field 1"
+  item.classification = "string"
+end
+
+# Entry
+collection.entries.find_or_create_by(collection: collection) do |item|
+  item.value = { field1: "Value for field 1" }
+  item.available_at = Time.now
+end

data/docs/Extension/Models.md

@@ -10,7 +10,7 @@ module Archangel
     before_validation :parameterize_slug
 
     validates :bar, presence: true
-    validates :slug, presence: true, uniqueness: true
+    validates :slug, presence: true, uniqueness: { scope: :site_id }
 
     belongs_to :site
 

data/lib/archangel/command/templates/extension/config/routes.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-Archangel::Engine.routes.draw do
+Archangel::Engine.routes.prepend do
   # Add your routes here
 end

data/lib/archangel/engine.rb

@@ -53,6 +53,10 @@ module Archangel
       end
     end
 
+    config.after_initialize do
+      Rails.application.routes_reloader.reload!
+    end
+
     config.action_controller.include_all_helpers = false
 
     config.generators do |gen|

data/lib/archangel/version.rb

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

data/lib/generators/archangel/dummy/templates/config/database.yml

@@ -10,10 +10,6 @@ development:
 test:
   <<: *default
   database: archangel_<%= options[:lib_name] %>_test
-
-production:
-  <<: *default
-  database: archangel_<%= options[:lib_name] %>_production
 <%- when "postgres" -%>
 default: &default
   adapter: postgresql
@@ -26,10 +22,6 @@ development:
 test:
   <<: *default
   database: archangel_<%= options[:lib_name] %>_test
-
-production:
-  <<: *default
-  database: archangel_<%= options[:lib_name] %>_production
 <%- else -%>
 default: &default
   adapter: sqlite3
@@ -41,8 +33,4 @@ development:
 test:
   <<: *default
   database: db/archangel_<%= options[:lib_name] %>_test.sqlite3
-
-production:
-  <<: *default
-  database: db/archangel_<%= options[:lib_name] %>_production.sqlite3
 <%- end -%>

data/spec/lib/archangel/command/extension_spec.rb

@@ -57,7 +57,7 @@ module Archangel
         silence_output
 
         Dir.chdir("spec/dummy") do
-          subject = Archangel::Command::Extension.new([extension_name])
+          subject = described_class.new([extension_name])
           subject.invoke_all
         end
       end

data/spec/models/archangel/asset_spec.rb

@@ -5,28 +5,25 @@ require "rails_helper"
 module Archangel
   RSpec.describe Asset, type: :model do
     context "callbacks" do
-      it { expect(subject).to callback(:save_asset_attributes).before(:save) }
+      it { is_expected.to callback(:save_asset_attributes).before(:save) }
     end
 
     context "validations" do
-      it { expect(subject).to validate_presence_of(:file) }
-      it { expect(subject).to validate_presence_of(:file_name) }
+      it { is_expected.to validate_presence_of(:file) }
+      it { is_expected.to validate_presence_of(:file_name) }
 
-      it { expect(subject).to allow_value("success.jpg").for(:file_name) }
+      it { is_expected.to allow_value("success.js").for(:file_name) }
+      it { is_expected.to allow_value("success.jpg").for(:file_name) }
+      it { is_expected.to allow_value("filename.extension").for(:file_name) }
 
-      it do
-        expect(subject).not_to allow_value("without-extension").for(:file_name)
-      end
-      it do
-        expect(subject).not_to allow_value("with.dot.jpg").for(:file_name)
-      end
-      it do
-        expect(subject).not_to allow_value("with space.jpg").for(:file_name)
-      end
+      it { is_expected.to_not allow_value("error.c").for(:file_name) }
+      it { is_expected.to_not allow_value("without-extension").for(:file_name) }
+      it { is_expected.to_not allow_value("with.dot.jpg").for(:file_name) }
+      it { is_expected.to_not allow_value("with space.jpg").for(:file_name) }
     end
 
     context "associations" do
-      it { expect(subject).to belong_to(:site) }
+      it { is_expected.to belong_to(:site) }
     end
   end
 end

data/spec/models/archangel/collection_spec.rb

@@ -5,21 +5,51 @@ require "rails_helper"
 module Archangel
   RSpec.describe Collection, type: :model do
     context "callbacks" do
-      it { expect(subject).to callback(:parameterize_slug).before(:validation) }
+      it { is_expected.to callback(:parameterize_slug).before(:validation) }
 
-      it { expect(subject).to callback(:column_reset).after(:destroy) }
+      it { is_expected.to callback(:column_reset).after(:destroy) }
     end
 
     context "validations" do
-      it { expect(subject).to validate_presence_of(:name) }
-      it { expect(subject).to validate_presence_of(:slug) }
+      it { is_expected.to validate_presence_of(:name) }
+      it { is_expected.to validate_presence_of(:slug) }
 
-      it { expect(subject).to have_db_index(:slug).unique(true) }
+      it "has a unique slug scoped to Site" do
+        resource = build(:collection)
+
+        expect(resource)
+          .to validate_uniqueness_of(:slug).scoped_to(:site_id).case_insensitive
+      end
     end
 
     context "associations" do
-      it { expect(subject).to have_many(:entries) }
-      it { expect(subject).to have_many(:fields) }
+      it { is_expected.to belong_to(:site) }
+
+      it { is_expected.to have_many(:entries) }
+      it { is_expected.to have_many(:fields) }
+    end
+
+    context "#to_param" do
+      it "uses `slug` as the identifier for routes" do
+        resource = build(:collection, slug: "foo")
+
+        expect(resource.to_param).to eq("foo")
+      end
+    end
+
+    context "#column_reset" do
+      before { ::Timecop.freeze }
+      after { ::Timecop.return }
+
+      it "resets `slug` to `slug` + current time" do
+        resource = create(:collection)
+
+        slug = resource.slug
+
+        resource.destroy!
+
+        expect(resource.slug).to eq "#{Time.current.to_i}_#{slug}"
+      end
     end
   end
 end

data/spec/models/archangel/entry_spec.rb

@@ -5,16 +5,18 @@ require "rails_helper"
 module Archangel
   RSpec.describe Entry, type: :model do
     context "validations" do
-      it { expect(subject).to validate_presence_of(:collection_id) }
-      it { expect(subject).to validate_presence_of(:value) }
+      it { is_expected.to validate_presence_of(:collection_id) }
+      it { is_expected.to validate_presence_of(:value) }
 
-      it { expect(subject).to allow_value(nil).for(:available_at) }
-      it { expect(subject).to allow_value(Time.current).for(:available_at) }
-      it { expect(subject).not_to allow_value("invalid").for(:available_at) }
+      it { is_expected.to allow_value(nil).for(:available_at) }
+      it { is_expected.to allow_value("").for(:available_at) }
+      it { is_expected.to allow_value(Time.current).for(:available_at) }
+
+      it { is_expected.to_not allow_value("invalid").for(:available_at) }
     end
 
     context "associations" do
-      it { expect(subject).to belong_to(:collection) }
+      it { is_expected.to belong_to(:collection) }
     end
   end
 end

data/spec/models/archangel/field_spec.rb

@@ -5,25 +5,36 @@ require "rails_helper"
 module Archangel
   RSpec.describe Field, type: :model do
     context "validations" do
-      it { expect(subject).to validate_presence_of(:classification) }
-      it { expect(subject).to validate_presence_of(:collection_id).on(:update) }
-      it { expect(subject).to validate_presence_of(:label) }
-      it { expect(subject).to validate_presence_of(:slug) }
+      it { is_expected.to validate_presence_of(:classification) }
+      it { is_expected.to validate_presence_of(:collection_id).on(:update) }
+      it { is_expected.to validate_presence_of(:label) }
+      it { is_expected.to validate_presence_of(:slug) }
 
-      it { expect(subject).to allow_value(true).for(:required) }
-      it { expect(subject).to allow_value(false).for(:required) }
-      it { expect(subject).not_to allow_value(nil).for(:required) }
+      it { is_expected.to allow_value(true).for(:required) }
+      it { is_expected.to allow_value(1).for(:required) }
+      it { is_expected.to allow_value(false).for(:required) }
+      it { is_expected.to allow_value(0).for(:required) }
 
-      it do
+      it { is_expected.to_not allow_value(nil).for(:required) }
+
+      it "allows certain classifications" do
         expect(subject).to(
           validate_inclusion_of(:classification)
-            .in_array(%w[string text boolean])
+            .in_array(Archangel::Field::CLASSIFICATIONS)
+        )
+      end
+
+      it "has a unique slug scoped to Collection" do
+        resource = build(:field)
+
+        expect(resource).to(
+          validate_uniqueness_of(:slug).scoped_to(:collection_id)
         )
       end
     end
 
     context "associations" do
-      it { expect(subject).to belong_to(:collection) }
+      it { is_expected.to belong_to(:collection) }
     end
   end
 end

data/spec/models/archangel/page_spec.rb

@@ -5,38 +5,56 @@ require "rails_helper"
 module Archangel
   RSpec.describe Page, type: :model do
     context "callbacks" do
-      it { expect(subject).to callback(:parameterize_slug).before(:validation) }
+      it { is_expected.to callback(:parameterize_slug).before(:validation) }
 
-      it { expect(subject).to callback(:build_page_path).before(:save) }
+      it { is_expected.to callback(:build_page_path).before(:save) }
 
-      it { expect(subject).to callback(:homepage_reset).after(:save) }
+      it { is_expected.to callback(:homepage_reset).after(:save) }
 
-      it { expect(subject).to callback(:column_reset).after(:destroy) }
+      it { is_expected.to callback(:column_reset).after(:destroy) }
     end
 
     context "validations" do
-      it { expect(subject).to validate_presence_of(:content) }
-      it { expect(subject).to validate_presence_of(:slug) }
-      it { expect(subject).to validate_presence_of(:title) }
+      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 { expect(subject).to allow_value(true).for(:homepage) }
-      it { expect(subject).to allow_value(false).for(:homepage) }
-      it { expect(subject).not_to allow_value(nil).for(:homepage) }
+      it { is_expected.to allow_value("{{ foo }}").for(:content) }
 
-      it { expect(subject).to allow_value(nil).for(:published_at) }
-      it { expect(subject).to allow_value(Time.current).for(:published_at) }
-      it { expect(subject).not_to allow_value("invalid").for(:published_at) }
+      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 { expect(subject).to have_db_index(:path).unique(true) }
+      it { is_expected.to_not allow_value(nil).for(:homepage) }
 
-      it { expect(subject).to allow_value("{{ foo }}").for(:content) }
-      it { expect(subject).not_to allow_value("{{ foo }").for(:content) }
+      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 "has a unique path scoped to Site" do
+        resource = build(:page)
+
+        expect(resource).to validate_uniqueness_of(:path).scoped_to(:site_id)
+      end
+
+      it "has a unique slug scoped to Page" do
+        resource = build(:page, :with_parent)
+
+        expect(resource).to(
+          validate_uniqueness_of(:slug).scoped_to(:parent_id).case_insensitive
+        )
+      end
+
+      it { is_expected.to allow_value("{{ foo }}").for(:content) }
+      it { is_expected.to_not allow_value("{{ foo }").for(:content) }
     end
 
     context "associations" do
-      it { expect(subject).to belong_to(:parent) }
-      it { expect(subject).to belong_to(:site) }
-      it { expect(subject).to belong_to(:template) }
+      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) }
     end
 
     context "scopes" do
@@ -44,7 +62,7 @@ module Archangel
         it "returns all where published_at <= now" do
           page = create(:page)
 
-          expect(Page.published.first).to eq(page)
+          expect(described_class.published.first).to eq(page)
         end
       end
 
@@ -52,13 +70,13 @@ module Archangel
         it "returns all where published_at is nil" do
           page = create(:page, :unpublished)
 
-          expect(Page.unpublished.first).to eq(page)
+          expect(described_class.unpublished.first).to eq(page)
         end
 
         it "returns all where published_at is > now" do
           page = create(:page, :future)
 
-          expect(Page.unpublished.first).to eq(page)
+          expect(described_class.unpublished.first).to eq(page)
         end
       end
 
@@ -66,12 +84,12 @@ module Archangel
         it "returns all where homepage is true" do
           page = create(:page, :homepage)
 
-          expect(Page.homepage.first).to eq(page)
+          expect(described_class.homepage.first).to eq(page)
         end
       end
     end
 
-    context "#published?" do
+    context ".published?" do
       it "is published" do
         page = build(:page)
 
@@ -90,5 +108,28 @@ module Archangel
         expect(page.published?).to be_falsey
       end
     end
+
+    context "#to_liquid" do
+      it "returns a Liquid object" do
+        resource = build(:page)
+
+        expect(resource.to_liquid).to be_a(Archangel::Liquid::Drops::PageDrop)
+      end
+    end
+
+    context "#column_reset" do
+      before { ::Timecop.freeze }
+      after { ::Timecop.return }
+
+      it "resets `slug` to `slug` + current time" do
+        resource = create(:page)
+
+        slug = resource.slug
+
+        resource.destroy!
+
+        expect(resource.slug).to eq "#{Time.current.to_i}_#{slug}"
+      end
+    end
   end
 end