loc_mods 0.2.4 → 0.2.6

data/lib/loc_mods/related_item.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "base_mapper"
+require "lutaml/model"
 
 require_relative "abstract"
 require_relative "access_condition"
@@ -23,14 +23,14 @@ require_relative "title_info"
 require_relative "type_of_resource"
 
 module LocMods
-  class RelatedItem < BaseMapper
-    attribute :type, Shale::Type::String
-    attribute :other_type, Shale::Type::String
-    attribute :other_type_auth, Shale::Type::String
-    attribute :other_type_auth_uri, Shale::Type::String
-    attribute :other_type_uri, Shale::Type::String
-    attribute :display_label, Shale::Type::String
-    attribute :id, Shale::Type::Value
+  class RelatedItem < Lutaml::Model::Serializable
+    attribute :type, :string
+    attribute :other_type, :string
+    attribute :other_type_auth, :string
+    attribute :other_type_auth_uri, :string
+    attribute :other_type_uri, :string
+    attribute :display_label, :string
+    attribute :id, :string
     attribute :abstract, Abstract, collection: true
     attribute :access_condition, AccessCondition, collection: true
     attribute :classification, Classification, collection: true
@@ -51,7 +51,7 @@ module LocMods
     attribute :target_audience, TargetAudience, collection: true
     attribute :title_info, TitleInfo, collection: true
     attribute :type_of_resource, TypeOfResource, collection: true
-    attribute :href, Shale::Type::String
+    attribute :href, :string
 
     xml do
       root "relatedItem"

data/lib/loc_mods/role.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "base_mapper"
+require "lutaml/model"
 
 require_relative "role_term"
 
 module LocMods
-  class Role < BaseMapper
+  class Role < Lutaml::Model::Serializable
     attribute :role_term, RoleTerm, collection: true
 
     xml do

data/lib/loc_mods/role_term.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "base_mapper"
+require "lutaml/model"
 
 module LocMods
-  class RoleTerm < BaseMapper
-    attribute :content, Shale::Type::String
-    attribute :type, Shale::Type::String
+  class RoleTerm < Lutaml::Model::Serializable
+    attribute :content, :string
+    attribute :type, :string
 
     xml do
       root "roleTerm"

data/lib/loc_mods/script_term.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "base_mapper"
+require "lutaml/model"
 
 module LocMods
-  class ScriptTerm < BaseMapper
-    attribute :content, Shale::Type::String
-    attribute :type, Shale::Type::String
+  class ScriptTerm < Lutaml::Model::Serializable
+    attribute :content, :string
+    attribute :type, :string
 
     xml do
       root "scriptTerm"

data/lib/loc_mods/string_plus_language.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative "base_mapper"
+require "lutaml/model"
 
 module LocMods
-  class StringPlusLanguage < BaseMapper
-    attribute :content, Shale::Type::String
-    attribute :lang, Shale::Type::String
-    attribute :script, Shale::Type::String
-    attribute :transliteration, Shale::Type::String
+  class StringPlusLanguage < Lutaml::Model::Serializable
+    attribute :content, :string
+    attribute :lang, :string
+    attribute :script, :string
+    attribute :transliteration, :string
 
     xml do
       root "nonSort"

data/lib/loc_mods/string_plus_language_plus_authority.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "base_mapper"
+require "lutaml/model"
 
 module LocMods
-  class StringPlusLanguagePlusAuthority < BaseMapper
-    attribute :content, Shale::Type::String
-    attribute :authority, Shale::Type::String
-    attribute :authority_uri, Shale::Type::Value
-    attribute :value_uri, Shale::Type::Value
+  class StringPlusLanguagePlusAuthority < Lutaml::Model::Serializable
+    attribute :content, :string
+    attribute :authority, :string
+    attribute :authority_uri, :string
+    attribute :value_uri, :string
   end
 end

data/lib/loc_mods/string_plus_language_plus_supplied.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative "base_mapper"
+require "lutaml/model"
 
 module LocMods
-  class StringPlusLanguagePlusSupplied < BaseMapper
-    attribute :content, Shale::Type::String
-    attribute :supplied, Shale::Type::Value
+  class StringPlusLanguagePlusSupplied < Lutaml::Model::Serializable
+    attribute :content, :string
+    attribute :supplied, :string
   end
 end

data/lib/loc_mods/subject.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "base_mapper"
+require "lutaml/model"
 
 require_relative "cartographics"
 require_relative "genre"
@@ -12,19 +12,19 @@ require_relative "temporal"
 require_relative "occupation"
 
 module LocMods
-  class Subject < BaseMapper
-    attribute :id, Shale::Type::Value
-    attribute :authority, Shale::Type::String
-    attribute :authority_uri, Shale::Type::Value
-    attribute :value_uri, Shale::Type::Value
-    attribute :lang, Shale::Type::String
-    attribute :script, Shale::Type::String
-    attribute :transliteration, Shale::Type::String
-    attribute :display_label, Shale::Type::String
-    attribute :alt_rep_group, Shale::Type::String
-    attribute :usage, Shale::Type::Value
-    attribute :topic, Shale::Type::String, collection: true
-    attribute :geographic, Shale::Type::String, collection: true
+  class Subject < Lutaml::Model::Serializable
+    attribute :id, :string
+    attribute :authority, :string
+    attribute :authority_uri, :string
+    attribute :value_uri, :string
+    attribute :lang, :string
+    attribute :script, :string
+    attribute :transliteration, :string
+    attribute :display_label, :string
+    attribute :alt_rep_group, :string
+    attribute :usage, :string
+    attribute :topic, :string, collection: true
+    attribute :geographic, :string, collection: true
     attribute :temporal, Temporal, collection: true
     attribute :title_info, SubjectTitleInfo, collection: true
     attribute :name, SubjectName, collection: true
@@ -33,10 +33,10 @@ module LocMods
     attribute :cartographics, Cartographics, collection: true
     attribute :occupation, Occupation, collection: true
     attribute :genre, Genre, collection: true
-    attribute :href, Shale::Type::String
+    attribute :href, :string
 
     xml do
-      root "subject"
+      root "subject", ordered: true
       namespace "http://www.loc.gov/mods/v3", nil
 
       map_attribute "href", to: :href,

data/lib/loc_mods/subject_name.rb

@@ -1,27 +1,27 @@
 # frozen_string_literal: true
 
-require_relative "base_mapper"
+require "lutaml/model"
 
 require_relative "identifier"
 require_relative "name_part"
 require_relative "role"
 
 module LocMods
-  class SubjectName < BaseMapper
-    attribute :type, Shale::Type::String
-    attribute :id, Shale::Type::Value
-    attribute :authority, Shale::Type::String
-    attribute :authority_uri, Shale::Type::Value
-    attribute :value_uri, Shale::Type::Value
-    attribute :lang, Shale::Type::String
-    attribute :script, Shale::Type::String
-    attribute :transliteration, Shale::Type::String
-    attribute :display_label, Shale::Type::String
+  class SubjectName < Lutaml::Model::Serializable
+    attribute :type, :string
+    attribute :id, :string
+    attribute :authority, :string
+    attribute :authority_uri, :string
+    attribute :value_uri, :string
+    attribute :lang, :string
+    attribute :script, :string
+    attribute :transliteration, :string
+    attribute :display_label, :string
     attribute :name_part, NamePart, collection: true
-    attribute :display_form, Shale::Type::String, collection: true
-    attribute :affiliation, Shale::Type::String, collection: true
+    attribute :display_form, :string, collection: true
+    attribute :affiliation, :string, collection: true
     attribute :role, Role, collection: true
-    attribute :description, Shale::Type::String, collection: true
+    attribute :description, :string, collection: true
     attribute :name_identifier, Identifier, collection: true
 
     xml do

data/lib/loc_mods/subject_title_info.rb

@@ -1,23 +1,23 @@
 # frozen_string_literal: true
 
-require_relative "base_mapper"
+require "lutaml/model"
 
 module LocMods
-  class SubjectTitleInfo < BaseMapper
-    attribute :id, Shale::Type::Value
-    attribute :authority, Shale::Type::String
-    attribute :authority_uri, Shale::Type::Value
-    attribute :value_uri, Shale::Type::Value
-    attribute :lang, Shale::Type::String
-    attribute :script, Shale::Type::String
-    attribute :transliteration, Shale::Type::String
-    attribute :display_label, Shale::Type::String
-    attribute :type, Shale::Type::String
-    attribute :title, Shale::Type::String, collection: true
-    attribute :sub_title, Shale::Type::String, collection: true
-    attribute :part_number, Shale::Type::String, collection: true
-    attribute :part_name, Shale::Type::String, collection: true
-    attribute :non_sort, Shale::Type::String, collection: true
+  class SubjectTitleInfo < Lutaml::Model::Serializable
+    attribute :id, :string
+    attribute :authority, :string
+    attribute :authority_uri, :string
+    attribute :value_uri, :string
+    attribute :lang, :string
+    attribute :script, :string
+    attribute :transliteration, :string
+    attribute :display_label, :string
+    attribute :type, :string
+    attribute :title, :string, collection: true
+    attribute :sub_title, :string, collection: true
+    attribute :part_number, :string, collection: true
+    attribute :part_name, :string, collection: true
+    attribute :non_sort, :string, collection: true
 
     xml do
       root "subjectTitleInfo"

data/lib/loc_mods/table_of_contents.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require_relative "base_mapper"
+require "lutaml/model"
 
 module LocMods
-  class TableOfContents < BaseMapper
-    attribute :content, Shale::Type::String
-    attribute :display_label, Shale::Type::String
-    attribute :type, Shale::Type::String
-    attribute :shareable, Shale::Type::Value
-    attribute :alt_rep_group, Shale::Type::String
-    attribute :alt_format, Shale::Type::Value
-    attribute :content_type, Shale::Type::String
+  class TableOfContents < Lutaml::Model::Serializable
+    attribute :content, :string
+    attribute :display_label, :string
+    attribute :type, :string
+    attribute :shareable, :string
+    attribute :alt_rep_group, :string
+    attribute :alt_format, :string
+    attribute :content_type, :string
 
     xml do
       root "tableOfContents"

data/lib/loc_mods/target_audience.rb

@@ -1,18 +1,20 @@
 # frozen_string_literal: true
 
-require_relative "base_mapper"
+require "lutaml/model"
 
 module LocMods
-  class TargetAudience < BaseMapper
-    attribute :content, Shale::Type::String
-    attribute :display_label, Shale::Type::String
-    attribute :alt_rep_group, Shale::Type::String
+  class TargetAudience < Lutaml::Model::Serializable
+    attribute :content, :string
+    attribute :authority, :string
+    attribute :display_label, :string
+    attribute :alt_rep_group, :string
 
     xml do
       root "targetAudience"
       namespace "http://www.loc.gov/mods/v3", nil
 
       map_content to: :content
+      map_attribute "authority", to: :authority
       map_attribute "displayLabel", to: :display_label
       map_attribute "altRepGroup", to: :alt_rep_group
     end

data/lib/loc_mods/temporal.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require_relative "base_mapper"
+require "lutaml/model"
 
 require_relative "date"
 
 module LocMods
-  class Temporal < BaseMapper
+  class Temporal < Lutaml::Model::Serializable
     attribute :content, Date
-    attribute :authority, Shale::Type::String
-    attribute :authority_uri, Shale::Type::Value
-    attribute :value_uri, Shale::Type::Value
+    attribute :authority, :string
+    attribute :authority_uri, :string
+    attribute :value_uri, :string
 
     xml do
       root "temporal"

data/lib/loc_mods/text.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "base_mapper"
+require "lutaml/model"
 
 module LocMods
-  class Text < BaseMapper
-    attribute :content, Shale::Type::String
-    attribute :display_label, Shale::Type::String
-    attribute :type, Shale::Type::String
+  class Text < Lutaml::Model::Serializable
+    attribute :content, :string
+    attribute :display_label, :string
+    attribute :type, :string
 
     xml do
       root "text"

data/lib/loc_mods/title_info.rb

@@ -1,30 +1,30 @@
 # frozen_string_literal: true
 
-require_relative "base_mapper"
+require "lutaml/model"
 require_relative "non_sort"
 
 module LocMods
-  class TitleInfo < BaseMapper
-    attribute :type, Shale::Type::String
-    attribute :other_type, Shale::Type::Value
-    attribute :supplied, Shale::Type::Value
-    attribute :alt_rep_group, Shale::Type::String
-    attribute :alt_format, Shale::Type::Value
-    attribute :content_type, Shale::Type::String
-    attribute :name_title_group, Shale::Type::String
-    attribute :usage, Shale::Type::Value
-    attribute :id, Shale::Type::Value
-    attribute :authority, Shale::Type::String
-    attribute :authority_uri, Shale::Type::Value
-    attribute :value_uri, Shale::Type::Value
-    attribute :lang, Shale::Type::String
-    attribute :script, Shale::Type::String
-    attribute :transliteration, Shale::Type::String
-    attribute :display_label, Shale::Type::String
-    attribute :title, Shale::Type::String, collection: true
-    attribute :sub_title, Shale::Type::String, collection: true
-    attribute :part_number, Shale::Type::String, collection: true
-    attribute :part_name, Shale::Type::String, collection: true
+  class TitleInfo < Lutaml::Model::Serializable
+    attribute :type, :string
+    attribute :other_type, :string
+    attribute :supplied, :string
+    attribute :alt_rep_group, :string
+    attribute :alt_format, :string
+    attribute :content_type, :string
+    attribute :name_title_group, :string
+    attribute :usage, :string
+    attribute :id, :string
+    attribute :authority, :string
+    attribute :authority_uri, :string
+    attribute :value_uri, :string
+    attribute :lang, :string
+    attribute :script, :string
+    attribute :transliteration, :string
+    attribute :display_label, :string
+    attribute :title, :string, collection: true
+    attribute :sub_title, :string, collection: true
+    attribute :part_number, :string, collection: true
+    attribute :part_name, :string, collection: true
     attribute :non_sort, NonSort, collection: true
 
     xml do

data/lib/loc_mods/type_of_resource.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require_relative "base_mapper"
+require "lutaml/model"
 
 module LocMods
-  class TypeOfResource < BaseMapper
-    attribute :content, Shale::Type::String
-    attribute :collection, Shale::Type::Value
-    attribute :manuscript, Shale::Type::Value
-    attribute :display_label, Shale::Type::String
-    attribute :alt_rep_group, Shale::Type::String
-    attribute :usage, Shale::Type::Value
+  class TypeOfResource < Lutaml::Model::Serializable
+    attribute :content, :string
+    attribute :collection, :string
+    attribute :manuscript, :string
+    attribute :display_label, :string
+    attribute :alt_rep_group, :string
+    attribute :usage, :string
 
     xml do
       root "typeOfResource"

data/lib/loc_mods/url.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require_relative "base_mapper"
+require "lutaml/model"
 
 module LocMods
-  class Url < BaseMapper
-    attribute :content, Shale::Type::Value
-    attribute :date_last_accessed, Shale::Type::String
-    attribute :display_label, Shale::Type::String
-    attribute :note, Shale::Type::String
-    attribute :access, Shale::Type::String
-    attribute :usage, Shale::Type::String
+  class Url < Lutaml::Model::Serializable
+    attribute :content, :string
+    attribute :date_last_accessed, :string
+    attribute :display_label, :string
+    attribute :note, :string
+    attribute :access, :string
+    attribute :usage, :string
 
     xml do
       root "url"

data/lib/loc_mods/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LocMods
-  VERSION = "0.2.4"
+  VERSION = "0.2.6"
 end

data/lib/loc_mods.rb

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
 
-require_relative "loc_mods/version"
+require "lutaml/model"
+
+Lutaml::Model::Config.configure do |config|
+  require "lutaml/model/xml_adapter/nokogiri_adapter"
+  config.xml_adapter = Lutaml::Model::XmlAdapter::NokogiriAdapter
+end
 
 module LocMods
   class Error < StandardError; end
-  # Your code goes here...
 end
 
-require "shale"
-require "shale/adapter/nokogiri"
-Shale.xml_adapter = Shale::Adapter::Nokogiri
-
+require_relative "loc_mods/version"
 require_relative "loc_mods/collection"

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: loc_mods
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-13 00:00:00.000000000 Z
+date: 2025-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: lutaml-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shale
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -132,6 +132,7 @@ extra_rdoc_files: []
 files:
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - CODE_OF_CONDUCT.md
 - README.adoc
 - Rakefile
@@ -141,14 +142,12 @@ files:
 - lib/loc_mods/access_condition.rb
 - lib/loc_mods/alternative_name.rb
 - lib/loc_mods/area.rb
-- lib/loc_mods/base_mapper.rb
 - lib/loc_mods/cartographic_extension.rb
 - lib/loc_mods/cartographics.rb
 - lib/loc_mods/city_section.rb
 - lib/loc_mods/classification.rb
 - lib/loc_mods/cli.rb
 - lib/loc_mods/collection.rb
-- lib/loc_mods/comparable_mapper.rb
 - lib/loc_mods/copy_information.rb
 - lib/loc_mods/date.rb
 - lib/loc_mods/date_other.rb
@@ -215,7 +214,7 @@ metadata:
   homepage_uri: https://github.com/relaton/loc_mods
   source_code_uri: https://github.com/relaton/loc_mods
   changelog_uri: https://github.com/relaton/loc_mods
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -231,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Library of Congress MODS / MADS parser
 test_files: []

data/lib/loc_mods/base_mapper.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-# lib/loc_mods/base_mapper.rb
-require "shale"
-require_relative "comparable_mapper"
-
-module LocMods
-  # Base class for all object definitions
-  class BaseMapper < Shale::Mapper
-    include ComparableMapper
-  end
-
-  # Nil class substitute for comparison
-  class ComparableNil < BaseMapper
-  end
-
-  # Comparison of two values for ComparableMapper
-  class Comparison
-    attr_accessor :original, :updated
-
-    def initialize(original:, updated:)
-      @original = original
-      @updated = updated
-    end
-  end
-end