svg_icon 0.2.0 → 0.3.0

data/lib/svg_icon/configuration.rb

@@ -2,7 +2,7 @@
 
 module SvgIcon
   class Configuration
-    DEFAULT_ICON = "bi"
+    DEFAULT_ICON = "lucide"
 
     attr_accessor :icon
     attr_accessor :default_class
@@ -23,5 +23,6 @@ module SvgIcon
 
   def self.configure
     yield configuration
+    SvgIcon.clear_cache!
   end
 end

data/lib/svg_icon/helper.rb

@@ -1,31 +1,42 @@
+# frozen_string_literal: true
+
+require "cgi"
+
 module SvgIcon
   module Helper
     def svg_icon(name, options = {})
       options = options.dup
-
       icons = SvgIcon.icons_json
+
       height = icons["height"] || 24
       width = icons["width"] || 24
 
-      options[:viewBox] = "0 0 #{width} #{height}"
-      options[:version] = "1.1"
+      options[:viewBox] ||= "0 0 #{width} #{height}"
 
       default_class = SvgIcon.configuration.default_class
-
       options[:class] = "#{default_class} #{options[:class]}".strip if default_class.present?
 
-      begin
-        path = icons["icons"][name]["body"]
-        "<svg xmlns='http://www.w3.org/2000/svg' #{icon_html_attributes(options)}>#{path}</svg>".html_safe
-      rescue
-        "<svg xmlns='http://www.w3.org/2000/svg' #{icon_html_attributes(options)}><!-- SVG icon file not found: '#{name}' --></svg>".html_safe
+      body = icons.dig("icons", name.to_s, "body")
+
+      content = if body
+        body
+      else
+        "<!-- SVG icon file not found: '#{safe_comment_text(name.to_s)}' -->"
       end
+
+      "<svg xmlns='http://www.w3.org/2000/svg' #{icon_html_attributes(options)}>#{content}</svg>".html_safe
     end
 
+    private
+
     def icon_html_attributes(options)
-      attrs = ""
-      options.each { |attr, value| attrs += "#{attr}=\"#{value}\" " }
-      attrs.strip
+      options.map do |attr, value|
+        %(#{CGI.escapeHTML(attr.to_s)}="#{CGI.escapeHTML(value.to_s)}")
+      end.join(" ")
+    end
+
+    def safe_comment_text(value)
+      CGI.escapeHTML(value).gsub("-", "&#45;")
     end
   end
 end

data/lib/svg_icon/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SvgIcon
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/svg_icon.rb

@@ -5,50 +5,94 @@ require_relative "svg_icon/helper"
 require_relative "svg_icon/version"
 
 require "multi_json"
+require "active_support/core_ext/object/blank"
+require "active_support/core_ext/string/output_safety"
 
 module SvgIcon
   class Error < StandardError; end
 
   extend self
 
-  def extra_file_data
-    extra_data_path = SvgIcon.configuration.extra_icons_path
-    return nil if extra_data_path.nil?
-    @extra_file_data ||= File.read(extra_data_path)
+  def icons
+    @icons ||= {}
+    @icons[icon] ||= MultiJson.load(file_data)
   end
 
-  def extra_icons
-    return {} if extra_file_data.nil?
-    @extra_icons ||= MultiJson.load(extra_file_data)
+  def icons_json
+    @icons_json ||= {}
+    @icons_json[cache_key] ||= merge_extra_icons(icons)
   end
 
-  # def file_data
-  #   icons_data_path = SvgIcon.configuration.icons_data_path
+  def clear_cache!
+    @file_data = nil
+    @icons = nil
+    @icons_json = nil
+    @extra_file_data = nil
+    @extra_icons = nil
+  end
+
+  private
 
-  #   icons_path = if icons_data_path.present?
-  #     File.join(icons_data_path)
-  #   else
-  #     File.join(__dir__, "data/#{SvgIcon.configuration.icon}.json")
-  #   end
-  #   @file_data ||= File.read(icons_path)
-  # end
+  def icon
+    configuration.icon
+  end
+
+  def configuration
+    SvgIcon.configuration
+  end
+
+  def data_path
+    File.join(__dir__, "data", "#{icon}.json")
+  end
 
   def file_data
-    icons_path = File.join(__dir__, "data/#{SvgIcon.configuration.icon}.json")
-    @file_data ||= File.read(icons_path)
+    @file_data ||= {}
+    @file_data[data_path] ||= begin
+      path = data_path
+      raise Error, "Icon data file not found: #{path}" unless File.exist?(path)
+
+      File.read(path)
+    end
   end
 
-  def icons
-    @icons ||= MultiJson.load(file_data)
+  def extra_icons
+    return {} unless configuration.extra_icons_path
+
+    @extra_icons ||= {}
+    @extra_icons[extra_path] ||= begin
+      data = MultiJson.load(extra_file_data)
+      raise Error, "Extra icons file must contain a JSON object: #{extra_path}" unless data.is_a?(Hash)
+
+      data
+    end
   end
 
-  def icons_json
-    @icons_json ||= if extra_icons
-      puts "icons_json"
-      icons["icons"] = icons["icons"].merge(extra_icons)
-      icons
-    else
-      icons
+  def extra_path
+    configuration.extra_icons_path
+  end
+
+  def extra_file_data
+    @extra_file_data ||= {}
+    @extra_file_data[extra_path] ||= begin
+      path = extra_path
+      raise Error, "Extra icons file not found: #{path}" unless File.exist?(path)
+
+      File.read(path)
     end
   end
+
+  def merge_extra_icons(base_icons)
+    icons_set = base_icons["icons"]
+    raise Error, "Icon data must contain an 'icons' object: #{data_path}" unless icons_set.is_a?(Hash)
+
+    return base_icons if extra_icons.empty?
+
+    merged = base_icons.dup
+    merged["icons"] = icons_set.merge(extra_icons)
+    merged
+  end
+
+  def cache_key
+    "#{icon}:#{extra_path}"
+  end
 end

data/svg_icon.gemspec

@@ -26,6 +26,8 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  # Uncomment to register a new dependency of your gem
   spec.add_dependency "multi_json"
+  spec.add_dependency "activesupport", ">= 5.0"
+
+  spec.add_development_dependency "minitest"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: svg_icon
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - doabit
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-31 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -24,6 +23,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Svg icon render helper for rails.
 email:
 - doinsist@gmail.com
@@ -41,6 +68,7 @@ files:
 - lib/data/bi.json
 - lib/data/bx.json
 - lib/data/heroicons.json
+- lib/data/lucide.json
 - lib/svg_icon.rb
 - lib/svg_icon/configuration.rb
 - lib/svg_icon/helper.rb
@@ -52,7 +80,6 @@ metadata:
   homepage_uri: https://github.com/ruby-gems/svg_icon
   source_code_uri: https://github.com/ruby-gems/svg_icon
   changelog_uri: https://github.com/ruby-gems/svg_icon
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -67,8 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Svg icon render helper for rails
 test_files: []