lita-irkit 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc4e1799d85b776ce4bb87623d8aa3d567a3a17b
-  data.tar.gz: 5dc5038f08b66dee9a7386832d1dbbc210ea9487
+  metadata.gz: dc5a5b5fcf056ff95bf9aba7e0db50dcd547a8f8
+  data.tar.gz: 3bae0c2d114dc0948a31cc5a2f27f0c564e87842
 SHA512:
-  metadata.gz: 4b6add3d4a8d6094c851bf615f1acc1c8e22e3e33d03346ec66c190056497f15aa25b41fc790a182790e07222b63dea8f65335766e4e9f48cba8932bc1b3435d
-  data.tar.gz: 3f097080c6bf1fed561970bf852c6f7e50b1746b5555367bc9564b30163931bbc64f275ee9c16325388f0f00d833a48cec176051e62954529070d21ff216cde9
+  metadata.gz: 259034c30629ce1b175f43660d034a13178d8b0586f00e0d4bbcd143320f59a842a57f60af2f7c8447a273caf7f57fe6fdcf8b49d6ec165f19f1c228f9c679d9
+  data.tar.gz: 97abd33ca4bc3c4cafbd83a4bd6d428c0f794f6676bfeecd4dadc8f99944b56de1d531477d952450c685abddf2af13216a9a80daa8cc09d3f58dd3f38768bf50

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 rvm:
   - 2.1
+  - 2.2
 script: bundle exec rake
 before_install:
   - gem update --system

data/README.md

@@ -2,6 +2,8 @@
 
 Use IRKit on Lita
 
+[![Build Status](https://travis-ci.org/fukayatsu/lita-irkit.svg?branch=master)](https://travis-ci.org/fukayatsu/lita-irkit)
+
 ## Installation
 
 Add lita-irkit to your Lita instance's Gemfile:

data/lib/lita/handlers/irkit.rb

@@ -15,15 +15,16 @@ module Lita
       route /^ir migrate/,         :ir_migrate,      command: true
 
       def ir_list(response)
-        response.reply redis.keys.map{ |key| key.sub(/^messages:/, '') }.join(', ')
+        response.reply messages_redis.keys.sort.join(', ')
       end
 
       def ir_register(response)
         cmd     = response.matches[0][0]
-        ir_data = irkit_api.get('messages', clientkey: config.clientkey).body
+        response.reply "waiting for ir data..."
+        ir_data = irkit_api.get('messages', clientkey: config.clientkey, clear: 1).body
         return response.reply "ir data not found" if ir_data.length == 0
 
-        redis["messages:#{cmd}"] = JSON.parse(ir_data)['message'].to_json
+        messages_redis[cmd] = JSON.parse(ir_data)['message'].to_json
         response.reply ":ok_woman:"
       end
 
@@ -33,12 +34,12 @@ module Lita
         if send_command(cmd)
           response.reply ":ok_woman:"
         else
-          response.reply 'ir data not found' unless message
+          response.reply 'ir data not found'
         end
       end
 
       def ir_send_all_off(response)
-        cmds = redis.keys('messages:*off').map{ |key| key.sub(/^messages:/, '') }
+        cmds = messages_redis.keys('*off')
         cmds.each do |cmd|
           send_command(cmd)
         end
@@ -47,7 +48,7 @@ module Lita
 
       def ir_unregister(response)
         cmd = response.matches[0][0]
-        redis.del "messages:#{cmd}"
+        messages_redis.del cmd
         response.reply ":ok_woman:"
       end
 
@@ -64,13 +65,17 @@ module Lita
       end
 
       def send_command(command)
-        return false unless message = redis["messages:#{command}"]
+        return false unless message = messages_redis[command]
 
         irkit_api.post('messages', clientkey: config.clientkey, deviceid: config.deviceid, message: message)
       end
 
     private
 
+      def messages_redis
+        @messages_redis ||= ::Redis::Namespace.new(:messages, redis: redis)
+      end
+
       def irkit_api
         @conn ||= Faraday.new(url: 'https://api.getirkit.com/1') do |faraday|
           faraday.request  :url_encoded             # form-encode POST params

data/lita-irkit.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-irkit"
-  spec.version       = "0.1.0"
+  spec.version       = "0.1.1"
   spec.authors       = ["fukayatsu"]
   spec.email         = ["fukayatsu@gmail.com"]
   spec.description   = %q{Use IRKit on Lita}

data/spec/lita/handlers/irkit_spec.rb

@@ -1,4 +1,126 @@
 require "spec_helper"
 
 describe Lita::Handlers::Irkit, lita_handler: true do
+  let(:irkit_api_stub) { Faraday::Adapter::Test::Stubs.new }
+
+  before do
+    conn = Faraday.new do |faraday|
+      faraday.adapter :test, irkit_api_stub
+    end
+
+    allow_any_instance_of(described_class).to receive(:irkit_api).and_return(conn)
+  end
+
+  describe 'ir list' do
+    before do
+      Lita.redis['handlers:irkit:messages:foo'] = 'FOO'
+      Lita.redis['handlers:irkit:messages:bar'] = 'BAR'
+    end
+
+    it 'list irkit command names' do
+      send_message 'ir list'
+
+      expect(replies.last).to eq('bar, foo')
+    end
+  end
+
+  describe 'ir send' do
+    before do
+      Lita.redis['handlers:irkit:messages:foo'] = 'FOO'
+
+      irkit_api_stub.post('messages', message: 'FOO', deviceid: nil, clientkey: nil) { [200, {}, ''] }
+    end
+
+    context 'happy case' do
+      it 'send irkit command' do
+        send_message 'ir send foo'
+
+        expect(replies.last).to eq(':ok_woman:')
+      end
+    end
+
+    context 'command not found' do
+      it 'do nothing' do
+        send_message 'ir send bar'
+
+        expect(replies.last).to eq('ir data not found')
+      end
+    end
+  end
+
+  describe 'ir all off' do
+    before do
+      Lita.redis['handlers:irkit:messages:foo off'] = 'FOO'
+      Lita.redis['handlers:irkit:messages:bar_off'] = 'BAR'
+      Lita.redis['handlers:irkit:messages:baz']     = 'BAZ'
+
+      expect_any_instance_of(described_class).to     receive(:send_command).with('foo off')
+      expect_any_instance_of(described_class).to     receive(:send_command).with('bar_off')
+      expect_any_instance_of(described_class).to_not receive(:send_command).with('baz')
+    end
+
+    it "send ir commands which end with 'off'" do
+      send_message 'ir all off'
+    end
+  end
+
+  describe 'ir register' do
+    context 'happy case' do
+      before do
+        irkit_api_stub.get('messages') { [200, {}, {message: {foo: 'bar'}}.to_json] }
+      end
+
+      it 'register irkit command' do
+        send_command 'ir register foo'
+
+        expect(replies.last).to eq(':ok_woman:')
+        expect(Lita.redis['handlers:irkit:messages:foo']).to eq({foo: 'bar'}.to_json)
+      end
+    end
+
+    context 'timeout' do
+      before do
+        irkit_api_stub.get('messages') { [200, {}, ''] }
+      end
+
+      it 'say ng' do
+        send_command 'ir register foo'
+
+        expect(replies.last).to eq('ir data not found')
+        expect(Lita.redis['handlers:irkit:messages:foo']).to be_nil
+      end
+    end
+  end
+
+  describe 'ir unregister' do
+    before do
+      Lita.redis['handlers:irkit:messages:foo'] = 'FOO'
+    end
+
+    it 'unregister irkit command' do
+      send_command 'ir unregister foo'
+
+      expect(replies.last).to eq(':ok_woman:')
+      expect(Lita.redis['handlers:irkit:messages:foo']).to be_nil
+    end
+  end
+
+  describe 'ir migrate' do
+    before do
+      Lita.redis['irkit:messages:foo'] = 'FOO'
+      Lita.redis['irkit:messages:bar'] = 'BAR'
+      Lita.redis['baz']                = 'BAZ'
+    end
+
+    it 'migrate to new namespace' do
+      send_command 'ir migrate'
+
+      expect(replies.last).to eq(':ok_woman: 2 keys are migrated.')
+
+      expect(Lita.redis.keys('handlers:irkit:*')).to match_array([
+        'handlers:irkit:messages:foo',
+        'handlers:irkit:messages:bar'
+      ])
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-irkit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - fukayatsu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita