markdown_titles_to_svg 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04730d2d939be49a169d9b99eb05af099968131245401fc9a87bc4c791ce8806
-  data.tar.gz: 398032d4a02f9b254c40be22966672e6b3bcf811e02702f5386620d849202180
+  metadata.gz: d0624a1975dce5637462bc4f80c829ee684a717fea9ee09f2bcf6fcba8a14baa
+  data.tar.gz: 426aa2d3820655b802dbf5898fd0b5079b965c0f0aea0882cdd52a9fbe8c50cd
 SHA512:
-  metadata.gz: 30d457f7ad4932c2fad26fc4e5e5aae7c173d2a7762a226d7041a68f8a61ddcc1eb28411c2ec1f456e17a7c30a4454ee21f6ead4f7e38c0998c143697fec177e
-  data.tar.gz: 547e57eef58726527b3102718c1507b7c39c8bd14b11a88e42a595215ad51d78104c4fff22c1982b3fba24382cad4c6e9e1b8eeb120f2fdf798e43f08885a490
+  metadata.gz: c98302754778d80f0f3595293861cbe6050115902d41a0695204570f669f38e47b43c48e6af65dcf6582b0431ce22e1ad424c4201e34947ee10f7f15d9029c19
+  data.tar.gz: 16e14716757d19b86c807ab3adaad631fc8601ab3e9698c5d30989293b2b957ca7103e6dcb22d936fe6d2c3bf3f35b29ad755d83ad5d182aa87ed22c1644778e

data/CHANGELOG.md

@@ -3,3 +3,8 @@
 ## [0.1.0] - 2021-06-17
 
 - Initial release
+
+## [0.1.3] - 2021-06-17
+
+- Google Fonts Feature
+- Multiple Headline types

data/lib/markdown_titles_to_svg.rb

@@ -20,37 +20,67 @@ module MarkdownTitlesToSvg
     },
     font: {
       text_align: :left,
-      bold: true,
-      local: false,
-      source: {
-        local_path: '',
-        google_fonts: {
-          name: 'Amatic SC',
+      bold: false,
+      mode: {
+        h1: :local,
+        default: :google_fonts
+      },
+      local: {
+        h1: '/Library/Fonts/Microsoft/Corbel Bold.ttf',
+        default: '/Library/Fonts/Microsoft/Consolas.ttf'
+      },
+      google_fonts: {
+        h1: {
+          name: 'Oswald',
           variant: 'regular',
-          subset: 'latin'
+          subset: 'latin'         
         },
-        current: nil,
+        default: {
+          name: 'Amatic SC',
+          variant: 'regular',
+          subset: 'latin'              
+        } 
+      },
+      current: {
+        h1: nil,
+        default: nil
       }
     },
     view: {
       offset: {
-        height: -800,
+        height: 0,
         widht: 0
       }
     },
     style: {
-      color: {
-        opacity: 1.0,
-        default: '#A5834B',
-        palette: []
+      h1: {
+        color: {
+          opacity: 1.0,
+          default: '#A5834B',
+          palette: []
+        },
+        stroke: {
+          color: 'none',
+          width: '0px',
+          opacity: 1.0,
+          linecap: 'butt'
+        }
       },
-      stroke: {
-        color: 'none',
-        width: '10px',
-        opacity: 1.0,
-        linecap: 'butt'
+      default: {
+        color: {
+          opacity: 1.0,
+          default: '#A5834B',
+          palette: []
+        },
+        stroke: {
+          color: 'none',
+          width: '0px',
+          opacity: 1.0,
+          linecap: 'butt'
+        }
       }
-    }
+    },
+    silent: false
   }
 
 
@@ -63,35 +93,27 @@ module MarkdownTitlesToSvg
     if self.validate( markdowns, gh_name, options, @TEMPLATE )
       obj = self.options_update( options, @TEMPLATE, 'set_options' )
       obj[:github][:profile] = gh_name
-
-      if obj[:font][:source][:user].nil?
-        obj[:font][:source][:current] = obj[:font][:source][:default]
-      else
-        obj[:font][:source][:current] = obj[:font][:source][:user]
-      end
-
-      if obj[:font][:local] 
-        obj[:font][:source][:current] = obj[:font][:source][:local_path]
-      else
-        obj[:font][:source][:current] = "./tmp-#{Time.now.getutc.to_i}.ttf"
-        google_font_download( 
-          obj[:font][:source][:google_fonts][:name], 
-          obj[:font][:source][:google_fonts][:variant], 
-          obj[:font][:source][:google_fonts][:subset], 
-          obj[:font][:source][:current]
-        )
-      end
+      obj = self.set_fonts( obj )
 
       cmds = self.markdowns_read( markdowns, obj )
+
       root = './'
       cmds.each do | cmd |
-        svg = self.svg_generate( cmd[:headline], obj )
+        svg = self.svg_generate( cmd, obj )
         FileUtils.mkdir_p ( File.dirname( cmd[:path] ) )
         File.open( cmd[:path], "w" ) { | f | f.write( svg ) }
       end
     end
 
-    !obj[:font][:local] ? File.delete( obj[:font][:source][:current] ) : ''
+    obj[:font][:mode].keys.each do | key |
+      if obj[:font][:mode][ key ] == :google_fonts
+        if ( Time.now.getutc.to_i - obj[:font][:current][ key ].split( '-' )[ 1 ].to_i ) < 30
+          if File.basename( obj[:font][:current][ key ] ) .start_with?( key.to_s )
+            File.delete( obj[:font][:current][ key ] )
+          end
+        end
+      end
+    end
 
     return true
   end
@@ -100,6 +122,37 @@ module MarkdownTitlesToSvg
   private
 
 
+  def self.set_fonts( obj )
+    types = obj[:font][:mode].keys
+    behaviours = types.map { | key | obj[:font][:mode][ key ] }
+
+    !obj[:silent] ? puts( 'Used Fonts: ' ) : ''
+    behaviours.each.with_index do | behaviour, index |
+      t = types[ index ].to_s.length < 3 ? "\t\t" : "\t"
+      !obj[:silent] ? print( "  :#{types[ index ].to_s}#{t}> " ) : ''
+      case behaviour
+        when :local
+          obj[:font][:current][ types[ index ] ] = obj[:font][:local][ types[ index ] ]
+          tmp = File.basename( obj[:font][:current][ types[ index ] ] )
+          !obj[:silent] ? print( "#{tmp} (Local)" ) : ''
+        when :google_fonts
+          obj[:font][:current][ types[ index ] ] = "./#{types[ index ].to_s}-#{Time.now.getutc.to_i}.ttf"
+          self.google_font_download( 
+            obj[:font][:google_fonts][ types[ index ] ][:name], 
+            obj[:font][:google_fonts][ types[ index ] ][:variant], 
+            obj[:font][:google_fonts][ types[ index ] ][:subset], 
+            obj[:font][:current][ types[ index ] ],
+            types[ index ],
+            obj[:silent]
+          )
+      end
+      !obj[:silent] ? puts : ''
+    end
+
+    return obj
+  end
+
+
   def self.str_difference( a, b )
     a = a.to_s.downcase.split( '_' ).join( '' )
     b = b.to_s.downcase.split( '_' ).join( '' )
@@ -113,7 +166,7 @@ module MarkdownTitlesToSvg
   end
 
 
-  def self.google_font_download( font, style, subset, file_name )    
+  def self.google_font_download( font, style, subset, file_name, type, silent )    
     def self.unzip_file( file, destination, file_name )
       Zip::ZipFile.open( file ) do | zip_file |
        zip_file.each do | f |
@@ -144,7 +197,7 @@ module MarkdownTitlesToSvg
       .map { | a | { name: a, score: self.str_difference( style.to_s, a.to_s ) } }
       .min_by { | h | h[:score] }
   
-    puts "Font: #{font["id"]} #{variant[:name]} (#{subset})"
+    !silent ? print( "#{font["id"]} #{variant[:name]} #{subset} (Google Fonts)" ) : ''
     
     url = ''
     url += server
@@ -170,7 +223,7 @@ module MarkdownTitlesToSvg
       other: []
     }
 
-    begin
+    #begin
       if markdowns.class.to_s.eql? 'Array'
         if markdowns.map { | a | a.start_with?( template[:github][:source] ) }.all?
           if markdowns.map { | a | a.end_with?( '.md' ) }.all?
@@ -196,14 +249,14 @@ module MarkdownTitlesToSvg
       end
 
       if vars.class.to_s == 'Hash'
-        messages[:options] = self.options_update( vars, template, 'options_valid?' )
+        messages[:options] = self.options_update( vars, template, 'check_options' )
       else
         messages[:options].push( 'Is not Type "Hash".') 
       end
 
-    rescue
-      messages[:other].push( "Undefined error occured.")
-    end
+    #rescue
+      #messages[:other].push( "Undefined error occured.")
+    #end
 
     valid = messages.keys.map { | key | messages[ key ].length }.sum == 0
 
@@ -225,23 +278,34 @@ module MarkdownTitlesToSvg
 
 
   def self.options_update( vars, template, mode )
-    allow_list =     [
+    allow_list = [
+      :github__source,
       :font__text_align,
       :font__bold,
-      :font__local,
-      :font__source__local_path,
-      :font__source__google_fonts__name,
-      :font__source__google_fonts__variant,
-      :font__source__google_fonts__subset,
+      :font__mode__h1,
+      :font__mode__default,
+      :font__google_fonts__h1__name,
+      :font__google_fonts__h1__variant,
+      :font__google_fonts__h1__subset,
+      :font__google_fonts__default__name,
+      :font__google_fonts__default__variant,
+      :font__google_fonts__default__subset,
       :view__offset__height,
       :view__offset__widht,
-      :style__color__opacity,
-      :style__color__default,
-      :style__color__palette,
-      :style__stroke__color,
-      :style__stroke__width,
-      :style__stroke__opacity,
-      :style__stroke__linecap
+      :style__h1__color__opacity,
+      :style__h1__color__default,
+      :style__h1__color__palette,
+      :style__h1__stroke__color,
+      :style__h1__stroke__width,
+      :style__h1__stroke__opacity,
+      :style__h1__stroke__linecap,
+      :style__default__color__opacity,
+      :style__default__color__default,
+      :style__default__color__palette,
+      :style__default__stroke__color,
+      :style__default__stroke__width,
+      :style__default__stroke__opacity, 
+      :style__default__stroke__linecap,
     ]
 
     messages = []
@@ -274,7 +338,7 @@ module MarkdownTitlesToSvg
     
     result = nil
     case mode
-      when 'options_valid?'
+      when 'check_options'
         result = messages
       when 'set_options'
         result = _options
@@ -301,8 +365,8 @@ module MarkdownTitlesToSvg
   end
 
 
-  def self.svg_items_decode( str, elements, obj )
-    def self.svg_item( char, color, element, obj )
+  def self.svg_items_decode( cmd, elements, obj )
+    def self.svg_item( char, color, element, obj, cmd )
       item = {
         "character": nil,
         "fill": nil,
@@ -317,11 +381,11 @@ module MarkdownTitlesToSvg
 
       item[:"character"] = char
       item[:"fill"] = color
-      item[:"fill-opacity"] = obj[:style][:color][:opacity]
-      item[:"stroke"] = obj[:style][:stroke][:color]
-      item[:"stroke-width"] = obj[:style][:stroke][:width]
-      item[:"stroke-linecap"] = obj[:style][:stroke][:linecap]
-      item[:"stroke-opacity"] = obj[:style][:stroke][:opacity]
+      item[:"fill-opacity"] = obj[:style][ cmd[:type] ][:color][:opacity]
+      item[:"stroke"] = obj[:style][ cmd[:type] ][:stroke][:color]
+      item[:"stroke-width"] = obj[:style][ cmd[:type] ][:stroke][:width]
+      item[:"stroke-linecap"] = obj[:style][ cmd[:type] ][:stroke][:linecap]
+      item[:"stroke-opacity"] = obj[:style][ cmd[:type] ][:stroke][:opacity]
   
       [ :"transform", :"d" ].each do | key |
         search = key.to_s
@@ -333,16 +397,16 @@ module MarkdownTitlesToSvg
     end
     
     
-    characters = str.gsub( ' ', '' )
+    characters = cmd[:headline].gsub( ' ', '' )
     items = []
     elements.each.with_index do | element, index |
-      if obj[:style][:color][:palette].length <= index
-        color = obj[:style][:color][:default]
+      if obj[:style][ cmd[:type] ][:color][:palette].length <= index
+        color = obj[:style][ cmd[:type] ][:color][:default]
       else
-        color = obj[:style][:color][:palette][ index ]
+        color = obj[:style][ cmd[:type] ][:color][:palette][ index ]
       end
       
-      item = self.svg_item( characters[ index ], color, element, obj )
+      item = self.svg_item( characters[ index ], color, element, obj, cmd )
       items.push( item )
     end
     return items
@@ -381,16 +445,16 @@ module MarkdownTitlesToSvg
   end
 
 
-  def self.svg_generate( str, obj )
+  def self.svg_generate( cmd, obj )
     svg = Text2svg( 
-      str, 
-      font: obj[:font][:source][:current], 
+      cmd[:headline], 
+      font: obj[:font][:current][ cmd[:type] ], 
       text_align: obj[:font][:text_align], 
       bold: obj[:font][:bold]
     ).to_s
   
     elements = self.svg_elements( svg )
-    items = self.svg_items_decode( str, elements, obj )
+    items = self.svg_items_decode( cmd, elements, obj )
     code = self.svg_create_code( items, svg, obj )
     return code
   end
@@ -406,10 +470,11 @@ module MarkdownTitlesToSvg
         doc = Nokogiri::HTML( response )
         doc.xpath( '//img' ).each do | element |
           begin
-            if !element.attribute( 'banner' ).nil?
+            if !element.attribute( 'alt' ).nil?
               validation = "#{obj[:github][:source]}#{obj[:github][:profile]}/"
               cmd = {
                 headline: nil,
+                type: nil,
                 src: nil,
                 file: nil,
                 path: nil
@@ -421,8 +486,11 @@ module MarkdownTitlesToSvg
               if cmd[:src].start_with?( validation )
                 if cmd[:src].end_with?( '.svg' ) 
                   if url =~ URI::regexp
-                    cmd[:headline] = element.attribute( 'banner' ).value
-                    
+                    cmd[:headline] = element.attribute( 'alt' ).value
+
+                    cmd[:type] = cmd[:headline].count( '#' ) == 0 ? :default : :h1
+                    cmd[:headline] = cmd[:headline].gsub( '#', '' ).strip
+
                     tmp = cmd[:src][ cmd[:src].index( validation ) + validation.length, cmd[:src].length ]
                     tmp = tmp
                       .split( '/' )

data/lib/markdown_titles_to_svg/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MarkdownTitlesToSvg
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markdown_titles_to_svg
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - a6b8