jalc 2.0.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5112d02828c77713d27f6f817b8360b2ba4d7f494116e6e29c7c838a467f612
-  data.tar.gz: c2e4c484221e81cbcc41538a7773a61aab622ce9c463a5887897f71fafc92373
+  metadata.gz: 2407227918e30a52acb05438fbb3b1713ee9cb2206000204d795030b78d7f265
+  data.tar.gz: 390b6c7e439ef7f487af098808cc717411610d1c07aeafe15b95404eeed7d954
 SHA512:
-  metadata.gz: 164852ecb1e72be40a39e609a055de250a3d69446a317ca71a76ae9895c7003c2215b1bdd3a65b1c9a72faffe91247cfdb160e640acce4cf2de5d43a4d5056dd
-  data.tar.gz: 6ef81e529ec75c794a66605698a5aadb2c632fe2149df97d7b1f237c488bf9348e09c7757af376c17a4348bd2c95004fd7c5556c484e6985ef035b31faf8b165
+  metadata.gz: 275263f97587d4258f29d850d19378cdcfedf3ac502b3d13d52cb72b5c259e0f87159cb1a9d136c9fbb9d6c0b4a58b3f2d36ebb2007fe8fe6ca3af38793196ff
+  data.tar.gz: d09786ab3e4a994020e6e1f52d575e4bd18f57ce2728944bd8987682c93ec0104150d1a5133fbe3251acb05b55f1984731de23c0aabd313c5e6821a33dc12458

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## [Unreleased]
 
+## [2.1.2] - 2022-04-13
+
+- Fix the condition of log filtering
+
+## [2.1.1] - 2022-04-08
+
+- Fix a typo of a registration API parameter
+
+## [2.1.0] - 2022-04-07
+
+- Update the constructor arguments of REST::Client and Registration::Client
+
 ## [2.0.1] - 2022-03-06
 
 - Make the registration error messages Japanese

data/README.md

@@ -50,6 +50,7 @@ See https://japanlinkcenter.org/top/doc/JaLC_tech_interface_doc.pdf for API deta
 require 'jalc'
 
 JaLC::Registration.configure do |config|
+  config.base_url = 'https://japanlinkcenter.org' # default
   config.id = 'sankichi92'
   config.password = ENV['JALC_PASSWORD']
   config.logger = nil

data/lib/jalc/registration/client.rb

@@ -9,22 +9,19 @@ require_relative 'middleware/raise_error'
 
 module JaLC
   module Registration
-    BASE_URL = 'https://japanlinkcenter.org'
-
     class Client
-      def initialize(id:, password:, logger: nil, base_url: BASE_URL)
-        @id = id
-        @password = password
-        @logger = logger
-        @base_url = base_url
+      attr_reader :config
+
+      def initialize(config)
+        @config = config
       end
 
       def post(xml_file)
         response = conn.post(
           '/jalc/infoRegistry/registDataReceive/index',
           {
-            login_id: Faraday::Multipart::ParamPart.new(@id, 'text/plain'),
-            login_password: Faraday::Multipart::ParamPart.new(@password, 'text/plain'),
+            login_id: Faraday::Multipart::ParamPart.new(config.id, 'text/plain'),
+            login_passwd: Faraday::Multipart::ParamPart.new(config.password, 'text/plain'),
             fname: Faraday::Multipart::FilePart.new(xml_file, 'text/xml'),
           },
         )
@@ -35,8 +32,8 @@ module JaLC
         response = conn.get(
           '/jalc/infoRegistry/registDataResult/index',
           {
-            login_id: @id,
-            login_password: @password,
+            login_id: config.id,
+            login_passwd: config.password,
             exec_id: exec_id,
           },
         )
@@ -47,16 +44,16 @@ module JaLC
 
       def conn
         @conn ||= Faraday.new(
-          url: @base_url,
+          url: config.base_url,
           headers: { 'User-Agent' => "jalc-ruby v#{VERSION}" },
         ) do |f|
           f.request :multipart
           f.use Middleware::RaiseError
           f.use Middleware::ParseXML
           f.response :raise_error
-          if @logger
-            f.response :logger, @logger, { headers: false } do |logger|
-              logger.filter(/(password=)\w+/, '\1[FILTERED]')
+          if config.logger
+            f.response :logger, config.logger, { headers: false } do |logger|
+              logger.filter(/(passwd=)([^&]+)/, '\1[REMOVED]')
             end
           end
         end

data/lib/jalc/registration/config.rb

@@ -5,9 +5,12 @@ require 'logger'
 module JaLC
   module Registration
     class Config
-      attr_accessor :id, :password, :logger
+      DEFAULT_BASE_URL = 'https://japanlinkcenter.org'
+
+      attr_accessor :base_url, :id, :password, :logger
 
       def initialize
+        @base_url = DEFAULT_BASE_URL
         @id = nil
         @password = nil
         @logger = ::Logger.new($stdout)

data/lib/jalc/registration.rb

@@ -23,11 +23,7 @@ module JaLC
       private
 
       def client
-        @client ||= Client.new(
-          id: config.id,
-          password: config.password,
-          logger: config.logger,
-        )
+        @client ||= Client.new(config)
       end
     end
   end

data/lib/jalc/rest/client.rb

@@ -9,12 +9,11 @@ require_relative '../version'
 
 module JaLC
   module REST
-    BASE_URL = 'https://api.japanlinkcenter.org'
-
     class Client
-      def initialize(logger: nil, base_url: BASE_URL)
-        @logger = logger
-        @base_url = base_url
+      attr_reader :config
+
+      def initialize(config)
+        @config = config
       end
 
       def prefixes(ra: nil, sort: nil, order: nil)
@@ -54,12 +53,12 @@ module JaLC
 
       def conn
         @conn ||= Faraday.new(
-          url: @base_url,
+          url: config.base_url,
           headers: { 'User-Agent' => "jalc-ruby v#{VERSION}" },
         ) do |f|
           f.use Middleware::RaiseError
           f.response :json
-          f.response :logger, @logger, { headers: false } if @logger
+          f.response :logger, config.logger, { headers: false } if config.logger
         end
       rescue Faraday::Error => e
         raise e unless e.message.match?(/is not registered/)

data/lib/jalc/rest/config.rb

@@ -5,9 +5,12 @@ require 'logger'
 module JaLC
   module REST
     class Config
-      attr_accessor :logger
+      DEFAULT_BASE_URL = 'https://api.japanlinkcenter.org'
+
+      attr_accessor :base_url, :logger
 
       def initialize
+        @base_url = DEFAULT_BASE_URL
         @logger = ::Logger.new($stdout)
       end
     end

data/lib/jalc/rest.rb

@@ -23,7 +23,7 @@ module JaLC
       private
 
       def client
-        @client ||= Client.new(logger: config.logger)
+        @client ||= Client.new(config)
       end
     end
   end

data/lib/jalc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JaLC
-  VERSION = '2.0.1'
+  VERSION = '2.1.2'
 end

data/sig/jalc.rbs

@@ -5,8 +5,6 @@ module JaLC
   VERSION: String
 
   module Registration
-    BASE_URL: String
-
     def self.configure: { (Config) -> void } -> void
     def self.config: -> Config
 
@@ -27,12 +25,14 @@ module JaLC
       end
       type rexml_document = untyped
 
-      def initialize: (id: String, password: String, ?logger: _Logger?, ?base_url: String) -> void
+      def initialize: (Config config) -> void
       def post: (_IO xml_file) -> rexml_document
       def get_result: (Integer | String exec_id) -> rexml_document
     end
 
     class Config
+      DEFAULT_BASE_URL: String
+      
       attr_accessor id: String?
       attr_accessor password: String?
       attr_accessor logger: _Logger?
@@ -44,8 +44,6 @@ module JaLC
   module REST
     type response_body = Hash[String, untyped] | String | nil
 
-    BASE_URL: String
-
     def self.configure: { (Config) -> void } -> void
     def self.config: -> Config
 
@@ -74,13 +72,15 @@ module JaLC
     end
     
     class Client
-      def initialize: (?logger: _Logger?, ?base_url: String) -> void
+      def initialize: (Config config) -> void
       def prefixes: (?ra: String?, ?sort: String?, ?order: String?) -> response_body
       def doilist: (String prefix, ?from: String?, ?to: String?, ?rows: Integer? | String?, ?page: Integer? | String?, ?sort: String?, ?order: String?) -> response_body
       def doi: (String doi) -> response_body
     end
 
     class Config
+      DEFAULT_BASE_URL: String
+      
       attr_accessor logger: _Logger?
       
       def initialize: -> void

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jalc
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Takahiro Miyoshi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-06 00:00:00.000000000 Z
+date: 2022-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday