sibu 0.1.30 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42e04848ddb67867f8254004f396c25e96f3962f
-  data.tar.gz: 4e0781f08438129c1e34cdef43f145e26339a0d9
+  metadata.gz: a4ce5724416f6921c5a4529d03b9291ffd80876b
+  data.tar.gz: f06dee1f7ecd38a5482fe94b7dbe613f59780894
 SHA512:
-  metadata.gz: 0a70fa491883f58d8af8f1389c771da93e46ff0f2860792a63dc7273e781e1444c7799815569627cfd6c8fb5aeaf7b223dfdb1c4d366c7d055169f11380f171f
-  data.tar.gz: 6306180b3ea39f4b603d4f25780298e7fe39dface6509bf62d060135db405782ed668ec4eee747ec4d2b240065531cc59a01a6781761af0600d7811d4a70bdd3
+  metadata.gz: 13b0f98002eda8b9fd1af7d8e0fd51f867dada1b1eaa8b1975b6d6b82008d7703fe11aed808a853fb207303482b5eb410367d5e671d70ae0b089d52037b9fc7c
+  data.tar.gz: c018e9f2c7c125eb60342a403943d28f9245ea6575e55b63f27e9e273d36d15d25466cc3998774ae98070af4282e67b34cdd58a27ef4eb42a56eb6f218b94e6d

data/app/controllers/sibu/sites_controller.rb

@@ -21,6 +21,7 @@ module Sibu
     def create
       @site = Sibu::Site.new(site_params)
       if @site.save_and_init
+        generate_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."
@@ -34,6 +35,9 @@ module Sibu
 
     def update
       if @site.update(site_params)
+        if @site.previous_changes.has_key?(:custom_data)
+          generate_styles
+        end
         redirect_to (params[:next_page].blank? ? sites_url : params[:next_page]), notice: "Le site a bien été mis à jour."
       else
         flash.now[:alert] = "Une erreur s'est produite lors de l'enregistrement du site."
@@ -55,5 +59,10 @@ module Sibu
     def site_params
       params.require(:site).permit!
     end
+
+    def generate_styles
+      ds = Sibu::DynamicStyle.new(@site.id)
+      ds.compile
+    end
   end
 end

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

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

data/app/models/sibu/dynamic_style.rb

@@ -5,37 +5,38 @@ module Sibu
 
     def initialize(site_id)
       @site = Sibu::Site.find(site_id)
-      @filename = "_variables"
+      @filename = "#{site_id}_#{Time.current.to_i}"
       @scss_file = File.new(scss_file_path, 'w')
-      vars_binding = OpenStruct.new(site: @site).instance_eval { binding }
-      @body = ERB.new(File.read(template_file_path)).result(vars_binding)
+      @body = ERB.new(File.read(template_file_path)).result(binding)
       @env = Rails.application.assets
     end
 
-    # Todo : la compilation semble marcher
-    # Modifier le fichier cible scss pour que les variables soient directement renseignées (detente.scss.erb)
-    # Tester la compilation SASS puis mettre en place upload du fichier compilé dans Sibu::Site si ça marche
     def compile
       find_or_create_scss
 
       begin
         scss_file.write generate_css
         scss_file.flush
-        # site.update(style_url: File.join(site.site_template.path, "#{filename}.css"))
-      ensure
         scss_file.close
-        # File.delete(scss_file)
+        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
+          logger.error(ex)
+      ensure
+        File.delete(scss_file_path) if File.exist?(scss_file_path)
+        File.delete(css_file_path) if File.exist?(css_file_path)
       end
     end
 
     private
 
     def template_file_path
-      @template_file_path ||= File.join(Rails.root, 'app', 'assets', 'stylesheets', site.site_template.path, '_template.scss.erb')
+      @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', site.site_template.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

data/app/models/sibu/site.rb

@@ -1,9 +1,10 @@
 module Sibu
   class Site < ApplicationRecord
+    include StyleUploader::Attachment.new(:style, cache: :styles_cache, store: :styles_store)
     include Sibu::SectionsConcern
 
     store :custom_data, accessors: [:primary_font, :secondary_font, :primary_color, :secondary_color], coder: JSON
-    store :metadata, accessors: [:analytics_id, :style_url], 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
@@ -11,6 +12,26 @@ module Sibu
 
     validates_presence_of :name, :site_template
 
+    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["template"]}"
     end

