inline_svg 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fb6e64ae5311883892613c4a6b3eebf128961b6
-  data.tar.gz: 40f3eb0a9198ff40838f3df4fe93937a3ef1dd9c
+  metadata.gz: 03af7d5bbffb013be526892939230f59115d147f
+  data.tar.gz: 5ec5c3bf3efd03be4b65940e91e42677b61e0222
 SHA512:
-  metadata.gz: 2a6d3430898827a14e0b34dfe018efe8f99991dd7362f758e63973e75d577d7cb6116ee8cb981a1534dfd7283fd170e9bbef36ad13325f7fc482423c86de0314
-  data.tar.gz: 126adaf50a5d41ea9225c3497cf2df7ee20c231caf33f653773ddc03d8cb5b2c32bf51248ac5bbd1cff9e19ca494422cccfadf7136530d08826b71e74d9cc17b
+  metadata.gz: 9b2ac5b8b8c784642822510229dbe42c9ede8a48824c7f357bed960e106a1439b5ae30060ccaecf198379e5a87bef0b9e2b40c7f233925ca4fc6b63e15b86626
+  data.tar.gz: 804cf57efaaee53e5de5b85c97330c56f17d7cbf5c73e46b2b7cad41d700747201e687c09dbe2158f65dcd374ac8e90264856ed05500884577b4ea21c594ef95

data/CHANGELOG.md

@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased][unreleased]
 - Nothing
 
+## [0.11.1] - 2016-11-22
+### Fixed
+- Dasherize data attribute names:
+  [#51](https://github.com/jamesmartin/inline_svg/issues/51)
+- Prevent ID collisions between `desc` and `title` attrs:
+  [#52](https://github.com/jamesmartin/inline_svg/pull/52)
+
 ## [0.11.0] - 2016-07-24
 ### Added
 - Priority ordering for transformations
@@ -117,7 +124,8 @@ transformations](https://github.com/jamesmartin/inline_svg/blob/master/README.md
 ### Added
 - Basic Railtie and view helper to inline SVG documents to Rails views.
 
-[unreleased]: https://github.com/jamesmartin/inline_svg/compare/v0.11.0...HEAD
+[unreleased]: https://github.com/jamesmartin/inline_svg/compare/v0.11.1...HEAD
+[0.11.1]: https://github.com/jamesmartin/inline_svg/compare/v0.11.0...v0.11.1
 [0.11.0]: https://github.com/jamesmartin/inline_svg/compare/v0.10.0...v0.11.0
 [0.10.0]: https://github.com/jamesmartin/inline_svg/compare/v0.9.1...v0.10.0
 [0.9.1]: https://github.com/jamesmartin/inline_svg/compare/v0.9.0...v0.9.1

data/README.md

@@ -13,7 +13,7 @@ Want to embed SVGs with Javascript? You might like [RemoteSvg](https://github.co
 
 ## Changelog
 
-This project adheres to [Semantic Versioning](http://sermver.org). All notable changes are documented in the
+This project adheres to [Semantic Versioning](http://semver.org). All notable changes are documented in the
 [CHANGELOG](https://github.com/jamesmartin/inline_svg/blob/master/CHANGELOG.md).
 
 ## Installation

data/lib/inline_svg/transform_pipeline/transformations/aria_attributes.rb

@@ -26,9 +26,9 @@ module InlineSvg::TransformPipeline::Transformations
 
     def element_id_for(base, element)
       if element['id'].nil?
-        InlineSvg::IdGenerator.generate(base, value)
+        InlineSvg::IdGenerator.generate(base, element.text)
       else
-        InlineSvg::IdGenerator.generate(element['id'], value)
+        InlineSvg::IdGenerator.generate(element['id'], element.text)
       end
     end
   end

data/lib/inline_svg/transform_pipeline/transformations/data_attributes.rb

@@ -4,13 +4,19 @@ module InlineSvg::TransformPipeline::Transformations
       doc = Nokogiri::XML::Document.parse(doc.to_html)
       svg = doc.at_css 'svg'
       with_valid_hash_from(self.value).each_pair do |name, data|
-        svg["data-#{name}"] = data
+        svg["data-#{dasherize(name)}"] = data
       end
       doc
     end
 
+    private
+
     def with_valid_hash_from(hash)
       Hash.try_convert(hash) || {}
     end
+
+    def dasherize(string)
+      string.to_s.gsub(/_/, "-")
+    end
   end
 end

data/lib/inline_svg/version.rb

@@ -1,3 +1,3 @@
 module InlineSvg
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

data/spec/transformation_pipeline/transformations/aria_attributes_spec.rb

@@ -13,9 +13,9 @@ describe InlineSvg::TransformPipeline::Transformations::AriaAttributes do
   context "aria-labelledby attribute" do
     it "adds 'title' when a title element is present" do
       document = Nokogiri::XML::Document.parse('<svg><title>Some title</title>Some document</svg>')
-      transformation = InlineSvg::TransformPipeline::Transformations::AriaAttributes.create_with_value("some-salt")
+      transformation = InlineSvg::TransformPipeline::Transformations::AriaAttributes.create_with_value(true)
 
-      expect(InlineSvg::IdGenerator).to receive(:generate).with("title", "some-salt").
+      expect(InlineSvg::IdGenerator).to receive(:generate).with("title", "Some title").
         and_return("some-id")
 
       expect(transformation.transform(document).to_html).to eq(
@@ -25,9 +25,9 @@ describe InlineSvg::TransformPipeline::Transformations::AriaAttributes do
 
     it "adds 'desc' when a description element is present" do
       document = Nokogiri::XML::Document.parse('<svg><desc>Some description</desc>Some document</svg>')
-      transformation = InlineSvg::TransformPipeline::Transformations::AriaAttributes.create_with_value("some-salt")
+      transformation = InlineSvg::TransformPipeline::Transformations::AriaAttributes.create_with_value(true)
 
-      expect(InlineSvg::IdGenerator).to receive(:generate).with("desc", "some-salt").
+      expect(InlineSvg::IdGenerator).to receive(:generate).with("desc", "Some description").
         and_return("some-id")
 
       expect(transformation.transform(document).to_html).to eq(
@@ -37,11 +37,11 @@ describe InlineSvg::TransformPipeline::Transformations::AriaAttributes do
 
     it "adds both 'desc' and 'title' when title and description elements are present" do
       document = Nokogiri::XML::Document.parse('<svg><title>Some title</title><desc>Some description</desc>Some document</svg>')
-      transformation = InlineSvg::TransformPipeline::Transformations::AriaAttributes.create_with_value("some-salt")
+      transformation = InlineSvg::TransformPipeline::Transformations::AriaAttributes.create_with_value(true)
 
-      expect(InlineSvg::IdGenerator).to receive(:generate).with("title", "some-salt").
+      expect(InlineSvg::IdGenerator).to receive(:generate).with("title", "Some title").
         and_return("some-id")
-      expect(InlineSvg::IdGenerator).to receive(:generate).with("desc", "some-salt").
+      expect(InlineSvg::IdGenerator).to receive(:generate).with("desc", "Some description").
         and_return("some-other-id")
 
       expect(transformation.transform(document).to_html).to eq(
@@ -51,11 +51,11 @@ describe InlineSvg::TransformPipeline::Transformations::AriaAttributes do
 
     it "uses existing IDs when they exist" do
       document = Nokogiri::XML::Document.parse('<svg><title id="my-title">Some title</title><desc id="my-desc">Some description</desc>Some document</svg>')
-      transformation = InlineSvg::TransformPipeline::Transformations::AriaAttributes.create_with_value("some-salt")
+      transformation = InlineSvg::TransformPipeline::Transformations::AriaAttributes.create_with_value(true)
 
-      expect(InlineSvg::IdGenerator).to receive(:generate).with("my-title", "some-salt").
+      expect(InlineSvg::IdGenerator).to receive(:generate).with("my-title", "Some title").
         and_return("some-id")
-      expect(InlineSvg::IdGenerator).to receive(:generate).with("my-desc", "some-salt").
+      expect(InlineSvg::IdGenerator).to receive(:generate).with("my-desc", "Some description").
         and_return("some-other-id")
 
       expect(transformation.transform(document).to_html).to eq(

data/spec/transformation_pipeline/transformations/data_attributes_spec.rb

@@ -10,6 +10,24 @@ describe InlineSvg::TransformPipeline::Transformations::DataAttributes do
     )
   end
 
+  it "dasherizes the data attribute name" do
+    document = Nokogiri::XML::Document.parse('<svg>Some document</svg>')
+    transformation = InlineSvg::TransformPipeline::Transformations::DataAttributes.create_with_value({some_name: "value"})
+
+    expect(transformation.transform(document).to_html).to eq(
+      "<svg data-some-name=\"value\">Some document</svg>\n"
+    )
+  end
+
+  it "dasherizes a data attribute name with multiple parts" do
+    document = Nokogiri::XML::Document.parse('<svg>Some document</svg>')
+    transformation = InlineSvg::TransformPipeline::Transformations::DataAttributes.create_with_value({some_other_name: "value"})
+
+    expect(transformation.transform(document).to_html).to eq(
+      "<svg data-some-other-name=\"value\">Some document</svg>\n"
+    )
+  end
+
   context "when multiple data attributes are supplied" do
     it "adds data attributes to the SVG for each supplied value" do
       document = Nokogiri::XML::Document.parse('<svg>Some document</svg>')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inline_svg
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - James Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler