lita 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb14f54dba3cb206240b73763d3e026995bc06a5
-  data.tar.gz: 45069d5cfdf40c64d531e105a8a87ea54558f2b7
+  metadata.gz: 72bfc92024ae2bb828d19ddaa51b6234465522d8
+  data.tar.gz: 6849ff7eb590365266e4fa89c8f17a5c4c075e52
 SHA512:
-  metadata.gz: 451f67e518336c165ad40cb5a2f0016011145e51d8ec4767eb878073922219c292fe450dfaf31f2d843cd670b781fc3c2aa0a61bada976234c34019e408330a9
-  data.tar.gz: cf03873b486d1c6a16c78f52b4f0728373c93a7eb0bce3c5aed9a14dd0b89f0f8ef22a62abb3bd534ca7c13ac96be293e1f968f4dbeb0f2a01c70550ad76ed12
+  metadata.gz: bd119e2dfff11a6e2bdaafe556c03fd8ab9ce2d89f760474a96588dde7c0bc6316f6fd37de78df4fc9a1bd40ce4f7ea9208cb682d3ea65bead748f843d0f44c3
+  data.tar.gz: 3d3b9be32bca1ed13a2dcf9b4ad3b85df51530532f4e1e89fd10749fd7b7a56bd4cda1fda1a461125c953b11ede6d864159d33325c9281fad5a3d155704171ac

data/.rubocop.yml

@@ -8,8 +8,12 @@ ClassLength:
   Enabled: false
 Documentation:
   Enabled: false
+DoubleNegation:
+  Enabled: false
 EndAlignment:
   AlignWith: variable
+IndentHash:
+  Enabled: false
 LineLength:
   Max: 100
 MethodLength:

data/lib/lita/daemon.rb

@@ -19,19 +19,19 @@ module Lita
       Process.daemon(true)
       File.open(@pid_path, "w") { |f| f.write(Process.pid) }
       set_up_logs
-      at_exit { FileUtils.rm(@pid_path) if File.exists?(@pid_path) }
+      at_exit { FileUtils.rm(@pid_path) if File.exist?(@pid_path) }
     end
 
     private
 
     # Abort if Lita is already running.
     def ensure_not_running
-      abort I18n.t("lita.daemon.pid_exists", path: @pid_path) if File.exists?(@pid_path)
+      abort I18n.t("lita.daemon.pid_exists", path: @pid_path) if File.exist?(@pid_path)
     end
 
     # Call the appropriate method depending on kill mode.
     def handle_existing_process
-      if @kill_existing && File.exists?(@pid_path)
+      if @kill_existing && File.exist?(@pid_path)
         kill_existing_process
       else
         ensure_not_running

data/lib/lita/handler.rb

@@ -200,20 +200,22 @@ module Lita
     # Invokes the given block after the given number of seconds.
     # @param interval [Integer] The number of seconds to wait before invoking the block.
     # @yieldparam timer [Lita::Timer] The current {Lita::Timer} instance.
+    # @return [void]
     # @since 3.0.0
     def after(interval, &block)
-      Timer.new(interval: interval, &block).start
+      Thread.new { Timer.new(interval: interval, &block).start }
     end
 
     # Invokes the given block repeatedly, waiting the given number of seconds between each
     # invocation.
     # @param interval [Integer] The number of seconds to wait before each invocation of the block.
     # @yieldparam timer [Lita::Timer] The current {Lita::Timer} instance.
+    # @return [void]
     # @note The block should call {Lita::Timer#stop} at a terminating condition to avoid infinite
     #   recursion.
     # @since 3.0.0
     def every(interval, &block)
-      Timer.new(interval: interval, recurring: true, &block).start
+      Thread.new { Timer.new(interval: interval, recurring: true, &block).start }
     end
 
     # Creates a new +Faraday::Connection+ for making HTTP requests.

data/lib/lita/rspec/matchers/event_subscription_matcher.rb

@@ -57,7 +57,7 @@ module Lita
         end
 
         def set_description
-          description = %{#{description_prefix} "#{event_name}"}
+          description = %(#{description_prefix} "#{event_name}")
           description << " to :#{expected_route}" if expected_route
           ::RSpec.current_example.metadata[:description] = description
         end

data/lib/lita/rspec/matchers/route_matcher.rb

@@ -59,7 +59,7 @@ module Lita
         end
 
         def set_description
-          description = %{#{description_prefix} "#{message_body}"}
+          description = %(#{description_prefix} "#{message_body}")
           description << " to :#{expected_route}" if expected_route
           ::RSpec.current_example.metadata[:description] = description
         end

data/lib/lita/timer.rb

@@ -32,9 +32,11 @@ module Lita
 
     # Sleep for the given interval, call the block, then run again if it's a recurring timer.
     def run
-      sleep @interval
-      @block.call(self) if running? && @block
-      run if running? && recurring?
+      loop do
+        sleep @interval
+        @block.call(self) if running? && @block
+        break unless running? && recurring?
+      end
     end
 
     # Is the timer currently running?

data/lib/lita/user.rb

@@ -8,18 +8,18 @@ module Lita
         @redis ||= Redis::Namespace.new("users", redis: Lita.redis)
       end
 
-      # Finds or creates a user. Attempts to find a user with the given ID. If
-      # none is found, creates a user with the provided ID and metadata.
+      # Creates a new user with the given ID, or merges and saves supplied
+      # metadata to an existing user with the given ID.
       # @param id [Integer, String] A unique identifier for the user.
       # @param metadata [Hash] An optional hash of metadata about the user.
       # @option metadata [String] name (id) The display name of the user.
       # @return [Lita::User] The user.
       def create(id, metadata = {})
-        user = find_by_id(id)
-        unless user
-          user = new(id, metadata)
-          user.save
-        end
+        existing_user = find_by_id(id)
+        metadata = Util.stringify_keys(metadata)
+        metadata = existing_user.metadata.merge(metadata) if existing_user
+        user = new(id, metadata)
+        user.save
         user
       end
 
@@ -94,8 +94,8 @@ module Lita
     # @option metadata [String] name (id) The user's display name.
     def initialize(id, metadata = {})
       @id = id.to_s
-      @metadata = metadata
-      @name = @metadata[:name] || @metadata["name"] || @id
+      @metadata = Util.stringify_keys(metadata)
+      @name = @metadata["name"] || @id
       ensure_name_metadata_set
     end
 
@@ -126,7 +126,6 @@ module Lita
     # one value. It's not possible to store an empty hash key in Redis.
     def ensure_name_metadata_set
       username = metadata.delete("name")
-      username = metadata.delete(:name) unless username
       metadata["name"] = username || id
     end
 

data/lib/lita/util.rb

@@ -5,6 +5,15 @@ module Lita
     ACRONYM_REGEX = /(?=a)b/
 
     class << self
+      # Returns a hash with any symbol keys converted to strings.
+      # @param hash [Hash] The hash to convert.
+      # @return [Hash] The converted hash.
+      def stringify_keys(hash)
+        result = {}
+        hash.each_key { |key| result[key.to_s] = hash[key] }
+        result
+      end
+
       # Transforms a camel-cased string into a snaked-cased string. Taken from
       # +ActiveSupport.+
       # @param camel_cased_word [String] The word to transform.

data/lib/lita/version.rb

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

data/spec/lita/authorization_spec.rb

@@ -81,19 +81,19 @@ describe Lita::Authorization, lita: true do
 
   describe ".groups" do
     before do
-      %i{foo bar baz}.each do |group|
+      %i(foo bar baz).each do |group|
         described_class.add_user_to_group(requesting_user, user, group)
       end
     end
 
     it "returns a list of all authorization groups" do
-      expect(described_class.groups).to match_array(%i{foo bar baz})
+      expect(described_class.groups).to match_array(%i(foo bar baz))
     end
   end
 
   describe ".groups_with_users" do
     before do
-      %i{foo bar baz}.each do |group|
+      %i(foo bar baz).each do |group|
         described_class.add_user_to_group(requesting_user, user, group)
         described_class.add_user_to_group(
           requesting_user,
@@ -108,7 +108,7 @@ describe Lita::Authorization, lita: true do
     end
 
     it "returns a hash of all authorization groups and their members" do
-      groups = %i{foo bar baz}
+      groups = %i(foo bar baz)
       groups_with_users = described_class.groups_with_users
       expect(groups_with_users.keys).to match_array(groups)
       groups.each do |group|

data/spec/lita/daemon_spec.rb

@@ -25,7 +25,7 @@ describe Lita::Daemon do
 
     context "when the user has not requested that existing processes should be killed" do
       it "aborts if a Lita process is already running" do
-        allow(File).to receive(:exists?).and_return(true)
+        allow(File).to receive(:exist?).and_return(true)
         expect(subject).to receive(:abort)
         subject.daemonize
       end
@@ -35,13 +35,13 @@ describe Lita::Daemon do
       subject { described_class.new("/tmp/lita_pid", "/tmp/lita_log", true) }
 
       it "kills existing processes" do
-        allow(File).to receive(:exists?).and_return(true)
+        allow(File).to receive(:exist?).and_return(true)
         expect(Process).to receive(:kill)
         subject.daemonize
       end
 
       it "aborts if it can't kill an existing process" do
-        allow(File).to receive(:exists?).and_return(true)
+        allow(File).to receive(:exist?).and_return(true)
         allow(Process).to receive(:kill).and_raise(Errno::ESRCH)
         expect(subject).to receive(:abort)
         subject.daemonize

data/spec/lita/handler_spec.rb

@@ -57,6 +57,12 @@ describe Lita::Handler, lita: true do
         end
       end
 
+      def infinite_every_test(response)
+        thread = every(5) { "Looping forever!" }
+        response.reply("Replying after timer!")
+        thread
+      end
+
       def self.name
         "Lita::Handlers::Test"
       end
@@ -212,5 +218,13 @@ describe Lita::Handler, lita: true do
         expect { queue.pop(true) }.to raise_error(ThreadError)
       end
     end
+
+    context "with an infinite timer" do
+      it "doesn't block the handler's thread" do
+        expect(response).to receive(:reply)
+        thread = subject.infinite_every_test(response)
+        thread.kill
+      end
+    end
   end
 end

data/spec/lita/handlers/authorization_spec.rb

@@ -40,7 +40,7 @@ describe Lita::Handlers::Authorization, lita_handler: true do
       expect(replies.last).to eq("#{target_user.name} was already in bar.")
     end
 
-    it %{replies with a warning if the group was "admins"} do
+    it 'replies with a warning if the group was "admins"' do
       send_command("auth add foo admins")
       expect(replies.last).to match(/Administrators can only be managed/)
     end
@@ -63,7 +63,7 @@ describe Lita::Handlers::Authorization, lita_handler: true do
       expect(replies.last).to eq("#{target_user.name} was not in bar.")
     end
 
-    it %{replies with a warning if the group was "admins"} do
+    it 'replies with a warning if the group was "admins"' do
       send_command("auth add foo admins")
       expect(replies.last).to match(/Administrators can only be managed/)
     end
@@ -71,7 +71,7 @@ describe Lita::Handlers::Authorization, lita_handler: true do
 
   describe "#list" do
     context "when there are populated groups" do
-      let(:groups) { %i{foo bar} }
+      let(:groups) { %i(foo bar) }
       let(:user1) { Lita::User.create(3, name: "Bongo") }
       let(:user2) { Lita::User.create(4, name: "Carl") }
 

data/spec/lita/handlers/info_spec.rb

@@ -23,9 +23,7 @@ describe Lita::Handlers::Info, lita_handler: true do
     it "returns JSON with info about the running robot" do
       subject.web(request, response)
       expect(response.headers["Content-Type"]).to eq("application/json")
-      expect(response.body.join).to include(
-        %{"lita_version":"#{Lita::VERSION}"}
-      )
+      expect(response.body.join).to include(%("lita_version":"#{Lita::VERSION}"))
     end
   end
 end

data/spec/lita/user_spec.rb

@@ -12,11 +12,18 @@ describe Lita::User, lita: true do
 
     it "returns existing users" do
       described_class.create(1, name: "Carl")
-      expect_any_instance_of(described_class).not_to receive(:save)
-      user = described_class.find(1, name: "Carl")
+      user = described_class.find(1)
       expect(user.id).to eq("1")
       expect(user.name).to eq("Carl")
     end
+
+    it "merges and saves new metadata for existing users" do
+      described_class.create(1, name: "Carl")
+      described_class.create(1, name: "Mr. Carl", foo: "bar")
+      user = described_class.find_by_id(1)
+      expect(user.name).to eq("Mr. Carl")
+      expect(user.metadata["foo"]).to eq("bar")
+    end
   end
 
   describe ".find_by_id" do

data/spec/lita/util_spec.rb

@@ -1,6 +1,13 @@
 require "spec_helper"
 
 describe Lita::Util do
+  describe ".stringify_keys" do
+    it "converts symbol hash keys to strings" do
+      stringified = described_class.stringify_keys(foo: "bar")
+      expect(stringified).to eq("foo" => "bar")
+    end
+  end
+
   describe ".underscore" do
     it "converts camel cased strings into snake case" do
       expect(described_class.underscore("FooBarBaz")).to eq("foo_bar_baz")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Jimmy Cuadra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler