sibu 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd539c6932c5892e902387c23af671662ef5e6f0
-  data.tar.gz: 3479e3686c6e4eb316c4717e720424ffa98175b3
+  metadata.gz: 269f3881e2c48664a07b538764e527e174a8ae39
+  data.tar.gz: 8ec378a884b7d26ff5b400241cd6333ac0177aa1
 SHA512:
-  metadata.gz: f1893df21c5e7b14cd4504744851ea2916bd0c4773245936899fafcc66832c8ebda987e93b24b07489eca3574a6d0c5a9f0584efe7daec8a53040b783d19f4aa
-  data.tar.gz: e152ccc9a2afc46648b5a53a9a5801e4f02fa6aba8a3feb79f41e036b424ff8592bd25859c812e67137322cdfcc538d0c445cd41181a936e5c2f99c312a7deda
+  metadata.gz: db8306822fca5383613540b03d8e2e26ba0a511aa4e0c5ae62e30a6ada43778a442551cb8b9a1b11a9d6c79417ec60d24ddb53750acafd7fa0f11cd92419402e
+  data.tar.gz: 59f03f99a1920ae2a406ae657a043e8f216c952514ff3e8a4488023ae9a1bf8b7da89d81782821c5776780ef9fb54c12604b07302203c2242fd25c8f3b9e32ab

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,11 @@ 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]
+        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}")
         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 +76,7 @@ module Sibu
             html_output = content_tag(t, raw(content["text"]).html_safe, html_opts)
           end
         end
-        @sb_section -= [t_id]
+        instance_variable_set("@sb_section", instance_variable_get("@sb_section")[0..-2])
         html_output
       end
     end
@@ -82,18 +84,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]
+        instance_variable_set("@sb_section", (instance_variable_get("@sb_section") || []) + [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]
+        instance_variable_set("@sb_section", instance_variable_get("@sb_section")[0..-2])
         html_output
       end
     end
@@ -126,7 +128,7 @@ module Sibu
     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)
@@ -313,8 +315,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'
+      instance_variable_set("@sb_section", (instance_variable_get("@sb_section") || []) + [t_id])
+      # @sb_section = (@sb_section || []) + [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 +335,8 @@ module Sibu
       else
         html_output = content_tag(:a, raw(text), content.merge(html_opts).except("elements"))
       end
-      @sb_section -= [t_id]
+      instance_variable_set("@sb_section", instance_variable_get("@sb_section") - [t_id])
+      # @sb_section -= [t_id]
       html_output
     end
 

data/lib/sibu/version.rb

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

metadata

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