carrierwave-audio-waveform 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b978937b699c8840ed808da400cc75406b850c7
-  data.tar.gz: e8ea1146faf2a37a1fcdb7c98172c1a241008bfc
+  metadata.gz: 6497146ba653815208e4665a1ed1bfad567a9f1b
+  data.tar.gz: c727ed3c1b3b5575a026fc42fa6d3635640e2ceb
 SHA512:
-  metadata.gz: 763f2a8d2b40333712f256cf8f8cac5e2a75559a30d24857a3075f1f8cb30f5ee1ac825b97d719b8d7bf46f09542fcf1432ba67f2d34a327a1ccf75062e5ff42
-  data.tar.gz: 377f117014e72cc62fb6c3dafb1a1882a77ce43100b548c10690da7c2f6f79c6564b5f80ca95c4f34503f6df2cf51f1afbb718e30ea7d8c956e2b12de2a116c7
+  metadata.gz: f475378005b85801917e5083709056a665e59441b36712b812956287947301bd70f81d671cd7e35adc68fe3ea978cefe02a6cf54b7abb2cdac02800d5bffa976
+  data.tar.gz: a26fd903358e1978545d4754524ed3f29f495e3eceac6c5d49d61556024963c035b7a13ca227609c9107c50bee4736fd7069bf8418191b49b9b8b254e77c6f75

data/lib/carrierwave/audio_waveform.rb

@@ -21,7 +21,12 @@ module CarrierWave
 
       image_filename = Waveformer.generate(current_path, options)
       File.rename image_filename, current_path
-      self.file.instance_variable_set(:@content_type, "image/png")
+
+      if options[:type] == :svg
+        self.file.instance_variable_set(:@content_type, "image/svg+xml")
+      else
+        self.file.instance_variable_set(:@content_type, "image/png")
+      end
     end
 
     def waveform_data options={}

data/lib/carrierwave/audio_waveform/version.rb

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

data/lib/carrierwave/audio_waveform/waveformer.rb

@@ -12,7 +12,8 @@ module CarrierWave
         :height => 280,
         :background_color => "#666666",
         :color => "#00ccff",
-        :logger => nil
+        :logger => nil,
+        :type => :png
       }
 
       TransparencyMask = "#00ff00"
@@ -80,7 +81,7 @@ module CarrierWave
         #
         def generate(source, options={})
           options = DefaultOptions.merge(options)
-          filename = options[:filename] || self.generate_png_filename(source)
+          filename = options[:filename] || self.generate_image_filename(source, options[:type])
 
           raise ArgumentError.new("No source audio filename given, must be an existing sound file.") unless source
           raise ArgumentError.new("No destination filename given for waveform") unless filename
@@ -117,7 +118,14 @@ module CarrierWave
             end
 
             image = draw samples, options
-            image.save filename
+
+            if options[:type] == :svg
+              File.open(filename, 'w') do |f|
+                f.puts image
+              end
+            else
+              image.save filename
+            end
           end
 
           if source != old_source
@@ -130,10 +138,15 @@ module CarrierWave
           filename
         end
 
-        def generate_png_filename(source)
+        def generate_image_filename(source, image_type)
           ext = File.extname(source)
           source_file_path_without_extension = File.join File.dirname(source), File.basename(source, ext)
-          "#{source_file_path_without_extension}.png"
+
+          if image_type == :svg
+            "#{source_file_path_without_extension}.svg"
+          else
+            "#{source_file_path_without_extension}.png"
+          end
         end
 
         private
@@ -189,8 +202,71 @@ module CarrierWave
           raise RuntimeError.new("Source audio file #{source} could not be read by RubyAudio library -- Hint: non-WAV files are no longer supported, convert to WAV first using something like ffmpeg (RubyAudio: #{e.message})")
         end
 
-        # Draws the given samples using the given options, returns a ChunkyPNG::Image.
         def draw(samples, options)
+          if options[:type] == :svg
+            draw_svg(samples, options)
+          else
+            draw_png(samples, options)
+          end
+        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?
+            image+= "<style>"
+            image+= "svg {"
+            image+= "stroke: #000;"
+            image+= "stroke-width: 1;"
+            image+= "}"
+            image+= "use.waveform-progress {"
+            image+= "stroke-width: 2;"
+            image+= "clip-path: polygon(0% 0%, 0% 0%, 0% 100%, 0% 100%);"
+            image+= "}"
+            image+= "svg path {"
+            image+= "stroke: inherit;"
+            image+= "stroke-width: inherit;"
+            image+= "}"
+            image+= "</style>"
+          end
+          image+= "<defs>"
+          if options[:gradient]
+            options[:gradient].each_with_index do |grad, id|
+              image+= "<linearGradient id=\"linear#{id}\" x1=\"0%\" y1=\"0%\" x2=\"100%\" y2=\"0%\">"
+              image+= "<stop offset=\"0%\" stop-color=\"#{grad[0]}\"/>"
+              image+= "<stop offset=\"100%\" stop-color=\"#{grad[1]}\"/>"
+              image+= "</linearGradient>"
+            end
+          end
+          uniqueWaveformID = "waveform-#{SecureRandom.uuid}"
+          image+= "<g id=\"#{uniqueWaveformID}\">"
+          image+= '<g transform="translate(0, 125.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+= '"/>'
+          image+= "</g>"
+          image+= "</g>"
+          image+= "</defs>"
+          image+= "<use class=\"waveform-base\" href=\"##{uniqueWaveformID}\" />"
+          image+= "<use class=\"waveform-progress\" href=\"##{uniqueWaveformID}\" />"
+          image+= "</svg>"
+        end
+
+        # Draws the given samples using the given options, returns a ChunkyPNG::Image.
+        def draw_png(samples, options)
           image = ChunkyPNG::Image.new(options[:width], options[:height],
             options[:background_color] == :transparent ? ChunkyPNG::Color::TRANSPARENT : options[:background_color]
           )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-audio-waveform
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Trevor Hinesley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -147,4 +147,3 @@ signing_key:
 specification_version: 4
 summary: Generate waveform images from audio files within Carrierwave
 test_files: []
-has_rdoc: