cyborg 0.5.24 → 0.5.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68cf19f866d0d344943d3d4844e0329bce1e52f2
-  data.tar.gz: 01126b6a0e25132737e68be1799fc3cbc8a5fe0a
+  metadata.gz: 189d061f804203f7f8e6c0067ac5645758e98530
+  data.tar.gz: 6c7a1aa38771f9ef73be7f3b77839129039130cf
 SHA512:
-  metadata.gz: 8b865ce911bec5cb84129cf9f48877bd43355ac7a666af16987bb8be422fa5d48256777b9071affba1c89a9a25d2bcdfb914f1d43a84a3928c221bec3235722c
-  data.tar.gz: 638361f7f4520e682211cb09a75393af11919e960eb620e69b2aadfaea128a62152b049c4f09a207a037ac7b8f6b259ece2b2bcd2458c9c5bef5d9c080c12b9f
+  metadata.gz: 4150332a37bca33fccdc141476db52280ef35298afba506741234ee263329dba681405b1a29ab44644e47f8d5482464075d4915957e48f3c3c5a435c5e5a6dc6
+  data.tar.gz: 7e682811edda69acb9142cdf3b354ed4cc0ddd29d7e531739b098481aa0a5c13f8acd2731c257660edd334eb867daa7c879d1591232f91ad7253e328cf4d9e1b

data/cyborg.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'sass', '~> 3.4'
-  spec.add_runtime_dependency 'esvg', '~> 4.0'
+  spec.add_runtime_dependency 'esvg', '~> 4.1'
   spec.add_runtime_dependency 'listen', '~> 3.0.0'
   spec.add_runtime_dependency 'block_helpers', '~> 0.3'
   spec.add_runtime_dependency 'colorize', '~> 0.8'

data/lib/cyborg/esvg.rb

@@ -3,12 +3,14 @@ require 'esvg'
 module Esvg
   module Helpers
 
-    def use_svg(name, options={})
-      if esvg_files.exist?(name, options[:fallback])
-        esvg_files.use(name, options).html_safe
-      elsif Cyborg.plugin.svgs.icons.exist?(name, options[:fallback])
-        Cyborg.plugin.svgs.use(name, options).html_safe
+    def use_svg(name, options={}, &block)
+      files = if esvg.exist?(name, options[:fallback])
+        esvg
+      elsif Cyborg.plugin.svgs.esvg.exist?(name, options[:fallback])
+        Cyborg.plugin.svgs.esvg
       end
+
+      use_svg_with_files(files, name, options, &block) if files
     end
   end
 end

data/lib/cyborg/plugin/assets/svgs.rb

@@ -9,9 +9,12 @@ module Cyborg
         @plugin = plugin
         @base = path
 
-        @svg = Esvg::SVG.new({
+      end
+
+      def esvg
+        @svg ||= Esvg::SVG.new({
           config_file: File.join(plugin.root, 'config', 'esvg.yml'),
-          source: path,
+          source: @base,
           assets: plugin.paths[:javascripts],
           version: plugin.version,
           build: plugin.destination,
@@ -24,10 +27,6 @@ module Cyborg
 
       end
 
-      def icons
-        @svg
-      end
-
       def ext
         "svg"
       end
@@ -41,21 +40,21 @@ module Cyborg
       end
 
       def use(*args)
-        icons.use(*args)
+        esvg.use(*args)
       end
 
       def build_paths
-        @svg.build_paths.map { |file| file.sub("-#{plugin.version}",'') }
+        esvg.build_paths.map { |file| file.sub("-#{plugin.version}",'') }
       end
 
       def build
 
         begin
-          @svg.read_files
+          esvg.read_files
 
-          return if @svg.svgs.empty?
+          return if esvg.svgs.empty?
 
-          if files = @svg.build
+          if files = esvg.build
             files.each do |file|
               puts build_success(file)
             end

data/lib/cyborg/version.rb

@@ -1,3 +1,3 @@
 module Cyborg
-  VERSION = "0.5.24"
+  VERSION = "0.5.26"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyborg
 version: !ruby/object:Gem::Version
-  version: 0.5.24
+  version: 0.5.26
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement