inkscape_merge 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59987cc8bed62687f4a197846234274f953af557
-  data.tar.gz: c96fb3eb79e2571a4e35249e9edef50ba8cac1d1
+  metadata.gz: 3695709d47649503372392541be660acf2ee73e8
+  data.tar.gz: 59275e92175e9257511336ddba6cc98530c76e87
 SHA512:
-  metadata.gz: cc4c8c1c07aeba733660d33870fc1cbd51ab40aa648d5db46e8a17a05b9a7a55d083815cfa2a4245be77bff946c41a1a88fbd585b8232d18faad4414a610f7b8
-  data.tar.gz: 336c51043addea97b73d7bfaf70fd1a2db872d0f58bfed27bb6d3d323e94eacd46548858b459583a8f7d002429523ed906f60aee2406eea9131de4a22561d9dc
+  metadata.gz: 9352aee677f10770a4dfd6de668f37c9e301b8bbba295d79931bf185a65c8f32c6dfd1e750ec83a872a8b04d75406fcf8c64892fd1536529172a67c633f626ae
+  data.tar.gz: db0ebb3635ccc780cde22ed72780281a5b4b44d900a538269c78c82d8b25e383829dc47558ca7231fd137656aca3b93ba1f79cc923087aae983e63bd8d41aab7

data/Gemfile

@@ -2,10 +2,6 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler"
-  gem "jeweler"
+  gem 'juwelier', '~> 2.1'
+  gem 'rspec', '~> 3.5'
 end
-
-# Ruby 1.9 merged FasterCSV as core CSV library
-gem "fastercsv", :platforms => :ruby_18

data/Gemfile.lock

@@ -1,56 +1,72 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.5)
+    addressable (2.4.0)
     builder (3.2.2)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    fastercsv (1.5.5)
-    git (1.2.5)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
-      oauth2
-    hashie (2.0.5)
-    highline (1.6.19)
-    httpauth (0.2.0)
-    jeweler (1.8.7)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.3.0)
+    github_api (0.14.5)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      oauth2 (~> 1.0)
+    hashie (3.4.6)
+    highline (1.7.8)
+    json (1.8.3)
+    juwelier (2.1.3)
       builder
-      bundler (~> 1.0)
+      bundler (>= 1.13)
       git (>= 1.2.5)
-      github_api (= 0.10.1)
+      github_api
       highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.0)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    multi_json (1.7.9)
+      semver
+    jwt (1.5.6)
+    mini_portile2 (2.1.0)
+    multi_json (1.12.1)
     multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    multipart-post (2.0.0)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    oauth2 (1.2.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.5.2)
-    rake (10.1.0)
-    rdoc (4.0.1)
+      rack (>= 1.2, < 3)
+    rack (2.0.1)
+    rake (11.3.0)
+    rdoc (4.2.2)
       json (~> 1.4)
-    shoulda (2.11.3)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    semver (1.0.1)
+    thread_safe (0.3.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler
-  fastercsv
-  jeweler
-  shoulda
+  juwelier (~> 2.1)
+  rspec (~> 3.5)
+
+BUNDLED WITH
+   1.13.6

data/Rakefile

@@ -11,8 +11,8 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
+require 'juwelier'
+Juwelier::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "inkscape_merge"
   gem.homepage = "http://github.com/borgand/inkscape_merge"
@@ -24,7 +24,7 @@ Jeweler::Tasks.new do |gem|
   gem.authors = ["Laas Toom"]
   # dependencies defined in Gemfile
 end
-Jeweler::RubygemsDotOrgTasks.new
+Juwelier::RubygemsDotOrgTasks.new
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/inkscape_merge.gemspec

@@ -1,15 +1,17 @@
-# Generated by jeweler
+# Generated by juwelier
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: inkscape_merge 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "inkscape_merge"
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Laas Toom"]
-  s.date = "2013-08-15"
+  s.date = "2016-10-25"
   s.description = "Script to merge SVG files with CSV data-files using Inkscape, to produce\n  one outputfile (e.g. PDF) per data-row."
   s.email = "laas.toom@gmail.com"
   s.executables = ["inkscape_merge"]
@@ -30,34 +32,31 @@ Gem::Specification.new do |s|
     "lib/inkscape_merge.rb",
     "lib/inkscape_merge/data_parsers.rb",
     "lib/inkscape_merge/processor.rb",
-    "test/helper.rb",
-    "test/test_inkscape_merge.rb"
+    "spec/data_parsers_spec.rb",
+    "spec/fixtures/data.csv",
+    "spec/fixtures/fake_inkscape",
+    "spec/fixtures/test.svg",
+    "spec/helper.rb",
+    "spec/processor_spec.rb"
   ]
   s.homepage = "http://github.com/borgand/inkscape_merge"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.3"
+  s.rubygems_version = "2.5.1"
   s.summary = "Merge SVG files with CSV file using Inkscape"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<fastercsv>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<juwelier>, ["~> 2.1"])
+      s.add_development_dependency(%q<rspec>, ["~> 3.5"])
     else
-      s.add_dependency(%q<fastercsv>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<juwelier>, ["~> 2.1"])
+      s.add_dependency(%q<rspec>, ["~> 3.5"])
     end
   else
-    s.add_dependency(%q<fastercsv>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<juwelier>, ["~> 2.1"])
+    s.add_dependency(%q<rspec>, ["~> 3.5"])
   end
 end
 

data/lib/inkscape_merge/processor.rb

@@ -2,13 +2,14 @@ require 'ostruct'
 require 'tempfile'
 require 'fileutils'
 require 'inkscape_merge/data_parsers'
+require 'shellwords'
 
 module Inkscape # :nodoc:
-  module Merge # :nodoc:    
+  module Merge # :nodoc:
     # Main class to initialize processing
     class Processor
       attr_reader :options
-      
+
       # Initialize the processor, setting files and options
       def initialize
         @options = OpenStruct.new
@@ -25,18 +26,18 @@ module Inkscape # :nodoc:
               "/Applications/Inkscape.app/Contents/Resources/bin/inkscape"
             end
         end
-        
-      end  
-      
+
+      end
+
       # Iterate over all data rows and generate output files
       # Optionally stop when LIMIT is reached
       def run
         validate_options
-        
+
         # Open the files
         @svg = File.read options.svg_file
         @data_file = DataParser.detect(options)
-        
+
         count = 0
         headers = @data_file.headers
         pattern = /%VAR_(#{headers.map(&:to_s).join("|")})%/
@@ -53,19 +54,19 @@ module Inkscape # :nodoc:
                   row[$1]
               }
             }
-            
+
             # Write merged SVG out
             tmp_file.puts merged_svg
             tmp_file.close
-            
+
             # Sprintf outfile with current row number
             outfile %= count
-            
+
             # Generate output path
             FileUtils.mkdir_p(File.dirname outfile)
-            
+
             # Generate the file itself
-            ink_generate tmp_file.path, outfile, @options.format, @options.dpi
+            ink_generate tmp_file.path, Shellwords.escape(outfile), @options.format, @options.dpi
           rescue => e
             $stderr.puts "ERROR: #{e}"
             $stderr.puts e.backtrace if @options.verbose
@@ -74,13 +75,13 @@ module Inkscape # :nodoc:
           end
         }
       end
-      
+
       private
-      
+
       # Validate options and give error if something is missing
       def validate_options
         # TODO: replace with
-        
+
         # If inkscape can not be found or run, bail out
         unless File.executable? @options.inkscape
           raise ArgumentError, "Inkscape not found or not executable"
@@ -96,9 +97,12 @@ module Inkscape # :nodoc:
 
         unless @options.output
           raise ArgumentError, "Output pattern must be given"
+        else
+          # Ensure absolute pathname
+          @options.output = File.absolute_path(@options.output)
         end
       end
-      
+
       # Run Inkscape to generate files
       def ink_generate(in_file, out_file, format='pdf', dpi="300")
         cmd = %(#{@options.inkscape} --without-gui --export-#{format}=#{out_file} --export-dpi=#{dpi} #{in_file})

data/spec/data_parsers_spec.rb

@@ -0,0 +1,25 @@
+require_relative 'helper'
+require 'inkscape_merge/data_parsers'
+
+RSpec.describe Inkscape::Merge::DataParser do
+  before do
+    @options = OpenStruct.new
+    @options.csv_options = {:headers => true, :col_sep => ',', :encoding => 'utf-8'}
+    @options.data_file = File.join(File.dirname(__FILE__), 'fixtures/data.csv')
+  end
+
+  it "returns a CSV parser" do
+    data_file = Inkscape::Merge::DataParser.detect(@options)
+    expect(data_file.class).to eq Inkscape::Merge::DataParser::CSV
+  end
+
+  it 'parses CSV headers' do
+    data_file = Inkscape::Merge::DataParser.detect(@options)
+    expect(data_file.headers).to eq ['Col1', 'Col2']
+  end
+
+  it 'parses CSV data rows' do
+    data_file = Inkscape::Merge::DataParser.detect(@options)
+    expect(data_file.each.map{|row| row['Col1']}).to eq ["1.0", "2.0"]
+  end
+end

data/spec/fixtures/data.csv

@@ -0,0 +1,3 @@
+Col1,Col2
+1.0,"Hello"
+2.0,"World"

data/spec/fixtures/fake_inkscape

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo "FAKE Inkscape: $@"

data/spec/fixtures/test.svg

@@ -0,0 +1,3 @@
+<svg height="30" width="200">
+  <text x="0" y="15" fill="red">Col1: %VAR_Col1% and Col2: %VAR_Col2%</text>
+</svg>

data/spec/helper.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'inkscape_merge'
+require 'rspec'

data/spec/processor_spec.rb

@@ -0,0 +1,41 @@
+require_relative 'helper'
+
+RSpec.describe Inkscape::Merge::Processor do
+  before do
+    @processor = Inkscape::Merge::Processor.new
+    @processor.options.csv_options = {:headers => true, :col_sep => ',', :encoding => 'utf-8'}
+    @processor.options.data_file = File.join(File.dirname(__FILE__), 'fixtures/data.csv')
+    @processor.options.svg_file = File.join(File.dirname(__FILE__), 'fixtures/test.svg')
+    @processor.options.inkscape = File.join(File.dirname(__FILE__), 'fixtures/fake_inkscape')
+    @processor.options.output = File.join(File.dirname(__FILE__), 'fixtures/output_%d.svg')
+  end
+
+  context 'When validating options' do
+    it "validates inkscape binary" do
+      @processor.options.inkscape = 'nonexistant'
+      expect{@processor.send(:validate_options)}.to raise_error(ArgumentError, 'Inkscape not found or not executable')
+    end
+
+    it "validates svg file" do
+      @processor.options.svg_file = nil
+      expect{@processor.send(:validate_options)}.to raise_error(ArgumentError, 'SVG file must be given')
+    end
+
+    it "validates data file" do
+      @processor.options.data_file = nil
+      expect{@processor.send(:validate_options)}.to raise_error(ArgumentError, 'Data-file must be given')
+    end
+
+    it "validates inkscape binary" do
+      @processor.options.output = nil
+      expect{@processor.send(:validate_options)}.to raise_error(ArgumentError, 'Output pattern must be given')
+    end
+  end
+
+  context 'When generating' do
+    it "calls ink_generate right number of times" do
+      expect(@processor).to receive(:ink_generate).twice
+      @processor.run
+    end
+  end
+end

metadata

@@ -1,71 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: inkscape_merge
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Laas Toom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: fastercsv
+  name: juwelier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
 description: |-
   Script to merge SVG files with CSV data-files using Inkscape, to produce
     one outputfile (e.g. PDF) per data-row.
@@ -77,7 +49,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
+- ".document"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -89,8 +61,12 @@ files:
 - lib/inkscape_merge.rb
 - lib/inkscape_merge/data_parsers.rb
 - lib/inkscape_merge/processor.rb
-- test/helper.rb
-- test/test_inkscape_merge.rb
+- spec/data_parsers_spec.rb
+- spec/fixtures/data.csv
+- spec/fixtures/fake_inkscape
+- spec/fixtures/test.svg
+- spec/helper.rb
+- spec/processor_spec.rb
 homepage: http://github.com/borgand/inkscape_merge
 licenses:
 - MIT
@@ -101,17 +77,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Merge SVG files with CSV file using Inkscape

data/test/helper.rb

@@ -1,18 +0,0 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'inkscape_merge'
-
-class Test::Unit::TestCase
-end

data/test/test_inkscape_merge.rb

@@ -1,25 +0,0 @@
-require 'helper'
-require 'inkscape_merge/data_parsers'
-
-class TestInkscapeMerge < Test::Unit::TestCase
-  context "Parsing CSV files" do
-    setup do
-      @csv_file = Tempfile.open(['inkscape_merge_test', '.csv'])
-      @csv_file.write %("Col1","Col2"\n1.0,"Hello")
-      @csv_file.close
-
-      @options = OpenStruct.new
-      @options.csv_options = {:headers => true, :col_sep => ',', :encoding => 'utf-8'}
-      @options.data_file = @csv_file.path
-    end
-
-    teardown do
-      @csv_file.unlink
-    end
-
-    should "parse CSV file correctly" do
-      data_file = Inkscape::Merge::DataParser.detect(@options)
-      assert_equal 1, data_file.count
-    end
-  end
-end