sibu 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c6f5a167c25ae09399fc380a29a3b28b5779b64
-  data.tar.gz: 3d81f0ccfc1dcfc94187059384e84a043344a6ca
+  metadata.gz: 12b8c61886eced3159e2e597e31fe83c3bac36ca
+  data.tar.gz: f0a8a11c80f92c1a39a254aef356b26dbc9efe4e
 SHA512:
-  metadata.gz: a7154da111bf85b4eb8062dfa7197c7f1eb1d2009ad92d5ed57925b530a5e4a868a529ec0a4e7b42eba5392102c44d5e7cf942131c17de21d0170545e3977c21
-  data.tar.gz: 3c0d4ebba40926d6ea7e320b68acc32e44121e484e2671665d433dd2162a868ca98cf81803ee7b77eda70eb394b5b04391977060d1ab987b83e9c755e582a9e6
+  metadata.gz: 941e6278c17d84a88897be0a055c416e0c28fce3679d7a003cd55fcb055b53ac3a87e7f8d7ea9095b1f88d104c01fe3589c289d90f5ee471d2945083e1505e84
+  data.tar.gz: b9d7b3e5c8ecb60bedf2fb51c2d9eb4fc11ba05733e27a37528272269dbcf535b2f58a479e2ee50f9fb8d4c642bab96a5b64fcc70c580afc0af9af342c8a8149

data/app/assets/javascripts/sibu/sibu.js.erb

@@ -79,14 +79,14 @@ function initQuillEditor(container) {
     return quill;
 }
 
