More tests, fix bugs, make config not blow up if not initialized

Gemfile

@@ -6,6 +6,7 @@ source "https://rubygems.org"
 gemspec
 
 group :development, :test do
+  gem "pry"
   gem "standard"
   gem "standard-rails"
   gem "standard-performance"

Gemfile.lock

@@ -26,6 +26,7 @@ GEM
       thor (>= 0.14.0)
     ast (2.4.2)
     builder (3.2.4)
+    coderay (1.1.3)
     concurrent-ruby (1.2.3)
     crass (1.0.6)
     erubi (1.12.0)
@@ -37,6 +38,7 @@ GEM
     loofah (2.21.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
+    method_source (1.0.0)
     minitest (5.22.2)
     nokogiri (1.16.2-aarch64-linux)
       racc (~> 1.4)
@@ -54,6 +56,9 @@ GEM
     parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     racc (1.7.3)
     rack (3.0.9.1)
     rails-dom-testing (2.2.0)
@@ -122,6 +127,7 @@ DEPENDENCIES
   appraisal
   heroic_icons!
   minitest (>= 5.16)
+  pry
   standard
   standard-performance
   standard-rails

heroic_icons.gemspec

@@ -35,4 +35,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "minitest", ">= 5.16"
   spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "pry"
 end

lib/heroic_icons/config.rb

@@ -1,11 +1,14 @@
+# lib/heroic_icons/config.rb
+
 module HeroicIcons
   class << self
-    attr_accessor :configuration
-  end
+    def configuration
+      @configuration ||= Configuration.new
+    end
 
-  def self.configure
-    self.configuration ||= Configuration.new
-    yield(configuration)
+    def configure
+      yield(configuration)
+    end
   end
 
   class Configuration

lib/heroic_icons/heroic_icons.rb

@@ -8,10 +8,12 @@ class Icons
     # Updated method signature to accept name and a hash for additional options
     def icon(name, **options)
       # append or replace?  hmmm.
-      if options[:override_class].present? || options[:class].blank?
-        options[:class] = HeroicIcons.configuration.default_classes
+      if options[:override_class].present? 
+        options[:class] = options.delete(:override_class)
       elsif options[:class].present?
         options[:class] = "#{HeroicIcons.configuration.default_classes} #{options[:class]}"
+      else
+        options[:class] = HeroicIcons.configuration.default_classes
       end
       file_path = determine_file_path(name, options)
 

test/test_helper.rb

@@ -2,5 +2,6 @@
 
 $LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 require "heroic_icons"
+require "pry"
 
 require "minitest/autorun"

test/test_heroic_icons.rb

@@ -7,6 +7,25 @@ def test_that_it_has_a_version_number
     refute_nil ::HeroicIcons::VERSION
   end
 
+  def test_icon_with_default_classes
+    HeroicIcons.configure do |config|
+      config.default_classes = "default-class"
+    end
+
+    rendered_icon = HeroicIcons::Icons.new.icon("plus")
+    assert_includes rendered_icon, "default-class"
+  end
+
+  def test_icon_with_default_class_override
+    HeroicIcons.configure do |config|
+      config.default_classes = "default-class"
+    end
+
+    rendered_icon = HeroicIcons::Icons.new.icon("plus", override_class: "override-class")
+    refute_includes rendered_icon, "default-class"
+    assert_includes rendered_icon, "override-class"
+  end
+
   def test_icon_not_found
     assert_raises(HeroicIcons::IconNotFound) do
       HeroicIcons::Icons.new.icon("nonexistent")