icat4json 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 434bb4dee92074b3e017c99a2fc4804ac578ff47ce3fbc069266997d93ba7851
-  data.tar.gz: 31357442c1d87b77a3eabb73ea802d9a98bc37e7bc49b4692903058057266d54
+  metadata.gz: c85d6a903ebea3b9c793c9afe4896bdcefe2623d3fdb12ad38caab5d80d0911f
+  data.tar.gz: 12e136c7720e1ba168b44cec60242aa0314abbe818e6ffa04909bfcf569aaaa8
 SHA512:
-  metadata.gz: 363c88013bde3b1ccca2f7708b3b32300ca4984b6043e0485db1d6b140f3211edc6c37ee8abc3e9a84823ddcb0f46c16d584c8336b753cef2756f5eccb0a22e7
-  data.tar.gz: 71233622a630170737cf6b1234c3e396f5c5bfec8f8cb9eb092b20a870a5e1121a535c81f3bcbad523bd557e9b56a9c54ad951d8041ff4ad637a7a6e3de1d09a
+  metadata.gz: c2e294b7257bfaff1a98631900252be8f903148d43f8d8623a33e95ad5765126968b4bd75c04b247f92685241fe54c6356aa645472c89a9e6e6f6d8c692b9775
+  data.tar.gz: c31a4de53e09cdb2a3e85ed1d0a7f106fde2fb85247e6ee19d94db0ca1b1723f45f4b4837c9d0489de4aaed3c19f0f31ec1702be3a23859afaa52b08606e3edf

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in icat4json.gemspec
 gemspec

data/Gemfile.lock

@@ -1,12 +1,77 @@
 PATH
   remote: .
   specs:
-    icat4json (1.0.2)
+    icat4json (1.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.4.3)
+    date (3.4.1)
+    erb (5.0.2)
+    io-console (0.8.1)
+    irb (1.15.2)
+      pp (>= 0.6.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.15.0)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    parallel (1.27.0)
+    parser (3.3.9.0)
+      ast (~> 2.4.1)
+      racc
+    pp (0.6.2)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.5.1)
+    psych (5.2.6)
+      date
+      stringio
+    racc (1.8.1)
+    rainbow (3.1.1)
     rake (13.3.0)
+    rdoc (6.14.2)
+      erb
+      psych (>= 4.0.0)
+    regexp_parser (2.11.3)
+    reline (0.6.2)
+      io-console (~> 0.5)
+    rubocop (1.80.2)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.46.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.47.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-performance (1.25.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    ruby-progressbar (1.13.0)
+    standard (1.51.1)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.80.2)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.8)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.8.0)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.25.0)
+    stringio (3.1.7)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
 
 PLATFORMS
   ruby
@@ -14,7 +79,9 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.0)
   icat4json!
+  irb
   rake (~> 13.0)
+  standard (~> 1.0)
 
 BUNDLED WITH
    2.5.18

data/README.md

@@ -29,7 +29,7 @@ require 'icat4json'
 so,
 
 ```
-data = ICat4JSON::ICat4JSON.new
+data = ICat4JSON.new
 puts data.json
 puts data.icat
 ```

data/Rakefile

@@ -1,2 +1,2 @@
 require "bundler/gem_tasks"
-task :default => :spec
+task default: :spec

data/icat4json.gemspec

@@ -1,25 +1,26 @@
-
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "icat4json/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "icat4json"
-  spec.version       = Icat4json::VERSION
-  spec.authors       = ["FUNABARA Masao"]
-  spec.email         = ["masao@masoo.jp"]
-  spec.summary       = "Ruby client for IPA's icat for JSON vulnerability feed"
-  spec.description   = "A Ruby gem to fetch and parse vulnerability information from IPA's icat for JSON feed. Provides easy access to Japanese vulnerability database."
-  spec.homepage      = "https://github.com/masoo/icat4json"
-  spec.license       = "MIT"
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.name = "icat4json"
+  spec.version = ICat4JSON::VERSION
+  spec.authors = ["FUNABARA Masao"]
+  spec.email = ["masao@masoo.jp"]
+  spec.summary = "Ruby client for IPA's icat for JSON vulnerability feed"
+  spec.description = "A Ruby gem to fetch and parse vulnerability information from IPA's icat for JSON feed. Provides easy access to Japanese vulnerability database."
+  spec.homepage = "https://github.com/masoo/icat4json"
+  spec.license = "MIT"
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   spec.required_ruby_version = ">= 3.2.0"
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "irb"
+  spec.add_development_dependency "standard", "~> 1.0"
 end

data/lib/icat4json/version.rb

@@ -1,3 +1,3 @@
-module Icat4json
-  VERSION = "1.0.6"
+module ICat4JSON
+  VERSION = "1.1.0"
 end

data/lib/icat4json.rb

@@ -5,26 +5,46 @@ require "json"
 
 module ICat4JSON
   class ICat4JSON
-    attr_accessor :json, :icat
-    ICAT4JSON_URL = "http://isec-myjvn-feed1.ipa.go.jp/IPARssReader.php?1456207434&tool=icatw"
+    attr_reader :json, :icat
+
+    ICATData = Struct.new(:itemdata, :docTitle, :docTitleFix, :docLink, :docDate)
+    ItemData = Struct.new(:item_title, :item_link, :item_date, :item_identifier)
 
     def initialize
-      uri = URI.parse(ICAT4JSON_URL)
-      http = Net::HTTP.get(uri)
-      @json = JSON.parse(http)
-      struct_icat = Struct.new(:itemdata, :docTitle, :docTitleFix, :docLink, :docDate)
-      struct_item = Struct.new(:item_title, :item_link, :item_date, :item_identifier)
-      @icat = struct_icat.new
-      @json.each {|k, v| icat[k] = v unless k == "itemdata" }
+      begin
+        uri = URI.parse(icat4json_url)
+        http = Net::HTTP.get(uri)
+      rescue => e
+        raise e, "HTTP request failed: #{e.message}"
+      end
+
+      begin
+        @json = JSON.parse(http)
+      rescue JSON::ParserError => e
+        raise e, "JSON parsing failed: #{e.message}"
+      end
+
+      @icat = ICATData.new
+      @json.each { |k, v| icat[k] = v unless k == "itemdata" }
       @icat[:itemdata] = []
       @json["itemdata"].each do |itemdata|
-        item = struct_item.new
-        itemdata.each do |k,v|
+        item = ItemData.new
+        itemdata.each do |k, v|
           item[k] = v
         end
         @icat[:itemdata].push item
       end
-      true
     end
+
+    private
+
+    # analize https://www.ipa.go.jp/security/announce/irss/icatw2.js
+    def icat4json_url
+      "http://isec-myjvn-feed1.ipa.go.jp/IPARssReader.php?#{Time.now.to_i}&tool=icatw"
+    end
+  end
+
+  def self.new(*args, &block)
+    ICat4JSON.new(*args, &block)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: icat4json
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - FUNABARA Masao
@@ -37,6 +37,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: irb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: A Ruby gem to fetch and parse vulnerability information from IPA's icat
   for JSON feed. Provides easy access to Japanese vulnerability database.
 email: