sibu 1.0.10 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81b1a892357b7809824ea579fe32219a9cc864c1
-  data.tar.gz: 121e9d7cec8dd2790bafc8d152aeff2f667d2014
+  metadata.gz: c73b880e87681d9f20c0f5b0a7fe505e226d2cf2
+  data.tar.gz: c9032cab8cb4a7365c5988c43a7e4686485b9e77
 SHA512:
-  metadata.gz: 481e3ce5022276de19aa596d15da11c99638a3b06fb9cb1eeac5ad8e38699810ece60c46a1cfeff01725dd2f5a5e5bd24dc1965d343325af161b1f1b76e1133d
-  data.tar.gz: c6dcd079e5672c7a702db7d9e117aa87cb90cc687171ad6d2110f51ba1fb6b5d8de4cdff7f1c3cb884da391bb64653910067b75998c3a7631804065cf31c3a0a
+  metadata.gz: 29087a80f2f64240a12c975dc1faf82eb810541b408b839f60181997bcc294b25b79edb8a6b1c8a05e2f6c89db83af445ab896297e617fa5bab71dafbadaac22
+  data.tar.gz: f76234b3d79658d30f120c9a0bd11b4e5d6a8aee814400d29748f43709b4ed3eec86f5d9f903d39c516b25467c49e0d575ddf4db8dc33d9b8fc25c0ea91555b5

data/app/controllers/sibu/sites_controller.rb

@@ -38,8 +38,8 @@ module Sibu
 
     def update
       if @site.update(site_params)
-        if conf[:custom_styles] && @site.previous_changes.has_key?(:custom_data)
-          generate_styles(@site)
+        if conf[:custom_styles]
+          generate_styles(@site, @site.previous_changes.has_key?(:custom_data))
         end
         if @site.previous_changes.has_key?(:version)
           @site.update_paths
@@ -61,7 +61,7 @@ module Sibu
       if new_site.save
         if conf[:custom_styles]
           generate_styles(@site)
-          generate_styles(new_site)
+          generate_styles(new_site, true)
         end
         redirect_to sites_url, notice: "Le site a bien été copié."
       else
@@ -81,8 +81,8 @@ module Sibu
       params.require(:site).permit!
     end
 
-    def generate_styles(site)
-      ds = Sibu::DynamicStyle.new(site.id)
+    def generate_styles(site, force_styles = false)
+      ds = Sibu::DynamicStyle.new(site.id, force_styles)
       ds.compile
     end
   end

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,14 +113,21 @@ 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'])})}
     end
 
+    def each_element(elt_or_id)
+      element_id = elt_id(elt_or_id)
+      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)
@@ -127,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)
@@ -134,14 +152,30 @@ 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})
+      pop_section_id
+      html_output
+    end
+
+    def svg_image(elt, opts = {})
+      size = opts.delete(:size)
+      t_id = elt.is_a?(Hash) ? elt["id"] : elt
+      defaults = {"id" => t_id, "xlink:href" => Sibu::DEFAULT_IMG}
+      content = defaults.merge((elt.is_a?(Hash) ? elt : (select_element(elt) || {})).transform_keys {|k| k == 'src' ? 'xlink:href' : k})
+      @sb_section = (@sb_section || []) + [t_id]
+      if action_name == 'show'
+        content["xlink:href"] = ("/#{conf[:deployment_path]}" + content["xlink:href"]) if @online && conf[:deployment_path]
+      else
+        opts.merge!({data: {id: @sb_section[1..-1].join('|'), type: "media", repeat: false, size: size}})
+      end
+      html_output = content_tag(:image, nil, content.except("id").merge(opts.stringify_keys) {|k, old, new| k == 'class' ? [old, new].join(' ') : new})
       @sb_section -= [t_id]
       html_output
     end
@@ -242,21 +276,25 @@ module Sibu
 
     alias site sb_site
 
-    def render_page_section(s)
-      @sb_section = [s['id']]
+    # Resets section ids to clean up remaining ids
+    def render_page_section(s, set_id = false)
+      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).html_safe}
+             locals: {sibu: self, sibu_section: s, sibu_attrs: sibu_attributes(s, set_id).html_safe}
     end
 
     # Page sections attrs
-    def sibu_attributes(section)
-      action_name != 'show' ? ('data-sb-id="' + section['id'] + '" data-sb-entity="page"') : ''
+    def sibu_attributes(section, set_id)
+      attrs = set_id ? ('id="' + section['id'] + '" ') : ''
+      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
@@ -289,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?('#')
@@ -308,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/sibu/dynamic_style.rb

@@ -3,9 +3,9 @@ module Sibu
 
     attr_reader :site, :body, :env, :filename, :scss_file, :styles_changed
 
-    def initialize(site_id)
+    def initialize(site_id, force_styles = false)
       @site = Sibu::Site.find(site_id)
-      @styles_changed = @site.style.nil? || styles_changed?(@site.style_url)
+      @styles_changed = @site.style.nil? || force_styles || styles_changed?(@site.style_url)
       if @styles_changed
         @filename = "#{site_id}_#{Time.current.to_i}"
         @scss_file = File.new(scss_file_path, 'w')

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| %>
@@ -65,7 +71,7 @@
         rightOverlay.style.height = height + "px";
         rightOverlay.style.left = left + width + "px";
         rightOverlay.style.top = top + "px";
-        editModeActions.style.top = (top <= 120 ? (top + height) : (top - 40 - 20)) + "px";
+        editModeActions.style.top = (top + height) + "px";
         editModeActions.style.left = left + "px";
         editModeActions.style.width = width + "px";
         editMode.querySelector("#edit_section_msg").innerText = "Modifier la section";
@@ -79,8 +85,6 @@
             editMode.querySelector("#new_section_after").style.display = "block";
             editMode.querySelector("#delete_section").style.display = "block";
         }
-        var topPadding = top <= 120 ? 60 : 120;
-        window.scrollTo(0, top - topPadding);
         section.classList.add('sb-editing');
         initInnerOverlays(section);
         document.querySelector("#edit_overlays").innerHTML = "";

data/app/views/sibu/pages/edit_element.js.erb

@@ -49,11 +49,11 @@ setTimeout(function() {
                         editPanel.querySelector('.sibu_image.selected').classList.remove('selected');
                     }
                     evt.currentTarget.classList.add('selected');
-                    var imgElt = evt.currentTarget.querySelector("img");
-                    document.querySelector("#element_src").value = imgElt.getAttribute("data-src");
+                    var imgElt = evt.currentTarget.querySelector("img"), eltSrc = document.querySelector("#element_src");
+                    eltSrc.value = imgElt.getAttribute("data-src");
                     document.querySelector("#element_alt").value = imgElt.getAttribute("data-alt");
                     editPanel.querySelector(".sibu_center").innerHTML =
-                        '<img src="' + $("#element_src").val() + '"/>' +
+                        '<img src="' + eltSrc.value + '"/>' +
                         '<div id="sibu_center_pos" style="display: none;">✕</div>' +
                         '<div id="sibu_center_desc" style="display: none;"><em>Cliquez sur l\'image pour la recentrer sur un point donné (à utiliser lorsque l\'image est tronquée car la zone d\'affichage est trop petite)</em></div>';
                     if (editPanel.querySelector(".sibu_selected_image > p:first-child")) {

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '1.0.10'
+  VERSION = '1.0.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.15
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-08 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails