dragonfly_svg 0.0.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0a80f5be599ee36aeef6e1fb8b3ac547eacfa5dd
-  data.tar.gz: 3381778fb2df92c6c806404a39f8e873aee38193
+SHA256:
+  metadata.gz: 92bc94aeb68fd9cc8fbf967c27b7ace7a7778472a6c641462fa67cf7b9f74f6d
+  data.tar.gz: deb2869aba9c2fc76f5400df0783cc971f6a7b56cabed5ffe3aebdb819bad8ab
 SHA512:
-  metadata.gz: daa3efc319ebe8457c22f460f1cf69e00c6bd8b9f270d98983d7d5d927b6d36c12dedf183ffe8f7d93c98014880bd0a795b7694ba98291a0c55a8ba1b48648fb
-  data.tar.gz: bb23dfbe0b3f524e276962fe851bb95a8712fb442c7164df77d761d6baac63b7bf39af1595804a239cc2c14ac4422d94ecfe366eaca0f5d0c2e8c9d8d8afbbcb
+  metadata.gz: 165deab9c210352a43e7972ec5f44f4a54cfde88bf10d68f98129340c1015243eb4a31dfbdf869aef9a5fb192660210af427c7371e3209522f994c9e7d5ed18e
+  data.tar.gz: 50a51b640787b72c1b9badd203183494c629dce7fcffb217c4b5fa95b2db682ce96214b12768fb774d43d87e9a9b85e08a697a4b93b2eb934345743457822b29

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# CHANGELOG
+
+## 1.0.0
+
+* add `SUPPORTED_FORMATS` and raise errors when formats are not matching
+* `svg_properties` analyser now fallbacks to `viewBox` values when `width` and `height` attributes not found
+* add `set_tag_value` processor

data/README.md

@@ -20,7 +20,7 @@ Or install it yourself as:
 
     $ gem install dragonfly_svg
 
-## Plugin
+## Usage
 The analyser and processors are added by configuring the plugin
 
 ```ruby
@@ -29,6 +29,14 @@ Dragonfly.app.configure do
 end
 ```
 
+## Supported Formats
+
+List of supported formats is available as:
+
+```ruby
+DragonflySvg::SUPPORTED_FORMATS # => ["svg", "svgz", "svg.gz"]
+```
+
 ## Analyser
 The analyser supplies the following methods:
 
@@ -68,6 +76,14 @@ Allows to set attribute for specified `xpath`:
 svg.set_attribute('./*[name()="svg"]', 'style', 'margin: 50px;')
 ```
 
+### SetTagValue
+
+Allows to set tag value for specified `xpath`:
+
+```ruby
+svg.set_tag_value('./*[name()="text"]', 'Updated text')
+```
+
 ### SetDimensions
 
 Sets the dimensions of the SVG. Takes two parameters: `width` and `height`

data/dragonfly_svg.gemspec

@@ -1,29 +1,30 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'dragonfly_svg/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "dragonfly_svg"
+  spec.name          = 'dragonfly_svg'
   spec.version       = DragonflySvg::VERSION
-  spec.authors       = ["Tomas Celizna"]
-  spec.email         = ["tomas.celizna@gmail.com"]
-  spec.summary       = %q{Dragonfly analyser and processor for SVGs.}
-  spec.description   = %q{Dragonfly analyser and processor for SVGs.}
-  spec.homepage      = "https://github.com/tomasc/dragonfly_svg"
-  spec.license       = "MIT"
+  spec.authors       = ['Tomas Celizna']
+  spec.email         = ['tomas.celizna@gmail.com']
+  spec.summary       = 'Dragonfly analyser and processor for SVGs.'
+  spec.description   = 'Dragonfly analyser and processor for SVGs.'
+  spec.homepage      = 'https://github.com/tomasc/dragonfly_svg'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "dragonfly", "~> 1.0"
-  spec.add_dependency "nokogiri"
+  spec.add_dependency 'dragonfly', '~> 1.0'
+  spec.add_dependency 'nokogiri'
 
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "guard"
-  spec.add_development_dependency "guard-minitest"
-  spec.add_development_dependency "minitest"
+  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'rake', '~> 10.4'
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard-minitest'
+  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'minitest-reporters'
 end

data/lib/dragonfly_svg.rb

@@ -1,3 +1,10 @@
 require 'dragonfly'
 require 'dragonfly_svg/plugin'
 require 'dragonfly_svg/version'
+
+module DragonflySvg
+  class UnsupportedFormat < RuntimeError; end
+  class UnsupportedOutputFormat < RuntimeError; end
+
+  SUPPORTED_FORMATS = %w[svg svgz svg.gz]
+end

data/lib/dragonfly_svg/analysers/svg_properties.rb

@@ -4,20 +4,34 @@ module DragonflySvg
   module Analysers
     class SvgProperties
       def call(content)
-        node = svg_node(content)
+        return {} unless SUPPORTED_FORMATS.include?(content.ext)
+        return {} unless doc = Nokogiri::XML(content.data)
+        return {} unless node = doc.xpath("//*[name()='svg']").first
 
         {
-          width: node.get_attribute('width').to_f,
-          height: node.get_attribute('height').to_f,
-          id: node.get_attribute('id')
+          'format' => content.ext.to_s,
+          'width' => width(node).to_f,
+          'height' => height(node).to_f,
+          'id' => id(node)
         }
       end
 
-      private # =============================================================
+      private
 
-      def svg_node(content)
-        return unless doc = Nokogiri::XML(content.data)
-        doc.xpath("//*[name()='svg']").first
+      def viewBox(node)
+        node.get_attribute('viewBox').to_s.split(/\s+/)
+      end
+
+      def width(node)
+        node.get_attribute('width') || viewBox(node)[2]
+      end
+
+      def height(node)
+        node.get_attribute('height') || viewBox(node)[3]
+      end
+
+      def id(node)
+        node.get_attribute('id')
       end
     end
   end

data/lib/dragonfly_svg/plugin.rb

@@ -1,11 +1,4 @@
-require 'dragonfly_svg/analysers/base'
-
-require 'dragonfly_svg/analysers/aspect_ratio_analyser'
-require 'dragonfly_svg/analysers/height_analyser'
-require 'dragonfly_svg/analysers/landscape_analyser'
-require 'dragonfly_svg/analysers/portrait_analyser'
 require 'dragonfly_svg/analysers/svg_properties'
-require 'dragonfly_svg/analysers/width_analyser'
 
 require 'dragonfly_svg/processors/extend_ids'
 require 'dragonfly_svg/processors/remove_namespaces'
@@ -13,34 +6,40 @@ require 'dragonfly_svg/processors/set_attribute'
 require 'dragonfly_svg/processors/set_dimensions'
 require 'dragonfly_svg/processors/set_namespace'
 require 'dragonfly_svg/processors/set_preserve_aspect_ratio'
+require 'dragonfly_svg/processors/set_tag_value'
 require 'dragonfly_svg/processors/set_view_box'
 
 module DragonflySvg
   class Plugin
-    def call(app, _opts = {})
-      app.add_analyser :svg_properties, DragonflySvg::Analysers::SvgProperties.new
-
-      DragonflySvg::Analysers::WidthAnalyser.new(app)
-      DragonflySvg::Analysers::HeightAnalyser.new(app)
-      DragonflySvg::Analysers::AspectRatioAnalyser.new(app)
-      DragonflySvg::Analysers::PortraitAnalyser.new(app)
-      DragonflySvg::Analysers::LandscapeAnalyser.new(app)
-
-      app.add_analyser :id do |content|
-        content.analyse(:svg_properties)[:id]
+    def call(app, options = {})
+      # Analysers
+      app.add_analyser :svg_properties, Analysers::SvgProperties.new
+
+      %w[ format
+          width
+          height
+          id
+      ].each do |name|
+        app.add_analyser(name) { |c| c.analyse(:svg_properties)[name] }
       end
 
+      app.add_analyser(:aspect_ratio) { |c| c.analyse(:width).to_f / c.analyse(:height).to_f }
+      app.add_analyser(:portrait) { |c| c.analyse(:aspect_ratio) < 1.0 }
+      app.add_analyser(:landscape) { |c| !c.analyse(:portrait) }
+
       # Aliases
       app.define(:portrait?) { portrait }
       app.define(:landscape?) { landscape }
 
-      app.add_processor :extend_ids, DragonflySvg::Processors::ExtendIds.new
-      app.add_processor :remove_namespaces, DragonflySvg::Processors::RemoveNamespaces.new
-      app.add_processor :set_attribute, DragonflySvg::Processors::SetAttribute.new
-      app.add_processor :set_dimensions, DragonflySvg::Processors::SetDimensions.new
-      app.add_processor :set_namespace, DragonflySvg::Processors::SetNamespace.new
-      app.add_processor :set_preserve_aspect_ratio, DragonflySvg::Processors::SetPreserveAspectRatio.new
-      app.add_processor :set_view_box, DragonflySvg::Processors::SetViewBox.new
+      # Processors
+      app.add_processor :extend_ids, Processors::ExtendIds.new
+      app.add_processor :remove_namespaces, Processors::RemoveNamespaces.new
+      app.add_processor :set_attribute, Processors::SetAttribute.new
+      app.add_processor :set_dimensions, Processors::SetDimensions.new
+      app.add_processor :set_namespace, Processors::SetNamespace.new
+      app.add_processor :set_preserve_aspect_ratio, Processors::SetPreserveAspectRatio.new
+      app.add_processor :set_tag_value, Processors::SetTagValue.new
+      app.add_processor :set_view_box, Processors::SetViewBox.new
     end
   end
 end

data/lib/dragonfly_svg/processors/extend_ids.rb

@@ -1,9 +1,12 @@
 require 'nokogiri'
+require 'securerandom'
 
 module DragonflySvg
   module Processors
     class ExtendIds
-      def call(content, append_str = SecureRandom.urlsafe_base64(8))
+      def call(content, append_str = SecureRandom.urlsafe_base64(8), options = {})
+        raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext)
+
         doc = Nokogiri::XML(content.data)
 
         # nodes with id attributes
@@ -18,7 +21,7 @@ module DragonflySvg
           node.set_attribute 'href', [node_href, append_str].join('-')
         end
 
-        content.update(doc.to_xml)
+        content.update(doc.to_xml, 'name' => 'temp.svg')
       end
     end
   end

data/lib/dragonfly_svg/processors/remove_namespaces.rb

@@ -4,11 +4,11 @@ module DragonflySvg
   module Processors
     class RemoveNamespaces
       def call(content)
-        doc = Nokogiri::XML(content.data)
+        raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext)
 
+        doc = Nokogiri::XML(content.data)
         doc.remove_namespaces!
-
-        content.update(doc.to_xml)
+        content.update(doc.to_xml, 'name' => 'temp.svg')
       end
     end
   end

data/lib/dragonfly_svg/processors/set_attribute.rb

@@ -4,13 +4,14 @@ module DragonflySvg
   module Processors
     class SetAttribute
       def call(content, xpath, attribute_name, value)
-        doc = Nokogiri::XML(content.data)
+        raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext)
 
+        doc = Nokogiri::XML(content.data)
         doc.xpath(xpath).each do |node|
           node.set_attribute attribute_name, value
         end
 
-        content.update(doc.to_xml)
+        content.update(doc.to_xml, 'name' => 'temp.svg')
       end
     end
   end

data/lib/dragonfly_svg/processors/set_dimensions.rb

@@ -4,6 +4,8 @@ module DragonflySvg
   module Processors
     class SetDimensions
       def call(content, width, height)
+        raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext)
+
         SetAttribute.new.call(content, "//*[name()='svg']", 'width', width) if width
         SetAttribute.new.call(content, "//*[name()='svg']", 'height', height) if height
       end

data/lib/dragonfly_svg/processors/set_namespace.rb

@@ -4,6 +4,8 @@ module DragonflySvg
   module Processors
     class SetNamespace
       def call(content, namespace = 'http://www.w3.org/2000/svg')
+        raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext)
+
         doc = Nokogiri::XML(content.data)
 
         if svg_node = doc.xpath("//*[name()='svg']").first
@@ -13,7 +15,7 @@ module DragonflySvg
           end
         end
 
-        content.update(doc.to_xml)
+        content.update(doc.to_xml, 'name' => 'temp.svg')
       end
     end
   end

data/lib/dragonfly_svg/processors/set_preserve_aspect_ratio.rb

@@ -4,6 +4,8 @@ module DragonflySvg
   module Processors
     class SetPreserveAspectRatio
       def call(content, value = 'xMinYMin meet')
+        raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext)
+        
         SetAttribute.new.call(content, "//*[name()='svg']", 'preserveAspectRatio', value)
       end
     end

data/lib/dragonfly_svg/processors/set_tag_value.rb

@@ -0,0 +1,18 @@
+require 'nokogiri'
+
+module DragonflySvg
+  module Processors
+    class SetTagValue
+      def call(content, xpath, value)
+        raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext)
+
+        doc = Nokogiri::XML(content.data)
+        doc.xpath(xpath).each do |node|
+          node.inner_html = value
+        end
+
+        content.update(doc.to_xml, 'name' => 'temp.svg')
+      end
+    end
+  end
+end

data/lib/dragonfly_svg/processors/set_view_box.rb

@@ -4,6 +4,8 @@ module DragonflySvg
   module Processors
     class SetViewBox
       def call(content, min_x, min_y, width, height)
+        raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext)
+        
         value = [min_x, min_y, width, height].map(&:to_s).join(' ')
         SetAttribute.new.call(content, "//*[name()='svg']", 'viewBox', value)
       end

data/lib/dragonfly_svg/version.rb

@@ -1,3 +1,3 @@
 module DragonflySvg
-  VERSION = '0.0.4'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/samples/sample.svg

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
 <svg version="1.1" id="sample_id" xmlns="http://www.w3.org/2000/svg" width="200" height="300" viewBox="0 0 200 300">
   <rect fill="none" stroke="#000000" x="0" y="0" width="200" height="300" />
-</svg>
+  <text>TEXT</text>
+</svg>

data/samples/sample_without_dimensions.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<svg version="1.1" id="sample_id" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 300">
+  <rect fill="none" stroke="#000000" x="0" y="0" width="200" height="300" />
+</svg>

data/test/dragonfly_svg/analysers/svg_properties_test.rb

@@ -1,32 +1,19 @@
 require 'test_helper'
 
-module DragonflySvg
-  module Analysers
-    describe SvgProperties do
-      let(:app) { test_app.configure_with(:svg) }
-      let(:analyser) { DragonflySvg::Analysers::SvgProperties.new }
-      let(:svg) { app.fetch_file(SAMPLES_DIR.join('sample.svg')) }
+describe DragonflySvg::Analysers::SvgProperties do
+  let(:app) { test_app.configure_with(:svg) }
+  let(:analyser) { DragonflySvg::Analysers::SvgProperties.new }
+  let(:svg) { app.fetch_file(SAMPLES_DIR.join('sample.svg')) }
 
-      describe 'call' do
-        let(:svg_properties) { analyser.call(svg) }
-        let(:ratio) { 200.0 / 300.0 }
+  it { analyser.call(svg).must_be_kind_of Hash }
+  it { analyser.call(svg)['width'].must_equal 200 }
+  it { analyser.call(svg)['height'].must_equal 300 }
+  it { analyser.call(svg)['id'].must_equal 'sample_id' }
 
-        it 'returns Hash' do
-          svg_properties.must_be_kind_of Hash
-        end
+  describe 'when dimensions only in viewBox' do
+    let(:svg) { app.fetch_file(SAMPLES_DIR.join('sample_without_dimensions.svg')) }
 
-        it ':width' do
-          svg_properties[:width].must_equal 200
-        end
-
-        it ':height' do
-          svg_properties[:height].must_equal 300
-        end
-
-        it ':id' do
-          svg_properties[:id].must_equal 'sample_id'
-        end
-      end
-    end
+    it { analyser.call(svg)['width'].must_equal 200 }
+    it { analyser.call(svg)['height'].must_equal 300 }
   end
 end

data/test/dragonfly_svg/plugin_test.rb

@@ -1,101 +1,30 @@
 require 'test_helper'
 
-module DragonflySvg
-  describe Plugin do
-    let(:app) { test_app.configure_with(:svg) }
-    let(:svg) { app.fetch_file(SAMPLES_DIR.join('sample.svg')) }
-
-    # ---------------------------------------------------------------------
-
-    describe 'analysers' do
-      it 'adds #svg_properties' do
-        svg.must_respond_to :svg_properties
-      end
-
-      it 'adds #width' do
-        svg.must_respond_to :width
-        svg.width.must_equal 200.0
-      end
-
-      it 'adds #height' do
-        svg.must_respond_to :height
-        svg.height.must_equal 300.0
-      end
-
-      it 'adds #aspect_ratio' do
-        svg.must_respond_to :aspect_ratio
-        svg.aspect_ratio.must_equal 0.6666666666666666
-      end
-
-      it 'adds #portrait' do
-        svg.must_respond_to :portrait
-        svg.portrait.must_equal true
-      end
-
-      it 'adds #landscape' do
-        svg.must_respond_to :landscape
-        svg.landscape.must_equal false
-      end
-
-      it 'adds #id' do
-        svg.must_respond_to :id
-      end
-
-      describe "when handling non svg files" do
-        let(:png) { app.fetch_file(SAMPLES_DIR.join('sample.png')) }
-
-        before do
-          test_app.configure_with(:image_magick)
-        end
-
-        it 'still works to get the width' do
-          png.width.must_equal 1
-        end
-
-        it 'still works to get the height' do
-          png.height.must_equal 1
-        end
-
-        it 'still works to get the aspect ratio' do
-          png.aspect_ratio.must_equal 1.0
-        end
-
-        it 'still works to ask for portrait' do
-          png.portrait.must_equal true
-        end
-
-        it 'still works to ask for landscape' do
-          png.landscape.must_equal false
-        end
-      end
-    end
-
-    # ---------------------------------------------------------------------
-
-    describe 'processors' do
-      it 'adds #extend_ids' do
-        svg.must_respond_to :extend_ids
-      end
-
-      it 'adds #remove_namespaces' do
-        svg.must_respond_to :remove_namespaces
-      end
-
-      it 'adds #set_dimensions' do
-        svg.must_respond_to :set_dimensions
-      end
-
-      it 'adds #set_namespace' do
-        svg.must_respond_to :set_namespace
-      end
-
-      it 'adds #set_preserve_aspect_ratio' do
-        svg.must_respond_to :set_preserve_aspect_ratio
-      end
+describe DragonflySvg::Plugin do
+  let(:app) { test_app.configure_with(:svg) }
+  let(:content) { app.fetch_file(SAMPLES_DIR.join('sample.svg')) }
+
+  describe 'analysers' do
+    it { content.svg_properties.must_equal('format' => 'svg', 'width' => 200.0, 'height' => 300.0, 'id' => 'sample_id') }
+    it { content.format.must_equal 'svg' }
+    it { content.width.must_equal 200.0 }
+    it { content.height.must_equal 300.0 }
+    it { content.aspect_ratio.round(2).must_equal 0.67 }
+    it { content.must_be :portrait }
+    it { content.must_be :portrait? }
+    it { content.wont_be :landscape }
+    it { content.wont_be :landscape? }
+    it { content.id.must_equal 'sample_id' }
+  end
 
-      it 'adds #set_view_box' do
-        svg.must_respond_to :set_view_box
-      end
-    end
+  describe 'processors' do
+    it { content.must_respond_to :extend_ids }
+    it { content.must_respond_to :remove_namespaces }
+    it { content.must_respond_to :set_attribute }
+    it { content.must_respond_to :set_dimensions }
+    it { content.must_respond_to :set_namespace }
+    it { content.must_respond_to :set_preserve_aspect_ratio }
+    it { content.must_respond_to :set_tag_value }
+    it { content.must_respond_to :set_view_box }
   end
 end

data/test/dragonfly_svg/processors/extend_ids_test.rb

@@ -1,26 +1,25 @@
 require 'test_helper'
 
-module DragonflySvg
-  module Processors
-    describe ExtendIds do
-      let(:app) { test_app.configure_with(:svg) }
-      let(:processor) { DragonflySvg::Processors::ExtendIds.new }
-      let(:analyser) { DragonflySvg::Analysers::SvgProperties.new }
-      let(:svg) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample.svg')) }
+describe DragonflySvg::Processors::ExtendIds do
+  let(:app) { test_app.configure_with(:svg) }
+  let(:content) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample.svg')) }
+  let(:analyser) { DragonflySvg::Analysers::SvgProperties.new }
+  let(:processor) { DragonflySvg::Processors::ExtendIds.new }
 
-      before do
-        @orig_id = analyser.call(svg)[:id]
-      end
+  before { @orig_id = analyser.call(content)['id'] }
 
-      it 'adds unique ID' do
-        processor.call(svg)
-        analyser.call(svg)[:id].wont_equal @orig_id
-      end
+  describe 'default' do
+    before { processor.call(content) }
+    it { analyser.call(content)['id'].wont_equal @orig_id }
+  end
+
+  describe 'supplied string' do
+    before { processor.call(content, 'foo') }
+    it { analyser.call(content)['id'].must_equal "#{@orig_id}-foo" }
+  end
 
-      it 'adds supplied string to ID' do
-        processor.call(svg, 'foo')
-        analyser.call(svg)[:id].must_equal "#{@orig_id}-foo"
-      end
-    end
+  describe 'tempfile has extension' do
+    before { processor.call(content) }
+    it { content.tempfile.path.must_match /\.svg\z/ }
   end
 end

data/test/dragonfly_svg/processors/remove_namespaces_test.rb

@@ -1,16 +1,15 @@
 require 'test_helper'
 
-module DragonflySvg
-  module Processors
-    describe RemoveNamespaces do
-      let(:app) { test_app.configure_with(:svg) }
-      let(:processor) { DragonflySvg::Processors::RemoveNamespaces.new }
-      let(:svg) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample.svg')) }
+describe DragonflySvg::Processors::RemoveNamespaces do
+  let(:app) { test_app.configure_with(:svg) }
+  let(:content) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample.svg')) }
+  let(:processor) { DragonflySvg::Processors::RemoveNamespaces.new }
 
-      it 'removes namespaces' do
-        processor.call(svg)
-        svg.data.wont_include 'xmlns='
-      end
-    end
+  before { processor.call(content) }
+
+  it { content.data.wont_include 'xmlns=' }
+
+  describe 'tempfile has extension' do
+    it { content.tempfile.path.must_match /\.svg\z/ }
   end
 end

data/test/dragonfly_svg/processors/set_attribute_test.rb

@@ -1,25 +1,21 @@
 require 'test_helper'
 
-module DragonflySvg
-  module Processors
-    describe SetAttribute do
-      let(:app) { test_app.configure_with(:svg) }
-      let(:processor) { DragonflySvg::Processors::SetAttribute.new }
-      let(:analyser) { DragonflySvg::Analysers::SvgProperties.new }
-      let(:svg) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample.svg')) }
+describe DragonflySvg::Processors::SetAttribute do
+  let(:app) { test_app.configure_with(:svg) }
+  let(:processor) { DragonflySvg::Processors::SetAttribute.new }
+  let(:analyser) { DragonflySvg::Analysers::SvgProperties.new }
+  let(:content) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample.svg')) }
 
-      let(:xpath) { "./*[name()='svg']" }
-      let(:attribute_name) { 'style' }
-      let(:attribute_value) { 'margin: 50px;' }
+  let(:xpath) { "./*[name()='svg']" }
+  let(:attribute_name) { 'style' }
+  let(:attribute_value) { 'margin: 50px;' }
 
-      before do
-        processor.call(svg, xpath, attribute_name, attribute_value)
-      end
+  before { processor.call(content, xpath, attribute_name, attribute_value) }
 
-      it 'sets attribute' do
-        Nokogiri::XML(svg.data).xpath(xpath).count.must_equal 1
-        Nokogiri::XML(svg.data).xpath(xpath).first.get_attribute('style').must_equal attribute_value
-      end
-    end
+  it { Nokogiri::XML(content.data).xpath(xpath).count.must_equal 1 }
+  it { Nokogiri::XML(content.data).xpath(xpath).first.get_attribute('style').must_equal attribute_value }
+
+  describe 'tempfile has extension' do
+    it { content.tempfile.path.must_match /\.svg\z/ }
   end
 end

data/test/dragonfly_svg/processors/set_dimensions_test.rb

@@ -1,24 +1,17 @@
 require 'test_helper'
 
-module DragonflySvg
-  module Processors
-    describe SetDimensions do
-      let(:app) { test_app.configure_with(:svg) }
-      let(:processor) { DragonflySvg::Processors::SetDimensions.new }
-      let(:analyser) { DragonflySvg::Analysers::SvgProperties.new }
-      let(:svg) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample.svg')) }
+describe DragonflySvg::Processors::SetDimensions do
+  let(:app) { test_app.configure_with(:svg) }
+  let(:content) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample.svg')) }
+  let(:processor) { DragonflySvg::Processors::SetDimensions.new }
+  let(:analyser) { DragonflySvg::Analysers::SvgProperties.new }
 
-      before do
-        processor.call(svg, 400, 600)
-      end
+  before { processor.call(content, 400, 600) }
 
-      it 'sets width' do
-        analyser.call(svg)[:width].must_equal 400
-      end
+  it { analyser.call(content)['width'].must_equal 400 }
+  it { analyser.call(content)['height'].must_equal 600 }
 
-      it 'sets height' do
-        analyser.call(svg)[:height].must_equal 600
-      end
-    end
+  describe 'tempfile has extension' do
+    it { content.tempfile.path.must_match /\.svg\z/ }
   end
 end

data/test/dragonfly_svg/processors/set_namespace_test.rb

@@ -1,21 +1,22 @@
 require 'test_helper'
 
-module DragonflySvg
-  module Processors
-    describe SetNamespace do
-      let(:app) { test_app.configure_with(:svg) }
-      let(:processor) { DragonflySvg::Processors::SetNamespace.new }
-      let(:svg) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample.svg')) }
+describe DragonflySvg::Processors::SetNamespace do
+  let(:app) { test_app.configure_with(:svg) }
+  let(:content) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample.svg')) }
+  let(:processor) { DragonflySvg::Processors::SetNamespace.new }
 
-      it 'sets default namespace' do
-        processor.call(svg)
-        svg.data.must_include 'http://www.w3.org/2000/svg'
-      end
+  describe 'by default' do
+    before { processor.call(content) }
+    it { content.data.must_include 'http://www.w3.org/2000/svg' }
+  end
+
+  describe 'custom namespace' do
+    before { processor.call(content, 'custom_namespace') }
+    it { content.data.must_include 'custom_namespace' }
+  end
 
-      it 'sets custom namespace' do
-        processor.call(svg, 'custom_namespace')
-        svg.data.must_include 'custom_namespace'
-      end
-    end
+  describe 'tempfile has extension' do
+    before { processor.call(content) }
+    it { content.tempfile.path.must_match /\.svg\z/ }
   end
 end

data/test/dragonfly_svg/processors/set_preserve_aspect_ratio_test.rb

@@ -1,30 +1,23 @@
 require 'test_helper'
 
-module DragonflySvg
-  module Processors
-    describe SetPreserveAspectRatio do
-      let(:app) { test_app.configure_with(:svg) }
-      let(:processor) { DragonflySvg::Processors::SetPreserveAspectRatio.new }
-      let(:svg) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample.svg')) }
+describe DragonflySvg::Processors::SetPreserveAspectRatio do
+  let(:app) { test_app.configure_with(:svg) }
+  let(:content) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample.svg')) }
+  let(:processor) { DragonflySvg::Processors::SetPreserveAspectRatio.new }
 
-      describe 'with default value' do
-        it 'adds preserveAspectRatio attribute' do
-          processor.call(svg)
-          svg.data.must_include 'preserveAspectRatio'
-        end
+  describe 'with default value' do
+    before { processor.call(content) }
+    it { content.data.must_include 'preserveAspectRatio' }
+    it { content.data.must_include 'xMinYMin meet' }
+  end
 
-        it 'sets default value' do
-          processor.call(svg)
-          svg.data.must_include 'xMinYMin meet'
-        end
-      end
+  describe 'with specified value' do
+    before { processor.call(content, 'xMidYMid meet') }
+    it { content.data.must_include 'xMidYMid meet' }
+  end
 
-      describe 'with specified value' do
-        it 'adds preserveAspectRatio with specified value' do
-          processor.call(svg, 'xMidYMid meet')
-          svg.data.must_include 'xMidYMid meet'
-        end
-      end
-    end
+  describe 'tempfile has extension' do
+    before { processor.call(content) }
+    it { content.tempfile.path.must_match /\.svg\z/ }
   end
 end

data/test/dragonfly_svg/processors/set_tag_value_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+describe DragonflySvg::Processors::SetTagValue do
+  let(:app) { test_app.configure_with(:svg) }
+  let(:processor) { DragonflySvg::Processors::SetTagValue.new }
+  let(:analyser) { DragonflySvg::Analysers::SvgProperties.new }
+  let(:content) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample.svg')) }
+
+  let(:xpath) { "//*[name()='text']" }
+  let(:val) { 'TEST' }
+
+  before { processor.call(content, xpath, val) }
+
+  it { Nokogiri::XML(content.data).xpath(xpath).count.must_equal 1 }
+  it { Nokogiri::XML(content.data).xpath(xpath).first.inner_html.must_equal val }
+
+  describe 'tempfile has extension' do
+    it { content.tempfile.path.must_match /\.svg\z/ }
+  end
+end

data/test/dragonfly_svg/processors/set_view_box_test.rb

@@ -1,19 +1,14 @@
 require 'test_helper'
 
-module DragonflySvg
-  module Processors
-    describe SetViewBox do
-      let(:app) { test_app.configure_with(:svg) }
-      let(:processor) { DragonflySvg::Processors::SetViewBox.new }
-      let(:svg) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample.svg')) }
+describe DragonflySvg::Processors::SetViewBox do
+  let(:app) { test_app.configure_with(:svg) }
+  let(:content) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample.svg')) }
+  let(:processor) { DragonflySvg::Processors::SetViewBox.new }
 
-      before do
-        processor.call(svg, 0, 0, 400, 600)
-      end
+  before { processor.call(content, 0, 0, 400, 600) }
+  it { content.data.must_include '0 0 400 600' }
 
-      it 'sets view box' do
-        svg.data.must_include '0 0 400 600'
-      end
-    end
+  describe 'tempfile has extension' do
+    it { content.tempfile.path.must_match /\.svg\z/ }
   end
 end

data/test/test_helper.rb

@@ -2,20 +2,18 @@ require 'bundler/setup'
 
 require 'minitest'
 require 'minitest/autorun'
+require 'minitest/reporters'
 require 'minitest/spec'
 
-require 'dragonfly'
 require 'dragonfly_svg'
 
-# ---------------------------------------------------------------------
+SAMPLES_DIR = Pathname.new(File.expand_path('../samples', __dir__))
 
-SAMPLES_DIR = Pathname.new(File.expand_path('../../samples', __FILE__))
-
-# ---------------------------------------------------------------------
+Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
 
 def test_app(name = nil)
-  app = Dragonfly::App.instance(name)
-  app.datastore = Dragonfly::MemoryDataStore.new
-  app.secret = 'test secret'
-  app
+  Dragonfly::App.instance(name).tap do |app|
+    app.datastore = Dragonfly::MemoryDataStore.new
+    app.secret = 'test secret'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly_svg
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-24 00:00:00.000000000 Z
+date: 2018-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
@@ -54,6 +54,20 @@ dependencies:
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+- !ruby/object:Gem::Dependency
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-minitest
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -118,6 +132,7 @@ files:
 - ".coveralls.yml"
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE
@@ -125,13 +140,7 @@ files:
 - Rakefile
 - dragonfly_svg.gemspec
 - lib/dragonfly_svg.rb
-- lib/dragonfly_svg/analysers/aspect_ratio_analyser.rb
-- lib/dragonfly_svg/analysers/base.rb
-- lib/dragonfly_svg/analysers/height_analyser.rb
-- lib/dragonfly_svg/analysers/landscape_analyser.rb
-- lib/dragonfly_svg/analysers/portrait_analyser.rb
 - lib/dragonfly_svg/analysers/svg_properties.rb
-- lib/dragonfly_svg/analysers/width_analyser.rb
 - lib/dragonfly_svg/plugin.rb
 - lib/dragonfly_svg/processors/extend_ids.rb
 - lib/dragonfly_svg/processors/remove_namespaces.rb
@@ -139,10 +148,11 @@ files:
 - lib/dragonfly_svg/processors/set_dimensions.rb
 - lib/dragonfly_svg/processors/set_namespace.rb
 - lib/dragonfly_svg/processors/set_preserve_aspect_ratio.rb
+- lib/dragonfly_svg/processors/set_tag_value.rb
 - lib/dragonfly_svg/processors/set_view_box.rb
 - lib/dragonfly_svg/version.rb
-- samples/sample.png
 - samples/sample.svg
+- samples/sample_without_dimensions.svg
 - test/dragonfly_svg/analysers/svg_properties_test.rb
 - test/dragonfly_svg/plugin_test.rb
 - test/dragonfly_svg/processors/extend_ids_test.rb
@@ -151,6 +161,7 @@ files:
 - test/dragonfly_svg/processors/set_dimensions_test.rb
 - test/dragonfly_svg/processors/set_namespace_test.rb
 - test/dragonfly_svg/processors/set_preserve_aspect_ratio_test.rb
+- test/dragonfly_svg/processors/set_tag_value_test.rb
 - test/dragonfly_svg/processors/set_view_box_test.rb
 - test/test_helper.rb
 homepage: https://github.com/tomasc/dragonfly_svg
@@ -173,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Dragonfly analyser and processor for SVGs.
@@ -186,5 +197,6 @@ test_files:
 - test/dragonfly_svg/processors/set_dimensions_test.rb
 - test/dragonfly_svg/processors/set_namespace_test.rb
 - test/dragonfly_svg/processors/set_preserve_aspect_ratio_test.rb
+- test/dragonfly_svg/processors/set_tag_value_test.rb
 - test/dragonfly_svg/processors/set_view_box_test.rb
 - test/test_helper.rb

data/lib/dragonfly_svg/analysers/aspect_ratio_analyser.rb

@@ -1,17 +0,0 @@
-module DragonflySvg
-  module Analysers
-    class AspectRatioAnalyser < Base
-      def initialize(app)
-        original = app.analysers.items[:aspect_ratio]
-        app.add_analyser(:aspect_ratio) do |content|
-          if is_svg?(content)
-            attrs = content.analyse(:svg_properties)
-            attrs[:width].to_f / attrs[:height]
-          elsif original
-            original.call(content)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/dragonfly_svg/analysers/base.rb

@@ -1,11 +0,0 @@
-module DragonflySvg
-  SVG_MIME_TYPE = 'image/svg+xml'.freeze
-
-  module Analysers
-    class Base
-      def is_svg?(content)
-        content.mime_type == DragonflySvg::SVG_MIME_TYPE
-      end
-    end
-  end
-end

data/lib/dragonfly_svg/analysers/height_analyser.rb

@@ -1,16 +0,0 @@
-module DragonflySvg
-  module Analysers
-    class HeightAnalyser < Base
-      def initialize(app)
-        original = app.analysers.items[:height]
-        app.add_analyser(:height) do |content|
-          if is_svg?(content)
-            content.analyse(:svg_properties)[:height]
-          elsif original
-            original.call(content)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/dragonfly_svg/analysers/landscape_analyser.rb

@@ -1,17 +0,0 @@
-module DragonflySvg
-  module Analysers
-    class LandscapeAnalyser < Base
-      def initialize(app)
-        original = app.analysers.items[:landscape]
-        app.add_analyser(:landscape) do |content|
-          if is_svg?(content)
-            attrs = content.analyse(:svg_properties)
-            attrs[:width] >= attrs[:height]
-          elsif original
-            original.call(content)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/dragonfly_svg/analysers/portrait_analyser.rb

@@ -1,17 +0,0 @@
-module DragonflySvg
-  module Analysers
-    class PortraitAnalyser < Base
-      def initialize(app)
-        original = app.analysers.items[:portrait]
-        app.add_analyser(:portrait) do |content|
-          if is_svg?(content)
-            attrs = content.analyse(:svg_properties)
-            attrs[:width] <= attrs[:height]
-          elsif original
-            original.call(content)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/dragonfly_svg/analysers/width_analyser.rb

@@ -1,16 +0,0 @@
-module DragonflySvg
-  module Analysers
-    class WidthAnalyser < Base
-      def initialize(app)
-        original = app.analysers.items[:width]
-        app.add_analyser(:width) do |content|
-          if is_svg?(content)
-            content.analyse(:svg_properties)[:width]
-          elsif original
-            original.call(content)
-          end
-        end
-      end
-    end
-  end
-end