sibu 1.0.11 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddad9d6305d71605c692e8dbdafadb0c6cce1d7a
-  data.tar.gz: 91539711c089a4d111dede2965a554051c590dc5
+  metadata.gz: b93f3e95737adee12da11b924e22c4f04fbf32bb
+  data.tar.gz: 2e2f83ffda9d26834d8900c8a6b010a18af69a59
 SHA512:
-  metadata.gz: e025dc9b575fedeb91471848f78487b4ba1e3e7fbb19e81822bc31576aae2cd764326ce75bd6e39dd2d2b9ea0901d30f5b33bcef1a26a354a62f90f3d3d74a05
-  data.tar.gz: cb43b5c568dcd4c9323944645c2ab6935f81988d8a95fe3c47902115db8070bf8e2f10253174d8eaa73074f63348bce2acb724e0c69171e1ff8540355a8db827
+  metadata.gz: c4feb32b7552393945dbf01283555d8a2037d076c71dbc71fbc4a5806a35a132190043b87ad6e95dd2be4fdad6498bc6ba204f9b683309fea3e097c08a1cd281
+  data.tar.gz: 5155224fcf65a3e519ea91f2fbe87e52b8185f86dbefb459abe623902266b9959ed72eac609ecf41e21c081b895359209a4c992ef6f9d02f0c0efcfe4828653a

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,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/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| %>

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '1.0.11'
+  VERSION = '1.0.16'
 end

metadata

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