svgr 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d224bf9a5fc726732a3fc41025e5e427b854e64af0e98b885dfa07463b8f3163
-  data.tar.gz: 50ab5833da2e78c564b801297d366807e28bd158029bc311753cf54efde76245
+  metadata.gz: '0005479337446fbe607007a85e09bb6328ab3c1933a21197fa50875229f4cc82'
+  data.tar.gz: 36c5b92d7bc1507d05c5ee4c3ad4fc588f70cdc7ecf4a3d93e17657038542c17
 SHA512:
-  metadata.gz: 90ff675a77946193b6065b75346748f7b12fde67753ef4d516e8cfc152c20a198a04ac9cd54b07cf62f9dc86f1e0e8e3a70d033844d15bceed36884da57697bb
-  data.tar.gz: cda5463648daf778a6e1dc9e2f11bf2b993f3ea96c63fdfbff6c0ea013d0f953fc4a6e1642ee50c491e4cde42a5798c2487d9ff1d3632798552714b0c5156940
+  metadata.gz: 68a6c31b1841c307b0df5742cb254495764b66deb446b774aa83bb9def6f46083e7dfc700751a9e9530736686013b47bd787e987bdff4964388f94e7ae34e13a
+  data.tar.gz: bc660eb66946fd9e33aa8d2e63435a11335852dfcfe4612d2e2c1c2fb6c12c90a28b47792322a4ed9f94439b75cfbeed26ff061c23d5b7b433bf5d80a06ab512

data/bin/svgr

@@ -1,15 +1,50 @@
 #!/usr/bin/env ruby
 
-require_relative '../lib/svgr'
-
-# The first command-line argument will be the subcommand (e.g., "combine")
-subcommand = ARGV.shift
-
-case subcommand
-when 'combine'
-  Svgr::CombineSvgs.start(ARGV)
-else
-  puts "Unknown subcommand: #{subcommand}"
-  puts "Usage: svgr combine <source_directory> <output_file> <rows> <columns> [options]"
-  exit(1)
-end
+require "optparse"
+require_relative "../lib/svgr/arrange/grid"
+require_relative "../lib/svgr/document/resize"
+
+module Svgr
+  def self.start(argv)
+    global_opts = {}
+
+    subcommands = {
+      "arrange:grid" => ->(args) { Svgr::Arrange::Grid.start(args) },
+      "document:resize" => ->(args) { Svgr::Document::Resize.start(args) },
+    }
+
+    opt_parser = OptionParser.new do |opts|
+      opts.banner = "Usage: svgr [options] <subcommand>"
+
+      opts.separator ""
+      opts.separator "Subcommands:"
+      subcommands.each do |name, _|
+        opts.separator "  #{name}"
+      end
+
+      opts.separator ""
+      opts.separator "Global options:"
+
+      opts.on("-h", "--help", "Prints this help") do
+        puts opts
+        exit
+      end
+    end
+
+    opt_parser.order!(argv)
+
+    if argv.empty?
+      puts opt_parser
+      exit(1)
+    end
+
+    subcommand = argv.shift
+    subcommands.fetch(subcommand).call(argv)
+  rescue KeyError
+    puts "Error: Unknown subcommand '#{subcommand}'"
+    puts opt_parser
+    exit(1)
+  end
+end
+
+Svgr.start(ARGV)

data/lib/svgr/arrange/grid.rb

