lita 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82f0c8bba8bcf252debec8df0ab1aee07e239cdc
-  data.tar.gz: 9d398df86aa81a27c97089dd5367a2b3516c5cbb
+  metadata.gz: 587288247dc60338bb91eb3914f9d40d3ca8a59a
+  data.tar.gz: d015472e6b10d7cecc199b89e4164d8430297f06
 SHA512:
-  metadata.gz: c7fcfae5ea03659d83c477249e2df8a40f013f1e6e927a1bb18993e6c475fc56662b8fc5a74a14b2d8eaf65ead10177c2f98c843db3d62e50ed225cbc14565bc
-  data.tar.gz: d91453339c92d22a74bc75090b0e03e31cc43909da422c8dc1bb89d86fa78cc1d328bc2f3a8a57e501b70d9b8d7f2dfed9263fffa725bddb612ad76908408d59
+  metadata.gz: 506d911b55c472c89625f9de45a6d22054b958ad68092e1d873844e4b453c77ed6c635b5c8447a5405ebec0249e4b21dd7d35ef1393b948802ccbb6a583d68bb
+  data.tar.gz: 0ea3074f7d44da4b24f8440ecf909aa9b7b5ee1b1c011f603d57e6f9c97e4b7288d24ac210d042c56b9471990db74aa028034a5b54745f27e9f17054bc683b9e

data/lib/lita.rb

@@ -82,6 +82,7 @@ require_relative "lita/common"
 require_relative "lita/errors"
 require_relative "lita/config"
 require_relative "lita/configuration_builder"
+require_relative "lita/middleware_registry"
 require_relative "lita/default_configuration"
 require_relative "lita/configuration_validator"
 require_relative "lita/util"

data/lib/lita/adapter.rb

@@ -45,7 +45,7 @@ module Lita
       @robot = robot
       ensure_required_configs
     end
-    #
+
     # The adapter's configuration object.
     # @return [Lita::Configuration] The adapter's configuration object.
     # @since 4.0.0
@@ -98,6 +98,13 @@ module Lita
       end
     end
 
+    # The Lita logger.
+    # @return [Lita::Logger] The Lita logger.
+    # @since 4.0.2
+    def log
+      Lita.logger
+    end
+
     # Formats a name for "mentioning" a user in a group chat. Override this
     # method in child classes to customize the mention format for the chat
     # service.

data/lib/lita/default_configuration.rb

@@ -26,7 +26,7 @@ module Lita
       robot_config
     end
 
-    # Processes the {Lita::ConfigurationBuilder} object to return a {Lita:Configuration}.
+    # Processes the {Lita::ConfigurationBuilder} object to return a {Lita::Configuration}.
     # @return [Lita::Configuration] The built configuration object.
     def build
       final_config = root.build
@@ -114,7 +114,7 @@ module Lita
         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: []
+        config :middleware, type: MiddlewareRegistry, default: MiddlewareRegistry.new
       end
     end
 

data/lib/lita/middleware_registry.rb

@@ -0,0 +1,35 @@
+module Lita
+  # Stores Rack middleware for later use in a +Rack::Builder+.
+  # @since 4.0.2
+  # @api private
+  class MiddlewareRegistry
+    # A Rack middleware and its initialization arguments.
+    class MiddlewareWrapper < Struct.new(:middleware, :args, :block); end
+
+    extend Forwardable
+
+    def_delegators :@registry, :each, :empty?
+
+    def initialize
+      @registry = []
+    end
+
+    # Adds a Rack middleware with no initialization arguments.
+    # @param middleware [#call] A Rack middleware.
+    # @return [void]
+    def push(middleware)
+      @registry << MiddlewareWrapper.new(middleware, [], nil)
+    end
+    alias_method :<<, :push
+
+    # Adds a Rack middleware with initialization argumens. Uses the same interface as
+    # +Rack::Builder#use+.
+    # @param middleware [#call] A Rack middleware.
+    # @param args [Array] Arbitrary initialization arguments for the middleware.
+    # @yield An optional block to be passed to the constructor of the middleware.
+    # @return [void]
+    def use(middleware, *args)
+      @registry << MiddlewareWrapper.new(middleware, args, (proc if block_given?))
+    end
+  end
+end

data/lib/lita/rack_app.rb

@@ -15,7 +15,15 @@ module Lita
     def self.build(robot)
       builder = Rack::Builder.new
       builder.run(new(robot))
-      robot.config.http.middleware.each { |middleware| builder.use(middleware) }
+
+      robot.config.http.middleware.each do |wrapper|
+        if wrapper.block
+          builder.use(wrapper.middleware, *wrapper.args, &wrapper.block)
+        else
+          builder.use(wrapper.middleware, *wrapper.args)
+        end
+      end
+
       builder.to_app
     end
 

data/lib/lita/version.rb

@@ -1,4 +1,4 @@
 module Lita
   # The current version of Lita.
-  VERSION = "4.0.1"
+  VERSION = "4.0.2"
 end

data/spec/lita/adapter_spec.rb

@@ -61,6 +61,12 @@ describe Lita::Adapter, lita: true do
     end
   end
 
+  describe "#log" do
+    it "returns the Lita logger" do
+      expect(subject.log).to eq(Lita.logger)
+    end
+  end
+
   describe "#mention_format" do
     it "formats the provided name for mentioning the user" do
       expect(subject.mention_format("carl")).to eq("carl:")

data/spec/lita/default_configuration_spec.rb

@@ -142,7 +142,17 @@ describe Lita::DefaultConfiguration, lita: true do
 
       config.http.middleware.push(middleware)
 
-      expect(config.http.middleware).to include(middleware)
+      expect(config.http.middleware).not_to be_empty
+    end
+
+    it "can add middleware with arguments" do
+      middleware = double("a rack middleware")
+
+      config.http.middleware.use(middleware, "argument") do
+        "block"
+      end
+
+      expect(config.http.middleware).not_to be_empty
     end
   end
 

data/spec/lita/handler/http_router_spec.rb

@@ -37,6 +37,7 @@ handler = Class.new do
   end
 
   def middleware(request, response)
+    response["Custom-Header"] = request.env["header_value"] if request.env["use_header"]
     response.write("middleware worked") if request.env["custom_rack_middleware_working"]
   end
 end
@@ -104,3 +105,30 @@ describe handler, lita_handler: true do
     expect(response.body).to eq("middleware worked")
   end
 end
+
+describe handler, lita_handler: true do
+  let(:middleware) do
+    Class.new do
+      def initialize(app, use_header = false, &block)
+        @app = app
+        @use_header = use_header
+        @block = block
+      end
+
+      def call(env)
+        env["use_header"] = @use_header
+        env["header_value"] = @block.call
+        @app.call(env)
+      end
+    end
+  end
+
+  prepend_before do
+    registry.config.http.middleware.use(middleware, true) { "header value" }
+  end
+
+  it "uses any custom middlewares registered" do
+    response = http.get("/middleware")
+    expect(response["Custom-Header"]).to eq("header value")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Jimmy Cuadra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -307,6 +307,7 @@ files:
 - lib/lita/http_route.rb
 - lib/lita/logger.rb
 - lib/lita/message.rb
+- lib/lita/middleware_registry.rb
 - lib/lita/namespace.rb
 - lib/lita/plugin_builder.rb
 - lib/lita/rack_app.rb