sibu 0.7.3 → 0.8.1

data/app/controllers/sibu/sites_controller.rb

@@ -1,81 +1,81 @@
-require_dependency "sibu/application_controller"
-
-module Sibu
-  class SitesController < ApplicationController
-    before_action :set_site, only: [:show, :edit, :update, :destroy, :duplicate]
-    skip_before_action Rails.application.config.sibu[:auth_filter], only: [:show]
-
-    def index
-      @sites = Sibu::Site.for_user(sibu_user).order(:name, :version)
-    end
-
-    def show
-      @page = @site.page('')
-      redirect_to site_page_path(@site.id, @page.id)
-    end
-
-    def new
-      @site = Sibu::Site.new(user_id: sibu_user.id, version: Sibu::Site::DEFAULT_VERSION)
-    end
-
-    def create
-      @site = Sibu::Site.new(site_params)
-      if @site.save_and_init
-        generate_styles(@site) if conf[:custom_styles]
-        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."
-        render :new
-      end
-    end
-
-    def edit
-    end
-
-    def update
-      if @site.update(site_params)
-        if conf[:custom_styles] && @site.previous_changes.has_key?(:custom_data)
-          generate_styles(@site)
-        end
-        redirect_to sites_url, notice: "Le site a bien été mis à jour."
-      else
-        flash.now[:alert] = "Une erreur s'est produite lors de l'enregistrement du site."
-        render :edit
-      end
-    end
-
-    def destroy
-      @site.destroy
-      redirect_to sites_url, notice: "Le site a bien été supprimé."
-    end
-
-    def duplicate
-      new_site = @site.deep_copy
-      if new_site.save
-        if conf[:custom_styles]
-          generate_styles(@site)
-          generate_styles(new_site)
-        end
-        redirect_to sites_url, notice: "Le site a bien été copié."
-      else
-        flash.now[:alert] = "Une erreur s'est produite lors de la copie du site."
-        render :index
-      end
-    end
-
-    private
-
-    def set_site
-      @site = Sibu::Site.find(params[:id])
-    end
-
-    def site_params
-      params.require(:site).permit!
-    end
-
-    def generate_styles(site)
-      ds = Sibu::DynamicStyle.new(site.id)
-      ds.compile
-    end
-  end
-end
+require_dependency "sibu/application_controller"
+
+module Sibu
+  class SitesController < ApplicationController
+    before_action :set_site, only: [:show, :edit, :update, :destroy, :duplicate]
+    skip_before_action Rails.application.config.sibu[:auth_filter], only: [:show]
+
+    def index
+      @sites = Sibu::Site.for_user(sibu_user).order(:name, :version)
+    end
+
+    def show
+      @page = @site.page('')
+      redirect_to site_page_path(@site.id, @page.id)
+    end
+
+    def new
+      @site = Sibu::Site.new(user_id: sibu_user.id, version: Sibu::Site::DEFAULT_VERSION)
+    end
+
+    def create
+      @site = Sibu::Site.new(site_params)
+      if @site.save_and_init
+        generate_styles(@site) if conf[:custom_styles]
+        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."
+        render :new
+      end
+    end
+
+    def edit
+    end
+
+    def update
+      if @site.update(site_params)
+        if conf[:custom_styles] && @site.previous_changes.has_key?(:custom_data)
+          generate_styles(@site)
+        end
+        redirect_to sites_url, notice: "Le site a bien été mis à jour."
+      else
+        flash.now[:alert] = "Une erreur s'est produite lors de l'enregistrement du site."
+        render :edit
+      end
+    end
+
+    def destroy
+      @site.destroy
+      redirect_to sites_url, notice: "Le site a bien été supprimé."
+    end
+
+    def duplicate
+      new_site = @site.deep_copy
+      if new_site.save
+        if conf[:custom_styles]
+          generate_styles(@site)
+          generate_styles(new_site)
+        end
+        redirect_to sites_url, notice: "Le site a bien été copié."
+      else
+        flash.now[:alert] = "Une erreur s'est produite lors de la copie du site."
+        render :index
+      end
+    end
+
+    private
+
+    def set_site
+      @site = Sibu::Site.find(params[:id])
+    end
+
+    def site_params
+      params.require(:site).permit!
+    end
+
+    def generate_styles(site)
+      ds = Sibu::DynamicStyle.new(site.id)
+      ds.compile
+    end
+  end
+end

data/app/helpers/sibu/application_helper.rb

@@ -1,11 +1,11 @@
-module Sibu
-  module ApplicationHelper
-    def conf
-      Rails.application.config.sibu
-    end
-
-    def sibu_user
-      send(Rails.application.config.sibu[:current_user])
-    end
-  end
-end
+module Sibu
+  module ApplicationHelper
+    def conf
+      Rails.application.config.sibu
+    end
+
+    def sibu_user
+      send(Rails.application.config.sibu[:current_user])
+    end
+  end
+end

data/app/helpers/sibu/documents_helper.rb

@@ -1,4 +1,4 @@
-module Sibu
-  module DocumentsHelper
-  end
-end
+module Sibu
+  module DocumentsHelper
+  end
+end

data/app/helpers/sibu/images_helper.rb

@@ -1,4 +1,4 @@
-module Sibu
-  module ImagesHelper
-  end
-end
+module Sibu
+  module ImagesHelper
+  end
+end

data/app/helpers/sibu/pages_helper.rb

@@ -1,194 +1,194 @@
-module Sibu
-  module PagesHelper
-    include Sibu::Engine.routes.url_helpers
-
-    def link_path(page_id)
-      p = @site.page_by_id(page_id)
-      p ? (request.host == conf[:host] ? site_page_path(@site.id, p.id) : (conf[:deployment_path] ? "/#{conf[:deployment_path]}/#{p.path}" : "/#{p.path}")) : "#"
-    end
-
-    def sections_templates
-      @site.site_template.available_templates
-    end
-
-    def site_images
-      ([Sibu::Image.empty] + Sibu::Image.for_user(sibu_user)).uniq
-    end
-
-    def available_links
-      options_from_collection_for_select(@site.pages.order(:name), :id, :name, @element["value"])
-    end
-
-    def available_docs
-      options_from_collection_for_select(Sibu::Document.for_user(sibu_user), :file_url, :file_name, @element["value"])
-    end
-
-    def link_type(val)
-      if val.blank? || /^\d+$/.match(val.to_s)
-        'internal'
-      elsif Sibu::Document.for_user(sibu_user).map {|d| d.file_url}.include?(val)
-        'document'
-      elsif val.to_s.start_with?('http', '#', '/')
-        'external'
-      else
-        'email'
-      end
-    end
-
-    [:h1, :h2, :h3, :h4, :h5, :h6, :span].each do |t|
-      define_method(t) do |elt, html_opts = {}|
-        defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "text" => DEFAULT_TEXT}
-        content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
-        html_opts.merge!({data: {id: elt_id(elt), type: "text"}}) if action_name != 'show'
-        content_tag(t, raw(content["text"]).html_safe, html_opts)
-      end
-    end
-
-    def p(elt, opts = {})
-      repeat = opts.delete(:repeat)
-      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "text" => DEFAULT_PARAGRAPH}
-      content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
-      opts.merge!({data: {id: elt_id(elt), repeat: repeat, type: "paragraph"}}) if action_name != 'show'
-      content_tag(:div, content_tag(:p, raw(content["text"]).html_safe), opts)
-    end
-
-    def sb
-      self
-    end
-
-    def select_element(id)
-      @sb_entity.element(*@sb_section, id)
-    end
-
-    def elements(id = nil)
-      items = id ? select_element(id)["elements"] : @sb_entity.find_or_init(*@sb_section)["elements"]
-      items.blank? ? [{"id" => "el#{Time.current.to_i}"}] : items
-    end
-
-    def img(elt, opts = {})
-      wrapper = opts.delete(:wrapper)
-      repeat = opts.delete(:repeat)
-      size = opts.delete(:size)
-      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "src" => DEFAULT_IMG}
-      content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
-      if action_name == 'show'
-        content["src"] = ("/#{conf[:deployment_path]}" + content["src"]) if @online && conf[:deployment_path]
-      else
-        opts.merge!({data: {id: elt_id(elt), type: "media", repeat: repeat, size: size}})
-      end
-      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})
-    end
-
-    def grp(elt, opts = {}, &block)
-      wrapper = opts.delete(:wrapper) || :div
-      repeat = opts.delete(:repeat)
-      children = opts.delete(:children)
-      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt}
-      opts = defaults.merge(opts)
-      opts.merge!({data: {id: elt_id(elt), type: "group", repeat: repeat, children: children}}) if action_name != 'show'
-      content_tag(wrapper, capture(*elts(elt), &block), opts)
-    end
-
-    def form_label(elt, html_opts = {}, &block)
-      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "text" => DEFAULT_TEXT}
-      content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
-      html_opts.merge!({data: {id: elt_id(elt), type: "text"}}) if action_name != 'show'
-      content_tag(:label, raw(content["text"]).html_safe, html_opts)
-    end
-
-    def widget(elt, widget_type, opts = {}, &block)
-      content = elt.is_a?(Hash) ? elt : (select_element(elt) || {})
-      opts.merge!({data: {id: elt_id(elt), type: "widget_#{widget_type.to_s.split('::').last.underscore}"}}) if action_name != 'show'
-      content_tag(:div, capture(widget_type.new(content), &block), opts)
-    end
-
-    def embed(elt, opts = {})
-      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "code" => '<p>Contenu HTML personnalisé (iframe, etc...)</p>'}
-      content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
-      opts.merge!({data: {id: elt_id(elt), type: "embed"}}) if action_name != 'show'
-      content_tag(:div, content_tag(:p, raw(content["code"]).html_safe), opts)
-    end
-
-    # Note : see ActionView::OutputBuffer
-    def sb_page
-      @sb_entity = @page
-      self
-    end
-
-    alias page sb_page
-
-    def sb_site
-      @sb_entity = @site
-      self
-    end
-
-    alias site sb_site
-
-    def section(id, tag, html_opts = {}, &block)
-      @sb_section = [id]
-      opts = action_name != 'show' ? html_opts.merge({"data-sb-id" => id, "data-sb-repeat" => @sb_entity != @site, "data-sb-entity" => @sb_entity == @site ? 'site' : 'page'}) : html_opts
-      content_tag(tag, capture(self, &block), opts)
-    end
-
-    def sections(id, tag, html_opts = {}, &block)
-      (@sb_entity.find_or_init(id)["elements"].map.with_index do |elt, i|
-        @sb_section = [id, elt["id"]]
-        opts = action_name != 'show' ? html_opts.merge({"data-sb-id" => @sb_section.join('|'), "data-sb-repeat" => true, "data-sb-entity" => @sb_entity == @site ? 'site' : 'page'}) : html_opts
-        content_tag(tag, capture(self, i, &block), opts)
-      end).join('').html_safe
-    end
-
-    def elts(id)
-      items = []
-      element_id = elt_id(id)
-      elemnts = @sb_entity.elements(*(@sb_section + element_id.split("|")).uniq)
-      if elemnts
-        elemnts.each do |e|
-          e["data-id"] = [element_id, e["id"]].join("|")
-          items << e
-        end
-      end
-      items.blank? ? [{"id" => element_id.split("|").last, "data-id" => [element_id, "#{element_id}0"].join("|")}] : items
-    end
-
-    def link(elt, html_opts = {}, &block)
-      repeat = html_opts.delete(:repeat)
-      children = html_opts.delete(:children)
-      defaults = {"id" => elt_id(elt), "value" => "", "text" => DEFAULT_TEXT}
-      content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
-      val = content.delete("value") || ""
-      text = content.delete("text")
-      html_opts.merge!({data: {id: elt_id(elt), 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?('#')
-        content["href"] = val
-        content.delete("target")
-      elsif val.to_s.start_with?('/')
-        content["href"] = val
-      elsif val.to_s.include?('@')
-        content["href"] = 'mailto:' + val
-      else
-        content["href"] = @links.keys.include?(val.to_s) ? (action_name == 'show' ? link_path(val) : site_page_edit_content_path(@site.id, val)) : '#'
-      end
-      # Note : sends elts in given order
-      if block_given?
-        content_tag(:a, capture(*([raw(text)] + elts(elt)), &block), content.merge(html_opts).except("elements"))
-      else
-        content_tag(:a, raw(text), content.merge(html_opts).except("elements"))
-      end
-    end
-
-    def interactive_map(elt, html_opts = {})
-      defaults = {"data-lat" => "45.68854", "data-lng" => "5.91587", "data-title" => DEFAULT_TEXT}
-      content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {"id" => elt}))
-      html_opts.merge!({data: {id: elt_id(elt), type: "map"}}) if action_name != 'show'
-      content_tag(:div, nil, content.merge(html_opts))
-    end
-
-    def elt_id(elt)
-      elt.is_a?(Hash) ? (elt["data-id"] || elt["id"]) : elt
-    end
-  end
-end
+module Sibu
+  module PagesHelper
+    include Sibu::Engine.routes.url_helpers
+
+    def link_path(page_id)
+      p = @site.page_by_id(page_id)
+      p ? (request.host == conf[:host] ? site_page_path(@site.id, p.id) : (conf[:deployment_path] ? "/#{conf[:deployment_path]}/#{p.path}" : "/#{p.path}")) : "#"
+    end
+
+    def sections_templates
+      @site.site_template.available_sections
+    end
+
+    def site_images
+      ([Sibu::Image.empty] + Sibu::Image.for_user(sibu_user)).uniq
+    end
+
+    def available_links
+      options_from_collection_for_select(@site.pages.order(:name), :id, :name, @element["value"])
+    end
+
+    def available_docs
+      options_from_collection_for_select(Sibu::Document.for_user(sibu_user), :file_url, :file_name, @element["value"])
+    end
+
+    def link_type(val)
+      if val.blank? || /^\d+$/.match(val.to_s)
+        'internal'
+      elsif Sibu::Document.for_user(sibu_user).map {|d| d.file_url}.include?(val)
+        'document'
+      elsif val.to_s.start_with?('http', '#', '/')
+        'external'
+      else
+        'email'
+      end
+    end
+
+    [:h1, :h2, :h3, :h4, :h5, :h6, :span].each do |t|
+      define_method(t) do |elt, html_opts = {}|
+        defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "text" => DEFAULT_TEXT}
+        content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
+        html_opts.merge!({data: {id: elt_id(elt), type: "text"}}) if action_name != 'show'
+        content_tag(t, raw(content["text"]).html_safe, html_opts)
+      end
+    end
+
+    def p(elt, opts = {})
+      repeat = opts.delete(:repeat)
+      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "text" => DEFAULT_PARAGRAPH}
+      content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
+      opts.merge!({data: {id: elt_id(elt), repeat: repeat, type: "paragraph"}}) if action_name != 'show'
+      content_tag(:div, content_tag(:p, raw(content["text"]).html_safe), opts)
+    end
+
+    def sb
+      self
+    end
+
+    def select_element(id)
+      @sb_entity.element(*@sb_section, id)
+    end
+
+    def elements(id = nil)
+      items = id ? select_element(id)["elements"] : @sb_entity.find_or_init(*@sb_section)["elements"]
+      items.blank? ? [{"id" => "el#{Time.current.to_i}"}] : items
+    end
+
+    def img(elt, opts = {})
+      wrapper = opts.delete(:wrapper)
+      repeat = opts.delete(:repeat)
+      size = opts.delete(:size)
+      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "src" => DEFAULT_IMG}
+      content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
+      if action_name == 'show'
+        content["src"] = ("/#{conf[:deployment_path]}" + content["src"]) if @online && conf[:deployment_path]
+      else
+        opts.merge!({data: {id: elt_id(elt), type: "media", repeat: repeat, size: size}})
+      end
+      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})
+    end
+
+    def grp(elt, opts = {}, &block)
+      wrapper = opts.delete(:wrapper) || :div
+      repeat = opts.delete(:repeat)
+      children = opts.delete(:children)
+      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt}
+      opts = defaults.merge(opts)
+      opts.merge!({data: {id: elt_id(elt), type: "group", repeat: repeat, children: children}}) if action_name != 'show'
+      content_tag(wrapper, capture(*elts(elt), &block), opts)
+    end
+
+    def form_label(elt, html_opts = {}, &block)
+      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "text" => DEFAULT_TEXT}
+      content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
+      html_opts.merge!({data: {id: elt_id(elt), type: "text"}}) if action_name != 'show'
+      content_tag(:label, raw(content["text"]).html_safe, html_opts)
+    end
+
+    def widget(elt, widget_type, opts = {}, &block)
+      content = elt.is_a?(Hash) ? elt : (select_element(elt) || {})
+      opts.merge!({data: {id: elt_id(elt), type: "widget_#{widget_type.to_s.split('::').last.underscore}"}}) if action_name != 'show'
+      content_tag(:div, capture(widget_type.new(content), &block), opts)
+    end
+
+    def embed(elt, opts = {})
+      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "code" => '<p>Contenu HTML personnalisé (iframe, etc...)</p>'}
+      content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
+      opts.merge!({data: {id: elt_id(elt), type: "embed"}}) if action_name != 'show'
+      content_tag(:div, content_tag(:p, raw(content["code"]).html_safe), opts)
+    end
+
+    # Note : see ActionView::OutputBuffer
+    def sb_page
+      @sb_entity = @page
+      self
+    end
+
+    alias page sb_page
+
+    def sb_site
+      @sb_entity = @site
+      self
+    end
+
+    alias site sb_site
+
+    def section(id, tag, html_opts = {}, &block)
+      @sb_section = [id]
+      opts = action_name != 'show' ? html_opts.merge({"data-sb-id" => id, "data-sb-repeat" => @sb_entity != @site, "data-sb-entity" => @sb_entity == @site ? 'site' : 'page'}) : html_opts
+      content_tag(tag, capture(self, &block), opts)
+    end
+
+    def sections(id, tag, html_opts = {}, &block)
+      (@sb_entity.find_or_init(id)["elements"].map.with_index do |elt, i|
+        @sb_section = [id, elt["id"]]
+        opts = action_name != 'show' ? html_opts.merge({"data-sb-id" => @sb_section.join('|'), "data-sb-repeat" => true, "data-sb-entity" => @sb_entity == @site ? 'site' : 'page'}) : html_opts
+        content_tag(tag, capture(self, i, &block), opts)
+      end).join('').html_safe
+    end
+
+    def elts(id)
+      items = []
+      element_id = elt_id(id)
+      elemnts = @sb_entity.elements(*(@sb_section + element_id.split("|")).uniq)
+      if elemnts
+        elemnts.each do |e|
+          e["data-id"] = [element_id, e["id"]].join("|")
+          items << e
+        end
+      end
+      items.blank? ? [{"id" => element_id.split("|").last, "data-id" => [element_id, "#{element_id}0"].join("|")}] : items
+    end
+
+    def link(elt, html_opts = {}, &block)
+      repeat = html_opts.delete(:repeat)
+      children = html_opts.delete(:children)
+      defaults = {"id" => elt_id(elt), "value" => "", "text" => DEFAULT_TEXT}
+      content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
+      val = content.delete("value") || ""
+      text = content.delete("text")
+      html_opts.merge!({data: {id: elt_id(elt), 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?('#')
+        content["href"] = val
+        content.delete("target")
+      elsif val.to_s.start_with?('/')
+        content["href"] = val
+      elsif val.to_s.include?('@')
+        content["href"] = 'mailto:' + val
+      else
+        content["href"] = @links.keys.include?(val.to_s) ? (action_name == 'show' ? link_path(val) : site_page_edit_content_path(@site.id, val)) : '#'
+      end
+      # Note : sends elts in given order
+      if block_given?
+        content_tag(:a, capture(*([raw(text)] + elts(elt)), &block), content.merge(html_opts).except("elements"))
+      else
+        content_tag(:a, raw(text), content.merge(html_opts).except("elements"))
+      end
+    end
+
+    def interactive_map(elt, html_opts = {})
+      defaults = {"data-lat" => "45.68854", "data-lng" => "5.91587", "data-title" => DEFAULT_TEXT}
+      content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {"id" => elt}))
+      html_opts.merge!({data: {id: elt_id(elt), type: "map"}}) if action_name != 'show'
+      content_tag(:div, nil, content.merge(html_opts))
+    end
+
+    def elt_id(elt)
+      elt.is_a?(Hash) ? (elt["data-id"] || elt["id"]) : elt
+    end
+  end
+end