fb2rb 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b0cba63057a870150ac866d4bad15d1abfcc46700e5fbcc518624dfc0070b8c
-  data.tar.gz: b36961a19897fab51251b158b76cb5ce7a0ad371d095e8f37b40c295c5e6a546
+  metadata.gz: 9f40628b5817548b930e498b741899cbe16af58e490774277a1edef7bf8959f8
+  data.tar.gz: f2dc2d7b3f75b59134c8ea454f9af78faea7c977be12f20538e6954c26292610
 SHA512:
-  metadata.gz: 59cfc281a836952a9b6b62ebba3e015206555c3c19a64804aad1a54189b58245e62f106adfd2a6d55281efe675f125553fe81f77fb244cd5339625e97c610bab
-  data.tar.gz: 01df364a0b2e879f67ef8884629a2ee563ca0cdccb5f122a959663e516477b622c3b05380451bde8e96fcceafe662a7a924eb810db0f41046f9a92e0e740bbee
+  metadata.gz: 78b4b0a543373ff9c62a4e2894c9212d47bc61cc16e13ee3718b72baee12de0a2c2bc33f2f407598a6641649aec3b64927c39d633f0e4e26c7471a401711db1f
+  data.tar.gz: 87e5bba7077549dc647aa714d71e4c8322181f5e7323e8cec66354a245fbf73feb6bdefcf676c4501cab71aa0cdca002bb7177a5aca25c6a21848aa683c51e8f

data/.github/workflows/ci.yml

@@ -5,11 +5,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.1'
+          ruby-version: '3.4'
           bundler-cache: true
       - name: Lint
         run: bundle exec rake lint
@@ -17,15 +17,17 @@ jobs:
     strategy:
       matrix:
         # Test oldest and newest supported versions
-        ruby: ['jruby-9.2', 'jruby-9.4', '2.5', '3.1']
-        os: [ubuntu-latest, windows-latest]
-        include:
-          - ruby: '3.1'
-            os: macos-latest
+        ruby: ['jruby', '2.7', '3.4']
+        os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'adopt'
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/release.yml

@@ -7,11 +7,11 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.1'
+        ruby-version: '3.4'
     - name: Publish to RubyGems.org
       uses: dawidd6/action-publish-gem@v1
       with:

data/.gitignore

@@ -1,3 +1,4 @@
 /.bundle/
 /.idea/
 /Gemfile.lock
+/vendor/

data/CHANGELOG.adoc

@@ -7,6 +7,11 @@
 This document provides a high-level view of the changes to the {project-name} by release.
 For a detailed view of what has changed, refer to the {uri-project}/commits/master[commit history] on GitHub.
 
+== 0.9.0 (2025-01-20) @slonopotamus
+
+* Remove dependency on base64 to fix Ruby 3.4 compatibility
+* Bump minimal required Ruby version to 2.7
+
 == 0.8.0 (2023-05-03) @slonopotamus
 
 * Allow Nokogiri 1.x

data/README.adoc

@@ -8,7 +8,7 @@ Marat Radchenko <marat@slonopotamus.org>
 :uri-gem: https://rubygems.org/gems/{project-handle}
 
 image:https://img.shields.io/gem/v/{project-handle}.svg[Latest Release,link={uri-gem}]
-image:{uri-project}/workflows/CI/badge.svg?branch=master[Build Status,link={uri-ci}]
+image:{uri-project}/actions/workflows/ci.yml/badge.svg?branch=master[Build Status,link={uri-ci}]
 
 {project-handle} is a http://gribuser.ru/xml/fictionbook/index.html.en[Fiction Book 2] parser/generator library written in Ruby.
 

data/fb2rb.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.summary = 'Fiction Book 2 parser/generator library'
   s.homepage = 'https://github.com/slonopotamus/fb2rb'
   s.license = 'MIT'
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = '>= 2.7.0'
 
   s.files = `git ls-files`.split("\n").reject { |f| f.match(%r{^spec/}) }
   s.executables = `git ls-files -- bin/*`.split("\n").map do |f|
@@ -19,11 +19,11 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_runtime_dependency 'nokogiri', '>= 1.10', '< 2.0'
-  s.add_runtime_dependency 'rubyzip', '~> 2.3.0'
+  s.add_runtime_dependency 'rubyzip', '>= 2.3.0', '< 3.0'
 
-  s.add_development_dependency 'rake', '~> 13.0.0'
-  s.add_development_dependency 'rspec', '~> 3.12.0'
-  s.add_development_dependency 'rubocop', '~> 1.28.2'
+  s.add_development_dependency 'rake', '~> 13.2.0'
+  s.add_development_dependency 'rspec', '~> 3.13.0'
+  s.add_development_dependency 'rubocop', '~> 1.69.2'
   s.add_development_dependency 'rubocop-rake', '~> 0.6.0'
-  s.add_development_dependency 'rubocop-rspec', '~> 2.10.0'
+  s.add_development_dependency 'rubocop-rspec', '~> 3.3'
 end

data/lib/fb2rb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FB2rb
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

data/lib/fb2rb.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'base64'
 require 'date'
 require 'fb2rb/version'
 require 'nokogiri'
@@ -57,7 +56,7 @@ module FB2rb
 
       def ns_prefix(namespace, namespaces)
         prefix = namespaces.key(namespace)
-        prefix.nil? ? nil : prefix.sub(/^xmlns:/, '')
+        prefix&.sub(/^xmlns:/, '')
       end
 
       private
@@ -715,12 +714,12 @@ module FB2rb
     end
 
     def self.parse(xml)
-      decoded = Base64.decode64(xml.text)
+      decoded = xml.text.unpack('m0')
       Binary.new(id: xml['id'], content: decoded, content_type: xml['content-type'])
     end
 
     def to_xml(xml)
-      encoded = Base64.encode64(@content)
+      encoded = [@content].pack('m0')
       xml.binary(encoded, 'id' => @id, 'content-type' => @content_type)
     end
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fb2rb
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Marat Radchenko
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-03 00:00:00.000000000 Z
+date: 2025-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -34,58 +33,64 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.0
+        version: 13.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.0
+        version: 13.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.12.0
+        version: 3.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.12.0
+        version: 3.13.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.28.2
+        version: 1.69.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.28.2
+        version: 1.69.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -106,15 +111,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
-description: 
+        version: '3.3'
 email:
 - marat@slonopotamus.org
 executables: []
@@ -144,7 +148,6 @@ homepage: https://github.com/slonopotamus/fb2rb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -152,15 +155,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Fiction Book 2 parser/generator library
 test_files: []