im_reader 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f693637efa72f8b0c59dce1206e1e9716b3f5cac3335b2dac02bc1d6cc025548
-  data.tar.gz: feac962d03b51b08322c7beb9258be0f39b6811f2e1f0f848f3e1ab996797fd0
+  metadata.gz: 9df80b54a543f446c9a12e0f09d296813cb861cd44f1ed283d5b30e3df57797c
+  data.tar.gz: 48e211b702f2dd7e3261db75d8be8d48c7c759e0dd7c23b85fdaa63148f0ad08
 SHA512:
-  metadata.gz: '038aacfbf6507b20e57ce5cf156d0ceb4a666b1eb0e555595d2d719744e64ad3ddb88ec83ca5b62bfbb19e56ba35af5be9f394fa8da102f794c06a39fc434a65'
-  data.tar.gz: 746605c1a88fecbc0402082d58f5b54fcf93fced074182c20146da00d9d7aee7b8d756780b482c08592878e8350eece1566b2345fc02ddaf0f2c5871736e56b1
+  metadata.gz: df2f8086643d74000d8fed67ad0f0068b56966757c4de95fe72ed38f4f8a113486294f0240a16c95d353b6cd3b0784b3313de5188e18a7ce4b10d02cd9959788
+  data.tar.gz: 066ed3cb0d3ead6971f51589aa722c872b77f9394d107246e89b1b9cb02d74aacbb5446d5247d4e53e3fafab02ce7103914db1ea8e8e3010b020a9dac875db64

data/app/assets/javascripts/im_reader/reader.js

@@ -19,17 +19,43 @@
         $("#reader-root").append(overlay);
 
         var bookUrl = $root.data("book-url");
+        if (!bookUrl) {
+            $("#cover-content").html(`<p class="ui red text">${i18n.missing_url || "URL manquante."}</p>`);
+            return;
+        }
         var theme = "light";
         var fontSize = 100;
+        fetch(bookUrl, { method: "HEAD" })
+            .then((res) => {
+                if (!res.ok) {
+                    // Si HEAD échoue, on tente GET pour récupérer le message texte
+                    return fetch(bookUrl).then(async (resp) => {
+                        const msg = await resp.text();
+                        throw new Error(msg || i18n.reading_error || "Erreur de lecture.");
+                    });
+                }
+            })
+            .then(() => startReader(bookUrl, i18n, overlay))
+            .catch((err) => {
+                console.error("[im_reader] load error:", err);
+                $("#cover-content").html(`<p class="ui red text">${err.message}</p>`);
+            });
+    }
 
+    function startReader(bookUrl, i18n, overlay) {
         var $viewer = $("#viewer"), $toc = $("#toc");
-        var $prev_button = $("#prev_button"), $next_button = $("#next_button"), $btnTheme = $("#btnTheme");
+        var $prev_button = $("#prev_button"), $next_button = $("#next_button");
 
-        if (!window.ePub) { console.error("ePub introuvable"); return; }
+        if (!window.ePub) {
+            $("#cover-content").html(`<p class="ui red text">ePub introuvable</p>`);
+            return;
+        }
 
-        window.book = window.ePub(bookUrl, { openAs: "epub",
+        window.book = window.ePub(bookUrl, {
+            openAs: "epub",
             replacements: "blob",
-            restore: false });
+            restore: false
+        });
 
         var rendition = book.renderTo("viewer", {
             width: "100%",
@@ -53,34 +79,17 @@
             if (iframe) iframe.setAttribute("sandbox", "allow-same-origin allow-scripts");
         });
 
-        $prev_button.on("click", () => {
-            rendition.prev();
-        });
-
-        $next_button.on("click", () => {
-            rendition.next();
-        });
-
-        rendition.on("relocated", (location) => {
-            if (book.locations.total > 0) {
-                const current = book.locations.locationFromCfi(location.start.cfi);
-                const total = book.locations.total;
-                let percentage = current / total;
-                if (location.atEnd) percentage = 1.0;
-
-                $('#progressBar').progress('set percent', Math.round(percentage * 100));
-            }
-        });
+        $prev_button.on("click", () => rendition.prev());
+        $next_button.on("click", () => rendition.next());
 
         book.ready.then(() => Promise.all([book.loaded.navigation, book.loaded.manifest]))
             .then(([toc, manifest]) => {
-
                 book.coverUrl().then((url) => {
                     if (url) {
                         $("#cover-content").html(`
-                      <img src="${url}" alt="${i18n.book_cover}">
-                      <button id="start_button" class="ui primary button">${i18n.start}</button>
-                    `);
+              <img src="${url}" alt="${i18n.book_cover}">
+              <button id="start_button" class="ui primary button">${i18n.start}</button>
+            `);
 
                         overlay.on("click", "#start_button", () => {
                             overlay.remove();
@@ -93,51 +102,24 @@
                 });
 
                 const $toc = $("#toc");
-
-                function normalizeHref(href) {
-                    for (const key in manifest) {
-                        const entry = manifest[key];
-                        if (
-                            entry.href.endsWith(href) ||
-                            entry.href.endsWith("x" + href) ||
-                            entry.href.endsWith("/" + href)
-                        ) {
-                            return entry.href;
-                        }
-                    }
-
-                    // Par défaut
-                    return href;
-                }
-
                 toc.toc.forEach((chapter) => {
-                    const resolvedHref = normalizeHref(chapter.href);
-
                     $("<a>")
                         .addClass("item")
                         .attr("href", "#")
                         .text(chapter.label)
                         .on("click", (e) => {
                             e.preventDefault();
-                            rendition
-                                .display(resolvedHref)
-                                .catch((err) => {
-                                    console.error("[im_reader] Display error:", err.message, resolvedHref);
-                                });
+                            rendition.display(chapter.href).catch((err) => {
+                                console.error("[im_reader] Display error:", err.message);
+                            });
                         })
                         .appendTo($toc);
                 });
             })
-            .catch((err) => console.error("[im_reader] TOC load error:", err));
-
-        book.ready.then(() => {
-            return book.locations.generate(1000);
-        }).then(() => {
-        }).catch(e => console.error("Error, book not ready", e));
-
-        rendition.on("displayError", (e)=> console.error("Error on display", e));
-
-        rendition.display().catch(e=>console.error("Error while rendering book", e));
+            .catch((err) => {
+                console.error("[im_reader] TOC load error:", err);
+                $("#cover-content").html(`<p class="ui red text">${i18n.reading_error || "Erreur de lecture du livre."}</p>`);
+            });
     }
 
     $(function(){ var $root = $("#reader-root"); if ($root.length) initReader($root); });

data/app/controllers/im_reader/epub_reader_controller.rb

@@ -8,12 +8,14 @@ module ImReader
     end
 
     def remote
-      url = params[:url]
-      uri = URI.parse(url)
+      raw_url = params[:url].to_s.strip
+      return render plain: I18n.t('im_reader.messages.missing_url'), status: 400 if raw_url.empty?
+      uri = parse_uri(raw_url)
+      return render plain: I18n.t('im_reader.messages.invalid_url'), status: 400 unless uri
+
       response = fetch_with_redirect(uri)
 
       if response.is_a?(Net::HTTPSuccess)
-
         send_data response.body,
                   filename: File.basename(uri.path.presence || "remote.epub"),
                   type: "application/epub+zip",
@@ -25,6 +27,24 @@ module ImReader
 
     private
 
+    def parse_uri(value)
+      raw = value.to_s.strip
+      return nil if raw.empty?
+
+      candidates = [raw, CGI.unescape(raw)].uniq
+
+      candidates.each do |c|
+        begin
+          uri = URI.parse(c)
+          return uri if uri.is_a?(URI::HTTP) || uri.is_a?(URI::HTTPS)
+        rescue URI::InvalidURIError, URI::InvalidComponentError
+          next
+        end
+      end
+
+      nil
+    end
+
     def fetch_with_redirect(uri, limit = 5)
       raise "Too many redirects" if limit == 0
 

data/app/views/im_reader/epub_reader/show.html.erb

@@ -3,6 +3,7 @@
      data-i18n='<%= {
                       start: t("im_reader.buttons.start"),
                       loading: t("im_reader.messages.loading"),
+                      missing_url: t("im_reader.messages.missing_url"),
                       book_cover: t("im_reader.elements.book_cover")
                     }.to_json %>'>
   <aside class="ui vertical menu">

data/config/locales/de.yml

@@ -7,5 +7,7 @@ de:
     buttons:
       start: "Lesen beginnen"
     messages:
+      invalid_url: "Die URL zum Lesen ist ungültig."
+      missing_url: "Die Lese-URL fehlt."
       loading: "Buch wird geladen..."
       reading_error: "EPUB-Datei konnte nicht abgerufen werden"

data/config/locales/en.yml

@@ -7,5 +7,7 @@ en:
     buttons:
       start: "Start to Read"
     messages:
+      invalid_url: "The URL provide is invalid."
+      missing_url: "The reading URL is missing."
       loading: "Book is loading ..."
       reading_error: "Unable to retrieve the EPUB"

data/config/locales/es.yml

@@ -7,5 +7,7 @@ es:
     buttons:
       start: "Comenzar la lectura"
     messages:
+      invalid_url: "La URL para leer no es válida."
+      missing_url: "Falta la URL de lectura."
       loading: "Cargando el libro..."
       reading_error: "No se pudo recuperar el EPUB"

data/config/locales/fr.yml

@@ -7,5 +7,7 @@ fr:
     buttons:
       start: "Commencer la lecture"
     messages:
+      invalid_url: "L'url de lecture est invalide."
+      missing_url: "L'url de lecture est manquante."
       loading: "Chargement du livre ..."
       reading_error: "Impossible de récupérer l’EPUB"

data/config/locales/pt.yml

@@ -7,5 +7,7 @@ pt:
     buttons:
       start: "Começar a leitura"
     messages:
+      invalid_url: "O URL para leitura é inválido."
+      missing_url: "O URL de leitura está em falta."
       loading: "Carregando o livro..."
       reading_error: "Não foi possível recuperar o EPUB."

data/lib/im_reader/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ImReader
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: im_reader
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Elodie Ailleaume
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-30 00:00:00.000000000 Z
+date: 2025-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass