archangel 0.0.7 → 0.0.8

data/lib/archangel/liquid/drops/site_drop.rb

@@ -9,14 +9,6 @@ module Archangel
       class SiteDrop < Archangel::Liquid::Drop
         attributes :locale, :meta_description, :meta_keywords, :name
 
-        # Site favicon URL
-        #
-        # @return [String] the Site favicon URL
-        #
-        def favicon
-          object.favicon.url
-        end
-
         # Original size Site logo URL
         #
         # @return [String] the original Site logo URL

data/lib/archangel/testing_support/factories/archangel_assets.rb

@@ -8,11 +8,6 @@ FactoryBot.define do
     content_type "image/jpg"
     file_size 123
 
-    trait :stylesheet do
-      file { fixture_file_upload(uploader_test_stylesheet) }
-      content_type "text/css"
-    end
-
     trait :deleted do
       deleted_at { Time.current }
     end

data/lib/archangel/testing_support/factories/archangel_sites.rb

@@ -13,10 +13,6 @@ FactoryBot.define do
       logo { fixture_file_upload(uploader_test_image) }
     end
 
-    trait :favicon do
-      favicon { fixture_file_upload(uploader_test_favicon) }
-    end
-
     trait :deleted do
       deleted_at { Time.current }
     end

data/lib/archangel/testing_support/support.rb

@@ -4,10 +4,6 @@ def uploader_test_image
   Archangel::Engine.root + "lib/archangel/testing_support/fixtures/image.gif"
 end
 
-def uploader_test_favicon
-  Archangel::Engine.root + "lib/archangel/testing_support/fixtures/favicon.png"
-end
-
 def uploader_test_stylesheet
   Archangel::Engine.root +
     "lib/archangel/testing_support/fixtures/stylesheet.css"

data/lib/archangel/version.rb

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

data/lib/generators/archangel/dummy/dummy_generator.rb

@@ -35,8 +35,9 @@ module Archangel
       # Rails flags available to be passed with generator
       #
       PASSTHROUGH_OPTIONS = %i[
-        skip_active_record skip_javascript database javascript quiet pretend
-        force skip
+        database javascript pretend quiet
+        skip_action_cable skip_active_record skip_active_storage skip_bootsnap
+        skip_javascript skip_turbolinks
       ].freeze
 
       ##
@@ -59,15 +60,9 @@ module Archangel
       # Generate new dummy directory
       #
       def generate_dummy
-        opts = {}.merge(options).slice(*PASSTHROUGH_OPTIONS)
-
-        opts[:database] = "sqlite3" if opts[:database].blank?
-        opts[:force] = true
-        opts[:skip_bundle] = true
-        opts[:skip_git] = true
-        opts[:old_style_hash] = false
-        opts[:skip_turbolinks] = true
-        opts[:skip_bootsnap] = true
+        opts = option_defaults.merge(options)
+                              .slice(*PASSTHROUGH_OPTIONS)
+                              .merge(option_constants)
 
         puts "Generating dummy Rails application..."
 
@@ -121,28 +116,55 @@ module Archangel
 
       protected
 
-      def remove_directory_if_exists(path)
-        remove_dir(path) if File.directory?(path)
-      end
+      no_tasks do
+        def remove_directory_if_exists(path)
+          remove_dir(path) if File.directory?(path)
+        end
+
+        def inject_require_for(requirement)
+          insert_into_file("config/application.rb",
+                           before: /require "#{@lib_name}"/,
+                           verbose: true) do
+            <<-APP_CONFIG.strip_heredoc.indent(2)
+
+              begin
+                require "#{requirement}"
+              rescue LoadError
+                # #{requirement} is not available.
+              end
 
-      def inject_require_for(requirement)
-        insert_into_file("config/application.rb",
-                         before: /require "#{@lib_name}"/,
-                         verbose: true) do
-          <<-APP_CONFIG.strip_heredoc.indent(2)
+            APP_CONFIG
+          end
+        end
 
-            begin
-              require "#{requirement}"
-            rescue LoadError
-              # #{requirement} is not available.
-            end
+        def dummy_database
+          ENV["DB"] || "sqlite3"
+        end
 
-          APP_CONFIG
+        def dummy_path
+          ENV["DUMMY_PATH"] || "spec/dummy"
         end
       end
 
-      def dummy_path
-        ENV["DUMMY_PATH"] || "spec/dummy"
+      no_tasks do
+        def option_defaults
+          {
+            database: dummy_database,
+            skip_turbolinks: true,
+            skip_bootsnap: true,
+            skip_action_cable: true,
+            skip_active_storage: true
+          }
+        end
+
+        def option_constants
+          {
+            force: true,
+            skip_bundle: true,
+            skip_git: true,
+            old_style_hash: false
+          }
+        end
       end
     end
   end

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

@@ -10,7 +10,7 @@ development:
 test:
   <<: *default
   database: archangel_<%= options[:lib_name] %>_test
-<%- when "postgres" -%>
+<%- when "postgresql" -%>
 default: &default
   adapter: postgresql
   username: postgres

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

@@ -9,14 +9,12 @@ auth_path: "account"
 backend_path: "backend"
 
 # File extension whitelist of asset uploads.
-# Default is ['css', 'gif', 'jpeg', 'jpg', 'js', 'png']
+# Default is ['gif', 'jpeg', 'jpg', 'png']
 #
 asset_extension_whitelist:
-  - css
   - gif
   - jpeg
   - jpg
-  - js
   - png
 
 # Maximum file size of for asset uploads.
@@ -24,21 +22,6 @@ asset_extension_whitelist:
 #
 asset_maximum_file_size: 2.megabytes
 
-# File extension whitelist of favicon uploads.
-# Default is ['gif', 'ico', 'jpeg', 'jpg', 'png']
-#
-favicon_extension_whitelist:
-  - gif
-  - ico
-  - jpeg
-  - jpg
-  - png
-
-# Maximum file size of for favicon uploads.
-# Default is `2.megabytes`
-#
-favicon_maximum_file_size: 2.megabytes
-
 # File extension whitelist of general image uploads.
 # Default is ['gif', 'jpeg', 'jpg', 'png']
 #

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

@@ -32,17 +32,6 @@ module Archangel
           expect(assigns(:asset)).to eq(asset)
         end
 
-        it "uses default image for not-image assets" do
-          asset = create(:asset, :stylesheet)
-
-          get :show, params: { id: asset }
-
-          expect(asset.file.url).to include("/uploads/archangel/asset/file")
-          expect(asset.file.small.url).to(
-            include("/assets/archangel/fallback/small_asset")
-          )
-        end
-
         it "uses uploaded image for image assets" do
           asset = create(:asset)
 

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

@@ -18,22 +18,6 @@ module Archangel
           expect(assigns(:site)).to eq(site)
         end
 
-        it "uses default favicon for site" do
-          get :show
-
-          expect(site.favicon.url).to(
-            include("/assets/archangel/fallback/favicon")
-          )
-        end
-
-        it "uses uploaded favicon for site" do
-          site = create(:site, :favicon)
-
-          get :show
-
-          expect(site.favicon.url).to include("/uploads/archangel/site/favicon")
-        end
-
         it "uses default logo for site" do
           get :show
 

data/spec/features/frontend/{drop_variables_spec.rb → liquid_drop_variables_spec.rb}

@@ -105,7 +105,6 @@ RSpec.feature "Default variables", type: :feature do
         Site Locale: {{ site.locale }}
         Site Meta Keywords: {{ site.meta_keywords }}
         Site Meta Description: {{ site.meta_description }}
-        Site Favicon: {{ site.favicon }}
         Site Logo: {{ site.logo }}
       CONTENT
 
@@ -118,7 +117,6 @@ RSpec.feature "Default variables", type: :feature do
       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 Favicon: #{site.favicon}")
       expect(page).to have_content("Site Logo: #{site.logo}")
     end
   end

data/spec/lib/archangel/liquid/drops/site_drop_spec.rb

@@ -27,11 +27,6 @@ module Archangel
             expect(resource_drop.name).to eq("Test Site")
           end
 
-          it "returns correct #favicon value" do
-            expect(resource_drop.favicon)
-              .to match(%r{/assets/archangel/fallback/favicon(.+).ico})
-          end
-
           it "returns correct #logo value" do
             expect(resource_drop.logo)
               .to match(%r{/assets/archangel/fallback/logo(.+).png})

data/spec/lib/archangel/liquid/tags/asset_tag_spec.rb

@@ -20,7 +20,8 @@ module Archangel
         end
 
         it "returns link for non-image asset" do
-          asset = create(:asset, :stylesheet, site: site)
+          asset = create(:asset)
+          asset.update_attributes(content_type: "text/css")
 
           result = ::Liquid::Template.parse("{% asset '#{asset.file_name}' %}")
                                      .render(context)

data/spec/models/archangel/entry_spec.rb

@@ -39,23 +39,23 @@ module Archangel
       end
     end
 
-    context "#available_status" do
+    context "#status" do
       it "returns `unavailable` for Entries not available" do
         entry = build(:entry, :unavailable)
 
-        expect(entry.available_status).to eq("unavailable")
+        expect(entry.status).to eq("unavailable")
       end
 
       it "returns `future-available` for Entries available in the future" do
         entry = build(:entry, :future)
 
-        expect(entry.available_status).to eq("future-available")
+        expect(entry.status).to eq("future-available")
       end
 
       it "returns `available` for Entries available in the past" do
         entry = build(:entry)
 
-        expect(entry.available_status).to eq("available")
+        expect(entry.status).to eq("available")
       end
     end
   end

data/spec/models/archangel/page_spec.rb

@@ -109,23 +109,23 @@ module Archangel
       end
     end
 
-    context "#published_status" do
+    context "#status" do
       it "returns `unpublished` for Pages not published" do
         page = build(:page, :unpublished)
 
-        expect(page.published_status).to eq("unpublished")
+        expect(page.status).to eq("unpublished")
       end
 
       it "returns `future-published` for Pages published in the future" do
         page = build(:page, :future)
 
-        expect(page.published_status).to eq("future-published")
+        expect(page.status).to eq("future-published")
       end
 
       it "returns `published` for Pages published in the past" do
         page = build(:page)
 
-        expect(page.published_status).to eq("published")
+        expect(page.status).to eq("published")
       end
     end
 

data/spec/models/archangel/template_spec.rb

@@ -27,5 +27,19 @@ module Archangel
         )
       end
     end
+
+    context "#status" do
+      it "returns `partial` for partial Templates" do
+        page = build(:template, :partial)
+
+        expect(page.status).to eq("partial")
+      end
+
+      it "returns `full` for non-partial Templates" do
+        page = build(:template)
+
+        expect(page.status).to eq("full")
+      end
+    end
   end
 end

data/spec/uploaders/archangel/asset_uploader_spec.rb

@@ -12,7 +12,7 @@ module Archangel
     end
 
     it "allows certain extensions" do
-      expect(subject.extension_whitelist).to eq %i[css gif jpeg jpg js png]
+      expect(subject.extension_whitelist).to eq %i[gif jpeg jpg png]
     end
 
     context "with image file" do
@@ -44,28 +44,5 @@ module Archangel
         expect(uploader).to have_permissions(0o666)
       end
     end
-
-    context "with non-image file" do
-      before do
-        described_class.enable_processing = true
-
-        uploader.store!(fixture_file_upload(uploader_test_stylesheet,
-                                            "text/css"))
-      end
-
-      after do
-        described_class.enable_processing = false
-
-        uploader.remove!
-      end
-
-      it "is not an image file" do
-        expect(uploader.image?).to be_falsey
-      end
-
-      it "makes the image with 666 permissions" do
-        expect(uploader).to have_permissions(0o666)
-      end
-    end
   end
 end

data/vendor/assets/stylesheets/daterangepicker/_daterangepicker.scss

@@ -259,8 +259,6 @@
 .daterangepicker select.ampmselect {
   width: 50px;
   margin: 0 auto;
-  background: #eee;
-  border: 1px solid #eee;
   padding: 2px;
   outline: 0;
   font-size: 12px;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: archangel
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - David Freerksen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-20 00:00:00.000000000 Z
+date: 2018-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -499,7 +499,6 @@ files:
 - app/assets/images/archangel/fallback/asset.png
 - app/assets/images/archangel/fallback/avatar.png
 - app/assets/images/archangel/fallback/default.png
-- app/assets/images/archangel/fallback/favicon.ico
 - app/assets/images/archangel/fallback/large_avatar.png
 - app/assets/images/archangel/fallback/large_logo.png
 - app/assets/images/archangel/fallback/logo.png
@@ -603,6 +602,7 @@ files:
 - app/themes/default/assets/javascripts/default/auth/.keep
 - app/themes/default/assets/javascripts/default/backend.js
 - app/themes/default/assets/javascripts/default/backend/core.js
+- app/themes/default/assets/javascripts/default/backend/templates.js
 - app/themes/default/assets/javascripts/default/common/cards.js
 - app/themes/default/assets/javascripts/default/common/flash.js
 - app/themes/default/assets/javascripts/default/frontend.js
@@ -610,6 +610,7 @@ files:
 - app/themes/default/assets/stylesheets/default/auth.css
 - app/themes/default/assets/stylesheets/default/auth/core.scss
 - app/themes/default/assets/stylesheets/default/backend.css
+- app/themes/default/assets/stylesheets/default/backend/bootstrap/_tables.scss
 - app/themes/default/assets/stylesheets/default/backend/core.scss
 - app/themes/default/assets/stylesheets/default/common/_bootstrap.scss
 - app/themes/default/assets/stylesheets/default/common/_selectize.scss
@@ -663,8 +664,8 @@ files:
 - app/uploaders/archangel/application_uploader.rb
 - app/uploaders/archangel/asset_uploader.rb
 - app/uploaders/archangel/avatar_uploader.rb
-- app/uploaders/archangel/favicon_uploader.rb
 - app/uploaders/archangel/logo_uploader.rb
+- app/views/archangel/backend/assets/_asset.html.erb
 - app/views/archangel/backend/assets/_buttons.html.erb
 - app/views/archangel/backend/assets/_form.html.erb
 - app/views/archangel/backend/assets/edit.html.erb
@@ -672,6 +673,7 @@ files:
 - app/views/archangel/backend/assets/new.html.erb
 - app/views/archangel/backend/assets/show.html.erb
 - app/views/archangel/backend/collections/_buttons.html.erb
+- app/views/archangel/backend/collections/_collection.html.erb
 - app/views/archangel/backend/collections/_field_fields.html.erb
 - app/views/archangel/backend/collections/_form.html.erb
 - app/views/archangel/backend/collections/edit.html.erb
@@ -681,6 +683,7 @@ files:
 - app/views/archangel/backend/dashboards/_buttons.html.erb
 - app/views/archangel/backend/dashboards/show.html.erb
 - app/views/archangel/backend/entries/_buttons.html.erb
+- app/views/archangel/backend/entries/_entry.html.erb
 - app/views/archangel/backend/entries/_form.html.erb
 - app/views/archangel/backend/entries/edit.html.erb
 - app/views/archangel/backend/entries/index.html.erb
@@ -688,6 +691,7 @@ files:
 - app/views/archangel/backend/entries/show.html.erb
 - app/views/archangel/backend/pages/_buttons.html.erb
 - app/views/archangel/backend/pages/_form.html.erb
+- app/views/archangel/backend/pages/_page.html.erb
 - app/views/archangel/backend/pages/edit.html.erb
 - app/views/archangel/backend/pages/index.html.erb
 - app/views/archangel/backend/pages/new.html.erb
@@ -725,18 +729,21 @@ files:
 - app/views/archangel/backend/sites/show.html.erb
 - app/views/archangel/backend/templates/_buttons.html.erb
 - app/views/archangel/backend/templates/_form.html.erb
+- app/views/archangel/backend/templates/_template.html.erb
 - app/views/archangel/backend/templates/edit.html.erb
 - app/views/archangel/backend/templates/index.html.erb
 - app/views/archangel/backend/templates/new.html.erb
 - app/views/archangel/backend/templates/show.html.erb
 - app/views/archangel/backend/users/_buttons.html.erb
 - app/views/archangel/backend/users/_form.html.erb
+- app/views/archangel/backend/users/_user.html.erb
 - app/views/archangel/backend/users/edit.html.erb
 - app/views/archangel/backend/users/index.html.erb
 - app/views/archangel/backend/users/new.html.erb
 - app/views/archangel/backend/users/show.html.erb
 - app/views/archangel/backend/widgets/_buttons.html.erb
 - app/views/archangel/backend/widgets/_form.html.erb
+- app/views/archangel/backend/widgets/_widget.html.erb
 - app/views/archangel/backend/widgets/edit.html.erb
 - app/views/archangel/backend/widgets/index.html.erb
 - app/views/archangel/backend/widgets/new.html.erb
@@ -771,7 +778,9 @@ files:
 - archangel.gemspec
 - archangel.png
 - bin/archangel
+- bin/citest
 - bin/rails
+- bin/test
 - config/brakeman.yml
 - config/initializers/assets.rb
 - config/initializers/carrierwave.rb
@@ -803,7 +812,6 @@ files:
 - docs/Extension/Controllers.md
 - docs/Extension/Developers.md
 - docs/Extension/Helpers.md
-- docs/Extension/Ideas.md
 - docs/Extension/Models.md
 - docs/Extension/Policies.md
 - docs/Extension/Routes.md
@@ -935,9 +943,9 @@ files:
 - spec/features/auth/log_in_spec.rb
 - spec/features/auth/log_out_spec.rb
 - spec/features/auth/registration_spec.rb
-- spec/features/backend/duplicate_page_slugs_spec.rb
-- spec/features/frontend/drop_variables_spec.rb
-- spec/features/frontend/homepage_redirect_spec.rb
+- spec/features/backend/pages/duplicate_slugs_spec.rb
+- spec/features/frontend/liquid_drop_variables_spec.rb
+- spec/features/frontend/pages/homepage_redirect_spec.rb
 - spec/helpers/archangel/application_helper_spec.rb
 - spec/helpers/archangel/auth_helper_spec.rb
 - spec/helpers/archangel/backend/assets_helper_spec.rb
@@ -1006,11 +1014,10 @@ files:
 - spec/services/archangel/render_service_spec.rb
 - spec/services/archangel/template_render_service_spec.rb
 - spec/spec_helper.rb
-- spec/support/coveralls.rb
+- spec/support/.keep
 - spec/uploaders/archangel/application_uploader_spec.rb
 - spec/uploaders/archangel/asset_uploader_spec.rb
 - spec/uploaders/archangel/avatar_uploader_spec.rb
-- spec/uploaders/archangel/favicon_uploader_spec.rb
 - spec/uploaders/archangel/logo_uploader_spec.rb
 - vendor/assets/icons/trumbowyg/icons.svg
 - vendor/assets/javascripts/daterangepicker/daterangepicker.js