cakewalk 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d80b397852e16785d686f599bbe07e8abd304a48d120c54c2faf6a685439084
-  data.tar.gz: 1f66b25d408532dd5510c6b0f876f19aabc1da9c4ea30ffda3879c2d1fd0a552
+  metadata.gz: 929c625da975e28dea593eb8de1085387ff44b307f6473a667914312c073668b
+  data.tar.gz: b15475feb47c1fde4fd9b7d36c8298b63d02a02396766d1e1bb683be911aa279
 SHA512:
-  metadata.gz: 2dbb18d3cba0ea8b5361f23565c21fc4420cd3f837f9945330e57c846f07908b0fa1dedac9beb012e0c300991c465772c51cb6904423fe2dd86cf86faae10726
-  data.tar.gz: 8dfdbdf6c6a0045435248e2cbff36e3e8b8f859e9888c8da22ea7c97df3cf270553da208fcf45053b6c88f778d3a3da921d6f28880e5f56b87887a5b567aebf1
+  metadata.gz: 1a3f8def3f8fb0fce1b441c8a93ba9b25b54cd1ebb98edfe82643d66a072872b916823aa0157a69cbd42c312625a50c15c02b4e64b2b3f1098fb8dba066ce9f1
+  data.tar.gz: 141ffff916b9cc9ec9df712991ad4daca53013043044d318c9941be651e0b0acb2893691dc606ea29514ae06de9e3e8b719dae3b832657769b14a188b3454457

data/README.md

@@ -2,8 +2,7 @@ Cakewalk - The IRC Bot Building Framework
 =====================================
 
 Cakewalk is an attempt at reviving a retired IRC bot building framework called **cinch**.
-While the codebase seems to be working just fine with Ruby versions up to 2.7.x, our main
-focus is Ruby 3.x.
+Cakewalk supports Ruby 3.x and 4.x (tested on Ruby 4.0).
 
 Description
 -----------

data/examples/basic/google.rb

@@ -15,7 +15,7 @@ bot = Cakewalk::Bot.new do
     # or "No results found" otherwise
     def google(query)
       url = "http://www.google.com/search?q=#{CGI.escape(query)}"
-      res = Nokogiri.parse(open(url).read).at("h3.r")
+      res = Nokogiri.parse(URI.open(url).read).at("h3.r")
 
       title = res.text
       link = res.at('a')[:href]

data/examples/basic/urban_dict.rb

@@ -19,7 +19,7 @@ bot = Cakewalk::Bot.new do
     # can be done.. it works!
     def urban_dict(query)
       url = "http://www.urbandictionary.com/define.php?term=#{CGI.escape(query)}"
-      CGI.unescape_html Nokogiri::HTML(open(url)).css("div.meaning").first.text.gsub(/\s+/, ' ').strip rescue nil
+      CGI.unescape_html Nokogiri::HTML(URI.open(url)).css("div.meaning").first.text.gsub(/\s+/, ' ').strip rescue nil
     end
   end
 

data/examples/basic/url_shorten.rb

@@ -1,4 +1,6 @@
 require 'open-uri'
+require 'cgi'
+require 'uri'
 require 'cakewalk'
 
 # Automatically shorten URL's found in messages
@@ -12,7 +14,7 @@ bot = Cakewalk::Bot.new do
 
   helpers do
     def shorten(url)
-      url = open("http://tinyurl.com/api-create.php?url=#{URI.escape(url)}").read
+      url = URI.open("http://tinyurl.com/api-create.php?url=#{CGI.escape(url)}").read
       url == "Error" ? nil : url
     rescue OpenURI::HTTPError
       nil

data/examples/plugins/google.rb

@@ -9,7 +9,7 @@ class Google
 
   def search(query)
     url = "http://www.google.com/search?q=#{CGI.escape(query)}"
-    res = Nokogiri.parse(open(url).read).at("h3.r")
+    res = Nokogiri.parse(URI.open(url).read).at("h3.r")
 
     title = res.text
     link = res.at('a')[:href]

data/examples/plugins/url_shorten.rb

@@ -1,4 +1,6 @@
 require 'open-uri'
+require 'cgi'
+require 'uri'
 require 'cakewalk'
 
 class TinyURL
@@ -7,7 +9,7 @@ class TinyURL
   listen_to :channel
 
   def shorten(url)
-    url = open("http://tinyurl.com/api-create.php?url=#{URI.escape(url)}").read
+    url = URI.open("http://tinyurl.com/api-create.php?url=#{CGI.escape(url)}").read
     url == "Error" ? nil : url
   rescue OpenURI::HTTPError
     nil

data/lib/cakewalk/configuration.rb

@@ -1,3 +1,5 @@
+require "ostruct"
+
 module Cakewalk
   # @since 2.0.0
   class Configuration < OpenStruct
@@ -16,20 +18,26 @@ module Cakewalk
     end
 
     # @return [Hash]
-    def to_h
-      @table.clone
+    def to_h(&block)
+      if block
+        @table.to_h(&block)
+      else
+        @table.dup
+      end
     end
 
     def [](key)
       # FIXME also adjust method_missing
+      key = key.to_sym
       raise ArgumentError, "Unknown option #{key}" unless self.class::KnownOptions.include?(key)
       @table[key]
     end
 
     def []=(key, value)
       # FIXME also adjust method_missing
+      key = key.to_sym
       raise ArgumentError, "Unknown option #{key}" unless self.class::KnownOptions.include?(key)
-      modifiable[new_ostruct_member(key)] = value
+      super(key, value)
     end
 
     # Loads a configuration from a hash by merging the hash with
@@ -43,7 +51,19 @@ module Cakewalk
     # @return [void]
     def load(new_config, from_default = false)
       if from_default
-        @table = self.class.default_config
+        if respond_to?(:update_to_values!, true)
+          send(:update_to_values!, self.class.default_config)
+        else
+          @table = self.class.default_config.dup
+          # Ensure singleton methods exist for old OpenStruct (Ruby < 3.5)
+          self.class.default_config.each_key do |k|
+            if respond_to?(:new_ostruct_member!, true)
+              send(:new_ostruct_member!, k)
+            elsif respond_to?(:new_ostruct_member, true)
+              send(:new_ostruct_member, k)
+            end
+          end
+        end
       end
 
       new_config.each do |option, value|

data/lib/cakewalk/version.rb

@@ -1,4 +1,4 @@
 module Cakewalk
   # Version of the library
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: cakewalk
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Petru Madar
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-27 00:00:00.000000000 Z
-dependencies: []
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple, friendly DSL for creating IRC bots
 email:
 - petru@mdr.sh
@@ -114,11 +127,10 @@ files:
 - lib/cakewalk/utilities/encoding.rb
 - lib/cakewalk/utilities/kernel.rb
 - lib/cakewalk/version.rb
-homepage: http://cakewalk.mdr.sh
+homepage: https://cakewalk.mdr.sh
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -133,8 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key:
+rubygems_version: 4.0.16
 specification_version: 4
 summary: An IRC Bot Building Framework
 test_files: []