rails_icons 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9e2199e5795be0bd65fe3b1ade8a0fde475a93d0833e245c3f93e099e7b7a77
-  data.tar.gz: f90c88a1fb8e654b3f603cc15d0708ce17dd34d7c0601aaf42c0ac457909705a
+  metadata.gz: 1eb234823bc6e27e9acad4dff7c38f02e09680874be20591ebfcd5259b9076f4
+  data.tar.gz: d8d835dc636cd685ad6db3fff46580a8ea623725827742110c1d781e64c3209c
 SHA512:
-  metadata.gz: 46ee695f9eb54288b18a9dd4175033ec177b1c2890afe1a7e676807fb111de7be3547af4cad028915a949f77f4bbc14fe85b2d32a47888efc5240361782c2f42
-  data.tar.gz: 9076052c13f3b2481f5d61a6d3dea6aef93b12a79b5af6e394ee6b0bb574d3a4c5367dc386c2a5169d653147d19c2a72fc4d656d07c97e2326359b21605936b8
+  metadata.gz: b8b4b1e11b017a7f31c700422306e2d92bb8a60c5c338a1c9797f08988058b635ece2543abfe8f0db6c11e44576d6507c3ad7a9b71d63f6e2d0c86ab52d13492
+  data.tar.gz: 8f9f3515fb864772cca37e3c28a20a3467cd6974a815b41325504794fa8b5225629759ce72245304ae2f0e53884fa666e40189723605e6f3159f538972217055

data/Gemfile

@@ -5,7 +5,6 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in rails_icons.gemspec
 gemspec
 
-# gem "rails", "~> 7.0.6"
 gem "appraisal"
 gem "propshaft"
 

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    rails_icons (1.6.1)
-      nokogiri (~> 1.16, >= 1.16.4)
+    rails_icons (1.7.0)
+      icons (~> 0.8.0)
       rails (>= 7.0)
 
 GEM
@@ -102,6 +102,8 @@ GEM
       activesupport (>= 6.1)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
+    icons (0.8.0)
+      nokogiri (~> 1.16, >= 1.16.4)
     io-console (0.8.1)
     irb (1.15.2)
       pp (>= 0.6.0)

data/README.md

@@ -77,17 +77,17 @@ icon "check", stroke_width: 2
 
 ## First-party libraries
 
-- [Boxicons](https://railsdesigner.com/rails-icons/boxicons/) (1600+ icons)
-- [Feather](https://railsdesigner.com/rails-icons/feather/) (280+ icons)
-- [Flags](https://railsdesigner.com/rails-icons/flags/) (540+ icons)
-- [Heroicons](https://railsdesigner.com/rails-icons/heroicons/) (300+ icons)
-- [Linear](https://railsdesigner.com/rails-icons/linear/) (170+ icons)
-- [Lucide](https://railsdesigner.com/rails-icons/lucide/) (1500+ icons)
-- [Phosphor](https://railsdesigner.com/rails-icons/phosphor/) (9000+ icons)
-- [Radix](https://railsdesigner.com/rails-icons/radix/) (300+ icons)
-- [SidekickIcons](https://railsdesigner.com/rails-icons/sidekickicons/) (49 icons, complementing [Heroicons](https://railsdesigner.com/rails-icons/heroicons/))
-- [Tabler](https://railsdesigner.com/rails-icons/tabler/) (5700+ icons)
-- [Weather](https://railsdesigner.com/rails-icons/weather/) (215+ icons)
+- [Boxicons](https://railsdesigner.com/open-source/rails-icons/boxicons/) (1600+ icons)
+- [Feather](https://railsdesigner.com/open-source/rails-icons/feather/) (280+ icons)
+- [Flags](https://railsdesigner.com/open-source/rails-icons/flags/) (540+ icons)
+- [Heroicons](https://railsdesigner.com/open-source/rails-icons/heroicons/) (300+ icons)
+- [Linear](https://railsdesigner.com/open-source/rails-icons/linear/) (170+ icons)
+- [Lucide](https://railsdesigner.com/open-source/rails-icons/lucide/) (1500+ icons)
+- [Phosphor](https://railsdesigner.com/open-source/rails-icons/phosphor/) (9000+ icons)
+- [Radix](https://railsdesigner.com/open-source/rails-icons/radix/) (300+ icons)
+- [SidekickIcons](https://railsdesigner.com/open-source/rails-icons/sidekickicons/) (49 icons, complementing [Heroicons](https://railsdesigner.com/open-source/rails-icons/heroicons/))
+- [Tabler](https://railsdesigner.com/open-source/rails-icons/tabler/) (5700+ icons)
+- [Weather](https://railsdesigner.com/open-source/rails-icons/weather/) (215+ icons)
 
 
 ## Animated icons

data/lib/generators/rails_icons/initializer_generator.rb

@@ -75,7 +75,7 @@ module RailsIcons
     def create_custom_directory = FileUtils.mkdir_p(File.join(options[:destination], options[:custom]))
 
     def library_configuration
-      libraries.map { RailsIcons.libraries[_1.to_sym].initializer_config }.join("\n")
+      libraries.map { |library| RailsIcons.libraries[library.to_sym].initializer_config }.join("\n")
     end
 
     def custom_configuration
@@ -92,7 +92,7 @@ module RailsIcons
     def default_configuration_exists?
       line = /^\s*config\.default_library\s*=/
 
-      File.readlines(INITIALIZER).any? { _1.match?(line) }
+      File.readlines(INITIALIZER).any? { |file_line| file_line.match?(line) }
     end
 
     def libraries

data/lib/generators/rails_icons/sync_generator.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "rails_icons/base_generator"
-require "rails_icons/sync/engine"
 
 module RailsIcons
   class SyncGenerator < RailsIcons::BaseGenerator
@@ -12,7 +11,9 @@ module RailsIcons
     class_option :library, type: :string, desc: "Choose a library (#{RailsIcons.libraries.keys.join("/")})"
     class_option :libraries, type: :array, default: [], desc: "Choose libraries (#{RailsIcons.libraries.keys.join("/")})"
 
-    def sync_icons = libraries.each { Sync::Engine.new(_1).sync }
+    def sync_icons
+      libraries.each { |library| Icons::Sync.new(library).now }
+    end
 
     private
 

data/lib/rails_icons/base_generator.rb

@@ -15,8 +15,8 @@ module RailsIcons
     def validate!
       return if custom_library?
 
-      raise RailsIcons::LibraryNotFound.new("") if libraries.empty?
-      raise RailsIcons::LibraryNotFound.new(invalid_libraries.join(", ")) if invalid_libraries.any?
+      raise Icons::LibraryNotFound.new("") if libraries.empty?
+      raise Icons::LibraryNotFound.new(invalid_libraries.join(", ")) if invalid_libraries.any?
     end
 
     def validatable? = false
@@ -25,9 +25,13 @@ module RailsIcons
       [*options.libraries, options.library].compact_blank
     end
 
-    def invalid_libraries = libraries.map(&:to_sym).map(&:downcase).reject { RailsIcons.libraries.key?(_1) }
+    def invalid_libraries
+      libraries.map(&:to_sym).map(&:downcase).reject { |library| RailsIcons.libraries.key?(library) }
+    end
 
-    def custom_library? = options.custom.present?
+    def custom_library?
+      options.custom.present?
+    end
 
     # Uses `gsub_file` as a read-only operation to check file content. This
     # approach is preferred over `File.read` because `gsub_file` is properly stubbed

data/lib/rails_icons/engine.rb

@@ -6,6 +6,12 @@ module RailsIcons
   class Engine < ::Rails::Engine
     isolate_namespace RailsIcons
 
+    initializer "rails_icons.configure_icons_gem", before: :load_config_initializers do
+      Icons.configure do |config|
+        config.base_path = Rails.root
+      end
+    end
+
     initializer "rails_icons.helpers" do
       ActiveSupport.on_load(:action_view) do
         include RailsIcons::Helpers::IconHelper

data/lib/rails_icons/helpers/icon_helper.rb

@@ -4,16 +4,16 @@ module RailsIcons
   module Helpers
     module IconHelper
       def icon(name, library: RailsIcons.configuration.default_library, from: library, variant: nil, **arguments)
-        RailsIcons::Icon.new(
+        Icons::Icon.new(
           name: name,
           library: from || library,
           variant: variant,
           arguments: arguments
-        ).svg
+        ).svg.html_safe
       end
 
       def encoded_icon(name, library: RailsIcons.configuration.default_library, from: library, variant: nil, **arguments)
-        svg_content = RailsIcons::Icon.new(
+        svg_content = Icons::Icon.new(
           name: name,
           library: from || library,
           variant: variant,

data/lib/rails_icons/version.rb

@@ -1,3 +1,3 @@
 module RailsIcons
-  VERSION = "1.6.1"
+  VERSION = "1.7.0"
 end

data/lib/rails_icons.rb

@@ -1,11 +1,17 @@
 # frozen_string_literal: true
 
+require "icons"
+
 require_relative "rails_icons/version"
-require_relative "rails_icons/libraries"
-require_relative "rails_icons/configuration"
 require_relative "rails_icons/engine"
-require_relative "rails_icons/errors"
-require_relative "rails_icons/icon"
 
 module RailsIcons
+  class << self
+    def configure(&block) = Icons.configure(&block)
+
+    def configuration = Icons.configuration
+    alias_method :config, :configuration
+
+    def libraries = Icons.libraries
+  end
 end

data/lib/ruby_lsp/rails_icons/addon.rb

@@ -0,0 +1,128 @@
+# frozen_string_literal: true
+
+require "ruby_lsp/addon"
+
+module RubyLsp
+  module RailsIcons
+    class Addon < ::RubyLsp::Addon
+      def activate(global_state, message_queue)
+        @workspace_path = global_state.workspace_path
+        @icons = index_icons
+      end
+
+      def deactivate
+      end
+
+      def name = "Rails Icons"
+
+      def version = ::RailsIcons::VERSION
+
+      def create_completion_listener(response_builder, node_context, dispatcher, uri)
+        node = node_context.node
+
+        return unless node.is_a?(Prism::CallNode) && node.name == :icon
+
+        Completion.new(response_builder, node, @icons, dispatcher)
+      end
+
+      private
+
+      def configuration
+        ::RailsIcons.configuration
+      rescue
+        nil
+      end
+
+      def default_library
+        configuration&.default_library&.to_s
+      end
+
+      def icons_path
+        File.join(@workspace_path, configuration&.icons_path || "app/assets/svg/icons")
+      end
+
+      def library_path
+        default_library ? File.join(icons_path, default_library) : icons_path
+      end
+
+      def index_icons
+        Dir.glob("#{library_path}/**/*.svg").map { |path| File.basename(path, ".svg") }.uniq.sort
+      end
+    end
+
+    class Completion
+      include ::RubyLsp::Requests::Support::Common
+
+      def initialize(response_builder, node, icons, dispatcher)
+        @response_builder = response_builder
+        @node = node
+        @icons = icons
+
+        dispatcher.register(self, :on_call_node_enter)
+      end
+
+      def on_call_node_enter(node)
+        return unless node.name == :icon
+
+        prefix = extract_prefix(node)
+
+        @icons.each do |icon|
+          next unless icon.start_with?(prefix)
+
+          @response_builder << Interface::CompletionItem.new(
+            label: icon,
+            kind: Constant::CompletionItemKind::VALUE,
+            text_edit: Interface::TextEdit.new(
+              range: first_argument_range(node),
+              new_text: icon
+            )
+          )
+        end
+      end
+
+      private
+
+      def extract_prefix(node)
+        first_argument = node.arguments&.arguments&.first
+
+        return "" unless first_argument.is_a?(Prism::StringNode)
+
+        first_argument.content
+      end
+
+      def first_argument_range(node)
+        first_argument = node.arguments&.arguments&.first
+
+        return zero_width_range(node.location) unless first_argument.is_a?(Prism::StringNode)
+
+        content_location = first_argument.content_loc
+
+        Interface::Range.new(
+          start: Interface::Position.new(
+            line: content_location.start_line - 1,
+            character: content_location.start_column
+          ),
+
+          end: Interface::Position.new(
+            line: content_location.end_line - 1,
+            character: content_location.end_column
+          )
+        )
+      end
+
+      def zero_width_range(location)
+        Interface::Range.new(
+          start: Interface::Position.new(
+            line: location.end_line - 1,
+            character: location.end_column
+          ),
+
+          end: Interface::Position.new(
+            line: location.end_line - 1,
+            character: location.end_column
+          )
+        )
+      end
+    end
+  end
+end

data/rails_icons.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
 
   spec.files = Dir["{bin,app,config,db,lib,public}/**/*", "Rakefile", "README.md", "rails_icons.gemspec", "Gemfile", "Gemfile.lock"]
 
-  # spec.required_ruby_version = ">= 3.1.0"
   spec.add_dependency "rails", ">= 7.0"
-  spec.add_runtime_dependency "nokogiri", "~> 1.16", ">= 1.16.4"
+  spec.add_dependency "icons", "~> 0.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_icons
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Rails Designer Developers
@@ -24,25 +24,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '7.0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: icons
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.16.4
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.16.4
+        version: 0.8.0
 description: Add any icon library to a Rails app, from Heroicons, to Lucide to Tabler
   (and others). Rails Icons is library-agnostic, so you can add any library while
   using the same interface.
@@ -70,30 +64,10 @@ files:
 - lib/generators/rails_icons/templates/initializer.rb.tt
 - lib/rails_icons.rb
 - lib/rails_icons/base_generator.rb
-- lib/rails_icons/configuration.rb
-- lib/rails_icons/configuration/animated.rb
-- lib/rails_icons/configuration/boxicons.rb
-- lib/rails_icons/configuration/feather.rb
-- lib/rails_icons/configuration/flags.rb
-- lib/rails_icons/configuration/heroicons.rb
-- lib/rails_icons/configuration/linear.rb
-- lib/rails_icons/configuration/lucide.rb
-- lib/rails_icons/configuration/phosphor.rb
-- lib/rails_icons/configuration/radix.rb
-- lib/rails_icons/configuration/sidekickicons.rb
-- lib/rails_icons/configuration/tabler.rb
-- lib/rails_icons/configuration/weather.rb
 - lib/rails_icons/engine.rb
-- lib/rails_icons/errors.rb
 - lib/rails_icons/helpers/icon_helper.rb
-- lib/rails_icons/icon.rb
-- lib/rails_icons/icon/attributes.rb
-- lib/rails_icons/icon/file_path.rb
-- lib/rails_icons/libraries.rb
-- lib/rails_icons/sync/engine.rb
-- lib/rails_icons/sync/process_variants.rb
-- lib/rails_icons/sync/transformations.rb
 - lib/rails_icons/version.rb
+- lib/ruby_lsp/rails_icons/addon.rb
 - rails_icons.gemspec
 homepage: https://railsdesigner.com/rails-icons/
 licenses:
@@ -115,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.4
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Add any icon library to a Rails app
 test_files: []

data/lib/rails_icons/configuration/animated.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module RailsIcons
-  class Configuration
-    module Animated
-      extend self
-
-      def config
-        ActiveSupport::OrderedOptions.new.tap do |options|
-          options.default = default_options
-        end
-      end
-
-      private
-
-      def default_options
-        ActiveSupport::OrderedOptions.new.tap do |options|
-          options.css = "size-6"
-          options.data = {}
-        end
-      end
-    end
-  end
-end

data/lib/rails_icons/configuration/boxicons.rb

@@ -1,78 +0,0 @@
-# frozen_string_literal: true
-
-module RailsIcons
-  class Configuration
-    module Boxicons
-      extend self
-
-      def config
-        ActiveSupport::OrderedOptions.new.tap do |options|
-          options.default_variant = :regular
-          options.exclude_variants = []
-
-          setup_regular_config(options)
-          setup_solid_config(options)
-          setup_logos_config(options)
-        end
-      end
-
-      def initializer_config
-        <<~RB.indent(2)
-          # Override Boxicons defaults
-          # config.libraries.boxicons.default_variant = "" # Set a default variant for Boxicons
-          # config.libraries.boxicons.exclude_variants = [] # Exclude specific variants
-
-          # config.libraries.boxicons.solid.css = "size-6"
-          # config.libraries.boxicons.solid.data = {}
-
-          # config.libraries.boxicons.regular.css = "size-6"
-          # config.libraries.boxicons.regular.data = {}
-
-          # config.libraries.boxicons.logos.css = "size-6"
-          # config.libraries.boxicons.logos.data = {}
-        RB
-      end
-
-      def source
-        {
-          url: "https://github.com/atisawd/boxicons.git",
-          variants: {
-            logos: "svg/logos",
-            regular: "svg/regular",
-            solid: "svg/solid"
-          }
-        }
-      end
-
-      def transformations
-        {
-          filenames: {
-            delete_prefix: ["bxl-", "bx-", "bxs-"]
-          }
-        }
-      end
-
-      def setup_regular_config(options)
-        options.regular = ActiveSupport::OrderedOptions.new
-        options.regular.default = default_options
-      end
-
-      def setup_solid_config(options)
-        options.solid = ActiveSupport::OrderedOptions.new
-        options.solid.default = default_options
-      end
-
-      def setup_logos_config(options)
-        options.logos = ActiveSupport::OrderedOptions.new
-        options.logos.default = default_options
-      end
-
-      def default_options
-        ActiveSupport::OrderedOptions.new.tap do |options|
-          options.css = "size-6"
-          options.data = {}
-        end
-      end
-    end
-  end
-end

data/lib/rails_icons/configuration/feather.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-module RailsIcons
-  class Configuration
-    module Feather
-      extend self
-
-      def config
-        ActiveSupport::OrderedOptions.new.tap do |options|
-          options.default_variant = nil
-          options.exclude_variants = []
-
-          options.default = default_options
-        end
-      end
-
-      def initializer_config
-        <<~RB.indent(2)
-          # Override Feather defaults
-          # config.libraries.feather.default_variant = "" # Feather has no variants, this is provided for backwards compatibility
-          # config.libraries.feather.exclude_variants = [] # Feather has no variants, this is provided for backwards compatibility
-
-          # config.libraries.feather.default.css = "size-6"
-          # config.libraries.feather.default.stroke_width = "2"
-          # config.libraries.feather.default.data = {}
-        RB
-      end
-
-      def source
-        {
-          url: "https://github.com/feathericons/feather.git",
-          variants: {
-            ".": "icons" # Feather has no variants, store in the top directory
-          }
-        }
-      end
-
-      private
-
-      def default_options
-        ActiveSupport::OrderedOptions.new.tap do |options|
-          options.stroke_width = "2"
-          options.css = "size-6"
-          options.data = {}
-        end
-      end
-    end
-  end
-end

data/lib/rails_icons/configuration/flags.rb

@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-module RailsIcons
-  class Configuration
-    module Flags
-      extend self
-
-      def config
-        ActiveSupport::OrderedOptions.new.tap do |options|
-          options.default_variant = "landscape"
-          options.exclude_variants = []
-
-          setup_square_config(options)
-          setup_landscape_config(options)
-        end
-      end
-
-      def initializer_config
-        <<~RB.indent(2)
-          # Override Flags defaults
-          # config.libraries.flags.default_variant = "" # Set a default variant for Flags
-          # config.libraries.flags.exclude_variants = [:square, :landscape]
-
-          # config.libraries.flags.square.default.css = "size-6"
-          # config.libraries.flags.square.default.data = {}
-
-          # config.libraries.flags.landscape.default.css = "size-6"
-          # config.libraries.flags.landscape.default.data = {}
-        RB
-      end
-
-      def source
-        {
-          url: "https://github.com/lipis/flag-icons.git",
-          variants: {
-            square: "flags/1x1",
-            landscape: "flags/4x3"
-          }
-        }
-      end
-
-      private
-
-      def setup_square_config(options)
-        options.square = ActiveSupport::OrderedOptions.new
-        options.square.default = default_square_options
-      end
-
-      def setup_landscape_config(options)
-        options.landscape = ActiveSupport::OrderedOptions.new
-        options.landscape.default = default_landscape_options
-      end
-
-      def default_square_options
-        ActiveSupport::OrderedOptions.new.tap do |options|
-          options.css = "size-6"
-          options.data = {}
-        end
-      end
-
-      def default_landscape_options
-        ActiveSupport::OrderedOptions.new.tap do |options|
-          options.css = "size-6"
-          options.data = {}
-        end
-      end
-    end
-  end
-end