sibu 0.8.1 → 0.8.2

data/app/controllers/sibu/pages_controller.rb

@@ -1,197 +1,197 @@
-require_dependency "sibu/application_controller"
-
-module Sibu
-  class PagesController < ApplicationController
-    before_action :set_page, only: [:edit, :update, :destroy, :duplicate, :edit_element, :update_element, :clone_element,
-                                    :delete_element, :child_element, :new_section, :create_section, :edit_section,
-                                    :update_section, :delete_section]
-    before_action :set_site, only: [:index, :new]
-    before_action :set_edit_context, only: [:edit_element, :update_element, :clone_element, :delete_element,
-                                            :child_element, :new_section, :create_section, :edit_section,
-                                            :update_section, :delete_section]
-    before_action :set_online, only: [:show, :edit]
-    skip_before_action Rails.application.config.sibu[:auth_filter], only: [:show]
-
-    def index
-      @pages = @site.pages.order(:created_at)
-    end
-
-    def show
-      return_code = :ok
-      if params[:site_id].blank?
-        @page = Sibu::Page.lookup(request.host, params[:path])
-        if @page
-          @query_path =  params[:path][@page.path.length + 1..-1] unless @page.path.blank?
-          @query_params = show_params.except(:controller, :action, :path).to_h
-          @site = @page.site
-          @links = @site.pages_path_by_id
-          view_template = 'show'
-        else
-          @site = Sibu::Site.where(domain: request.host).first
-          view_template = Rails.application.config.sibu[:not_found]
-          return_code = :not_found
-        end
-      else
-        @site = Sibu::Site.find(params[:site_id])
-        @page = Sibu::Page.find(params[:id])
-        @links = @site.pages_path_by_id
-        @query_path = params[:path]
-        @query_params = show_params.except(:controller, :action, :path).to_h
-        view_template = 'show'
-      end
-
-      render view_template, layout: 'sibu/site', status: return_code
-    end
-
-    def new
-      @page = Sibu::Page.new(site_id: @site.id)
-    end
-
-    def create
-      @page = Sibu::Page.new(page_params)
-      if @page.save_and_init
-        redirect_to site_pages_url(@page.site_id), notice: "La page a bien été créée."
-      else
-        flash.now[:alert] = "Une erreur s'est produite lors de la création de la page."
-        render :new
-      end
-    end
-
-    def edit
-    end
-
-    def update
-      if @page.update(page_params)
-        redirect_to site_pages_url(@page.site_id), notice: "La page a bien été mise à jour."
-      else
-        flash.now[:alert] = "Une erreur s'est produite lors de l'enregistrement de la page."
-        render :edit
-      end
-    end
-
-    def destroy
-      site_id = @page.site_id
-      if @page.destroy
-        redirect_to site_pages_url(site_id), notice: "La page a bien été supprimée."
-      else
-        flash.now[:alert] = "Une erreur s'est produite lors de la suppression de la page."
-        render :index
-      end
-    end
-
-    def duplicate
-      new_page = @page.deep_copy
-      if new_page.save
-        redirect_to site_pages_url(@page.site_id), notice: "La page a bien été copiée."
-      else
-        flash.now[:alert] = "Une erreur s'est produite lors de la copie de la page."
-        render :index
-      end
-    end
-
-    def edit_content
-      @page = Sibu::Page.find(params[:page_id])
-      @site = Sibu::Site.includes(:pages).find(@page.site_id) if @page
-      @links = @site.pages_path_by_id if @site
-      @edit_section = params[:edit_section]
-      render :edit_content, layout: 'sibu/edit_content'
-    end
-
-    def edit_element
-      @content_type = params[:content_type]
-      @links = @site.pages_path_by_id if @site
-      @element = @entity.element(*@section_id.split('|'), *@element_id.split('|'))
-      @repeat = params[:repeat]
-      @size = params[:size].blank? ? :medium : params[:size].to_sym
-      @children = params[:children]
-    end
-
-    def update_element
-      ids = (@section_id.split('|') + @element_id.split('|')).uniq[0...-1]
-      @updated = @entity.update_element(*ids, element_params)
-      @refresh = params[:refresh]
-    end
-
-    def clone_element
-      @cloned = @entity.clone_element(*@section_id.split('|'), *@element_id.split('|'))
-    end
-
-    def delete_element
-      @deleted = @entity.delete_element(*@section_id.split('|'), *@element_id.split('|'))
-    end
-
-    def child_element
-      @added = @entity.child_element(*@section_id.split('|'), *@element_id.split('|'))
-    end
-
-    def new_section
-      page = Sibu::Page.find(params[:id])
-      @page = Page.new(id: page.id, sections: [])
-      @site = Sibu::Site.includes(:pages).find(page.site_id)
-      @after = params[:after]
-      @links = @site.pages_path_by_id
-
-      @site.site_template.available_sections.each do |t|
-        template_defaults = @site.site_template.templates ? (@site.site_template.templates[t["template"]] || {}) : {}
-        @page.sections << template_defaults.merge(t).to_h
-      end
-    end
-
-    def create_section
-      @created = @entity.create_section(*@section_id.split('|'), params[:after], section_params)
-    end
-
-    def edit_section
-      @section = @entity.section(params[:section_id])
-    end
-
-    def update_section
-      # {"utf8"=>"✓", "section"=>{"color"=>"#AFCA0B", "filters"=>"school_camps"}, "section_id"=>"cs1536301729", "refresh"=>"true", "commit"=>"Valider", "site_id"=>"3", "id"=>"1392"}
-      @entity.section(params[:section_id]).merge!(section_params)
-      logger.debug @entity.section(params[:section_id])
-      @updated = @entity.save
-    end
-
-    def delete_section
-      @deleted = @entity.delete_section(*@section_id.split('|'))
-    end
-
-    private
-
-    def set_page
-      @page = Sibu::Page.find(params[:id])
-      @site = Sibu::Site.includes(:pages).find(@page.site_id) if @page
-    end
-
-    def set_site
-      @site = Sibu::Site.find(params[:site_id])
-    end
-
-    def set_edit_context
-      @entity_type = params[:entity]
-      @section_id = params[:section_id]
-      @element_id = params[:element_id]
-      @entity = @entity_type == 'site' ? @site : @page
-    end
-
-    def set_online
-      @online = request.host != conf[:host]
-    end
-
-    def page_params
-      params.require(:page).permit!
-    end
-
-    def element_params
-      params.require(:element).permit!
-    end
-
-    def section_params
-      params.require(:section).permit!
-    end
-
-    def show_params
-      params.permit!
-    end
-  end
-end
+require_dependency "sibu/application_controller"
+
+module Sibu
+  class PagesController < ApplicationController
+    before_action :set_page, only: [:edit, :update, :destroy, :duplicate, :edit_element, :update_element, :clone_element,
+                                    :delete_element, :child_element, :new_section, :create_section, :edit_section,
+                                    :update_section, :delete_section]
+    before_action :set_site, only: [:index, :new]
+    before_action :set_edit_context, only: [:edit_element, :update_element, :clone_element, :delete_element,
+                                            :child_element, :new_section, :create_section, :edit_section,
+                                            :update_section, :delete_section]
+    before_action :set_online, only: [:show, :edit]
+    skip_before_action Rails.application.config.sibu[:auth_filter], only: [:show]
+
+    def index
+      @pages = @site.pages.order(:created_at)
+    end
+
+    def show
+      return_code = :ok
+      if params[:site_id].blank?
+        @page = Sibu::Page.lookup(request.host, params[:path])
+        if @page
+          @query_path =  params[:path][@page.path.length + 1..-1] unless @page.path.blank?
+          @query_params = show_params.except(:controller, :action, :path).to_h
+          @site = @page.site
+          @links = @site.pages_path_by_id
+          view_template = 'show'
+        else
+          @site = Sibu::Site.where(domain: request.host).first
+          view_template = Rails.application.config.sibu[:not_found]
+          return_code = :not_found
+        end
+      else
+        @site = Sibu::Site.find(params[:site_id])
+        @page = Sibu::Page.find(params[:id])
+        @links = @site.pages_path_by_id
+        @query_path = params[:path]
+        @query_params = show_params.except(:controller, :action, :path).to_h
+        view_template = 'show'
+      end
+
+      render view_template, layout: 'sibu/site', status: return_code
+    end
+
+    def new
+      @page = Sibu::Page.new(site_id: @site.id)
+    end
+
+    def create
+      @page = Sibu::Page.new(page_params)
+      if @page.save_and_init
+        redirect_to site_pages_url(@page.site_id), notice: "La page a bien été créée."
+      else
+        flash.now[:alert] = "Une erreur s'est produite lors de la création de la page."
+        render :new
+      end
+    end
+
+    def edit
+    end
+
+    def update
+      if @page.update(page_params)
+        redirect_to site_pages_url(@page.site_id), notice: "La page a bien été mise à jour."
+      else
+        flash.now[:alert] = "Une erreur s'est produite lors de l'enregistrement de la page."
+        render :edit
+      end
+    end
+
+    def destroy
+      site_id = @page.site_id
+      if @page.destroy
+        redirect_to site_pages_url(site_id), notice: "La page a bien été supprimée."
+      else
+        flash.now[:alert] = "Une erreur s'est produite lors de la suppression de la page."
+        render :index
+      end
+    end
+
+    def duplicate
+      new_page = @page.deep_copy
+      if new_page.save
+        redirect_to site_pages_url(@page.site_id), notice: "La page a bien été copiée."
+      else
+        flash.now[:alert] = "Une erreur s'est produite lors de la copie de la page."
+        render :index
+      end
+    end
+
+    def edit_content
+      @page = Sibu::Page.find(params[:page_id])
+      @site = Sibu::Site.includes(:pages).find(@page.site_id) if @page
+      @links = @site.pages_path_by_id if @site
+      @edit_section = params[:edit_section]
+      render :edit_content, layout: 'sibu/edit_content'
+    end
+
+    def edit_element
+      @content_type = params[:content_type]
+      @links = @site.pages_path_by_id if @site
+      @element = @entity.element(*@section_id.split('|'), *@element_id.split('|'))
+      @repeat = params[:repeat]
+      @size = params[:size].blank? ? :medium : params[:size].to_sym
+      @children = params[:children]
+    end
+
+    def update_element
+      ids = (@section_id.split('|') + @element_id.split('|')).uniq[0...-1]
+      @updated = @entity.update_element(*ids, element_params)
+      @refresh = params[:refresh]
+    end
+
+    def clone_element
+      @cloned = @entity.clone_element(*@section_id.split('|'), *@element_id.split('|'))
+    end
+
+    def delete_element
+      @deleted = @entity.delete_element(*@section_id.split('|'), *@element_id.split('|'))
+    end
+
+    def child_element
+      @added = @entity.child_element(*@section_id.split('|'), *@element_id.split('|'))
+    end
+
+    def new_section
+      page = Sibu::Page.find(params[:id])
+      @page = Page.new(id: page.id, sections: [])
+      @site = Sibu::Site.includes(:pages).find(page.site_id)
+      @after = params[:after]
+      @links = @site.pages_path_by_id
+
+      @site.site_template.available_sections.each do |t|
+        template_defaults = @site.site_template.templates ? (@site.site_template.templates[t["template"]] || {}) : {}
+        @page.sections << template_defaults.merge(t).to_h
+      end
+    end
+
+    def create_section
+      @created = @entity.create_section(*@section_id.split('|'), params[:after], section_params)
+    end
+
+    def edit_section
+      @section = @entity.section(params[:section_id])
+    end
+
+    def update_section
+      # {"utf8"=>"✓", "section"=>{"color"=>"#AFCA0B", "filters"=>"school_camps"}, "section_id"=>"cs1536301729", "refresh"=>"true", "commit"=>"Valider", "site_id"=>"3", "id"=>"1392"}
+      @entity.section(params[:section_id]).merge!(section_params)
+      logger.debug @entity.section(params[:section_id])
+      @updated = @entity.save
+    end
+
+    def delete_section
+      @deleted = @entity.delete_section(*@section_id.split('|'))
+    end
+
+    private
+
+    def set_page
+      @page = Sibu::Page.find(params[:id])
+      @site = Sibu::Site.includes(:pages).find(@page.site_id) if @page
+    end
+
+    def set_site
+      @site = Sibu::Site.find(params[:site_id])
+    end
+
+    def set_edit_context
+      @entity_type = params[:entity]
+      @section_id = params[:section_id]
+      @element_id = params[:element_id]
+      @entity = @entity_type == 'site' ? @site : @page
+    end
+
+    def set_online
+      @online = request.host != conf[:host]
+    end
+
+    def page_params
+      params.require(:page).permit!
+    end
+
+    def element_params
+      params.require(:element).permit!
+    end
+
+    def section_params
+      params.require(:section).permit!
+    end
+
+    def show_params
+      params.permit!
+    end
+  end
+end

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