archangel 0.0.6 → 0.0.7

data/app/views/archangel/backend/entries/index.html.erb

@@ -34,7 +34,7 @@
 
                 <tbody id="sortable">
                   <% @entries.each do |entry| %>
-                    <tr data-id="<%= entry.id %>">
+                    <tr class="<%= entry.available_status %>" data-id="<%= entry.id %>">
                       <td class="text-center"><%= fa_icon("sort", title: Archangel.t(:sort)) %></td>
                       <% fields.each do |field| %>
                         <td><%= entry.value[field] %></td>

data/app/views/archangel/backend/pages/index.html.erb

@@ -30,7 +30,7 @@
 
                 <tbody>
                   <% @pages.each do |page| %>
-                    <tr>
+                    <tr class="<%= page.published_status %>">
                       <td>
                         <%= page.title %>
 

data/archangel.gemspec

@@ -29,7 +29,6 @@ Gem::Specification.new do |s|
   s.add_dependency "acts_as_tree", "~> 2.7"
   s.add_dependency "anyway_config", "~> 1.2"
   s.add_dependency "bootstrap", "~> 4.1"
-  s.add_dependency "bootstrap3-datetimepicker-rails", "~> 4.17"
   s.add_dependency "carrierwave", "~> 1.2"
   s.add_dependency "cocoon", "~> 1.2"
   s.add_dependency "date_validator", "~> 0.9"

data/config/initializers/simple_form_bootstrap.rb

@@ -2,8 +2,7 @@
 
 SimpleForm.setup do |config|
   config.error_notification_class = "alert alert-danger"
-  config.button_class = "btn btn-default"
-  config.boolean_label_class = nil
+  config.button_class = "btn btn-primary"
 
   config.wrappers :vertical_form, tag: "div",
                                   class: "form-group",

data/config/locales/en.yml

@@ -20,26 +20,40 @@ en:
     content_type: Content Type
     dashboard: Dashboard
     datetimepicker:
-      clear: Clear selection
-      close: Close the picker
+      apply: Apply
+      cancel: Cancel
+      custom_range: Custom
       date_format: "%Y-%m-%d"
       date_format_js: YYYY-MM-DD
-      format: "%Y-%m-%d %H:%M"
-      format_js: YYYY-MM-DD HH:mm
-      next_century: Next Century
-      next_decade: Next Decade
-      next_month: Next Month
-      next_year: Next Year
-      prev_century: Previous Century
-      prev_decade: Previous Decade
-      prev_month: Previous Month
-      prev_year: Previous Year
-      select_decade: Select Decade
-      select_month: Select Month
-      select_year: Select Year
+      datetime_format: "%Y-%m-%d %H:%M"
+      datetime_format_js: YYYY-MM-DD HH:MM
+      days:
+        sunday: Sun
+        monday: Mon
+        tuesday: Tue
+        wednesday: Wed
+        thursday: Thu
+        friday: Fri
+        saturday: Sat
+      from: From
+      months:
+        january: January
+        february: February
+        march: March
+        april: April
+        may: May
+        june: June
+        july: July
+        august: August
+        september: September
+        october: October
+        november: November
+        december: December
+      separator: " - "
       time_format: "%H:%M"
-      time_format_js: HH:mm
-      today: Go to today
+      time_format_js: HH:MM
+      to: To
+      week: W
     destroy: Destroy
     duplicate_slug: duplicate slug
     duplicate_field_slug: duplicate slug

data/docs/Extension/Ideas.md

@@ -4,6 +4,8 @@ Feeling bored? Looking for ideas?
 
 _ \* In no particular order_
 
+* GDPR
+  * https://github.com/prey/gdpr_rails
 * Preview
   * Page preview
 * Angular

data/lib/archangel.rb

@@ -4,7 +4,6 @@ require "acts_as_list"
 require "acts_as_tree"
 require "anyway_config"
 require "bootstrap"
-require "bootstrap3-datetimepicker-rails"
 require "carrierwave"
 require "cocoon"
 require "date_validator"

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

@@ -11,6 +11,64 @@ module Archangel
       #
       class ApplicationTag < ::Liquid::Tag
         include ::ActionView::Helpers::TagHelper
