wahwah 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e742f50b1a22c7cbbe63ba26506803720bbc44dbfe9943ac07a32e7efe048cbe
-  data.tar.gz: 47e1352b98217e34eb3e3fb3c258695a8f7cf2a4d579ce6baaeda1216703f4e8
+  metadata.gz: 7e3b8992dca29fbbe7a537a7d2ad23ca0fe33e9596dfbabb5131e615461d22b1
+  data.tar.gz: 58809228e4e9b7f2e40c48136f68cdd2f29939b8628e6690efd75e95cf7c0e88
 SHA512:
-  metadata.gz: f5450f35d5478a3a434ac0e366589edb3999b40eb1f321e53086ccd1d3d20c5542ce63ac9d8d7b380379cafd719bbc97c33d2768d585c9a2b1d71218950f1b36
-  data.tar.gz: 86a134f7ac39a2430fcc2a62756a23354aa42825bf1a97ad4b7ba6b71f42bb72c20f3dda4a884db06e77faa84517c7fe5f4004e317939bd36d4c60369067c93e
+  metadata.gz: 501f86ff6b621bfb302b7503e05ef45a472c8faa8c128fc8cb15cf92cb35deca4e828d416bfb0e3bc750f63fb2b299cccabee9d9718729372225edb3e4618f9f
+  data.tar.gz: f1d7c0a92c982180f7041883137b6909c11a761d2da17564aaa4a758297d56db197ae1a1698d3028b8397864ab0673c1f7300acb4bcd6fcfda3d82a6dce1832e

data/lib/wahwah/lazy_read.rb

@@ -12,15 +12,28 @@ module WahWah
       @file_io = file_io
       super(*arg)
       @position = @file_io.pos
+      @data = get_data if @file_io.is_a?(StringIO)
     end
 
     def data
-      @file_io.seek(@position)
-      @file_io.read(size)
+      if @file_io.closed? && @file_io.is_a?(File)
+        @file_io = File.open(@file_io.path)
+        @data = get_data
+        @file_io.close
+      end
+
+      @data ||= get_data
     end
 
     def skip
+      @file_io.seek(@position)
       @file_io.seek(size, IO::SEEK_CUR)
     end
+
+    private
+      def get_data
+        @file_io.seek(@position)
+        @file_io.read(size)
+      end
   end
 end

data/lib/wahwah/mp3_tag.rb

@@ -38,7 +38,7 @@ module WahWah
     end
 
     def is_vbr?
-      xing_header.valid? || vbri_header.valid?
+      mpeg_frame_header.valid? && (xing_header.valid? || vbri_header.valid?)
     end
 
     private
@@ -48,8 +48,8 @@ module WahWah
       end
 
       def parse_id3_tag
-        id3_v1_tag = ID3::V1.new(@file_io)
-        id3_v2_tag = ID3::V2.new(@file_io)
+        id3_v1_tag = ID3::V1.new(@file_io.dup)
+        id3_v2_tag = ID3::V2.new(@file_io.dup)
 
         return id3_v2_tag if id3_v2_tag.valid?
         id3_v1_tag if id3_v1_tag.valid?

data/lib/wahwah/mp4/atom.rb

@@ -90,7 +90,7 @@ module WahWah
             atom = self.class.new(atoms_data_io)
             children_atoms.push(atom)
 
-            atoms_data_io.seek(atom.size, IO::SEEK_CUR)
+            atom.skip
           end
 
           children_atoms

data/lib/wahwah/ogg_tag.rb

@@ -16,18 +16,6 @@ module WahWah
       :composer,
       :sample_rate
 
-    def duration
-      @duration ||= parse_duration
-    end
-
-    def bitrate
-      @bitrate ||= parse_bitrate
-    end
-
-    def bit_depth
-      @bit_depth ||= parse_bit_depth
-    end
-
     private
       def packets
         @packets ||= Ogg::Packets.new(@file_io)
@@ -51,6 +39,10 @@ module WahWah
                when identification_packet.start_with?("\x7FFLAC")
                  Ogg::FlacTag.new(identification_packet, comment_packet)
         end
+
+        @duration = parse_duration
+        @bitrate = parse_bitrate
+        @bit_depth = parse_bit_depth
       end
 
       def parse_duration

data/lib/wahwah/tag.rb

@@ -43,6 +43,8 @@ module WahWah
         value = instance_variable_get("@#{attr_name}")&.to_i
         instance_variable_set("@#{attr_name}", value)
       end
+    ensure
+      @file_io.close
     end
 
     def inspect

data/lib/wahwah/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wahwah
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - aidewoode
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-11 00:00:00.000000000 Z
+date: 2020-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler