jalc 2.1.2 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2407227918e30a52acb05438fbb3b1713ee9cb2206000204d795030b78d7f265
-  data.tar.gz: 390b6c7e439ef7f487af098808cc717411610d1c07aeafe15b95404eeed7d954
+  metadata.gz: 55ff4fb23821eddb0698085a58a54bec6663c30e19504fb5e25a0369972e7d57
+  data.tar.gz: cffd65412e172347f271f668eab81a40602cf624815ad670ba5ea61c291f5f1a
 SHA512:
-  metadata.gz: 275263f97587d4258f29d850d19378cdcfedf3ac502b3d13d52cb72b5c259e0f87159cb1a9d136c9fbb9d6c0b4a58b3f2d36ebb2007fe8fe6ca3af38793196ff
-  data.tar.gz: d09786ab3e4a994020e6e1f52d575e4bd18f57ce2728944bd8987682c93ec0104150d1a5133fbe3251acb05b55f1984731de23c0aabd313c5e6821a33dc12458
+  metadata.gz: 5e31213e71eb257b29b3ccb5ecb61ae681f1a4a1a5ab19b0518644217a22646251bd63b5feef0d150215f44aafd48b1d92fd63ec9a8999a01042a8b31e3e4fc3
+  data.tar.gz: 2c3aa1cc1445bfbb2f1a3e20da84bbff7cae9990a06c6553e1c5aada559f1888abd11391485d8f818ee7aec74d2506ce2e04cd57891f7ee70f4259250b8043d6

data/.devcontainer/devcontainer.json

@@ -0,0 +1,31 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/ruby
+{
+	"name": "Ruby",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/ruby:0-3-bullseye",
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	"postCreateCommand": "bin/setup",
+
+	// Configure tool-specific properties.
+	"customizations": {
+		"vscode": {
+      "extensions": [
+				"KoichiSasada.vscode-rdbg",
+				"castwide.solargraph",
+				"soutaro.rbs-syntax",
+				"soutaro.steep-vscode"
+			]
+    }
+	}
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

data/.rubocop.yml

@@ -2,9 +2,15 @@ require:
   - rubocop-rake
   - rubocop-rspec
 
+inherit_mode:
+  merge:
+    - Exclude
+
 AllCops:
   TargetRubyVersion: 2.7
   NewCops: enable
+  Exclude:
+    - gem_rbs_collection/**/*
 
 Metrics/BlockLength:
   Exclude:

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## [Unreleased]
 
+## [2.2.1] - 2023-02-03
+
+- Fix the constructor args of `Registration::RegistrationError`
+
+## [2.2.0] - 2023-02-03
+
+- Stop using HTTP GET for Registration API
+- Use `errmsg` element for error messages
+
 ## [2.1.2] - 2022-04-13
 
 - Fix the condition of log filtering

data/Gemfile

@@ -12,4 +12,6 @@ gem 'rspec'
 gem 'rubocop'
 gem 'rubocop-rake'
 gem 'rubocop-rspec'
+gem 'solargraph'
+gem 'steep'
 gem 'webmock'

data/Steepfile

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+D = Steep::Diagnostic
+
+target :lib do
+  signature 'sig', 'sig-private'
+  repo_path 'gem_rbs_collection/gems'
+
+  check 'lib'
+
+  library 'forwardable', 'logger', 'uri'
+  library 'faraday'
+
+  configure_code_diagnostics do |hash|
+    hash[D::Ruby::NoMethod] = :information
+    hash[D::Ruby::UnknownConstant] = :information
+
+    hash[D::Ruby::MethodDefinitionMissing] = nil # To supress noisy VS Code extension message.
+  end
+end

data/lib/jalc/registration/client.rb

@@ -29,12 +29,12 @@ module JaLC
       end
 
       def get_result(exec_id)
-        response = conn.get(
+        response = conn.post(
           '/jalc/infoRegistry/registDataResult/index',
           {
-            login_id: config.id,
-            login_passwd: config.password,
-            exec_id: exec_id,
+            login_id: Faraday::Multipart::ParamPart.new(config.id, 'text/plain'),
+            login_passwd: Faraday::Multipart::ParamPart.new(config.password, 'text/plain'),
+            exec_id: Faraday::Multipart::ParamPart.new(exec_id, 'text/plain'),
           },
         )
         response.body
@@ -51,11 +51,7 @@ module JaLC
           f.use Middleware::RaiseError
           f.use Middleware::ParseXML
           f.response :raise_error
-          if config.logger
-            f.response :logger, config.logger, { headers: false } do |logger|
-              logger.filter(/(passwd=)([^&]+)/, '\1[REMOVED]')
-            end
-          end
+          f.response :logger, config.logger, { headers: false } if config.logger
         end
       end
     end

data/lib/jalc/registration/middleware/raise_error.rb

@@ -11,18 +11,28 @@ module JaLC
         def on_complete(env)
           case env.body.root.elements['head/errcd']&.text
           when '*'
-            raise AuthenticationError,
-                  'IDとパスワードの組合せが間違っているか、アクセス元のIPアドレスがJaLCに登録されているIPアドレスと異なっている可能性があります (errcd=*)'
+            raise AuthenticationError.new(doc: env.body)
           when '#'
-            raise InvalidXMLError, 'XMLファイルの構造に誤りがあるか、login_id、login_passwd、fnameのパラメータに未設定のものがある可能性があります (errcd=#)'
+            raise InvalidXMLError.new(doc: env.body)
           when '+'
-            raise RegistrationError, 'fnameで指定したファイルがXMLファイルでないか、XMLファイルの文字コードがUTF-8でない可能性があります (errcd=+)'
+            raise RegistrationError.new(doc: env.body)
           end
         end
       end
     end
 
-    class RegistrationError < Error; end
+    class RegistrationError < Error
+      attr_reader :doc
+
+      def initialize(msg = nil, doc: nil)
+        @doc = doc
+        if msg.nil? && doc
+          msg = "#{doc.root.elements['head/errmsg']&.text} (errcd=#{doc.root.elements['head/errcd']&.text})"
+        end
+        super(msg)
+      end
+    end
+
     class AuthenticationError < RegistrationError; end
     class InvalidXMLError < RegistrationError; end
   end

data/lib/jalc/rest/client.rb

@@ -66,8 +66,8 @@ module JaLC
         begin
           require 'faraday_middleware'
         rescue LoadError
-          raise LoadError, 'faraday_middleware gem is required when using Faraday v1.' \
-                           " Please add `gem 'faraday_middleware'` to your Gemfile."
+          raise LoadError, 'faraday_middleware gem is required when using Faraday v1. ' \
+                           "Please add `gem 'faraday_middleware'` to your Gemfile."
         end
 
         retry

data/lib/jalc/rest/middleware/raise_error.rb

@@ -44,7 +44,7 @@ module JaLC
 
       def initialize(msg = nil, response: nil)
         @response = response
-        msg ||= response[:body].dig('message', 'errors', 'message') if response && response[:body].respond_to?(:dig)
+        msg ||= response[:body].dig('message', 'errors', 'message') if response && response[:body].is_a?(Hash)
         msg ||= "the server responded with status #{response[:status]}" if response
 
         super(msg)

data/lib/jalc/version.rb

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

data/sig/jalc.rbs

@@ -1,10 +1,10 @@
 module JaLC
-  interface _Logger
-  end
-
   VERSION: String
 
   module Registration
+    self.@config: Config
+    self.@client: Client
+
     def self.configure: { (Config) -> void } -> void
     def self.config: -> Config
 
@@ -12,6 +12,9 @@ module JaLC
     end
     
     class RegistrationError < Error
+      def initialize: (?untyped msg, ?doc: untyped) -> void
+                    
+      attr_reader doc: untyped # REXML::Document
     end
     
     class AuthenticationError < RegistrationError
@@ -21,28 +24,52 @@ module JaLC
     end
 
     class Client
-      interface _IO
-      end
-      type rexml_document = untyped
-
       def initialize: (Config config) -> void
-      def post: (_IO xml_file) -> rexml_document
-      def get_result: (Integer | String exec_id) -> rexml_document
+      
+      attr_reader config: Config
+      @conn: Faraday::Connection
+
+      def post: (IO | StringIO xml_file) -> untyped # REXML::Document
+      def get_result: (Integer | String exec_id) -> untyped # REXML::Document
+                    
+      private
+
+      def conn: -> Faraday::Connection
     end
 
     class Config
       DEFAULT_BASE_URL: String
       
+      def initialize: -> void
+      
+      attr_accessor base_url: String
       attr_accessor id: String?
       attr_accessor password: String?
-      attr_accessor logger: _Logger?
-      
-      def initialize: -> void
+      attr_accessor logger: Logger?
+    end
+
+    module Middleware
+      class ParseXML < Faraday::Middleware
+        def on_complete: (untyped env) -> void
+      end
+
+      class RaiseError < Faraday::Middleware
+        def on_complete: (untyped env) -> void
+      end
     end
   end
 
   module REST
-    type response_body = Hash[String, untyped] | String | nil
+    type response_body = (Hash[String, untyped] | String)?
+    type response_hash = {
+      status: Integer,
+      headers: Hash[String, String],
+      body: response_body,
+      request: { method: Symbol, url: URI, headers: Hash[String, String], body: String? }
+    }
+                       
+    self.@config: Config
+    self.@client: Client
 
     def self.configure: { (Config) -> void } -> void
     def self.config: -> Config
@@ -51,11 +78,10 @@ module JaLC
     end
     
     class HTTPError < Error
-      type response_hash = {status: Integer, headers: Hash[String, String], body: response_body, request: {method: Symbol, url: URI, headers: Hash[String, String], body: String?}}
+      def initialize: (?String? msg, ?response: response_hash?) -> void
 
       attr_reader response: response_hash?
 
-      def initialize: (?String? msg, ?response: response_hash?) -> void
       def inspect: -> String
     end
 
@@ -73,17 +99,36 @@ module JaLC
     
     class Client
       def initialize: (Config config) -> void
+      
+      attr_reader config: Config
+      @conn: Faraday::Connection
+
       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
+             
+      private
+
+      def conn: -> Faraday::Connection
     end
 
     class Config
       DEFAULT_BASE_URL: String
       
-      attr_accessor logger: _Logger?
-      
       def initialize: -> void
+      
+      attr_accessor base_url: String
+      attr_accessor logger: Logger?  
+    end
+
+    module Middleware
+      class RaiseError < Faraday::Middleware
+        def on_complete: (untyped env) -> void
+                       
+        private
+
+        def response_values: (untyped env) -> response_hash
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jalc
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.1
 platform: ruby
 authors:
 - Takahiro Miyoshi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-13 00:00:00.000000000 Z
+date: 2023-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -65,6 +65,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer/devcontainer.json"
 - ".rspec"
 - ".rubocop.yml"
 - CHANGELOG.md
@@ -73,6 +74,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- Steepfile
 - bin/console
 - bin/setup
 - jalc.gemspec
@@ -114,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: JaLC (Japan Link Center) API Client