+
+        ##
+        # Regex for asset name
+        #
+        ASSET_SYNTAX = /
+          #{::Liquid::QuotedString}
+          |
+          (
+            [\w-]+\.[\w]+
+            |
+            #{::Liquid::QuotedString}
+          )
+        /ox
+
+        ##
+        # Regex for tag syntax
+        #
+        ASSET_ATTRIBUTES_SYNTAX = /
+          (?<asset>#{ASSET_SYNTAX})
+          \s*
+          (?<attributes>.*)
+          \s*
+        /omx
+
+        ##
+        # Regex for "key: value" attributes
+        #
+        # Example
+        #   {% tag_name "[slug]" [foo: bar, bat: "baz"] %}
+        #
+        KEY_VALUE_ATTRIBUTES_SYNTAX = /
+          (?<key>\w+)
+          \s*
+          \:
+          \s*
+          (?<value>#{::Liquid::QuotedFragment})
+        /ox
+
+        ##
+        # Slug and attributes syntax
+        #
+        # Example
+        #   {% tag_name "[slug]" [attributes] %}
+        #
+        SLUG_ATTRIBUTES_SYNTAX = /
+          (?<slug>#{::Liquid::QuotedFragment}+)
+          \s*
+          (?<attributes>.*)
+          \s*
+        /omx
+
+        ##
+        # Slug syntax
+        #
+        # Example
+        #   {% tag_name "[slug]" %}
+        #
+        SLUG_SYNTAX = /(?<slug>#{::Liquid::QuotedFragment}+)\s*/o
       end
     end
   end

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

@@ -17,40 +17,6 @@ module Archangel
       class AssetTag < ApplicationTag
         include ::ActionView::Helpers::UrlHelper
 
-        ##
-        # Regex for tag key
-        #
-        KEY_SYNTAX = /
-          #{::Liquid::QuotedString}
-          |
-          (
-            [\w-]+\.[\w]+
-            |
-            #{::Liquid::QuotedString}
-          )
-        /ox
-
-        ##
-        # Regex for tag syntax
-        #
-        SYNTAX = /
-          (?<key>#{KEY_SYNTAX})
-          \s*
-          (?<attributes>.*)
-          \s*
-        /omx
-
-        ##
-        # Regex for attributes
-        #
-        SYNTAX_ATTRIBUTES = /
-          (?<key>\w+)
-          \s*
-          \:
-          \s*
-          (?<value>#{::Liquid::QuotedFragment})
-        /ox
-
         ##
         # Asset for Liquid
         #
@@ -61,13 +27,13 @@ module Archangel
         def initialize(tag_name, markup, options)
           super
 
-          match = SYNTAX.match(markup)
+          match = ASSET_ATTRIBUTES_SYNTAX.match(markup)
 
           if match.blank?
             raise ::Liquid::SyntaxError, Archangel.t("errors.syntax.asset")
           end
 
-          @key = ::Liquid::Variable.new(match[:key], options).name
+          @key = ::Liquid::Variable.new(match[:asset], options).name
           @attributes = {}
 
           build_attributes(match[:attributes])
@@ -95,7 +61,7 @@ module Archangel
         attr_reader :attributes, :key, :size
 
         def build_attributes(attrs)
-          attrs.scan(SYNTAX_ATTRIBUTES) do |key, value|
+          attrs.scan(KEY_VALUE_ATTRIBUTES_SYNTAX) do |key, value|
             @attributes[key.to_sym] = ::Liquid::Expression.parse(value)
           end
 

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

@@ -32,17 +32,6 @@ module Archangel
           \s*
         /omx
 
-        ##
-        # Regex for attributes
-        #
-        SYNTAX_ATTRIBUTES = /
-          (?<key>\w+)
-          \s*
-          \:
-          \s*
-          (?<value>#{::Liquid::QuotedFragment})
-        /ox
-
         ##
         # Collection for Liquid
         #
@@ -63,7 +52,7 @@ module Archangel
           @value = ::Liquid::Variable.new(match[:value], options).name
           @attributes = {}
 
-          match[:attributes].scan(SYNTAX_ATTRIBUTES) do |key, value|
+          match[:attributes].scan(KEY_VALUE_ATTRIBUTES_SYNTAX) do |key, value|
             @attributes[key.to_sym] = ::Liquid::Expression.parse(value)
           end
         end

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

@@ -13,40 +13,6 @@ module Archangel
       class GistTag < ApplicationTag
         include ::ActionView::Helpers::AssetTagHelper
 
-        ##
-        # Regex for tag key
-        #
-        KEY_SYNTAX = /
-          #{::Liquid::QuotedString}
-          |
-          (
-            [\w-]+\.[\w]+
-            |
-            #{::Liquid::QuotedString}
-          )
-        /ox
-
-        ##
-        # Regex for tag syntax
-        #
-        SYNTAX = /
-          (?<key>#{KEY_SYNTAX})
-          \s*
-          (?<attributes>.*)
-          \s*
-        /omx
-
-        ##
-        # Regex for attributes
-        #
-        SYNTAX_ATTRIBUTES = /
-          (?<key>\w+)
-          \s*
-          \:
-          \s*
-          (?<value>#{::Liquid::QuotedFragment})
-        /ox
-
         ##
         # Asset for Liquid
         #
@@ -57,16 +23,16 @@ module Archangel
         def initialize(tag_name, markup, options)
           super
 
-          match = SYNTAX.match(markup)
+          match = ASSET_ATTRIBUTES_SYNTAX.match(markup)
 
           if match.blank?
             raise ::Liquid::SyntaxError, Archangel.t("errors.syntax.gist")
           end
 
-          @key = ::Liquid::Variable.new(match[:key], options).name
+          @key = ::Liquid::Variable.new(match[:asset], options).name
           @attributes = {}
 
-          match[:attributes].scan(SYNTAX_ATTRIBUTES) do |key, value|
+          match[:attributes].scan(KEY_VALUE_ATTRIBUTES_SYNTAX) do |key, value|
             @attributes[key.to_sym] = ::Liquid::Expression.parse(value)
           end
         end

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

@@ -18,27 +18,6 @@ module Archangel
       #   {% vimeo "183344978" frameborder:4 %}
       #
       class VimeoTag < ApplicationTag
-        ##
-        # Regex for tag syntax
-        #
-        SYNTAX = /
-          (?<key>#{::Liquid::QuotedFragment}+)
-          \s*
-          (?<attributes>.*)
-          \s*
-        /omx
-
-        ##
-        # Regex for attributes
-        #
-        SYNTAX_ATTRIBUTES = /
-          (?<key>\w+)
-          \s*
-          \:
-          \s*
-          (?<value>#{::Liquid::QuotedFragment})
-        /ox
-
         ##
         # Vimeo video embed for Liquid
         #
@@ -49,16 +28,16 @@ module Archangel
         def initialize(tag_name, markup, options)
           super
 
-          match = SYNTAX.match(markup)
+          match = SLUG_ATTRIBUTES_SYNTAX.match(markup)
 
           if match.blank?
             raise ::Liquid::SyntaxError, Archangel.t("errors.syntax.vimeo")
           end
 
-          @key = ::Liquid::Variable.new(match[:key], options).name
+          @key = ::Liquid::Variable.new(match[:slug], options).name
           @attributes = {}
 
-          match[:attributes].scan(SYNTAX_ATTRIBUTES) do |key, value|
+          match[:attributes].scan(KEY_VALUE_ATTRIBUTES_SYNTAX) do |key, value|
             @attributes[key.to_sym] = ::Liquid::Expression.parse(value)
           end
         end

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

@@ -12,11 +12,6 @@ module Archangel
       #   {% widget widget-name %}
       #
       class WidgetTag < ApplicationTag
-        ##
-        # Regex for tag syntax
-        #
-        SYNTAX = /(?<slug>#{::Liquid::QuotedFragment}+)\s*/o
-
         ##
         # Widget for Liquid
         #
@@ -27,7 +22,7 @@ module Archangel
         def initialize(tag_name, markup, options)
           super
 
-          match = SYNTAX.match(markup)
+          match = SLUG_SYNTAX.match(markup)
 
           if match.blank?
             raise ::Liquid::SyntaxError, Archangel.t("errors.syntax.widget")

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

@@ -23,27 +23,6 @@ module Archangel
       #   {% youtube "-X2atEH7nCg" frameborder:4 %}
       #
       class YoutubeTag < ApplicationTag
-        ##
-        # Regex for tag syntax
-        #
-        SYNTAX = /
-          (?<key>#{::Liquid::QuotedFragment}+)
-          \s*
-          (?<attributes>.*)
-          \s*
-        /omx
-
-        ##
-        # Regex for attributes
-        #
-        SYNTAX_ATTRIBUTES = /
-          (?<key>\w+)
-          \s*
-          \:
-          \s*
-          (?<value>#{::Liquid::QuotedFragment})
-        /ox
-
         ##
         # YouTube video embed for Liquid
         #
@@ -54,16 +33,16 @@ module Archangel
         def initialize(tag_name, markup, options)
           super
 
-          match = SYNTAX.match(markup)
+          match = SLUG_ATTRIBUTES_SYNTAX.match(markup)
 
           if match.blank?
             raise ::Liquid::SyntaxError, Archangel.t("errors.syntax.youtube")
           end
 
-          @key = ::Liquid::Variable.new(match[:key], options).name
+          @key = ::Liquid::Variable.new(match[:slug], options).name
           @attributes = {}
 
-          match[:attributes].scan(SYNTAX_ATTRIBUTES) do |key, value|
+          match[:attributes].scan(KEY_VALUE_ATTRIBUTES_SYNTAX) do |key, value|
             @attributes[key.to_sym] = ::Liquid::Expression.parse(value)
           end
         end