hera_cms 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5aa9efe0f53f57f3455978481d5b469a58b470f651db6c9b9de10167bdd6910e
-  data.tar.gz: b5ed7cb6d61b33f38d40448a12737ccc95aa577f240f2970872edd95de9814e2
+  metadata.gz: 7f4470fe55d225d68aa2bf7acc64e51bde8313ff8a8ab980fbf3ed026d984d32
+  data.tar.gz: 459ba30e104ccb91cc80e1496467e315655933d2cb6f1a5cde8c43e35f56410e
 SHA512:
-  metadata.gz: 6f1d9b6b41a4e272cb4df3e1a84aba88d10ec26f10458c42206f12af256c7db0451642e0767720d6eb1d5e0ffffc56bf77feef62b9a498526c41102ba568e1ed
-  data.tar.gz: '0798a46a9aa7ed5d8dd557e1cd37a82be450d17fbc852cacf89fa4071248a396672376581d3120f1ed12ea84f51c966490a1222f2318f8028c84772037a6687f'
+  metadata.gz: 5131b9167e0854d426538322d39f97c3b5b05fee5a4a4f03a2699e45c0474655b6d0785390de74540069fafe1dc4a716bb2be13d1a4d93e9b4a292891e3753f0
+  data.tar.gz: a5813934ba73b6ef1874f2bbc48846caee3dac3a6dfdf50c0f7cc9773c7d448aead71d20f31d6a2d0177f539e4aa49851c09da44103c53641bb7456db4a14030

data/app/assets/javascripts/hera_cms/application.js

@@ -151,8 +151,12 @@ const createForm = (e) => {
     case 'links':
       form = linkForm(form, editable);
       break;
-    case 'media_index':
-      form = imageForm(form, editable);
+    case 'images':
+      if (editable.dataset['editableUpload'] === "true") {
+        form = imageUploadForm(form, editable);
+      } else {
+        form = imageUrlForm(form, editable);
+      }
       break;
     case 'texts':
       form = textForm(form, editable);
@@ -251,24 +255,37 @@ const linkForm = (form, editable) => {
   return form;
 }
 
-const imageForm = (form, editable) => {
+const imageUploadForm = (form, editable) => {
 
   // Creates text input for the content of the element and appends it to the form
   i = document.createElement("input");
   i.setAttribute('type', "file");
-  i.setAttribute('name', "media[upload]");
+  i.setAttribute('name', "image[upload]");
 
   form.appendChild(i);
 
   i = document.createElement("input");
   i.setAttribute('type', "hidden");
-  i.setAttribute('name', "media[upload_cache]");
+  i.setAttribute('name', "image[upload_cache]");
 
   form.appendChild(i);
 
   return form;
 }
 
+const imageUrlForm = (form, editable) => {
+
+  // Creates text input for the content of the element and appends it to the form
+  i = document.createElement("input");
+  i.setAttribute('type', "text");
+  i.setAttribute('name', "image[url]");
+  i.setAttribute('autocomplete', "off");
+  i.setAttribute('value', editable.querySelector('img').src);
+  form.appendChild(i);
+
+  return form;
+}
+
 const textForm = (form, editable) => {
 
   // Creates text input for the content of the element and appends it to the form

data/app/assets/stylesheets/hera_cms/application.css

@@ -82,7 +82,7 @@
 .hera-highlight-layer{
   position: relative;
   z-index: 6;
-  background: #F5F5F5;
+  background: #F5F5F5 !important;
   transition: .5s;
   padding: 5px;
   border-radius: 3px;

data/app/controllers/hera_cms/images_controller.rb

@@ -0,0 +1,22 @@
+require_dependency "hera_cms/application_controller"
+
+module HeraCms
+  class ImagesController < ApplicationController
+
+    def update
+      @image = HeraCms::Image.find(params[:id])
+
+      if @image.update(image_params)
+        render json: { redirect: URI(request.referer).path }, status: 200
+      else
+        render json: { errors: @image.errors.full_messages }, status: 422
+      end
+    end
+
+    private
+
+    def image_params
+      params.require(:image).permit(:identifier, :upload, :url, :classes, :style)
+    end
+  end
+end

data/app/helpers/hera_cms/tag_helper.rb

@@ -28,8 +28,44 @@ module HeraCms
       end
     end
 
+    def hera_text(identifier, args = {})
+      text = HeraCms::Text.identify(identifier)
+      inner_text, style, identifier = text.inner_text, text.style, text.identifier
+      classes = set_classes(args, text)
+      args[:html_tag] ||= "p"
+
+      html_options = {
+        class: classes,
+        style: style,
+        id: identifier,
+        data: { editable_id: text.id, editable_type: text.model_name.route_key}
+      }
+      return content_tag(args[:html_tag].to_sym, inner_text, html_options)
+    end
+
+    def hera_image(identifier, args = {})
+      image = HeraCms::Image.identify(identifier)
+      identifier, upload, style = image.identifier, image.upload, image.style
+      classes = set_classes(args, image)
+      args[:type] ||= "image"
+      url = HeraCms.active_storage? ? url_for(upload) : image.url
+
+      html_options = {
+        class: classes,
+        style: style,
+        id: identifier,
+        data: { editable_id: image.id, editable_type: image.model_name.route_key, editable_upload: HeraCms.active_storage? }
+      }
+
+      if args[:type] == "video"
+        content_tag(:div, video_tag(url, style: "max-width: 100%; max-height: 100%;"), html_options)
+      else
+        content_tag(:div, image_tag(url, style: "max-width: 100%; max-height: 100%;"), html_options)
+      end
+    end
+
   # BANNER
-    # def hera_media_banner(identifier, args={}, &block)
+    # def hera_image_banner(identifier, args={}, &block)
     #   media = HeraCms::Image.identify(identifier)
     #   identifier, upload, style = media.identifier, media.upload, media.style
     #   classes = set_classes(args, media)
@@ -49,42 +85,7 @@ module HeraCms
     # end
 
   # Assign media to rails helpers for videos and images
-    # def hera_image_tag(identifier, args = {})
-    #   media = HeraCms::Image.identify(identifier)
-    #   identifier, upload, style = media.identifier, media.upload, media.style
-    #   classes = set_classes(args, media)
-    #   args[:type] ||= "image"
-    #   url = upload.url if upload
-
-    #   html_options = {
-    #     class: classes,
-    #     style: style,
-    #     id: identifier,
-    #     data: { editable_id: media.id, editable_type: media.model_name.route_key}
-    #   }
-
-    #   if args[:type] == "video"
-    #     content_tag(:div, video_tag(url, style: "max-width: 100%; max-height: 100%;"), html_options)
-    #   else
-    #     content_tag(:div, image_tag(url, style: "max-width: 100%; max-height: 100%;"), html_options)
-    #   end
-    # end
 
-  # Generate HTML tag
-    def hera_text(identifier, args = {})
-      text = Text.identify(identifier)
-      inner_text, style, identifier = text.inner_text, text.style, text.identifier
-      classes = set_classes(args, text)
-      args[:html_tag] ||= "p"
-
-      html_options = {
-        class: classes,
-        style: style,
-        id: identifier,
-        data: { editable_id: text.id, editable_type: text.model_name.route_key}
-      }
-      return content_tag(args[:html_tag].to_sym, inner_text, html_options)
-    end
 
   # Generate Form Tag
     # def hera_form(identifier, args = {})
@@ -108,13 +109,13 @@ module HeraCms
     # end
 
     def set_editable(editable)
-      editable.classes += " hera-editable" if editable.editable? && (editable.classes && !editable.classes.include?("hera-editable"))
+      editable.classes += " hera-editable" if editable.editable? && (editable.classes && !editable.classes&.include?("hera-editable"))
     end
 
     def set_classes(args, editable)
       args[:add_class] ||= ""
       classes = "#{ args[:class] || editable.classes } #{args[:add_class]}"
-      classes += " hera-editable" unless args[:editable] == false || editable.classes.include?("hera-editable") || !editable.editable?
+      classes += " hera-editable" unless args[:editable] == false || editable.classes&.include?("hera-editable") || !editable.editable?
     end
 
   end

data/app/models/hera_cms/image.rb

@@ -1,6 +1,10 @@
 module HeraCms
   class Image < ApplicationRecord
     validates :identifier, presence: true, uniqueness: true
-
+    if HeraCms.active_storage?
+      has_one_attached :upload
+    else
+      validates :url, presence: true
+    end
   end
 end

data/config/routes.rb

@@ -3,4 +3,5 @@ HeraCms::Engine.routes.draw do
 
   resources :links, only: :update
   resources :texts, only: :update
+  resources :images, only: :update
 end

data/lib/generators/hera_cms/templates/config.rb.tt

@@ -1,2 +1,6 @@
-# see https://github.com/horta-tech/iris_cms for more info
+# see https://github.com/horta-tech/hera_cms for more info
 
+HeraCms.setup do |config|
+  # config.image_upload = true
+  # config.upload_service = :active_storage
+end

data/lib/hera_cms.rb

@@ -22,8 +22,8 @@ module HeraCms
     yield self
   end
 
-  def self.test
-    return "Successful"
+  def self.active_storage?
+    self.image_upload && ["active_storage", :active_storage].include?(self.upload_service&.downcase)
   end
 end
 

data/lib/hera_cms/version.rb

@@ -1,3 +1,3 @@
 module HeraCms
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hera_cms
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Rayan Castro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -148,6 +148,7 @@ files:
 - app/controllers/hera_cms/application_controller.rb
 - app/controllers/hera_cms/base_controller.rb
 - app/controllers/hera_cms/dashboard_controller.rb
+- app/controllers/hera_cms/images_controller.rb
 - app/controllers/hera_cms/links_controller.rb
 - app/controllers/hera_cms/texts_controller.rb
 - app/helpers/hera_cms/application_helper.rb