sibu 0.8.1 → 0.9.1

data/app/models/sibu/document.rb

@@ -1,16 +1,16 @@
-module Sibu
-  class Document < ApplicationRecord
-    include DocumentUploader::Attachment.new(:file, cache: :documents_cache, store: :documents_store)
-    extend Sibu::UserConcern
-
-    validates_presence_of :file_data
-
-    def metadata
-      JSON.parse(file_data, symbolize_names: true)[:metadata]
-    end
-
-    def file_name
-      metadata[:filename]
-    end
-  end
-end
+module Sibu
+  class Document < ApplicationRecord
+    include DocumentUploader::Attachment.new(:file, cache: :documents_cache, store: :documents_store)
+    extend Sibu::UserConcern
+
+    validates_presence_of :file_data
+
+    def metadata
+      JSON.parse(file_data, symbolize_names: true)[:metadata]
+    end
+
+    def file_name
+      metadata[:filename]
+    end
+  end
+end

data/app/models/sibu/dynamic_style.rb

@@ -1,77 +1,77 @@
-module Sibu
-  class DynamicStyle
-
-    attr_reader :site, :body, :env, :filename, :scss_file
-
-    def initialize(site_id)
-      @site = Sibu::Site.find(site_id)
-      @filename = "#{site_id}_#{Time.current.to_i}"
-      @scss_file = File.new(scss_file_path, 'w')
-      @body = ERB.new(File.read(template_file_path)).result(binding)
-      @env = Rails.application.assets
-    end
-
-    def compile
-      find_or_create_scss
-
-      begin
-        scss_file.write generate_css
-        scss_file.flush
-        scss_file.close
-        css_file_path = scss_file_path.gsub('scss', 'css')
-        File.rename(scss_file_path, css_file_path)
-        site.update(style: File.new(css_file_path))
-      rescue Exception => ex
-          Rails.logger.error(ex)
-      ensure
-        File.delete(scss_file_path) if scss_file_path && File.exist?(scss_file_path)
-        File.delete(css_file_path) if css_file_path && File.exist?(css_file_path)
-      end
-    end
-
-    def self.refresh_styles
-      Sibu::Site.all.each do |s|
-        Sibu::DynamicStyle.new(s.id).compile
-      end
-    end
-
-    private
-
-    def template_file_path
-      @template_file_path ||= File.join(Rails.root, 'lib', 'assets', '_default_template.scss.erb')
-    end
-
-    def scss_tmpfile_path
-      @scss_file_path ||= File.join(Rails.root, 'app', 'assets', 'stylesheets', 'templates')
-      FileUtils.mkdir_p(@scss_file_path) unless File.exists?(@scss_file_path)
-      @scss_file_path
-    end
-
-    def scss_file_path
-      @scss_file_path ||= File.join(scss_tmpfile_path, "#{filename}.scss")
-    end
-
-    def find_or_create_scss
-      File.open(scss_file_path, 'w') {|f| f.write(body)}
-    end
-
-    def generate_css
-      Sass::Engine.new(asset_source, {
-          syntax: :scss,
-          cache: false,
-          read_cache: false,
-          style: :compressed
-      }).render
-    end
-
-    def asset_source
-      if env.find_asset(filename)
-        env.find_asset(filename).source
-      else
-        uri = Sprockets::URIUtils.build_asset_uri(scss_file.path, type: "text/css")
-        asset = Sprockets::UnloadedAsset.new(uri, env)
-        env.load(asset.uri).source
-      end
-    end
-  end
+module Sibu
+  class DynamicStyle
+
+    attr_reader :site, :body, :env, :filename, :scss_file
+
+    def initialize(site_id)
+      @site = Sibu::Site.find(site_id)
+      @filename = "#{site_id}_#{Time.current.to_i}"
+      @scss_file = File.new(scss_file_path, 'w')
+      @body = ERB.new(File.read(template_file_path)).result(binding)
+      @env = Rails.application.assets
+    end
+
+    def compile
+      find_or_create_scss
+
+      begin
+        scss_file.write generate_css
+        scss_file.flush
+        scss_file.close
+        css_file_path = scss_file_path.gsub('scss', 'css')
+        File.rename(scss_file_path, css_file_path)
+        site.update(style: File.new(css_file_path))
+      rescue Exception => ex
+          Rails.logger.error(ex)
+      ensure
+        File.delete(scss_file_path) if scss_file_path && File.exist?(scss_file_path)
+        File.delete(css_file_path) if css_file_path && File.exist?(css_file_path)
+      end
+    end
+
+    def self.refresh_styles
+      Sibu::Site.all.each do |s|
+        Sibu::DynamicStyle.new(s.id).compile
+      end
+    end
+
+    private
+
+    def template_file_path
+      @template_file_path ||= File.join(Rails.root, 'lib', 'assets', '_default_template.scss.erb')
+    end
+
+    def scss_tmpfile_path
+      @scss_file_path ||= File.join(Rails.root, 'app', 'assets', 'stylesheets', 'templates')
+      FileUtils.mkdir_p(@scss_file_path) unless File.exists?(@scss_file_path)
+      @scss_file_path
+    end
+
+    def scss_file_path
+      @scss_file_path ||= File.join(scss_tmpfile_path, "#{filename}.scss")
+    end
+
+    def find_or_create_scss
+      File.open(scss_file_path, 'w') {|f| f.write(body)}
+    end
+
+    def generate_css
+      Sass::Engine.new(asset_source, {
+          syntax: :scss,
+          cache: false,
+          read_cache: false,
+          style: :compressed
+      }).render
+    end
+
+    def asset_source
+      if env.find_asset(filename)
+        env.find_asset(filename).source
+      else
+        uri = Sprockets::URIUtils.build_asset_uri(scss_file.path, type: "text/css")
+        asset = Sprockets::UnloadedAsset.new(uri, env)
+        env.load(asset.uri).source
+      end
+    end
+  end
 end

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