marc 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78a543b07dbaa8d6aeff40421038d6d24649bc1769db2f286017e9205428c086
-  data.tar.gz: ed2b006b3f4c32ec718ede1a5d56435311970144a8208821733c6089e82bfea7
+  metadata.gz: faaea90f6a961fd419d41cd3fc789a7967ddd41866b82cb2075be3a139e73e58
+  data.tar.gz: dacb3e74659b39f4774205231c07a09802af24bf15726cd8eecee1c424199a56
 SHA512:
-  metadata.gz: 6a53a6fafee92dad72b644668a5b1adabcd0cdb1af6b2ed87d7f8c97d5e56415bcf1e990f113cb5f459807e792e2ac5846948e116534dbfdfd31061c1a44f905
-  data.tar.gz: 4b36af95c908ac282efe7f05f1205b66f8c6c6f62c9f750843012512360c5695af15c5bb23759ccad2703d6c0304540915c45ae3259068fe8a7cb1497f1237f6
+  metadata.gz: c5860c18fac9062dc15cea515e925a31e652bb599ddb5ef96281ac1840860b607a0d5c2bc66e514ab7d0ea17d1f08219253f54eeff128a9d6251a73627a4a3ce
+  data.tar.gz: 3936a4dc7fd88038e9794cec0427e0f0ee1264639f700d7ae8cf37c9710bc7ff4bba0c7679c8c301034ca3ea98c36e6c5df81c77caff8b6dfe2a9cdf6928dcaf

data/.github/workflows/ruby.yml

@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.5, 2.6, 2.7, 3.0, jruby]
+        ruby: [2.7, 3.0, 3.1, 3.2, 3.3, 3.4, jruby, truffleruby, "truffleruby+graalvm"]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.3] - 2025-01-0-9
+
+### Breaking Change
+
+**ruby >= 2.2 is now required**. Removed no-longer-necessary `unf` gem in 
+favor of built-in string methods for dealing with encodings. 
+
+### Non-user-facing changes
+
+- Pulled everything into the gemspec instead of having some stuff 
+  hanging out in the Gemfile
+- Changed tested rubies to only include 2.7, 3.[0,1,2,3,4], latest 
+  jruby, and latest truffleruby (with and without graalvm)
+
 ## [1.2] - 2022-08-02
 
 ### Added

data/Gemfile

@@ -1,15 +1,5 @@
 source "https://rubygems.org"
 
-group :test do
-  if RUBY_VERSION != "1.8.7"
-    gem "nokogiri"
-  end
-  gem "rake"
-  gem "rdoc"
-  gem "xml-simple"
-  gem "test-unit"
-  gem "warning"
-end
 
 # Specify your gem's dependencies in ..gemspec
 gemspec

data/lib/marc/marc8/to_unicode.rb

@@ -1,6 +1,5 @@
 require "marc"
 require "marc/marc8/map_to_unicode"
-require "unf/normalizer"
 
 module MARC
   module Marc8
@@ -170,7 +169,7 @@ module MARC
         end
 
         if normalization
-          uni_str = UNF::Normalizer.normalize(uni_str, normalization)
+          uni_str = uni_str.unicode_normalize(normalization)
         end
 
         uni_str

data/lib/marc/reader.rb

@@ -1,5 +1,3 @@
-require "scrub_rb"
-
 # Note: requiring 'marc/marc8/to_unicode' below, in #initialize,
 # only when necessary
 

data/lib/marc/version.rb

@@ -1,3 +1,3 @@
 module MARC
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/marc.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/ruby-marc/ruby-marc/"
   s.summary = "A ruby library for working with Machine Readable Cataloging"
   s.license = "MIT"
-  s.required_ruby_version = ">= 1.8.6"
+  s.required_ruby_version = ">= 2.2.0"
   s.authors = ["Kevin Clarke", "Bill Dueber", "William Groppe", "Jonathan Rochkind", "Ross Singer", "Ed Summers", "Chris Beer"]
 
   s.files = `git ls-files -z`.split("\x0")
@@ -16,8 +16,13 @@ Gem::Specification.new do |s|
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
+  s.add_dependency "nokogiri", "~>1.0"
+
+  s.add_development_dependency "rake", "~>13.0"
+  s.add_development_dependency "test-unit", "~>3.0"
   s.add_development_dependency "standard", "~>1.0"
-  s.add_dependency "scrub_rb", ">= 1.0.1", "< 2" # backport for ruby 2.1 String#scrub
-  s.add_dependency "unf" # unicode normalization
+  s.add_development_dependency "warning", "~>1.5"
+  s.add_development_dependency "xml-simple"
+
   s.add_dependency "rexml" # rexml was unbundled from the stdlib in ruby 3
 end

data/test/marc8/tc_to_unicode.rb

@@ -3,8 +3,6 @@ require "marc"
 
 require "marc/marc8/to_unicode"
 
-require "unf"
-
 if "".respond_to?(:encoding)
 
   class TestMarc8ToUnicode < Test::Unit::TestCase
@@ -22,7 +20,7 @@ if "".respond_to?(:encoding)
       value = MARC::Marc8::ToUnicode.new.transcode("Conversa\xF0c\xE4ao")
       assert_equal "UTF-8", value.encoding.name
 
-      expected = UNF::Normalizer.normalize("Conversação", :nfc)
+      expected = "Conversação".unicode_normalize(:nfc)
 
       assert_equal expected, value
     end
@@ -67,10 +65,10 @@ if "".respond_to?(:encoding)
       marc8 = "Conversa\xF0c\xE4ao \xC1"
       unicode = "Conversação \u2113"
 
-      unicode_c = UNF::Normalizer.normalize(unicode, :nfc)
-      unicode_kc = UNF::Normalizer.normalize(unicode, :nfkc)
-      unicode_d = UNF::Normalizer.normalize(unicode, :nfd)
-      unicode_kd = UNF::Normalizer.normalize(unicode, :nfkd)
+      unicode_c = unicode.unicode_normalize(:nfc)
+      unicode_kc = unicode.unicode_normalize(:nfkc)
+      unicode_d = unicode.unicode_normalize(:nfd)
+      unicode_kd = unicode.unicode_normalize(:nfkd)
 
       converter = MARC::Marc8::ToUnicode.new
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marc
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Kevin Clarke
@@ -14,16 +14,16 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-02 00:00:00.000000000 Z
+date: 2025-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: standard
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -31,33 +31,69 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: scrub_rb
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - "<"
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - "<"
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: warning
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: unf
+  name: xml-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -170,14 +206,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.6
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: A ruby library for working with Machine Readable Cataloging