socrates 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9bb99fd80afa2c0115599cf6deb59a48689aa48
-  data.tar.gz: 7af67f0f859c82ff79fc2e59208b768dc41a9d16
+  metadata.gz: 1f0032b63152e0394fa4fd937f32f4c5bdfdfacb
+  data.tar.gz: bbe5c6deb6223862b6d3dc2d31f9645837b25352
 SHA512:
-  metadata.gz: 1da101c9c7d1bb8ab6d77320a96038e7b83f0cc3d491bada410e11e315b7346aa1699abc2063cf52b300c4fff4d31da29d6172b4110dd25663e36dc872984186
-  data.tar.gz: dcbcafde4c22bc45e2e1a0d0b08228e3c5dcf64c1d83150e78b8803720b2a3beb30ae73089cfac72e460d926037459b8e4862fd1eb5677e4b768b6c3c4da6890
+  metadata.gz: d278b58e1e84f5f2c72ea64197db4bfe6058bd8714810bcc1a84b1ae613dea7cd267345098d716005b681c561ba697b96963a403513e343cb42510605fd2b16d
+  data.tar.gz: d9fc427ba56a46e1ba8acdea37b82db4598325bdb53a267ba3a263d7f558993faaee359a639c6714ee48b81034e6cf6bbb54f4d58943d1c6c4ef724fc7e07a2d

data/exe/socrates

@@ -38,9 +38,9 @@ def run_command(options)
   storage =
     case options[:storage]
       when "redis"
-        Socrates::Storage::RedisStorage.new(url: ENV.fetch("REDIS_URL", "redis://localhost"))
+        Socrates::Storage::Redis.new(url: ENV.fetch("REDIS_URL", "redis://localhost"))
       else
-        Socrates::Storage::MemoryStorage.new
+        Socrates::Storage::Memory.new
     end
 
   Socrates.configure do |config|
@@ -54,9 +54,9 @@ def run_command(options)
 
   case (adapter = options[:adapter])
     when "console"
-      Socrates::Bots::CLIBot.new(state_factory: Socrates::SampleStates::StateFactory.new).start
+      Socrates::Bots::CLI.new(state_factory: Socrates::SampleStates::StateFactory.new).start
     when "slack"
-      Socrates::Bots::SlackBot.new(state_factory: Socrates::SampleStates::StateFactory.new).start
+      Socrates::Bots::Slack.new(state_factory: Socrates::SampleStates::StateFactory.new).start
     else
       puts "Unknown adapter '#{adapter}'"
       exit 1

data/lib/socrates/adapters/{console_adapter.rb → console.rb}

@@ -1,6 +1,8 @@
+require "socrates/adapters/stubs"
+
 module Socrates
   module Adapters
-    class ConsoleAdapter
+    class Console
       CLIENT_ID = "CONSOLE"
 
       attr_accessor :email, :users

data/lib/socrates/adapters/{memory_adapter.rb → memory.rb}

@@ -1,6 +1,8 @@
+require "socrates/adapters/stubs"
+
 module Socrates
   module Adapters
-    class MemoryAdapter
+    class Memory
       CLIENT_ID = "MEMORY"
 
       attr_reader :history, :dms

data/lib/socrates/adapters/{slack_adapter.rb → slack.rb}

@@ -1,6 +1,8 @@
+require "active_support/core_ext/object"
+
 module Socrates
   module Adapters
-    class SlackAdapter
+    class Slack
       def initialize(real_time_client)
         @real_time_client = real_time_client
       end

data/lib/socrates/bots/{cli_bot.rb → cli.rb}

@@ -1,8 +1,11 @@
+require "socrates/adapters/console"
+require "socrates/core/dispatcher"
+
 module Socrates
   module Bots
-    class CLIBot
+    class CLI
       def initialize(adapter: nil, state_factory:)
-        @adapter    = adapter || Adapters::ConsoleAdapter.new
+        @adapter    = adapter || Adapters::Console.new
         @dispatcher = Core::Dispatcher.new(adapter: @adapter, state_factory: state_factory)
       end
 

data/lib/socrates/bots/{slack_bot.rb → slack.rb}

@@ -1,10 +1,13 @@
 require "slack-ruby-client"
 
+require "socrates/adapters/slack"
+require "socrates/core/dispatcher"
+
 module Socrates
   module Bots
-    class SlackBot
+    class Slack
       def initialize(state_factory:)
-        Slack.configure do |config|
+        ::Slack.configure do |config|
           config.token        = ENV["SLACK_API_TOKEN"]
           config.logger       = Logger.new(STDOUT)
           config.logger.level = Logger::INFO
@@ -12,8 +15,8 @@ module Socrates
           raise "Missing ENV['SLACK_API_TOKEN']!" unless config.token
         end
 
-        @slack_client = Slack::RealTime::Client.new
-        @adapter      = Adapters::SlackAdapter.new(@slack_client)
+        @slack_client = ::Slack::RealTime::Client.new
+        @adapter      = Adapters::Slack.new(@slack_client)
         @dispatcher   = Core::Dispatcher.new(adapter: @adapter, state_factory: state_factory)
       end
 

data/lib/socrates/configuration.rb

@@ -0,0 +1,27 @@
+require "socrates/logger"
+require "socrates/storage/memory"
+
+module Socrates
+  def self.config
+    @config ||= Configuration.new
+  end
+
+  def self.configure
+    yield(config)
+  end
+
+  class Configuration
+    attr_accessor :view_path
+    attr_accessor :storage
+    attr_accessor :error_message
+    attr_accessor :expired_timeout # seconds
+    attr_accessor :logger
+
+    def initialize
+      @storage         = Storage::Memory.new
+      @error_message   = "Sorry, something went wrong. We'll have to start over..."
+      @expired_timeout = 30.minutes
+      @logger          = Socrates::Logger.default
+    end
+  end
+end

data/lib/socrates/core/dispatcher.rb

@@ -1,8 +1,11 @@
 require "hashie"
+require "active_support/all"
 
+require "socrates/configuration"
 require "socrates/logger"
 require "socrates/string_helpers"
-require "socrates/storage/storage"
+require "socrates/storage/memory"
+require "socrates/core/state"
 require "socrates/core/state_data"
 
 module Socrates
@@ -11,10 +14,10 @@ module Socrates
       def initialize(adapter:, state_factory:, storage: nil)
         @adapter       = adapter
         @state_factory = state_factory
-        @storage       = storage || Socrates::Config.storage || Storage::MemoryStorage.new
+        @storage       = storage || Socrates.config.storage
 
-        @logger        = Socrates::Config.logger || Socrates::Logger.default
-        @error_message = Socrates::Config.error_message || DEFAULT_ERROR_MESSAGE
+        @logger        = Socrates.config.logger
+        @error_message = Socrates.config.error_message || DEFAULT_ERROR_MESSAGE
       end
 
       # rubocop:disable Metrics/AbcSize
@@ -105,7 +108,7 @@ module Socrates
       def state_data_expired?(state_data)
         return unless state_data.timestamp.present?
 
-        state_data.elapsed_time > (Config.expired_timeout || 30.minutes)
+        state_data.elapsed_time > (Socrates.config.expired_timeout || 30.minutes)
       end
 
       def instantiate_state(state_data, context)

data/lib/socrates/core/state.rb

@@ -1,6 +1,11 @@
 require "hashie"
 require "erb"
 
+require "socrates/configuration"
+require "socrates/logger"
+require "socrates/string_helpers"
+require "socrates/core/state_data"
+
 module Socrates
   module Core
     module State
@@ -12,7 +17,7 @@ module Socrates
         @context           = context
         @next_state_id     = nil
         @next_state_action = nil
-        @logger            = Socrates::Config.logger || Socrates::Logger.default
+        @logger            = Socrates.config.logger || Socrates::Logger.default
       end
 
       def next_state_id

data/lib/socrates/core/state_data.rb

@@ -1,7 +1,7 @@
 require "hashie"
 require "json"
-require "set"
 require "yaml"
+require "active_support/core_ext/time"
 
 module Socrates
   module Core
@@ -13,7 +13,7 @@ module Socrates
         @state_action   = state_action
         @timestamp      = Time.current
         @data           = data
-        @temporary_keys = Set.new(temporary_keys)
+        @temporary_keys = temporary_keys
       end
 
       def elapsed_time
@@ -33,8 +33,7 @@ module Socrates
       end
 
       def has_temporary_key?(key)
-        # The !! turns nils into false, which shouldn"t be necessary, but seems to be after the set is loaded from yaml.
-        @temporary_keys.include?(key) == true
+        @temporary_keys.include?(key)
       end
 
       def get(key, clear: false)

data/lib/socrates/sample_states.rb

@@ -1,5 +1,6 @@
 require "date"
 
+require "socrates/string_helpers"
 require "socrates/core/state"
 
 module Socrates

data/lib/socrates/storage/memory.rb

@@ -0,0 +1,25 @@
+module Socrates
+  module Storage
+    class Memory
+      def initialize
+        @memory = {}
+      end
+
+      def has_key?(key)
+        @memory.has_key?(key)
+      end
+
+      def clear(key)
+        @memory.delete(key)
+      end
+
+      def get(key)
+        @memory[key]
+      end
+
+      def put(key, value)
+        @memory[key] = value
+      end
+    end
+  end
+end

data/lib/socrates/storage/redis.rb

@@ -0,0 +1,27 @@
+require "redis"
+
+module Socrates
+  module Storage
+    class Redis
+      def initialize(url: "redis://localhost")
+        @redis = Redis.new(url: url)
+      end
+
+      def has_key?(key)
+        @redis.exists(key)
+      end
+
+      def clear(key)
+        @redis.del(key)
+      end
+
+      def get(key)
+        @redis.get(key)
+      end
+
+      def put(key, value)
+        @redis.set(key, value)
+      end
+    end
+  end
+end

data/lib/socrates/version.rb

@@ -1,3 +1,3 @@
 module Socrates
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/socrates.rb

@@ -1,20 +1,19 @@
 # Socrates
 require "socrates/version"
-require "socrates/config"
+require "socrates/configuration"
 require "socrates/logger"
 require "socrates/string_helpers"
-require "socrates/adapters/console_adapter"
-require "socrates/adapters/memory_adapter"
-require "socrates/adapters/slack_adapter"
+require "socrates/adapters/console"
+require "socrates/adapters/memory"
+require "socrates/adapters/slack"
 require "socrates/adapters/stubs"
-require "socrates/storage/storage"
+require "socrates/storage/memory"
+require "socrates/storage/redis"
 require "socrates/core/state_data"
 require "socrates/core/state"
 require "socrates/core/dispatcher"
-
-# Bot implementations
-require "socrates/bots/cli_bot"
-require "socrates/bots/slack_bot"
+require "socrates/bots/cli"
+require "socrates/bots/slack"
 
 module Socrates
 end

data/socrates.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.3.0"
 
   spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 10.5"
   spec.add_development_dependency "rspec", "~> 3.5"
   spec.add_development_dependency "rubocop", "~> 0.48.1"
   spec.add_development_dependency "timecop", "~> 0.8.1"
@@ -35,5 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "celluloid-io", ">= 0.17.3"
   spec.add_dependency "hashie", ">= 3.5.5"
   spec.add_dependency "redis", ">= 3.3.3"
-  spec.add_dependency "slack-ruby-client", ">= 0.8.0"
+  spec.add_dependency "slack-ruby-client", ">= 0.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socrates
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Christian Nelson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
 description: 
 email:
 - christian@carbonfive.com
@@ -170,19 +170,20 @@ files:
 - circle.yml
 - exe/socrates
 - lib/socrates.rb
-- lib/socrates/adapters/console_adapter.rb
-- lib/socrates/adapters/memory_adapter.rb
-- lib/socrates/adapters/slack_adapter.rb
+- lib/socrates/adapters/console.rb
+- lib/socrates/adapters/memory.rb
+- lib/socrates/adapters/slack.rb
 - lib/socrates/adapters/stubs.rb
-- lib/socrates/bots/cli_bot.rb
-- lib/socrates/bots/slack_bot.rb
-- lib/socrates/config.rb
+- lib/socrates/bots/cli.rb
+- lib/socrates/bots/slack.rb
+- lib/socrates/configuration.rb
 - lib/socrates/core/dispatcher.rb
 - lib/socrates/core/state.rb
 - lib/socrates/core/state_data.rb
 - lib/socrates/logger.rb
 - lib/socrates/sample_states.rb
-- lib/socrates/storage/storage.rb
+- lib/socrates/storage/memory.rb
+- lib/socrates/storage/redis.rb
 - lib/socrates/string_helpers.rb
 - lib/socrates/version.rb
 - sample-conversation-console.gif

data/lib/socrates/config.rb

@@ -1,21 +0,0 @@
-module Socrates
-  module Config
-    extend self
-
-    attr_accessor :view_path
-    attr_accessor :storage
-    attr_accessor :error_message
-    attr_accessor :expired_timeout # seconds
-    attr_accessor :logger
-  end
-
-  class << self
-    def configure
-      block_given? ? yield(Config) : Config
-    end
-
-    def config
-      Config
-    end
-  end
-end

data/lib/socrates/storage/storage.rb

@@ -1,50 +0,0 @@
-require "redis"
-require "json"
-
-module Socrates
-  module Storage
-    class MemoryStorage
-      def initialize
-        @storage = {}
-      end
-
-      def has_key?(key)
-        @storage.has_key? key
-      end
-
-      def clear(key)
-        @storage.delete key
-      end
-
-      def get(key)
-        @storage[key]
-      end
-
-      def put(key, value)
-        @storage[key] = value
-      end
-    end
-
-    class RedisStorage
-      def initialize(url: "redis://localhost")
-        @redis = Redis.new(url: url)
-      end
-
-      def has_key?(key)
-        @redis.exists(key)
-      end
-
-      def clear(key)
-        @redis.del key
-      end
-
-      def get(key)
-        @redis.get(key)
-      end
-
-      def put(key, value)
-        @redis.set(key, value)
-      end
-    end
-  end
-end