dragonfly_svg 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 535a838609a37371bc692cd6a18581fb6ee4e7be
-  data.tar.gz: 00c687d365a5b7600ec2ad7a3f0ebc28750e5511
+  metadata.gz: 0a80f5be599ee36aeef6e1fb8b3ac547eacfa5dd
+  data.tar.gz: 3381778fb2df92c6c806404a39f8e873aee38193
 SHA512:
-  metadata.gz: f313203428612c6bd4a44a47912bfcf236703939124f1305126242e7597729dff33e5e87ca6daf30f2c03903fb2dc99fe738737a099b4dd8b4ca88b9e2a5bd81
-  data.tar.gz: 84dad19fc19dbb7a62af87c4457eb0b91d44b35a86492222b9d2bac48bbfe72b36acea8753830c32a995a33bce75712bd6726f9b77beb0f9f968c9bb7a7c7284
+  metadata.gz: daa3efc319ebe8457c22f460f1cf69e00c6bd8b9f270d98983d7d5d927b6d36c12dedf183ffe8f7d93c98014880bd0a795b7694ba98291a0c55a8ba1b48648fb
+  data.tar.gz: bb23dfbe0b3f524e276962fe851bb95a8712fb442c7164df77d761d6baac63b7bf39af1595804a239cc2c14ac4422d94ecfe366eaca0f5d0c2e8c9d8d8afbbcb

data/.gitignore

@@ -20,3 +20,4 @@ tmp
 *.o
 *.a
 mkmf.log
+dragonfly.log

data/.travis.yml

@@ -2,11 +2,11 @@ language: ruby
 cache: bundler
 script: 'bundle exec rake'
 rvm:
-  - 1.9.3
+  - 2.2.2
 
 notifications:
   email:
     recipients:
       - tomas.celizna@gmail.com
     on_failure: change
-    on_success: never
+    on_success: never

data/README.md

@@ -60,6 +60,14 @@ Removes the `xmlns` namespace from the SVG.
 svg.remove_namespaces
 ```
 
+### SetAttribute
+
+Allows to set attribute for specified `xpath`:
+
+```ruby
+svg.set_attribute('./*[name()="svg"]', 'style', 'margin: 50px;')
+```
+
 ### SetDimensions
 
 Sets the dimensions of the SVG. Takes two parameters: `width` and `height`
@@ -100,4 +108,4 @@ svg.set_viewbox(0, 0, 400, 600)       # viewBox="0 0 400 600"
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+5. Create a new Pull Request

data/lib/dragonfly_svg.rb

@@ -1,7 +1,3 @@
-require "dragonfly"
-require "dragonfly_svg/plugin"
-require "dragonfly_svg/version"
-
-Dragonfly.app.configure do
-  plugin :svg
-end
+require 'dragonfly'
+require 'dragonfly_svg/plugin'
+require 'dragonfly_svg/version'

data/lib/dragonfly_svg/analysers/aspect_ratio_analyser.rb

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,17 @@
+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/svg_properties.rb

@@ -3,24 +3,22 @@ require 'nokogiri'
 module DragonflySvg
   module Analysers
     class SvgProperties
-
-      def call content
+      def call(content)
         node = svg_node(content)
 
         {
           width: node.get_attribute('width').to_f,
           height: node.get_attribute('height').to_f,
-          id: node.get_attribute('id'),
+          id: node.get_attribute('id')
         }
       end
 
       private # =============================================================
 
-      def svg_node content
+      def svg_node(content)
         return unless doc = Nokogiri::XML(content.data)
         doc.xpath("//*[name()='svg']").first
       end
-
     end
   end
-end
+end

data/lib/dragonfly_svg/analysers/width_analyser.rb

@@ -0,0 +1,16 @@
+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

data/lib/dragonfly_svg/plugin.rb

@@ -1,4 +1,12 @@
+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'
 require 'dragonfly_svg/processors/set_attribute'
@@ -9,26 +17,15 @@ require 'dragonfly_svg/processors/set_view_box'
 
 module DragonflySvg
   class Plugin
-
-    def call app, opts={}
+    def call(app, _opts = {})
       app.add_analyser :svg_properties, DragonflySvg::Analysers::SvgProperties.new
-      app.add_analyser :width do |content|
-        content.analyse(:svg_properties)[:width]
-      end
-      app.add_analyser :height do |content|
-        content.analyse(:svg_properties)[:height]
-      end
-      app.add_analyser :aspect_ratio do |content|
-        attrs = content.analyse(:svg_properties)
-        attrs[:width].to_f / attrs[:height].to_f
-      end
-      app.add_analyser :portrait do |content|
-        attrs = content.analyse(:svg_properties)
-        attrs[:width] <= attrs[:height]
-      end
-      app.add_analyser :landscape do |content|
-        !content.analyse(:portrait)
-      end
+
+      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]
       end
@@ -45,7 +42,6 @@ module DragonflySvg
       app.add_processor :set_preserve_aspect_ratio, DragonflySvg::Processors::SetPreserveAspectRatio.new
       app.add_processor :set_view_box, DragonflySvg::Processors::SetViewBox.new
     end
-
   end
 end
 

data/lib/dragonfly_svg/processors/extend_ids.rb

@@ -3,25 +3,23 @@ require 'nokogiri'
 module DragonflySvg
   module Processors
     class ExtendIds
-
-      def call content, append_str=SecureRandom.urlsafe_base64(8)
+      def call(content, append_str = SecureRandom.urlsafe_base64(8))
         doc = Nokogiri::XML(content.data)
 
         # nodes with id attributes
-        doc.xpath("//*[@id]").each do |node|
+        doc.xpath('//*[@id]').each do |node|
           node_id = node.get_attribute 'id'
           node.set_attribute 'id', [node_id, append_str].join('-')
         end
 
         # nodes with id references
-        doc.xpath("//*[@href]").each do |node|
+        doc.xpath('//*[@href]').each do |node|
           node_href = node.get_attribute 'href'
           node.set_attribute 'href', [node_href, append_str].join('-')
         end
 
         content.update(doc.to_xml)
       end
-
     end
   end
-end
+end

data/lib/dragonfly_svg/processors/remove_namespaces.rb

@@ -3,8 +3,7 @@ require 'nokogiri'
 module DragonflySvg
   module Processors
     class RemoveNamespaces
-
-      def call content
+      def call(content)
         doc = Nokogiri::XML(content.data)
 
         doc.remove_namespaces!
@@ -13,4 +12,4 @@ module DragonflySvg
       end
     end
   end
-end
+end

data/lib/dragonfly_svg/processors/set_attribute.rb

@@ -3,8 +3,7 @@ require 'nokogiri'
 module DragonflySvg
   module Processors
     class SetAttribute
-
-      def call content, xpath, attribute_name, value
+      def call(content, xpath, attribute_name, value)
         doc = Nokogiri::XML(content.data)
 
         doc.xpath(xpath).each do |node|
@@ -13,7 +12,6 @@ module DragonflySvg
 
         content.update(doc.to_xml)
       end
-
     end
   end
 end

data/lib/dragonfly_svg/processors/set_dimensions.rb

@@ -3,18 +3,10 @@ require 'nokogiri'
 module DragonflySvg
   module Processors
     class SetDimensions
-
-      def call content, width, height
-        doc = Nokogiri::XML(content.data)
-
-        if svg_node = doc.xpath("//*[name()='svg']").first
-          svg_node.set_attribute 'width', width unless width.nil?
-          svg_node.set_attribute 'height', height unless height.nil?
-        end
-
-        content.update(doc.to_xml)
+      def call(content, width, height)
+        SetAttribute.new.call(content, "//*[name()='svg']", 'width', width) if width
+        SetAttribute.new.call(content, "//*[name()='svg']", 'height', height) if height
       end
-
     end
   end
-end
+end

data/lib/dragonfly_svg/processors/set_namespace.rb

@@ -3,8 +3,7 @@ require 'nokogiri'
 module DragonflySvg
   module Processors
     class SetNamespace
-
-      def call content, namespace="http://www.w3.org/2000/svg"
+      def call(content, namespace = 'http://www.w3.org/2000/svg')
         doc = Nokogiri::XML(content.data)
 
         if svg_node = doc.xpath("//*[name()='svg']").first
@@ -16,7 +15,6 @@ module DragonflySvg
 
         content.update(doc.to_xml)
       end
-
     end
   end
-end
+end

data/lib/dragonfly_svg/processors/set_preserve_aspect_ratio.rb

@@ -3,17 +3,9 @@ require 'nokogiri'
 module DragonflySvg
   module Processors
     class SetPreserveAspectRatio
-
-      def call content, value='xMinYMin meet'
-        doc = Nokogiri::XML(content.data)
-
-        if svg_node = doc.xpath("//*[name()='svg']").first
-          svg_node.set_attribute 'preserveAspectRatio', value
-        end
-
-        content.update(doc.to_xml)
+      def call(content, value = 'xMinYMin meet')
+        SetAttribute.new.call(content, "//*[name()='svg']", 'preserveAspectRatio', value)
       end
-
     end
   end
-end
+end

data/lib/dragonfly_svg/processors/set_view_box.rb

@@ -3,19 +3,10 @@ require 'nokogiri'
 module DragonflySvg
   module Processors
     class SetViewBox
-
-      def call content, min_x, min_y, width, height
-        doc = Nokogiri::XML(content.data)
-
+      def call(content, min_x, min_y, width, height)
         value = [min_x, min_y, width, height].map(&:to_s).join(' ')
-
-        if svg_node = doc.xpath("//*[name()='svg']").first
-          svg_node.set_attribute 'viewBox', value
-        end
-
-        content.update(doc.to_xml)
+        SetAttribute.new.call(content, "//*[name()='svg']", 'viewBox', value)
       end
-
     end
   end
-end
+end

data/lib/dragonfly_svg/version.rb

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

data/test/dragonfly_svg/analysers/svg_properties_test.rb

@@ -3,7 +3,6 @@ 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')) }
@@ -28,7 +27,6 @@ module DragonflySvg
           svg_properties[:id].must_equal 'sample_id'
         end
       end
-
     end
   end
-end
+end

data/test/dragonfly_svg/plugin_test.rb

@@ -2,7 +2,6 @@ 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')) }
 
@@ -15,19 +14,60 @@ module DragonflySvg
 
       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
 
     # ---------------------------------------------------------------------
@@ -57,6 +97,5 @@ module DragonflySvg
         svg.must_respond_to :set_view_box
       end
     end
-
   end
-end
+end

data/test/dragonfly_svg/processors/extend_ids_test.rb

@@ -3,7 +3,6 @@ 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 }
@@ -22,7 +21,6 @@ module DragonflySvg
         processor.call(svg, 'foo')
         analyser.call(svg)[:id].must_equal "#{@orig_id}-foo"
       end
-
     end
   end
-end
+end

data/test/dragonfly_svg/processors/remove_namespaces_test.rb

@@ -3,7 +3,6 @@ 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')) }
@@ -12,7 +11,6 @@ module DragonflySvg
         processor.call(svg)
         svg.data.wont_include 'xmlns='
       end
-
     end
   end
-end
+end

data/test/dragonfly_svg/processors/set_attribute_test.rb

@@ -3,7 +3,6 @@ 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 }
@@ -11,17 +10,16 @@ module DragonflySvg
 
       let(:xpath) { "./*[name()='svg']" }
       let(:attribute_name) { 'style' }
-      let(:value) { 'margin: 50px;' }
+      let(:attribute_value) { 'margin: 50px;' }
 
       before do
-        processor.call(svg, xpath, attribute_name, value)
+        processor.call(svg, xpath, attribute_name, attribute_value)
       end
 
       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 value
+        Nokogiri::XML(svg.data).xpath(xpath).first.get_attribute('style').must_equal attribute_value
       end
-
     end
   end
 end

data/test/dragonfly_svg/processors/set_dimensions_test.rb

@@ -3,7 +3,6 @@ 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 }
@@ -20,7 +19,6 @@ module DragonflySvg
       it 'sets height' do
         analyser.call(svg)[:height].must_equal 600
       end
-
     end
   end
-end
+end

data/test/dragonfly_svg/processors/set_namespace_test.rb

@@ -3,7 +3,6 @@ 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')) }
@@ -17,7 +16,6 @@ module DragonflySvg
         processor.call(svg, 'custom_namespace')
         svg.data.must_include 'custom_namespace'
       end
-
     end
   end
-end
+end

data/test/dragonfly_svg/processors/set_preserve_aspect_ratio_test.rb

@@ -3,7 +3,6 @@ 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')) }
@@ -11,22 +10,21 @@ module DragonflySvg
       describe 'with default value' do
         it 'adds preserveAspectRatio attribute' do
           processor.call(svg)
-          svg.data.must_include "preserveAspectRatio"
+          svg.data.must_include 'preserveAspectRatio'
         end
 
         it 'sets default value' do
           processor.call(svg)
-          svg.data.must_include "xMinYMin meet"
+          svg.data.must_include 'xMinYMin meet'
         end
       end
 
       describe 'with specified value' do
         it 'adds preserveAspectRatio with specified value' do
           processor.call(svg, 'xMidYMid meet')
-          svg.data.must_include "xMidYMid meet"
+          svg.data.must_include 'xMidYMid meet'
         end
       end
-
     end
   end
-end
+end

data/test/dragonfly_svg/processors/set_view_box_test.rb

@@ -3,7 +3,6 @@ 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')) }
@@ -15,7 +14,6 @@ module DragonflySvg
       it 'sets view box' do
         svg.data.must_include '0 0 400 600'
       end
-
     end
   end
-end
+end

data/test/test_helper.rb

@@ -13,9 +13,9 @@ SAMPLES_DIR = Pathname.new(File.expand_path('../../samples', __FILE__))
 
 # ---------------------------------------------------------------------
 
-def test_app name=nil
+def test_app(name = nil)
   app = Dragonfly::App.instance(name)
   app.datastore = Dragonfly::MemoryDataStore.new
-  app.secret = "test secret"
+  app.secret = 'test secret'
   app
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly_svg
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2016-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
@@ -125,7 +125,13 @@ 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
@@ -135,6 +141,7 @@ files:
 - lib/dragonfly_svg/processors/set_preserve_aspect_ratio.rb
 - lib/dragonfly_svg/processors/set_view_box.rb
 - lib/dragonfly_svg/version.rb
+- samples/sample.png
 - samples/sample.svg
 - test/dragonfly_svg/analysers/svg_properties_test.rb
 - test/dragonfly_svg/plugin_test.rb