socrates 0.1.21 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0503a47c1d80b9e475aad24753057be5005b8d262b71ba8c7e2f6ad1c21bdbaa
-  data.tar.gz: cdc9a4f69e52277557ea5501ffb555db1478c932182da7335ef0cb5ce0842260
+  metadata.gz: 1b89f3b7fa49fbdb11fc45c55072ac9569af934ef48a1df00f7c800cfd6b5b52
+  data.tar.gz: 10cba8ecd0e4a00e229d9fa5367cd8f81a57c23a67ad2bc9e733f5c8949672d9
 SHA512:
-  metadata.gz: b10e4449d1f88e9e0ce11f71ba97c2796d811edb670502056b049257a03a84d0c8ff07ed70f3ba8432867c831587c49d10627a36a4fed2406f5b8143382c5e5d
-  data.tar.gz: d6558e640848fb481c6defeed68313b2f8116f72cb23911c9f5112af008b3abffe1881919bba759b62e7c946c7c4c960e8023860f27e2ece35c6769a2a25ca5d
+  metadata.gz: 8a433c69eb83c9dd8bd701ff2f77797cec8034aa0ff4919facbd45881c67cf2faebce030fbb730661d944505c048d19519fcd8d9b0d893afee7f19eb36cd8841
+  data.tar.gz: 40541d66d832555cac31a29245bcf980e80f86822ae5716a53b91882e80de4b70f75c1a6c0e42d0279b1e6140921abf838e2ec067bf86503c1b7de01d9f75342

data/.circleci/config.yml

@@ -4,7 +4,7 @@ jobs:
     parallelism: 1
     working_directory: ~/socrates
     docker:
-      - image: circleci/ruby:2.6.1
+      - image: circleci/ruby:3.0.0
     steps:
       - checkout
 
@@ -15,7 +15,10 @@ jobs:
             - gem-cache
 
       # Bundle install dependencies and remove any unused gems
-      - run: bundle install --path vendor/bundle --jobs=4 && bundle clean --force
+      - run:
+          command: |
+            gem install bundler
+            bundle install --path vendor/bundle --jobs=4 && bundle clean --force
 
       # Store bundle cache
       - save_cache:

data/.gitignore

@@ -7,7 +7,7 @@
 /pkg/
 /spec/reports/
 /tmp/
-/.rubocop-https---raw-githubusercontent-com-carbonfive-c5-conventions-master-rubocop-rubocop-yml
+/.rubocop-https---*
 /socrates-*.gem
 
 # rspec failure tracking

data/.rubocop.yml

@@ -1,5 +1,15 @@
+require:
+  - rubocop-performance
+
 inherit_from:
-  - https://raw.githubusercontent.com/carbonfive/c5-conventions/master/rubocop/rubocop.yml
+  - https://raw.githubusercontent.com/carbonfive/c5-conventions/main/rubocop/.rubocop-common.yml
+  - https://raw.githubusercontent.com/carbonfive/c5-conventions/main/rubocop/.rubocop-performance.yml
+
+AllCops:
+  TargetRubyVersion: 2.5 # this must match gemspec required_ruby_version
+
+Naming/VariableNumber:
+  Enabled: false
 
-Naming/UncommunicativeMethodParamName:
+Style/AccessorGrouping:
   Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.6.1
+3.0.0

data/lib/socrates/adapters/adapter.rb

@@ -4,9 +4,7 @@ module Socrates
   module Adapters
     module Adapter
       # Many of the methods in the Adapter module serve as an interface for Adapter implementations to
-      # implement. We want to serve as an example, even if we don't provide implementations here. Therefor,
-      # we're disabling this cop to avoid its warnings.
-      # rubocop:disable Lint/UnusedMethodArgument
+      # implement. We want to serve as an example, even if we don't provide implementations here.
 
       def client_id_from(context: nil, user: nil)
         raise NotImplementedError
@@ -59,8 +57,6 @@ module Socrates
       def lookup_email(*)
         raise NotImplementedError
       end
-
-      # rubocop:enable Lint/UnusedMethodArgument
     end
   end
 end

data/lib/socrates/adapters/slack.rb

@@ -73,7 +73,7 @@ module Socrates
         return im if im.present?
 
         # Start a new conversation with this user.
-        response = @real_time_client.web_client.im_open(user: user.id)
+        response = @real_time_client.web_client.conversations_open(users: user.id)
         response.channel.id
       end
     end

data/lib/socrates/bots/cli.rb

@@ -4,7 +4,7 @@ require "socrates/core/dispatcher"
 module Socrates
   module Bots
     class CLI
-      def initialize(adapter: nil, state_factory:)
+      def initialize(state_factory:, adapter: nil)
         @adapter    = adapter || Adapters::Console.new
         @dispatcher = Core::Dispatcher.new(adapter: @adapter, state_factory: state_factory)
       end

data/lib/socrates/bots/slack.rb

@@ -9,7 +9,7 @@ module Socrates
       def initialize(state_factory:)
         ::Slack.configure do |config|
           config.token        = ENV["SLACK_API_TOKEN"]
-          config.logger       = Logger.new(STDOUT)
+          config.logger       = Logger.new($stdout)
           config.logger.level = Logger::INFO
 
           raise "Missing ENV['SLACK_API_TOKEN']!" unless config.token

data/lib/socrates/bots/slack/ping.rb

@@ -3,7 +3,7 @@ module Socrates
     class Slack
       class Ping
         def initialize
-          logger = Logger.new(STDOUT)
+          logger = Logger.new($stdout)
           # The ping is going to run every minute, so don't be too chatty
           logger.level = Logger::WARN
 

data/lib/socrates/configuration.rb

@@ -25,8 +25,8 @@ module Socrates
       @error_message   = "Sorry, something went wrong. We'll have to start over..."
       @expired_timeout = 30.minutes
       @logger          = Socrates::Logger.default
-      @error_handler   = proc { |_message, _error| }
-      @warn_handler    = proc { |_message| }
+      @error_handler   = proc { |_message, _error| } # rubocop:disable Lint/EmptyBlock
+      @warn_handler    = proc { |_message| } # rubocop:disable Lint/EmptyBlock
     end
   end
 end

data/lib/socrates/core/state.rb

@@ -11,7 +11,7 @@ module Socrates
     module State
       attr_reader :data, :adapter, :session, :user
 
-      def initialize(data: StateData.new, adapter:, session:)
+      def initialize(adapter:, session:, data: StateData.new)
         @data              = data
         @adapter           = adapter
         @session           = session

data/lib/socrates/logger.rb

@@ -4,7 +4,7 @@ module Socrates
   class Logger < ::Logger
     def self.default
       @default ||= begin
-        logger       = new(STDOUT)
+        logger       = new($stdout)
         logger.level = Logger::WARN
         logger
       end

data/lib/socrates/storage/redis.rb

@@ -12,7 +12,7 @@ module Socrates
       end
 
       def has_key?(key)
-        @redis.exists(key)
+        @redis.exists?(key)
       end
 
       def clear(key)

data/lib/socrates/storage/storage.rb

@@ -32,8 +32,6 @@ module Socrates
         client_id
       end
 
-      # rubocop:disable Lint/UnusedMethodArgument
-
       def has_key?(key)
         raise NotImplementedError
       end
@@ -53,8 +51,6 @@ module Socrates
       def clear_all
         raise NotImplementedError
       end
-
-      # rubocop:enable Lint/UnusedMethodArgument
     end
   end
 end

data/lib/socrates/string_helpers.rb

@@ -12,7 +12,7 @@ module StringHelpers
   # Lifted from Rails' text helpers.
   def self.pluralize(count, singular, plural_arg = nil, plural: plural_arg)
     word =
-      if count == 1 || count =~ /^1(\.0+)?$/
+      if count == 1 || count.to_s =~ /^1(\.0+)?$/
         singular
       else
         plural || singular.pluralize

data/lib/socrates/version.rb

@@ -1,3 +1,3 @@
 module Socrates
-  VERSION = "0.1.21"
+  VERSION = "0.1.26"
 end

data/socrates.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |spec|
 
   spec.summary  = "A micro-framework for building stateful conversational bots."
   spec.homepage = "https://github.com/carbonfive/socrates"
+  spec.metadata = { "source_code_uri" => "https://github.com/carbonfive/socrates" }
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -21,18 +22,19 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.4.0"
+  spec.required_ruby_version = ">= 2.5.0"
 
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 12.3"
-  spec.add_development_dependency "rspec", "~> 3.8"
-  spec.add_development_dependency "rubocop", "= 0.65.0"
+  spec.add_development_dependency "bundler", "~> 2.2"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rspec", "~> 3.10"
+  spec.add_development_dependency "rubocop", "= 1.11.0"
+  spec.add_development_dependency "rubocop-performance", "= 1.10.1"
   spec.add_development_dependency "simplecov", "~> 0.16"
   spec.add_development_dependency "timecop", "~> 0.9"
 
   spec.add_dependency "activesupport", ">= 5.2"
-  spec.add_dependency "async-websocket", ">= 0.7"
+  spec.add_dependency "async-websocket", "~> 0.8.0"
   spec.add_dependency "hashie", ">= 3.6"
-  spec.add_dependency "redis", ">= 4.1"
-  spec.add_dependency "slack-ruby-client", ">= 0.14.1"
+  spec.add_dependency "redis", ">= 4.2.5"
+  spec.add_dependency "slack-ruby-client", ">= 0.15.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socrates
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.26
 platform: ruby
 authors:
 - Christian Nelson
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-02-28 00:00:00.000000000 Z
+date: 2021-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,56 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.65.0
+        version: 1.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.65.0
+        version: 1.11.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.10.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.10.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +126,16 @@ dependencies:
   name: async-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -142,29 +156,29 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.2.5
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.1
-description: 
+        version: 0.15.1
+description:
 email:
 - christian@carbonfive.com
 executables:
@@ -209,8 +223,9 @@ files:
 homepage: https://github.com/carbonfive/socrates
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  source_code_uri: https://github.com/carbonfive/socrates
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -218,15 +233,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A micro-framework for building stateful conversational bots.
 test_files: []