misp 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07311aee3cd4d7fee5ba2d5dbd47948ea93a9ac7d46378acd131638af1c10b91
-  data.tar.gz: 363f45097f02db033dd2d7ff0a9e098682a23bb96b222530dd7c64e538e65834
+  metadata.gz: dc2ae518cdfe5d3872000bf12bd1083a4a8540a3e6857e50573b1b8011604605
+  data.tar.gz: 25917d69a7a912ace45ccaa43f5bc0a5202e37e66532e1eabf30a09df0478c2e
 SHA512:
-  metadata.gz: 0e8ab18e39772789d47875f4b284a0496044a85d1336c40f4983fd8bde0c0f3822f58be3c84ca1d1cabac8167bc23383fd7901e8ca81cd6f439f9d8a51fe36b1
-  data.tar.gz: 2668db41a8afaec3190ea6dea42cc4fb32ffc4a39bf1a7d7ef3ec9836a09252d476eaf8442b32a4c34b6c16fe146f53131960bad62d7a1a55c1ddf42e5e3d194
+  metadata.gz: 4691cfaffdc82bc4580e08ede833788371b0c9df3b4013bb96a777b2c8b35f92889d466274b301370daa0014a087ad0006d3f92a1de62de9cbea3f5e6e2d78e4
+  data.tar.gz: 2c7e5a0d2c3d5c503346d0a208f6dc9efc4b7b5b8470655e0bf29ea89ed4cbe4d8f4cf2e002738d62cb5b74dfd8b175ed99d01dfaf02fa0cc24c3e85029532c0

data/.github/workflows/test.yaml

@@ -0,0 +1,23 @@
+name: Ruby CI
+
+on: [pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.7, "3.0"]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Build and test with Rake
+        run: |
+          bundle exec rake

data/lib/misp/attribute.rb

@@ -41,24 +41,24 @@ module MISP
     def initialize(**attributes)
       attributes = normalize_attributes(**attributes)
 
-      @id = attributes.dig(:id)
-      @type = attributes.dig(:type)
-      @category = attributes.dig(:category)
-      @to_ids = attributes.dig(:to_ids)
-      @uuid = attributes.dig(:uuid)
-      @event_id = attributes.dig(:event_id)
-      @distribution = attributes.dig(:distribution)
-      @timestamp = attributes.dig(:timestamp)
-      @comment = attributes.dig(:comment)
-      @sharing_group_id = attributes.dig(:sharing_group_id)
-      @deleted = attributes.dig(:deleted)
-      @disable_correlation = attributes.dig(:disable_correlation)
-      @value = attributes.dig(:value)
-      @data = attributes.dig(:data)
-
-      @sharing_groups = build_plural_attribute(items: attributes.dig(:SharingGroup), klass: SharingGroup)
-      @shadow_attributes = build_plural_attribute(items: attributes.dig(:ShadowAttribute), klass: Attribute )
-      @tags = build_plural_attribute(items: attributes.dig(:Tag), klass: Tag)
+      @id = attributes[:id]
+      @type = attributes[:type]
+      @category = attributes[:category]
+      @to_ids = attributes[:to_ids]
+      @uuid = attributes[:uuid]
+      @event_id = attributes[:event_id]
+      @distribution = attributes[:distribution]
+      @timestamp = attributes[:timestamp]
+      @comment = attributes[:comment]
+      @sharing_group_id = attributes[:sharing_group_id]
+      @deleted = attributes[:deleted]
+      @disable_correlation = attributes[:disable_correlation]
+      @value = attributes[:value]
+      @data = attributes[:data]
+
+      @sharing_groups = build_plural_attribute(items: attributes[:SharingGroup], klass: SharingGroup)
+      @shadow_attributes = build_plural_attribute(items: attributes[:ShadowAttribute], klass: Attribute )
+      @tags = build_plural_attribute(items: attributes[:Tag], klass: Tag)
     end
 
     #

data/lib/misp/base.rb

@@ -66,7 +66,7 @@ module MISP
     def normalize_attributes(**attributes)
       klass = class_name.to_sym
 
-      attributes.key?(klass) ? attributes.dig(klass) : attributes
+      attributes.key?(klass) ? attributes[klass] : attributes
     end
 
     def wrap(params)
@@ -149,9 +149,9 @@ module MISP
 
     def default_headers
       {
-        "Content-Type": "application/json",
-        "Accept": "application/json",
-        "Authorization": api_key
+        'Content-Type': "application/json",
+        Accept: "application/json",
+        Authorization: api_key
       }
     end
 

data/lib/misp/event.rb

@@ -60,34 +60,34 @@ module MISP
     def initialize(**attrs)
       attrs = normalize_attributes(**attrs)
 
-      @id = attrs.dig(:id)
-      @orgc_id = attrs.dig(:orgc_id)
-      @org_id = attrs.dig(:org_id)
-      @date = attrs.dig(:date)
-      @threat_level_id = attrs.dig(:threat_level_id)
-      @info = attrs.dig(:info)
-      @published = attrs.dig(:published) || false
-      @uuid = attrs.dig(:uuid)
-      @attribute_count = attrs.dig(:attribute_count)
-      @analysis = attrs.dig(:analysis)
-      @timestamp = attrs.dig(:timestamp)
-      @distribution = attrs.dig(:distribution)
-      @proposal_email_lock = attrs.dig(:proposal_email_lock)
-      @locked = attrs.dig(:locked) || false
-      @publish_timestamp = attrs.dig(:publish_timestamp)
-      @sharing_group_id = attrs.dig(:sharing_group_id)
-      @disable_correlation = attrs.dig(:disable_correlation)
-      @event_creator_email = attrs.dig(:event_creator_email)
-
-      @org = build_attribute(item: attrs.dig(:Org), klass: Org)
-      @orgc = build_attribute(item: attrs.dig(:Orgc), klass: Orgc)
-
-      @sharing_groups = build_plural_attribute(items: attrs.dig(:SharingGroup), klass: SharingGroup)
-      @attributes = build_plural_attribute(items: attrs.dig(:Attribute), klass: Attribute)
-      @shadow_attributes = build_plural_attribute(items: attrs.dig(:ShadowAttribute), klass: Attribute )
-      @related_events = build_plural_attribute(items: attrs.dig(:RelatedEvent), klass: Attribute)
-      @galaxies = build_plural_attribute(items: attrs.dig(:Galaxy), klass: Galaxy)
-      @tags = build_plural_attribute(items: attrs.dig(:Tag), klass: Tag)
+      @id = attrs[:id]
+      @orgc_id = attrs[:orgc_id]
+      @org_id = attrs[:org_id]
+      @date = attrs[:date]
+      @threat_level_id = attrs[:threat_level_id]
+      @info = attrs[:info]
+      @published = attrs[:published] || false
+      @uuid = attrs[:uuid]
+      @attribute_count = attrs[:attribute_count]
+      @analysis = attrs[:analysis]
+      @timestamp = attrs[:timestamp]
+      @distribution = attrs[:distribution]
+      @proposal_email_lock = attrs[:proposal_email_lock]
+      @locked = attrs[:locked] || false
+      @publish_timestamp = attrs[:publish_timestamp]
+      @sharing_group_id = attrs[:sharing_group_id]
+      @disable_correlation = attrs[:disable_correlation]
+      @event_creator_email = attrs[:event_creator_email]
+
+      @org = build_attribute(item: attrs[:Org], klass: Org)
+      @orgc = build_attribute(item: attrs[:Orgc], klass: Orgc)
+
+      @sharing_groups = build_plural_attribute(items: attrs[:SharingGroup], klass: SharingGroup)
+      @attributes = build_plural_attribute(items: attrs[:Attribute], klass: Attribute)
+      @shadow_attributes = build_plural_attribute(items: attrs[:ShadowAttribute], klass: Attribute )
+      @related_events = build_plural_attribute(items: attrs[:RelatedEvent], klass: Attribute)
+      @galaxies = build_plural_attribute(items: attrs[:Galaxy], klass: Galaxy)
+      @tags = build_plural_attribute(items: attrs[:Tag], klass: Tag)
     end
 
     #
@@ -193,7 +193,7 @@ module MISP
       }
 
       _post("/events/restSearch", base.merge(params)) do |json|
-        events = json.dig(:response) || []
+        events = json[:response] || []
         events.map { |event| Event.new(**event) }
       end
     end

data/lib/misp/feed.rb

@@ -50,28 +50,28 @@ module MISP
     def initialize(**attributes)
       attributes = normalize_attributes(**attributes)
 
-      @id = attributes.dig(:id)
-      @name = attributes.dig(:name) || "feed name"
-      @provider = attributes.dig(:provider) || "my provider"
-      @url = attributes.dig(:url) || "http://example.com"
-      @rules = attributes.dig(:rules) || ""
-      @enabled = attributes.dig(:enabled)
-      @distribution = attributes.dig(:distribution)
-      @sharing_group_id = attributes.dig(:sharing_group_id)
-      @tag_id = attributes.dig(:tag_id) || "0"
-      @default = attributes.dig(:default) || true
-      @source_format = attributes.dig(:source_format) || "misp"
-      @fixed_event = attributes.dig(:fixed_event) || true
-      @delta_merge = attributes.dig(:delta_merge) || false
-      @event_id = attributes.dig(:event_id) || "0"
-      @publish = attributes.dig(:publish) || true
-      @override_ids = attributes.dig(:override_ids) || false
-      @settings = attributes.dig(:settings) || ""
-      @input_source = attributes.dig(:input_source) || "network"
-      @delete_local_file = attributes.dig(:delete_local_file) || false
-      @lookup_visible = attributes.dig(:lookup_visible) || true
-      @headers = attributes.dig(:headers) || ""
-      @caching_enabled = attributes.dig(:caching_enabled) || true
+      @id = attributes[:id]
+      @name = attributes[:name] || "feed name"
+      @provider = attributes[:provider] || "my provider"
+      @url = attributes[:url] || "http://example.com"
+      @rules = attributes[:rules] || ""
+      @enabled = attributes[:enabled]
+      @distribution = attributes[:distribution]
+      @sharing_group_id = attributes[:sharing_group_id]
+      @tag_id = attributes[:tag_id] || "0"
+      @default = attributes[:default] || true
+      @source_format = attributes[:source_format] || "misp"
+      @fixed_event = attributes[:fixed_event] || true
+      @delta_merge = attributes[:delta_merge] || false
+      @event_id = attributes[:event_id] || "0"
+      @publish = attributes[:publish] || true
+      @override_ids = attributes[:override_ids] || false
+      @settings = attributes[:settings] || ""
+      @input_source = attributes[:input_source] || "network"
+      @delete_local_file = attributes[:delete_local_file] || false
+      @lookup_visible = attributes[:lookup_visible] || true
+      @headers = attributes[:headers] || ""
+      @caching_enabled = attributes[:caching_enabled] || true
     end
 
     #

data/lib/misp/galaxy.rb

@@ -21,14 +21,14 @@ module MISP
     def initialize(**attributes)
       attributes = normalize_attributes(**attributes)
 
-      @id = attributes.dig(:id)
-      @uuid = attributes.dig(:uuid)
-      @name = attributes.dig(:name)
-      @type = attributes.dig(:type)
-      @description = attributes.dig(:description)
-      @version = attributes.dig(:version)
+      @id = attributes[:id]
+      @uuid = attributes[:uuid]
+      @name = attributes[:name]
+      @type = attributes[:type]
+      @description = attributes[:description]
+      @version = attributes[:version]
 
-      @galaxy_clusters = build_plural_attribute(items: attributes.dig(:GalaxyCluster), klass: GalaxyCluster)
+      @galaxy_clusters = build_plural_attribute(items: attributes[:GalaxyCluster], klass: GalaxyCluster)
     end
 
     #

data/lib/misp/galaxy_cluster.rb

@@ -26,19 +26,19 @@ module MISP
     attr_reader :meta
 
     def initialize(**attributes)
-      attributes = normalize_attributes(attributes)
+      attributes = normalize_attributes(**attributes)
 
-      @id = attributes.dig(:id)
-      @uuid = attributes.dig(:uuid)
-      @type = attributes.dig(:type)
-      @value = attributes.dig(:value)
-      @tag_name = attributes.dig(:tag_name)
-      @description = attributes.dig(:description)
-      @galaxy_id = attributes.dig(:galaxy_id)
-      @source = attributes.dig(:source)
-      @authors = attributes.dig(:authors)
-      @tag_id = attributes.dig(:tag_id)
-      @meta = attributes.dig(:meta)
+      @id = attributes[:id]
+      @uuid = attributes[:uuid]
+      @type = attributes[:type]
+      @value = attributes[:value]
+      @tag_name = attributes[:tag_name]
+      @description = attributes[:description]
+      @galaxy_id = attributes[:galaxy_id]
+      @source = attributes[:source]
+      @authors = attributes[:authors]
+      @tag_id = attributes[:tag_id]
+      @meta = attributes[:meta]
     end
 
     #

data/lib/misp/org.rb

@@ -12,9 +12,9 @@ module MISP
     def initialize(**attributes)
       attributes = normalize_attributes(**attributes)
 
-      @id = attributes.dig(:id)
-      @name = attributes.dig(:name)
-      @uuid = attributes.dig(:uuid)
+      @id = attributes[:id]
+      @name = attributes[:name]
+      @uuid = attributes[:uuid]
     end
 
     #

data/lib/misp/orgc.rb

@@ -12,9 +12,9 @@ module MISP
     def initialize(**attributes)
       attributes = normalize_attributes(**attributes)
 
-      @id = attributes.dig(:id)
-      @name = attributes.dig(:name)
-      @uuid = attributes.dig(:uuid)
+      @id = attributes[:id]
+      @name = attributes[:name]
+      @uuid = attributes[:uuid]
     end
 
     #

data/lib/misp/server.rb

@@ -12,9 +12,9 @@ module MISP
     def initialize(**attributes)
       attributes = normalize_attributes(**attributes)
 
-      @id = attributes.dig(:id)
-      @url = attributes.dig(:url)
-      @name = attributes.dig(:name)
+      @id = attributes[:id]
+      @url = attributes[:url]
+      @name = attributes[:name]
     end
 
     #

data/lib/misp/sharing_group.rb

@@ -40,24 +40,24 @@ module MISP
     def initialize(**attributes)
       attributes = normalize_attributes(**attributes)
 
-      @id = attributes.dig(:id)
-      @name = attributes.dig(:name) || "default name"
-      @releasability = attributes.dig(:releasability) || "default sharability"
-      @description = attributes.dig(:description)
-      @uuid = attributes.dig(:uuid)
-      @organisation_uuid = attributes.dig(:organisation_uuid)
-      @org_id = attributes.dig(:org_id)
-      @sync_user_id = attributes.dig(:sync_user_id)
-      @active = attributes.dig(:active)
-      @created = attributes.dig(:created)
-      @modified = attributes.dig(:modified)
-      @local = attributes.dig(:local)
-      @roaming = attributes.dig(:roaming)
+      @id = attributes[:id]
+      @name = attributes[:name] || "default name"
+      @releasability = attributes[:releasability] || "default sharability"
+      @description = attributes[:description]
+      @uuid = attributes[:uuid]
+      @organisation_uuid = attributes[:organisation_uuid]
+      @org_id = attributes[:org_id]
+      @sync_user_id = attributes[:sync_user_id]
+      @active = attributes[:active]
+      @created = attributes[:created]
+      @modified = attributes[:modified]
+      @local = attributes[:local]
+      @roaming = attributes[:roaming]
 
-      @organisation = build_attribute(item: attributes.dig(:Organization), klass: Org)
+      @organisation = build_attribute(item: attributes[:Organization], klass: Org)
 
-      @sharing_group_orgs = build_plural_attribute(items: attributes.dig(:SharingGroupOrg), klass: SharingGroupOrg)
-      @sharing_group_servers = build_plural_attribute(items: attributes.dig(:SharingGroupServer), klass: SharingGroupServer)
+      @sharing_group_orgs = build_plural_attribute(items: attributes[:SharingGroupOrg], klass: SharingGroupOrg)
+      @sharing_group_servers = build_plural_attribute(items: attributes[:SharingGroupServer], klass: SharingGroupServer)
     end
 
     #
