cyborg 0.5.23 → 0.5.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f39879ff4f3fd4e28316d8e646c36b2ac90701f3
-  data.tar.gz: 4157d506118a428fbefae2f92ab69dc30d0c66fd
+  metadata.gz: 68cf19f866d0d344943d3d4844e0329bce1e52f2
+  data.tar.gz: 01126b6a0e25132737e68be1799fc3cbc8a5fe0a
 SHA512:
-  metadata.gz: 37d029410fe756af1105607637bd13204781aefc738c70b7ceb681319f6e40df6c83f1c00400d3d9af491b6babb7b82e0163d405207781e08963d932ebcf9195
-  data.tar.gz: 037765fbc3c3f3a45120d1aeac7f1b002c6cb5a930f2e62078ce97dcd4240770a9d702110730bd71a30a4e8a8944fd6e962ca29367e5409c9d21b0eaf3693f58
+  metadata.gz: 8b865ce911bec5cb84129cf9f48877bd43355ac7a666af16987bb8be422fa5d48256777b9071affba1c89a9a25d2bcdfb914f1d43a84a3928c221bec3235722c
+  data.tar.gz: 638361f7f4520e682211cb09a75393af11919e960eb620e69b2aadfaea128a62152b049c4f09a207a037ac7b8f6b259ece2b2bcd2458c9c5bef5d9c080c12b9f

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', '~> 3.2'
+  spec.add_runtime_dependency 'esvg', '~> 4.0'
   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

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

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

@@ -56,26 +56,27 @@ module Cyborg
         STDERR.puts msg.to_s.colorize(:red)
       end
 
-      # Determine if an NPM module is installed by checking paths with `npm ls`
+      # Determine if an NPM module is installed by checking paths with `npm bin`
       # Returns path to binary if installed
-      def find_node_module(cmd)
-        response = Open3.capture3("npm ls #{cmd}")
-
-        # Look in local `./node_modules` path.
-        # Be sure stderr is empty (the second argument returned by capture3)
-        if response[1].empty?
-          "$(npm bin)/#{cmd}"
-
-        # Check global module path
-        elsif Open3.capture3("npm ls -g #{cmd}")[1].empty?
-          cmd
+    def find_node_module(cmd)
+      require 'open3'
+      (@modules ||= {})[cmd] ||= begin
+
+        local = "$(npm bin)/#{cmd}"
+        global = "$(npm -g bin)/#{cmd}"
+        
+        if Open3.capture3(local)[2].success?
+          local
+        elsif Open3.capture3(global)[2].success?
+          global
         end
+
       end
+    end
 
       def npm_command(cmd)
         cmd = cmd.split(' ')
-        path = find_node_module(cmd.shift)
-        if path
+        if path = find_node_module(cmd.shift)
           system "#{path} #{cmd.join(' ')}"
         end
       end

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

@@ -3,18 +3,23 @@ module Cyborg
     class Svgs < AssetType
 
       def initialize(plugin, path)
-        require 'esvg'
+
+        require 'cyborg/esvg'
+
         @plugin = plugin
         @base = path
 
-        @svg = Esvg.new({
+        @svg = Esvg::SVG.new({
           config_file: File.join(plugin.root, 'config', 'esvg.yml'),
-          path: path,
-          tmp_path: Cyborg.rails_path('tmp/cache/assets'),
-          js_path: File.join(plugin.paths[:javascripts], '_icons.js'),
-          js_build_version: plugin.version,
-          js_build_dir: plugin.destination,
-          optimize: true
+          source: path,
+          assets: plugin.paths[:javascripts],
+          version: plugin.version,
+          build: plugin.destination,
+          temp: Cyborg.rails_path('tmp/cache/assets'),
+          filename: '_icons.js',
+          compress: Cyborg.production?,
+          optimize: true,
+          print: false
         })
 
       end
@@ -35,6 +40,10 @@ module Cyborg
             .sub(plugin.root+'/','')                 # writtent to public dir
       end
 
+      def use(*args)
+        icons.use(*args)
+      end
+
       def build_paths
         @svg.build_paths.map { |file| file.sub("-#{plugin.version}",'') }
       end
@@ -44,13 +53,10 @@ module Cyborg
         begin
           @svg.read_files
 
-          return if @svg.files.empty?
+          return if @svg.svgs.empty?
 
-          if files = @svg.write
+          if files = @svg.build
             files.each do |file|
-              if file.start_with?(plugin.destination)
-                compress(file)
-              end
               puts build_success(file)
             end
           else

data/lib/cyborg/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyborg
 version: !ruby/object:Gem::Version
-  version: 0.5.23
+  version: 0.5.24
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +193,7 @@ files:
 - lib/cyborg/command/help.rb
 - lib/cyborg/command/npm.rb
 - lib/cyborg/command/scaffold.rb
+- lib/cyborg/esvg.rb
 - lib/cyborg/helpers/asset_helpers.rb
 - lib/cyborg/helpers/layout_helpers.rb
 - lib/cyborg/middleware.rb