From 03bd5203ca2578ec6b3bf6337e4d4c1dd6587509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 8 Mar 2023 10:28:46 +0700 Subject: [PATCH] Make code compatible with Ruby 2.7 Not including specs etc. --- lib/nostr/client.rb | 2 +- lib/nostr/event.rb | 22 +++++++++++++--------- lib/nostr/filter.rb | 10 +++++----- lib/nostr/keygen.rb | 2 +- nostr.gemspec | 2 +- 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/lib/nostr/client.rb b/lib/nostr/client.rb index d5aaa3e..c0c0f75 100644 --- a/lib/nostr/client.rb +++ b/lib/nostr/client.rb @@ -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 diff --git a/lib/nostr/event.rb b/lib/nostr/event.rb index 6448b52..8a0ec6c 100644 --- a/lib/nostr/event.rb +++ b/lib/nostr/event.rb @@ -149,7 +149,9 @@ module Nostr # # @return [Array] 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] 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 diff --git a/lib/nostr/filter.rb b/lib/nostr/filter.rb index 40f9190..9b4af50 100644 --- a/lib/nostr/filter.rb +++ b/lib/nostr/filter.rb @@ -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 diff --git a/lib/nostr/keygen.rb b/lib/nostr/keygen.rb index 761e5fd..451ba11 100644 --- a/lib/nostr/keygen.rb +++ b/lib/nostr/keygen.rb @@ -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 diff --git a/nostr.gemspec b/nostr.gemspec index 6acdb6a..2c27e21 100644 --- a/nostr.gemspec +++ b/nostr.gemspec @@ -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