sibu 0.5.6 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c7d523fedee01e7f41f6ea81a2dcb9d96df8d69
-  data.tar.gz: 1ec96000ae16aaf420cfdecc5cc4a572c60b90c9
+  metadata.gz: 5c359dcb1bc4d7356ca37b607246afda7665c549
+  data.tar.gz: e9a586994f8b165d4642235aa3408b21e93c1b05
 SHA512:
-  metadata.gz: ebf94090c127a16203bf3125f8a3587f1f7d895c431618472ebd0d58252b21421a411e244450d066720e4a19fd18f1b1f575fff9bb396ab1e10e8131a344b357
-  data.tar.gz: c7b825f62ad04f5ed70f9ad91946567d6ae3f692e115cdded8078a5b2064e328a440a0d6b0f6bccde9bb496ad41ed5d93935fc53979ce6aef0fcfdbae3fbf87b
+  metadata.gz: 7d46a51a3509a60efd50c824f7447f1fd9bb1d2ffea7f94871100c1b3d0ad1b6b8993321d33b4544b3c9451be07ff7cf3d1922a829fb7adea90729f73d739db6
+  data.tar.gz: 6c9e093fc1b83ef300558d2e3a5766dc183553449ea15dd0efecbedb5d82e6c9d2e399286aeb6b1491563683d870824ea89f3197af2444778c91a88036ef2e28

data/app/controllers/sibu/documents_controller.rb

@@ -3,7 +3,7 @@ require_dependency "sibu/application_controller"
 module Sibu
   class DocumentsController < ApplicationController
     def index
-      @documents = Sibu::Document.shared + Sibu::Document.for_user(sibu_user)
+      @documents = Sibu::Document.for_user(sibu_user)
     end
 
     def new

data/app/controllers/sibu/images_controller.rb

@@ -6,7 +6,7 @@ module Sibu
     before_action :set_edition_context, only: [:new, :create]
 
     def index
-      @images = Sibu::Image.shared + Sibu::Image.for_user(sibu_user)
+      @images = Sibu::Image.for_user(sibu_user)
     end
 
     def new

data/app/helpers/sibu/pages_helper.rb

@@ -12,7 +12,7 @@ module Sibu
     end
 
     def site_images
-      ([Sibu::Image.empty] + Sibu::Image.shared + Sibu::Image.for_user(sibu_user)).uniq
+      ([Sibu::Image.empty] + Sibu::Image.for_user(sibu_user)).uniq
     end
 
     def available_links
@@ -20,13 +20,13 @@ module Sibu
     end
 
     def available_docs
-      options_from_collection_for_select((Sibu::Document.shared + Sibu::Document.for_user(sibu_user)), :file_url, :file_name, @element["value"])
+      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+$/.match(val.to_s)
         'internal'
-      elsif (Sibu::Document.shared + Sibu::Document.for_user(sibu_user)).map {|d| d.file_url}.include?(val)
+      elsif Sibu::Document.for_user(sibu_user).map {|d| d.file_url}.include?(val)
         'document'
       else
         'external'

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

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

data/app/models/sibu/document.rb

@@ -5,10 +5,6 @@ module Sibu
 
     validates_presence_of :file_data
 
-    def self.shared
-      where(user_id: nil)
-    end
-
     def metadata
       JSON.parse(file_data, symbolize_names: true)[:metadata]
     end

data/app/models/sibu/image.rb

@@ -7,10 +7,6 @@ module Sibu
 
     validates_presence_of :file_data
 
-    def self.shared
-      where(user_id: nil)
-    end
-
     def self.empty
       empty_img = where("metadata ILIKE '%default_empty_image%'").first
       if empty_img.nil?

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '0.5.6'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors:
 - Jean-Baptiste Vilain