id3tag 0.11.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03c00ecdfdd2c6e53e5664831502753b5210a67098223bcfdb2805b9ab7958cd
-  data.tar.gz: aba76b6019b3be742ddd51a2a024b90fefc59dfd1f645589f5f4a18b4da0dc60
+  metadata.gz: f9b52a546758418d0b992a1635a8e15728454a019bed0916fcbba4d9beb2e904
+  data.tar.gz: 2724b29dd05af9342467fad1f1b225ad09317ebf876582032aa0f5dcf83215d8
 SHA512:
-  metadata.gz: 85af215ef04e69deac371b5e9dea9c1bf401f01763794ae3f319be55ce09b6aa7fd67228fca0d62bfd956d4e8a445d173d985eecd4177462fa0b7a8aeae6aa3e
-  data.tar.gz: d3fdb4e68b97b3dfffb013d544b6feeeb56b1d9277d5ec6407fa3327837e1e8b5148c849e419ab0b18bccd8b003e5e2d01b0cca437a6216b8c3f55b88634d559
+  metadata.gz: 9fb5a81dcd96455512acd17ba94e458d39b2fe099acd9f57cfc58b1d4d18ff8df6979e6887876870066844dab70e0ca99bfd7d71bc694624b80a1fa31b05fc42
+  data.tar.gz: aac944d393fb8cbbae901e0cc5b4a2c3eb763cc30533c5fdefc979fa4b20e14d5308c985a2b9ffa4b7630ff60904ace7c94773fa7d03fd1cd264bf0a805cb0fd

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
@@ -60,22 +60,51 @@ You can inspect tag by calling `frame_ids` to see available frame ids or `frames
 
 ## Configuration
 
-It is also possible to provide configuration and overwrite default behaviour.
- 
+
 ```ruby
+# Configuration could be set using a block syntax.
 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
+
+ID3Tag.configuration.v2_tag_read_limit = 1024
+
+ID3Tag.configuration.v2_tag_read_limit # 1024
+
+
+# In case you would like to set configuration temporally you could use `local_configuration` method.
+# Within this block you can read and modify configuration and it wont affect global or layers above.
+
+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
 end
+
+ID3Tag.configuration.v2_tag_read_limit # 1024
+
+ID3Tag.reset_configuration # Resets global configuration to defaults
+
+ID3Tag.configuration.v2_tag_read_limit # 0
 ```
 
 
@@ -96,7 +125,7 @@ end
 * 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.rb

@@ -1,4 +1,6 @@
 require "stringio"
+require "singleton"
+require "id3tag/configuration_struct"
 require "id3tag/configuration"
 require "id3tag/synchsafe_integer"
 require "id3tag/audio_file"
@@ -42,15 +44,16 @@ module ID3Tag
   end
 
   class << self
-    def configuration
-      @configuration ||= reset_configuration
-      yield @configuration if block_given?
-      @configuration
+    def configuration(&blk)
+      ID3Tag::Configuration.configuration(&blk)
     end
 
-    def reset_configuration(configuration = ID3Tag::Configuration.new)
-      raise ArgumentError, "Passed argument must be a ID3Tag::Configuration class object" unless configuration.is_a?(ID3Tag::Configuration)
-      @configuration = configuration
+    def local_configuration(&blk)
+      ID3Tag::Configuration.local_configuration(&blk)
+    end
+
+    def reset_configuration
+      ID3Tag::Configuration.reset
     end
   end
 end

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
@@ -111,7 +111,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.rb

@@ -1,11 +1,50 @@
 module ID3Tag
   class Configuration
+    include Singleton
+    ResetError = Class.new(StandardError)
+    StackItem = Struct.new(:configuration)
+
+    class << self
+      def local_configuration(&blk)
+        instance.send(:local_configuration, &blk)
+      end
+
+      def configuration
+        value_from_stack = instance.instance_variable_get(:@stack).last
+        value = value_from_stack && value_from_stack.configuration
+        value ||= instance.instance_variable_get(:@global_configuration)
+        yield value if block_given?
+        value
+      end
+
+      def reset
+        instance.send(:reset)
+      end
+    end
+
+    def local_configuration
+      instance_to_copy = @stack.last && @stack.last.configuration
+      instance_to_copy ||= @global_configuration
+      stack_item = StackItem.new(instance_to_copy.dup)
+      stack_backup = @stack.dup
+      @stack << stack_item
+      begin
+        yield stack_item.configuration
+      ensure
+        @stack.replace stack_backup
+      end
+    end
+
+    private
+
     def initialize
-      @string_encode_options = {}
-      @v2_tag_read_limit = 0
+      @stack = []
+      reset
     end
 
-    attr_accessor :string_encode_options
-    attr_accessor :v2_tag_read_limit
+    def reset
+      raise ResetError, "Configuration cannot be reset within local_configuration block" if @stack.size > 0
+      @global_configuration = ConfigurationStruct.new
+    end
   end
 end

data/lib/id3tag/configuration_struct.rb

@@ -0,0 +1,13 @@
+module ID3Tag
+  class ConfigurationStruct
+    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.11.0"
+  VERSION = "0.14.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: id3tag
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Krists Ozols
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-16 00:00:00.000000000 Z
+date: 2021-03-29 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.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 6.2.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.9.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.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.13.1
 description: Native Ruby ID3 tag reader that aims for 100% coverage of ID3v2.x and
   ID3v1.x standards
 email: krists.ozols@gmail.com
@@ -122,6 +122,7 @@ files:
 - lib/id3tag.rb
 - lib/id3tag/audio_file.rb
 - lib/id3tag/configuration.rb
+- lib/id3tag/configuration_struct.rb
 - lib/id3tag/encoding_util.rb
 - lib/id3tag/frame_id_advisor.rb
 - lib/id3tag/frames/util/genre_names.rb
@@ -174,8 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Native Ruby ID3 tag reader that aims for 100% coverage of ID3v2.x and ID3v1.x