sibu 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff397b82e6322f99d4615f86cc9be5d9bef9f1ea
-  data.tar.gz: 024c92f3a41dcf68dccabc13a93e1c2f94fa6f5e
+  metadata.gz: f71d0ed5ea931e10b3ac298b61719f4e90781c84
+  data.tar.gz: 86c5c7c355cb751903633f5f8548bef66a6877d9
 SHA512:
-  metadata.gz: 3cacc523c3106cf94856d997126d5bfbb9ea7015159baf9a23a17565a5c9f1de4c9ce343ce7a515aff0e91040817d20111072dd10f74510bed1490cf4987f46d
-  data.tar.gz: 7edfb73ea4c3221c95c721af8a075794712935f97f497983b5a94142c1ef2888f18e320302c66be908edac65399aa2efdde2d888aa06d5467f948e39070b1ed2
+  metadata.gz: 103b62d79ad05287ce1b1d7096cffdc394fb65368209f4b8eb9cb785bc8f86cda3be9b642fa80695c83791b97a1963a1eae9ffb1005bd006362449a849c79275
+  data.tar.gz: 373113cd05d72a79f389273730eb8f3697898ed8417242c8858ac83803ea91aa4ff591bd9b6a38a0360b8a9998f66e0fb76f10b6111895e68219fe90939c7b88

data/app/helpers/sibu/pages_helper.rb

@@ -24,11 +24,11 @@ module Sibu
     end
 
     def link_type(val)
-      if val.blank? || val == '#' || /^\d+$/.match(val.to_s)
+      if val.blank? || /^\d+$/.match(val.to_s)
         'internal'
       elsif Sibu::Document.for_user(sibu_user).map {|d| d.file_url}.include?(val)
         'document'
-      elsif val.to_s.include?('/')
+      elsif val.to_s.start_with?('http', '#', '/')
         'external'
       else
         'email'
@@ -114,12 +114,14 @@ module Sibu
       @sb_entity = @page
       self
     end
+
     alias page sb_page
 
     def sb_site
       @sb_entity = @site
       self
     end
+
     alias site sb_site
 
     def section(id, tag, html_opts = {}, &block)
@@ -157,10 +159,15 @@ 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?('/') || val.to_s.include?('#')
+      if val.to_s.start_with?('http')
+        content["href"] = val
+      elsif val.to_s.start_with?('#')
+        content["href"] = val
+        content.delete("target")
+      elsif val.to_s.start_with?('/')
         content["href"] = val
       elsif val.to_s.include?('@')
-        content["href"] = 'mailto:'+val
+        content["href"] = 'mailto:' + val
       else
         content["href"] = @links.keys.include?(val.to_s) ? (action_name == 'show' ? link_path(val) : site_page_edit_content_path(@site.id, val)) : '#'
       end

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

@@ -9,18 +9,25 @@ class Sibu::ImageUploader < Shrine
   process(:store) do |io, context|
     original = io.download
     images_config = Rails.application.config.sibu[:images]
+    image_type = io.mime_type
 
-    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])
+    if image_type == "image/svg+xml"
 
-    {original: io, large: large, medium: medium, small: small}
+      {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].user_id
+    user_id = context[:record].user_id
     style = context[:version] != :original ? "resized" : "originals"
-    name  = super
+    name = super
 
     [user_id, style, name].compact.join("/")
   end

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

@@ -16,7 +16,7 @@
     </div>
     <div id="link_external" class="sibu_field link_mode">
       <%= radio_button_tag :mode, 'external', current_type == 'external', class: 'radio' %>
-      <%= label_tag 'mode_external', 'Lien vers un autre site' %>
+      <%= label_tag 'mode_external', 'Lien personnalisé' %>
       <%= 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>

data/lib/sibu/version.rb

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

metadata

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