faw_icon 1.2.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de5480bbb14198a0b481e2ae8096b42825adcda417b12ab7903078bf179d7755
-  data.tar.gz: 5b962f280976cf45fa5b957787a8af52cf2c3460e606c62a1ed654a2e13800fd
+  metadata.gz: 21c386a35bb9d5e124131e5ee19bc647d2a603f719a66a50b7158e0a1037b7fa
+  data.tar.gz: d19ef48041f3533e5d731670f31fba402140fbd1c3a77242858512377f2bdb03
 SHA512:
-  metadata.gz: 03b1b0464f81aeab522848538dd9bd11d633b34826d7f3b86d2bd19bada259d6e65aea6958f7cbc3d1e200da5381f6f59817180297ac226c3c470e0e07a1cdfe
-  data.tar.gz: 4bc8ce452b76ddee9999007093cbd01be9e3bc695542eebc90f1a23b98f6e08cbbfd3d9d97b42cf60abb8416f8728410ae28e8ff03d1da03e07550cb1fc269b3
+  metadata.gz: 36fe80a571302bc4662adb591638f64be0d02227058e4e8ec454315c8f3a9c08ce4256f4ecbb20f3e6135ae35857864a400a3d78646d104fbbe6fb7834c1ae48
+  data.tar.gz: 87ee7cb28b3cff7bed85ec792068bf959565d6d764d7e72e5587e4c21411fd199e4233ae2fe7d471796678eeb69f9bb2c2771532267b047eb763437263db821a

data/Gemfile.lock

@@ -1,11 +1,13 @@
 PATH
   remote: .
   specs:
-    faw_icon (1.2.1)
+    faw_icon (1.4.0)
+      nokolexbor (~> 0.6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    nokolexbor (0.6.0-x86_64-linux)
     rake (10.5.0)
 
 PLATFORMS

data/faw_icon.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "nokolexbor", "~> 0.6.0"
   spec.add_development_dependency "bundler", "~> 2.2"
   spec.add_development_dependency "rake", "~> 10.0"
   # spec.required_ruby_version = '>= 2.5.0'

data/lib/faw_icon/helper.rb

@@ -1,6 +1,6 @@
 require "faw_icon/version"
 require "faw_icon/configuration"
-require "rexml/document"
+require "nokolexbor"
 
 module FawIcon
   def faw_icon(style, name, options = {})
@@ -34,17 +34,23 @@ module FawIcon
     icons = JSON.parse(File.read(FawIcon.configuration.icons_path))
 
     if icons[name].present? && icons[name]['svg'][style].present?
-      doc = REXML::Document.new(icons[name]['svg'][style]['raw'])
-      svg = doc.root
+      doc = Nokolexbor::HTML(icons[name]['svg'][style]['raw'])
+      svg = doc.at_css("svg")
     end
 
     fa_tag(svg, html_props)
   end
 
   def by_raw(style, name, html_props)
-    if File.exist? Rails.root.join(FawIcon.configuration.raw_svg_path, style, "#{name}.svg")
-      doc = File.open(Rails.root.join(FawIcon.configuration.raw_svg_path, style, "#{name}.svg")) { |f| REXML::Document.new(f) }
-      svg = doc.root
+    image_path = FawIcon.configuration.raw_svg_path
+
+    if (faw_spec = Gem.loaded_specs['faw_files'])
+      image_path = "#{faw_spec.full_gem_path}/vendor/assets/images/fa/raw-svg"
+    end
+
+    if File.exist? Rails.root.join(image_path, style, "#{name}.svg")
+      doc = File.open(Rails.root.join(image_path, style, "#{name}.svg")) { |f| Nokolexbor::HTML(f) }
+      svg = doc.at_css('svg')
     end
 
     fa_tag(svg, html_props)
@@ -52,26 +58,26 @@ module FawIcon
 
   def by_sprite(style, name, html_props)
     if File.exist? Rails.root.join(FawIcon.configuration.svg_sprites_path, "fa-#{style}.svg")
-      doc = REXML::Document.new("<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 512 512\"><use href=\"/fa5/svg-sprites/fa-#{style}.svg##{name}\"></use></svg>")
-      svg = doc.root
+      doc = Nokolexbor::HTML("<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 512 512\"><use href=\"/fa5/svg-sprites/fa-#{style}.svg##{name}\"></use></svg>")
+      svg = doc.at_css("svg")
     end
 
     fa_tag(svg, html_props)
   end
 
   def by_js(html_props)
-    doc = REXML::Document.new('<i>&nbsp;</i>')
+    doc = Nokolexbor::HTML('<i>&nbsp;</i>')
 
-    fa_tag(doc.root, html_props)
+    fa_tag(doc.at_css("i"), html_props)
   end
 
   def fa_tag(svg = nil, html_props)
     svg = svg_not_found if svg.nil?
 
-    svg.attributes['class'] = html_props[:class].join(' ')
-    svg.attributes['data-fa-transform'] = html_props[:transform] if html_props[:transform]
-    svg.attributes['data-fa-mask'] = html_props[:mask] if html_props[:mask]
-    svg.attributes['data-source-type'] = html_props[:source_type] if html_props[:source_type]
+    svg['class'] = html_props[:class].join(' ')
+    svg['data-fa-transform'] = html_props[:transform] if html_props[:transform]
+    svg['data-fa-mask'] = html_props[:mask] if html_props[:mask]
+    svg['data-source-type'] = html_props[:source_type] if html_props[:source_type]
 
     svg.to_s.html_safe
   end
@@ -92,8 +98,8 @@ module FawIcon
   end
 
   def svg_not_found
-    doc = REXML::Document.new(FawIcon.configuration.icon_not_found)
+    doc = Nokolexbor::HTML(FawIcon.configuration.icon_not_found)
 
-    doc.root
+    doc.at_css("svg")
   end
 end

data/lib/faw_icon/version.rb

@@ -1,3 +1,3 @@
 module FawIcon
-  VERSION = "1.2.1"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: faw_icon
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.4.0
 platform: ruby
 authors:
 - alexwebgr
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-20 00:00:00.000000000 Z
+date: 2025-05-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokolexbor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -78,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A simple helper for Font-Awesome 5 using raw SVG and SVG-with-JS