cremefraiche 1.2 → 1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f77d80c3b68961a05dfe0b13fa1573b6412a6fafe7668252849d421939900dc8
-  data.tar.gz: 1cde51638355051748a080f4efee166131c78d0a6c843003045595c9ded61331
+  metadata.gz: 42faa6dffda9a73b0eae45993fe03bfc3f232f5f3c742a76b5115e59826c91d7
+  data.tar.gz: 166f2caa8ab28b1dbd4d9f5d79844c8da64fedf18e68aec08f66f352ce0f85ce
 SHA512:
-  metadata.gz: d35e374c6350f5b0adf4ed09c18ffcd3345389af0ed80fc93279d8e9a0a69fea477b07bc63a6fea4c202cf9ad93cde4702509572f035c144ebd67e00c0a3debd
-  data.tar.gz: 07a8ffd0601e565c9cef6869862a70537bc2cb35b3a5e831be0d9b8ac805f1fa55cbae1f4dd37da7f85cdb1ff63152568ae0591f0ec97f16f4bb8b515cdcc573
+  metadata.gz: 12e1105911e0316f8ce6451df6845fae61843dba1bfa4ed7edd35771a0d4f29d74248c1e85a877b45c09794b6847a07e48f2cfa22bbea58ec8a48e429c8071cc
+  data.tar.gz: efcfe3ffcce0753b33020f9a243fadc47d43a92eb9ac4a8b5e77e38d6e38db02607f02e0e680e64a7eded28b5931c4639f055482a09527f7d2f9645cebb9ce99

data/README.md

@@ -33,6 +33,8 @@ possible variations in the way that Mail is created these days, is an ongoing
 endeavor. If you need authentic output of a HTML mail, **use a different
 software**, a Web Browser or a converter specifically developed for the task.
 
+Cremefraiche uses the ruby-gem “Html2Text” to convert HTML to plain text.
+
 CONFIGURATION
 ===============
 Cremefraiche is highly configurable. 
@@ -68,9 +70,9 @@ Other Information
 
 pipe-in a mail from STDIN
 --------------------------
-You can pipe in mails to cremefraiche. This is useful for use in conjunction
-with mail-clients that allow such operation, notably the *Mutt* mail client.
-For Mutt, it is sufficient to define two macros in the file .muttrc :
+You can pipe in mails to cremefraiche. This is useful in conjunction with
+mail-clients that allow such operation, notably the *Mutt* mail client.  For
+Mutt, it is sufficient to define two macros in the file .muttrc :
 
 <code>macro index X "|cremefraiche -\n"          "make PDF"</code>
 

data/cremefraiche.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'nokogiri', '~> 1.13', '>= 1.13.10'
   s.add_runtime_dependency 'mail', '~> 2.8', '>= 2.8.0'
   s.add_runtime_dependency 'gtk3', '~> 4.0', '>= 4.0.5'
+  s.add_runtime_dependency 'html2text', '~> 0.4', '>= 0.4.0'
   s.executables = 'cremefraiche', 'cremefraicheGui'
   s.license     = 'Nonstandard'
   s.homepage    = Web_page

data/lib/basic_logging.rb

@@ -40,7 +40,7 @@ module BasicLogging
   @@target = STDOUT
   @@muted = []
 
-  # do not log, if caller is name (class or instance)
+  # do not log, if caller is obj (class or instance)
   def self.mute(obj)
     name = obj.class == Class ? obj.name.dup : obj.class.name
     @@muted << name
@@ -51,7 +51,7 @@ module BasicLogging
     @@muted.include?(name)  
   end
 
-  # set the log level for the calling class or object
+  # set the log level 
   def set_level(lv)
     if lv.respond_to?(:to_str)
       lv = Levels[lv.to_sym]
@@ -64,7 +64,7 @@ module BasicLogging
     end
   end
 
-  # set the log target for the calling class or object
+  # set the log target 
   def set_target(tg)
     if tg.respond_to?(:to_io) 
       @@target = tg

data/lib/cfprawn.rb

@@ -19,7 +19,7 @@ require 'escape'
 require_relative 'basic_logging'
 require_relative 'configuration'
 require_relative 'translating'
-require_relative 'html2text'
+require 'html2text'
 
 # NS_POS=1
 # TAG_POS=2
@@ -331,9 +331,7 @@ class CFPrawn
 
 	# handles html-text
 	def html(html)
-		parser = Html2Text.new(html)
-		phtml = parser.text()
-		return phtml
+       return Html2Text::convert(html)
 	end
 	# extracts those headers that should appear in the final PDF-document 
 	# and includes them for rendering in the PDF.

data/lib/gui/ConfDialog.rb

@@ -1,7 +1,7 @@
 #encoding: UTF-8
 =begin
 /***************************************************************************
- *   ©2011-2023, Michael Uplawski <michael.uplawski@uplawski.eu>           *
+ *   ©2011-2024, Michael Uplawski <michael.uplawski@uplawski.eu>           *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the WTFPL 2.0 or later version of the  LICENSE. *
@@ -28,6 +28,9 @@ require_relative 'message_dialog'
         An object of this class opens a configuration-dialog
         that displays and allows to modify all the options which are defined in 
         the currently used configuration-file.
+
+        TODO : Remember how this used to work and simplify.
+        SORRY: I programmed it.
 =end
 class ConfDialog
   include Translating
@@ -213,6 +216,7 @@ class ConfDialog
     # This looks dumb because it is! Eat it. Why a Hash? What Hash?
     vtext
   end
+
 =begin
         creates a checkbox for a boolean configuration-option.
 =end

data/lib/gui/HowtoDialog.rb

@@ -1,24 +1,20 @@
 #encoding: UTF-8
+
 =begin
 /***************************************************************************
- *   ©2012-2016, Michael Uplawski <michael.uplawski@uplawski.eu>           *
+ *   ©2011-2024, Michael Uplawski <michael.uplawski@uplawski.eu>           *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 3 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   it under the terms of the WTFPL 2.0 or later version of the  LICENSE. *
+ *   See https://wtfpl2.com/ for details.                                  * 
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
  *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 =end
+
 require 'gtk3'
 require_relative '../cremefraiche'
 require_relative 'ButtonLabel'
@@ -32,7 +28,7 @@ class HowtoDialog
 	include BasicLogging
 	@@GD = File::expand_path(File::dirname(__FILE__) ) + File::Separator if !defined?(@@GD)
 	@@HOWTO = $PROG_DIR.dup << '../doc/gui_howto.pdf'
-	PDFViers = %w"firefox opera epiphany-browser"
+	PDFViewers = %w"firefox opera epiphany-browser"
 
 	def initialize(options = {})
 		@hdialog = Gtk::Dialog.new()
@@ -95,7 +91,7 @@ class HowtoDialog
 	end
 
 	def find_reader
-		PDFViers.detect(''){|c| $Progs.include?(c)}
+		PDFViewers.detect(''){|c| $Progs.include?(c)}
 	end
 
 	def choose_reader

data/lib/gui/gtk-about.xpm

@@ -1,4 +1,17 @@
 /* XPM */
+/***************************************************************************
+ *   ©2011-2024, Michael Uplawski <michael.uplawski@uplawski.eu>           *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the WTFPL 2.0 or later version of the  LICENSE. *
+ *   See https://wtfpl2.com/ for details.                                  * 
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
+ *                                                                         *
+ ***************************************************************************/
+
 static char * gtk_about_xpm[] = {
 "22 22 65 1",
 " 	c None",

data/lib/gui/gtk-close.xpm

@@ -1,4 +1,17 @@
 /* XPM */
+/***************************************************************************
+ *   ©2011-2024, Michael Uplawski <michael.uplawski@uplawski.eu>           *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the WTFPL 2.0 or later version of the  LICENSE. *
+ *   See https://wtfpl2.com/ for details.                                  * 
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
+ *                                                                         *
+ ***************************************************************************/
+
 static char * gtk_close_xpm[] = {
 "22 22 65 1",
 " 	c None",

data/lib/gui/gtk-execute.xpm

@@ -1,4 +1,17 @@
 /* XPM */
+/***************************************************************************
+ *   ©2011-2024, Michael Uplawski <michael.uplawski@uplawski.eu>           *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the WTFPL 2.0 or later version of the  LICENSE. *
+ *   See https://wtfpl2.com/ for details.                                  * 
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
+ *                                                                         *
+ ***************************************************************************/
+
 static char * gtk_execute_xpm[] = {
 "22 22 93 2",
 "  	c None",

data/lib/gui/gtk-open.xpm

@@ -1,4 +1,17 @@
 /* XPM */
+/***************************************************************************
+ *   ©2011-2024, Michael Uplawski <michael.uplawski@uplawski.eu>           *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the WTFPL 2.0 or later version of the  LICENSE. *
+ *   See https://wtfpl2.com/ for details.                                  * 
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
+ *                                                                         *
+ ***************************************************************************/
+
 static char *dummy[]={
 "22 22 122 2",
 "Qt c None",

data/lib/gui/gtk-properties.xpm

@@ -1,4 +1,17 @@
 /* XPM */
+/***************************************************************************
+ *   ©2011-2024, Michael Uplawski <michael.uplawski@uplawski.eu>           *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the WTFPL 2.0 or later version of the  LICENSE. *
+ *   See https://wtfpl2.com/ for details.                                  * 
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
+ *                                                                         *
+ ***************************************************************************/
+
 static char *dummy[]={
 "24 24 351 2",
 "Qt c None",

data/lib/gui/gtk-quit.xpm

@@ -1,4 +1,17 @@
 /* XPM */
+/***************************************************************************
+ *   ©2011-2024, Michael Uplawski <michael.uplawski@uplawski.eu>           *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the WTFPL 2.0 or later version of the  LICENSE. *
+ *   See https://wtfpl2.com/ for details.                                  * 
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
+ *                                                                         *
+ ***************************************************************************/
+
 static char *dummy[]={
 "24 24 325 2",
 ".r c None",

data/lib/gui/gtk-remove.xpm

@@ -1,4 +1,18 @@
 /* XPM */
+
+/***************************************************************************
+ *   ©2011-2024, Michael Uplawski <michael.uplawski@uplawski.eu>           *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the WTFPL 2.0 or later version of the  LICENSE. *
+ *   See https://wtfpl2.com/ for details.                                  * 
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
+ *                                                                         *
+ ***************************************************************************/
+
 static char *dummy[]={
 "22 22 98 2",
 "Qt c None",

data/lib/gui/gtk-save.xpm

@@ -1,4 +1,18 @@
 /* XPM */
+
+/***************************************************************************
+ *   ©2011-2024, Michael Uplawski <michael.uplawski@uplawski.eu>           *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the WTFPL 2.0 or later version of the  LICENSE. *
+ *   See https://wtfpl2.com/ for details.                                  * 
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
+ *                                                                         *
+ ***************************************************************************/
+
 static char *dummy[]={
 "24 24 187 2",
 "Qt c None",

data/lib/gui/gtk-stop.xpm

@@ -1,4 +1,17 @@
 /* XPM */
+/***************************************************************************
+ *   ©2011-2024, Michael Uplawski <michael.uplawski@uplawski.eu>           *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the WTFPL 2.0 or later version of the  LICENSE. *
+ *   See https://wtfpl2.com/ for details.                                  * 
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
+ *                                                                         *
+ ***************************************************************************/
+
 static char *dummy[]={
 "24 24 317 2",
 "Qt c None",

data/lib/gui/help.xpm

@@ -1,4 +1,17 @@
 /* XPM */
+/***************************************************************************
+ *   ©2011-2024, Michael Uplawski <michael.uplawski@uplawski.eu>           *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the WTFPL 2.0 or later version of the  LICENSE. *
+ *   See https://wtfpl2.com/ for details.                                  * 
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
+ *                                                                         *
+ ***************************************************************************/
+
 static char *dummy[]={
 "24 24 436 2",
 "Qt c None",

data/lib/gui/icon.xpm

@@ -1,4 +1,17 @@
 /* XPM */
+/***************************************************************************
+ *   ©2011-2024, Michael Uplawski <michael.uplawski@uplawski.eu>           *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the WTFPL 2.0 or later version of the  LICENSE. *
+ *   See https://wtfpl2.com/ for details.                                  * 
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
+ *                                                                         *
+ ***************************************************************************/
+
 static char * icon_xpm[] = {
 "48 48 249 2",
 "  	c None",

data/lib/gui/message_dialog.rb

@@ -1,25 +1,18 @@
 #encoding: UTF-8
 =begin
 /***************************************************************************
- *   ©2012-2016, Michael Uplawski <michael.uplawski@uplawski.eu>           *
+ *   ©2011-2024, Michael Uplawski <michael.uplawski@uplawski.eu>           *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 3 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   it under the terms of the WTFPL 2.0 or later version of the  LICENSE. *
+ *   See https://wtfpl2.com/ for details.                                  * 
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
  *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 =end
-
 require 'gtk3'
 
 def msg_dialog(msg, type = :info)

data/lib/{html2text.rb → html2crtext.rb}

@@ -36,9 +36,9 @@ class Html2Text
     html.gsub!("<br/>", "\n")
     html.gsub!("<br />", "\n")
     # Try to remove html-comments
-    #debug('removing comments')
-    html.gsub! /\<!--(.|\s)*?-->/m, ''
-    #debug('   comments removed')
+    # ? for lazyness. matches first -->
+    # otherwise matches too much
+    html.gsub! /\<!--.*?-->/m, ''
     html.gsub! /\s+/, ' '
     @html = Nokogiri::HTML::fragment(html)
     define_tag_handlers if @html

data/lib/version.rb

@@ -15,9 +15,9 @@
  ***************************************************************************/
 =end
 
-YEARS="2011 - 2023"
-VERSION="1.2"
-SUMMARY="Better HTML-handling, more HTML supported."
+YEARS="2011 - 2024"
+VERSION="1.31"
+SUMMARY="using ruby-gem Html2Text on HTML-mail."
 
 App_name = 'Creme Fraiche'
 Author = 'Michael Uplawski'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cremefraiche
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.31'
 platform: ruby
 authors:
 - Michael Uplawski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-01 00:00:00.000000000 Z
+date: 2024-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -130,6 +130,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.5
+- !ruby/object:Gem::Dependency
+  name: html2text
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 description: transforms EML files to PDF
 email: "<michael.uplawski@uplawski.eu>"
 executables:
@@ -143,17 +163,6 @@ files:
 - bin/cremefraicheGui
 - cremefraiche.gemspec
 - doc/gui_howto.pdf
-- lib/.basic_logging.rb.swp
-- lib/.cfprawn.rb.swp
-- lib/.confcheck.rb.swp
-- lib/.configuration.rb.swp
-- lib/.cremefraiche.rb.swp
-- lib/.emlfile.rb.swp
-- lib/.file_checking.rb.swp
-- lib/.html2text.rb.swp
-- lib/.license.rb.swp
-- lib/.tag_munging.rb.swp
-- lib/.version.rb.swp
 - lib/LANG
 - lib/basic_logging.rb
 - lib/busy_indicator/.busy_function_test.rb.swp
@@ -170,10 +179,6 @@ files:
 - lib/cremefraiche.rb
 - lib/emlfile.rb
 - lib/file_checking.rb
-- lib/gui/.ButtonLabel.rb.swp
-- lib/gui/.conf_value.rb.swp
-- lib/gui/.cremefraicheGui.rb.swp
-- lib/gui/.message_dialog.rb.swp
 - lib/gui/AboutDialog.rb
 - lib/gui/ButtonLabel.rb
 - lib/gui/ConfDialog.rb
@@ -196,7 +201,7 @@ files:
 - lib/gui/okay.xpm
 - lib/gui/preferences-color.xpm
 - lib/gui/view.xpm
-- lib/html2text.rb
+- lib/html2crtext.rb
 - lib/icon/icon.xpm
 - lib/icon/icon_big.xpm
 - lib/license.rb
@@ -225,8 +230,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - prawn prawn-table escape nokogiri mail gtk3
-rubygems_version: 3.4.20
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
-summary: Better HTML-handling, more HTML supported.
+summary: using ruby-gem Html2Text on HTML-mail.
 test_files: []