carrierwave-audio-waveform 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6497146ba653815208e4665a1ed1bfad567a9f1b
-  data.tar.gz: c727ed3c1b3b5575a026fc42fa6d3635640e2ceb
+  metadata.gz: 2cf043df5b38e07639eb6a531706b07163868e36
+  data.tar.gz: 67140c30355b8c621c5d2b2fbe69775cd6c79aa4
 SHA512:
-  metadata.gz: f475378005b85801917e5083709056a665e59441b36712b812956287947301bd70f81d671cd7e35adc68fe3ea978cefe02a6cf54b7abb2cdac02800d5bffa976
-  data.tar.gz: a26fd903358e1978545d4754524ed3f29f495e3eceac6c5d49d61556024963c035b7a13ca227609c9107c50bee4736fd7069bf8418191b49b9b8b254e77c6f75
+  metadata.gz: 69db0a620320c1ecf4b36c5530c45abbe232ec10489410c8c1c0b0452b8dca38e88ffb890877dafe8f0afee5c4bad572761b0eaae48c6059ed1d36e8c80ca41c
+  data.tar.gz: 3787b962fa47074f2cc3c6ccdffd241529c947869a1772717a621a32fd32ee9206af20f6422148b8a46f5fe635842457157cd8c0b2b1fddcfce9e79a24cce3c5

data/lib/carrierwave/audio_waveform/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module AudioWaveform
-    VERSION = '1.0.4'
+    VERSION = '1.0.5'
   end
 end

data/lib/carrierwave/audio_waveform/waveformer.rb

@@ -106,7 +106,7 @@ module CarrierWave
           # the larger the frames are, the more "peaky" the waveform should get,
           # perhaps to the point of inaccurately reflecting the actual sound.
           samples = frames(source, options[:width], options[:method]).collect do |frame|
-            frame.inject(0.0) { |sum, peak| sum + peak } / frame.size
+            frame.inject(0.0) { |sum, peak| sum + peak } / frame.size      
           end
 
           @log.timed("\nDrawing...") do
@@ -211,15 +211,34 @@ module CarrierWave
         end
 
         def draw_svg(samples, options)
-          image = "<svg viewbox=\"0 0 #{options[:width]} #{options[:height]}\" preserveAspectRatio=\"none\" width=\"100%\" height=\"100%\">"          
-          if options[:hide_style].nil?
+          wave_image    = ""
+          samples       = spaced_samples(samples, options[:sample_width], options[:gap_width]) if options[:sample_width]
+          height_factor = (options[:height] * 0.85 / 2.0)
+
+          bar_pos = 0
+          samples.each_with_index do |sample, pos|
+            next if sample.nil?
+
+            if (pos%3 == 0)
+              amplitude = sample * height_factor
+              top       = (0 - amplitude).round
+              bottom    = (0 + amplitude).round
+
+              wave_image+= "M#{bar_pos},#{top}V#{bottom}"
+
+              bar_pos += 1
+            end
+          end
+
+          image = "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3/org/1999/xlink\" viewbox=\"0 0 #{iPos+1} #{options[:height]}\" preserveAspectRatio=\"none\" width=\"100%\" height=\"100%\">"          
+          if (options[:hide_style].nil? || options[:hide_style] == false)
             image+= "<style>"
             image+= "svg {"
             image+= "stroke: #000;"
-            image+= "stroke-width: 1;"
+            image+= "stroke-width: 0.25;"
             image+= "}"
             image+= "use.waveform-progress {"
-            image+= "stroke-width: 2;"
+            image+= "stroke-width: 0.25;"
             image+= "clip-path: polygon(0% 0%, 0% 0%, 0% 100%, 0% 100%);"
             image+= "}"
             image+= "svg path {"
@@ -239,22 +258,10 @@ module CarrierWave
           end
           uniqueWaveformID = "waveform-#{SecureRandom.uuid}"
           image+= "<g id=\"#{uniqueWaveformID}\">"
-          image+= '<g transform="translate(0, 125.0)">'
+          image+= "<g transform=\"translate(0, #{options[:height] / 2.0})\">"
           image+= '<path stroke="currrentColor" d="'
 
-          samples       = spaced_samples(samples, options[:sample_width], options[:gap_width]) if options[:sample_width]
-          max           = samples.reject {|v| v.nil? }.max
-          height_factor = (options[:height] / 2.0) / max
-
-          samples.each_with_index do |sample, pos|
-            next if sample.nil?
-
-            amplitude = sample * height_factor
-            top       = (0 - amplitude).round
-            bottom    = (0 + amplitude).round
-
-            image+= " M#{pos},#{top} V#{bottom}"
-          end
+          image+= wave_image
 
           image+= '"/>'
           image+= "</g>"
@@ -315,7 +322,7 @@ module CarrierWave
 
         def spaced_samples samples, sample_width = 1, gap_width = 1
           sample_width = sample_width.to_i >= 1 ? sample_width.to_i : 1
-          gap_width = gap_width.to_i >= 1 ? gap_width.to_i : 1
+          gap_width = gap_width.to_i >= 0 ? gap_width.to_i : 1
           width_counter = sample_width
           current_sample_index = 0
           spaced_samples = []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-audio-waveform
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Trevor Hinesley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2018-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave