id3tag 0.12.1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19488a0e5c2d7354946f8c02f9190134580fde95820eb2ab3e35b559e4c85819
-  data.tar.gz: 5b25ad975028445328117b0aaa443e4b781ca86bed14101366baa8fbf57915d0
+  metadata.gz: 8ee2f5e34526388ad61267ade1af0773b4bd85c723b252cc7848a4a692d99281
+  data.tar.gz: 984577caccfa629dc79ad4b0c49d52a2b7ce08598400084b199e2b4fc1909d8f
 SHA512:
-  metadata.gz: 7d717cde84a8bcad1bcfb93c8f024e64fa315933bccd199f68a748c7b54c5ef57f7b184f926da63627eec14af1eeb769380e73dbe5f6cd5cefe657a1ef1782ff
-  data.tar.gz: 4a80fd637e147b07f2ba2c35f5cbee826c430a778e86d3bec69bdf2e581f87e5c9794ea6542e60697f12826e51060f7f87b11cecb6c3fa507b815a7c85c1d548
+  metadata.gz: 22617752ac7e06ae319cf97d034c2d358b926252a76957e87899acdace5d130fd9051f43cf769e59e9a3c9d99c52bb417c475c24bcd1c7506a0196d1768d2fb6
+  data.tar.gz: 6eea548143a08b68522d860ed3f0c8da2ed64590dfd87c7a3a4c7b182799542dfc9396eb8c9578b5686659b5bc013f63eb12b04a928ef771dbf892188051e3ff

data/README.md

@@ -12,7 +12,7 @@ gem install id3tag
 
 Or add the gem to your Gemfile:
 ```
-gem 'id3tag', '~> 0.11.0'
+gem 'id3tag', '~> 0.14.0'
 ```
 
 ## How to use
@@ -67,14 +67,20 @@ ID3Tag.configuration do |c|
 
   # This way you can avoid Encoding::InvalidByteSequenceError when tag contains invalid data.
   # Currently only for String#encode which is used in TextFrames.
-  # default: {} 
+  # default: {}
   c.string_encode_options = { :invalid => :replace, :undef => :replace }
-  
+
   # You might want to set v2.x tag read limit in bytes to avoid reading too much data into memory
   # v2 tags will be extracted until end of tag or limit is reached.
-  # default: 0 (There are no limit) 
+  # default: 0 (There are no limit)
   c.v2_tag_read_limit = 1048576 # 1 megabyte
-  
+
+  # In some situations, it's not possible to recognize what is the encoding of a
+  # text frame. The default behavior is to raise UnsupportedTextEncoding, but
+  # it's possible to set a fallback to avoid it.
+  # default: nil
+  c.source_encoding_fallback = Encoding::UTF_8
+
 end
 
 ID3Tag.configuration.v2_tag_read_limit # 1048576
@@ -91,7 +97,7 @@ ID3Tag.local_configuration do
   ID3Tag.configuration.v2_tag_read_limit # 1024
   ID3Tag.configuration.v2_tag_read_limit = 9999
   # ...
-  ID3Tag.configuration.v2_tag_read_limit # 9999 
+  ID3Tag.configuration.v2_tag_read_limit # 9999
 end
 
 ID3Tag.configuration.v2_tag_read_limit # 1024
@@ -119,7 +125,7 @@ ID3Tag.configuration.v2_tag_read_limit # 0
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
 ## Code Status
-[![Code Climate](https://codeclimate.com/github/krists/id3tag.png)](https://codeclimate.com/github/krists/id3tag) [![Build Status](https://travis-ci.org/krists/id3tag.png?branch=master)](https://travis-ci.org/krists/id3tag) [![Coverage Status](https://coveralls.io/repos/krists/id3tag/badge.png?branch=master)](https://coveralls.io/r/krists/id3tag) [![Gem Version](https://badge.fury.io/rb/id3tag.png)](http://badge.fury.io/rb/id3tag)
+[![Code Climate](https://codeclimate.com/github/krists/id3tag.svg)](https://codeclimate.com/github/krists/id3tag) [![Build Status](https://travis-ci.org/krists/id3tag.svg?branch=master)](https://travis-ci.org/krists/id3tag) [![Coverage Status](https://coveralls.io/repos/krists/id3tag/badge.svg?branch=master)](https://coveralls.io/r/krists/id3tag) [![Gem Version](https://badge.fury.io/rb/id3tag.svg)](http://badge.fury.io/rb/id3tag)
 ## Copyright
 
 Copyright (c) 2018 Krists Ozols. See LICENSE.txt for

data/lib/id3tag/audio_file.rb

@@ -20,14 +20,14 @@ module ID3Tag
     end
 
     def v2_tag_present?
-      @file.rewind
+      @file.seek(0)
       @file.read(3) == IDV2_TAG_IDENTIFIER
     end
 
     def v1_tag_body
       if v1_tag_present?
         @file.seek(-v1_tag_size, IO::SEEK_END)
-        @file.read
+        @file.read(v1_tag_size)
       else
         nil
       end
@@ -45,6 +45,7 @@ module ID3Tag
       if v2_tag_size > 0
         @file.seek(v2_tag_frame_and_padding_position)
         bytes_to_read = v2_tag_frame_and_padding_size
+        return BLANK_STRING if bytes_to_read < 0
         limit = ID3Tag.configuration.v2_tag_read_limit
         if (limit > 0) && (bytes_to_read > limit)
           bytes_to_read = limit
@@ -111,7 +112,7 @@ module ID3Tag
     end
 
     def get_v2_tag_header
-      @file.rewind
+      @file.seek(0)
       ID3v2TagHeader.new(@file.read(ID3V2_TAG_HEADER_SIZE))
     end
   end

data/lib/id3tag/configuration_struct.rb

@@ -3,9 +3,11 @@ module ID3Tag
     def initialize
       @string_encode_options = {}
       @v2_tag_read_limit = 0
+      @source_encoding_fallback = nil
     end
 
     attr_accessor :string_encode_options
     attr_accessor :v2_tag_read_limit
+    attr_accessor :source_encoding_fallback
   end
 end

data/lib/id3tag/encoding_util.rb

@@ -27,7 +27,7 @@ module ID3Tag
     end
 
     def self.encode(text, source_encoding)
-      text.encode(DESTINATION_ENCODING, source_encoding, ID3Tag.configuration.string_encode_options)
+      text.encode(DESTINATION_ENCODING, source_encoding, **ID3Tag.configuration.string_encode_options)
     end
   end
 end

data/lib/id3tag/frame_id_advisor.rb

@@ -20,6 +20,7 @@ module ID3Tag
         :comments => :COM,
         :genre => :TCO,
         :track_nr => :TRK,
+        :disc_nr => :TPA,
         :unsychronized_transcription => :ULT,
         :image => :PIC
       },
@@ -31,6 +32,7 @@ module ID3Tag
         :comments => :COMM,
         :genre => :TCON,
         :track_nr => :TRCK,
+        :disc_nr => :TPOS,
         :unsychronized_transcription => :USLT,
         :image => :APIC
       },
@@ -42,6 +44,7 @@ module ID3Tag
         :comments => :COMM,
         :genre => :TCON,
         :track_nr => :TRCK,
+        :disc_nr => :TPOS,
         :unsychronized_transcription => :USLT,
         :image => :APIC
       }

data/lib/id3tag/frames/v1/comments_frame.rb

@@ -15,7 +15,7 @@ module ID3Tag
         end
 
         def content
-          @content.encode(destination_encoding, source_encoding)
+          EncodingUtil.encode(@content, source_encoding)
         end
       end
     end

data/lib/id3tag/frames/v1/text_frame.rb

@@ -9,15 +9,11 @@ module ID3Tag
         end
 
         def content
-          @content.encode(destination_encoding, source_encoding)
+          EncodingUtil.encode(@content, source_encoding)
         end
 
         private
 
-        def destination_encoding
-          Encoding::UTF_8
-        end
-
         def source_encoding
           Encoding::ISO8859_1
         end

data/lib/id3tag/frames/v2/comments_frame.rb

@@ -32,7 +32,7 @@ module  ID3Tag
         end
 
         def encoded_content
-          content_without_encoding_byte_and_language.encode(destination_encoding, source_encoding)
+          EncodingUtil.encode(content_without_encoding_byte_and_language, source_encoding)
         end
 
         def content_without_encoding_byte_and_language

data/lib/id3tag/frames/v2/text_frame.rb

@@ -21,15 +21,13 @@ module  ID3Tag
         private
 
         def encoded_content
-          content_without_encoding_byte.encode(destination_encoding, source_encoding, ID3Tag.configuration.string_encode_options)
+          EncodingUtil.encode(content_without_encoding_byte, source_encoding)
         end
 
         def source_encoding
-          ENCODING_MAP.fetch(get_encoding_byte) { raise UnsupportedTextEncoding }.to_s
-        end
-
-        def destination_encoding
-          Encoding::UTF_8.to_s
+          ENCODING_MAP.fetch(get_encoding_byte) do
+            ID3Tag.configuration.source_encoding_fallback || raise(UnsupportedTextEncoding)
+          end.to_s
         end
 
         def get_encoding_byte

data/lib/id3tag/id3_v2_frame_parser.rb

@@ -60,7 +60,7 @@ module ID3Tag
     end
 
     def rewind_input
-      @input.rewind
+      @input.seek(0)
     end
 
     def padding_or_eof_reached?

data/lib/id3tag/tag.rb

@@ -38,7 +38,7 @@ module ID3Tag
 
     def first_frame_by_id(*ids)
       first_existing_id = ids.find { |id| frame_ids.include?(id) }
-      first_existing_id && get_frame(first_existing_id)
+      first_existing_id && get_frames(first_existing_id).first
     end
 
     def all_frames_by_id(*ids)

data/lib/id3tag/version.rb

@@ -1,3 +1,3 @@
 module ID3Tag
-  VERSION = "0.12.1"
+  VERSION = "0.14.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: id3tag
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.14.2
 platform: ruby
 authors:
 - Krists Ozols
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-16 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,84 +30,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.1.0
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.1.0
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 6.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 6.3.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.21
+        version: 0.8.23
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.21
+        version: 0.8.23
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: '0'
 description: Native Ruby ID3 tag reader that aims for 100% coverage of ID3v2.x and
   ID3v1.x standards
 email: krists.ozols@gmail.com
@@ -160,7 +160,7 @@ homepage: https://github.com/krists/id3tag
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -175,9 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Native Ruby ID3 tag reader that aims for 100% coverage of ID3v2.x and ID3v1.x
   standards