Make code compatible with Ruby 2.7

Not including specs etc.
This commit is contained in:
Râu Cao 2023-03-08 10:28:46 +07:00 committed by Râu Cao
parent 5497930dd5
commit d59f31a3c6
Signed by: raucao
GPG Key ID: 37036C356E56CC51
8 changed files with 32 additions and 24 deletions

View File

@ -81,7 +81,7 @@ module Nostr
# @return [Subscription] The subscription object
#
def subscribe(subscription_id: SecureRandom.hex, filter: Filter.new)
subscriptions[subscription_id] = Subscription.new(id: subscription_id, filter:)
subscriptions[subscription_id] = Subscription.new(id: subscription_id, filter: filter)
parent_to_child_channel.push([ClientMessageType::REQ, subscription_id, filter.to_h].to_json)
subscriptions[subscription_id]
end

View File

@ -13,6 +13,8 @@ module Nostr
#
# @param [String] key_kind The kind of key that is invalid (public or private)
#
def initialize(key_kind) = super("Invalid #{key_kind} key type")
def initialize(key_kind)
super("Invalid #{key_kind} key type")
end
end
end

View File

@ -149,7 +149,9 @@ module Nostr
#
# @return [Array<String>] The event's updated list of tags
#
def add_event_reference(event_id) = tags.push(['e', event_id])
def add_event_reference(event_id)
tags.push(['e', event_id])
end
# Adds a reference to a pubkey as a 'p' tag
#
@ -163,7 +165,9 @@ module Nostr
#
# @return [Array<String>] The event's updated list of tags
#
def add_pubkey_reference(pubkey) = tags.push(['p', pubkey.to_s])
def add_pubkey_reference(pubkey)
tags.push(['p', pubkey.to_s])
end
# Signs an event with the user's private key
#
@ -212,13 +216,13 @@ module Nostr
#
def to_h
{
id:,
pubkey:,
created_at:,
kind:,
tags:,
content:,
sig:
id: id,
pubkey: pubkey,
created_at: created_at,
kind: kind,
tags: tags,
content: content,
sig: sig
}
end

View File

@ -148,14 +148,14 @@ module Nostr
#
def to_h
{
ids:,
authors:,
kinds:,
ids: ids,
authors: authors,
kinds: kinds,
'#e': e,
'#p': p,
since:,
since: since,
until: self.until,
limit:
limit: limit
}.compact
end

View File

@ -79,7 +79,9 @@ module Nostr
#
# @return [String] The bech32 string representation of the key
#
def to_bech32 = Bech32.encode(hrp: self.class.hrp, data: self)
def to_bech32
Bech32.encode(hrp: self.class.hrp, data: self)
end
protected

View File

@ -33,7 +33,7 @@ module Nostr
private_key = generate_private_key
public_key = extract_public_key(private_key)
KeyPair.new(private_key:, public_key:)
KeyPair.new(private_key: private_key, public_key: public_key)
end
# Generates a private key
@ -89,7 +89,7 @@ module Nostr
def get_key_pair_from_private_key(private_key)
validate_private_key(private_key)
public_key = extract_public_key(private_key)
KeyPair.new(private_key:, public_key:)
KeyPair.new(private_key: private_key, public_key: public_key)
end
private

View File

@ -62,10 +62,10 @@ module Nostr
)
event = Event.new(
pubkey: keypair.public_key,
kind:,
content:,
created_at:,
tags:
kind: kind,
content: content,
created_at: created_at,
tags: tags
)
event.sign(keypair.private_key)
end

View File

@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
spec.description = 'Client and relay implementation of the Nostr protocol.'
spec.homepage = 'https://nostr-ruby.com/'
spec.license = 'MIT'
spec.required_ruby_version = '>= 3.2.0'
spec.required_ruby_version = '>= 2.7.2'
spec.metadata['rubygems_mfa_required'] = 'true'
spec.metadata['homepage_uri'] = spec.homepage