hyde_admin 0.0.7 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ef51602655e92300fd16efb61fc625738e962b8708146c702666fefe759d582
-  data.tar.gz: 695738c9eb64ff85aaa643fb2b06ac8219d9ed1abec97cd9fc2ca7a4b99014f8
+  metadata.gz: 4c2a24943a838bb470b6375c0658626798f0f1beb456f65d792995a4fe7bf0bd
+  data.tar.gz: a367a451d9b2e2aa05aa79cc2812702624472e59a776bf9fdc842260fa1cf099
 SHA512:
-  metadata.gz: 1076b6a7a5cd25e24715a5bfc27f5cc7ddb2f2a88c3406d6ca2affeb45e391cab4e74f734ef0036a6c33ae1f2fa61e977b63e8446cd26139aacafabcacbbde7e
-  data.tar.gz: 29719bfc0e10609a22b45590031c5e4fea57d9e190ba158a186d2fa523953d0c37df8e204ff8d846296b915fb108d9a0a7d61b0bb2ae8b9991dccc2175d0c519
+  metadata.gz: 712d1960647c69074f878d94d4bc1db2193f3f170835f7c7ad98d4652df95ad96ef25d9d6dd238d19517ff0a87d5256a2875dafba89b534d69a8d632de576596
+  data.tar.gz: f3773cbc9b770c60ee5c237f1ac657d4ed9cbe25973f8a3cfffbf86938ac6b9ab8573820a3e72710dcf32e96738d3d4c0e7954c7efde347ad122a79a4bff3a6b

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/.idea/hyde_admin.iml

@@ -12,7 +12,11 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.1.9, RVM: ruby-2.7.0) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ffi (v1.15.4, RVM: ruby-2.7.0) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="i18n (v1.8.10, RVM: ruby-2.7.0) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="image_processing (v1.12.1, RVM: ruby-2.7.0) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mini_magick (v4.11.0, RVM: ruby-2.7.0) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ruby-vips (v2.0.17, RVM: ruby-2.7.0) [gem]" level="application" />
   </component>
   <component name="RModuleSettingsStorage">
     <LOAD_PATH number="0" />

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.0.9
+
+Hide deploy button if 'deploy_dest_address' is empty.
+hyde_admin_config allow you to install the latest default config file.
+
+# 0.0.8
+
+Resize image at upload with ImageProcessing (MiniMagick)
+
 # 0.0.7
 
 Post edit : bugfix, keep layout & format when we don't show input.

data/README.md

@@ -1,8 +1,15 @@
+## Hyde admin
+
+Hyde_admin is a administration frontend for Jekyll (static site generator in Ruby).
+
 ## Getting Started with Hyde Admin
 
 Add
 
-`gem 'hyde_admin'`
+```
+gem 'hyde_admin'
+gem 'puma'
+```
 
 In the Gemfile of your jekyll site.
 
@@ -20,4 +27,14 @@ You can visit localhost:9292 !
 hyde_admin.yml is automatically generated in your jekyll directory.
 (you can change settings with hyde_admin ou directly)
 
-Hyde_admin allow ssh deployment.
+Hyde_admin allow ssh deployment.
+
+## New version of hyde_admin ?
+
+Just install the lastest config file (your config file will be renamed, and latest config file will be installed), run :
+
+`hyde_admin_config`
+
+## Error when bundle install
+
+Try this [https://stackoverflow.com/questions/30818391/gem-eventmachine-fatal-error-openssl-ssl-h-file-not-found](https://stackoverflow.com/questions/30818391/gem-eventmachine-fatal-error-openssl-ssl-h-file-not-found)

data/bin/admin_views/admin_layout.html.erb

@@ -84,12 +84,14 @@
                   <%= EscapeUtils.escape_html t.overview.capitalize %>
                 </a>
               </li>
-              <li class="nav-item">
-                <a class="nav-link active" aria-current="page" href="/deploy" id="btn-deploy">
-                  <span data-feather="home" class="fas fa-cloud-upload-alt"></span>
-                  <%= EscapeUtils.escape_html t.deploy.capitalize %>
-                </a>
-              </li>
+              <% if !@hyde_parameters['deploy_dest_address'].to_s.empty? %>
+                <li class="nav-item">
+                  <a class="nav-link active" aria-current="page" href="/deploy" id="btn-deploy">
+                    <span data-feather="home" class="fas fa-cloud-upload-alt"></span>
+                    <%= EscapeUtils.escape_html t.deploy.capitalize %>
+                  </a>
+                </li>
+              <% end %>
             </ul>
             <p class="text-center text-muted"><br><br><em>Hyde Admin V.<%= HydeAdmin::VERSION %></em>&nbsp;&nbsp;&nbsp;<a href="https://github.com/rivsc/hyde_admin" class="link-secondary"><i class="fab fa-github"></i></a></p>
           </div>

data/bin/admin_views/configuration.erb

@@ -3,9 +3,9 @@
 <form action="/configuration" method="post">
   <% @hyde_parameters.each_pair do |setting, value| %>
     <div class="mb-3">
-      <label for="i-<%= setting %>" class="form-label"><%= EscapeUtils.escape_html t.send(setting).capitalize %></label>
+      <label for="i-<%= setting %>" class="form-label"><%= (EscapeUtils.escape_html t.send(setting).capitalize rescue setting) %></label>
       <input type="text" class="form-control" value="<%= value %>" name="<%= setting %>" id="i-<%= setting %>">
-      <div id="i-<%= setting %>-help" class="form-text"><%= EscapeUtils.escape_html t.send("help_#{setting}").capitalize %></div>
+      <div id="i-<%= setting %>-help" class="form-text"><%= (EscapeUtils.escape_html t.send("help_#{setting}").capitalize rescue '') %></div>
     </div>
   <% end %>
   <button type="submit" class="btn btn-primary"><%= EscapeUtils.escape_html t.submit.capitalize %></button>

data/bin/admin_views/upload_image_form.erb

@@ -25,21 +25,25 @@
     </script>
   </head>
   <body style="width:800px;" class="p-4">
-      <h1><%= t.upload_image_form.capitalize %></h1>
+    <div class="container-fluid">
+      <div class="row">
+        <h1><%= t.upload_image_form.capitalize %></h1>
 
-      <% if @filenames %>
-        <%= t.pictures_has_been_uploaded.capitalize %> : <%= @filenames.join(', ') %>
-      <% end %>
+        <% if @filenames %>
+          <%= t.pictures_has_been_uploaded.capitalize %> : <%= @filenames.join(', ') %>
+        <% end %>
 
-      <form enctype="multipart/form-data" method="post" action="/upload_image" class="row g-3">
-        <div class="col-10">
-          <input type="file" name="files[]" multiple class="form-control">
-        </div>
-        <div class="col-2">
-          <button class="btn btn-primary"><%= t.upload.capitalize %></button>
-        </div>
-      </form>
+        <form enctype="multipart/form-data" method="post" action="/upload_image" class="row g-3">
+          <div class="col-10">
+            <input type="file" name="files[]" multiple class="form-control">
+          </div>
+          <div class="col-2">
+            <button class="btn btn-primary"><%= t.upload.capitalize %></button>
+          </div>
+        </form>
 
-      <button class="btn btn-secondary btn-return-to-editor fixed-bottom mb-4 ms-4"><%= t.quit.capitalize %></button>
+        <button class="btn btn-secondary btn-return-to-editor fixed-bottom mb-4 ms-4"><%= t.quit.capitalize %></button>
+      </div>
+    </div>
   </body>
 </html>

data/bin/hyde_admin.ru

@@ -6,6 +6,7 @@ require 'fileutils'
 require 'i18n'
 require 'date'
 require 'escape_utils'
+require 'image_processing/mini_magick'
 require_relative '../lib/hyde_admin/version'
 
 # TODO détecter format nouveau post (pour codemirror)
@@ -82,6 +83,26 @@ class Mid < Roda
     str.to_s.scan(/^\[?(.*?)\]?$/).flatten.first.split(',')
   end
 
+  def self.resize_image(image_path,params)
+    dir = File.dirname(image_path)
+    basename = File.basename(image_path, File.extname(image_path))
+    while File.exist?("#{File.join(dir, "#{basename}_#{params['resize_size']}")}.#{params['resize_format']}")
+      basename += '_'
+    end
+    output_path = "#{File.join(dir, "#{basename}_#{params['resize_size']}")}.#{params['resize_format']}"
+
+    width,height = params['resize_size'].split("x")
+    ip = ImageProcessing::MiniMagick
+      .source(image_path)
+      .convert(params['resize_format'])
+      .resize_to_limit(width.to_i, height.to_i)
+    if params['resize_format'] == 'jpg'
+      ip = ip.saver(quality: 80, interlace: "Line")
+    end
+
+    ip.call(destination: output_path)
+  end
+
   FORMAT_DATE_FILENAME = '%Y-%m-%d'
   FORMAT_DATE_INPUT_FILENAME = '%Y-%m-%d %H:%M:%S %z'
 
@@ -156,6 +177,9 @@ class Mid < Roda
         File.open(File.join(@hyde_parameters['images_path'], filename), 'wb') do |f|
           f.write(file[:tempfile].read)
         end
+        if @hyde_parameters['resize_enable'] == 'true'
+          Mid.resize_image(File.join(@hyde_parameters['images_path'], filename), @hyde_parameters)
+        end
       end
       render("upload_image_form")
     end

data/bin/hyde_admin.yml

@@ -6,10 +6,13 @@ deploy_dest_path: "/absolute/remote/path/mysite"
 rsync_fullpath: rsync
 site_index: index.html
 hyde_admin_language: en
-hyde_admin_auth: false
+hyde_admin_auth: 'false'
 hyde_admin_user: admin
 hyde_admin_password: admin
 default_format: html
-display_layout: true
-display_format: true
-images_path: assets/images/
+display_layout: 'true'
+display_format: 'true'
+images_path: assets/images/
+resize_format: jpg
+resize_size: 1500x1000
+resize_enable: 'true'

data/bin/hyde_admin_config

@@ -0,0 +1,16 @@
+#!/bin/env ruby
+
+require 'fileutils'
+
+local_config_file = File.join(Dir.pwd, 'hyde_admin.yml')
+old_filename = "hyde_admin_old_#{Time.now.strftime('%Y_%m_%d')}.yml"
+
+# Backup actual config file
+if File.exist?(local_config_file)
+  FileUtils.mv(local_config_file, old_filename)
+end
+
+# Copy the default config file
+FileUtils.copy(File.join(File.expand_path(File.dirname(__FILE__)), 'hyde_admin.yml'), local_config_file)
+
+puts "#{local_config_file} copied, you can find your old config file here : #{old_filename} !"

data/bin/i18n/en.yml

@@ -100,4 +100,10 @@ quit: quit
 header_name: header name
 header_value: header value
 images: images
-load_images: load images
+load_images: load images
+resize_format: jpg
+help_resize_format: jpg or png
+resize_size: "size to fit, example : 1500x1000"
+help_resize_size: Downsize to fit to the specified size (resize preserve ratio), example 1500x1000
+resize_enable: Enable resizing for images
+help_resize_enable: enable feature resize image at upload

data/bin/i18n/fr.yml

@@ -100,4 +100,10 @@ quit: quitter
 header_name: nom d'entête
 header_value: valeur d'entête
 images: images
-load_images: charger images
+load_images: charger images
+resize_format: jpg
+help_resize_format: jpg ou png
+resize_size: "Recadrer en (example : 1500x1000)"
+help_resize_size: Réduit les image pour coller à la taille spécifiée (le redimensionnement préserve le ratio), exemple 1500x1000
+resize_enable: activer redimensionnement
+help_resize_enable: active la fonctionnalité de redimensionnement d'image à l'upload

data/hyde_admin.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   all_files     = `git ls-files`.split("\n").reject{ |filepath| filepath.start_with? 'test/' }
   s.files       = all_files
 
-  s.executables   = ['hyde_admin']
+  s.executables   = ['hyde_admin','hyde_admin_config']
   s.bindir        = "bin"
   s.require_paths = ["lib"]
 
@@ -31,4 +31,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("escape_utils") # escape_javascript / escape_html
   #s.add_runtime_dependency("i18n", "~> 0.4.0") # I18n.transliterate (already required by jekyll)
   s.add_runtime_dependency('jekyll') # Because we call jekyll binary
+  s.add_runtime_dependency('image_processing') # JPEG quality
 end

data/lib/hyde_admin/version.rb

@@ -1,3 +1,3 @@
 module HydeAdmin
-  VERSION = "0.0.7"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyde_admin
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.10
 platform: ruby
 authors:
 - Sylvain Claudel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-25 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roda
@@ -80,14 +80,30 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: image_processing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Jekyll admin interface
 email: claudel.sylvain@gmail.com
 executables:
 - hyde_admin
+- hyde_admin_config
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitattributes"
+- ".gitignore"
 - ".idea/.gitignore"
 - ".idea/hyde_admin.iml"
 - ".idea/misc.xml"
@@ -112,6 +128,7 @@ files:
 - bin/hyde_admin
 - bin/hyde_admin.ru
 - bin/hyde_admin.yml
+- bin/hyde_admin_config
 - bin/hyde_assets/hyde_admin.css
 - bin/hyde_assets/hyde_admin.js
 - bin/i18n/en.yml
@@ -179,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Hyde for Jekyll site