sibu 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 269f3881e2c48664a07b538764e527e174a8ae39
-  data.tar.gz: 8ec378a884b7d26ff5b400241cd6333ac0177aa1
+  metadata.gz: c73b880e87681d9f20c0f5b0a7fe505e226d2cf2
+  data.tar.gz: c9032cab8cb4a7365c5988c43a7e4686485b9e77
 SHA512:
-  metadata.gz: db8306822fca5383613540b03d8e2e26ba0a511aa4e0c5ae62e30a6ada43778a442551cb8b9a1b11a9d6c79417ec60d24ddb53750acafd7fa0f11cd92419402e
-  data.tar.gz: 59f03f99a1920ae2a406ae657a043e8f216c952514ff3e8a4488023ae9a1bf8b7da89d81782821c5776780ef9fb54c12604b07302203c2242fd25c8f3b9e32ab
+  metadata.gz: 29087a80f2f64240a12c975dc1faf82eb810541b408b839f60181997bcc294b25b79edb8a6b1c8a05e2f6c89db83af445ab896297e617fa5bab71dafbadaac22
+  data.tar.gz: f76234b3d79658d30f120c9a0bd11b4e5d6a8aee814400d29748f43709b4ed3eec86f5d9f903d39c516b25467c49e0d575ddf4db8dc33d9b8fc25c0ea91555b5

data/app/helpers/sibu/pages_helper.rb

@@ -53,8 +53,7 @@ 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)
-        instance_variable_set("@sb_section", (instance_variable_get("@sb_section") || []) + [t_id])
-        Rails.logger.info("s : #{instance_variable_get("@sb_section")} - t : #{t_id} - content: #{content}")
+        push_section_ids(t_id)
         if action_name != 'show'
           html_opts.merge!({
                                "data-id" => instance_variable_get("@sb_section")[1..-1].join('|'),
@@ -76,7 +75,7 @@ module Sibu
             html_output = content_tag(t, raw(content["text"]).html_safe, html_opts)
           end
         end
-        instance_variable_set("@sb_section", instance_variable_get("@sb_section")[0..-2])
+        pop_section_id
         html_output
       end
     end
@@ -84,7 +83,7 @@ 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
-        instance_variable_set("@sb_section", (instance_variable_get("@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!({
@@ -95,7 +94,7 @@ module Sibu
                            })
         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)
-        instance_variable_set("@sb_section", instance_variable_get("@sb_section")[0..-2])
+        pop_section_id
         html_output
       end
     end
@@ -114,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'])})}
@@ -122,9 +121,9 @@ 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)
@@ -136,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)
@@ -143,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
 
@@ -267,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}
@@ -280,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
@@ -315,8 +327,8 @@ module Sibu
       content = defaults.merge(link_elt)
       val = content.delete("value") || ""
       text = content.delete("text")
-      instance_variable_set("@sb_section", (instance_variable_get("@sb_section") || []) + [t_id])
-      # @sb_section = (@sb_section || []) + [t_id]
+      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
@@ -335,8 +347,7 @@ module Sibu
       else
         html_output = content_tag(:a, raw(text), content.merge(html_opts).except("elements"))
       end
-      instance_variable_set("@sb_section", instance_variable_get("@sb_section") - [t_id])
-      # @sb_section -= [t_id]
+      pop_section_id
       html_output
     end
 

data/lib/sibu/version.rb

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

metadata

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