sip2-ruby 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf795e745647f0ec5826a90ff63bf922a378abd11b8a9d859ea668c3ce08e2ec
-  data.tar.gz: b09a7171eb127c1db17718da05eac080a7c0dcd02c3c3aa3ec05a89fe10bc61f
+  metadata.gz: 96d721046557a0efc45a7c605b25f55ff1b5e9269fb4efe44b79891e2ae6cdb2
+  data.tar.gz: d42791627df1b51319116ab60ccbb4e177a455644979b4973b8a0c9d3b00c389
 SHA512:
-  metadata.gz: 19c7a7e5f76b282bd9dae4406a4e886d53ad612cdc6bd9b90df7fa4db50d705875c1ef8f3913d576df892afb769a10abdef6dbe79af1f1640c857dfc1063e510
-  data.tar.gz: b9c0047215b39683546594d15004a0a3e390ead39f56625ed0caab55d6155d45a85b322ae07d45f63245c02e44f214a4f72ad6ff13c17d6a097f0f57e36059c0
+  metadata.gz: e25c2e31d3fed713558137f339aa9d224e73d5fdb0a241ce4add781ee4c710b8ccf0664beb57d1eff2dc244509d1e119011957086c04d314ffdb83e11ef4ca99
+  data.tar.gz: f96394c636f0c8215d8a0c79f60c27d9278d5d499f2287b650f19ddbf30cb53d0847497ceafc2b5bdeb6e5b9be0ea9f9fee8e672bca1c92ac5e15960532ee386

data/lib/sip2/messages.rb

@@ -619,7 +619,10 @@ module Sip2
       required_delimited_fields: [],
       optional_delimited_fields: [],
     },
-  ]
+  ].map { |msg|
+    msg[:symbol] = msg[:name].downcase.gsub(" ", "_").to_sym
+    msg
+  }
 
   MESSAGES_BY_CODE = MESSAGES
     .group_by { |m| m[:code] }

data/lib/sip2/transformer.rb

@@ -9,7 +9,7 @@ module Sip2
     rule(nil: simple(:_)) { nil }
     rule(empty_hash: simple(:_)) { {} }
 
-    rule(int: simple(:x)) { Integer(x) }
+    rule(int: simple(:x)) { Integer(x, 10) }
 
     rule(int: sequence(:x)) { x.empty? ? 0 : x }
 
@@ -70,7 +70,10 @@ module Sip2
             hsh.fetch(k) { hsh[k] = [] } << v
           }
         else
-          hsh.merge!(el)
+          el.each do |k,v|
+            warn "Overwriting duplicate field: #{k}" if hsh.key?(k)
+            hsh[k] = v
+          end
         end
       }
     }

data/lib/sip2/version.rb

@@ -1,3 +1,3 @@
 module Sip2
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/sip2-ruby.gemspec

@@ -13,12 +13,11 @@ Gem::Specification.new do |spec|
   EOS
   spec.homepage      = "https://github.com/ub-library/sip2-ruby"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = spec.homepage + "/CHANGES.md"
-
+  spec.metadata["changelog_uri"] = spec.homepage + "/blob/main/CHANGES.md"
   spec.files = Dir.glob("{lib,test}/**/*") + %w[
       LICENSE.txt
       README.md
@@ -31,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.executables   = %w[sip2-to-json json-to-sip2]
   spec.require_paths = %w[lib]
 
-  spec.add_runtime_dependency "dry-struct", "~> 1.4"
+  spec.add_runtime_dependency "dry-struct", ">= 1.4", "< 1.9"
   spec.add_runtime_dependency "parslet", "~> 2.0"
   spec.add_runtime_dependency "yajl-ruby", "~> 1.4"
 

data/test/sip2_spec.rb

@@ -140,6 +140,56 @@ describe Sip2 do
       end
 
     end
-  end 
+
+    describe "Messages with duplicate fields" do
+      let(:base_message) { sip2_fixture("18") }
+
+      it "combines repeatable fields into arrays" do
+        # Insert print_line fields after the title field
+        msg = base_message.sub(
+          "|AJSome example title by Some Author|",
+          "|AJSome example title by Some Author|AGFirst print line|AGSecond print line|"
+        )
+
+        result = Sip2.parse(msg).first
+        assert_equal ["First print line", "Second print line"], result[:print_line]
+      end
+
+      it "keeps last value for duplicate non-repeatable fields" do
+        # Insert duplicate location field after the first one
+        msg = base_message.sub(
+          "|APSomeLocation|",
+          "|APFirstLocation|APSecondLocation|"
+        )
+
+        result = Sip2.parse(msg).first
+        assert_equal "SecondLocation", result[:current_location]
+      end
+
+      it "warns about duplicate non-repeatable fields" do
+        msg = base_message.sub(
+          "|APSomeLocation|",
+          "|APFirstLocation|APSecondLocation|"
+        )
+
+        assert_output(nil, /Overwriting duplicate field: current_location/) do
+          Sip2.parse(msg)
+        end
+      end
+
+      it "handles multiple types of repeatable fields in any order" do
+        msg = base_message.sub(
+          "|AJSome example title by Some Author|",
+          "|AJSome example title by Some Author|" \
+            "AGFirst print line|AFFirst screen msg|" \
+            "AFSecond screen msg|AGSecond print line|"  # Interspersed order
+        )
+
+        result = Sip2.parse(msg).first
+        assert_equal ["First print line", "Second print line"], result[:print_line]
+        assert_equal ["First screen msg", "Second screen msg"], result[:screen_message]
+      end
+    end
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sip2-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Daniel Sandbecker
@@ -14,16 +14,22 @@ dependencies:
   name: dry-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
@@ -170,7 +176,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/ub-library/sip2-ruby
   source_code_uri: https://github.com/ub-library/sip2-ruby
-  changelog_uri: https://github.com/ub-library/sip2-ruby/CHANGES.md
+  changelog_uri: https://github.com/ub-library/sip2-ruby/blob/main/CHANGES.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -179,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="