sibu 0.8.1 → 0.8.2

data/app/jobs/sibu/application_job.rb

@@ -1,4 +1,4 @@
-module Sibu
-  class ApplicationJob < ActiveJob::Base
-  end
-end
+module Sibu
+  class ApplicationJob < ActiveJob::Base
+  end
+end

data/app/mailers/sibu/application_mailer.rb

@@ -1,6 +1,6 @@
-module Sibu
-  class ApplicationMailer < ActionMailer::Base
-    default from: 'from@example.com'
-    layout 'mailer'
-  end
-end
+module Sibu
+  class ApplicationMailer < ActionMailer::Base
+    default from: 'from@example.com'
+    layout 'mailer'
+  end
+end

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

@@ -1,8 +1,8 @@
-class Sibu::DocumentUploader < Shrine
-  plugin :validation_helpers
-
-  Attacher.validate do
-    validate_max_size (Rails.application.config.sibu[:max_doc_size] || 10)*1024*1024, message: "est trop volumineux (#{Rails.application.config.sibu[:max_doc_size] || 10}Mo maximum)"
-    # validate_mime_type_inclusion %w[application/pdf]
-  end
-end
+class Sibu::DocumentUploader < Shrine
+  plugin :validation_helpers
+
+  Attacher.validate do
+    validate_max_size (Rails.application.config.sibu[:max_doc_size] || 10)*1024*1024, message: "est trop volumineux (#{Rails.application.config.sibu[:max_doc_size] || 10}Mo maximum)"
+    # validate_mime_type_inclusion %w[application/pdf]
+  end
+end

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

@@ -1,32 +1,32 @@
-require "image_processing/mini_magick"
-
-class Sibu::ImageUploader < Shrine
-  include ImageProcessing::MiniMagick
-  plugin :processing
-  plugin :versions
-  plugin :delete_raw
-
-  process(:store) do |io, context|
-    original = io.download
-    images_config = Rails.application.config.sibu[:images]
-    image_type = io.mime_type
-
-    if image_type == "image/svg+xml" || io.metadata['filename'].end_with?('.svg')
-      {original: io, large: io.download, medium: io.download, small: io.download}
-    else
-      large = resize_to_limit!(original, images_config[:large], images_config[:large]) {|cmd| cmd.auto_orient}
-      medium = resize_to_limit(large, images_config[:medium], images_config[:medium])
-      small = resize_to_limit(medium, images_config[:small], images_config[:small])
-
-      {original: io, large: large, medium: medium, small: small}
-    end
-  end
-
-  def generate_location(io, context)
-    user_id = context[:record] ? context[:record].user_id : nil
-    style = context[:version] != :original ? "resized" : "originals"
-    name = super
-
-    [user_id, style, name].compact.join("/")
-  end
+require "image_processing/mini_magick"
+
+class Sibu::ImageUploader < Shrine
+  include ImageProcessing::MiniMagick
+  plugin :processing
+  plugin :versions
+  plugin :delete_raw
+
+  process(:store) do |io, context|
+    original = io.download
+    images_config = Rails.application.config.sibu[:images]
+    image_type = io.mime_type
+
+    if image_type == "image/svg+xml" || io.metadata['filename'].end_with?('.svg')
+      {original: io, large: io.download, medium: io.download, small: io.download}
+    else
+      large = resize_to_limit!(original, images_config[:large], images_config[:large]) {|cmd| cmd.auto_orient}
+      medium = resize_to_limit(large, images_config[:medium], images_config[:medium])
+      small = resize_to_limit(medium, images_config[:small], images_config[:small])
+
+      {original: io, large: large, medium: medium, small: small}
+    end
+  end
+
+  def generate_location(io, context)
+    user_id = context[:record] ? context[:record].user_id : nil
+    style = context[:version] != :original ? "resized" : "originals"
+    name = super
+
+    [user_id, style, name].compact.join("/")
+  end
 end

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

@@ -1,135 +1,135 @@
-module Sibu
-  module SectionsConcern
-    include ActiveSupport::Concern
-
-    def section(id)
-      if id
-        pos = sections.index {|s| s["id"] == id}
-        pos ? sections[pos] : {"id" => id}
-      end
-    end
-
-    def elements(*ids)
-      unless ids.blank?
-        s = section(ids.first)
-        unless s["elements"].blank?
-          ids[1..-1].each do |elt_id|
-            pos = s["elements"].index {|e| e["id"] == elt_id.split('|').last}
-            s = pos ? s["elements"][pos] : {"id" => elt_id, "elements" => []}
-          end
-          s["elements"]
-        end
-      end
-    end
-
-    def element(*ids)
-      unless ids.blank?
-        if ids.length == 1
-          section(ids.first)
-        else
-          elts = elements(*ids[0..-2]) || []
-          pos = elts.index {|e| e["id"] == ids.last}
-          pos ? elts[pos] : {"id" => ids.last}
-        end
-      end
-    end
-
-    def update_element(*ids, value)
-      unless ids.blank?
-        parent_section = find_or_init(*ids)["elements"]
-        if parent_section.any? {|elt| elt["id"] == value["id"]}
-          parent_section.map! {|elt| elt["id"] == value["id"] ? value : elt}
-        else
-          parent_section << value.to_h
-        end
-
-        value if save
-      end
-    end
-
-    def clone_element(*ids, element_id)
-      src_elt = find_or_init(*ids, element_id)
-      siblings = find_or_init(*ids)["elements"]
-      ref_index = siblings.index {|s| s["id"] == element_id}
-      new_elt = siblings[ref_index].deep_dup
-      new_elt["id"] = "cl#{Time.current.to_i}"
-      siblings.insert(ref_index + 1, new_elt)
-      save ? new_elt : nil
-    end
-
-    def delete_element(*ids, element_id)
-      src_elt = find_or_init(*ids, element_id)
-      siblings = find_or_init(*ids)["elements"]
-      ref_index = siblings.index {|s| s["id"] == element_id}
-      siblings.delete_at(ref_index)
-      save
-    end
-
-    def child_element(*ids, element_id)
-      siblings = elements(*ids)
-      parent_elt = siblings[siblings.index {|s| s["id"] == element_id}]
-      if parent_elt["elements"].blank?
-        parent_elt["elements"] = [{"id" => "cl#{Time.current.to_i}"}]
-      else
-        parent_elt["elements"] << {"id" => "cl#{Time.current.to_i}"}
-      end
-      save
-    end
-
-    def create_section(*ids, after, new_section)
-      new_section["id"] = "cs#{Time.current.to_i}"
-      if ids.length == 1
-        parent = sections
-      else
-        parent = find_or_init(*ids[0..-2])["elements"]
-      end
-      if new_section["template"].blank?
-        nil
-      else
-        template_defaults = (site_template.templates && site_template.templates[new_section["template"]]) ? site_template.templates[new_section["template"]] : {}
-        sec = template_defaults.merge(new_section)
-        ref_pos = parent.index {|s| s["id"] == ids.last}
-        parent.insert(after.to_s == 'true' ? ref_pos + 1 : ref_pos, sec)
-        sec if save
-      end
-    end
-
-    def delete_section(*ids)
-      if ids.length == 1
-        if sections.length == 1
-          nil
-        else
-          ref_index = sections.index {|s| s["id"] == ids.first}
-          sections.delete_at(ref_index)
-          save
-        end
-      else
-        parent = find_or_init(*ids[0..-2])
-        ref_index = parent["elements"].index {|s| s["id"] == ids.last}
-        parent["elements"].delete_at(ref_index)
-        save
-      end
-    end
-
-    def elt(siblings, elt_id, default_elt = nil)
-      pos = siblings.index {|e| e["id"] == elt_id}
-      pos ? siblings[pos] : default_elt
-    end
-
-    def find_or_init(*ids)
-      node = nil
-      siblings = sections
-      ids.each do |elt_id|
-        node = elt(siblings, elt_id)
-        if node.nil?
-          node = {"id" => elt_id, "elements" => []}
-          siblings << node
-        elsif node["elements"].nil?
-          node["elements"] = []
-        end
-        siblings = node["elements"]
-      end
-      node
-    end
-  end
+module Sibu
+  module SectionsConcern
+    include ActiveSupport::Concern
+
+    def section(id)
+      if id
+        pos = sections.index {|s| s["id"] == id}
+        pos ? sections[pos] : {"id" => id}
+      end
+    end
+
+    def elements(*ids)
+      unless ids.blank?
+        s = section(ids.first)
+        unless s["elements"].blank?
+          ids[1..-1].each do |elt_id|
+            pos = s["elements"].index {|e| e["id"] == elt_id.split('|').last}
+            s = pos ? s["elements"][pos] : {"id" => elt_id, "elements" => []}
+          end
+          s["elements"]
+        end
+      end
+    end
+
+    def element(*ids)
+      unless ids.blank?
+        if ids.length == 1
+          section(ids.first)
+        else
+          elts = elements(*ids[0..-2]) || []
+          pos = elts.index {|e| e["id"] == ids.last}
+          pos ? elts[pos] : {"id" => ids.last}
+        end
+      end
+    end
+
+    def update_element(*ids, value)
+      unless ids.blank?
+        parent_section = find_or_init(*ids)["elements"]
+        if parent_section.any? {|elt| elt["id"] == value["id"]}
+          parent_section.map! {|elt| elt["id"] == value["id"] ? value : elt}
+        else
+          parent_section << value.to_h
+        end
+
+        value if save
+      end
+    end
+
+    def clone_element(*ids, element_id)
+      src_elt = find_or_init(*ids, element_id)
+      siblings = find_or_init(*ids)["elements"]
+      ref_index = siblings.index {|s| s["id"] == element_id}
+      new_elt = siblings[ref_index].deep_dup
+      new_elt["id"] = "cl#{Time.current.to_i}"
+      siblings.insert(ref_index + 1, new_elt)
+      save ? new_elt : nil
+    end
+
+    def delete_element(*ids, element_id)
+      src_elt = find_or_init(*ids, element_id)
+      siblings = find_or_init(*ids)["elements"]
+      ref_index = siblings.index {|s| s["id"] == element_id}
+      siblings.delete_at(ref_index)
+      save
+    end
+
+    def child_element(*ids, element_id)
+      siblings = elements(*ids)
+      parent_elt = siblings[siblings.index {|s| s["id"] == element_id}]
+      if parent_elt["elements"].blank?
+        parent_elt["elements"] = [{"id" => "cl#{Time.current.to_i}"}]
+      else
+        parent_elt["elements"] << {"id" => "cl#{Time.current.to_i}"}
+      end
+      save
+    end
+
+    def create_section(*ids, after, new_section)
+      new_section["id"] = "cs#{Time.current.to_i}"
+      if ids.length == 1
+        parent = sections
+      else
+        parent = find_or_init(*ids[0..-2])["elements"]
+      end
+      if new_section["template"].blank?
+        nil
+      else
+        template_defaults = (site_template.templates && site_template.templates[new_section["template"]]) ? site_template.templates[new_section["template"]] : {}
+        sec = template_defaults.merge(new_section)
+        ref_pos = parent.index {|s| s["id"] == ids.last}
+        parent.insert(after.to_s == 'true' ? ref_pos + 1 : ref_pos, sec)
+        sec if save
+      end
+    end
+
+    def delete_section(*ids)
+      if ids.length == 1
+        if sections.length == 1
+          nil
+        else
+          ref_index = sections.index {|s| s["id"] == ids.first}
+          sections.delete_at(ref_index)
+          save
+        end
+      else
+        parent = find_or_init(*ids[0..-2])
+        ref_index = parent["elements"].index {|s| s["id"] == ids.last}
+        parent["elements"].delete_at(ref_index)
+        save
+      end
+    end
+
+    def elt(siblings, elt_id, default_elt = nil)
+      pos = siblings.index {|e| e["id"] == elt_id}
+      pos ? siblings[pos] : default_elt
+    end
+
+    def find_or_init(*ids)
+      node = nil
+      siblings = sections
+      ids.each do |elt_id|
+        node = elt(siblings, elt_id)
+        if node.nil?
+          node = {"id" => elt_id, "elements" => []}
+          siblings << node
+        elsif node["elements"].nil?
+          node["elements"] = []
+        end
+        siblings = node["elements"]
+      end
+      node
+    end
+  end
 end

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

@@ -1,2 +1,2 @@
-class Sibu::StyleUploader < Shrine
+class Sibu::StyleUploader < Shrine
 end

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

@@ -1,9 +1,9 @@
-module Sibu
-  module UserConcern
-    include ActiveSupport::Concern
-
-    def for_user(usr)
-      Rails.application.config.sibu[:multi_user] ? where(user_id: [nil, usr.id]) : all
-    end
-  end
+module Sibu
+  module UserConcern
+    include ActiveSupport::Concern
+
+    def for_user(usr)
+      Rails.application.config.sibu[:multi_user] ? where(user_id: [nil, usr.id]) : all
+    end
+  end
 end

data/app/models/sibu/application_record.rb

@@ -1,5 +1,5 @@
-module Sibu
-  class ApplicationRecord < ActiveRecord::Base
-    self.abstract_class = true
-  end
-end
+module Sibu
+  class ApplicationRecord < ActiveRecord::Base
+    self.abstract_class = true
+  end
+end

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