lita-slack 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 263b8f5a62893a0ca957dbbf02925525e6c4aef0
-  data.tar.gz: 8a8d23b254f44196cb4c332c81b445fbac276df0
+  metadata.gz: 5ef23fe9c0c94ca5668f7780c8504e0d695d896e
+  data.tar.gz: fe0565d87688f3f175a4f6c50410b4c9e9a65ecf
 SHA512:
-  metadata.gz: 09b05e48245ee0966a4a211a6672df6d8042e5a5af27f74c88ea91ad568fe865e0fce44e709e32a5f18afca9198c15826a2c02b3ba60cf423448923e078486ee
-  data.tar.gz: 8408c30ff79ef6b025e7e94c29178538b84d01f850ef24e6e41f6ee365b59cf6b3e5d1945605f12efa113b0669422c6e3c67fdef105f6d4a69575ed21c2faf8f
+  metadata.gz: 2e9243b224e1bb78f731707496200bb34dcebf0bea6cb6ed9ae3a8e208c2ff6781f96cc32e7f955f790df9b00348355cc73038b72e4bfa30d6cd766ae007b19b
+  data.tar.gz: be29248c5356c227b17877135dc2fc0e471c057b11eb4868238a09b6b1712a017ab619155e3eeb955d4dc5a7c9cd20a9b23383968083588427032ac8922a4b5c

data/.travis.yml

@@ -11,6 +11,7 @@ branches:
   except:
     - /^v[0-9]/
 notifications:
+  email: false
   webhooks:
     urls:
-      - https://lita-freenode.herokuapp.com/travis
+      - http://util.perceptes.com:8080/travis

data/lib/lita/adapters/slack/slack_user.rb

@@ -27,15 +27,21 @@ module Lita
         attr_reader :name
         # @return [String] The user's display name, e.g. Alice Bobhart
         attr_reader :real_name
+        # @return [String] The user's email address, e.g. alice@example.com
+        attr_reader :email
         # @return [Hash] The raw user data received from Slack, including many more fields.
-        attr_reader :raw_data
+        attr_reader :metadata
 
-        def initialize(id, name, real_name, raw_data)
+        def initialize(id, name, real_name, metadata)
           @id = id
           @name = name
           @real_name = real_name.to_s
-          @raw_data = raw_data
+          @email = metadata['email'].to_s
+          @metadata = metadata
         end
+
+        # nodoc: backward compatability
+        alias_method :raw_data, :metadata
       end
     end
   end

data/lita-slack.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-slack"
-  spec.version       = "1.6.0"
+  spec.version       = "1.7.0"
   spec.authors       = ["Ken J.", "Jimmy Cuadra"]
   spec.email         = ["kenjij@gmail.com", "jimmy@jimmycuadra.com"]
   spec.description   = %q{Lita adapter for Slack.}

data/spec/lita/adapters/slack/rtm_connection_spec.rb

@@ -15,8 +15,8 @@ describe Lita::Adapters::Slack::RTMConnection, lita: true do
   let(:registry) { Lita::Registry.new }
   let(:robot) { Lita::Robot.new(registry) }
   let(:raw_user_data) { Hash.new }
-  let(:channel) { Lita::Adapters::Slack::SlackChannel.new('C2147483705', 'general', 1360782804, 'U023BECGF', raw_data) }
-  let(:raw_data) { Hash.new }
+  let(:channel) { Lita::Adapters::Slack::SlackChannel.new('C2147483705', 'general', 1360782804, 'U023BECGF', metadata) }
+  let(:metadata) { Hash.new }
 
   let(:rtm_start_response) do
     Lita::Adapters::Slack::TeamData.new(

data/spec/lita/adapters/slack/slack_user_spec.rb

@@ -5,7 +5,8 @@ describe Lita::Adapters::Slack::SlackUser do
     {
       "id" => "U023BECGF",
       "name" => "bobby",
-      "real_name" => "Bobby Tables"
+      "real_name" => "Bobby Tables",
+      "email" => "btables@example.com"
     }
   end
   let(:user_data_2) do
@@ -27,9 +28,15 @@ describe Lita::Adapters::Slack::SlackUser do
       expect(subject[0].id).to eq('U023BECGF')
       expect(subject[0].name).to eq('bobby')
       expect(subject[0].real_name).to eq('Bobby Tables')
+      expect(subject[0].email).to eq('btables@example.com')
       expect(subject[1].id).to eq('U024BE7LH')
       expect(subject[1].name).to eq('carl')
       expect(subject[1].real_name).to eq('')
+      expect(subject[1].email).to eq('')
+    end
+
+    it "raw_data matches the metadata" do
+      expect(subject[0].metadata['email']).to eq(subject[0].raw_data['email'])
     end
   end
 end

data/spec/lita/adapters/slack/user_creator_spec.rb

@@ -13,9 +13,10 @@ describe Lita::Adapters::Slack::UserCreator do
 
   describe ".create_users" do
     let(:real_name) { 'Bobby Tables' }
+    let(:email) { 'bobby@example.com' }
     let(:bobby) { Lita::Adapters::Slack::SlackUser.new('U023BECGF', 'bobby', real_name, slack_data) }
     let(:robot_id) { 'U12345678' }
-    let(:slack_data) { { 'id' => 'U023BECGF', 'name' => 'bobby', 'real_name' => real_name } }
+    let(:slack_data) { { 'id' => 'U023BECGF', 'name' => 'bobby', 'real_name' => real_name, 'email' => email } }
 
     it "creates Lita users for each user in the provided data" do
       expect(Lita::User).to receive(:create).with(
@@ -48,7 +49,7 @@ describe Lita::Adapters::Slack::UserCreator do
 
   describe ".create_user" do
     let(:robot_id) { 'U12345678' }
-    let(:slack_data) { { 'id' => robot_id, 'name' => 'litabot', 'real_name' => 'Lita Bot' } }
+    let(:slack_data) { { 'id' => robot_id, 'name' => 'litabot', 'real_name' => 'Lita Bot', 'email' => 'litabot@example.com' } }
     let(:slack_user) { Lita::Adapters::Slack::SlackUser.new(robot_id, 'litabot', 'Lita Bot', slack_data) }
 
     it "updates the robot's name and mention name if it applicable" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-slack
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Ken J.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-29 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine