khl 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3110943f00d66a4139d82f1f13798cde8f4ffddc0462cffeb3c47c5e131a2b47
-  data.tar.gz: bc8cb50c6876fbbc769667525f84bcbda3c2a9aa1d1e76bfdb00a2525a443ea8
+  metadata.gz: dada5b7c211f7c1b21ca9e5221f47e50d21e53817e36af0c93376955caa8a1ea
+  data.tar.gz: cf24e949bb192a9db50c0c98daee9ae6f27009244b7039e94f5b5d68f6f55cbc
 SHA512:
-  metadata.gz: 8b4be1d65e2cb54e3d1b1a762253bc2fa3578bf448b056d9905edc7a0823c216802a857122b6904b93484f016585b2c5d5e314500b38ad0839765526ac6f0a43
-  data.tar.gz: 99916625ffb6cb60f9613785167cae2209ad6e0f9f61af09a2f22e4d84605d4041aefaf0d6630612bb45adc22f6cb01881e13debe15cb1be5b4701596e36d480
+  metadata.gz: 95705f39d775096a4fb9addda311e0f72ce7b032f4a304c96072f4fa5286d02ae2fdd30f9aed37a702d1ddb4131539a1d221851a93e95dde47577a61473b7d9c
+  data.tar.gz: e85ae914fec3221a167199453aadba3d77b0677e29bbae306373c422f47352911127724c8fc4ce40015206f5041d8da9a78ccbbbf0ae0b001d0d62b1ebec8905

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 1.4.0 - 2022-04-18
+
+* Rename KHL::HTTP::Response#error? to KHL::HTTP::Response#failed?
+
+### 1.3.0 - 2022-04-18
+
+* Remove KHL::Event
+
+### 1.2.1 - 2022-04-18
+
+* Add hash support for KHL::Message.parse
+
 ### 1.2.0 - 2022-04-08
 
 * Fix 开黑啦 Webhook API

data/lib/khl/http/response.rb

@@ -48,7 +48,7 @@ module KHL
         http_code == 200 && code.zero?
       end
 
-      def error?
+      def failed?
         !success?
       end
 

data/lib/khl/message.rb

@@ -3,8 +3,6 @@
 require "active_support/core_ext/hash/indifferent_access"
 require "active_support/hash_with_indifferent_access"
 
-require_relative "event"
-
 module KHL
   class Message
     TYPES = %i[
@@ -22,14 +20,14 @@ module KHL
     def self.parse(raw)
       return unless raw
 
-      data = JSON.parse(raw)
+      data = raw.is_a?(String) ? JSON.parse(raw) : raw
       data = ActiveSupport::HashWithIndifferentAccess.new(data)
 
-      message = Message.new
-      message.type = TYPES[data[:s]]
-      message.data = data[:d]
-      message.sn = data[:sn]
-      message
+      Message.new(
+        type: TYPES[data[:s]],
+        data: data[:d],
+        sn: data[:sn]
+      )
     end
 
     def initialize(type: nil, data: nil, sn: nil)
@@ -38,12 +36,6 @@ module KHL
       @sn = sn
     end
 
-    def event
-      return unless event?
-
-      Event.new(@data)
-    end
-
     def to_h
       ActiveSupport::HashWithIndifferentAccess.new(
         s: TYPES.index(type),

data/lib/khl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KHL
-  VERSION = "1.2.0"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: khl
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Dounx
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-08 00:00:00.000000000 Z
+date: 2022-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -54,7 +54,6 @@ files:
 - CHANGELOG.md
 - README.md
 - lib/khl.rb
-- lib/khl/event.rb
 - lib/khl/http/asset.rb
 - lib/khl/http/badge.rb
 - lib/khl/http/base.rb
@@ -103,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.10
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: Ruby SDK for 开黑啦

data/lib/khl/event.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require "active_support/core_ext/hash/indifferent_access"
-require "active_support/hash_with_indifferent_access"
-
-module KHL
-  class Event
-    attr_accessor :channel_type, :type, :target_id, :author_id, :content, :msg_id, :msg_timestamp, :nonce, :extra
-
-    def initialize(params = {})
-      params = ActiveSupport::HashWithIndifferentAccess.new(params)
-
-      @channel_type = params[:channel_type]
-      @type = params[:type]
-      @target_id = params[:target_id]
-      @author_id = params[:author_id]
-      @content = params[:content]
-      @msg_id = params[:msg_id]
-      @msg_timestamp = params[:msg_timestamp]
-      @nonce = params[:nonce]
-      @extra = params[:extra]
-    end
-  end
-end