glycobook 0.1.0.alpha.13-java → 0.1.0.alpha.14-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6597991ee22be9f80490074af766e649928da064481acc7cec61696beda9212
-  data.tar.gz: 84ff7fb0d1e34c14b2ba60e42870e96aa01080a9bd4aa96e9ac18610c93eadb2
+  metadata.gz: 9783edf50dd8884c859bd729245b8db2bfd1b460f9d492decb8b53b888aed05d
+  data.tar.gz: 763879fa7da8fd5d0d846eaa327970d426f689fe5426540616889742dc15f6fc
 SHA512:
-  metadata.gz: 3d97a3ebcd70fac044adc0d16989da2f9ee8042f4d65b4f18977cd91df7e4216a724a6a9de34211ac22837b796ae69b6952589624060a392faae21b72d471316
-  data.tar.gz: 66c04e3a9fd53e7d5c5ae219664c0100b2fe18e7d3b31f5deb243d8abcca109c111dabbabfa58964af819c633b2a4caa0bf0d7355b100aca8d655c7881aaf587
+  metadata.gz: 2226714ccd56a84dd8c5977140011983ffc9f5d27c934a78de632e72f2ffbd593e41d6117f0b73575aa88a69526e0d27219849917964f0370b3fac8714f0c379
+  data.tar.gz: d8cac73b68d01d07a22a1d90a5188fb987c24253f8d5dec048feee76260892dbd4879714677b8b9fd67d1288e05bde674f0e6ff92b8e9e25ed27010a53e621d8

data/jar.yml

@@ -10,8 +10,10 @@ list:
     file: "jar/wurcsframework-1.2.14.jar"
   - url: "https://gitlab.com/glycoinfo/wurcsframework/-/package_files/70458150/download"
     file: "jar/wurcsframework-1.0.1.jar"
-  - url: "https://repo1.maven.org/maven2/org/slf4j/slf4j-api/2.0.7/slf4j-api-2.0.7.jar"
+  - url: "https://repo1.maven.org/maven2/org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9.jar"
     file: "jar/slf4j-api.jar"
+  - url: "https://repo1.maven.org/maven2/org/slf4j/slf4j-simple/2.0.9/slf4j-simple-2.0.9.jar"
+    file: "jar/slf4j-simple-2.0.9.jar"
   - url: "https://gitlab.glyco.info/glycosmos/subsumption/subsumption/-/package_files/567/download"
     file: "jar/subsumption.jar"
   - url: "https://gitlab.glyco.info/glycosmos/glytoucangroup/archetype/lib/-/package_files/489/download"

data/lib/glycobook/Loggerinit.rb

@@ -1,23 +1,33 @@
 require 'java'
 require 'logger'
 require_relative  '../jar/slf4j-api.jar'
+require_relative  '../jar/slf4j-simple.jar'
+
 java_import 'org.slf4j.LoggerFactory'
 
+module GlycoBook
 class JRubySLF4JLogger < Logger
   def initialize(name)
-    super(STDOUT)  # STDOUTはダミー、実際のログはSLF4Jを通じて行われる
+    super(STDOUT)  # STDOUT is dummy
     @java_logger = LoggerFactory.getLogger(name)
   end
+  def add(severity, message , progname , &block)
+
+  message = block.call if block
+  message = message.to_s
 
-  def add(severity, message = nil, progname = nil)
-    # Rubyのログレベルに応じてJavaのSLF4Jメソッドを呼び出す
-    case severity
-    when Logger::INFO
+  case severity
+    when 0  # Logger::DEBUG
+      @java_logger.debug(message)
+    when 1  # Logger::INFO
+      @java_logger.info(message)
+    when 2  # Logger::WARN
+      @java_logger.warn(message)
+    when 3, 4# Logger::ERROR, Logger::FATAL
+      @java_logger.error(message)
+    else
       @java_logger.info(message)
-    # 他のログレベルについても同様に実装
     end
   end
 end
-
-logger = JRubySLF4JLogger.new("MyLogger")
-logger.info("This is an info message from JRuby with SLF4J")
+end

data/lib/glycobook/gly_tou_can.rb

@@ -7,8 +7,6 @@ require_relative '../jar/slf4j-api.jar'
 java_import 'org.glytoucan.Archetype'
 java_import 'org.glycoinfo.WURCSFramework.wurcs.graph.WURCSGraph'
 java_import 'org.glycoinfo.WURCSFramework.util.WURCSException'
-java_import 'org.slf4j.Logger'
-java_import 'org.slf4j.LoggerFactory'
 
 module GlycoBook
 class GlyTouCan

data/lib/glycobook/glycan_builder.rb

@@ -2,7 +2,6 @@ require 'java'
 
 require_relative '../jar/glycanbuilder2.jar'
 require_relative '../jar/wurcsframework.jar'
-require_relative '../jar/slf4j-api.jar'
 require_relative "../jar/batik-all.jar"
 
 java_import 'java.io.ByteArrayOutputStream'

data/lib/glycobook/glycan_format_converter.rb

@@ -2,7 +2,6 @@ require 'java'
 
 require_relative '../jar/glycanformatconverter.jar'
 require_relative '../jar/wurcsframework.jar'
-require_relative '../jar/slf4j-api.jar'
 require_relative "../jar/MolecularFramework.jar"
 
 java_import 'org.glycoinfo.GlycanFormatconverter.io.GlycoCT.WURCSToGlycoCT'

data/lib/glycobook/subsumption.rb

@@ -2,7 +2,6 @@ require 'java'
 
 require_relative '../jar/subsumption.jar'
 require_relative '../jar/wurcsframework.jar'
-require_relative '../jar/slf4j-api.jar'
 
 java_import 'org.glycoinfo.subsumption.manipulation.GraphManager'
 java_import 'org.glycoinfo.WURCSFramework.wurcs.graph.WURCSGraph'

data/lib/glycobook/wurcs_frame_work.rb

@@ -1,22 +1,23 @@
-# lib/my_gem.rb
 require 'java'
-require_relative  '../jar/slf4j-api.jar'
+
 module GlycoBook
-class WurcsFrameWork
+
+  class WurcsFrameWork
     require_relative  '../jar/wurcsframework.jar'
-  java_import 'org.glycoinfo.WURCSFramework.util.validation.WURCSValidator'
-  java_import 'org.slf4j.Logger'
-  def validator(w)
-    validator = WURCSValidator.new
-    validator.start(w)
-    reports = {}
-    reports["VALIDATOR"] = ["WURCSFramework-1.2.14"]
-    reports["WARNING"] = validator.getReport().hasWarning()
-    reports["ERROR"] = validator.getReport().hasError()
-    reports["UNVERIFIABLE"] = validator.getReport().hasUnverifiable()
-    return {"message" => reports,
+    java_import 'org.glycoinfo.WURCSFramework.util.validation.WURCSValidator'
+    java_import 'org.slf4j.Logger'
+    
+    def validator(w)
+      validator = WURCSValidator.new
+      validator.start(w)
+      reports = {}
+      reports["VALIDATOR"] = ["WURCSFramework-1.2.14"]
+      reports["WARNING"] = validator.getReport().hasWarning()
+      reports["ERROR"] = validator.getReport().hasError()
+      reports["UNVERIFIABLE"] = validator.getReport().hasUnverifiable()
+      return {"message" => reports,
             "StandardWURCS" => validator.getReport().standard_string(),
             "RESULTS" => validator.getReport().getResults() }
+    end
   end
 end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glycobook
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha.13
+  version: 0.1.0.alpha.14
 platform: java
 authors:
 - Akihiro Fujita