sibu 1.0.12 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d80e0d86c6b0ae3ee81f45775acf1c021fe15a17
-  data.tar.gz: 712c3383c6bb99034f988e9ecd45933f7cd60957
+  metadata.gz: '0881050b04d182c65eeffbad03d9685873c0c19d'
+  data.tar.gz: 596ab4805391210194ff4ca5ee3526eb535cf175
 SHA512:
-  metadata.gz: a51aca986aff80d8a5c0341aa6081bf464f66ee74eacae47aedf730035a123d19edf9219e4d3df56e00b3adf56dfb2aff72841677b2459ceec37a1892f09ccb5
-  data.tar.gz: 79751582c4674b13b2d7da12cd50224d2073f695bdb746d2d222457eb97c5a4ccb01fb9962777ff71c95313c4c4f554b26a5da8d47661f4200469f9236cf0fe5
+  metadata.gz: 33e03744ade338a03c6b16fb327d2675163abe23f4d3ee2f5b3fe58c301fb6573c8409c6007dbf787c58a9d20e7e24391d07f52d8b6ca69912222681d40ce2b8
+  data.tar.gz: c653ca08088170f1c076d793e1bf14dc7adf62ae849e18a899b9a3cd3ed162b98e1d00958be7ab05865486e7e7c80fe0ba89e848efadb70daee21036602c5db9

data/app/helpers/sibu/pages_helper.rb

@@ -1,3 +1,4 @@
+# Note : methods defined here are included in ActionView::Base
 module Sibu
   module PagesHelper
     include Sibu::Engine.routes.url_helpers
@@ -52,10 +53,10 @@ module Sibu
         defaults = {"id" => t_id, "text" => (t == :p ? Sibu::DEFAULT_PARAGRAPH : Sibu::DEFAULT_TEXT)}
         content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
         html_opts = {"id" => t_id}.merge(opts.except(:repeat, :children).stringify_keys)
-        @sb_section = (@sb_section || []) + [t_id]
+        push_section_ids(t_id)
         if action_name != 'show'
           html_opts.merge!({
-                               "data-id" => @sb_section[1..-1].join('|'),
+                               "data-id" => instance_variable_get("@sb_section")[1..-1].join('|'),
                                "data-type" => (t == :p ? "paragraph" : "text"),
                                "data-repeat" => opts.delete(:repeat),
                                "data-children" => opts.delete(:children)
@@ -74,7 +75,7 @@ module Sibu
             html_output = content_tag(t, raw(content["text"]).html_safe, html_opts)
           end
         end
-        @sb_section -= [t_id]
+        pop_section_id
         html_output
       end
     end
@@ -82,18 +83,18 @@ module Sibu
     [:div, :section, :article, :aside, :header, :footer, :nav, :main, :ul, :ol, :wrapper].each do |t|
       define_method(t) do |elt, opts = {}, &block|
         t_id = elt.is_a?(Hash) ? elt["id"] : elt
-        @sb_section = (@sb_section || []) + [t_id]
+        push_section_ids(t_id)
         html_opts = {"id" => t_id}.merge(opts.except(:repeat, :children).stringify_keys)
         if action_name != 'show'
           html_opts.merge!({
-                               "data-id" => @sb_section[1..-1].join('|'),
+                               "data-id" => instance_variable_get("@sb_section")[1..-1].join('|'),
                                "data-type" => "group",
                                "data-repeat" => opts.delete(:repeat),
                                "data-children" => opts.delete(:children)
                            })
         end
         html_output = t == :wrapper ? capture(current_elt(elt), nested_elements(t_id), &block) : content_tag(t, capture(current_elt(elt), nested_elements(t_id), &block), html_opts)
-        @sb_section -= [t_id]
+        pop_section_id
         html_output
       end
     end
@@ -112,7 +113,7 @@ module Sibu
     # Note : add "each_with_elements" and "elements" on section/elts enumerables
     def nested_elements(elt_or_id)
       element_id = elt_id(elt_or_id)
-      element_id_tokens = (@sb_section + element_id.split("|")).uniq
+      element_id_tokens = (instance_variable_get("@sb_section") + element_id.split("|")).uniq
       nested_elts = @sb_entity.elements(*element_id_tokens)
       nested_elts.blank? ? [{"id" => element_id.split("|").last, "data-id" => join_tokens(element_id_tokens[1..-1], "#{element_id}0")}] :
           nested_elts.map {|e| e.merge({"data-id" => join_tokens(element_id_tokens[1..-1], e['id'])})}
@@ -120,13 +121,13 @@ module Sibu
 
     def each_element(elt_or_id)
       element_id = elt_id(elt_or_id)
-      @sb_section = (@sb_section + element_id.split("|")).uniq unless element_id.blank?
-      (@sb_entity.elements(*@sb_section) || []).map {|el| yield(el)}
-      @sb_section -= [element_id] unless element_id.blank?
+      push_section_ids(*element_id.split("|")) unless element_id.blank?
+      (@sb_entity.elements(*instance_variable_get("@sb_section")) || []).map {|el| yield(el)}
+      pop_section_id unless element_id.blank?
     end
 
     def select_element(id)
-      @sb_entity.element(*@sb_section, id)
+      @sb_entity.element(*instance_variable_get("@sb_section"), id)
     end
 
     def elements(id = nil)
@@ -134,6 +135,16 @@ module Sibu
       items.blank? ? [{"id" => "el#{Time.current.to_i}"}] : items
     end
 
+    def push_section_ids(*section_ids)
+      # Rails.logger.debug "push section ids #{section_ids}"
+      instance_variable_set("@sb_section", (instance_variable_get("@sb_section") || []) + section_ids)
+    end
+
+    def pop_section_id
+      instance_variable_set("@sb_section", instance_variable_get("@sb_section")[0..-2])
+      # Rails.logger.debug "popped section - now #{instance_variable_get("@sb_section")}"
+    end
+
     def img(elt, opts = {})
       wrapper = opts.delete(:wrapper)
       repeat = opts.delete(:repeat)
@@ -141,15 +152,15 @@ module Sibu
       t_id = elt.is_a?(Hash) ? elt["id"] : elt
       defaults = {"id" => t_id, "src" => Sibu::DEFAULT_IMG}
       content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
-      @sb_section = (@sb_section || []) + [t_id]
+      push_section_ids(t_id)
       if action_name == 'show'
         content["src"] = ("/#{conf[:deployment_path]}" + content["src"]) if @online && conf[:deployment_path]
       else
-        opts.merge!({data: {id: @sb_section[1..-1].join('|'), type: "media", repeat: repeat, size: size}})
+        opts.merge!({data: {id: instance_variable_get("@sb_section")[1..-1].join('|'), type: "media", repeat: repeat, size: size}})
       end
       html_output = wrapper ? content_tag(wrapper, content_tag(:img, nil, content.except("id")), opts)
           : content_tag(:img, nil, content.except("id").merge(opts.stringify_keys) {|k, old, new| k == 'class' ? [old, new].join(' ') : new})
-      @sb_section -= [t_id]
+      pop_section_id
       html_output
     end
 
@@ -265,8 +276,10 @@ module Sibu
 
     alias site sb_site
 
+    # Resets section ids to clean up remaining ids
     def render_page_section(s, set_id = false)
-      @sb_section = [s['id']]
+      instance_variable_set("@sb_section", [])
+      push_section_ids(s['id'])
       @sb_entity = @page
       render partial: "shared/#{@site.section_template(s)}",
              locals: {sibu: self, sibu_section: s, sibu_attrs: sibu_attributes(s, set_id).html_safe}
@@ -278,9 +291,10 @@ module Sibu
       attrs + (action_name != 'show' ? ('data-sb-id="' + section['id'] + '" data-sb-entity="page"') : '')
     end
 
-    # Site sections attrs
+    # Site sections attrs - resets section ids
     def sibu_attrs(section_id)
-      @sb_section = [section_id]
+      instance_variable_set("@sb_section", [])
+      push_section_ids(section_id)
       @sb_entity = @site
       action_name != 'show' ? ('data-sb-id="' + section_id + '" data-sb-entity="site"').html_safe : ''
     end
@@ -313,8 +327,9 @@ module Sibu
       content = defaults.merge(link_elt)
       val = content.delete("value") || ""
       text = content.delete("text")
-      @sb_section = (@sb_section || []) + [t_id]
-      html_opts.merge!({data: {id: @sb_section[1..-1].join('|'), type: "link", repeat: repeat, children: children}}) if action_name != 'show'
+      push_section_ids(t_id)
+
+      html_opts.merge!({data: {id: instance_variable_get("@sb_section")[1..-1].join('|'), type: "link", repeat: repeat, children: children}}) if action_name != 'show'
       if val.to_s.start_with?('http')
         content["href"] = val
       elsif val.to_s.start_with?('#')
@@ -332,7 +347,7 @@ module Sibu
       else
         html_output = content_tag(:a, raw(text), content.merge(html_opts).except("elements"))
       end
-      @sb_section -= [t_id]
+      pop_section_id
       html_output
     end
 

data/app/models/concerns/sibu/image_uploader.rb

@@ -25,7 +25,7 @@ class Sibu::ImageUploader < Shrine
   def generate_location(io, context)
     user_id = context[:record] ? context[:record].user_id : nil
     style = context[:version] != :original ? "resized" : "originals"
-    name = super
+    name = "#{context.dig(:metadata, 'filename') ? context.dig(:metadata, 'filename').gsub(/\.\w+$/, '').parameterize : 'image'}-#{super}"
 
     [user_id, style, name].compact.join("/")
   end

data/app/views/layouts/sibu/edit_content.html.erb

@@ -14,6 +14,12 @@
   <%= javascript_include_tag "#{conf[:javascript]}-edit" %>
   <%= csrf_meta_tags %>
   <%= yield :styles %>
+  <% if @site && !@site.header_code.blank? %>
+    <%= raw @site.header_code %>
+  <% end %>
+  <% if @page && !@page.header_code.blank? %>
+    <%= raw @page.header_code %>
+  <% end %>
 </head>
 <body class="sibu_edit_content">
 <% [:top_panel, :side_panel, :content_panel, :bottom_panel].each do |panel| %>

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '1.0.12'
+  VERSION = '1.0.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.17
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-22 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails