sibu 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f71d0ed5ea931e10b3ac298b61719f4e90781c84
-  data.tar.gz: 86c5c7c355cb751903633f5f8548bef66a6877d9
+  metadata.gz: 11718eee8d05389ba6c3e54992c419d06e87039f
+  data.tar.gz: 64985305666f99c3f52636d5447a37389044b0f5
 SHA512:
-  metadata.gz: 103b62d79ad05287ce1b1d7096cffdc394fb65368209f4b8eb9cb785bc8f86cda3be9b642fa80695c83791b97a1963a1eae9ffb1005bd006362449a849c79275
-  data.tar.gz: 373113cd05d72a79f389273730eb8f3697898ed8417242c8858ac83803ea91aa4ff591bd9b6a38a0360b8a9998f66e0fb76f10b6111895e68219fe90939c7b88
+  metadata.gz: ef9befafde933e52bdcd6617efb75385d79e7cd7c075fab9fa6e0d04396840e4131d858180b1ac5f7c0a52cef9737fe3bef600e6104399dfb318a10289cd8490
+  data.tar.gz: 2cb79f2f07fb033870f71f38f4975c3ce757f584e65fc872bd12c7cb27a84cb87859c0f275b18d0f137598e9b7991bd7cf61f799b1e8b88e65962bc6a0eab2b1

data/app/helpers/sibu/sites_helper.rb

@@ -17,7 +17,7 @@ module Sibu
     end
 
     def site_versions
-      [['Français (par défaut)', 'fr'], ['Anglais', 'en']]
+      Rails.application.config.sibu[:versions] || [['Français', 'fr']]
     end
   end
 end

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

@@ -25,7 +25,7 @@ class Sibu::ImageUploader < Shrine
   end
 
   def generate_location(io, context)
-    user_id = context[:record].user_id
+    user_id = context[:record] ? context[:record].user_id : nil
     style = context[:version] != :original ? "resized" : "originals"
     name = super
 

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

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

data/app/models/sibu/page.rb

@@ -31,7 +31,8 @@ module Sibu
 
     # Todo : fix me (is_home flag ?)
     def update_path
-      self.path = name.parameterize if self.path.blank? && name != 'Accueil'
+      prefix = site.version == Sibu::Site::DEFAULT_VERSION ? '' : "#{site.version}/"
+      self.path = "#{prefix}#{name != 'Accueil' ? name.parameterize : ''}" if self.path.blank?
     end
 
     def site_template

data/config/initializers/shrine.rb

@@ -1,5 +1,6 @@
 require "shrine"
 require "shrine/storage/file_system"
+require "mini_magick"
 
 Shrine.storages = {
     cache: Shrine::Storage::FileSystem.new("public", prefix: "uploads/cache"),
@@ -11,4 +12,8 @@ Shrine.storages = {
 }
 
 Shrine.plugin :activerecord
-Shrine.plugin :cached_attachment_data
+Shrine.plugin :cached_attachment_data
+
+MiniMagick.configure do |config|
+  config.whiny = false
+end

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '0.6.8'
+  VERSION = '0.6.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2018-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails