svgeez 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a34b3e2f43c0d78cd9f77457795fc021a5576acec7209a235d5d150990917da
-  data.tar.gz: f26e9b0c2b70381cd939cda274240454b69fb575f004e853b9afc8e08c5dd237
+  metadata.gz: 51f2b828f3bd9b6247ac823ba7cf5c2f85175ea21245da946bdf272ef8bfb643
+  data.tar.gz: 97badde987dd8ed3e646a3cfa666c0ed43f637bb9393f6cd7347866bb89aafb0
 SHA512:
-  metadata.gz: e059e288c8d7a92dbeb8a2f5c099004519c2cab971cfaf6d9f33f749aeda842b03cb60fce87f05c7f65370b42f24d611dfd63f73ab819a647e4bd58441f7fa4a
-  data.tar.gz: 0fceee63b7a84300a7485a02e898909ba3e15540cecc445a095858a34da003489a24704e64ba6ab36beb9a3dff4c69a17cd83035b94a8c65943e5a6d7e976c0a
+  metadata.gz: eb5ab0a9a2ea91fcff2bf9c907769413ea4e180e5be9eea735a8d1f8113cd08645b63c082d151522e94a0c425fef3e64cd0e3494118797ec50db1c3f4fe98042
+  data.tar.gz: 8f486f1289987246c90733b15ec7913c62f7bd6a73b31efa765f4f6c1766836cd3cbe9ca3e8b8e1e72c4b20366b23faf753c109b3e0d7752d92aac8622910bb3

data/.reek.yml

@@ -0,0 +1,16 @@
+detectors:
+  DuplicateMethodCall:
+    max_calls: 2
+  IrresponsibleModule:
+    enabled: false
+  TooManyStatements:
+    exclude:
+      - Svgeez::Builder#build
+      - Svgeez::Builder#initialize
+      - Svgeez::Commands::Watch#process
+  UtilityFunction:
+    exclude:
+      - Svgeez::Elements::SymbolElement#element_contents
+
+exclude_paths:
+  - vendor/

data/.rubocop.yml

@@ -1,18 +1,21 @@
 require:
+  - rubocop-performance
   - rubocop-rspec
 
+Layout/AlignHash:
+  Exclude:
+    - svgeez.gemspec
+
 Metrics/BlockLength:
   Exclude:
-    - "spec/**/*"
+    - spec/**/*
+    - svgeez.gemspec
 
 Metrics/LineLength:
   Enabled: false
 
-RSpec/AnyInstance:
-  Enabled: false
-
-RSpec/MessageSpies:
-  EnforcedStyle: receive
+Naming/RescuedExceptionsVariableName:
+  PreferredName: exception
 
 RSpec/MultipleExpectations:
   Max: 2
@@ -22,3 +25,6 @@ Style/Documentation:
 
 Style/FrozenStringLiteralComment:
   Enabled: false
+
+Style/SymbolArray:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.4.5
+2.4.6

data/.travis.yml

@@ -1,21 +1,19 @@
 language: ruby
 rvm:
-  - 2.4.5
-  - 2.5.3
-  - 2.6.0
+  - 2.4.6
+  - 2.5.5
+  - 2.6.2
 cache:
   - bundler
 before_install:
-  - gem install bundler -v '~> 1.17'
+  - gem update --system
+  - gem install bundler
   - nvm install node
   - npm install -g svgo
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter
   - ./cc-test-reporter before-build
-script:
-  - bundle exec rubocop
-  - bundle exec rake
 after_script:
   - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 notifications:

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 3.0.0 / 2019-08-02
+
+### Breaking Changes
+
+- Bump required minimum SVGO version to 1.3.0 ([afa24c6](https://github.com/jgarber623/svgeez/commit/afa24c6)).
+
+### Additional Enhancements
+
+- Refactor command classes ([02f420c](https://github.com/jgarber623/svgeez/commit/02f420c)).
+- Refactor specs ([995f950](https://github.com/jgarber623/svgeez/commit/)).
+- Update development dependencies.
+
 ## 2.0.1 / 2019-01-03
 
 - Expand supported Ruby versions to include 2.6 ([0facfd0](https://github.com/jgarber623/svgeez/commit/0facfd0)).
@@ -8,7 +20,7 @@
 
 - Refactor classes to use `attr_reader`s ([c62780f](https://github.com/jgarber623/svgeez/commit/c62780f))
 - Change required Ruby versions and liberalize dependency constraints ([35fcadb](https://github.com/jgarber623/svgeez/commit/35fcadb))
-- Change project Ruby version to 2.4.5 ([301d341](https://github.com/jgarber623/svgeez/commit/301d341))
+- Change project Ruby version to 2.4.6 ([301d341](https://github.com/jgarber623/svgeez/commit/301d341))
 - Bump required SVGO version to 1.1.1 ([28741fc](https://github.com/jgarber623/svgeez/commit/28741fc))
 
 ## Previous Releases

data/CONTRIBUTING.md

@@ -8,9 +8,9 @@ There are a couple ways you can help improve svgeez:
 
 ## Getting Started
 
-svgeez is developed using Ruby 2.4.5 and is additionally tested against Ruby 2.5.3 and 2.6.0 using [Travis CI](https://travis-ci.org/jgarber623/svgeez).
+svgeez is developed using Ruby 2.4.6 and is additionally tested against Ruby 2.5.5 and 2.6.2 using [Travis CI](https://travis-ci.org/jgarber623/svgeez).
 
-Before making changes to svgeez, you'll want to install Ruby 2.4.5. It's recommended that you use a Ruby version managment tool like [rbenv](https://github.com/rbenv/rbenv), [chruby](https://github.com/postmodern/chruby), or [rvm](https://github.com/rvm/rvm). Once you've installed Ruby 2.4.5 using your method of choice, install the project's gems by running:
+Before making changes to svgeez, you'll want to install Ruby 2.4.6. It's recommended that you use a Ruby version managment tool like [rbenv](https://github.com/rbenv/rbenv), [chruby](https://github.com/postmodern/chruby), or [rvm](https://github.com/rvm/rvm). Once you've installed Ruby 2.4.6 using your method of choice, install the project's gems by running:
 
 ```sh
 bundle install

data/README.md

@@ -21,7 +21,7 @@ _For more on why SVG sprites are the bee's knees as far as icon systems go, give
 
 ## Getting Started
 
-Before installing and using svgeez, you'll want to have Ruby 2.4 (or newer) installed on your computer. There are plenty of ways to go about this, but my preference is [rbenv](https://github.com/sstephenson/rbenv). svgeez is developed using Ruby 2.4.5 and is additionally tested against Ruby 2.5.3 and 2.6.0 using [Travis CI](https://travis-ci.org/jgarber623/svgeez).
+Before installing and using svgeez, you'll want to have Ruby 2.4 (or newer) installed on your computer. There are plenty of ways to go about this, but my preference is [rbenv](https://github.com/sstephenson/rbenv). svgeez is developed using Ruby 2.4.6 and is additionally tested against Ruby 2.5.5 and 2.6.2 using [Travis CI](https://travis-ci.org/jgarber623/svgeez).
 
 ## Installation
 
@@ -30,19 +30,19 @@ If you're using [Bundler](http://bundler.io), add svgeez to your project's Gemfi
 ```rb
 source 'https://rubygems.org'
 
-gem 'svgeez', '~> 2.0'
+gem 'svgeez', '~> 3.0'
 ```
 
 …and hop over to your command prompt and run…
 
 ```sh
-$ bundle install
+bundle install
 ```
 
 You may also install svgeez directly by issuing the following command:
 
 ```sh
-$ gem install svgeez
+gem install svgeez
 ```
 
 ## Usage
@@ -56,18 +56,18 @@ You can manually generate an SVG sprite from a folder of SVGs with the `build` c
 A basic example:
 
 ```sh
-$ svgeez build --source ~/Sites/sixtwothree.org/images/icons --destination ~/Sites/sixtwothree.org/images/icons.svg
+svgeez build --source ~/Sites/sixtwothree.org/images/icons --destination ~/Sites/sixtwothree.org/images/icons.svg
 ```
 
 The above example will combine all SVG files in `~/Sites/sixtwothree.org/images/icons` into a single SVG sprite file (`icons.svg`) in `~/Sites/sixtwothree.org/images`.
 
 #### Options and Defaults
 
-|Option|Description|
-|---|---|
-|`-s`<br>`--source`|Path to the folder of source SVGs (defaults to `./_svgeez`).|
-|`-d`<br>`--destination`|Path to the destination file or folder (defaults to `./svgeez.svg`)|
-|`--with-svgo`|Optimize SVG sprite file with [SVGO](https://github.com/svg/svgo)|
+| Option                | Description                                                       |
+|:----------------------|:------------------------------------------------------------------|
+| `-s`, `--source`      | Path to folder of source SVGs (defaults to `./_svgeez`).          |
+| `-d`, `--destination` | Path to destination file or folder (defaults to `./svgeez.svg`)   |
+| `--with-svgo`         | Optimize SVG sprite file with [SVGO](https://github.com/svg/svgo) |
 
 ### The `watch` command
 
@@ -76,7 +76,7 @@ The `watch` command takes the same arguments as the `build` command but uses the
 Tweaking the example from above:
 
 ```sh
-$ svgeez watch --source ~/Sites/sixtwothree.org/images/icons --destination ~/Sites/sixtwothree.org/images/icons.svg
+svgeez watch --source ~/Sites/sixtwothree.org/images/icons --destination ~/Sites/sixtwothree.org/images/icons.svg
 ```
 
 svgeez will remaing running, watching for new, removed, or updated SVG files in the provided source folder. As SVG files are added, deleted, or modified in the source folder, svgeez will pump out updated SVG sprite files to the destination folder.
@@ -92,7 +92,7 @@ The first section of Jayden Seric's post, [How to optimize SVG](http://jaydenser
 If you have the excellent [SVGO](https://github.com/svg/svgo) utility installed on your system (and the `svgo` command is available in your `PATH`), you can use the `--with-svgo` option and optimize the generated sprite file.
 
 ```sh
-$ svgeez build --source ~/Sites/sixtwothree.org/images/icons --destination ~/Sites/sixtwothree.org/images/icons.svg --with-svgo
+svgeez build --source ~/Sites/sixtwothree.org/images/icons --destination ~/Sites/sixtwothree.org/images/icons.svg --with-svgo
 ```
 
 Depending on the number of individual SVG files in the source folder, using the `--with-svgo` option can add considerable time to SVG sprite generation.

data/Rakefile

@@ -1,6 +1,18 @@
 require 'bundler/gem_tasks'
+
+require 'reek/rake/task'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
+
+Reek::Rake::Task.new do |task|
+  task.fail_on_error = false
+  task.source_files  = FileList['**/*.rb'].exclude('vendor/**/*.rb')
+end
 
 RSpec::Core::RakeTask.new
 
-task default: :spec
+RuboCop::RakeTask.new do |task|
+  task.fail_on_error = false
+end
+
+task default: [:rubocop, :reek, :spec]

data/lib/svgeez.rb

@@ -1,22 +1,24 @@
 require 'fileutils'
-require 'listen'
 require 'logger'
-require 'mercenary'
 require 'mkmf'
 require 'securerandom'
 
+require 'listen'
+require 'mercenary'
+
 require 'svgeez/version'
 
 require 'svgeez/command'
 require 'svgeez/commands/build'
 require 'svgeez/commands/watch'
 
+require 'svgeez/elements/svg_element'
+require 'svgeez/elements/symbol_element'
+
 require 'svgeez/builder'
 require 'svgeez/destination'
 require 'svgeez/optimizer'
 require 'svgeez/source'
-require 'svgeez/svg_element'
-require 'svgeez/symbol_element'
 
 module Svgeez
   def self.logger

data/lib/svgeez/builder.rb

@@ -1,6 +1,7 @@
 module Svgeez
   class Builder
     SOURCE_IS_DESTINATION_MESSAGE = "Setting `source` and `destination` to the same path isn't allowed!".freeze
+    SOURCE_DOES_NOT_EXIST = 'Provided `source` folder does not exist.'.freeze
     NO_SVGS_IN_SOURCE_MESSAGE = 'No SVGs were found in `source` folder.'.freeze
 
     attr_reader :source, :destination
@@ -9,36 +10,59 @@ module Svgeez
       @source = Source.new(options)
       @destination = Destination.new(options)
       @svgo = options.fetch('svgo', false)
+
+      raise SOURCE_IS_DESTINATION_MESSAGE if source_is_destination?
+      raise SOURCE_DOES_NOT_EXIST unless source_exists?
+    rescue RuntimeError => exception
+      logger.error exception.message
+      exit
     end
 
     # rubocop:disable Metrics/AbcSize
     def build
-      return Svgeez.logger.error(SOURCE_IS_DESTINATION_MESSAGE) if source_is_destination?
-      return Svgeez.logger.warn(NO_SVGS_IN_SOURCE_MESSAGE) if source_is_empty?
+      raise NO_SVGS_IN_SOURCE_MESSAGE if source_is_empty?
 
-      Svgeez.logger.info "Generating sprite at `#{destination.file_path}` from #{source.file_paths.length} SVG#{'s' if source.file_paths.length > 1}..."
+      logger.info "Generating sprite at `#{destination_file_path}` from #{source_files_count} SVG#{'s' if source_files_count > 1}..."
 
       # Make destination folder
       FileUtils.mkdir_p(destination.folder_path)
 
       # Write the file
-      File.open(destination.file_path, 'w') do |f|
-        f.write destination_file_contents
+      File.open(destination_file_path, 'w') do |file|
+        file.write destination_file_contents
       end
 
-      Svgeez.logger.info "Successfully generated sprite at `#{destination.file_path}`."
+      logger.info "Successfully generated sprite at `#{destination_file_path}`."
+    rescue RuntimeError => exception
+      logger.warn exception.message
     end
     # rubocop:enable Metrics/AbcSize
 
     private
 
     def destination_file_contents
-      file_contents = SvgElement.new(source, destination).build
+      file_contents = Elements::SvgElement.new(source, destination).build
       file_contents = Optimizer.new.optimize(file_contents) if @svgo
 
       file_contents.insert(4, ' style="display: none;"')
     end
 
+    def destination_file_path
+      @destination_file_path ||= destination.file_path
+    end
+
+    def logger
+      @logger ||= Svgeez.logger
+    end
+
+    def source_exists?
+      File.directory?(source.folder_path)
+    end
+
+    def source_files_count
+      source.file_paths.length
+    end
+
     def source_is_destination?
       /\A#{source.folder_path}/ =~ destination.folder_path
     end

data/lib/svgeez/command.rb

@@ -1,18 +1,38 @@
 module Svgeez
   class Command
-    def self.subclasses
-      @subclasses ||= []
-    end
+    class << self
+      def subclasses
+        @subclasses ||= []
+      end
 
-    def self.inherited(base)
-      subclasses << base
-      super(base)
-    end
+      def inherited(base)
+        subclasses << base
+        super(base)
+      end
+
+      def init_with_program(program)
+        program.command(name.split('::').last.downcase.to_sym) do |command|
+          command.description command_description
+          command.syntax command_syntax
+
+          add_actions(command)
+          add_options(command)
+        end
+      end
+
+      private
+
+      def add_actions(command)
+        command.action do |_, options|
+          command_action(options)
+        end
+      end
 
-    def self.add_build_options(command)
-      command.option 'source', '-s', '--source [FOLDER]', 'Source folder (defaults to ./_svgeez)'
-      command.option 'destination', '-d', '--destination [OUTPUT]', 'Destination file or folder (defaults to ./svgeez.svg)'
-      command.option 'svgo', '--with-svgo', 'Optimize source SVGs with SVGO before sprite generation (non-destructive)'
+      def add_options(command)
+        command.option 'source', '-s', '--source [FOLDER]', 'Source folder (defaults to ./_svgeez)'
+        command.option 'destination', '-d', '--destination [OUTPUT]', 'Destination file or folder (defaults to ./svgeez.svg)'
+        command.option 'svgo', '--with-svgo', 'Optimize source SVGs with SVGO before sprite generation (non-destructive)'
+      end
     end
   end
 end

data/lib/svgeez/commands/build.rb

@@ -1,21 +1,24 @@
 module Svgeez
   module Commands
     class Build < Command
-      def self.init_with_program(program)
-        program.command(:build) do |command|
-          command.description 'Builds an SVG sprite from a folder of SVG icons'
-          command.syntax 'build [options]'
+      class << self
+        def process(options)
+          Svgeez::Builder.new(options).build
+        end
 
-          add_build_options(command)
+        private
 
-          command.action do |_, options|
-            Build.process(options)
-          end
+        def command_action(options)
+          Build.process(options)
         end
-      end
 
-      def self.process(options)
-        Svgeez::Builder.new(options).build
+        def command_description
+          'Builds an SVG sprite from a folder of SVG icons'
+        end
+
+        def command_syntax
+          'build [options]'
+        end
       end
     end
   end

data/lib/svgeez/commands/watch.rb

@@ -1,33 +1,33 @@
 module Svgeez
   module Commands
     class Watch < Command
-      def self.init_with_program(program)
-        program.command(:watch) do |command|
-          command.description 'Watches a folder of SVG icons for changes'
-          command.syntax 'watch [options]'
+      class << self
+        def process(options)
+          builder = Svgeez::Builder.new(options)
+          folder_path = builder.source.folder_path
 
-          add_build_options(command)
+          Svgeez.logger.info "Watching `#{folder_path}` for changes... Press ctrl-c to stop."
 
-          command.action do |_, options|
-            Build.process(options)
-            Watch.process(options)
-          end
+          Listen.to(folder_path, only: /\.svg\z/) { builder.build }.start
+          sleep
+        rescue Interrupt
+          Svgeez.logger.info 'Quitting svgeez...'
         end
-      end
 
-      def self.process(options)
-        builder = Svgeez::Builder.new(options)
+        private
 
-        listener = Listen.to(builder.source.folder_path, only: /\.svg\z/) do
-          builder.build
+        def command_action(options)
+          Build.process(options)
+          Watch.process(options)
         end
 
-        Svgeez.logger.info "Watching `#{builder.source.folder_path}` for changes... Press ctrl-c to stop."
+        def command_description
+          'Watches a folder of SVG icons for changes'
+        end
 
-        listener.start
-        sleep
-      rescue Interrupt
-        Svgeez.logger.info 'Quitting svgeez...'
+        def command_syntax
+          'watch [options]'
+        end
       end
     end
   end

data/lib/svgeez/elements/svg_element.rb

@@ -0,0 +1,22 @@
+module Svgeez
+  module Elements
+    class SvgElement
+      def initialize(source, destination)
+        @source = source
+        @destination = destination
+      end
+
+      def build
+        %(<svg id="#{@destination.file_id}" xmlns="http://www.w3.org/2000/svg">#{symbol_elements.join}</svg>)
+      end
+
+      private
+
+      def symbol_elements
+        @source.file_paths.map do |file_path|
+          SymbolElement.new(file_path, @destination.file_id).build
+        end
+      end
+    end
+  end
+end

data/lib/svgeez/elements/symbol_element.rb

@@ -0,0 +1,35 @@
+module Svgeez
+  module Elements
+    class SymbolElement
+      def initialize(file_path, file_id)
+        @file_path = file_path
+        @file_id = file_id
+      end
+
+      def build
+        IO.read(@file_path).match(%r{^<svg\s*?(?<attributes>.*?)>(?<content>.*?)</svg>}m) do |matches|
+          %(<symbol #{element_attributes(matches[:attributes]).sort.join(' ')}>#{element_contents(matches[:content])}</symbol>)
+        end
+      end
+
+      private
+
+      def element_attributes(attributes)
+        attrs = attributes.scan(/(?:viewBox|xmlns:.+?)=".*?"/m)
+
+        attrs << %(id="#{@file_id}-#{File.basename(@file_path, '.svg').gsub(/['"\s]/, '-')}")
+      end
+
+      def element_contents(content)
+        content.scan(/\sid="(.+?)"/).flatten.each do |value|
+          uuid = SecureRandom.uuid
+
+          content.gsub!(/\s(id|xlink:href)="(#?#{value})"/m, %( \\1="\\2-#{uuid}"))
+          content.gsub!(/\s(clip-path|fill|filter|marker-end|marker-mid|marker-start|mask|stroke)="url\((##{value})\)"/m, %( \\1="url(\\2-#{uuid})"))
+        end
+
+        content
+      end
+    end
+  end
+end

data/lib/svgeez/optimizer.rb

@@ -1,14 +1,16 @@
 module Svgeez
   class Optimizer
-    SVGO_MINIMUM_VERSION = '1.1.1'.freeze
+    SVGO_MINIMUM_VERSION = '1.3.0'.freeze
     SVGO_MINIMUM_VERSION_MESSAGE = "svgeez relies on SVGO #{SVGO_MINIMUM_VERSION} or newer. Continuing with standard sprite generation...".freeze
     SVGO_NOT_INSTALLED = 'Unable to find `svgo` in your PATH. Continuing with standard sprite generation...'.freeze
 
     def optimize(file_contents)
-      return Svgeez.logger.warn(SVGO_NOT_INSTALLED) unless installed?
-      return Svgeez.logger.warn(SVGO_MINIMUM_VERSION_MESSAGE) unless supported?
+      raise SVGO_NOT_INSTALLED unless installed?
+      raise SVGO_MINIMUM_VERSION_MESSAGE unless supported?
 
-      `cat <<EOF | svgo --disable=cleanupIDs --disable=removeViewBox -i - -o -\n#{file_contents}\nEOF`
+      `cat <<EOF | svgo --disable=cleanupIDs --disable=removeHiddenElems --disable=removeViewBox -i - -o -\n#{file_contents}\nEOF`
+    rescue RuntimeError => exception
+      logger.warn exception.message
     end
 
     private
@@ -17,6 +19,10 @@ module Svgeez
       @installed ||= find_executable0('svgo')
     end
 
+    def logger
+      @logger ||= Svgeez.logger
+    end
+
     def supported?
       @supported ||= Gem::Version.new(`svgo -v`.strip) >= Gem::Version.new(SVGO_MINIMUM_VERSION)
     end

data/lib/svgeez/version.rb

@@ -1,3 +1,3 @@
 module Svgeez
-  VERSION = '2.0.1'.freeze
+  VERSION = '3.0.0'.freeze
 end

data/svgeez.gemspec

@@ -22,13 +22,19 @@ Gem::Specification.new do |spec|
   spec.executables   = ['svgeez']
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.17'
+  spec.metadata = {
+    'bug_tracker_uri' => "#{spec.homepage}/issues",
+    'changelog_uri'   => "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md"
+  }
+
   spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'reek', '~> 5.4'
   spec.add_development_dependency 'rspec', '~> 3.8'
-  spec.add_development_dependency 'rubocop', '~> 0.62.0'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.31'
-  spec.add_development_dependency 'simplecov', '~> 0.16.1'
-  spec.add_development_dependency 'simplecov-console', '~> 0.4.2'
+  spec.add_development_dependency 'rubocop', '~> 0.74.0'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.4'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.34'
+  spec.add_development_dependency 'simplecov', '~> 0.17.0'
+  spec.add_development_dependency 'simplecov-console', '~> 0.5.0'
 
   spec.add_runtime_dependency 'listen', '~> 3.1'
   spec.add_runtime_dependency 'mercenary', '~> 0.3.6'

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: svgeez
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Jason Garber
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-03 00:00:00.000000000 Z
+date: 2019-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '5.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '5.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -58,56 +58,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.62.0
+        version: 0.74.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.74.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.62.0
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.31'
+        version: '1.34'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.31'
+        version: '1.34'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: simplecov-console
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +160,7 @@ extra_rdoc_files: []
 files:
 - ".editorconfig"
 - ".gitignore"
+- ".reek.yml"
 - ".rspec"
 - ".rubocop"
 - ".rubocop.yml"
@@ -166,16 +181,18 @@ files:
 - lib/svgeez/commands/build.rb
 - lib/svgeez/commands/watch.rb
 - lib/svgeez/destination.rb
+- lib/svgeez/elements/svg_element.rb
+- lib/svgeez/elements/symbol_element.rb
 - lib/svgeez/optimizer.rb
 - lib/svgeez/source.rb
-- lib/svgeez/svg_element.rb
-- lib/svgeez/symbol_element.rb
 - lib/svgeez/version.rb
 - svgeez.gemspec
 homepage: https://github.com/jgarber623/svgeez
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/jgarber623/svgeez/issues
+  changelog_uri: https://github.com/jgarber623/svgeez/blob/v3.0.0/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -194,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Automatically generate an SVG sprite from a folder of SVG icons.

data/lib/svgeez/svg_element.rb

@@ -1,20 +0,0 @@
-module Svgeez
-  class SvgElement
-    def initialize(source, destination)
-      @source = source
-      @destination = destination
-    end
-
-    def build
-      %(<svg id="#{@destination.file_id}" xmlns="http://www.w3.org/2000/svg">#{symbol_elements.join}</svg>)
-    end
-
-    private
-
-    def symbol_elements
-      @source.file_paths.map do |file_path|
-        SymbolElement.new(file_path, @destination.file_id).build
-      end
-    end
-  end
-end

data/lib/svgeez/symbol_element.rb

@@ -1,33 +0,0 @@
-module Svgeez
-  class SymbolElement
-    def initialize(file_path, file_id)
-      @file_path = file_path
-      @file_id = file_id
-    end
-
-    def build
-      IO.read(@file_path).match(%r{^<svg\s*?(?<attributes>.*?)>(?<content>.*?)</svg>}m) do |matches|
-        %(<symbol #{element_attributes(matches[:attributes]).sort.join(' ')}>#{element_contents(matches[:content])}</symbol>)
-      end
-    end
-
-    private
-
-    def element_attributes(attributes)
-      attrs = attributes.scan(/(?:viewBox|xmlns:.+?)=".*?"/m)
-
-      attrs << %(id="#{@file_id}-#{File.basename(@file_path, '.svg').gsub(/['"\s]/, '-')}")
-    end
-
-    def element_contents(content)
-      content.scan(/\sid="(.+?)"/).flatten.each do |value|
-        uuid = SecureRandom.uuid
-
-        content.gsub!(/\s(id|xlink:href)="(#?#{value})"/m, %( \\1="\\2-#{uuid}"))
-        content.gsub!(/\s(clip-path|fill|filter|marker-end|marker-mid|marker-start|mask|stroke)="url\((##{value})\)"/m, %( \\1="url(\\2-#{uuid})"))
-      end
-
-      content
-    end
-  end
-end