cyborg 0.5.20 → 0.5.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18932df829227244205d712f5f24606b960dbfc3
-  data.tar.gz: 00bf1a7894c7d4b08172b0f5760cb72ac1e1923c
+  metadata.gz: e39111c9fef46b63f7172aa6f57774a5ce4669ae
+  data.tar.gz: 00fa74b1ba044a4052f148ff45a29f0533ac5700
 SHA512:
-  metadata.gz: 6083983b7e9ec63be59d8e06dfe3f91e5845c6bbc6722077564eb4a39038c2af00553b2b9e6dc0fa0cbf6f33da7487119c65fb1b2b14ca90fae4c62f2cd5c7f3
-  data.tar.gz: 236f2ef3845d780006b286c4920cbda5f48e1a436b7d7aea8fe7fb0a000f0233186a0c977dc11a58444004978323f478a992d3c147418d4a6f4e774e973a67dc
+  metadata.gz: e0bc57a862058cfa6f14b3817bde0a8a194a7a5599e657f56b3cd9629931767590fbab2e71e8c8142890f59d2ebd9c9252ed2a07fbe4199989376283ad0d04c4
+  data.tar.gz: 3e85227a72c2764eb62977381c9f869859395a1dbb3b4d353749571decf3411554b7e5e871f3b9ad312bd458a59e90726ee049060ae7d29061003e9a03f49906

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.1'
+  spec.add_runtime_dependency 'esvg', '~> 3.2'
   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/helpers/asset_helpers.rb

@@ -21,7 +21,6 @@ module Cyborg
         options = args.last.is_a?(Hash) ? args.pop : {}
         tags = ''
 
-        puts "searching for: #{javascript_url(args)}"
         javascript_url(args).each do |url|
           tags += javascript_include_tag url, options
         end

data/lib/cyborg/middleware.rb

@@ -5,7 +5,7 @@ module Cyborg
   class Application < Rails::Application
     config.middleware.insert_before ActionDispatch::Static, Rack::Deflater
 
-    config.middleware.insert_before 0, "Rack::Cors", :debug => true, :logger => (-> { Rails.logger }) do
+    config.middleware.insert_before 0, Rack::Cors, :debug => true, :logger => (-> { Rails.logger }) do
       allow do
         origins "*"
         resource "*", {

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

@@ -22,17 +22,11 @@ module Cyborg
         end
       end
 
-      def filter_files(names=nil)
-        names = [names].flatten.compact.map do |n|
-          File.basename(n).sub(/(\..+)$/,'')
-        end
+      def filter_files(names)
 
-        if !names.empty?
-          find_files.select do |f|
-            names.include? File.basename(f).sub(/(\..+)$/,'')
-          end
-        else
-          find_files
+        # Filter names based on asset file locations
+        find_files.select do |f|
+          names.include? File.basename(f).sub(/(\..+)$/,'')
         end
       end
 
@@ -95,7 +89,21 @@ module Cyborg
       end
 
       def urls(names=nil)
-        filter_files(names).map{ |file| url(file) }
+        # If names are passed, look at the basename minus
+        # the extension as build files may have
+        # different extensions than sources
+        names = [names].flatten.compact.map do |n|
+          File.basename(n).sub(/(\..+)$/,'')
+        end
+
+        # Return all asset urls if none were specifically chosen
+        if names.empty?
+          find_files.map{ |file| url(file) }
+
+        # Filter files based on name
+        else
+          filter_files(names).map{ |file| url(file) }
+        end
       end
 
       def watch

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

@@ -13,6 +13,13 @@ module Cyborg
         Cyborg.rails_path("tmp/cache/assets/.browserify-cache-#{name}.json")
       end
 
+      # Find all asset files matching array of names
+      def filter_files(names)
+        [find_files, plugin.svgs.build_paths].flatten.select do |f|
+          names.include? File.basename(f).sub(/(\..+)$/,'')
+        end
+      end
+
       def build
         files = find_files
         FileUtils.mkdir_p(File.dirname(cache_file)) if !files.empty?

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

@@ -35,6 +35,10 @@ module Cyborg
             .sub(plugin.root+'/','')                 # writtent to public dir
       end
 
+      def build_paths
+        @svg.build_paths.map { |file| file.sub("-#{plugin.version}",'') }
+      end
+
       def build
 
         begin

data/lib/cyborg/version.rb

@@ -1,3 +1,3 @@
 module Cyborg
-  VERSION = "0.5.20"
+  VERSION = "0.5.21"
 end

metadata

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