archangel 0.3.0 → 0.4.0

data/lib/archangel/config.rb

@@ -7,8 +7,7 @@ module Archangel
   class Config < Anyway::Config
     config_name :archangel
 
-    attr_config allow_registration: false,
-                asset_maximum_file_size: 2.megabytes,
+    attr_config asset_maximum_file_size: 2.megabytes,
                 asset_extension_whitelist: %w[gif jpeg jpg png],
                 auth_path: "account",
                 backend_path: "backend",

data/lib/archangel/constants/theme.rb

@@ -14,5 +14,5 @@ module Archangel
   ##
   # Default theme constant
   #
-  THEME_DEFAULT = "default".freeze
+  THEME_DEFAULT = "default"
 end

data/lib/archangel/engine.rb

@@ -48,7 +48,9 @@ module Archangel
 
           file_path = Pathname.new(file).relative_path_from(path).to_s
 
-          app.config.assets.precompile << file if file_path =~ allowed_regex
+          if allowed_regex.match?(file_path)
+            app.config.assets.precompile << file
+          end
         end
       end
     end

data/lib/archangel/i18n.rb

@@ -3,6 +3,9 @@
 require "i18n"
 require "active_support/core_ext/array/extract_options"
 
+##
+# @see Archangel
+#
 module Archangel
   extend ActionView::Helpers::TranslationHelper
   extend ActionView::Helpers::TagHelper
@@ -26,8 +29,9 @@ module Archangel
     #     I18n.t(:hello, scope: :archangel) #=> "Hello"
     #     I18n.translate(:hello, scope: :archangel) #=> "Hello"
     #
-    # @param args [String,Array] translation paramaters
+    # @param args [String,Array] translation parameters
     # @return [String] the translated string
+    #
     def translate(*args)
       options = args.extract_options!
       options[:scope] = [*options[:scope]].unshift(:archangel)

data/lib/archangel/liquid/drop.rb

@@ -15,8 +15,8 @@ module Archangel
       end
 
       def self.inherited(base)
-        base._attributes   = []
         base._associations = {}
+        base._attributes = []
       end
 
       ##
@@ -34,56 +34,14 @@ module Archangel
         end
       end
 
+      attr_reader :object
+
       ##
       # Initialize
       #
       def initialize(object, _options = {})
         @object = object
       end
-
-      ##
-      # Hash of attributes
-      #
-      # @return [Hash] the attributes
-      #
-      def attributes
-        @attributes ||=
-          self.class._attributes.dup.each_with_object({}) do |name, hash|
-            hash[name.to_s] = send(name)
-          end
-      end
-
-      ##
-      # Object as JSON
-      #
-      # @return [Object] the JSON object
-      #
-      def as_json(options = {})
-        attributes.as_json(options)
-      end
-
-      ##
-      # Object to JSON
-      #
-      # @return [Object] the JSON object
-      #
-      def to_json(options = {})
-        as_json.to_json(options)
-      end
-
-      ##
-      # Object inspect
-      #
-      # @return [String] object inspect
-      #
-      def inspect
-        "#<#{self.class.name} " \
-          "@object: #{object.inspect} @attributes: #{attributes.inspect}>"
-      end
-
-      protected
-
-      attr_reader :object
     end
   end
 end

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

@@ -20,12 +20,12 @@ module Archangel
           object.id.to_s
         end
 
-        # Page path with leading slash
+        # Page permalink with leading slash
         #
-        # @return [String] the path
+        # @return [String] the permalink
         #
-        def path
-          "/#{object.path}"
+        def permalink
+          "/#{object.permalink}"
         end
       end
     end

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

@@ -9,6 +9,7 @@ module Archangel
       class SiteDrop < Archangel::Liquid::Drop
         attributes :locale, :name
 
+        ##
         # Original size Site logo URL
         #
         # @return [String] the original Site logo URL

data/lib/archangel/liquid/tags/asset_tag.rb

@@ -8,9 +8,9 @@ module Archangel
       #
       # Example
       #   {% asset 'my-asset.png' %} #=>
