wahwah 1.1.1 → 1.2.0

data/lib/wahwah/ogg/packets.rb

@@ -20,7 +20,7 @@ module WahWah
       def each
         @file_io.rewind
 
-        packet = +''
+        packet = +""
         pages = Ogg::Pages.new(@file_io)
 
         pages.each do |page|
@@ -31,7 +31,7 @@ module WahWah
             # So when segment length is less than 255 byte, it's the final segment.
             if segment.length < 255
               yield packet
-              packet = +''
+              packet = +""
             end
           end
         end

data/lib/wahwah/ogg/page.rb

@@ -99,7 +99,7 @@ module WahWah
     #    lacing value.
     class Page
       HEADER_SIZE = 27
-      HEADER_FORMAT = 'A4CxQx12C'
+      HEADER_FORMAT = "A4CxQx12C"
 
       attr_reader :segments, :granule_position
 
@@ -109,12 +109,12 @@ module WahWah
 
         return unless valid?
 
-        segment_table = file_io.read(page_segments).unpack('C' * page_segments)
+        segment_table = file_io.read(page_segments).unpack("C" * page_segments)
         @segments = segment_table.map { |segment_length| file_io.read(segment_length) }
       end
 
       def valid?
-        @capture_pattern == 'OggS' && @version == 0
+        @capture_pattern == "OggS" && @version == 0
       end
     end
   end

data/lib/wahwah/ogg/vorbis_comment.rb

@@ -16,32 +16,32 @@ module WahWah
     # 9) done.
     module VorbisComment
       COMMET_FIELD_MAPPING = {
-        'TITLE' => :title,
-        'ALBUM' => :album,
-        'ALBUMARTIST' => :albumartist,
-        'TRACKNUMBER' => :track,
-        'ARTIST' => :artist,
-        'DATE' => :year,
-        'GENRE' => :genre,
-        'DISCNUMBER' => :disc,
-        'COMPOSER' => :composer
+        "TITLE" => :title,
+        "ALBUM" => :album,
+        "ALBUMARTIST" => :albumartist,
+        "TRACKNUMBER" => :track,
+        "ARTIST" => :artist,
+        "DATE" => :year,
+        "GENRE" => :genre,
+        "DISCNUMBER" => :disc,
+        "COMPOSER" => :composer
       }
 
       def parse_vorbis_comment(comment_content)
         comment_content = StringIO.new(comment_content)
 
-        vendor_length = comment_content.read(4).unpack('V').first
+        vendor_length = comment_content.read(4).unpack1("V")
         comment_content.seek(vendor_length, IO::SEEK_CUR) # Skip vendor_string
 
-        comment_list_length = comment_content.read(4).unpack('V').first
+        comment_list_length = comment_content.read(4).unpack1("V")
 
         comment_list_length.times do
-          comment_length = comment_content.read(4).unpack('V').first
+          comment_length = comment_content.read(4).unpack1("V")
           comment = Helper.encode_to_utf8(comment_content.read(comment_length))
-          field_name, field_value = comment.split('=', 2)
+          field_name, field_value = comment.split("=", 2)
           attr_name = COMMET_FIELD_MAPPING[field_name&.upcase]
 
-          field_value = field_value.to_i if %i(track disc).include? attr_name
+          field_value = field_value.to_i if %i[track disc].include? attr_name
 
           instance_variable_set("@#{attr_name}", field_value) unless attr_name.nil?
         end

data/lib/wahwah/ogg/vorbis_tag.rb

@@ -20,10 +20,10 @@ module WahWah
         # 8) [blocksize_0] = 2 exponent (read 4 bits as unsigned integer)
         # 9) [blocksize_1] = 2 exponent (read 4 bits as unsigned integer)
         # 10) [framing_flag] = read one bit
-        @sample_rate, bitrate = identification_packet[12, 12].unpack('Vx4V')
+        @sample_rate, bitrate = identification_packet[12, 12].unpack("Vx4V")
         @bitrate = bitrate / 1000
 
-        comment_packet_id, comment_packet_body = [comment_packet[0..6], comment_packet[7..-1]]
+        comment_packet_id, comment_packet_body = [comment_packet[0..6], comment_packet[7..]]
 
         # Vorbis comment packet start with "\x03vorbis"
         return unless comment_packet_id == "\x03vorbis"

data/lib/wahwah/ogg_tag.rb

@@ -17,50 +17,50 @@ module WahWah
       :sample_rate
 
     private
-      def packets
-        @packets ||= Ogg::Packets.new(@file_io)
-      end
 
-      def pages
-        @pages ||= Ogg::Pages.new(@file_io)
-      end
+    def packets
+      @packets ||= Ogg::Packets.new(@file_io)
+    end
 
-      def parse
-        identification_packet, comment_packet = packets.first(2)
-        return if identification_packet.nil? || comment_packet.nil?
+    def pages
+      @pages ||= Ogg::Pages.new(@file_io)
+    end
 
-        @overhead_packets_size = identification_packet.size + comment_packet.size
+    def parse
+      identification_packet, comment_packet = packets.first(2)
+      return if identification_packet.nil? || comment_packet.nil?
 
-        @tag = case true
-               when identification_packet.start_with?("\x01vorbis")
-                 Ogg::VorbisTag.new(identification_packet, comment_packet)
-               when identification_packet.start_with?('OpusHead')
-                 Ogg::OpusTag.new(identification_packet, comment_packet)
-               when identification_packet.start_with?("\x7FFLAC")
-                 Ogg::FlacTag.new(identification_packet, comment_packet)
-        end
+      @overhead_packets_size = identification_packet.size + comment_packet.size
 
-        @duration = parse_duration
-        @bitrate = parse_bitrate
-        @bit_depth = parse_bit_depth
+      @tag = if identification_packet.start_with?("\x01vorbis")
+        Ogg::VorbisTag.new(identification_packet, comment_packet)
+      elsif identification_packet.start_with?("OpusHead")
+        Ogg::OpusTag.new(identification_packet, comment_packet)
+      elsif identification_packet.start_with?("\x7FFLAC")
+        Ogg::FlacTag.new(identification_packet, comment_packet)
       end
 
-      def parse_duration
-        return @tag.duration if @tag.respond_to? :duration
+      @duration = parse_duration
+      @bitrate = parse_bitrate
+      @bit_depth = parse_bit_depth
+    end
 
-        last_page = pages.to_a.last
-        pre_skip = @tag.respond_to?(:pre_skip) ? @tag.pre_skip : 0
+    def parse_duration
+      return @tag.duration if @tag.respond_to? :duration
 
-        ((last_page.granule_position - pre_skip) / @tag.sample_rate.to_f).round
-      end
+      last_page = pages.to_a.last
+      pre_skip = @tag.respond_to?(:pre_skip) ? @tag.pre_skip : 0
 
-      def parse_bitrate
-        return @tag.bitrate if @tag.respond_to? :bitrate
-        ((file_size - @overhead_packets_size) * 8.0 / duration / 1000).round
-      end
+      (last_page.granule_position - pre_skip) / @tag.sample_rate.to_f
+    end
 
-      def parse_bit_depth
-        @tag.bit_depth if @tag.respond_to? :bit_depth
-      end
+    def parse_bitrate
+      return @tag.bitrate if @tag.respond_to? :bitrate
+      ((file_size - @overhead_packets_size) * 8.0 / duration / 1000).round
+    end
+
+    def parse_bit_depth
+      @tag.bit_depth if @tag.respond_to? :bit_depth
+    end
   end
 end

data/lib/wahwah/riff/chunk.rb

@@ -19,7 +19,7 @@ module WahWah
       prepend LazyRead
 
       HEADER_SIZE = 8
-      HEADER_FORMAT = 'A4V'
+      HEADER_FORMAT = "A4V"
       HEADER_TYPE_SIZE = 4
 
       attr_reader :id, :type
@@ -28,11 +28,11 @@ module WahWah
         @id, @size = @file_io.read(HEADER_SIZE)&.unpack(HEADER_FORMAT)
         return unless valid?
 
-        @type = @file_io.read(HEADER_TYPE_SIZE).unpack('A4').first if have_type?
+        @type = @file_io.read(HEADER_TYPE_SIZE).unpack1("A4") if have_type?
       end
 
       def size
-        @size = @size + 1 if @size.odd?
+        @size += 1 if @size.odd?
         have_type? ? @size - HEADER_TYPE_SIZE : @size
       end
 
@@ -41,9 +41,10 @@ module WahWah
       end
 
       private
-        def have_type?
-          %w(RIFF LIST).include? @id
-        end
+
+      def have_type?
+        %w[RIFF LIST].include? @id
+      end
     end
   end
 end

data/lib/wahwah/riff_tag.rb

@@ -17,7 +17,7 @@ module WahWah
       TRCK: :track
     }
 
-    CHANNEL_MODE_INDEX = %w(Mono Stereo)
+    CHANNEL_MODE_INDEX = %w[Mono Stereo]
 
     tag_delegate :@id3_tag,
       :title,
@@ -39,102 +39,104 @@ module WahWah
     end
 
     private
-      def parse
-        top_chunk = Riff::Chunk.new(@file_io)
-        return unless top_chunk.valid?
 
-        total_chunk_size = top_chunk.size + Riff::Chunk::HEADER_SIZE
+    def parse
+      top_chunk = Riff::Chunk.new(@file_io)
+      return unless top_chunk.valid?
 
-        # The top "RIFF" chunks include an additional field in the first four bytes of the data field.
-        # This additional field provides the form type of the field.
-        # For wav file, the value of the type field is 'WAVE'
-        return unless top_chunk.id == 'RIFF' && top_chunk.type == 'WAVE'
+      total_chunk_size = top_chunk.size + Riff::Chunk::HEADER_SIZE
 
-        until total_chunk_size <= @file_io.pos || @file_io.eof? do
-          sub_chunk = Riff::Chunk.new(@file_io)
-          parse_sub_chunk(sub_chunk)
-        end
-      end
+      # The top "RIFF" chunks include an additional field in the first four bytes of the data field.
+      # This additional field provides the form type of the field.
+      # For wav file, the value of the type field is 'WAVE'
+      return unless top_chunk.id == "RIFF" && top_chunk.type == "WAVE"
 
-      def parse_sub_chunk(sub_chunk)
-        return unless sub_chunk.valid?
-
-        case sub_chunk.id
-        when 'fmt'
-          parse_fmt_chunk(sub_chunk)
-        when 'data'
-          parse_data_chunk(sub_chunk)
-        when 'LIST'
-          parse_list_chunk(sub_chunk)
-        when 'id3', 'ID3'
-          parse_id3_chunk(sub_chunk)
-        else
-          sub_chunk.skip
-        end
+      until total_chunk_size <= @file_io.pos || @file_io.eof?
+        sub_chunk = Riff::Chunk.new(@file_io)
+        parse_sub_chunk(sub_chunk)
       end
+    end
 
-      # The fmt chunk data structure:
-      # Length             Meaning       Description
-      #
-      # 2(little endian)   AudioFormat   PCM = 1 (i.e. Linear quantization)
-      #                                  Values other than 1 indicate some
-      #                                  form of compression.
-      #
-      # 2(little endian)   NumChannels   Mono = 1, Stereo = 2, etc.
-      #
-      # 4(little endian)   SampleRate    8000, 44100, etc.
-      #
-      # 4(little endian)   ByteRate      == SampleRate * NumChannels * BitsPerSample/8
-      #
-      # 2(little endian)   BlockAlign    == NumChannels * BitsPerSample/8
-      #                                  The number of bytes for one sample including
-      #                                  all channels.
-      #
-      # 2(little endian)   BitsPerSample 8 bits = 8, 16 bits = 16, etc.
-      def parse_fmt_chunk(chunk)
-        _, @channel, @sample_rate, _, _, @bit_depth = chunk.data.unpack('vvVVvv')
-        @bitrate = @sample_rate * @channel * @bit_depth / 1000
+    def parse_sub_chunk(sub_chunk)
+      return unless sub_chunk.valid?
+
+      case sub_chunk.id
+      when "fmt"
+        parse_fmt_chunk(sub_chunk)
+      when "data"
+        parse_data_chunk(sub_chunk)
+      when "LIST"
+        parse_list_chunk(sub_chunk)
+      when "id3", "ID3"
+        parse_id3_chunk(sub_chunk)
+      else
+        sub_chunk.skip
       end
+    end
 
-      def parse_data_chunk(chunk)
-        @duration = chunk.size * 8 / (@bitrate * 1000)
-        chunk.skip
-      end
+    # The fmt chunk data structure:
+    # Length             Meaning       Description
+    #
+    # 2(little endian)   AudioFormat   PCM = 1 (i.e. Linear quantization)
+    #                                  Values other than 1 indicate some
+    #                                  form of compression.
+    #
+    # 2(little endian)   NumChannels   Mono = 1, Stereo = 2, etc.
+    #
+    # 4(little endian)   SampleRate    8000, 44100, etc.
+    #
+    # 4(little endian)   ByteRate      == SampleRate * NumChannels * BitsPerSample/8
+    #
+    # 2(little endian)   BlockAlign    == NumChannels * BitsPerSample/8
+    #                                  The number of bytes for one sample including
+    #                                  all channels.
+    #
+    # 2(little endian)   BitsPerSample 8 bits = 8, 16 bits = 16, etc.
+    def parse_fmt_chunk(chunk)
+      _, @channel, @sample_rate, _, _, @bit_depth = chunk.data.unpack("vvVVvv")
+      @bitrate = @sample_rate * @channel * @bit_depth / 1000
+    end
 
-      def parse_list_chunk(chunk)
-        list_chunk_end_position = @file_io.pos + chunk.size
+    def parse_data_chunk(chunk)
+      @duration = chunk.size * 8 / (@bitrate * 1000).to_f
+      chunk.skip
+    end
 
-        # RIFF can be tagged with metadata in the INFO chunk.
-        # And INFO chunk as a subchunk for LIST chunk.
-        if chunk.type != 'INFO'
-          chunk.skip
-        else
-          until list_chunk_end_position <= @file_io.pos do
-            info_chunk = Riff::Chunk.new(@file_io)
+    def parse_list_chunk(chunk)
+      list_chunk_end_position = @file_io.pos + chunk.size
 
-            unless INFO_ID_MAPPING.keys.include? info_chunk.id.to_sym
-              info_chunk.skip; next
-            end
+      # RIFF can be tagged with metadata in the INFO chunk.
+      # And INFO chunk as a subchunk for LIST chunk.
+      if chunk.type != "INFO"
+        chunk.skip
+      else
+        until list_chunk_end_position <= @file_io.pos
+          info_chunk = Riff::Chunk.new(@file_io)
 
-            update_attribute(info_chunk)
+          unless INFO_ID_MAPPING.key? info_chunk.id.to_sym
+            info_chunk.skip
+            next
           end
+
+          update_attribute(info_chunk)
         end
       end
+    end
 
-      def parse_id3_chunk(chunk)
-        @id3_tag = ID3::V2.new(StringIO.new(chunk.data))
-      end
+    def parse_id3_chunk(chunk)
+      @id3_tag = ID3::V2.new(StringIO.new(chunk.data))
+    end
 
-      def update_attribute(chunk)
-        attr_name = INFO_ID_MAPPING[chunk.id.to_sym]
-        chunk_data = Helper.encode_to_utf8(chunk.data)
+    def update_attribute(chunk)
+      attr_name = INFO_ID_MAPPING[chunk.id.to_sym]
+      chunk_data = Helper.encode_to_utf8(chunk.data)
 
-        case attr_name
-        when :comment
-          @comments.push(chunk_data)
-        else
-          instance_variable_set("@#{attr_name}", chunk_data)
-        end
+      case attr_name
+      when :comment
+        @comments.push(chunk_data)
+      else
+        instance_variable_set("@#{attr_name}", chunk_data)
       end
+    end
   end
 end

data/lib/wahwah/tag.rb

@@ -2,8 +2,8 @@
 
 module WahWah
   class Tag
-    INTEGER_ATTRIBUTES = %i(disc disc_total track track_total)
-    INSPECT_ATTRIBUTES = %i(title artist album albumartist composer track track_total genre year disc disc_total duration bitrate sample_rate bit_depth)
+    INTEGER_ATTRIBUTES = %i[disc disc_total track track_total]
+    INSPECT_ATTRIBUTES = %i[title artist album albumartist composer track track_total genre year disc disc_total duration bitrate sample_rate bit_depth]
 
     attr_reader(
       :title,
@@ -48,8 +48,8 @@ module WahWah
     end
 
     def inspect
-      inspect_id = ::Kernel.format '%x', (object_id * 2)
-      inspect_attributes_values = INSPECT_ATTRIBUTES.map { |attr_name| "#{attr_name}=#{self.send(attr_name)}" }.join(' ')
+      inspect_id = ::Kernel.format "%x", (object_id * 2)
+      inspect_attributes_values = INSPECT_ATTRIBUTES.map { |attr_name| "#{attr_name}=#{send(attr_name)}" }.join(" ")
 
       "<#{self.class.name}:0x#{inspect_id} #{inspect_attributes_values}>"
     end
@@ -63,8 +63,9 @@ module WahWah
     end
 
     private
-      def parse
-        raise WahWahNotImplementedError, 'The parse method is not implemented'
-      end
+
+    def parse
+      raise WahWahNotImplementedError, "The parse method is not implemented"
+    end
   end
 end

data/lib/wahwah/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WahWah
-  VERSION = '1.1.1'
+  VERSION = "1.2.0"
 end

data/lib/wahwah.rb

@@ -1,62 +1,62 @@
 # frozen_string_literal: true
 
-require 'stringio'
-require 'forwardable'
-require 'zlib'
-
-require 'wahwah/version'
-require 'wahwah/errors'
-require 'wahwah/helper'
-require 'wahwah/tag_delegate'
-require 'wahwah/lazy_read'
-require 'wahwah/tag'
-
-require 'wahwah/id3/v1'
-require 'wahwah/id3/v2'
-require 'wahwah/id3/v2_header'
-require 'wahwah/id3/frame'
-require 'wahwah/id3/frame_body'
-require 'wahwah/id3/text_frame_body'
-require 'wahwah/id3/genre_frame_body'
-require 'wahwah/id3/comment_frame_body'
-require 'wahwah/id3/image_frame_body'
-
-require 'wahwah/mp3/mpeg_frame_header'
-require 'wahwah/mp3/xing_header'
-require 'wahwah/mp3/vbri_header'
-
-require 'wahwah/riff/chunk'
-
-require 'wahwah/flac/block'
-require 'wahwah/flac/streaminfo_block'
-
-require 'wahwah/ogg/page'
-require 'wahwah/ogg/pages'
-require 'wahwah/ogg/packets'
-require 'wahwah/ogg/vorbis_comment'
-require 'wahwah/ogg/vorbis_tag'
-require 'wahwah/ogg/opus_tag'
-require 'wahwah/ogg/flac_tag'
-
-require 'wahwah/asf/object'
-
-require 'wahwah/mp4/atom'
-
-require 'wahwah/mp3_tag'
-require 'wahwah/mp4_tag'
-require 'wahwah/ogg_tag'
-require 'wahwah/riff_tag'
-require 'wahwah/asf_tag'
-require 'wahwah/flac_tag'
+require "stringio"
+require "forwardable"
+require "zlib"
+
+require "wahwah/version"
+require "wahwah/errors"
+require "wahwah/helper"
+require "wahwah/tag_delegate"
+require "wahwah/lazy_read"
+require "wahwah/tag"
+
+require "wahwah/id3/v1"
+require "wahwah/id3/v2"
+require "wahwah/id3/v2_header"
+require "wahwah/id3/frame"
+require "wahwah/id3/frame_body"
+require "wahwah/id3/text_frame_body"
+require "wahwah/id3/genre_frame_body"
+require "wahwah/id3/comment_frame_body"
+require "wahwah/id3/image_frame_body"
+
+require "wahwah/mp3/mpeg_frame_header"
+require "wahwah/mp3/xing_header"
+require "wahwah/mp3/vbri_header"
+
+require "wahwah/riff/chunk"
+
+require "wahwah/flac/block"
+require "wahwah/flac/streaminfo_block"
+
+require "wahwah/ogg/page"
+require "wahwah/ogg/pages"
+require "wahwah/ogg/packets"
+require "wahwah/ogg/vorbis_comment"
+require "wahwah/ogg/vorbis_tag"
+require "wahwah/ogg/opus_tag"
+require "wahwah/ogg/flac_tag"
+
+require "wahwah/asf/object"
+
+require "wahwah/mp4/atom"
+
+require "wahwah/mp3_tag"
+require "wahwah/mp4_tag"
+require "wahwah/ogg_tag"
+require "wahwah/riff_tag"
+require "wahwah/asf_tag"
+require "wahwah/flac_tag"
 
 module WahWah
   FORMATE_MAPPING = {
-    Mp3Tag: ['mp3'],
-    OggTag: ['ogg', 'oga', 'opus'],
-    RiffTag: ['wav'],
-    FlacTag: ['flac'],
-    AsfTag: ['wma'],
-    Mp4Tag: ['m4a']
+    Mp3Tag: ["mp3"],
+    OggTag: ["ogg", "oga", "opus"],
+    RiffTag: ["wav"],
+    FlacTag: ["flac"],
+    AsfTag: ["wma"],
+    Mp4Tag: ["m4a"]
   }.freeze
 
   def self.open(file_path)
@@ -65,10 +65,10 @@ module WahWah
 
     file_format = Helper.file_format(file_path)
 
-    raise WahWahArgumentError, 'File is not exists' unless File.exist? file_path
-    raise WahWahArgumentError, 'File is unreadable' unless File.readable? file_path
-    raise WahWahArgumentError, 'File is empty' unless File.size(file_path) > 0
-    raise WahWahArgumentError, 'No supported format found' unless support_formats.include? file_format
+    raise WahWahArgumentError, "File is not exists" unless File.exist? file_path
+    raise WahWahArgumentError, "File is unreadable" unless File.readable? file_path
+    raise WahWahArgumentError, "File is empty" unless File.size(file_path) > 0
+    raise WahWahArgumentError, "No supported format found" unless support_formats.include? file_format
 
     FORMATE_MAPPING.each do |tag, formats|
       break const_get(tag).new(file_path) if formats.include?(file_format)