markup-email 1.1.4 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39c6bb2ead9d28caaa9999c48f943c60e82469b0
-  data.tar.gz: f674417861dc10247e9aa872635151131b418b97
+  metadata.gz: f6e22e8296de7ddd7242789e78bd8a25eb16dc6e
+  data.tar.gz: '08cbb413bc026b07aed7f4038dc817d0ddf1dffe'
 SHA512:
-  metadata.gz: 3b4dbd31483983f48b5334c42cfe6cdb1763d73239ef3f0c7e6a13b8a61b37f8d9a6cc7658fd279a32233442577f5294dde003170dfe67862391d6d448445052
-  data.tar.gz: 40c39a0482e5879226b2258c13eef00c4694822176624963056c69cd51e9c695d02798e9671c6dfbb44d1e46612c33b051731f670650694558f3ae1d4c07521b
+  metadata.gz: 23578201d5c153d195ecd9920fd89e959f3110f8e2d9895aa913f8065c9078377ff0e4065c66f232d3ae3ea334660581fb200ba01d123df5f70c03a6316c56ff
+  data.tar.gz: 705649ffe717846d52e2ca792cf54ee419271dd16c63d9070819c5925792dc6b9fb19cf2fe62701b25c0d81e9b1ce42d5ab9ac458f0fce596898395d36ecb7eb

data/README.md

@@ -53,12 +53,28 @@ Markup/HTML will be sanitized,
 ### E-mail it
 Then open `examples/veryExampleWow.html` in your browser and see for yourself, then you can open it in a text-editor, view the source and copy it in to your e-mail editor as `HTML` source.
 
+## Add custom styling
+Create a file named either: `.markup-email.css`, `.email.css`, `.markup.css` or `.markdown.css`.
+
+Add your custom css for your email in wither one of these files.
+
+e.g.
+```css
+body { width: 600px; }/* As opposed to 980px */
+
+article {
+  border-radius: 0; /* 5px */
+  box-shadow: none; /* 0 10px 50px rgba(0, 0, 0, 0.2) */
+  padding: 20px;    /* 45px */
+}
+```
+
 ## In Ruby
 *Can* also be used in Ruby
 ```ruby
 require 'markup_email'
 
-file = ... # Markdup file
+file = ... # Markup file
 title = ... # Title of the page
 
 markup = MarkupEmail::Convert.new(file, title, sanitize)
@@ -69,4 +85,4 @@ markup.write "#{file.split('.')[0..-2].join('.')}-converted.html" # Makes a new
 # then the new file from `markup.write()` would be called
 # "hello.there-converted.html"
 ```
-If this is not sufficient, perhaps see the [rubydoc.info](http://www.rubydoc.info/gems/markup-email/1.0.3/) for autogenerated documentation.
+If this is not sufficient, perhaps see the [rubydoc.info](http://www.rubydoc.info/gems/markup-email/1.2.4/) for autogenerated documentation.

data/lib/markup_email/convert.rb

@@ -48,7 +48,9 @@ module MarkupEmail
         puts "`#{package}` not installed for you chosen markup!\nSee `--help` for more information on installing the package."
         exit 1
       else
-        return "`#{package}` installed!"
+        puts "`#{package}` installed!"
+      ensure
+        nil
       end
     end
 
@@ -70,7 +72,7 @@ module MarkupEmail
         return true
       end
       if File.extname(@file) == '.creole'
-        require_test 'org-ruby'
+        require_test 'creole'
         return true
       end
       if %w(.mediawiki .wiki).include? File.extname(@file)
@@ -81,7 +83,7 @@ module MarkupEmail
         begin
           %x(python3 --version)
         rescue
-          puts "python3 (Python version 3) not installed, please install python3!"
+          puts "python3 (Python version 3) not installed, please install `python3`!"
           exit 1
         end
         unless %x(python3 -c "import sphinx" 2>&1).empty?

data/lib/markup_email/styling.rb

@@ -3,6 +3,15 @@ module MarkupEmail
     def self.github_md content
       document = Nokogiri::HTML(content)
 
+      custom_css = String.new
+      css_files = %w{ .markup-email.css .email.css .markup.css .markdown.css }
+      css_files.each do |css_file|
+        if File.file? "#{File.expand_path '~'}/#{css_file}"
+          custom_css = File.read "#{File.expand_path '~' }/#{css_file}"
+          break
+        end
+      end
+
       github_css = Net::HTTP.get(URI.parse("https://raw.githubusercontent.com/sindresorhus/github-markdown-css/gh-pages/github-markdown.css"))
       document.at_css('head') << <<-HTML
         <link rel="shortcut icon" href="https://user-images.githubusercontent.com/26842759/28286954-7d4e4b02-6b29-11e7-97d6-ca223344f755.png">
@@ -173,6 +182,12 @@ module MarkupEmail
             border: none !important;
           }
         </style>
+
+        <!-- User custom style overide -->
+        <style>
+          #{custom_css}
+        </style>
+
       HTML
       document.to_s.gsub("<span aria-hidden=\"true\" class=\"octicon octicon-link\"></span>", "<svg aria-hidden=\"true\" class=\"octicon octicon-link\" height=\"16\" version=\"1.1\" viewBox=\"0 0 16 16\" width=\"16\"><path fill-rule=\"evenodd\" d=\"M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0
       3-1.69 3-3.5S14.5 6 13 6z\"></path></svg>")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markup-email
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.4
 platform: ruby
 authors:
 - Demonstrandum
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: E-mails from Markup