@@ -0,0 +1,153 @@
+# frozen_string_literal: true
+
+require "nokogiri"
+require "optparse"
+
+module Svgr
+  module Arrange
+    class Grid
+      class << self
+        def start(argv)
+          options = {
+            scaling_factor: 1,
+            margin_top: 0,
+            margin_left: 0,
+          }
+
+          opt_parser =
+            OptionParser.new do |opts|
+              opts.banner =
+                "Usage: svgr arrange:grid [options] <file_paths> <rows> <columns>"
+
+              opts.on(
+                "-s",
+                "--scaling-factor FACTOR",
+                Float,
+                "Scaling factor for the SVG elements",
+              ) { |s| options[:scaling_factor] = s }
+
+              opts.on(
+                "-t",
+                "--margin-top MARGIN",
+                Integer,
+                "Top margin between the SVG elements",
+              ) { |t| options[:margin_top] = t }
+
+              opts.on(
+                "-l",
+                "--margin-left MARGIN",
+                Integer,
+                "Left margin between the SVG elements",
+              ) { |l| options[:margin_left] = l }
+
+              opts.on("-h", "--help", "Prints this help") do
+                puts opts
+                exit
+              end
+            end
+          opt_parser.parse!(argv)
+
+          if argv.length < 3
+            puts opt_parser.help
+            exit(1)
+          end
+
+          file_paths, rows, columns = argv.shift(3)
+          rows = rows.to_i
+          columns = columns.to_i
+          svg_files = file_paths.split(",")[0...rows * columns]
+
+          combined_elements =
+            svg_files.flat_map do |file|
+              content = read_svg_file(file)
+              extract_svg_elements(content)
+            end
+
+          combined_svg = create_combined_svg(
+            combined_elements,
+            rows,
+            columns,
+            options[:scaling_factor],
+            margin: { top: options[:margin_top], left: options[:margin_left] },
+          )
+
+          write_svg(combined_svg)
+        end
+
+        def read_svg_file(file)
+          File.read(file)
+        end
+
+        def extract_svg_elements(svg_content)
+          doc = Nokogiri.XML(svg_content)
+          doc.remove_namespaces!
+          top_level_groups = doc.xpath("//svg/g")
+
+          if top_level_groups.empty?
+            # Wrap all child elements of the SVG document in a group
+            svg_element = doc.at_xpath("//svg")
+            new_group = Nokogiri::XML::Node.new("g", doc)
+
+            svg_element.children.each { |child| new_group.add_child(child) }
+
+            svg_element.add_child(new_group)
+            top_level_groups = [new_group]
+          end
+
+          top_level_groups
+        end
+
+        def create_combined_svg(
+          elements,
+          rows,
+          columns,
+          scaling_factor,
+          margin: {}
+        )
+          margin_top = margin.fetch(:top, 0)
+          margin_left = margin.fetch(:left, 0)
+
+          width =
+            columns * 100 * scaling_factor +
+            (columns - 1) * margin_left * scaling_factor
+          height =
+            rows * 100 * scaling_factor + (rows - 1) * margin_top * scaling_factor
+
+          combined_svg =
+            Nokogiri::XML::Builder.new(encoding: "UTF-8") do |xml|
+              xml.svg(
+                xmlns: "http://www.w3.org/2000/svg",
+                width: width,
+                height: height,
+              ) do
+                elements.each_with_index do |element, index|
+                  row = index / columns
+                  col = index % columns
+
+                  # Adjust the 'transform' attribute to position and scale the element in the grid
+                  x =
+                    col * (100 * scaling_factor + margin_left * scaling_factor) +
+                    (width - 100 * scaling_factor) / 2
+                  y = row * (100 * scaling_factor + margin_top * scaling_factor)
+
+                  # Offset by half the size of the element vertically and horizontally
+                  x += 50 * scaling_factor
+                  y += 50 * scaling_factor
+
+                  transform = "translate(#{x}, #{y}) scale(#{scaling_factor})"
+                  element["transform"] = transform
+                  xml.parent << element
+                end
+              end
+            end
+
+          combined_svg.to_xml
+        end
+
+        def write_svg(svg)
+          puts svg
+        end
+      end
+    end
+  end
+end

data/lib/svgr/document/resize.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require "nokogiri"
+require "optparse"
+
+module Svgr
+  module Document
+    class Resize
+      class << self
+        def start(argv)
+          parser = OptionParser.new do |opts|
+            opts.banner = "Usage: svgr document:resize <width> <height>"
+
+            opts.on("-h", "--help", "Prints this help") do
+              puts opts
+              exit
+            end
+          end
+          parser.parse!(argv)
+
+          if argv.size < 2
+            puts parser.help
+            exit(1)
+          end
+
+          width = argv[0].to_f
+          height = argv[1].to_f
+
+          svg_content = $stdin.read
+
+          resized_svg = resize(svg_content, width, height)
+
+          # Write the output
+          output = resized_svg.to_xml
+          puts output
+        end
+
+        def resize(content, width, height)
+          doc = Nokogiri.XML(content)
+          doc.remove_namespaces!
+          svg_element = doc.at_xpath("/svg")
+
+          # Get the original SVG width and height
+          svg_width = svg_element["width"].to_i
+          svg_height = svg_element["height"].to_i
+
+          # Calculate width and height in pixels using a DPI of 96
+          width_px = (width * 96 / 25.4).round
+          height_px = (height * 96 / 25.4).round
+
+          # Calculate the difference between the new width and height and the original width and height
+          width_diff = (width_px - svg_width) / 2
+          height_diff = (height_px - svg_height) / 2
+
+          # Update the width and height attributes of the SVG element
+          svg_element["width"] = width_px
+          svg_element["height"] = height_px
+
+          # Create a new group element to wrap all the existing elements and apply the translation
+          new_group = Nokogiri::XML::Node.new("g", doc)
+          new_group["transform"] = "translate(#{width_diff}, #{height_diff})"
+          svg_element.children.each do |child|
+            new_group.add_child(child)
+          end
+          svg_element.add_child(new_group)
+
+          doc
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,29 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: svgr
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Nassredean Nasseri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-05 00:00:00.000000000 Z
+date: 2023-04-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: rubocop-shopify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1'
 description: A Ruby gem that provides a command-line interface for various SVG utilities
 email:
 executables:
@@ -32,10 +88,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/svgr
-- lib/svgr.rb
-- lib/svgr/combine_svgs.rb
-- lib/svgr/count_files_by_type.rb
-- lib/svgr/delete_files_by_type.rb
+- lib/svgr/arrange/grid.rb
+- lib/svgr/document/resize.rb
 homepage: https://github.com/nassredean/svgr
 licenses:
 - MIT

data/lib/svgr/combine_svgs.rb

@@ -1,132 +0,0 @@
-require "nokogiri"
-require "optparse"
-
-module Svgr
-  class CombineSvgs
-    def self.start(argv)
-      options = {
-        scaling_factor: 1,
-        margin_top: 0,
-        margin_left: 0,
-        sort: "default"
-      }
-
-      OptionParser
-        .new do |opts|
-          opts.banner =
-            "Usage: svgr combine [options] <source_directory> <output_file> <rows> <columns>"
-
-          opts.on(
-            "-s",
-            "--scaling-factor FACTOR",
-            Float,
-            "Scaling factor for the SVG elements"
-          ) { |s| options[:scaling_factor] = s }
-
-          opts.on(
-            "-t",
-            "--margin-top MARGIN",
-            Integer,
-            "Top margin between the SVG elements"
-          ) { |t| options[:margin_top] = t }
-
-          opts.on(
-            "-l",
-            "--margin-left MARGIN",
-            Integer,
-            "Left margin between the SVG elements"
-          ) { |l| options[:margin_left] = l }
-
-          opts.on(
-            "--sort SORT",
-            %w[default random],
-            "Sorting option for the SVG files (default, random)"
-          ) { |sort| options[:sort] = sort }
-        end
-        .parse!(argv)
-
-      if argv.length < 4
-        puts "Usage: svgr combine [options] <source_directory> <output_file> <rows> <columns>"
-        exit(1)
-      end
-
-      source_directory, output_file, rows, columns = argv.shift(4)
-      rows = rows.to_i
-      columns = columns.to_i
-      svg_files =
-        list_svg_files(source_directory, options[:sort])[0...rows * columns]
-
-      combined_elements =
-        svg_files.flat_map do |file|
-          content = read_svg_file(file)
-          extract_svg_elements(content)
-        end
-
-      combined_svg =
-        create_combined_svg(
-          combined_elements,
-          rows,
-          columns,
-          options[:scaling_factor],
-          options[:margin_top],
-          options[:margin_left]
-        )
-
-      save_svg_to_file(combined_svg, output_file)
-    end
-
-    def self.list_svg_files(directory, sort_option)
-      svg_files = Dir.glob(File.join(directory, "*.svg"))
-
-      case sort_option
-      when "default"
-        svg_files.sort_by { |file| File.basename(file, ".svg").to_i }
-      when "random"
-        svg_files.shuffle
-      else
-        puts "Invalid sorting option. Allowed options: default, random"
-        exit(1)
-      end
-    end
-
-    def self.read_svg_file(file)
-      File.read(file)
-    end
-
-    def self.extract_svg_elements(svg_content)
-      doc = Nokogiri.XML(svg_content)
-      doc.remove_namespaces!
-      doc.xpath("//svg/g")
-    end
-
-    def self.create_combined_svg(
-      elements,
-      rows,
-      columns,
-      scaling_factor,
-      margin_top,
-      margin_left
-    )
-      combined_svg =
-        Nokogiri::XML::Builder.new(encoding: "UTF-8") do |xml|
-          xml.svg(xmlns: "http://www.w3.org/2000/svg") do
-            elements.each_with_index do |element, index|
-              row = index / columns
-              col = index % columns
-
-              # Adjust the 'transform' attribute to position and scale the element in the grid
-              transform =
-                "translate(#{col * (100 + margin_left) * scaling_factor}, #{row * (100 + margin_top) * scaling_factor}) scale(#{scaling_factor})"
-              element["transform"] = transform
-              xml << element.to_xml
-            end
-          end
-        end
-      combined_svg.to_xml
-    end
-
-    def self.save_svg_to_file(svg, file)
-      File.write(file, svg)
-    end
-  end
-end

data/lib/svgr/count_files_by_type.rb

@@ -1,14 +0,0 @@
-def count_files_by_type(directory, file_extension)
-  Dir.glob(File.join(directory, "*.#{file_extension}")).count
-end
-
-if ARGV.length != 2
-  puts "Usage: ruby count_files_by_type.rb <source_directory> <file_extension>"
-  exit(1)
-end
-
-source_directory = ARGV[0]
-file_extension = ARGV[1]
-file_count = count_files_by_type(source_directory, file_extension)
-
-puts "Number of #{file_extension.upcase} files in #{source_directory}: #{file_count}"

data/lib/svgr/delete_files_by_type.rb

@@ -1,32 +0,0 @@
-require "fileutils"
-
-def get_files_by_type(directory, file_extension)
-  Dir
-    .glob(File.join(directory, "*.#{file_extension}"))
-    .sort_by { |f| File.basename(f).to_i }
-end
-
-def delete_file(file)
-  File.delete(file)
-end
-
-if ARGV.length != 2
-  puts "Usage: ruby delete_files_by_type.rb <source_directory> <file_extension>"
-  exit(1)
-end
-
-source_directory = ARGV[0]
-file_extension = ARGV[1]
-
-files = get_files_by_type(source_directory, file_extension)
-
-files.each do |file|
-  puts "File: #{file}"
-  print "Do you want to delete this file? [y/N]: "
-  answer = STDIN.gets.chomp.downcase
-
-  if answer == "y"
-    delete_file(file)
-    puts "Deleted #{file}"
-  end
-end

data/lib/svgr.rb

@@ -1 +0,0 @@
-require_relative "svgr/combine_svgs"