hipbot 1.0.3 → 1.0.4

data/lib/hipbot/reaction.rb

@@ -34,10 +34,6 @@ module Hipbot
       !!options[:global]
     end
 
-    def inspect
-      "#<Hipbot::Reaction #{options}>"
-    end
-
     def plugin_name
       plugin.name.demodulize
     end
@@ -53,10 +49,16 @@ module Hipbot
     attr_cache :readable_command do
       regexps.map(&:source).join(' or ').gsub(/\^|\\z|\$|\\/, '')
     end
+    delegate :to_s, to: :readable_command
 
     attr_cache :regexps do
-      Array(options[:regexps]).map do |regexp|
-        Regexp.new(regexp.source, Regexp::IGNORECASE)
+      regexps = Array(options[:regexps])
+      if Hipbot.configuration.case_insensitive
+        regexps.map do |regexp|
+          Regexp.new(regexp.source, Regexp::IGNORECASE)
+        end
+      else
+        regexps
       end
     end
 
@@ -71,7 +73,7 @@ module Hipbot
     protected
 
     def replace_symbols values, replacements_hash
-      Array(values).flat_map{ |v| replacements_hash[v] || v }.map(&:to_s)
+      Array(values).flat_map{ |v| replacements_hash[v] || v }.uniq
     end
   end
 end

data/lib/hipbot/response.rb

@@ -7,7 +7,7 @@ module Hipbot
 
     def initialize *_
       super
-      Hipbot.logger.info("RESPONSE WITH #{reaction.inspect}")
+      Hipbot.logger.info("RESPONSE WITH #{reaction}")
     end
 
     def invoke arguments

data/lib/hipbot/room.rb

@@ -41,7 +41,7 @@ module Hipbot
     end
 
     def archived?
-      !!attributes[:archived]
+      !!attributes[:is_archived]
     end
   end
 end

data/lib/hipbot/storages/hash.rb

@@ -77,12 +77,12 @@ module Hipbot
           end
         end
 
-        protected
+        # protected
 
-        def method_missing name, *args, &block
-          return all.public_send(name, *args, &block) if Array.instance_methods.include?(name)
-          super
-        end
+        # def method_missing name, *args, &block
+        #   return all.public_send(name, *args, &block) if Array.instance_methods.include?(name)
+        #   super
+        # end
       end
     end
   end

data/lib/hipbot/storages/mongoid.rb

@@ -11,7 +11,7 @@ module Hipbot
 
         alias_method :to_s, :name
 
-        validate :name, presence: true
+        validates :name, presence: true
       end
     end
   end

data/lib/hipbot/user.rb

@@ -15,5 +15,9 @@ module Hipbot
     def myself?
       self == Hipbot.user
     end
+
+    def guest?
+      attributes[:role] == 'visitor'
+    end
   end
 end

data/lib/hipbot/version.rb

@@ -1,3 +1,3 @@
 module Hipbot
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/spec/integration/my_hipbot_spec.rb

@@ -16,7 +16,7 @@ describe MyHipbot do
     end
 
     it 'should set hipchat token' do
-      subject.jid.should == 'robbot@chat.hipchat.com'
+      subject.configuration.jid.should == 'robbot@chat.hipchat.com'
     end
   end
 

data/spec/spec_helper.rb

@@ -1,7 +1,12 @@
+require 'rspec/its'
+
 require_relative '../lib/hipbot'
 
-require 'coveralls'
-Coveralls.wear!
+begin
+  require 'coveralls'
+  Coveralls.wear!
+rescue LoadError
+end
 
 RSpec.configure do |config|
   config.mock_with :rspec

data/spec/unit/match_spec.rb

@@ -24,7 +24,7 @@ describe Hipbot::Match do
   end
 
   describe "#matches?" do
-    its(:matches?) { should be_true }
+    its(:matches?) { should be_truthy }
 
     describe "specific regexp" do
       describe "matching the message body" do
@@ -33,7 +33,7 @@ describe Hipbot::Match do
           reaction.stub(regexps: [/\Atest/])
         end
 
-        its(:matches?) { should be_true }
+        its(:matches?) { should be_truthy }
       end
 
       describe "not matching message body" do
@@ -42,7 +42,7 @@ describe Hipbot::Match do
           reaction.stub(regexps: [/\Arandom/])
         end
 
-        its(:matches?) { should be_false }
+        its(:matches?) { should be_falsy }
       end
     end
 
@@ -53,7 +53,7 @@ describe Hipbot::Match do
           reaction.stub(regexps: [/\Awat/, /\Atest/])
         end
 
-        its(:matches?) { should be_true }
+        its(:matches?) { should be_truthy }
       end
 
       describe "not matching message body" do
@@ -62,7 +62,7 @@ describe Hipbot::Match do
           reaction.stub(regexps: [/\Awat/, /\Arandom/])
         end
 
-        its(:matches?) { should be_false }
+        its(:matches?) { should be_falsy }
       end
     end
 
@@ -72,7 +72,7 @@ describe Hipbot::Match do
           reaction.stub(condition: proc { true })
         end
 
-        its(:matches?) { should be_true }
+        its(:matches?) { should be_truthy }
       end
 
       describe "returning false" do
@@ -80,7 +80,7 @@ describe Hipbot::Match do
           reaction.stub(condition: proc { false })
         end
 
-        its(:matches?) { should be_false }
+        its(:matches?) { should be_falsy }
       end
     end
   end

data/spec/unit/message_spec.rb

@@ -56,13 +56,13 @@ describe Hipbot::Message do
   it "should be for bot" do
     user = double(mention: 'robot')
     message = subject.new('hello @robot!', room, sender)
-    message.for?(user).should be_true
+    message.for?(user).should be_truthy
   end
 
   it "should not be for bot" do
     user = double(mention: 'robot')
     message = subject.new('hello @tom!', room, sender)
-    message.for?(user).should be_false
+    message.for?(user).should be_falsy
   end
 
   it 'knows its recipients' do

data/spec/unit/reaction_spec.rb

@@ -8,27 +8,27 @@ describe Hipbot::Reaction do
     let(:reaction){ subject.new(@plugin, options, @block) }
 
     it '#in_any_room?' do
-      reaction.in_any_room?.should be_false
+      reaction.in_any_room?.should be_falsy
       options[:room] = true
-      reaction.in_any_room?.should be_true
+      reaction.in_any_room?.should be_truthy
     end
 
     it '#to_anything?' do
-      reaction.to_anything?.should be_true
+      reaction.to_anything?.should be_truthy
       reaction.options[:regexps] = nil
-      reaction.to_anything?.should be_true
+      reaction.to_anything?.should be_truthy
     end
 
     it '#from_anywhere?' do
-      reaction.from_anywhere?.should be_true
+      reaction.from_anywhere?.should be_truthy
       reaction.options[:room] = nil
-      reaction.from_anywhere?.should be_true
+      reaction.from_anywhere?.should be_truthy
     end
 
     it '#condition' do
-      reaction.condition.call.should be_true
+      reaction.condition.call.should be_truthy
       reaction.options[:if] = proc{ false }
-      reaction.condition.call.should be_false
+      reaction.condition.call.should be_falsy
     end
 
     it '#delete' do
@@ -45,15 +45,15 @@ describe Hipbot::Reaction do
     end
 
     it '#from_all?' do
-      reaction.from_all?.should be_true
+      reaction.from_all?.should be_truthy
       reaction.options[:room] = nil
-      reaction.from_all?.should be_true
+      reaction.from_all?.should be_truthy
     end
 
     it '#global?' do
-      reaction.global?.should be_false
+      reaction.global?.should be_falsy
       reaction.options = { global: true }
-      reaction.global?.should be_true
+      reaction.global?.should be_truthy
     end
 
     it '#plugin_name' do
@@ -67,9 +67,9 @@ describe Hipbot::Reaction do
     end
 
     it '#to_private_message?' do
-      reaction.to_private_message?.should be_false
+      reaction.to_private_message?.should be_falsy
       reaction.options[:room] = false
-      reaction.to_private_message?.should be_true
+      reaction.to_private_message?.should be_truthy
     end
 
     it '#regexps' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hipbot
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Bartosz Kopiński
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xmpp4r-hipchat
@@ -109,6 +109,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -143,26 +157,30 @@ files:
 - bin/hipbot
 - hipbot.gemspec
 - lib/hipbot.rb
+- lib/hipbot/adaptable.rb
 - lib/hipbot/adapter.rb
 - lib/hipbot/adapters/hipchat.rb
-- lib/hipbot/adapters/hipchat/initializer.rb
+- lib/hipbot/adapters/hipchat/client.rb
 - lib/hipbot/adapters/shell.rb
+- lib/hipbot/adapters/slack.rb
+- lib/hipbot/adapters/slack/client.rb
 - lib/hipbot/adapters/telnet.rb
+- lib/hipbot/adapters/xmpp.rb
+- lib/hipbot/adapters/xmpp/client.rb
 - lib/hipbot/bot.rb
-- lib/hipbot/cache.rb
 - lib/hipbot/callbacks/base.rb
-- lib/hipbot/callbacks/invite.rb
 - lib/hipbot/callbacks/lobby_presence.rb
 - lib/hipbot/callbacks/message.rb
 - lib/hipbot/callbacks/presence.rb
 - lib/hipbot/callbacks/private_message.rb
+- lib/hipbot/callbacks/room_invite.rb
 - lib/hipbot/callbacks/room_message.rb
 - lib/hipbot/callbacks/room_presence.rb
+- lib/hipbot/callbacks/room_topic.rb
 - lib/hipbot/configurable.rb
 - lib/hipbot/configuration.rb
 - lib/hipbot/helpers.rb
-- lib/hipbot/http.rb
-- lib/hipbot/logger.rb
+- lib/hipbot/helpers/http.rb
 - lib/hipbot/match.rb
 - lib/hipbot/matchable.rb
 - lib/hipbot/message.rb
@@ -178,6 +196,8 @@ files:
 - lib/hipbot/storages/hash.rb
 - lib/hipbot/storages/mongoid.rb
 - lib/hipbot/user.rb
+- lib/hipbot/utilities/cache.rb
+- lib/hipbot/utilities/logger.rb
 - lib/hipbot/version.rb
 - spec/integration/my_hipbot.rb
 - spec/integration/my_hipbot_spec.rb
@@ -211,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0.rc.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Hipbot is a XMPP bot for HipChat, written in Ruby with EventMachine.

data/lib/hipbot/callbacks/invite.rb

@@ -1,11 +0,0 @@
-module Hipbot
-  module Callbacks
-    class Invite < Base
-      def initialize room_id, user_name, room_name, topic
-        with_room(id: room_id, name: room_name, topic: topic) do |room|
-          Hipbot.join_room(room)
-        end
-      end
-    end
-  end
-end