middleman-svg 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f75c7508eeb8091388a6d0a5750f3fbc99f4bcb9
-  data.tar.gz: 99e5f0b678180819ce60c8e61b3f48b9960bf7cb
+SHA256:
+  metadata.gz: a8ec43630fd7af6af547cdd98d1ada9c78b91ddc89c93f1c2df0f37e51c47b2c
+  data.tar.gz: ab10e224897bba5158752b59fb85912dd24cb8ea687d1a66701cdfae596c35e4
 SHA512:
-  metadata.gz: fb03d634937ca902f894c58e0c4137730ddfd741aaf701a8213907efc6b8b902197d53e210fc258bbe41214e4dd0355df1d2be36f2efed15ba23b66e1db43d25
-  data.tar.gz: 9b44f0013e1b41c2702ab6094916a2a8db60b483b58934e053f3e9d98ca1fe89c04541f9e4fcef52506108510a5ba5d5b53a470782987c0fc0d1201e97f3a98d
+  metadata.gz: 014d5c9b7812fe51aa043200387687a5e261103c7be511f6cd961b0e33e28747c83250895343dbedc468465670dea88eb4c927427792b51c156d240f7ee2fae9
+  data.tar.gz: 724c0c667de15db17dadb835b7a8c11b43fee675e85e40f1af3e116e6dd46511472cc9467a35050d8809c8503d6ea39980bb04d1ccdbe423e8db424d1070f569

data/Gemfile

@@ -2,3 +2,16 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in middleman-test.gemspec
 gemspec
+
+gem 'middleman-core'
+
+# Build and doc tools
+gem 'rake', '>= 10.3', require: false
+gem 'yard', '>= 0.9',  require: false
+
+# Test tools
+gem 'byebug'
+gem 'rspec', '>= 3.0', require: false
+
+# Code Quality
+gem 'rubocop', '>= 0.57', require: false

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "middleman/svg"
+require "middleman-svg"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/middleman-svg.rb

@@ -1,4 +1,7 @@
-require 'middleman-core'
-require 'middleman/svg'
+require "middleman-core"
+require "middleman-svg/version"
 
-Middleman::Extensions.register(:inline_svg, Middleman::Svg::Extension)
+::Middleman::Extensions.register(:inline_svg) do
+  require "middleman-svg/extension"
+  ::Middleman::Svg::SvgExtension
+end

data/lib/middleman-svg/asset_file.rb

@@ -0,0 +1,16 @@
+module Middleman
+  module Svg
+    class AssetFile
+      class FileNotFound < IOError; end
+      UNREADABLE_PATH = ''
+
+      def self.named(filename)
+        root = Middleman::Application.root
+        source_path = File.join(root, 'source')
+        File.read(File.join(source_path, 'images', source) || File.join(source_path, 'fonts/svg', source) || UNREADABLE_PATH)
+      rescue Errno::ENOENT
+        raise FileNotFound.new("Asset not found: #{asset_path}")
+      end
+    end
+  end
+end

data/lib/{middleman/svg → middleman-svg}/extension.rb

@@ -1,11 +1,19 @@
-require 'middleman-core'
+require "middleman-svg/asset_file"
+require "middleman-svg/transform_pipeline"
+require "middleman-svg/io_resource"
+require "middleman-svg/uri_resource"
+require 'middleman-svg/id_generator'
+
+require 'uri'
+require 'open-uri'
+require 'nokogiri'
 
 module Middleman
   module Svg
-    class Extension < ::Middleman::Extension
+    class SvgExtension < Middleman::Extension
       expose_to_template :inline_svg
 
-      def initialize( app, options_hash={}, &block)
+      def initialize(app, options_hash={}, &block)
         super
 
         require 'active_support/core_ext/string'
@@ -13,15 +21,15 @@ module Middleman
 
       def inline_svg(filename, transform_params={})
         begin
-          svg_file = Middleman::Svg::Extension.read_svg(filename)
+          svg_file = Middleman::Svg::SvgExtension.read_svg(filename)
         rescue Middleman::Svg::AssetFile::FileNotFound
-          return Middleman::Svg::Extension.placeholder(filename) unless transform_params[:fallback].present?
+          return Middleman::Svg::SvgExtension.placeholder(filename) unless transform_params[:fallback].present?
 
           if transform_params[:fallback].present?
             begin
-              svg_file = Middleman::Svg::Extension.read_svg(transform_params[:fallback])
+              svg_file = Middleman::Svg::SvgExtension.read_svg(transform_params[:fallback])
             rescue Middleman::Svg::AssetFile::FileNotFound
-              Middleman::Svg::Extension.placeholder(filename)
+              Middleman::Svg::SvgExtension.placeholder(filename)
             end
           end
         end
@@ -32,8 +40,10 @@ module Middleman
       def self.read_svg(filename)
         if Middleman::Svg::IOResource === filename
           Middleman::Svg::IOResource.read filename
+        elsif Middleman::Svg::URIResource === filename
+          Middleman::Svg::URIResource.read filename
         else
-          Middleman::Svg::Extension.asset_path(filename)
+          Middleman::Svg::SvgExtension.asset_path(filename)
         end
       end
 
@@ -49,7 +59,7 @@ module Middleman
 
       def self.placeholder(filename)
         css_class = Middleman::Svg.configuration.svg_not_found_css_class
-        not_found_message = "'#{filename}' #{Middleman::Svg::Extension.extension_hint(filename)}"
+        not_found_message = "'#{filename}' #{Middleman::Svg::SvgExtension.extension_hint(filename)}"
 
         if css_class.nil?
           return "<svg><!-- SVG file not found: #{not_found_message}--></svg>".html_safe

data/lib/{middleman/svg → middleman-svg}/io_resource.rb

@@ -5,13 +5,6 @@ module Middleman
         object.is_a?(IO) || object.is_a?(StringIO)
       end
 
-      def self.default_for(object)
-        case object
-          when StringIO then ''
-          when IO then 1
-        end
-      end
-
       def self.read(object)
         start = object.pos
         str = object.read

data/lib/{middleman → middleman-svg}/svg.rb

@@ -4,7 +4,10 @@ require 'middleman/svg/extension'
 require "middleman/svg/asset_file"
 require "middleman/svg/transform_pipeline"
 require "middleman/svg/io_resource"
+require "middleman/svg/uri_resource"
 
+require 'uri'
+require 'open-uri'
 require 'nokogiri'
 
 module Middleman

data/lib/{middleman/svg → middleman-svg}/transform_pipeline.rb

@@ -8,5 +8,5 @@ module Middleman::Svg::TransformPipeline
 end
 
 require 'nokogiri'
-require 'middleman/svg/id_generator'
-require 'middleman/svg/transform_pipeline/transformations'
+require 'middleman-svg/id_generator'
+require 'middleman-svg/transform_pipeline/transformations'

data/lib/{middleman/svg → middleman-svg}/transform_pipeline/transformations.rb

@@ -60,18 +60,18 @@ module Middleman::Svg::TransformPipeline::Transformations
   end
 end
 
-require 'middleman/svg/transform_pipeline/transformations/transformation'
-require 'middleman/svg/transform_pipeline/transformations/no_defs'
-require 'middleman/svg/transform_pipeline/transformations/no_comment'
-require 'middleman/svg/transform_pipeline/transformations/class_attribute'
-require 'middleman/svg/transform_pipeline/transformations/style_attribute'
-require 'middleman/svg/transform_pipeline/transformations/title'
-require 'middleman/svg/transform_pipeline/transformations/description'
-require 'middleman/svg/transform_pipeline/transformations/size'
-require 'middleman/svg/transform_pipeline/transformations/height'
-require 'middleman/svg/transform_pipeline/transformations/width'
-require 'middleman/svg/transform_pipeline/transformations/id_attribute'
-require 'middleman/svg/transform_pipeline/transformations/data_attributes'
-require 'middleman/svg/transform_pipeline/transformations/preserve_aspect_ratio'
-require 'middleman/svg/transform_pipeline/transformations/aria_attributes'
-require "middleman/svg/transform_pipeline/transformations/aria_hidden_attribute"
+require 'middleman-svg/transform_pipeline/transformations/transformation'
+require 'middleman-svg/transform_pipeline/transformations/no_defs'
+require 'middleman-svg/transform_pipeline/transformations/no_comment'
+require 'middleman-svg/transform_pipeline/transformations/class_attribute'
+require 'middleman-svg/transform_pipeline/transformations/style_attribute'
+require 'middleman-svg/transform_pipeline/transformations/title'
+require 'middleman-svg/transform_pipeline/transformations/description'
+require 'middleman-svg/transform_pipeline/transformations/size'
+require 'middleman-svg/transform_pipeline/transformations/height'
+require 'middleman-svg/transform_pipeline/transformations/width'
+require 'middleman-svg/transform_pipeline/transformations/id_attribute'
+require 'middleman-svg/transform_pipeline/transformations/data_attributes'
+require 'middleman-svg/transform_pipeline/transformations/preserve_aspect_ratio'
+require 'middleman-svg/transform_pipeline/transformations/aria_attributes'
+require "middleman-svg/transform_pipeline/transformations/aria_hidden_attribute"

data/lib/middleman-svg/uri_resource.rb

@@ -0,0 +1,16 @@
+module Middleman
+  module Svg
+    module URIResource
+      def self.===(object)
+        return false if object.is_a?(IO) || object.is_a?(StringIO)
+        uri = URI.parse(object)
+        uri.kind_of?(URI::HTTP) or uri.kind_of?(URI::HTTPS)
+      end
+
+      def self.read(object)
+        str = open(object) { |f| f.read }
+        str
+      end
+    end
+  end
+end

data/lib/{middleman/svg → middleman-svg}/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Svg
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/middleman-svg.gemspec

@@ -1,32 +1,29 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'middleman/svg/version'
+require 'middleman-svg/version'
 
-Gem::Specification.new do |spec|
-  spec.platform      = Gem::Platform::RUBY
-  spec.name          = "middleman-svg"
-  spec.version       = Middleman::Svg::VERSION
-  spec.authors       = ["Damiano Giacomello"]
-  spec.email         = ["giacomello.damiano@gmail.com"]
+Gem::Specification.new do |s|
+  s.platform      = Gem::Platform::RUBY
+  s.name          = "middleman-svg"
+  s.version       = Middleman::Svg::VERSION
+  s.authors       = ["Damiano Giacomello"]
+  s.email         = ["giacomello.damiano@gmail.com"]
 
-  spec.summary       = "A simple helper to generate inline SVG with Middleman"
-  spec.description   = "A simple helper to generate inline SVG content with Middleman"
-  spec.homepage      = "https://github.com/cantierecreativo/middleman-svg"
-  spec.license       = "MIT"
+  s.summary       = "A simple helper to generate inline SVG with Middleman"
+  s.description   = "A simple helper to generate inline SVG content with Middleman"
+  s.homepage      = "https://github.com/cantierecreativo/middleman-svg"
+  s.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  s.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  s.bindir        = "exe"
+  s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  s.required_ruby_version = '>= 2.0.0'
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-
-  spec.add_runtime_dependency "middleman-core", ">= 4.0.0"
-  spec.add_runtime_dependency "activesupport", ">= 3.0"
-  spec.add_runtime_dependency "nokogiri", ">= 1.6"
+  s.add_runtime_dependency 'middleman-core', '~> 4.0', '>= 4.0.0'
+  s.add_runtime_dependency "activesupport", "~> 3.0", ">= 3.0"
+  s.add_runtime_dependency "nokogiri", "~> 1.6", ">= 1.6"
 end

metadata

@@ -1,61 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: middleman-svg
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Damiano Giacomello
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
+  name: middleman-core
   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: middleman-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
@@ -63,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
@@ -70,6 +34,9 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -77,6 +44,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -84,6 +54,9 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
@@ -91,6 +64,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
@@ -112,30 +88,31 @@ files:
 - bin/console
 - bin/setup
 - lib/middleman-svg.rb
-- lib/middleman/svg.rb
-- lib/middleman/svg/asset_file.rb
-- lib/middleman/svg/extension.rb
-- lib/middleman/svg/id_generator.rb
-- lib/middleman/svg/io_resource.rb
-- lib/middleman/svg/transform_pipeline.rb
-- lib/middleman/svg/transform_pipeline/transformations.rb
-- lib/middleman/svg/transform_pipeline/transformations/aria_attributes.rb
-- lib/middleman/svg/transform_pipeline/transformations/aria_hidden.rb
-- lib/middleman/svg/transform_pipeline/transformations/aria_hidden_attribute.rb
-- lib/middleman/svg/transform_pipeline/transformations/class_attribute.rb
-- lib/middleman/svg/transform_pipeline/transformations/data_attributes.rb
-- lib/middleman/svg/transform_pipeline/transformations/description.rb
-- lib/middleman/svg/transform_pipeline/transformations/height.rb
-- lib/middleman/svg/transform_pipeline/transformations/id_attribute.rb
-- lib/middleman/svg/transform_pipeline/transformations/no_comment.rb
-- lib/middleman/svg/transform_pipeline/transformations/no_defs.rb
-- lib/middleman/svg/transform_pipeline/transformations/preserve_aspect_ratio.rb
-- lib/middleman/svg/transform_pipeline/transformations/size.rb
-- lib/middleman/svg/transform_pipeline/transformations/style_attribute.rb
-- lib/middleman/svg/transform_pipeline/transformations/title.rb
-- lib/middleman/svg/transform_pipeline/transformations/transformation.rb
-- lib/middleman/svg/transform_pipeline/transformations/width.rb
-- lib/middleman/svg/version.rb
+- lib/middleman-svg/asset_file.rb
+- lib/middleman-svg/extension.rb
+- lib/middleman-svg/id_generator.rb
+- lib/middleman-svg/io_resource.rb
+- lib/middleman-svg/svg.rb
+- lib/middleman-svg/transform_pipeline.rb
+- lib/middleman-svg/transform_pipeline/transformations.rb
+- lib/middleman-svg/transform_pipeline/transformations/aria_attributes.rb
+- lib/middleman-svg/transform_pipeline/transformations/aria_hidden.rb
+- lib/middleman-svg/transform_pipeline/transformations/aria_hidden_attribute.rb
+- lib/middleman-svg/transform_pipeline/transformations/class_attribute.rb
+- lib/middleman-svg/transform_pipeline/transformations/data_attributes.rb
+- lib/middleman-svg/transform_pipeline/transformations/description.rb
+- lib/middleman-svg/transform_pipeline/transformations/height.rb
+- lib/middleman-svg/transform_pipeline/transformations/id_attribute.rb
+- lib/middleman-svg/transform_pipeline/transformations/no_comment.rb
+- lib/middleman-svg/transform_pipeline/transformations/no_defs.rb
+- lib/middleman-svg/transform_pipeline/transformations/preserve_aspect_ratio.rb
+- lib/middleman-svg/transform_pipeline/transformations/size.rb
+- lib/middleman-svg/transform_pipeline/transformations/style_attribute.rb
+- lib/middleman-svg/transform_pipeline/transformations/title.rb
+- lib/middleman-svg/transform_pipeline/transformations/transformation.rb
+- lib/middleman-svg/transform_pipeline/transformations/width.rb
+- lib/middleman-svg/uri_resource.rb
+- lib/middleman-svg/version.rb
 - middleman-svg.gemspec
 - source/images/example.svg
 - source/images/known-document-two.svg
@@ -155,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -163,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A simple helper to generate inline SVG with Middleman

data/lib/middleman/svg/asset_file.rb

@@ -1,14 +0,0 @@
-module Middleman::Svg
-  class AssetFile
-    class FileNotFound < IOError; end
-    UNREADABLE_PATH = ''
-
-    def self.named(filename)
-      root = Middleman::Application.root
-      source_path = File.join(root, 'source')
-      File.read(File.join(source_path, 'images', source) || File.join(source_path, 'fonts/svg', source) || UNREADABLE_PATH)
-    rescue Errno::ENOENT
-      raise FileNotFound.new("Asset not found: #{asset_path}")
-    end
-  end
-end