vectory 0.2.0 → 0.3.0

data/spec/vectory/cli_spec.rb

@@ -27,84 +27,84 @@ RSpec.describe Vectory::CLI do
 
     context "eps to ps" do
       let(:input)     { "spec/examples/eps2ps/img.eps" }
-      let(:reference) { "spec/examples/eps2ps/img.ps" }
+      let(:reference) { "spec/examples/eps2ps/ref.ps" }
 
       it_behaves_like "converter", "ps"
     end
 
     context "eps to svg" do
       let(:input)     { "spec/examples/eps2svg/img.eps" }
-      let(:reference) { "spec/examples/eps2svg/img.svg" }
+      let(:reference) { "spec/examples/eps2svg/ref.svg" }
 
       it_behaves_like "converter", "svg"
     end
 
     context "eps to emf" do
       let(:input)     { "spec/examples/eps2emf/img.eps" }
-      let(:reference) { "spec/examples/eps2emf/img.emf" }
+      let(:reference) { "spec/examples/eps2emf/ref.emf" }
 
       it_behaves_like "converter", "emf"
     end
 
     context "ps to eps" do
       let(:input)     { "spec/examples/ps2eps/img.ps" }
-      let(:reference) { "spec/examples/ps2eps/img.eps" }
+      let(:reference) { "spec/examples/ps2eps/ref.eps" }
 
       it_behaves_like "converter", "eps"
     end
 
     context "ps to emf" do
       let(:input)     { "spec/examples/ps2emf/img.ps" }
-      let(:reference) { "spec/examples/ps2emf/img.emf" }
+      let(:reference) { "spec/examples/ps2emf/ref.emf" }
 
       it_behaves_like "converter", "emf"
     end
 
     context "ps to svg" do
       let(:input)     { "spec/examples/ps2svg/img.ps" }
-      let(:reference) { "spec/examples/ps2svg/img.svg" }
+      let(:reference) { "spec/examples/ps2svg/ref.svg" }
 
       it_behaves_like "converter", "svg"
     end
 
     context "svg to emf" do
       let(:input)     { "spec/examples/svg2emf/img.svg" }
-      let(:reference) { "spec/examples/svg2emf/img.emf" }
+      let(:reference) { "spec/examples/svg2emf/ref.emf" }
 
       it_behaves_like "converter", "emf"
     end
 
     context "svg to eps" do
       let(:input)     { "spec/examples/svg2eps/img.svg" }
-      let(:reference) { "spec/examples/svg2eps/img.eps" }
+      let(:reference) { "spec/examples/svg2eps/ref.eps" }
 
       it_behaves_like "converter", "eps"
     end
 
     context "svg to ps" do
       let(:input)     { "spec/examples/svg2ps/img.svg" }
-      let(:reference) { "spec/examples/svg2ps/img.ps" }
+      let(:reference) { "spec/examples/svg2ps/ref.ps" }
 
       it_behaves_like "converter", "ps"
     end
 
     context "emf to svg" do
       let(:input)     { "spec/examples/emf2svg/img.emf" }
-      let(:reference) { "spec/examples/emf2svg/img.svg" }
+      let(:reference) { "spec/examples/emf2svg/ref.svg" }
 
       it_behaves_like "converter", "svg"
     end
 
     context "emf to eps" do
       let(:input)     { "spec/examples/emf2eps/img.emf" }
-      let(:reference) { "spec/examples/emf2eps/img.eps" }
+      let(:reference) { "spec/examples/emf2eps/ref.eps" }
 
       it_behaves_like "converter", "eps"
     end
 
     context "emf to ps" do
       let(:input)     { "spec/examples/emf2ps/img.emf" }
-      let(:reference) { "spec/examples/emf2ps/img.ps" }
+      let(:reference) { "spec/examples/emf2ps/ref.ps" }
 
       it_behaves_like "converter", "ps"
     end

data/spec/vectory/emf_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 RSpec.describe Vectory::Emf do
   describe "#to_svg" do
     let(:input)     { "spec/examples/emf2svg/img.emf" }
-    let(:reference) { "spec/examples/emf2svg/img.svg" }
+    let(:reference) { "spec/examples/emf2svg/ref.svg" }
 
     it "returns svg content" do
       expect(Vectory::Emf.from_path(input).to_svg.content)
@@ -18,7 +18,7 @@ RSpec.describe Vectory::Emf do
 
   describe "#to_eps" do
     let(:input)     { "spec/examples/emf2eps/img.emf" }
-    let(:reference) { "spec/examples/emf2eps/img.eps" }
+    let(:reference) { "spec/examples/emf2eps/ref.eps" }
 
     it "returns eps content" do
       expect(Vectory::Emf.from_path(input).to_eps.content)
@@ -28,7 +28,7 @@ RSpec.describe Vectory::Emf do
 
   describe "#to_ps" do
     let(:input)     { "spec/examples/emf2ps/img.emf" }
-    let(:reference) { "spec/examples/emf2ps/img.ps" }
+    let(:reference) { "spec/examples/emf2ps/ref.ps" }
 
     it "returns ps content" do
       expect(Vectory::Emf.from_path(input).to_ps.content)

data/spec/vectory/eps_spec.rb

@@ -19,21 +19,21 @@ RSpec.describe Vectory::Eps do
 
   describe "#to_ps" do
     let(:input)     { "spec/examples/eps2ps/img.eps" }
-    let(:reference) { "spec/examples/eps2ps/img.ps" }
+    let(:reference) { "spec/examples/eps2ps/ref.ps" }
 
     it_behaves_like "converter", "ps"
   end
 
   describe "#to_svg" do
     let(:input)     { "spec/examples/eps2svg/img.eps" }
-    let(:reference) { "spec/examples/eps2svg/img.svg" }
+    let(:reference) { "spec/examples/eps2svg/ref.svg" }
 
     it_behaves_like "converter", "svg"
   end
 
   describe "#to_emf" do
     let(:input)     { "spec/examples/eps2emf/img.eps" }
-    let(:reference) { "spec/examples/eps2emf/img.emf" }
+    let(:reference) { "spec/examples/eps2emf/ref.emf" }
 
     it_behaves_like "converter", "emf"
   end

data/spec/vectory/file_magic_spec.rb

@@ -7,10 +7,10 @@ RSpec.describe Vectory::FileMagic do
     references = {
       "spec/examples/eps2svg/img.eps" => :eps,
       "spec/examples/eps2emf/img.eps" => :eps,
-      "spec/examples/eps2svg/img.svg" => :svg,
+      "spec/examples/eps2svg/ref.svg" => :svg,
       "spec/examples/svg2emf/img.svg" => :svg,
-      "spec/examples/eps2emf/img.emf" => :emf,
-      "spec/examples/svg2emf/img.emf" => :emf,
+      "spec/examples/eps2emf/ref.emf" => :emf,
+      "spec/examples/svg2emf/ref.emf" => :emf,
     }
 
     references.each do |file, format|

data/spec/vectory/inkscape_converter_spec.rb

@@ -5,13 +5,18 @@ RSpec.describe Vectory::InkscapeConverter do
     context "file has inproper format: svg extension, but eps content" do
       let(:input) { "spec/examples/eps_but_svg_extension.svg" }
 
-      let(:command) do
-        Vectory::InkscapeConverter.convert(input, "svg", "--export-type=eps")
-      end
-
       it "raises error" do
-        expect { command }.to raise_error(Vectory::ConversionError,
-                                          /parser error : Start tag expected/)
+        with_tmp_dir do |dir|
+          tmp_input_path = File.join(dir, File.basename(input))
+          FileUtils.cp(input, tmp_input_path)
+
+          expect do
+            Vectory::InkscapeConverter.convert(tmp_input_path,
+                                               "emf",
+                                               "--export-type=emf")
+          end.to raise_error(Vectory::ConversionError,
+                             /parser error : Start tag expected/)
+        end
       end
     end
 

data/spec/vectory/ps_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 RSpec.describe Vectory::Ps do
   describe "#to_eps" do
     let(:input)     { "spec/examples/ps2eps/img.ps" }
-    let(:reference) { "spec/examples/ps2eps/img.eps" }
+    let(:reference) { "spec/examples/ps2eps/ref.eps" }
 
     it "returns eps content" do
       expect(Vectory::Ps.from_path(input).to_eps.content)
@@ -13,7 +13,7 @@ RSpec.describe Vectory::Ps do
 
   describe "#to_emf" do
     let(:input)     { "spec/examples/ps2emf/img.ps" }
-    let(:reference) { "spec/examples/ps2emf/img.emf" }
+    let(:reference) { "spec/examples/ps2emf/ref.emf" }
 
     it "returns emf content" do
       expect(Vectory::Ps.from_path(input).to_emf.content)
@@ -23,7 +23,7 @@ RSpec.describe Vectory::Ps do
 
   describe "#to_svg" do
     let(:input)     { "spec/examples/ps2svg/img.ps" }
-    let(:reference) { "spec/examples/ps2svg/img.svg" }
+    let(:reference) { "spec/examples/ps2svg/ref.svg" }
 
     it "returns svg content" do
       expect(Vectory::Ps.from_path(input).to_svg.content)

data/spec/vectory/svg_mapping_spec.rb

@@ -0,0 +1,42 @@
+require "spec_helper"
+
+RSpec.describe Vectory::SvgMapping do
+  context "no namespace" do
+    let(:source) { Vectory::SvgMapping.from_path("doc.xml") }
+    let(:reference) { File.read("doc-ref.xml") }
+    let(:work_dir) { "spec/examples/svg" }
+
+    it "rewrites ids" do
+      Dir.chdir(work_dir) do
+        content = source.call
+
+        expect(xmlpp(strip_image_and_style(content)))
+          .to be_equivalent_to xmlpp(reference)
+      end
+    end
+  end
+
+  context "with namespaces" do
+    let(:source) { Vectory::SvgMapping.from_path("doc2.xml") }
+    let(:reference) { File.read("doc2-ref.xml") }
+    let(:work_dir) { "spec/examples/svg" }
+
+    it "rewrites ids" do
+      Dir.chdir(work_dir) do
+        content = source.call
+
+        expect(xmlpp(strip_image(content)))
+          .to be_equivalent_to xmlpp(reference)
+      end
+    end
+  end
+
+  def strip_image(xml)
+    xml.gsub(%r{<image.*?</image>}m, "<image/>")
+  end
+
+  def strip_image_and_style(xml)
+    xml.gsub(%r{<image.*?</image>}m, "<image/>")
+       .gsub(%r{<style.*?</style>}m, "<style/>") # rubocop:disable Layout/MultilineMethodCallIndentation
+  end
+end

data/spec/vectory/svg_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 RSpec.describe Vectory::Svg do
   describe "#to_emf" do
     let(:input)     { "spec/examples/svg2emf/img.svg" }
-    let(:reference) { "spec/examples/svg2emf/img.emf" }
+    let(:reference) { "spec/examples/svg2emf/ref.emf" }
 
     it "returns emf content" do
       expect(Vectory::Svg.from_path(input).to_emf.content)
@@ -13,17 +13,25 @@ RSpec.describe Vectory::Svg do
 
   describe "#to_eps" do
     let(:input)     { "spec/examples/svg2eps/img.svg" }
-    let(:reference) { "spec/examples/svg2eps/img.eps" }
+    let(:reference) { "spec/examples/svg2eps/ref.eps" }
 
     it "returns eps content" do
       expect(Vectory::Svg.from_path(input).to_eps.content)
         .to be_equivalent_eps_to File.read(reference)
     end
+
+    context "remapped links beforehand" do
+      it "converts successfully" do
+        vector = Vectory::Svg.from_path(input)
+        vector.remap_links({})
+        expect { vector.to_eps }.not_to raise_error
+      end
+    end
   end
 
   describe "#to_ps" do
     let(:input)     { "spec/examples/svg2ps/img.svg" }
-    let(:reference) { "spec/examples/svg2ps/img.ps" }
+    let(:reference) { "spec/examples/svg2ps/ref.ps" }
 
     it "returns ps content" do
       expect(Vectory::Svg.from_path(input).to_ps.content)

data/vectory.gemspec

@@ -30,8 +30,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "htmlentities", "~> 4.3.4"
   spec.add_development_dependency "nokogiri", "~> 1.14"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rubocop", "~> 1.22.1"
-  spec.add_development_dependency "rubocop-rails", "~> 2.9"
-  spec.add_development_dependency "rubocop-performance", "~> 1.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vectory
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-16 00:00:00.000000000 Z
+date: 2023-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: emf2svg
@@ -94,62 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.22.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.22.1
-- !ruby/object:Gem::Dependency
-  name: rubocop-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.9'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
 description: |
   Vectory performs pairwise vector image conversions for common
   vector image formats, such as SVG, EMF, EPS and PS.
@@ -180,40 +124,47 @@ files:
 - lib/vectory/inkscape_converter.rb
 - lib/vectory/ps.rb
 - lib/vectory/svg.rb
+- lib/vectory/svg_mapping.rb
 - lib/vectory/system_call.rb
 - lib/vectory/utils.rb
 - lib/vectory/vector.rb
 - lib/vectory/version.rb
 - spec/examples/emf2eps/img.emf
 - spec/examples/emf2eps/img.emf.datauri
-- spec/examples/emf2eps/img.eps
+- spec/examples/emf2eps/ref.eps
 - spec/examples/emf2ps/img.emf
-- spec/examples/emf2ps/img.ps
+- spec/examples/emf2ps/ref.ps
 - spec/examples/emf2svg/img.emf
-- spec/examples/emf2svg/img.svg
-- spec/examples/eps2emf/img.emf
+- spec/examples/emf2svg/ref.svg
 - spec/examples/eps2emf/img.eps
 - spec/examples/eps2emf/img.eps.datauri
+- spec/examples/eps2emf/ref.emf
 - spec/examples/eps2ps/img.eps
-- spec/examples/eps2ps/img.ps
+- spec/examples/eps2ps/ref.ps
 - spec/examples/eps2svg/img.eps
-- spec/examples/eps2svg/img.svg
+- spec/examples/eps2svg/ref.svg
 - spec/examples/eps_but_svg_extension.svg
 - spec/examples/img.jpg
-- spec/examples/ps2emf/img.emf
 - spec/examples/ps2emf/img.ps
 - spec/examples/ps2emf/img.ps.datauri
-- spec/examples/ps2eps/img.eps
+- spec/examples/ps2emf/ref.emf
 - spec/examples/ps2eps/img.ps
+- spec/examples/ps2eps/ref.eps
 - spec/examples/ps2svg/img.ps
-- spec/examples/ps2svg/img.svg
-- spec/examples/svg2emf/img.emf
+- spec/examples/ps2svg/ref.svg
+- spec/examples/svg/action_schemaexpg1.svg
+- spec/examples/svg/action_schemaexpg2.svg
+- spec/examples/svg/doc-ref.xml
+- spec/examples/svg/doc.xml
+- spec/examples/svg/doc2-ref.xml
+- spec/examples/svg/doc2.xml
 - spec/examples/svg2emf/img.svg
 - spec/examples/svg2emf/img.svg.datauri
-- spec/examples/svg2eps/img.eps
+- spec/examples/svg2emf/ref.emf
 - spec/examples/svg2eps/img.svg
-- spec/examples/svg2ps/img.ps
+- spec/examples/svg2eps/ref.eps
 - spec/examples/svg2ps/img.svg
+- spec/examples/svg2ps/ref.ps
 - spec/spec_helper.rb
 - spec/support/matchers.rb
 - spec/support/text_matcher.rb
@@ -225,6 +176,7 @@ files:
 - spec/vectory/file_magic_spec.rb
 - spec/vectory/inkscape_converter_spec.rb
 - spec/vectory/ps_spec.rb
+- spec/vectory/svg_mapping_spec.rb
 - spec/vectory/svg_spec.rb
 - spec/vectory/vector_spec.rb
 - spec/vectory_spec.rb