sibu 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6ac6fcc8741cda28364f1a319bfa2d24dc605ef
-  data.tar.gz: ebc4761b97ed9186af7322a5cc51de3f7c5d2988
+  metadata.gz: 7635dae443f7cd9cea480558c4d28d1595e8b0dd
+  data.tar.gz: dd93b5227313bcd4f6863191261a6fae389b5310
 SHA512:
-  metadata.gz: 28bbc4e555c5e63c7bc0316366a2ebcaf3cbe353358ac3894cc127b37a573651cba3c47d7f9f29ee3cb9f750713668234ab29bf7496326618dfcae7663f8882b
-  data.tar.gz: 3afce7820f8452e608f62c2825cd2ad4c6cf2e6eb008152690a66b8a00ab26481754bfa2a48192262bbbecf1f649277884652ac8dca79d88eb4f720725e2fc40
+  metadata.gz: 0525e546145a52500ae365f916c992e8dbb02bb1473dc7e94ef1b3b77975bb77e0b7d1e1f66ab717fcf7dfb5403616d1513cc6a4e035f535d8025f90d8f5bcec
+  data.tar.gz: b208922425d9433c712b40356f8be17fb67b32fbd3391028e5ef4b19415c2ed94f7e006d8813b57589a64883bcef70c8d371f4d9bf37bfdb5bf8a4f287aba1d7

data/app/assets/javascripts/sibu/sibu.js.erb

@@ -1,3 +1,4 @@
 //= require jquery
 //= require jquery_ujs
+//= require tinymce-jquery
 //= require_self

data/app/assets/stylesheets/sibu/sibu.scss.erb

@@ -1,33 +1,11 @@
-sb-edit,
-[class*='sb-'] {
-  position: relative;
-
-  &:hover > .sb-overlay {
+sb-edit {
+  .sb-edit-active {
     cursor: pointer;
-    display: flex;
-  }
-}
-
-.sb-overlay {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 999;
-  width: 100%;
-  height: 100%;
-  display: none;
-  flex-wrap: wrap;
-  align-items: center;
-  justify-content: center;
-  text-align: center;
-
-  > * {
-    flex: 1 1 0%;
   }
 }
 
 #edit_panel {
-  position: absolute;
+  position: fixed;
   left: 0;
   bottom: 0;
   width: 100%;

data/app/controllers/sibu/pages_controller.rb

@@ -16,6 +16,7 @@ module Sibu
         @site = Sibu::Site.find_by_domain(request.domain)
         if @site
           @page = @site.page(params[:path])
+          @links = @site.internal_links
           view_template = @page ? 'show' : @site.not_found
         else
           view_template = Rails.application.config.sibu[:not_found]
@@ -23,6 +24,7 @@ module Sibu
       else
         @site = Sibu::Site.find(params[:site_id])
         @page = Sibu::Page.find(params[:id])
+        @links = @site.internal_links
         view_template = 'show'
       end
 
@@ -60,7 +62,8 @@ module Sibu
 
     def edit_content
       @page = Sibu::Page.find(params[:page_id])
-      @site = @page.site if @page
+      @site = Sibu::Site.includes(:pages).find(@page.site_id) if @page
+      @links = @site.internal_links if @site
       render :edit_content, layout: 'sibu/edit_content'
     end
 
@@ -68,7 +71,7 @@ module Sibu
     end
 
     def update_element
-      @updated = @entity.update_element(@section_id, @element_id, element_params)
+      @updated = @entity.update_element(@section_id, element_params)
     end
 
     def edit_section
@@ -81,7 +84,7 @@ module Sibu
 
     def set_page
       @page = Sibu::Page.find(params[:id])
-      @site = @page.site if @page
+      @site = Sibu::Site.includes(:pages).find(@page.site_id) if @page
     end
 
     def set_site

data/app/controllers/sibu/sites_controller.rb

@@ -20,8 +20,7 @@ module Sibu
 
     def create
       @site = Sibu::Site.new(site_params)
-      @site.init_data(:default)
-      if @site.save
+      if @site.save_and_init(:default)
         redirect_to sites_url, notice: "Le site a bien été créé."
       else
         flash.now[:alert] = "Une erreur s'est produite lors de la création du site."

data/app/helpers/sibu/pages_helper.rb

@@ -1,5 +1,7 @@
 module Sibu
   module PagesHelper
+    include Sibu::Engine.routes.url_helpers
+
     def link_path(page_id)
       p = @site.page_by_id(page_id)
       p ? (@site.domain.blank? ? site_page_path(@site.id, p.id) : "/#{p.path}") : "#"
@@ -12,5 +14,67 @@ module Sibu
     def page_languages
       [['Français', 'fr'], ['Anglais', 'en']]
     end
+
+    [:h1, :h2, :h3, :h4, :h5, :h6, :p, :span, :div, :label].each do |t|
+      define_method(t) do |id_or_elt, html_opts = {}|
+        content = id_or_elt.is_a?(Hash) ? (id_or_elt || {"text" => "Texte à modifier"}) : (select(id_or_elt) || {"text" => "Texte à modifier"})
+        html_opts.merge!({class: "sb-#{t} #{html_opts[:class]}", data: {id:  id_or_elt.is_a?(Hash) ? id_or_elt["id"] : id_or_elt}}) if action_name != 'show'
+        content_tag(t, raw(content["text"]).html_safe, html_opts)
+      end
+    end
+
+    def sb
+      self
+    end
+
+    def select(id)
+      @sb_entity.section(@sb_section).select {|elt| elt["id"] == id}.first
+    end
+
+    def site_section(id, &block)
+      @sb_entity = @site
+      @sb_section = id
+      capture(self, &block)
+    end
+
+    def section(id, &block)
+      @sb_entity = @page
+      @sb_section = id
+      capture(self, &block)
+    end
+
+    def each
+      # Todo : init array when empty
+      @sb_entity.section(@sb_section).each do |elt|
+        yield(elt.except("elements"), elt["elements"])
+      end
+    end
+
+    def each_elements
+      @sb_entity.section(@sb_section).each do |elt|
+        yield(*elt["elements"])
+      end
+    end
+
+    def img(id_or_elt, html_opts = {})
+      content = id_or_elt.is_a?(Hash) ? (id_or_elt || {"src" => "/default.jpg"}) : (select(id_or_elt) || {"src" => "/default.jpg"})
+      opts = action_name == 'show' ? html_opts.merge({class: "sb-img #{html_opts[:class]}", data: {id: id_or_elt.is_a?(Hash) ? id_or_elt["id"] : id_or_elt}}) : html_opts
+      content_tag(:img, nil, content.except("id").merge(opts))
+    end
+
+    def link(id_or_elt, html_opts = {}, &block)
+      content = id_or_elt.is_a?(Hash) ? (id_or_elt || {"value" => "", "text" => "Nouveau lien"}) : (select(id_or_elt) || {"value" => "", "text" => "Nouveau lien"})
+      val = content["value"] || ""
+      if val.to_s.include?('http')
+        href = val
+      else
+        href = @links.keys.include?(val) ? (action_name == 'show' ? site_page_path(@site.id, val) : site_page_edit_content_path(@site.id, val)) : '#'
+      end
+      if block_given?
+        content_tag(:a, {href: href}.merge(html_opts), &block)
+      else
+        content_tag(:a, content["text"], {href: href}.merge(html_opts))
+      end
+    end
   end
 end

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

@@ -2,34 +2,47 @@ module Sibu
   module SectionsConcern
     include ActiveSupport::Concern
 
-    def section(*ids)
-      if ids.length == 1
+    def section(id)
+      # elts = nil
+      # if ids.length == 1
         s = nil
         if sections.blank?
           self.sections = {}
         else
-          s = sections[ids[0]]
+          s = sections[id]
         end
         if s.nil?
           s = []
-          self.sections[ids[0]] = s
+          self.sections[id] = s
           save
         end
         s
-      elsif ids.length == 2
-        s = section(ids[0])
-        sub = s.select {|elt| elt["id"] == ids[1]}
-        unless sub
-          sub = {"id" => ids[1], "elements" => []}
-          self.sections[ids[0]] << sub
-          save
-        end
-        sub
+      # elsif ids.length == 2
+      #   s = section(ids[0])
+      #   sub = s.select {|elt| elt["id"] == ids[1]}
+      #   unless sub
+      #     sub = {"id" => ids[1], "elements" => []}
+      #     self.sections[ids[0]] << sub
+      #     save
+      #   end
+      #   elts = sub
+      # end
+      # elts.blank? ? {"default" => {}} : Hash[elts.map {|e| [e["id"], e.except("id")]}]
+    end
+
+    def subsection(id, subid)
+      s = section(id)
+      sub = s.select {|elt| elt["id"] == ids[1]}
+      unless sub
+        sub = {"id" => ids[1], "elements" => []}
+        self.sections[ids[0]] << sub
+        save
       end
+      elts = sub
     end
 
     def element(section_id, element_id)
-      elt = section(section_id).select {|e| e["id"] == element_id}.first
+      elt = section(section_id)[element_id]
       elt || {}
     end
 
@@ -37,17 +50,13 @@ module Sibu
     end
 
     # Note : only 2 levels supported for now
-    def update_element(*ids, value)
-      updated = nil
-      if ids.length > 1
-        if self.sections[ids[0]].any? {|elt| elt["id"] == ids[1]}
-          self.sections[ids[0]].map! {|elt| elt["id"] == ids[1] ? elt.value : elt}
-        else
-          self.sections[ids[0]] << {"id" => ids[1]}.merge(value)
-        end
-        updated = value if save
+    def update_element(section_id, value)
+      if self.sections[section_id].any? {|elt| elt["id"] == value["id"]}
+        self.sections[section_id].map! {|elt| elt["id"] == value["id"] ? value : elt}
+      else
+        self.sections[section_id] << value
       end
-      updated
+      value if save
     end
   end
 end

data/app/models/sibu/site.rb

@@ -23,12 +23,30 @@ module Sibu
       pages.where(id: page_id).first
     end
 
-    def init_data(source)
+    def save_and_init(source)
+      ActiveRecord::Base.transaction do
+        save!
+        init_pages(source)
+        init_sections(source)
+      end
+    end
+
+    def internal_links
+      Hash[pages.collect {|p| [p.id, p.path]}]
+    end
+
+    def init_pages(source)
       site_data = Rails.application.config.sibu[:site_data][source]
-      self.sections = site_data.sections
       site_data.pages.each do |p|
         self.pages << Sibu::Page.new(p)
       end
+      save!
+    end
+
+    def init_sections(source)
+      site_data = Rails.application.config.sibu[:site_data][source]
+      self.sections = site_data.sections(self)
+      save!
     end
   end
 end

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

@@ -8,7 +8,7 @@
   <%= javascript_include_tag 'sibu/sibu' %>
   <% if @site %>
     <%= stylesheet_link_tag @site.site_template.path, media: "all" %>
-    <%= javascript_include_tag @site.site_template.path %>
+    <%= javascript_include_tag "#{@site.site_template.path}-core" %>
   <% end %>
   <%= csrf_meta_tags %>
 </head>
@@ -23,26 +23,64 @@
 <div id="edit_panel" class="sibu_view"></div>
 
 <script>
-  $(function() {
-    initOverlays();
-  });
-
-  function initOverlays() {
-      var elts = $("[class*='sb-']");
-      elts.each(function() {
-          var elt = $(this);
-          elt.find(".sb-overlay").remove();
-          var section = elt.parents("sb-edit").first();
-          var eltId = elt.data("id"), sectionId = section.data("id"), entity = section.data("entity");
-          elt.append(
-              '<div class="sb-overlay sibu_panel">' +
-                '<a href="<%= edit_element_site_page_path(@site.id, @page.id) %>?element_id=' + eltId + '&section_id=' + sectionId +
-                  '&entity=' + entity + '" data-remote="true">Modifier</a>' +
-              '</div>'
-          );
-      });
-
-  }
+    $(function () {
+        initOverlays();
+    });
+
+    function initOverlays() {
+        const textTags = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'div', 'p', 'span'];
+
+        var elts = $("[class*='sb-']");
+        elts.each(function () {
+            var previous;
+            var elt = $(this), tag = elt.prop("tagName").toLowerCase(), width = elt.width(),
+                height = elt.height(), display = elt.css("display"), padding = elt.css("padding"), margin = elt.css("margin");
+            var section = elt.parents("sb-edit").first();
+            var eltId = elt.data("id"), sectionId = section.data("id"), entity = section.data("entity");
+            var overlayElt = $(editOverlay(width, height, display, padding, margin));
+            bindMouseEnter(elt, overlayElt, eltId, sectionId, entity);
+        });
+
+        function bindMouseEnter(element, overlay, elementId, sectionId, entity) {
+            element.mouseenter(function () {
+                overlay.replaceAll(element);
+                overlay.addClass("sb-edit-active sibu_panel");
+                overlay.click(function() {
+                  editContent(elementId, sectionId, entity)
+                });
+                bindMouseLeave(element, overlay, elementId, sectionId, entity);
+            });
+        }
+
+        function bindMouseLeave(element, overlay, elementId, sectionId, entity) {
+            overlay.mouseleave(function() {
+                overlay.removeClass("sb-edit-active sibu_panel");
+                element.replaceAll(overlay);
+                bindMouseEnter(element, overlay, elementId, sectionId, entity);
+            });
+        }
+
+        function editOverlay(width, height, display, padding, margin) {
+            return '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" ' +
+                      'style="box-sizing: content-box; display: ' + display + '; padding: ' + padding + '; margin: ' + margin + ';"' +
+                      'viewBox="0 0 ' + width + ' ' + height + '" width="' + width + 'px" height="' + height + 'px">' +
+                      '<rect width="' + width + '" height="' + height + '" x="0" y="0" fill="#dedede"/>' +
+                   '</svg>';
+        }
+
+        function editContent(eltId, sectionId, entity) {
+            $.ajax({
+                url: "<%= edit_element_site_page_path(@site.id, @page.id) %>",
+                method: "GET",
+                data: {
+                    element_id: eltId,
+                    section_id: sectionId,
+                    entity: entity
+                }
+            })
+        }
+
+    }
 </script>
 <%= yield :scripts %>
 </body>

data/app/views/sibu/pages/_edit_panel.html.erb

@@ -3,11 +3,10 @@
 <div class="sibu_form">
   <%= form_tag(update_element_site_page_path(@site.id, @page.id), method: :patch, remote: true) do |f| %>
     <div class="sibu_field">
-      <%= label_tag 'element[text]', 'Texte' %>
-      <%= text_area_tag 'element[text]' %>
+      <%= text_area_tag 'element[text]', '', class: 'tinymce' %>
     </div>
+    <%= hidden_field_tag 'element[id]', @element_id %>
     <%= hidden_field_tag :section_id, @section_id %>
-    <%= hidden_field_tag :element_id, @element_id %>
     <%= hidden_field_tag :entity, @entity_type %>
     <div class="sibu_actions">
       <%= submit_tag 'Valider' %>
@@ -15,5 +14,3 @@
     </div>
   <% end %>
 </div>
-
-

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

@@ -1,4 +1,12 @@
 var editPanel = $("#edit_panel");
 editPanel.html("<%= j(render 'edit_panel') %>");
-editPanel.find("#element").val("<%= @entity.element(@section_id, @element_id)["text"] %>");
-editPanel.slideDown("fast");
+editPanel.find("#element_text").val("<%= j(raw @entity.element(@section_id, @element_id)["text"]) %>");
+editPanel.slideDown("fast");
+tinyMCE.remove();
+tinyMCE.init({
+    selector: 'textarea.tinymce',
+    branding: false,
+    menubar: false,
+    toolbar: 'bold italic underline alignleft aligncenter alignright alignjustify',
+    forced_root_block : false
+});

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

@@ -2,6 +2,5 @@
   $("#edit_panel #edit_msg").html("<p class='sibu_alert'>Une erreur s'est produite lors de l'enregistrement.</p>");
 <% else %>
   $("#edit_panel").slideUp();
-  $("sb-edit[data-id='<%= @section_id %>']").find("[data-id='<%= @element_id %>']").text("<%= @updated["text"] %>");
-  initOverlays();
+  $("sb-edit[data-id='<%= @section_id %>']").find("[data-id='<%= @updated["id"] %>']").html("<%= j(raw @updated["text"]) %>");
 <% end %>

data/config/tinymce.yml

@@ -0,0 +1,6 @@
+default:
+  toolbar:
+    - styleselect | bold italic
+    - link
+  plugins:
+    - link

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -56,30 +56,30 @@ dependencies:
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.3.1
 - !ruby/object:Gem::Dependency
   name: tinymce-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.7.6
 - !ruby/object:Gem::Dependency
   name: tinymce-rails-langs
   requirement: !ruby/object:Gem::Requirement
@@ -145,8 +145,8 @@ files:
 - app/views/sibu/sites/show.html.erb
 - app/views/sibu/sites/update.html.erb
 - config/initializers/shrine.rb
-- config/initializers/tag_helper.rb
 - config/routes.rb
+- config/tinymce.yml
 - db/migrate/20180124095041_create_sibu_sites.rb
 - db/migrate/20180124095213_create_sibu_pages.rb
 - db/migrate/20180124145030_create_sibu_site_templates.rb

data/config/initializers/tag_helper.rb

@@ -1,75 +0,0 @@
-module ActionView
-  module Helpers
-    module TagHelper
-      # Todo : handle default values => sections can be totally empty or have at least 1 elt
-      # If "emptyable", how do we add the 1st elt ? If not, how do we provide a default value ?
-      class SectionHelper
-        include ActionView::Helpers::TagHelper
-
-        attr_reader :entity_type
-
-        [:h1, :h2, :h3, :h4, :h5, :h6, :p, :span, :div].each do |t|
-          define_method(t) do |id, html_opts = {}|
-            html_opts.merge!({class: "sb-#{t} #{html_opts[:class]}", data: {id: id}}) if @edit
-            content_tag(t, (@elements.dig(id, "text") || "Texte à modifier"), html_opts)
-          end
-        end
-
-        def initialize(*ids, entity, edit_mode)
-          @id = ids.join('|')
-          @entity_type = entity.is_a?(Sibu::Page) ? 'page' : 'site'
-          elts = entity.section(*ids)
-          @elements = elts.blank? ? {"default" => {}} : Hash[elts.map {|e| [e["id"], e.except("id")]}]
-          @edit = edit_mode
-        end
-
-        # Note : add sb-img back - see how the extra div could be removed
-        def img(id, html_opts = {})
-          content = id == "default" ? {"src" => "/default.jpg"} : (@elements[id] || {"src" => "/default.jpg"})
-          if @edit
-            content_tag(:div, content_tag(:img, nil, content.merge(html_opts)), {class: "rel h100 #{html_opts[:class]}", data: {id: id}})
-          else
-            content_tag(:img, nil, content.merge(html_opts))
-          end
-        end
-
-        def lnk(id)
-          @elements[id] || {"value" => "", "text" => "Nouveau lien"}
-        end
-
-        # def subsection(id, &block)
-        #   section
-          # s = SectionHelper.new(id, @entity_type, @elements[id], @edit)
-          # if !@edit
-          #   capture(s, &block)
-          # else
-          #   "<sb-edit data-id='#{id}' data-entity='#{@entity_type}'>#{capture(s, &block)}</sb-edit>".html_safe
-          # end
-        # end
-
-        def elements(&block)
-          @elements.each_pair(&block)
-        end
-      end
-
-      def section(id, entity = @page, &block)
-        s = SectionHelper.new(id, entity, action_name != 'show')
-        if action_name == 'show'
-          capture(s, &block)
-        else
-          "<sb-edit data-id='#{id}' data-entity='#{s.entity_type}'>#{capture(s, &block)}</sb-edit>".html_safe
-        end
-      end
-
-      def subsection(id, sub_id, entity = @page, &block)
-        entity_type = entity.is_a?(Sibu::Page) ? 'page' : 'site'
-        s = SectionHelper.new(id, sub_id, entity, action_name != 'show')
-        # if action_name == 'show'
-          capture(s, &block)
-        # else
-        #   "<sb-edit data-id='#{id}' data-entity='#{s.entity_type}'>#{capture(s, &block)}</sb-edit>".html_safe
-        # end
-      end
-    end
-  end
-end