data/app/models/sibu/site_template.rb

@@ -3,6 +3,7 @@ module Sibu
     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('-', '_')

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

@@ -7,15 +7,9 @@
   <%= javascript_include_tag "#{conf[:javascript]}-edit" %>
   <%= javascript_include_tag 'sibu/sibu' %>
   <% if @site %>
-    <%= stylesheet_link_tag @site.site_template.path, media: "all" %>
+    <%= stylesheet_link_tag @site.style_url, media: "all" %>
     <%= javascript_include_tag "#{@site.site_template.path}-core" %>
   <% end %>
-  <% unless @site.primary_font.blank? %>
-    <%= stylesheet_link_tag "fonts/#{@site.primary_font.downcase}", media: "all" %>
-  <% end %>
-  <% unless @site.secondary_font.blank? %>
-    <%= stylesheet_link_tag "fonts/#{@site.secondary_font.downcase}", media: "all" %>
-  <% end %>
   <%= csrf_meta_tags %>
   <%= yield :styles %>
 </head>

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

@@ -7,15 +7,9 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
   <% if @site %>
-    <%= stylesheet_link_tag @site.site_template.path, media: "all" %>
+    <%= stylesheet_link_tag @site.style_url, media: "all" %>
     <%= javascript_include_tag @site.site_template.path %>
   <% end %>
-  <% unless @site.primary_font.blank? %>
-    <%= stylesheet_link_tag "fonts/#{@site.primary_font.downcase}", media: "all" %>
-  <% end %>
-  <% unless @site.secondary_font.blank? %>
-    <%= stylesheet_link_tag "fonts/#{@site.secondary_font.downcase}", media: "all" %>
-  <% end %>
   <%= csrf_meta_tags %>
   <%= yield :styles %>
 </head>

data/app/views/sibu/sites/_form.html.erb

@@ -66,7 +66,7 @@
   <%= hidden_field_tag :next_page, @next_page %>
   <%= f.hidden_field :user_id %>
   <div class="sibu_actions">
-    <%= f.submit 'Valider' %>
+    <%= f.submit 'Valider', data: {disable: 'Enregistrement en cours...'} %>
     <%= link_to 'Annuler', :back %>
   </div>
 <% end %>

data/config/initializers/shrine.rb

@@ -4,6 +4,8 @@ require "shrine/storage/file_system"
 Shrine.storages = {
     cache: Shrine::Storage::FileSystem.new("public", prefix: "uploads/cache"),
     store: Shrine::Storage::FileSystem.new("public", prefix: "uploads/store"),
+    styles_cache: Shrine::Storage::FileSystem.new("public", prefix: "stylesheets/cache"),
+    styles_store: Shrine::Storage::FileSystem.new("public", prefix: "stylesheets/store")
 }
 
 Shrine.plugin :activerecord

data/db/migrate/20180301121902_add_style_data_to_sites.rb

@@ -0,0 +1,5 @@
+class AddStyleDataToSites < ActiveRecord::Migration[5.1]
+  def change
+    add_column :sibu_sites, :style_data, :text
+  end
+end

data/db/migrate/20180301152101_add_default_styles_to_templates.rb

@@ -0,0 +1,5 @@
+class AddDefaultStylesToTemplates < ActiveRecord::Migration[5.1]
+  def change
+    add_column :sibu_site_templates, :default_styles, :text
+  end
+end

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '0.1.30'
+  VERSION = '0.1.31'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.31
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2018-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -141,6 +141,7 @@ files:
 - app/mailers/sibu/application_mailer.rb
 - app/models/concerns/sibu/image_uploader.rb
 - app/models/concerns/sibu/sections_concern.rb
+- app/models/concerns/sibu/style_uploader.rb
 - app/models/sibu/application_record.rb
 - app/models/sibu/dynamic_style.rb
 - app/models/sibu/image.rb
@@ -205,6 +206,8 @@ files:
 - db/migrate/20180210181644_add_defaults_to_site_templates.rb
 - db/migrate/20180214134653_add_fields_to_sites.rb
 - db/migrate/20180227151519_add_default_templates_to_site_templates.rb
+- db/migrate/20180301121902_add_style_data_to_sites.rb
+- db/migrate/20180301152101_add_default_styles_to_templates.rb
 - lib/sibu.rb
 - lib/sibu/engine.rb
 - lib/sibu/utils.rb