@@ -93,7 +93,7 @@ module MISP
     #
     def list
       _get("/sharing_groups/") do |res|
-        sharing_groups = res.dig(:response) || []
+        sharing_groups = res[:response] || []
         sharing_groups.map do |sharing_group|
           SharingGroup.new(**sharing_group)
         end

data/lib/misp/sharing_group_org.rb

@@ -15,14 +15,14 @@ module MISP
     attr_reader :organization
 
     def initialize(**attributes)
-      attributes = normalize_attributes(attributes)
+      attributes = normalize_attributes(**attributes)
 
-      @id = attributes.dig(:id)
-      @sharing_group_id = attributes.dig(:sharing_group_id)
-      @org_id = attributes.dig(:org_id)
-      @extend = attributes.dig(:extend)
+      @id = attributes[:id]
+      @sharing_group_id = attributes[:sharing_group_id]
+      @org_id = attributes[:org_id]
+      @extend = attributes[:extend]
 
-      @organization = build_attribute(item: attributes.dig(:Organization), klass: Org)
+      @organization = build_attribute(item: attributes[:Organization], klass: Org)
     end
 
     #

data/lib/misp/sharing_group_server.rb

@@ -17,12 +17,12 @@ module MISP
     def initialize(**attributes)
       attributes = normalize_attributes(**attributes)
 
-      @id = attributes.dig(:id)
-      @sharing_group_id = attributes.dig(:sharing_group_id)
-      @server_id = attributes.dig(:server_id)
-      @all_orgs = attributes.dig(:all_orgs)
+      @id = attributes[:id]
+      @sharing_group_id = attributes[:sharing_group_id]
+      @server_id = attributes[:server_id]
+      @all_orgs = attributes[:all_orgs]
 
-      @servers = build_plural_attribute(items: attributes.dig(:Server), klass: Server)
+      @servers = build_plural_attribute(items: attributes[:Server], klass: Server)
     end
 
     #

data/lib/misp/tag.rb

@@ -16,11 +16,11 @@ module MISP
     def initialize(**attributes)
       attributes = normalize_attributes(**attributes)
 
-      @id = attributes.dig(:id)
-      @name = attributes.dig(:name)
-      @colour = attributes.dig(:colour)
-      @exportable = attributes.dig(:exportable)
-      @hide_tag = attributes.dig(:hide_tag)
+      @id = attributes[:id]
+      @name = attributes[:name]
+      @colour = attributes[:colour]
+      @exportable = attributes[:exportable]
+      @hide_tag = attributes[:hide_tag]
     end
 
     #

data/lib/misp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MISP
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/misp.gemspec

@@ -24,10 +24,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.1"
-  spec.add_development_dependency "coveralls", "~> 0.8"
+  spec.add_development_dependency "bundler", "~> 2.3"
+  spec.add_development_dependency "coveralls_reborn", "~> 0.23"
   spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.9"
-  spec.add_development_dependency "vcr", "~> 5.1"
-  spec.add_development_dependency "webmock", "~> 3.8"
+  spec.add_development_dependency "rspec", "~> 3.10"
+  spec.add_development_dependency "vcr", "~> 6.0"
+  spec.add_development_dependency "webmock", "~> 3.14"
 end

data/renovate.json

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "config:base"
+  ]
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: misp
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Manabu Niseki
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: coveralls_reborn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.23'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.23'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,42 +58,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.14'
 description: A dead simple MISP API wrapper for Ruby
 email:
 - manabu.niseki@gmail.com
@@ -101,9 +101,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yaml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -125,11 +125,12 @@ files:
 - lib/misp/tag.rb
 - lib/misp/version.rb
 - misp.gemspec
+- renovate.json
 homepage: https://github.com/ninoseki/misp-rb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -144,8 +145,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.14
+signing_key:
 specification_version: 4
 summary: A dead simple MISP API wrapper for Ruby
 test_files: []

data/.travis.yml

@@ -1,8 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.6
-  - 2.7
-before_install: gem install bundler -v 2.1