jektify 1.0.6 → 1.0.8

data/lib/jektify/main.rb

@@ -1,128 +1,109 @@
-# Required libs
 require "jekyll"
 require "yaml"
-require "benchmark"
 require "find"
 require "fileutils"
-require "open-uri"
-
+require "liquid"
 
 module Jektify
-
-  # Instance class
-  ENGINE = Engine.new
-  RENDER = Render.new
-
-  # Variables global
   APP_NAME = "jektify"
-  YML_LOAD = ENGINE.yml_config('_config.yml')
-  APP_ROOT_CONFIG = YML_LOAD["#{APP_NAME}"]
-
 
   class Generator < Jekyll::Generator
+    safe true
+    priority :normal
 
     def generate(site)
-      # Before, verify structure Jektify in _config.yml
-      ENGINE.yml_verify(APP_ROOT_CONFIG)
+      engine = Engine.new
+      render_obj = Render.new
+      config = engine.yml_config('_config.yml')[APP_NAME]
+
+      # Verifica se a configuração existe
+      engine.yml_verify(config)
 
       @site = site
 
-      # It will only generate the Javascript file for the user, if the 'Toggle' feature is enabled in the file "_config.yml".
-      if APP_ROOT_CONFIG["enable"] == true
-        @site.static_files.concat static_files if APP_ROOT_CONFIG["toggle"].nil? || APP_ROOT_CONFIG["toggle"]["enable"] == true
+      # Configura Sass para Jekyll
+      engine.configure_sass_for_jekyll(site)
+
+      # Copia arquivos estáticos caso toggle esteja habilitado
+      if config["enable"] == true
+        @site.static_files.concat static_files(engine) if config["toggle"].nil? || config["toggle"]["enable"] == true
       end
-      ENGINE.copy_sass_manual(APP_ROOT_CONFIG)
     end
 
-    # This method searches for folders and files in the assets root directory.
-    # After searching all files stores in an array and then copying to
-    # the folder "_site".
-    def static_files
-      source = File.dirname(ENGINE.assets_path)
-      asset_files.map do |file|
+    private
+
+    # Lista arquivos estáticos (exceto Sass)
+    def static_files(engine)
+      source = File.dirname(engine.assets_path)
+      asset_files(engine).map do |file|
         dir = File.dirname(file)
         file_name = File.basename(file)
-        Jekyll::StaticFile.new @site, source, dir, file_name
+        Jekyll::StaticFile.new(@site, source, dir, file_name)
       end
     end
 
-    # Get paths and fils directory 'assets'
-    def asset_files
-      asset_files = []
-      Find.find(ENGINE.assets_path).each do |path|
+    def asset_files(engine)
+      files = []
+      Find.find(engine.assets_path).each do |path|
         next if File.directory?(path)
-        next if path.include?(ENGINE.stylesheets_sass_path)
-        asset_files << path.sub(ENGINE.assets_path, 'assets')
+        next if path.include?(engine.stylesheets_sass_path)
+        files << path.sub(engine.assets_path, 'assets')
       end
-      asset_files
+      files
     end
+  end
 
-  end # Generator
-
-  # class load SASS
-  class << self
-
-    def loadSass
-      ENGINE.configure_sass(ENGINE)
-    end
-
-  end # self
-
-  # Implement Jektify in Page
   class Main < Liquid::Tag
-
     def initialize(tag_name, input, tokens)
       super
-      # Name tag in liquid
-      # @tag_name = tag_name # DEPRECATED
       @input = input
     end
 
     def render(context)
-      # Sets the data splitter
-      input_split = ENGINE.split_params(@input)
+      engine = Engine.new
+      render_obj = Render.new
+      config = engine.yml_config('_config.yml')[APP_NAME]
 
-      # Determines the positions of each data with the divisor
+      # Split do input e configurações do Spotify
+      input_split = engine.split_params(@input)
       spotify_user = input_split[0].strip
       spotify_embed_category = input_split[1].strip
       spotify_id = input_split[2].strip
       spotify_embed_theme = input_split[3].strip
+      spotify_embed_theme = spotify_embed_theme == "light" ? "white" : spotify_embed_theme
 
-      # Transpiler variable "theme"
-      spotify_embed_theme == "light" ? spotify_embed_theme = "white" : spotify_embed_theme = input_split[3].strip
+      engine.error_different_string(
+        spotify_embed_theme,
+        "dark",
+        "white",
+        "[x] Error: Parameter incorrect in {% spotify [user]/[type]/[id]/[theme] %}."
+      )
 
-      # Checks a series of error values in the settings of Jektify in sctructure {% spotify [user]/[type]/[id]/[theme] %}
-      ENGINE.error_different_string(spotify_embed_theme, "dark", "white", "[x] Error: Parameter incorrect in {% spotify [user]/[type]/[id]/[theme] %}.")
+      player_color = spotify_embed_theme == "dark" ? "0" : "1"
+      spotify_embed_url = "https://open.spotify.com/embed/#{spotify_embed_category}/#{spotify_id}?theme=#{player_color}"
 
-      # Customizing Url Spotify
-      # E.g: { % spotify [user]/[type]/[id]/[theme] % }
-      spotify_embed_url = "https://embed.spotify.com/?uri=spotify:#{spotify_embed_category}:#{spotify_id}&theme=#{spotify_embed_theme}"
-      spotify_embed_url = "https://embed.spotify.com/?uri=spotify:user:#{spotify_user}:#{spotify_embed_category}:#{spotify_id}&theme=#{spotify_embed_theme}" unless spotify_embed_category != "playlist"
-
-
-      # Checks a series of error values in the settings of Jektify in _config.yml
-      ENGINE.error_different_true_false(APP_ROOT_CONFIG["enable"], "[x] Error: The property 'spotify => enable' in file '_config.yml' does not exist or its value is incorrect. Use: [ true | false ]") unless APP_ROOT_CONFIG["enable"].nil?
-
-
-      ENGINE.error_different_true_false(APP_ROOT_CONFIG["open"], "[x] Error: The property 'spotify => open' in file '_config.yml' does not exist or its value is incorrect. Use: [ true | false ]") unless APP_ROOT_CONFIG["open"].nil?
-
-      ENGINE.error_different_true_false(APP_ROOT_CONFIG["title"]["enable"], "[x] Error: The property 'spotify => title => enable' in file '_config.yml' does not exist or its value is incorrect. Use: [ true | false ]") unless APP_ROOT_CONFIG["title"].nil?
-
-      ENGINE.error_different_true_false(APP_ROOT_CONFIG["description"]["enable"], "[x] Error: The property 'spotify => description => enable' in file '_config.yml' does not exist or its value is incorrect. Use: [ true | false ]") unless APP_ROOT_CONFIG["description"].nil?
-
-      ENGINE.error_different_true_false(APP_ROOT_CONFIG["toggle"]["enable"], "[x] Error: The property 'spotify => toggle => enable' in file '_config.yml' does not exist or its value is incorrect. Use: [ true | false ]") unless APP_ROOT_CONFIG["toggle"].nil?
+      # Validações das configs
+      %w[enable open].each do |key|
+        engine.error_different_true_false(config[key], "[x] Error: The property 'spotify => #{key}' in '_config.yml' is missing or invalid.") unless config[key].nil?
+      end
 
-      # If there are no errors starting the plugin
-      RENDER.rendering(APP_NAME, APP_ROOT_CONFIG, spotify_embed_category, spotify_embed_url, spotify_embed_theme)
+      if config["title"]
+        engine.error_different_true_false(config["title"]["enable"], "[x] Error: The property 'spotify => title => enable' in '_config.yml' is missing or invalid.") unless config["title"].nil?
+      end
 
-    end # def render
+      if config["description"]
+        engine.error_different_true_false(config["description"]["enable"], "[x] Error: The property 'spotify => description => enable' in '_config.yml' is missing or invalid.") unless config["description"].nil?
+      end
 
-  end # class Main
+      if config["toggle"]
+        engine.error_different_true_false(config["toggle"]["enable"], "[x] Error: The property 'spotify => toggle => enable' in '_config.yml' is missing or invalid.") unless config["toggle"].nil?
+      end
 
-  # Load files: (SASS)
-  Jektify.loadSass
+      # Renderiza o player
+      render_obj.rendering(APP_NAME, config, spotify_embed_category, spotify_embed_url, spotify_embed_theme)
+    end
+  end
 
-  # Register plugin (tag)
+  # Registra a tag Liquid
   Liquid::Template.register_tag(APP_NAME, Jektify::Main)
-
-end # module Jektify
+end

data/lib/jektify/render.rb

@@ -1,85 +1,59 @@
 module Jektify
-
   class Render
-
-    $DATETIME = Time.new
-
-    def rendering(app_name, app_root_config, spotify_embed_category, spotify_embed_url, spotify_embed_theme)
-
-      # Checks the state of the description" property in the file "_config.yml"
-      # jektify__description = app_root_config["title"]["enable"] == false and app_root_config["description"]["enable"] == false ? jektify__description = "none" : jektify__description = "block"
-
-      # Checks the state of the "title => enable" property in the file "_config.yml"
-      jektify__title = app_root_config["title"]["enable"] == true ? jektify__title = "block" : jektify__title = "none"
-
-      # Checks the state of the "title => enable" property in the file "_config.yml"
-      jektify__description = app_root_config["description"]["enable"] == true ? jektify__description = "block" : jektify__description = "none"
-
-      # Sets the size of the box where the tracks will stay.
-      spotify_embed_category == "album" || spotify_embed_category == "playlist" || spotify_embed_category == "artist" ? box_height = 380 : box_height = 80
-
-      # Sets whether the Jektify box will start open or closed
-      open_track = app_root_config["open"] == true ? open_track = "block" : open_track = "none"
-
-      # If the option to open the box at startup is enabled, the toggle button will also undergo open and close actions.
-      jektify__button_action = app_root_config["open"] == true ? jektify__button_action = "jektify__button--open" : jektify__button_action = "jektify__button--closed"
-
-      # Checks whether the user will use the Toggle feature or not.
-      # If do not use it, JavaScript will not be generated for the user. Because it is he who does the Toggle feature.
-      # The block generating Javascript is in the "Generator" class in the "generate" method. Version 3.0.1
-      # NOTe: If the user uses the previous version of the "_config.yml" file, there will be no conflict.
-      jektify__toggle_button = "<span class=\"jektify__button jektify__button--#{spotify_embed_theme} jektify__button--custom #{jektify__button_action}\">+</span>" if app_root_config["toggle"].nil? || app_root_config["toggle"]["enable"] == true
-
-      open_track = "block" if !app_root_config["toggle"].nil? && app_root_config["toggle"]["enable"] == false
-      jektify__toggle_button = "" if !app_root_config["toggle"].nil? && app_root_config["toggle"]["enable"] == false
-
-      # This is a feature for adding a Spotify user link. Version 3.0.1
-      # NOTe: If the user uses the previous version of the "_config.yml" file, there will be no conflict.
-      if app_root_config["spotify"].nil?
-        jektify__spotify_user = ""
-      else
-        jektify__spotify_user = "<div class=\"jektify__user\"><a href=\"https://open.spotify.com/user/#{app_root_config["spotify"]["user"]}\" target=\"_blank\" class=\"jektify__user-link jektify__user-link--#{spotify_embed_theme} jektify__user-link--custom\" title=\"#{app_root_config["spotify"]["text"]}\"><span class=\"jektify__user-text jektify__user-text--#{spotify_embed_theme} jektify__user-text--custom\">#{app_root_config["spotify"]["text"]}</span></a></div>" if !app_root_config["spotify"]["user"].nil? && !app_root_config["spotify"]["text"].nil?
+    $DATETIME = Time.now
+
+    def rendering(app_name, app_root_config, category, url, theme)
+      jektify_title = app_root_config.dig("title", "enable") ? "block" : "none"
+      jektify_description = app_root_config.dig("description", "enable") ? "block" : "none"
+      box_height = %w[album playlist artist].include?(category) ? 380 : 80
+      open_track = app_root_config["open"] ? "block" : "none"
+      button_action = app_root_config["open"] ? "jektify__button--open" : "jektify__button--closed"
+
+      toggle_button = if app_root_config.dig("toggle", "enable").nil? || app_root_config.dig("toggle", "enable")
+                        "<span class=\"jektify__button jektify__button--#{theme} jektify__button--custom #{button_action}\">+</span>"
+                      else
+                        ""
+                      end
+
+      open_track = "block" if app_root_config.dig("toggle", "enable") == false
+
+      spotify_user_html = ""
+      if app_root_config["spotify"]
+        user = app_root_config["spotify"]["user"]
+        text = app_root_config["spotify"]["text"]
+        if user && text
+          spotify_user_html = <<~HTML
+            <div class="jektify__user">
+              <a href="https://open.spotify.com/user/#{user}" target="_blank" class="jektify__user-link jektify__user-link--#{theme} jektify__user-link--custom" title="#{text}">
+                <span class="jektify__user-text jektify__user-text--#{theme} jektify__user-text--custom">#{text}</span>
+              </a>
+            </div>
+          HTML
+        end
       end
 
-      
-     # Render template if enable == true
-     if app_root_config["enable"] == true
-        %(<dl class="jektify jektify--#{spotify_embed_theme} jektify--custom">
-
-          <dt class="jektify__header jektify__header--#{spotify_embed_theme} jektify__header--custom">
-
-            <a class="jektify__brand jektify__brand--#{spotify_embed_theme} jektify__brand--custom" href="https://#{app_name}.github.io" target="_blank">#{app_name}</a>
+      return unless app_root_config["enable"]
 
-            <i class="jektify__year jektify__year--#{spotify_embed_theme} jektify__year--custom">&copy;&nbsp;#{$DATETIME.strftime("%Y")}&nbsp;</i>
-              #{jektify__toggle_button}
+      <<~HTML
+        <dl class="jektify jektify--#{theme} jektify--custom">
+          <dt class="jektify__header jektify__header--#{theme} jektify__header--custom">
+            <a class="jektify__brand jektify__brand--#{theme} jektify__brand--custom" href="https://#{app_name}.github.io" target="_blank">#{app_name}</a>
+            <i class="jektify__year jektify__year--#{theme} jektify__year--custom">&copy;&nbsp;#{$DATETIME.year}&nbsp;</i>
+            #{toggle_button}
           </dt>
-
-          <dd class="jektify__body jektify__body--#{spotify_embed_theme} jektify__body--custom" style="display: #{open_track}">
-
-            #{jektify__spotify_user}
-
-            <h1 class="jektify__title jektify__title--#{spotify_embed_theme} jektify__user--#{spotify_embed_theme} jektify__title--custom" style="display: #{jektify__title};">#{app_root_config["title"]["text"]}</h1>
-
-            <p class="jektify__description jektify__description--#{spotify_embed_theme} jektify__description--custom" style="display: #{jektify__description};">#{app_root_config["description"]["text"]}</p>
-
-            <div class="jektify__tracklist jektify__tracklist--#{spotify_embed_theme} jektify__tracklist--custom">
-              <iframe id="jektify__track"
-                class="jektify__track jektify__track--#{spotify_embed_theme} 
-                jektify__track--custom" 
-                src="#{spotify_embed_url}" 
-                width="100%" 
-                height="#{box_height}" 
-                frameborder="0" 
-                allowtransparency="true" 
-                allow="encrypted-media">
+          <dd class="jektify__body jektify__body--#{theme} jektify__body--custom" style="display: #{open_track}">
+            #{spotify_user_html}
+            <h1 class="jektify__title jektify__title--#{theme} jektify__title--custom" style="display: #{jektify_title};">#{app_root_config.dig("title", "text")}</h1>
+            <p class="jektify__description jektify__description--#{theme} jektify__description--custom" style="display: #{jektify_description};">#{app_root_config.dig("description", "text")}</p>
+            <div class="jektify__tracklist jektify__tracklist--#{theme} jektify__tracklist--custom">
+              <iframe id="jektify__track" class="jektify__track jektify__track--#{theme} jektify__track--custom"
+                      src="#{url}" width="100%" height="#{box_height}" frameborder="0"
+                      allowtransparency="true" allow="encrypted-media">
               </iframe>
             </div>
           </dd>
-        </dl>)
-      end
-
-    end # def content
-
-  end # class Render
-
-end # module Jektify
+        </dl>
+      HTML
+    end
+  end
+end

data/lib/jektify/version.rb

@@ -8,7 +8,7 @@ module Jektify
 
     MAJOR = 1
     MINOR = 0
-    PATCH = 6
+    PATCH = 8
     VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}"
 
 end