lita 4.0.0.rc1 → 4.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6aba9ae845dbe0d8fcbeedca12735d4cde375b44
-  data.tar.gz: 7afcedf903295c434f39390884c7f7fe8465c181
+  metadata.gz: a4833eb0b401c3fed770490aeea4e4658283b83a
+  data.tar.gz: ea7f7f1d2f9257719d5903f918ff11c191454d54
 SHA512:
-  metadata.gz: 174c6be0c949ee3fd83753348d65c862b6313b5f77164b6c6b928946524e1913adbd07c886f352ce9daedc19e8243a5016bb623e352701e8bfdc369ac1f9aa26
-  data.tar.gz: ce15b54ce11d9efcb90b6b6db82a246625d6b38154db75fdac127629ef1a60892e60e0a607d31d1853a539538d781285d89fbd22557ac1fef8d5dc67e623b823
+  metadata.gz: 6dadeb4bc8cdaa18443b15dc48b031562a427c5f1c542b049ba98c3dc73177704454145e6c1be9ac2f7f14a26bd9867495371787230f2c213d4dbf280f306146
+  data.tar.gz: 73e4d441468ab549074f5dbfdf8cc2b2c7b2c9edf81aa91d1907d8bb82587ea38057eec060e78a99b64e1d25216780470bbc46efdf414e1c12ac5b37fbe736b4

data/.rubocop.yml

@@ -18,6 +18,8 @@ LineLength:
   Max: 100
 MethodLength:
   Enabled: false
+NonNilCheck:
+  Enabled: false
 RegexpLiteral:
   Enabled: false
 RescueException:

data/lib/lita.rb

@@ -68,8 +68,8 @@ module Lita
     # @return [void]
     def run(config_path = nil)
       hooks[:before_run].each { |hook| hook.call(config_path: config_path) }
-      Configuration.load_user_config(config_path)
-      Configuration.freeze_config(config)
+      ConfigurationBuilder.load_user_config(config_path)
+      ConfigurationBuilder.freeze_config(config)
       ConfigurationValidator.new(self).call
       self.locale = config.robot.locale
       Robot.new.run
@@ -81,7 +81,7 @@ require_relative "lita/version"
 require_relative "lita/common"
 require_relative "lita/errors"
 require_relative "lita/config"
-require_relative "lita/configuration"
+require_relative "lita/configuration_builder"
 require_relative "lita/default_configuration"
 require_relative "lita/configuration_validator"
 require_relative "lita/util"
@@ -106,7 +106,7 @@ require_relative "lita/timer"
 require_relative "lita/robot"
 require_relative "lita/adapter"
 require_relative "lita/adapters/shell"
-require_relative "lita/builder"
+require_relative "lita/plugin_builder"
 require_relative "lita/route_validator"
 require_relative "lita/handlers/authorization"
 require_relative "lita/handlers/help"

data/lib/lita/adapter.rb

@@ -12,7 +12,7 @@ module Lita
       # @!attribute [r] required_configs
       # A list of configuration keys that are required for the adapter to boot.
       # @return [Array]
-      # @deprecated Will be removed in Lita 5.0. Use {Lita::Adapter#configuration} instead.
+      # @deprecated Will be removed in Lita 5.0. Use {Lita::Adapter#configuration_builder} instead.
       def required_configs
         Lita.logger.warn(I18n.t("lita.adapter.required_configs_deprecated"))
         @required_configs
@@ -46,7 +46,7 @@ module Lita
       ensure_required_configs
     end
     #
-    # The handler's config object.
+    # The adapter's configuration object.
     # @return [Lita::Configuration] The adapter's configuration object.
     # @since 4.0.0
     def config
@@ -117,7 +117,7 @@ module Lita
 
     private
 
-    # Returns the object used for the adapter's config.
+    # Returns the object used as the adapter's configuration.
     def adapter_config
       if Lita.version_3_compatibility_mode?
         Lita.config.adapter
@@ -147,6 +147,7 @@ module Lita
       end
     end
 
+    # Access the required configs without triggering the deprecation warning.
     def required_configs
       self.class.instance_variable_get(:@required_configs)
     end

data/lib/lita/authorization.rb

@@ -1,7 +1,7 @@
 module Lita
   # Methods for querying and manipulating authorization groups.
   class Authorization
-    # @param config [Object] The finalized configuration object for the currently running robot.
+    # @param config [Lita::Configuration] The configuration object of the currently running robot.
     def initialize(config)
       @config = config
     end

data/lib/lita/config.rb

@@ -1,6 +1,6 @@
 module Lita
   # An object that stores various user settings that affect Lita's behavior.
-  # @deprecated Will be removed in Lita 5.0. Use {Lita::Configuration} instead.
+  # @deprecated Will be removed in Lita 5.0. Use {Lita::ConfigurationBuilder} instead.
   class Config < Hash
     class << self
       # Initializes a new Config object with the default settings.

data/lib/lita/configurable.rb

@@ -3,27 +3,27 @@ module Lita
   # @since 4.0.0
   # @api private
   module Configurable
-    # The plugins's {Configuration} object.
-    # @return [Lita::Configuration] The configuration object.
+    # The plugins's {Lita::ConfigurationBuilder} object.
+    # @return [Lita::ConfigurationBuilder] The configuration builder.
     # @since 4.0.0
-    attr_accessor :configuration
+    attr_accessor :configuration_builder
 
     # Sets a configuration attribute on the plugin.
     # @return [void]
     # @since 4.0.0
-    # @see Lita::Configuration#config
+    # @see Lita::ConfigurationBuilder#config
     def config(*args, **kwargs)
       if block_given?
-        configuration.config(*args, **kwargs, &proc)
+        configuration_builder.config(*args, **kwargs, &proc)
       else
-        configuration.config(*args, **kwargs)
+        configuration_builder.config(*args, **kwargs)
       end
     end
 
-    # Initializes the configuration object for any inheriting classes.
+    # Initializes the configuration builder for any inheriting classes.
     def inherited(klass)
       super
-      klass.configuration = Configuration.new
+      klass.configuration_builder = ConfigurationBuilder.new
     end
   end
 end

data/lib/lita/{configuration.rb → configuration_builder.rb}

@@ -1,9 +1,13 @@
 module Lita
-  # An object that stores various settings that affect Lita's behavior.
+  # An object that stores user settings to control Lita's behavior.
   # @since 4.0.0
-  class Configuration
-    # An array of any nested configuration objects.
-    # @return [Array<Lita::Configuration>] The array of child configuration objects.
+  class Configuration; end
+
+  # Provides a DSL for building {Lita::Configuration} objects.
+  # @since 4.0.0
+  class ConfigurationBuilder
+    # An array of any nested configuration builders.
+    # @return [Array<Lita::ConfigurationBuilder>] The array of child configuration builders.
     attr_reader :children
 
     # An array of valid types for the attribute.
@@ -59,15 +63,30 @@ module Lita
       @name = :root
     end
 
+    # Builds a {Lita::Configuration} object from the attributes defined on the builder.
+    # @param object [Lita::Configuration] The empty configuration object that will be extended to
+    #   create the final form.
+    # @return [Lita::Confirmation] The fully built configuration object.
+    def build(object = Configuration.new)
+      container = if children.empty?
+        build_leaf(object)
+      else
+        build_nested(object)
+      end
+
+      container.public_send(name)
+    end
+
     # Returns a boolean indicating whether or not the attribute has any child attributes.
     # @return [Boolean] Whether or not the attribute has any child attributes.
     def children?
       !children.empty?
     end
 
-    # Merges two configuration objects by making one an attribute on the other.
+    # Merges two configuration builders by making one an attribute on the other.
     # @param name [String, Symbol] The name of the new attribute.
-    # @param attribute [Lita::Configuration] The configuration object that should be its value.
+    # @param attribute [Lita::ConfigurationBuilder] The configuration builder that should be its
+    #   value.
     # @return [void]
     def combine(name, attribute)
       attribute.name = name
@@ -82,7 +101,7 @@ module Lita
     # @param type [Object, Array<Object>] Optional: One or more types that the attribute's value
     #   must be.
     # @param required [Boolean] Whether or not this attribute must be set. If required, and Lita
-    #   is run without it set, a {Lita::ValidationError} will be raised.
+    #   is run without it set, Lita will abort on start up with a message about it.
     # @param default [Object] An optional default value for the attribute.
     # @yield A block to be evaluated in the context of the new attribute. Used for
     #   defining nested configuration attributes and validators.
@@ -98,20 +117,6 @@ module Lita
       children << attribute
     end
 
-    # Extracts the finalized configuration object as it will be interacted with by the user.
-    # @param object [Object] The bare object that will be extended to create the final form.
-    # @return [Object] A bare object with only the methods that were declared via the
-    #   {Lita::Configuration} DSL.
-    def finalize(object = Object.new)
-      container = if children.empty?
-        finalize_simple(object)
-      else
-        finalize_nested(object)
-      end
-
-      container.public_send(name)
-    end
-
     # Sets the valid types for the configuration attribute.
     # @param types [Object, Array<Object>] One or more valid types.
     # @return [void]
@@ -125,6 +130,13 @@ module Lita
     # @yield The code that performs validation.
     # @return [void]
     def validate
+      validator = proc
+
+      unless value.nil?
+        error = validator.call(value)
+        raise ValidationError, error if error
+      end
+
       @validator = proc
     end
 
@@ -133,47 +145,71 @@ module Lita
     # @return [void]
     # @raise [TypeError] If the new value is not among the declared valid types.
     def value=(value)
-      if value && types && types.none? { |type| type === value }
-        raise TypeError, "#{name} must be one of: #{types.inspect}"
-      end
+      ensure_valid_default_value(value)
 
       @value = value
     end
 
     private
 
-    # Finalize the root object.
-    def finalize_nested(object)
+    # Finalize a nested object.
+    def build_leaf(object)
       this = self
+      run_validator = method(:run_validator)
+      check_types = method(:check_types)
 
-      nested_object = Object.new
-      children.each { |child| child.finalize(nested_object) }
-      object.instance_exec { define_singleton_method(this.name) { nested_object } }
+      object.instance_exec do
+        define_singleton_method(this.name) { this.value }
+        define_singleton_method("#{this.name}=") do |value|
+          run_validator.call(value)
+          check_types.call(value)
+          this.value = value
+        end
+      end
 
       object
     end
 
-    # Finalize a nested object.
-    def finalize_simple(object)
+    # Finalize the root builder or any builder with children.
+    def build_nested(object)
       this = self
 
-      object.instance_exec do
-        define_singleton_method(this.name) { this.value }
-        define_singleton_method("#{this.name}=") do |value|
-          if this.validator
-            error = this.validator.call(value)
-            raise ValidationError, error if error
-          end
+      nested_object = Configuration.new
+      children.each { |child| child.build(nested_object) }
+      object.instance_exec { define_singleton_method(this.name) { nested_object } }
+
+      object
+    end
 
-          if this.types && this.types.none? { |type| type === value }
-            raise TypeError, "#{this.name} must be one of: #{this.types.inspect}"
-          end
+    # Check's the value's type from inside the finalized object.
+    def check_types(value)
+      if types && types.none? { |type| type === value }
+        Lita.logger.fatal(
+          I18n.t("lita.config.type_error", attribute: name, types: types.join(", "))
+        )
+        abort
+      end
+    end
 
-          this.value = value
-        end
+    # Raise if value is non-nil and isn't one of the specified types.
+    def ensure_valid_default_value(value)
+      if !value.nil? && types && types.none? { |type| type === value }
+        raise TypeError, I18n.t("lita.config.type_error", attribute: name, types: types.join(", "))
       end
+    end
 
-      object
+    # Runs the validator from inside the build configuration object.
+    def run_validator(value)
+      return unless validator
+
+      error = validator.call(value)
+
+      if error
+        Lita.logger.fatal(
+          I18n.t("lita.config.validation_error", attribute: name, message: error)
+        )
+        abort
+      end
     end
   end
 end

data/lib/lita/configuration_validator.rb

@@ -8,9 +8,9 @@ module Lita
       @registry = registry
     end
 
-    # Validates adapter and handler configuration.
+    # Validates adapter and handler configuration. Logs a fatal warning and aborts if any required
+    # configuration attributes are missing.
     # @return [void]
-    # @raise [Lita::ValidationError] If any required configuration attributes are missing.
     def call
       validate_adapters
       validate_handlers
@@ -25,7 +25,7 @@ module Lita
 
     # All a plugin's top-level configuration attributes.
     def children_for(plugin)
-      plugin.configuration.children
+      plugin.configuration_builder.children
     end
 
     # Generates the fully qualified name of a configuration attribute.
@@ -54,11 +54,12 @@ module Lita
         if attribute.children?
           validate(type, plugin, attribute.children, attribute_namespace.clone.push(attribute.name))
         elsif attribute.required? && attribute.value.nil?
-          raise ValidationError, I18n.t(
+          Lita.logger.fatal I18n.t(
             "lita.config.missing_required_#{type}_attribute",
             type => plugin.namespace,
             attribute: full_attribute_name(attribute_namespace, attribute.name)
           )
+          abort
         end
       end
     end

data/lib/lita/default_configuration.rb

@@ -10,14 +10,14 @@ module Lita
     # @return [Lita::Registry] The registry.
     attr_reader :registry
 
-    # The top-level {Configuration} attribute.
+    # The top-level {Lita::ConfigurationBuilder} attribute.
     # @return [Lita::Configuration] The root attribute.
     attr_reader :root
 
     # @param registry [Lita::Registry] The registry to build a default configuration object from.
     def initialize(registry)
       @registry = registry
-      @root = Configuration.new
+      @root = ConfigurationBuilder.new
 
       adapters_config
       handlers_config
@@ -26,11 +26,10 @@ module Lita
       robot_config
     end
 
-    # Processes the {Configuration} object to return a raw object with only the appropriate methods.
-    # This is the value that's actually stored in {Lita::Registry#config}.
-    # @return [Object] The final form of the configuration object.
-    def finalize
-      final_config = root.finalize
+    # Processes the {Lita::ConfigurationBuilder} object to return a {Lita:Configuration}.
+    # @return [Lita::Configuration] The built configuration object.
+    def build
+      final_config = root.build
       add_adapter_attribute(final_config)
       add_struct_access_to_redis(final_config.redis)
       final_config
@@ -44,7 +43,7 @@ module Lita
 
       root.config :adapters do
         adapters.each do |key, adapter|
-          combine(key, adapter.configuration)
+          combine(key, adapter.configuration_builder)
         end
       end
     end
@@ -97,8 +96,8 @@ module Lita
 
       root.config :handlers do
         handlers.each do |handler|
-          if handler.configuration.children?
-            combine(handler.namespace, handler.configuration)
+          if handler.configuration_builder.children?
+            combine(handler.namespace, handler.configuration_builder)
           else
             old_config = Config.new
             handler.default_config(old_config) if handler.respond_to?(:default_config)
@@ -112,9 +111,9 @@ module Lita
     def http_config
       root.config :http do
         config :host, type: String, default: "0.0.0.0"
-        config :port, type: Integer, default: 8080
-        config :min_threads, type: Integer, default: 0
-        config :max_threads, type: Integer, default: 16
+        config :port, type: [Integer, String], default: 8080
+        config :min_threads, type: [Integer, String], default: 0
+        config :max_threads, type: [Integer, String], default: 16
         config :middleware, type: Array, default: []
       end
     end
@@ -135,7 +134,7 @@ module Lita
         config :log_level, types: [String, Symbol], default: :info do
           validate do |value|
             unless LOG_LEVELS.include?(value.to_s.downcase.strip)
-              "log_level must be one of: #{LOG_LEVELS.join(", ")}"
+              "must be one of: #{LOG_LEVELS.join(", ")}"
             end
           end
         end

data/lib/lita/errors.rb

@@ -3,7 +3,8 @@ module Lita
   # @since 4.0.0
   class Error < StandardError; end
 
-  # An exception raised when a configuration attribute is invalid.
+  # An exception raised when a custom validation is set on a configuration attribute that is
+  # violated by the default value of the attribute.
   # @since 4.0.0
   class ValidationError < Error; end
 end

data/lib/lita/handler/common.rb

@@ -3,12 +3,12 @@ module Lita
     # Methods included in any class that includes at least one type of router.
     # @since 4.0.0
     module Common
-      # Adds common functionality to the class and initializes the handler's configuration.
+      # Adds common functionality to the class and initializes the handler's configuration builder.
       def self.included(klass)
         klass.extend(ClassMethods)
         klass.extend(Namespace)
         klass.extend(Configurable)
-        klass.configuration = Configuration.new
+        klass.configuration_builder = ConfigurationBuilder.new
       end
 
       # Common class-level methods for all handlers.
@@ -48,8 +48,8 @@ module Lita
         Thread.new { Timer.new(interval: interval, &block).start }
       end
 
-      # The handler's config object.
-      # @return [Object, Lita::Config] The handler's configuration object.
+      # The handler's configuration object.
+      # @return [Lita::Configuration, Lita::Config] The handler's configuration object.
       # @since 3.2.0
       def config
         if robot.config.handlers.respond_to?(self.class.namespace)

data/lib/lita/handler/event_router.rb

@@ -56,9 +56,9 @@ module Lita
       # @param payload [Hash] An optional hash of arbitrary data.
       # @return [Boolean] Whether or not the event triggered any callbacks.
       def trigger(robot, event_name, payload = {})
-        event_subscriptions_for(event_name).any? do |callback|
+        event_subscriptions_for(event_name).map do |callback|
           callback.call(new(robot), payload)
-        end
+        end.any?
       end
 
       private

data/lib/lita/{builder.rb → plugin_builder.rb}

@@ -2,7 +2,7 @@ module Lita
   # Constructs a Lita plugin from a block.
   # @since 4.0.0
   # @api private
-  class Builder
+  class PluginBuilder
     # @param namespace [String, Symbol] The Redis namespace to use for the plugin.
     # @yield The class body of the plugin.
     def initialize(namespace, &block)

data/lib/lita/registry.rb

@@ -5,13 +5,13 @@ module Lita
     # Allows a registry to be added to another object.
     module Mixins
       # The primary configuration object. Provides user settings for the robot.
-      # @return [Object] The configuration object.
+      # @return [Lita::Configuration] The configuration object.
       def config
-        @config ||= DefaultConfiguration.new(self).finalize
+        @config ||= DefaultConfiguration.new(self).build
       end
 
       # Yields the configuration object. Called by the user in a +lita_config.rb+ file.
-      # @yieldparam [Object] config The configuration object.
+      # @yieldparam [Lita::Configuration] config The configuration object.
       # @return [void]
       def configure
         yield config
@@ -48,7 +48,7 @@ module Lita
       #   @return [void]
       #   @since 4.0.0
       def register_adapter(key, adapter = nil)
-        adapter = Builder.new(key, &proc).build_adapter if block_given?
+        adapter = PluginBuilder.new(key, &proc).build_adapter if block_given?
 
         unless adapter.is_a?(Class)
           raise ArgumentError, I18n.t("lita.core.register_adapter.block_or_class_required")
@@ -69,7 +69,7 @@ module Lita
       #   @since 4.0.0
       def register_handler(handler_or_key)
         if block_given?
-          handler = Builder.new(handler_or_key, &proc).build_handler
+          handler = PluginBuilder.new(handler_or_key, &proc).build_handler
         else
           handler = handler_or_key
 

data/lib/lita/version.rb

@@ -1,4 +1,4 @@
 module Lita
   # The current version of Lita.
-  VERSION = "4.0.0.rc1"
+  VERSION = "4.0.0.rc2"
 end

data/spec/lita/{configuration_spec.rb → configuration_builder_spec.rb}

@@ -1,7 +1,7 @@
 require "spec_helper"
 
-describe Lita::Configuration do
-  let(:config) { subject.finalize }
+describe Lita::ConfigurationBuilder do
+  let(:config) { subject.build }
 
   describe ".load_user_config" do
     it "loads and evals lita_config.rb" do
@@ -53,7 +53,10 @@ describe Lita::Configuration do
     end
 
     it "raises if set to a value of the wrong type" do
-      expect { config.simple = "foo" }.to raise_error(TypeError)
+      expect(Lita.logger).to receive(:fatal).with(
+        /Configuration type error: "simple" must be one of: Symbol/
+      )
+      expect { config.simple = "foo" }.to raise_error(SystemExit)
     end
   end
 
@@ -75,7 +78,10 @@ describe Lita::Configuration do
     end
 
     it "raises if set to a value of the wrong type" do
-      expect { config.simple = 1 }.to raise_error(TypeError)
+      expect(Lita.logger).to receive(:fatal).with(
+        /Configuration type error: "simple" must be one of: Symbol, String/
+      )
+      expect { config.simple = 1 }.to raise_error(SystemExit)
     end
   end
 
@@ -116,7 +122,20 @@ describe Lita::Configuration do
     end
 
     it "raises if the validator raises due to an invalid value" do
-      expect { config.simple = false }.to raise_error(Lita::ValidationError, "must be true")
+      expect(Lita.logger).to receive(:fatal).with(
+        /Validation error on attribute "simple": must be true/
+      )
+      expect { config.simple = false }.to raise_error(SystemExit)
+    end
+  end
+
+  describe "a validated attribute with a conflicting default value" do
+    it "raises a ValidationError" do
+      expect do
+        subject.config :simple, default: :foo do
+          validate { |value| "must be :bar" unless value == :bar }
+        end
+      end.to raise_error(Lita::ValidationError, /must be :bar/)
     end
   end
 
@@ -141,11 +160,9 @@ describe Lita::Configuration do
     end
   end
 
-  describe "an attribute with all the options, validation, and nested attributes" do
+  describe "an attribute with all the options and nested attributes" do
     before do
       subject.config :nested, type: Symbol, default: :foo do
-        validate { "validation error" }
-
         config :foo
       end
     end
@@ -158,8 +175,8 @@ describe Lita::Configuration do
   describe "multiple nested attributes with options" do
     before do
       subject.config :nested do
-        config :foo, default: "foo" do
-          validate { |value| "must be bar" unless value == "bar" }
+        config :foo, default: "bar" do
+          validate { |value| "must include bar" unless value.include?("bar") }
         end
 
         config :bar, type: Symbol
@@ -167,16 +184,19 @@ describe Lita::Configuration do
     end
 
     it "can get the first nested attribute" do
-      expect(config.nested.foo).to eq("foo")
+      expect(config.nested.foo).to eq("bar")
     end
 
     it "can set the first nested attribute" do
-      config.nested.foo = "bar"
-      expect(config.nested.foo).to eq("bar")
+      config.nested.foo = "foo bar baz"
+      expect(config.nested.foo).to eq("foo bar baz")
     end
 
     it "has working validation" do
-      expect { config.nested.foo = "baz" }.to raise_error(Lita::ValidationError)
+      expect(Lita.logger).to receive(:fatal).with(
+        /Validation error on attribute "foo": must include bar/
+      )
+      expect { config.nested.foo = "baz" }.to raise_error(SystemExit)
     end
 
     it "can get the second nested attribute" do
@@ -184,7 +204,10 @@ describe Lita::Configuration do
     end
 
     it "can set the second nested attribute and options take effect" do
-      expect { config.nested.bar = "not a symbol" }.to raise_error(TypeError)
+      expect(Lita.logger).to receive(:fatal).with(
+        /Configuration type error: "bar" must be one of: Symbol/
+      )
+      expect { config.nested.bar = "not a symbol" }.to raise_error(SystemExit)
     end
   end
 

data/spec/lita/configuration_validator_spec.rb

@@ -21,10 +21,10 @@ describe Lita::ConfigurationValidator, lita: true do
         config :foo, required: true
       end
 
-      expect { subject.call }.to raise_error(
-        Lita::ValidationError,
+      expect(Lita.logger).to receive(:fatal).with(
         /Configuration attribute "foo" is required for "test" adapter/
       )
+      expect { subject.call }.to raise_error(SystemExit)
     end
 
     it "has no effect if all adapters with nested configuration have valid configuration" do
@@ -44,10 +44,10 @@ describe Lita::ConfigurationValidator, lita: true do
         end
       end
 
-      expect { subject.call }.to raise_error(
-        Lita::ValidationError,
+      expect(Lita.logger).to receive(:fatal).with(
         /Configuration attribute "foo\.bar" is required for "test" adapter/
       )
+      expect { subject.call }.to raise_error(SystemExit)
     end
 
     it "uses the right namespace for a nested attribute when a previous nesting has been visited" do
@@ -61,10 +61,10 @@ describe Lita::ConfigurationValidator, lita: true do
         end
       end
 
-      expect { subject.call }.to raise_error(
-        Lita::ValidationError,
+      expect(Lita.logger).to receive(:fatal).with(
         /Configuration attribute "one\.two" is required for "test" adapter/
       )
+      expect { subject.call }.to raise_error(SystemExit)
     end
 
     it "has no effect if all handlers have valid configuration" do
@@ -80,10 +80,10 @@ describe Lita::ConfigurationValidator, lita: true do
         config :foo, required: true
       end
 
-      expect { subject.call }.to raise_error(
-        Lita::ValidationError,
+      expect(Lita.logger).to receive(:fatal).with(
         /Configuration attribute "foo" is required for "test" handler/
       )
+      expect { subject.call }.to raise_error(SystemExit)
     end
 
     it "has no effect if all handlers with nested configuration have valid configuration" do
@@ -103,10 +103,10 @@ describe Lita::ConfigurationValidator, lita: true do
         end
       end
 
-      expect { subject.call }.to raise_error(
-        Lita::ValidationError,
+      expect(Lita.logger).to receive(:fatal).with(
         /Configuration attribute "foo\.bar" is required for "test" handler/
       )
+      expect { subject.call }.to raise_error(SystemExit)
     end
   end
 end

data/spec/lita/default_configuration_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Lita::DefaultConfiguration, lita: true do
   subject { described_class.new(registry) }
 
-  let(:config) { subject.finalize }
+  let(:config) { subject.build }
 
   describe "adapter config" do
     it "is an old-style config object" do
@@ -238,7 +238,10 @@ describe Lita::DefaultConfiguration, lita: true do
     end
 
     it "raises a validation error for invalid log levels" do
-      expect { config.robot.log_level = :not_a_level }.to raise_error(Lita::ValidationError)
+      expect(Lita.logger).to receive(:fatal).with(
+        /Validation error on attribute "log_level": must be one of/
+      )
+      expect { config.robot.log_level = :not_a_level }.to raise_error(SystemExit)
     end
 
     it "has no default admins" do

data/spec/lita/handler/common_spec.rb

@@ -17,7 +17,7 @@ describe Lita::Handler::Common, lita: true do
     it "sets configuration attributes" do
       handler.config :foo
 
-      config = handler.configuration.finalize
+      config = handler.configuration_builder.build
 
       expect(config.foo).to be_nil
       config.foo = :bar
@@ -25,13 +25,13 @@ describe Lita::Handler::Common, lita: true do
     end
   end
 
-  describe ".configuration" do
-    it "returns a Configuration object" do
-      expect(handler.configuration).to be_a(Lita::Configuration)
+  describe ".configuration_builder" do
+    it "returns a ConfigurationBuilder object" do
+      expect(handler.configuration_builder).to be_a(Lita::ConfigurationBuilder)
     end
 
     it "is memoized" do
-      expect(handler.configuration).to equal(handler.configuration)
+      expect(handler.configuration_builder).to equal(handler.configuration_builder)
     end
   end
 

data/spec/lita/handler/event_router_spec.rb

@@ -24,6 +24,9 @@ describe Lita::Handler::EventRouter do
       on :callable_test, lambda { |payload|
         robot.send_message("#{payload[:data]} received via callable!")
       }
+
+      on(:multiple_callbacks) { robot.send_message("first callback") }
+      on(:multiple_callbacks) { robot.send_message("second callback") }
     end
   end
 
@@ -45,6 +48,14 @@ describe Lita::Handler::EventRouter do
       subject.trigger(robot, :callable_test, data: "Data")
     end
 
+    it "doesn't stop triggering callbacks after the first is triggered" do
+      allow(robot).to receive(:send_message)
+
+      expect(robot).to receive(:send_message).with("second callback")
+
+      subject.trigger(robot, :multiple_callbacks)
+    end
+
     it "normalizes the event name" do
       expect(robot).to receive(:send_message).twice
       subject.trigger(robot, "connected")

data/spec/lita/{builder_spec.rb → plugin_builder_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Lita::Builder, lita: true do
+describe Lita::PluginBuilder, lita: true do
   let(:robot) { instance_double("Lita::Robot") }
   subject { plugin.new(robot) }
 

data/spec/lita_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Lita do
   before { described_class.register_adapter(:shell, Lita::Adapters::Shell) }
 
-  it "memoizes a Config" do
+  it "memoizes a Configuration" do
     expect(described_class.config).to eql(described_class.config)
   end
 
@@ -15,7 +15,7 @@ describe Lita do
   end
 
   describe ".configure" do
-    it "yields the Config object" do
+    it "yields the Configuration object" do
       described_class.configure { |c| c.robot.name = "Not Lita" }
       expect(described_class.config.robot.name).to eq("Not Lita")
     end
@@ -163,9 +163,9 @@ describe Lita do
     end
 
     it "raises if the configuration is not valid" do
-      allow(validator).to receive(:call).and_raise(Lita::ValidationError)
+      allow(validator).to receive(:call).and_raise(SystemExit)
 
-      expect { described_class.run }.to raise_error(Lita::ValidationError)
+      expect { described_class.run }.to raise_error(SystemExit)
     end
   end
 end

data/templates/locales/en.yml

@@ -54,7 +54,7 @@ en:
         Use Lita::Adapter.config instead.
       required_configs_deprecated: >-
         Lita::Adapter.required_configs is deprecated and will be removed in Lita 5.0.
-        Use Lita::Adapter.configuration instead.
+        Use Lita::Adapter.configuration_builder instead.
     cli:
       no_gemfile_warning: >-
         The default command "start" must be run inside a Lita project. Try running `lita new` to
@@ -83,6 +83,10 @@ en:
         Configuration attribute "%{attribute}" is required for "%{adapter}" adapter.
       missing_required_handler_attribute: >-
         Configuration attribute "%{attribute}" is required for "%{handler}" handler.
+      type_error: >-
+        Configuration type error: "%{attribute}" must be one of: %{types}.
+      validation_error: >-
+        Validation error on attribute "%{attribute}": %{message}
     daemon:
       pid_exists: >-
         PID file exists at %{path}. Lita may already be running. Kill the existing process or

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc1
+  version: 4.0.0.rc2
 platform: ruby
 authors:
 - Jimmy Cuadra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-18 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -283,13 +283,12 @@ files:
 - lib/lita/adapter.rb
 - lib/lita/adapters/shell.rb
 - lib/lita/authorization.rb
-- lib/lita/builder.rb
 - lib/lita/callback.rb
 - lib/lita/cli.rb
 - lib/lita/common.rb
 - lib/lita/config.rb
 - lib/lita/configurable.rb
-- lib/lita/configuration.rb
+- lib/lita/configuration_builder.rb
 - lib/lita/configuration_validator.rb
 - lib/lita/daemon.rb
 - lib/lita/default_configuration.rb
@@ -309,6 +308,7 @@ files:
 - lib/lita/logger.rb
 - lib/lita/message.rb
 - lib/lita/namespace.rb
+- lib/lita/plugin_builder.rb
 - lib/lita/rack_app.rb
 - lib/lita/registry.rb
 - lib/lita/response.rb
@@ -329,9 +329,8 @@ files:
 - spec/lita/adapter_spec.rb
 - spec/lita/adapters/shell_spec.rb
 - spec/lita/authorization_spec.rb
-- spec/lita/builder_spec.rb
 - spec/lita/config_spec.rb
-- spec/lita/configuration_spec.rb
+- spec/lita/configuration_builder_spec.rb
 - spec/lita/configuration_validator_spec.rb
 - spec/lita/daemon_spec.rb
 - spec/lita/default_configuration_spec.rb
@@ -347,6 +346,7 @@ files:
 - spec/lita/handlers/room_spec.rb
 - spec/lita/logger_spec.rb
 - spec/lita/message_spec.rb
+- spec/lita/plugin_builder_spec.rb
 - spec/lita/response_spec.rb
 - spec/lita/robot_spec.rb
 - spec/lita/rspec_spec.rb
@@ -399,9 +399,8 @@ test_files:
 - spec/lita/adapter_spec.rb
 - spec/lita/adapters/shell_spec.rb
 - spec/lita/authorization_spec.rb
-- spec/lita/builder_spec.rb
 - spec/lita/config_spec.rb
-- spec/lita/configuration_spec.rb
+- spec/lita/configuration_builder_spec.rb
 - spec/lita/configuration_validator_spec.rb
 - spec/lita/daemon_spec.rb
 - spec/lita/default_configuration_spec.rb
@@ -417,6 +416,7 @@ test_files:
 - spec/lita/handlers/room_spec.rb
 - spec/lita/logger_spec.rb
 - spec/lita/message_spec.rb
+- spec/lita/plugin_builder_spec.rb
 - spec/lita/response_spec.rb
 - spec/lita/robot_spec.rb
 - spec/lita/rspec_spec.rb