-      #     <img src="path/to/my-asset.png" alt:"my-asset.png">
+      #     <img src="path/to/my-asset.png" alt="my-asset.png">
       #   {% asset 'my-asset.png' size:'medium' %} #=>
-      #     <img src="path/to/medium_my-asset.png" alt:"my-asset.png">
+      #     <img src="path/to/medium_my-asset.png" alt="my-asset.png">
       #   {% asset 'my-asset.png' alt:'My image' class:'center' %} #=>
       #     <img src="path/to/my-asset.png" alt="My image" class="center">
       #
@@ -48,8 +48,7 @@ module Archangel
         def render(context)
           return if key.blank?
 
-          environments = context.environments[0]
-          asset = load_asset_for(environments["site"])
+          asset = load_asset_for(context["site"].object)
 
           return if asset.blank?
 
@@ -78,7 +77,7 @@ module Archangel
         end
 
         def asset_decider(asset)
-          if %r{image/[gif|jpeg|jpg|png]} =~ asset.content_type
+          if %r{image/[gif|jpeg|png]}.match?(asset.content_type)
             image_asset(asset)
           else
             linked_asset(asset)

data/lib/archangel/liquid/tags/collection_tag.rb

@@ -64,13 +64,10 @@ module Archangel
         # @return [Hash] the object
         #
         def render(context)
-          environments = context.environments.first
-          site = environments["site"]
-
-          val = load_collection(site)
+          val = load_collection(context["site"].object)
 
           context.scopes.last[key] = val
-          context.resource_limits.assign_score += assign_score_of(val)
+          context.resource_limits.assign_score << assign_score_of(val)
 
           ""
         end
@@ -96,6 +93,7 @@ module Archangel
           collection = site.collections.find_by!(slug: slug)
 
           site.entries
+              .available
               .where(collection: collection)
               .page(attributes.fetch(:offset, 1))
               .per(attributes.fetch(:limit, 12))

data/lib/archangel/liquid/tags/collectionfor_tag.rb

@@ -45,8 +45,7 @@ module Archangel
           offset = context.evaluate(@from).to_i
           limit = context.evaluate(@limit)
 
-          environments = context.environments.first
-          segment = load_collection(environments["site"], offset, limit)
+          segment = load_collection(context["site"].object, offset, limit)
 
           segment.reverse! if @reversed
 
@@ -71,9 +70,9 @@ module Archangel
           limit = 12 if limit.blank?
 
           site.entries
+              .available
               .where(collection: collection)
-              .page(offset)
-              .per(limit)
+              .page(offset).per(limit)
               .map(&:attributes)
         rescue StandardError
           []

data/lib/archangel/liquid/tags/gist_tag.rb

@@ -7,8 +7,8 @@ module Archangel
       # Gist custom tag for Liquid
       #
       # Example
-      #   {% gist '9bbaf7332bff1042c2d83fc88683b9df' %}
-      #   {% gist '9bbaf7332bff1042c2d83fc88683b9df' file:'hello.rb' %}
+      #   {% gist '0d6f8a168a225fda62e8d2ddfe173271' %}
+      #   {% gist '0d6f8a168a225fda62e8d2ddfe173271' file:'hello.rb' %}
       #
       class GistTag < ApplicationTag
         include ::ActionView::Helpers::AssetTagHelper
@@ -46,7 +46,7 @@ module Archangel
         def render(_context)
           return if key.blank?
 
-          src =  gist_source(key, attributes.fetch(:file, nil))
+          src = gist_source(key, attributes.fetch(:file, nil))
 
           javascript_include_tag(src)
         end

data/lib/archangel/liquid/tags/noembed_tag.rb

@@ -9,7 +9,7 @@ module Archangel
       # For more information about Noembed, see https://noembed.com/
       #
       # Example
-      #   {% noembed "https://www.youtube.com/watch?v=-X2atEH7nCg" %}
+      #   {% noembed "https://www.youtube.com/watch?v=NOGEyBeoBGM" %}
       #   {% noembed "https://vimeo.com/70707344" %}
       #   {% noembed "https://vimeo.com/70707344" remote: true %}
       #   {% noembed "https://vimeo.com/70707344" maxwidth:600 %}

data/lib/archangel/liquid/tags/vimeo_tag.rb

@@ -60,17 +60,23 @@ module Archangel
 
         def video_attributes
           {
-            id: attributes.fetch(:id, nil),
-            class: attributes.fetch(:class, nil),
-            style: attributes.fetch(:style, nil),
             src: video_url,
             width: video_width,
-            height: video_height,
-            frameborder: attributes.fetch(:frameborder, 0),
-            allowtransparency: attributes.fetch(:allowtransparency, "true"),
-            allowFullScreen:
-              attributes.fetch(:allowfullscreen, "allowFullScreen")
-          }
+            height: video_height
+          }.merge(video_fetch_attributes)
+        end
+
+        def video_fetch_attributes
+          {
+            id: nil,
+            class: nil,
+            style: nil,
+            frameborder: 0,
+            allowtransparency: "true",
+            allowFullScreen: "allowFullScreen"
+          }.each_with_object({}) do |(key, value), hash|
+            hash[key] = attributes.fetch(key.to_s.downcase.to_sym, value)
+          end
         end
 
         def video_url

data/lib/archangel/liquid/tags/widget_tag.rb

@@ -40,19 +40,16 @@ module Archangel
         def render(context)
           return if slug.blank?
 
-          environments = context.environments.first
-          site = environments["site"]
-
-          widget = load_widget_for(site)
+          widget = load_widget_for(context["site"].object)
 
           return if widget.blank?
 
-          rendered_widget = render_widget(widget.content, environments)
-
-          template = widget.template
+          rendered_widget = render_widget(widget.content,
+                                          context.environments.first)
 
-          if template.present?
-            rendered_widget = render_templated_widget(template, rendered_widget)
+          if widget.design.present?
+            rendered_widget = render_designed_widget(widget.design,
+                                                     rendered_widget)
           end
 
           rendered_widget
@@ -72,9 +69,9 @@ module Archangel
           Archangel::RenderService.call(content, assigns)
         end
 
-        def render_templated_widget(template_content, widget_content)
-          Archangel::TemplateRenderService.call(
-            template_content,
+        def render_designed_widget(design_content, widget_content)
+          Archangel::DesignRenderService.call(
+            design_content,
             content_for_layout: widget_content
           )
         end

data/lib/archangel/liquid/tags/youtube_tag.rb

@@ -7,20 +7,20 @@ module Archangel
       # YouTube custom tag for Liquid
       #
       # Example
-      #   Given the YouTube URL https://www.youtube.com/watch?v=-X2atEH7nCg
-      #   {% youtube "-X2atEH7nCg" %}
-      #   {% youtube "-X2atEH7nCg" width:800 height:600 %}
-      #   {% youtube "-X2atEH7nCg" id:"my_video" class:"my-video" %}
-      #   {% youtube "-X2atEH7nCg" autoplay:1 %}
-      #   {% youtube "-X2atEH7nCg" captions: %}
-      #   {% youtube "-X2atEH7nCg" loop:1 %}
-      #   {% youtube "-X2atEH7nCg" annotations:1 %}
-      #   {% youtube "-X2atEH7nCg" start:10 %}
-      #   {% youtube "-X2atEH7nCg" end:60 %}
-      #   {% youtube "-X2atEH7nCg" showinfo:0 %}
-      #   {% youtube "-X2atEH7nCg" allowfullscreen: %}
-      #   {% youtube "-X2atEH7nCg" allowtransparency:0 %}
-      #   {% youtube "-X2atEH7nCg" frameborder:4 %}
+      #   Given the YouTube URL https://www.youtube.com/watch?v=NOGEyBeoBGM
+      #   {% youtube "NOGEyBeoBGM" %}
+      #   {% youtube "NOGEyBeoBGM" width:800 height:600 %}
+      #   {% youtube "NOGEyBeoBGM" id:"my_video" class:"my-video" %}
+      #   {% youtube "NOGEyBeoBGM" autoplay:1 %}
+      #   {% youtube "NOGEyBeoBGM" captions: %}
+      #   {% youtube "NOGEyBeoBGM" loop:1 %}
+      #   {% youtube "NOGEyBeoBGM" annotations:1 %}
+      #   {% youtube "NOGEyBeoBGM" start:10 %}
+      #   {% youtube "NOGEyBeoBGM" end:60 %}
+      #   {% youtube "NOGEyBeoBGM" showinfo:0 %}
+      #   {% youtube "NOGEyBeoBGM" allowfullscreen: %}
+      #   {% youtube "NOGEyBeoBGM" allowtransparency:0 %}
+      #   {% youtube "NOGEyBeoBGM" frameborder:4 %}
       #
       class YoutubeTag < ApplicationTag
         ##
@@ -65,17 +65,23 @@ module Archangel
 
         def video_attributes
           {
-            id: attributes.fetch(:id, nil),
-            class: attributes.fetch(:class, nil),
-            style: attributes.fetch(:style, nil),
             src: video_url,
             width: video_width,
-            height: video_height,
-            frameborder: attributes.fetch(:frameborder, 0),
-            allowtransparency: attributes.fetch(:allowtransparency, "true"),
-            allowFullScreen:
-              attributes.fetch(:allowfullscreen, "allowFullScreen")
-          }
+            height: video_height
+          }.merge(video_fetch_attributes)
+        end
+
+        def video_fetch_attributes
+          {
+            id: nil,
+            class: nil,
+            style: nil,
+            frameborder: 0,
+            allowtransparency: "true",
+            allowFullScreen: "allowFullScreen"
+          }.each_with_object({}) do |(key, value), hash|
+            hash[key] = attributes.fetch(key.to_s.downcase.to_sym, value)
+          end
         end
 
         def video_url
@@ -89,17 +95,25 @@ module Archangel
           {
             ecver: 1,
             autohide: 2,
-            color: attributes.fetch(:color, "red"),
-            autoplay: attributes.fetch(:autoplay, 0),
             cc_load_policy: attributes.fetch(:captions, 0),
             iv_load_policy: attributes.fetch(:annotations, 0),
-            loop: attributes.fetch(:loop, 0),
-            showinfo: attributes.fetch(:showinfo, 1),
-            start: attributes.fetch(:start, nil),
-            end: attributes.fetch(:end, nil),
             width: video_width,
             height: video_height
-          }.compact.reject { |_, value| value.blank? }.to_query
+          }.merge(video_url_fetch_params)
+            .compact.reject { |_, value| value.blank? }.to_query
+        end
+
+        def video_url_fetch_params
+          {
+            color: "red",
+            autoplay: 0,
+            loop: 0,
+            showinfo: 1,
+            start: nil,
+            end: nil
+          }.each_with_object({}) do |(key, value), hash|
+            hash[key] = attributes.fetch(key.to_sym, value)
+          end
         end
 
         def video_width

data/lib/archangel/testing_support/factories/{archangel_templates.rb → archangel_designs.rb}

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :template, class: "Archangel::Template" do
+  factory :design, class: "Archangel::Design" do
     site
-    sequence(:name) { |n| "Template #{n} Name" }
+    sequence(:name) { |n| "Design #{n} Name" }
     content do
-      "<p>BEFORE TEMPLATE<p>
+      "<p>BEFORE DESIGN<p>
        <p>{{ content_for_layout }}<p>
-       <p>AFTER TEMPLATE<p>"
+       <p>AFTER DESIGN<p>"
     end
     partial { false }
 

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

@@ -3,19 +3,19 @@
 FactoryBot.define do
   factory :entry, class: "Archangel::Entry" do
     collection
-    value { ActiveSupport::JSON.encode(title: "Title", content: "Content") }
-    available_at { Time.current }
+    value { { foo: "bar" } }
+    published_at { Time.current }
 
     trait :deleted do
       deleted_at { Time.current }
     end
 
-    trait :unavailable do
-      available_at { nil }
+    trait :unpublished do
+      published_at { nil }
     end
 
     trait :future do
-      available_at { 1.week.from_now }
+      published_at { 1.week.from_now }
     end
   end
 end