-
 function initCropper(imgId) {
     var wrapper = $(".sibu_crop").first();
     var srcImg = $("#content_panel").find(".sb-editing img[data-id='" + imgId + "']").first();
     var srcContainer = srcImg.parent();
     var ratio = parseFloat(srcContainer.css("width")) / parseFloat(wrapper.css("width"));
-    wrapper.css("height", (parseFloat(srcContainer.css("height")) / ratio) + "px");
-    var cropper = new Cropper(wrapper.find("img")[0], {
+    var wrapperHeight = Math.min(320, parseFloat(srcContainer.css("height")) / ratio) + "px";
+    wrapper.css("height", wrapperHeight);
+    return new Cropper(wrapper.find("img")[0], {
         crop: function(event) {
             var data = event.detail;
             var cropper = this.cropper;
@@ -97,7 +97,8 @@ function initCropper(imgId) {
             var height = imageData.naturalHeight / imageScaledRatio + 'px';
             var marginLeft = -data.x / imageScaledRatio + 'px';
             var marginTop = -data.y / imageScaledRatio + 'px';
-
+            // console.log("crop detail : " + JSON.stringify(data));
+            // console.log('img data : ' + JSON.stringify(imageData));
             $("#element_style").val("width: " + width + "; height: " + height + "; margin-left: " + marginLeft + "; margin-top: " + marginTop +"; max-width: none; max-height: none;");
         }
     });

data/app/controllers/sibu/documents_controller.rb

@@ -0,0 +1,35 @@
+require_dependency "sibu/application_controller"
+
+module Sibu
+  class DocumentsController < ApplicationController
+    def index
+      @documents = Sibu::Document.for_user(sibu_user)
+    end
+
+    def new
+      @document = Sibu::Document.new(user_id: send(Rails.application.config.sibu[:current_user]).id)
+    end
+
+    def create
+      @document = Sibu::Document.new(document_params)
+      if @document.save
+        redirect_to documents_url, notice: "Le document a bien été téléchargé."
+      else
+        flash.now[:alert] = "Une erreur s'est produite lors du téléchargement du document."
+        render :new
+      end
+    end
+
+    def destroy
+      @document = @document.find(params[:id])
+      @document.destroy
+      redirect_to documents_url, notice: "Le document a bien été supprimé."
+    end
+
+    private
+
+    def document_params
+      params.require(:document).permit!
+    end
+  end
+end

data/app/helpers/sibu/documents_helper.rb

@@ -0,0 +1,4 @@
+module Sibu
+  module DocumentsHelper
+  end
+end

data/app/helpers/sibu/pages_helper.rb

@@ -16,11 +16,21 @@ module Sibu
     end
 
     def available_links
-      options_from_collection_for_select(@site.pages, :id, :name, @element["value"])
+      options_from_collection_for_select(@site.pages.order(:name), :id, :name, @element["value"])
     end
 
-    def is_internal(val)
-      val.blank? || val == '#' || /^\d{1,3}$/.match(val.to_s)
+    def available_docs
+      options_from_collection_for_select(Sibu::Document.for_user(sibu_user), :file_url, :file_name, @element["value"])
+    end
+
+    def link_type(val)
+      if val.blank? || val == '#' || /^\d{1,3}$/.match(val.to_s)
+        'internal'
+      elsif Sibu::Document.for_user(sibu_user).map {|d| d.file_url}.include?(val)
+        'document'
+      else
+        'external'
+      end
     end
 
     [:h1, :h2, :h3, :h4, :h5, :h6, :span].each do |t|
@@ -127,7 +137,7 @@ module Sibu
       val = content.delete("value") || ""
       text = content.delete("text");
       html_opts.merge!({data: {id: elt_id(elt), type: "link", repeat: repeat, children: children}}) if action_name != 'show'
-      if val.to_s.include?('http')
+      if val.to_s.include?('/')
         content["href"] = val
       else
         content["href"] = @links.keys.include?(val.to_s) ? (action_name == 'show' ? link_path(val) : site_page_edit_content_path(@site.id, val)) : '#'

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

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

data/app/models/sibu/document.rb

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

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

@@ -0,0 +1,15 @@
+<%= form_for(@document) do |f| %>
+  <div class="sibu_field">
+    <%= f.label :file, "Sélection du document" %>
+    <div>
+      <%= f.hidden_field :file, value: @document.cached_file_data %>
+      <%= f.file_field :file %>
+      <small>Sélectionnez un document à télécharger depuis votre ordinateur</small>
+    </div>
+  </div>
+  <%= f.hidden_field :user_id %>
+  <div class="sibu_actions">
+    <%= f.submit 'Valider', data: {disable_with: "Téléchargement du document en cours..."} %>
+    <%= link_to 'Annuler', :back %>
+  </div>
+<% end %>

data/app/views/sibu/documents/index.html.erb

@@ -0,0 +1,37 @@
+<div class="sibu_view">
+  <div class="actions">
+    <%= link_to 'Télécharger un document', new_document_path %> <%= link_to 'Retour', :back %>
+  </div>
+  <h2>Documents téléchargés</h2>
+  <table class="sibu_documents">
+    <thead>
+    <tr>
+      <th>Nom</th>
+      <th>Taille</th>
+      <th>Mise à jour</th>
+      <th>Chemin d'accès (URL)</th>
+      <th></th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @documents.each do |doc| %>
+      <tr>
+        <td><%= doc.metadata[:filename] %></td>
+        <td><%= doc.metadata[:size] > (1024 * 1024) ? "#{doc.metadata[:size] / (1024 * 1024)} Mo" : "#{doc.metadata[:size] / 1024} Ko" %></td>
+        <td><%= l doc.updated_at %></td>
+        <td><%= doc.file_url %></td>
+        <td>
+          <%= link_to 'Voir', doc.file_url, target: '_blank' %> |
+          <%= link_to 'Supprimer', document_path(doc), method: :delete, data: {confirm: "Supprimer le document \"#{doc.metadata[:filename]}\" ?"} %>
+        </td>
+      </tr>
+    <% end %>
+    <% if @documents.empty? %>
+      <tr>
+        <td colspan="4">Aucun document téléchargé pour le moment.</td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
+</div>
+

data/app/views/sibu/documents/new.html.erb

@@ -0,0 +1,13 @@
+<div class="sibu_view">
+  <div class="actions">
+    <%= link_to 'Retour', :back %>
+  </div>
+  <h2>Télécharger un document</h2>
+  <p>
+    Vous pouvez télécharger tous types de documents d'une taille inférieure à 10Mo.
+    Pour les documents textes, favorisez le format PDF pour une compatibilité optimale.
+  </p>
+  <div class="sibu_form">
+    <%= render 'form' %>
+  </div>
+</div>

data/app/views/sibu/images/index.html.erb

@@ -1,4 +1,4 @@
-<div id="pages" class="sibu_view">
+<div class="sibu_view">
   <div class="actions">
     <%= link_to 'Télécharger une image', new_image_path %> <%= link_to 'Retour', :back %>
   </div>

data/app/views/sibu/pages/_link_edit_panel.html.erb

@@ -3,23 +3,28 @@
 <%= render 'element_actions' %>
 <div class="sibu_edit_form">
   <%= form_tag(update_element_site_page_path(@site.id, @page.id), method: :patch, remote: true) do |f| %>
-    <% internal = is_internal(@element["value"]) %>
+    <% current_type = link_type(@element["value"]) %>
     <div class="sibu_field">
       <%= label_tag 'element[text]', 'Libellé' %>
       <%= text_field_tag 'element[text]', @element["text"] %>
     </div>
     <div id="link_internal" class="sibu_field">
-      <%= radio_button_tag :mode, 'internal', internal, class: 'radio' %>
+      <%= radio_button_tag :mode, 'internal', current_type == 'internal', class: 'radio' %>
       <%= label_tag 'mode_internal', 'Lien vers une page du site' %>
-      <%= select_tag 'element[value]', options_from_collection_for_select(@site.pages.order(:name), :id, :name, @element["value"]),
-                     prompt: 'Sélectionnez une page', disabled: !internal %>
-      <%= hidden_field_tag 'element[target]', '_self', disabled: !internal %>
+      <%= select_tag 'element[value]', available_links, prompt: 'Sélectionnez une page', disabled: current_type != 'internal' %>
+      <%= hidden_field_tag 'element[target]', '_self', disabled: current_type != 'internal' %>
     </div>
     <div id="link_external" class="sibu_field">
-      <%= radio_button_tag :mode, 'external', !internal, class: 'radio' %>
+      <%= radio_button_tag :mode, 'external', current_type == 'external', class: 'radio' %>
       <%= label_tag 'mode_external', 'Lien vers un autre site' %>
-      <%= text_field_tag 'element[value]', (@element["value"] unless internal), placeholder: 'Ex : http://www.un-site.com', disabled: internal %>
-      <%= hidden_field_tag 'element[target]', '_blank', disabled: internal %>
+      <%= text_field_tag 'element[value]', (@element["value"] if current_type == 'external'), placeholder: 'Ex : http://www.un-site.com', disabled: current_type != 'external' %>
+      <%= hidden_field_tag 'element[target]', '_blank', disabled: current_type != 'external' %>
+    </div>
+    <div id="link_document" class="sibu_field">
+      <%= radio_button_tag :mode, 'document', current_type == 'document', class: 'radio' %>
+      <%= label_tag 'mode_document', 'Lien vers un document' %>
+      <%= select_tag 'element[value]', available_docs, prompt: 'Sélectionnez un document', disabled: current_type != 'document' %>
+      <%= hidden_field_tag 'element[target]', '_blank', disabled: current_type != 'document' %>
     </div>
     <%= hidden_field_tag 'element[id]', @element["id"] %>
     <%= hidden_field_tag :element_id, @element_id %>

data/app/views/sibu/pages/_media_edit_panel.html.erb

@@ -19,10 +19,14 @@
         <% if @element["src"] == DEFAULT_IMG || @element["src"].blank? %>
           <p>Veuillez sélectionner une image.</p>
         <% end %>
+        <div class="sibu_is_cropped" style="display: <%= (@element["src"] == DEFAULT_IMG || @element["src"].blank?) ? 'none' : 'block' %>">
+          <%= check_box_tag('is_cropped', true, !@element["style"].blank?, id: 'is_cropped', class: 'checkbox') %>
+          <%= label_tag 'is_cropped', "Recadrer l'image" %>
+        </div>
         <div class="sibu_crop">
           <%= image_tag(@element["src"]) unless @element["src"] == DEFAULT_IMG || @element["src"].blank? %>
         </div>
-        <div class="sibu_field">
+        <div class="sibu_field" style="display: <%= (@element["src"] == DEFAULT_IMG || @element["src"].blank?) ? 'none' : 'block' %>">
           <%= label_tag 'element[alt]', 'Légende / texte alternatif' %>
           <%= text_field_tag 'element[alt]', @element["alt"] %>
         </div>

data/app/views/sibu/pages/edit_element.js.erb

@@ -37,6 +37,7 @@ editPanel.slideDown("fast", function() {
         });
     <% when 'media' %>
         var images = editPanel.find(".sibu_image img");
+        var isCropped = $("#is_cropped"), cropper;
         images.click(function() {
             if(!$(this).hasClass('selected')) {
                 images.removeClass('selected');
@@ -45,12 +46,29 @@ editPanel.slideDown("fast", function() {
                 $("#element_alt").val($(this).data("alt"));
                 editPanel.find(".sibu_crop").html('<img src="' + $("#element_src").val() + '"/>');
                 editPanel.find(".sibu_selected_image > p:first-child").hide();
-                initCropper("<%= @element_id %>");
+                editPanel.find(".sibu_selected_image").find(".sibu_is_cropped").show();
+                editPanel.find(".sibu_selected_image").find(".sibu_field").show();
+                if(isCropped.is(":checked")) {
+                    cropper = initCropper("<%= @element_id %>");
+                }
             }
         });
         if(editPanel.find(".sibu_crop img").size() > 0) {
-          initCropper("<%= @element_id %>");
+            if(isCropped.is(":checked")) {
+                cropper = initCropper("<%= @element_id %>");
+            }
         }
+        isCropped.change(function() {
+          if($(this).is(":checked")) {
+              cropper = initCropper("<%= @element_id %>");
+          } else {
+              $("#element_style").val("");
+              $(".sibu_crop").attr("style", "");
+              if(cropper) {
+                  cropper.destroy();
+              }
+          }
+        });
     <% when 'link' %>
         $("input[name='mode']").change(function() {
             var selected = $(this).val();

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

@@ -1,6 +1,7 @@
 <div class="sibu_view">
   <div class="actions">
     <%= link_to "Bibliothèque d'images", images_path %>
+    <%= link_to "Documents", documents_path %>
     <%= link_to 'Créer un site', new_site_path %>
   </div>
   <h2>Liste des sites</h2>

data/config/initializers/shrine.rb

@@ -5,7 +5,9 @@ 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")
+    styles_store: Shrine::Storage::FileSystem.new("public", prefix: "stylesheets/store"),
+    documents_cache: Shrine::Storage::FileSystem.new("public", prefix: "documents/cache"),
+    documents_store: Shrine::Storage::FileSystem.new("public", prefix: "documents/store")
 }
 
 Shrine.plugin :activerecord

data/config/routes.rb

@@ -20,7 +20,6 @@ Sibu::Engine.routes.draw do
         delete 'delete_section', on: :member
       end
     end
-
-    resources :images
+    resources :images, :documents
   end
 end

data/db/migrate/20180321144021_move_images_to_user_level.rb

@@ -1,7 +1,7 @@
 class MoveImagesToUserLevel < ActiveRecord::Migration[5.1]
   def change
     add_column :sibu_images, :user_id, :integer
-    Sibu::Image.where("site_id IS NOT NULL").each {|img| img.update(user_id: img.site.user_id)}
+    Sibu::Image.where("site_id IS NOT NULL").each {|img| img.update(user_id: Sibu::Site.find(img.site_id).user_id)}
     remove_column :sibu_images, :site_id
   end
 end

data/db/migrate/20180405095448_create_sibu_documents.rb

@@ -0,0 +1,10 @@
+class CreateSibuDocuments < ActiveRecord::Migration[5.1]
+  def change
+    create_table :sibu_documents do |t|
+      t.integer :user_id
+      t.text :file_data
+
+      t.timestamps
+    end
+  end
+end

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -134,20 +134,24 @@ files:
 - app/assets/stylesheets/sibu/icons.scss
 - app/assets/stylesheets/sibu/sibu.css
 - app/controllers/sibu/application_controller.rb
+- app/controllers/sibu/documents_controller.rb
 - app/controllers/sibu/images_controller.rb
 - app/controllers/sibu/pages_controller.rb
 - app/controllers/sibu/sites_controller.rb
 - app/helpers/sibu/application_helper.rb
+- app/helpers/sibu/documents_helper.rb
 - app/helpers/sibu/images_helper.rb
 - app/helpers/sibu/pages_helper.rb
 - app/helpers/sibu/sites_helper.rb
 - app/jobs/sibu/application_job.rb
 - app/mailers/sibu/application_mailer.rb
+- app/models/concerns/sibu/document_uploader.rb
 - app/models/concerns/sibu/image_uploader.rb
 - app/models/concerns/sibu/sections_concern.rb
 - app/models/concerns/sibu/style_uploader.rb
 - app/models/concerns/sibu/user_concern.rb
 - app/models/sibu/application_record.rb
+- app/models/sibu/document.rb
 - app/models/sibu/dynamic_style.rb
 - app/models/sibu/image.rb
 - app/models/sibu/page.rb
@@ -156,6 +160,9 @@ files:
 - app/views/layouts/sibu/application.html.erb
 - app/views/layouts/sibu/edit_content.html.erb
 - app/views/layouts/sibu/site.html.erb
+- app/views/sibu/documents/_form.html.erb
+- app/views/sibu/documents/index.html.erb
+- app/views/sibu/documents/new.html.erb
 - app/views/sibu/images/_edit_form.html.erb
 - app/views/sibu/images/_form.html.erb
 - app/views/sibu/images/edit.js.erb
@@ -215,6 +222,7 @@ files:
 - db/migrate/20180301152101_add_default_styles_to_templates.rb
 - db/migrate/20180321144021_move_images_to_user_level.rb
 - db/migrate/20180321170310_add_version_to_sibu_sites.rb
+- db/migrate/20180405095448_create_sibu_documents.rb
 - lib/sibu.rb
 - lib/sibu/engine.rb
 - lib/sibu/utils.rb