sibu 0.8.1 → 0.8.2

data/app/models/sibu/image.rb

@@ -1,19 +1,10 @@
-module Sibu
-  class Image < ApplicationRecord
-    include ImageUploader::Attachment.new(:file)
-    extend Sibu::UserConcern
-
-    store :metadata, accessors: [:alt, :reference, :credits], coder: JSON
-
-    validates_presence_of :file_data
-
-    def self.empty
-      empty_img = where("metadata ILIKE '%default_empty_image%'").first
-      if empty_img.nil?
-        empty_img = new(reference: 'default_empty_image', file: File.new('app/assets/images/empty.png'))
-        empty_img.save
-      end
-      empty_img
-    end
-  end
-end
+module Sibu
+  class Image < ApplicationRecord
+    include ImageUploader::Attachment.new(:file)
+    extend Sibu::UserConcern
+
+    store :metadata, accessors: [:alt, :reference, :credits], coder: JSON
+
+    validates_presence_of :file_data
+  end
+end

data/app/models/sibu/page.rb

@@ -1,66 +1,66 @@
-module Sibu
-  class Page < ApplicationRecord
-    include Sibu::SectionsConcern
-
-    belongs_to :site, :class_name => 'Sibu::Site'
-
-    store :custom_data, accessors: [:header_code, :footer_code], coder: JSON
-    store :metadata, accessors: [:title, :description, :keywords, :source, :external_id, :is_home], coder: JSON
-
-    before_save :update_path
-    validates_presence_of :name, :site
-
-    def self.lookup(domain_name, page_query)
-      page_path = (page_query || '').strip.split('?')[0]
-      if page_path.blank?
-        joins(:site).where("sibu_sites.domain = ? AND COALESCE(sibu_pages.path, '') = ''", domain_name).first
-      else
-        paths = page_path.split('/').inject([]) {|p, s| p << (p.length == 0 ? s : "#{p[-1]}/#{s}")}
-        joins(:site).where("sibu_sites.domain = ? AND COALESCE(sibu_pages.path, '') IN (?)", domain_name, paths)
-            .order(path: :desc)
-            .first
-      end
-    end
-
-    def save_and_init
-      if valid?
-        template_defaults = site.site_template.pages.first
-        self.sections = template_defaults[:sections]  if template_defaults
-      end
-      save
-    end
-
-    def update_path
-      prefix = site.version == Sibu::Site::DEFAULT_VERSION ? '' : "#{site.version}/"
-      if is_home == 'true'
-        self.path = ''
-      else
-        self.path = "#{prefix}#{name.parameterize}" if self.path.blank?
-      end
-    end
-
-    def site_template
-      site.site_template
-    end
-
-    def deep_copy
-      new_page = deep_dup
-      new_page.name = name + ' - copie'
-      new_page
-    end
-
-    def update_templates(sections_templates)
-      sections.each do |s|
-        s["template"] = sections_templates[s["id"]]
-      end
-      save
-    end
-
-    def reorder_sections(*ordered_ids)
-      if ordered_ids.length == sections.length
-        self.sections = ordered_ids.map {|section_id| sections.find {|sec| sec["id"] == section_id}}
-        save
-      end
-    end
-  end
-end
+module Sibu
+  class Page < ApplicationRecord
+    include Sibu::SectionsConcern
+
+    belongs_to :site, :class_name => 'Sibu::Site'
+
+    store :custom_data, accessors: [:header_code, :footer_code], coder: JSON
+    store :metadata, accessors: [:title, :description, :keywords, :source, :external_id, :is_home], coder: JSON
+
+    before_save :update_path
+    validates_presence_of :name, :site
+
+    def self.lookup(domain_name, page_query)
+      page_path = (page_query || '').strip.split('?')[0]
+      if page_path.blank?
+        joins(:site).where("sibu_sites.domain = ? AND COALESCE(sibu_pages.path, '') = ''", domain_name).first
+      else
+        paths = page_path.split('/').inject([]) {|p, s| p << (p.length == 0 ? s : "#{p[-1]}/#{s}")}
+        joins(:site).where("sibu_sites.domain = ? AND COALESCE(sibu_pages.path, '') IN (?)", domain_name, paths)
+            .order(path: :desc)
+            .first
+      end
+    end
+
+    def save_and_init
+      if valid?
+        template_defaults = site.site_template.pages.first
+        self.sections = template_defaults[:sections]  if template_defaults
+      end
+      save
+    end
+
+    def update_path
+      prefix = site.version == Sibu::Site::DEFAULT_VERSION ? '' : "#{site.version}/"
+      if is_home == 'true'
+        self.path = ''
+      else
+        self.path = "#{prefix}#{name.parameterize}" if self.path.blank?
+      end
+    end
+
+    def site_template
+      site.site_template
+    end
+
+    def deep_copy
+      new_page = deep_dup
+      new_page.name = name + ' - copie'
+      new_page
+    end
+
+    def update_templates(sections_templates)
+      sections.each do |s|
+        s["template"] = sections_templates[s["id"]]
+      end
+      save
+    end
+
+    def reorder_sections(*ordered_ids)
+      if ordered_ids.length == sections.length
+        self.sections = ordered_ids.map {|section_id| sections.find {|sec| sec["id"] == section_id}}
+        save
+      end
+    end
+  end
+end

data/app/models/sibu/site.rb

@@ -1,97 +1,97 @@
-module Sibu
-  class Site < ApplicationRecord
-    include StyleUploader::Attachment.new(:style, cache: :styles_cache, store: :styles_store)
-    include Sibu::SectionsConcern
-    extend Sibu::UserConcern
-
-    store :custom_data, accessors: [:primary_font, :secondary_font, :primary_color, :secondary_color, :header_code, :footer_code],
-          coder: JSON
-    store :metadata, accessors: [:analytics_id], coder: JSON
-
-    belongs_to :site_template, :class_name => 'Sibu::SiteTemplate'
-    has_many :pages, :class_name => 'Sibu::Page', dependent: :destroy
-
-    validates_presence_of :name, :site_template, :version
-
-    DEFAULT_VERSION = 'fr'
-
-    def style_url
-      style ? style.url : site_template.path
-    end
-
-    def main_color
-      primary_color.blank? ? site_template.primary_color : primary_color
-    end
-
-    def alt_color
-      secondary_color.blank? ? site_template.secondary_color : secondary_color
-    end
-
-    def main_font
-      primary_font.blank? ? site_template.primary_font : primary_font
-    end
-
-    def alt_font
-      secondary_font.blank? ? site_template.secondary_font : secondary_font
-    end
-
-    def section_template(section)
-        "#{site_template.path}/#{section["category"]}/#{section["template"]}"
-    end
-
-    def not_found
-      "shared/#{site_template.path}/not_found"
-    end
-
-    def page(path)
-      pages.where(path: path).first
-    end
-
-    def page_by_id(page_id)
-      pages.where(id: page_id).select(:id, :path).first
-    end
-
-    def save_and_init
-      if valid?
-        self.sections = site_template.sections
-        site_template.pages.each do |p|
-          self.pages << Sibu::Page.new(p)
-        end
-        self.primary_color = site_template.primary_color
-        self.secondary_color = site_template.secondary_color
-        self.primary_font = site_template.primary_font
-        self.secondary_font = site_template.secondary_font
-      end
-      save
-    end
-
-    def pages_path_by_id
-      Hash[pages.collect {|p| [p.id.to_s, p.path]}]
-    end
-
-    def init_pages(source)
-      site_data = Rails.application.config.sibu[:site_data][source]
-      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
-
-    def deep_copy
-      site_copy = deep_dup
-      pages.each do |p|
-        site_copy.name = name + ' - copie'
-        site_copy.domain = nil
-        site_copy.pages << p.deep_dup
-      end
-
-      site_copy
-    end
-  end
-end
+module Sibu
+  class Site < ApplicationRecord
+    include StyleUploader::Attachment.new(:style, cache: :styles_cache, store: :styles_store)
+    include Sibu::SectionsConcern
+    extend Sibu::UserConcern
+
+    store :custom_data, accessors: [:primary_font, :secondary_font, :primary_color, :secondary_color, :header_code, :footer_code],
+          coder: JSON
+    store :metadata, accessors: [:analytics_id], coder: JSON
+
+    belongs_to :site_template, :class_name => 'Sibu::SiteTemplate'
+    has_many :pages, :class_name => 'Sibu::Page', dependent: :destroy
+
+    validates_presence_of :name, :site_template, :version
+
+    DEFAULT_VERSION = 'fr'
+
+    def style_url
+      style ? style.url : site_template.path
+    end
+
+    def main_color
+      primary_color.blank? ? site_template.primary_color : primary_color
+    end
+
+    def alt_color
+      secondary_color.blank? ? site_template.secondary_color : secondary_color
+    end
+
+    def main_font
+      primary_font.blank? ? site_template.primary_font : primary_font
+    end
+
+    def alt_font
+      secondary_font.blank? ? site_template.secondary_font : secondary_font
+    end
+
+    def section_template(section)
+        "#{site_template.path}/#{section["category"]}/#{section["template"]}"
+    end
+
+    def not_found
+      "shared/#{site_template.path}/not_found"
+    end
+
+    def page(path)
+      pages.where(path: path).first
+    end
+
+    def page_by_id(page_id)
+      pages.where(id: page_id).select(:id, :path).first
+    end
+
+    def save_and_init
+      if valid?
+        self.sections = site_template.sections
+        site_template.pages.each do |p|
+          self.pages << Sibu::Page.new(p)
+        end
+        self.primary_color = site_template.primary_color
+        self.secondary_color = site_template.secondary_color
+        self.primary_font = site_template.primary_font
+        self.secondary_font = site_template.secondary_font
+      end
+      save
+    end
+
+    def pages_path_by_id
+      Hash[pages.collect {|p| [p.id.to_s, p.path]}]
+    end
+
+    def init_pages(source)
+      site_data = Rails.application.config.sibu[:site_data][source]
+      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
+
+    def deep_copy
+      site_copy = deep_dup
+      pages.each do |p|
+        site_copy.name = name + ' - copie'
+        site_copy.domain = nil
+        site_copy.pages << p.deep_dup
+      end
+
+      site_copy
+    end
+  end
+end

data/app/models/sibu/site_template.rb

@@ -1,22 +1,22 @@
-module Sibu
-  class SiteTemplate < ApplicationRecord
-    store :default_sections, accessors: [:sections], coder: JSON
-    store :default_pages, accessors: [:pages], coder: JSON
-    store :default_templates, accessors: [:templates], coder: JSON
-    store :default_styles, accessors: [:primary_font, :secondary_font, :primary_color, :secondary_color], coder: JSON
-
-    def reference
-      name.parameterize.gsub('-', '_')
-    end
-
-    def available_sections(path_prefix = 'app/views/shared')
-      sections_list = []
-      Dir.glob(File.join(Rails.root, "#{path_prefix}/#{path}/*/")).each do |dir|
-        cat = dir.split('/').last
-        sections_list += Dir.glob(dir + "*.erb").map {|f| f.split('/').last}.
-            map {|f| f[1..-1].gsub('.html.erb', '')}.map {|f| {"id" => "sibu_template_#{f}", "category" => cat, "template" => f}}
-      end
-      sections_list
-    end
-  end
-end
+module Sibu
+  class SiteTemplate < ApplicationRecord
+    store :default_sections, accessors: [:sections], coder: JSON
+    store :default_pages, accessors: [:pages], coder: JSON
+    store :default_templates, accessors: [:templates], coder: JSON
+    store :default_styles, accessors: [:primary_font, :secondary_font, :primary_color, :secondary_color], coder: JSON
+
+    def reference
+      name.parameterize.gsub('-', '_')
+    end
+
+    def available_sections(path_prefix = 'app/views/shared')
+      sections_list = []
+      Dir.glob(File.join(Rails.root, "#{path_prefix}/#{path}/*/")).each do |dir|
+        cat = dir.split('/').last
+        sections_list += Dir.glob(dir + "*.erb").map {|f| f.split('/').last}.
+            map {|f| f[1..-1].gsub('.html.erb', '')}.map {|f| {"id" => "sibu_template_#{f}", "category" => cat, "template" => f}}
+      end
+      sections_list
+    end
+  end
+end

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

@@ -1,23 +1,23 @@
-<!DOCTYPE html>
-<html class="sibu">
-<head>
-  <title><%= conf[:title] %></title>
-  <%= stylesheet_link_tag conf[:stylesheet], media: 'all' %>
-  <%= javascript_include_tag conf[:javascript] %>
-  <%= javascript_include_tag 'sibu/common' %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-<% [:top_panel, :side_panel, :content_panel, :bottom_panel].each do |panel| %>
-  <% unless conf[panel].blank? %>
-    <div class="sibu_panel">
-      <%= render conf[panel] %>
-    </div>
-  <% end %>
-<% end %>
-<script>
-    sibuCallback("<%= "#{action_name}_#{controller_name}".camelize(:lower) %>");
-</script>
-<%= yield :scripts %>
-</body>
-</html>
+<!DOCTYPE html>
+<html class="sibu">
+<head>
+  <title><%= conf[:title] %></title>
+  <%= stylesheet_link_tag conf[:stylesheet], media: 'all' %>
+  <%= javascript_include_tag conf[:javascript] %>
+  <%= javascript_include_tag 'sibu/common' %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+<% [:top_panel, :side_panel, :content_panel, :bottom_panel].each do |panel| %>
+  <% unless conf[panel].blank? %>
+    <div class="sibu_panel">
+      <%= render conf[panel] %>
+    </div>
+  <% end %>
+<% end %>
+<script>
+    sibuCallback("<%= "#{action_name}_#{controller_name}".camelize(:lower) %>");
+</script>
+<%= yield :scripts %>
+</body>
+</html>