lita-hcadmin 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbb668a3f1776c2b498ad15764a56d7f1b309347
-  data.tar.gz: 27af7e8a66abb2e65e4ba40c38ab87688c28331a
+  metadata.gz: ea505de875b8f0e2b8e23e48b73f74dfdd841aca
+  data.tar.gz: 1723fa99de97712ef95809ead9eb19061c056360
 SHA512:
-  metadata.gz: 7b888e6b7888f5d3412797d9cd28a33d293beb350861c9ec7b2eb72647ca5fc4ea918b05a99bb96b99c254033ef5f331bf5670346a810e0af543e3b3224fe27e
-  data.tar.gz: 57975f9f90f363f2f24ddee9ababc163da5f785ee6b0280298c18a3b8efbb47087a93f40a695cbf6be0c384dda39b4feff423c7eb3220a921a0c60b4b78f91ed
+  metadata.gz: c4721968c8703aaf7a5dfb4c14a583ff05f3b40b5e88d04c46249775ae5b5c538461322ee6efee7fc81ee1fadb003a1d8a1175af021c818a2d36a751426c9d88
+  data.tar.gz: a4839fdf71f065c4ffe43ccab69f6be0b41b6033d9953cff4d1575be0b09d1e3229a223a405aed8b1aa1cdc8c120ca3d50beb846e92d82b19fad1940123c61f0

data/lib/lita/handlers/hcadmin.rb

@@ -18,6 +18,7 @@ module Lita
       config :smtp_server
       config :allowed_domains
       config :room_change_admins, type: Array, required: false
+      config :user_change_admins, type: Array, required: false
       config :account_name, type: String, required: true
       config :email_domain_name, type: Array, required: true
       config :http_logging, type: [TrueClass, FalseClass], default: true, required: false
@@ -26,23 +27,23 @@ module Lita
         :identify_room_owner,
         help: { 'identify room owner ROOM_NAME' => 'Returns the mention name of the room owner.' })
 
-      route(/(?:(?:identify hipchat admins))/i,
+      route(/identify hipchat admins/,
         :identify_hipchat_admins,
         help: { 'identify hipchat admins' => 'Returns the mention name of the HipChat Admins.' })
 
-      route(/(?:(?:identify user count))/i,
+      route(/identify user count/,
         :identify_user_count,
         help: { 'identify user count' => 'Returns the count of users in the account.' })
 
-      route(/(?:(?:identify room count))/i,
+      route(/identify room count/,
         :identify_room_count,
         help: { 'identify room count' => 'Returns the count of rooms in the account.' })
 
-      route(/(?:(?:identify room change admins))/i,
+      route(/identify room change admins/,
         :identify_room_change_admins,
         help: { 'identify room change admins' => 'Returns a list of who can change room ownership' })
 
-      route(/(?:(?:identify status))/i,
+      route(/identify status/,
         :identify_status,
         help: { 'identify status' => 'Returns the status of HipChat.' })
 
@@ -50,14 +51,18 @@ module Lita
         :hipchat_sponsor,
         help: { 'hipchat sponsor EMAIL ADDRESS' => 'Generates an invite to the person being sponsored. Use a valid email address' })
 
-      route(/(?:(?:room owner change))\s+(.+)/i,
+      route(/((room owner change))\s+(.+)/i,
         :room_owner_change,
         help: { 'room owner change owner_mention_name room_name ' => 'When run as a room change admin, updates the room ownership' })
 
-      route(/(?:(?:room unarchive))/i, #      route(/(?:(?:room unarchive))\s+(.+)/i,
+      route(/((room unarchive))/i, #      route(/(?:(?:room unarchive))\s+(.+)/i,
         :room_unarchive,
         help: { 'room unarchive room_name ' => 'When run as a room change admin, removes a room from archive' })
 
+      route(/((user activate))\s+(.+)/i,
+        :user_activate,
+        help: { 'user activate email name' => 'When run as a user admin, generates an invite to the email account' })
+
       def hipchat_sponsor(response)
         response.args.each do |r|
           next if 'sponsor'.include?(r)
@@ -140,38 +145,18 @@ module Lita
       end
 
       def identify_room_owner(response)
-        room_name = nil
-        reply_message = nil
-        room_owner = nil
-        time = Benchmark.measure do
-          response.matches.each do |match|
-            room_name = normalize_room_name(match[0])
-          end
-          # get room json
-          response.reply 'Getting rooms ... one moment'
-          room_data = fetch_rooms
-
-          response.reply 'Getting room id ... another moment'
-          room_id = id_from_name(room_name, parse(room_data[:body], 'rooms'))
-
-          response.reply 'Getting the user name from the user ID ... almost there'
-          room_owner = owner_id_from_room_id(room_id, parse(room_data[:body], 'rooms'))
-
-          if room_owner.nil?
-            reply_message = "Room #{room_name} apparently does not have an owner or I could not find a room with that name"
-          elsif room_id.nil?
-            reply_message = "Room #{room_name} apparently does not have an owner or I could not find a room with that name"
-          end
+        @room_name = nil
+        @room_parse = nil
+        response.matches.each do |match|
+          @room_name = match[0]
         end
-
-        if reply_message.nil?
-          user_data = fetch_user(room_owner)
-          owner_mention = owner_name_from_id(parse(user_data[:body], 'user'))
-          reply_message = "The owner of #{room_name} is #{owner_mention}"
-          response.reply reply_message
-        else
-          response.reply reply_message + " ( #{time.real.to_i} s. to respond )"
+        response.reply 'Getting rooms ... one moment'
+        room_info = fetch_data('v2', 'room', @room_name)
+        @room_parse = JSON.parse(room_info[:body])
+        if @room_parse.key?('error')
+          return response.reply @room_parse['error']['message']
         end
+        response.reply "The owner of #{@room_name} is #{@room_parse['owner']['name']}"
       end
 
       def parse(json, type)
@@ -191,29 +176,6 @@ module Lita
         json
       end
 
-      def id_from_name(room_name, json)
-        room_id = nil
-        json.each do |j|
-          next unless room_name == j['name'].to_s.downcase.strip
-          room_id = j['room_id']
-        end
-        room_id
-      end
-
-      def owner_id_from_room_id(room_id, json)
-        owner_id = nil
-        json.each do |j|
-          next unless room_id == j['room_id']
-          owner_id = j['owner_user_id']
-        end
-        owner_id
-      end
-
-      def owner_name_from_id(json)
-        user_name = json['mention_name']
-        user_name
-      end
-
       def room_owner_change(response) # Length check => owner: 1, change: 2, member_name: 3, room_name: 4, room_name can be multiple words!
         return response.reply 'You are not represented in the room owner change admin group' unless user_in_group(response.user.mention_name, room_change_admins) == true
         return response.reply "Wrong number of arguments; expected format of owner_name & room_name received arguments: #{response.args.values_at(2..response.args.length - 1)}" unless response.args.length > 3
@@ -264,8 +226,18 @@ module Lita
         json
       end
 
+      def user_activate(response)
+        # puts response.args
+        return response.reply 'First value should be a valid email address' unless valid_email?(response.args[0]) == 0
+      end
+
       private
 
+      def valid_email?(email_value)
+        valid_email_reg = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
+        email_value =~ valid_email_reg
+      end
+
       def user_data(user_name)
         user_check = JSON.parse(fetch_data('v2', 'user', user_name).to_json)
         user_details = JSON.parse(user_check['body'])

data/lita-hcadmin.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-hcadmin"
-  spec.version       = "0.3.3"
+  spec.version       = "0.3.5"
   spec.authors       = ["Jason Walker"]
   spec.email         = ["jason.walker@target.com"]
   spec.description   = "HipChat admin plugin for Lita"

data/spec/lita/handlers/hcadmin_spec.rb

@@ -20,8 +20,8 @@ describe Lita::Handlers::Hcadmin, lita_handler: true do
   let(:mock_smtp) { mock('smtp') }
 
   let(:room_change_admin_member) { Lita::User.create(55, name: 'TestAdmin') }
+  let(:user_change_admin_member) { Lita::User.create(99, name: 'UserAdmin') }
   let(:regular_member) { Lita::User.create(66, name: 'RegularMember') }
-
   let(:fetch_api_data) { Hcadmin.fetch_data('v1', 'foo', 'bar') }
 
   before do
@@ -177,6 +177,30 @@ describe Lita::Handlers::Hcadmin, lita_handler: true do
         body: room_v2_json,
         headers: {}
       )
+    stub_request(:get, 'https://api.hipchat.com/v2/room/foobar?auth_token=abc&format=json')
+      .with(
+        headers: {
+          'Accept' => 'application/json',
+          'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+          'Content-Type' => 'application/json',
+          'User-Agent' => 'Faraday v0.9.2' })
+      .to_return(
+        status: 200,
+        body: room_v2_not_found,
+        headers: {}
+      )
+    stub_request(:get, 'https://api.hipchat.com/v2/room/Test%20Room%20@%20Company.com?auth_token=abc&format=json')
+      .with(
+        headers: {
+          'Accept' => 'application/json',
+          'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+          'Content-Type' => 'application/json',
+          'User-Agent' => 'Faraday v0.9.2' })
+      .to_return(
+        status: 200,
+        body: room_v2_json,
+        headers: {}
+      )
   end
 
   it 'routes the identify room owner command room name has spaces' do
@@ -223,6 +247,10 @@ describe Lita::Handlers::Hcadmin, lita_handler: true do
     is_expected.to route_command('room unarchive room_name').to(:room_unarchive)
   end
 
+  it 'routes user activate requests' do
+    is_expected.to route_command('user activate email_address name').to(:user_activate)
+  end
+
   describe '#hipchat_sponsor' do
     context 'validates the new account request is for a Target.com email address' do
       it 'rejects non-Target.com email addresses' do
@@ -338,23 +366,13 @@ describe Lita::Handlers::Hcadmin, lita_handler: true do
   describe '#identify_room_owner' do
     context 'getting the list of rooms' do
       it 'replies with the room_id for a real room name' do
-        send_command('identify room owner floppy drive')
-        expect(replies.last).to eq('The owner of floppy drive is AwesomeSauce')
-      end
-
-      it 'handles room names with numbers' do
-        send_command('identify room owner f00_bar')
-        expect(replies.last).to eq 'Room f00_bar apparently does not have an owner or I could not find a room with that name ( 0 s. to respond )'
+        send_command('identify room owner Test Room @ Company.com')
+        expect(replies.last).to eq('The owner of Test Room @ Company.com is Red Solo Cup')
       end
 
       it 'handles UCASE NAMES' do
-        send_command('identify room owner FOO_BAR')
-        expect(replies.last).to_not eq 'Sorry, no room found with that name FOO_BAR'
-      end
-
-      it 'handles NAMES-WITH-HYPHENS' do
-        send_command('identify room owner NAMES-WITH-HYPHENS')
-        expect(replies.last).to_not eq 'Sorry, no room found with that name NAMES-WITH-HYPHENS'
+        send_command('identify room owner foobar')
+        expect(replies.last).to eq "Room 'foobar' not found"
       end
     end
   end # end identify_room_owner
@@ -391,46 +409,40 @@ describe Lita::Handlers::Hcadmin, lita_handler: true do
   end # end fetch
 
   describe '#parse' do
-    before(:each) do
-      allow(described_class).to receive(:parse).with(room_json, 'rooms').and_return(JSON.parse(room_json))
-    end
-    let(:test_room_data) { described_class.parse(room_json, 'rooms') }
-    let(:test_room_details) { test_room_data['rooms'] }
+    let(:test_room_data) { subject.parse(room_json, 'rooms') }
 
     context 'JSON data from parse should return a JSON object' do
       it 'gets a JSON object during parse' do
-        expect(test_room_details.first['room_id']).to eq(31)
+        expect(test_room_data.first['room_id']).to eq(31)
       end
-    end
-  end
 
-  describe '#owner_name_from_id' do
-    before(:each) do
-      allow(described_class).to receive(:owner_name_from_id).with(31, user_json).and_return('AwesomeSauce')
-    end
-    context 'an owner id can be translated to an owner name' do
-      it 'gets the name of the room when presented a room ID' do
-        expect(described_class.owner_name_from_id(31, user_json)).to eq 'AwesomeSauce'
+      it 'accepts parse method' do
+        expect(subject).to respond_to(:parse)
       end
     end
   end
 
-  describe '#id_from_name' do
-    before(:each) do
-      allow(described_class).to receive(:id_from_name).with('floppy drive', room_json).and_return(31)
-    end
-
-    context 'returns the room_id from the room_name' do
-      it 'does not error when getting the ID from name' do
-        expect do
-          described_class.id_from_name('floppy drive', room_json)
-        end.to_not raise_error
-      end
-      it 'returns the room_id when given a room name' do
-        expect(described_class.id_from_name('floppy drive', room_json)).to eq 31
-      end
-    end
-  end
+  # describe '#owner_name_from_id' do
+  #   # before(:each) do
+  #   #   allow(described_class).to receive(:owner_name_from_id).with(31, user_json).and_return('AwesomeSauce')
+  #   # end
+  #   let(:user_mention_name) { subject.owner_name_from_id(user_json) }
+  #   context 'an owner id can be translated to an owner name' do
+  #     it 'returns the mention name field from JSON data' do
+  #       # expect(described_class.owner_name_from_id(31, user_json)).to eq 'AwesomeSauce'
+  #       expect(user_mention_name).to eq 'AwesomeSauce'
+  #     end
+  #   end
+  # end
+  #
+  # describe '#id_from_name' do
+  #   let(:room_search) { subject.id_from_name('floppy drive', room_json) }
+  #   context 'returns the room_id from the room_name' do
+  #     it 'does not error when getting the ID from name' do
+  #       expect(room_search).to eq 31
+  #     end
+  #   end
+  # end
 
   describe '#identify_room_count' do
     context 'room count is returned when called' do
@@ -558,4 +570,16 @@ describe Lita::Handlers::Hcadmin, lita_handler: true do
       end
     end
   end
+
+  describe '#user_activate' do
+    context 'reactivates a person' do
+      it 'catches if the user does not use a real email address' do
+        send_command('user activate email@companycom')
+        expect(replies.last).to include('First value should be a valid email address')
+      end
+      it 'does stuff' do
+        send_command('user activate email@company.com')
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-hcadmin
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Jason Walker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita