boty 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc1c058cb4c902d4905be90809d77bfbbb6cdcfc
-  data.tar.gz: bd3dfd1478dc9a5bffeb6298f9ea211c66316f2d
+  metadata.gz: 1456a7baa55bfe9bd3d7f66044b48ad900753686
+  data.tar.gz: 3bf63d30f6d2f77b20fe2ae7b13fbbed8283ad26
 SHA512:
-  metadata.gz: 06b5a68da3320987f4841b0ac8581e359ee0c834a2481eb86335db5605377398959108ce50a8b2a4c18ec4dd47fdb7fc2fa62dc190484970ffb8fdb8db29edc0
-  data.tar.gz: ee0bb00924a2a9ae56d33e829e4d2a85ac44b6db970ae6334cf01f0fc32d6747e30fe32759a0caa88c8a4972d9bb960fa998171b829ae2b266070acb02b16416
+  metadata.gz: 13a273517a75e7d28dfcf8784167ad6950843a97ef1392bf4c522910f4ad456dade641ec935d9a79018e88c1914eba02b2b9a58664c11956beba791275abcb32
+  data.tar.gz: 973e402fa4780ca293790850b58690ab51d62ee0d3540bc0026f1a35190b3ee1b7846609ab2086409a3df09a6da96aaaed5973432e1745e3baeeaea68c3fc90f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    boty (0.0.13)
+    boty (0.0.14)
       eventmachine
       faye-websocket
       i18n

data/lib/boty.rb

@@ -33,4 +33,6 @@ require "boty/slack"
 require "boty/session"
 require "boty/message"
 require "boty/action"
+require "boty/script_loader"
+require "boty/script_dsl"
 require "boty/bot"

data/lib/boty/action.rb

@@ -1,5 +1,6 @@
 module Boty
   class Action
+    include Boty::Logger
     attr_reader :regex, :desc, :action
 
     class Description
@@ -33,11 +34,15 @@ module Boty
     end
 
     def is_this?(regex, block)
-      if block
-        regex == self.regex && block == self.action
-      else
-        regex == self.regex
-      end
+      same_regex = regex == self.regex
+      block ? same_regex && block == self.action : same_regex
+    end
+
+    def execute(bot, message)
+      ScriptDSL.new(bot).instance_exec message, &action if message.match! regex
+    rescue => e
+      logger.error e.message
+      raise e
     end
   end
 end

data/lib/boty/bot.rb

@@ -8,7 +8,7 @@ module Boty
       @handlers ||= []
       @commands ||= []
       @events = {}
-      load_default_scripts
+      ScriptLoader.new(self).load
       on :message, &method(:message_handler)
     end
 
@@ -92,18 +92,6 @@ module Boty
 
     private
 
-    def scripts_to_load
-      default_scripts_path = File.expand_path("../../../script", __FILE__)
-      paths = Dir["script/**/*.rb"] + Dir["#{default_scripts_path}/**/*.rb"]
-      paths.map { |file| File.expand_path file }.uniq
-    end
-
-    def load_default_scripts
-      scripts_to_load.each do |file|
-        instance_eval File.read(file), file, 1
-      end
-    end
-
     def event_type(data)
       type = data["type"].to_sym
       logger.debug { "bot specifc event[#{type}] arrived: #{data}" }
@@ -129,19 +117,15 @@ module Boty
       !!(/(<@#{id}|#{name}>)/ =~ data["text"])
     end
 
-    def execute_command(command, message)
-      @_message = message
-      instance_exec @_message, &command.action
-      @_message = nil
-    end
-
     def message_handler(data)
       actions = has_valid_mention?(data) ? @commands : @handlers
-
-      Array(actions).each do |command|
-        next unless match = command.regex.match(data["text"])
-        #command.execute(self, match) #=> or something like that...
-        execute_command command, Message.new(data, match: match)
+      @_message = Message.new data
+      begin
+        Array(actions).each do |action|
+          action.execute self, @_message
+        end
+      ensure
+        @_message = nil
       end
     end
   end

data/lib/boty/message.rb

@@ -12,6 +12,10 @@ module Boty
       @match = match
     end
 
+    def match!(regex)
+      @match = regex.match @text
+    end
+
     def from?(author)
       if author.respond_to? :id
         @user.id == author.id

data/lib/boty/script_dsl.rb

@@ -0,0 +1,24 @@
+require "forwardable"
+
+module Boty
+  class ScriptDSL
+    attr_accessor :bot
+
+    INSTANCES = {}
+    private_constant :INSTANCES
+    class << self
+      alias original_constructor new
+    end
+
+    extend Forwardable
+    def_delegators :bot, :desc, :respond, :name, :say, :im, :brain, :know_how
+
+    def initialize(bot)
+      @bot = bot
+    end
+
+    def self.new(bot)
+      INSTANCES[bot] ||= original_constructor bot
+    end
+  end
+end

data/lib/boty/script_loader.rb

@@ -0,0 +1,21 @@
+module Boty
+  class ScriptLoader
+    def initialize(bot)
+      @dsl = ScriptDSL.new bot
+    end
+
+    def load
+      scripts_to_load.each do |file|
+        @dsl.instance_eval File.read(file), file, 1
+      end
+    end
+
+    private
+
+    def scripts_to_load
+      default_scripts_path = File.expand_path("../../../script", __FILE__)
+      paths = Dir["script/**/*.rb"] + Dir["#{default_scripts_path}/**/*.rb"]
+      paths.map { |file| File.expand_path file }.uniq
+    end
+  end
+end

data/lib/boty/version.rb

@@ -1,3 +1,3 @@
 module Boty
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boty
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Ricardo Valeriano
@@ -191,10 +191,11 @@ files:
 - lib/boty/action.rb
 - lib/boty/bot.rb
 - lib/boty/cli.rb
-- lib/boty/dsl.rb
 - lib/boty/logger.rb
 - lib/boty/message.rb
 - lib/boty/rspec.rb
+- lib/boty/script_dsl.rb
+- lib/boty/script_loader.rb
 - lib/boty/session.rb
 - lib/boty/slack.rb
 - lib/boty/slack/channel.rb