mobb 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: febcad507b908eb89cc3a74a26787e1d7d216157bb6d24e4bee947308a781fab
-  data.tar.gz: 7a952215c219f37bb24e02606b0e36daba75c240e19ff0f2ca2f0e11dfab3e45
+  metadata.gz: 45908e7b9ee455eade38bebbe8aa457b93df93013aec972e3fecc16b0d982dfc
+  data.tar.gz: c3b6343d33c5277093970e3100bdcc68a3573195380e3e4b286806472c2ef009
 SHA512:
-  metadata.gz: 1bbff647c951289f4de76e6739a1dce400f5ad68ca671c93c43563b1b7f585730c0963e47fe2e32e8d8e3834de932ec8ec60b82843a33c733aa4f98c7b745543
-  data.tar.gz: a141458e8442486f8729d3debbc1555e0a71d7fe02cc1ac7eecad20ea3beeb1b169c1cc0e7d07e062cfca187ff1306a81ca283ef15f3657168877f80e1d05016
+  metadata.gz: 635f87290e06901ecbac6444c15f89aa0e48753e518ceecae6a12aa34c0e305f939fe3ec2eec7db6f9c18088a51e8957423c5ad7a2688b7f7454480922d8e55b
+  data.tar.gz: 75682d95b5903622e0ca0b6b0b0a2828331f1d67ffa2f5cf4e4e4acb6848c5873b70bcb53c431c3ebcad048bed35d804ef5313d0cae6de69af51368771a8ec09

data/README.md

@@ -71,17 +71,19 @@ end
 
 ## Conditions
 
-You can use conditions `ignore_bot` and `reply_to_me`.
+You can use conditions `react_to_bot`, `include_myself` and `reply_to_me`.
 
 ```ruby
 require 'mobb'
 set :service, 'slack'
 
-# You must set `ignore_bot` true when response same message
-on 'Yo', ignore_bot: true do
+# Mobb ignore all bot messages, but when set reply_to_bot true, Mobb react all bot messages
+# this example will act infinit loop when receive message 'Yo'
+on 'Yo', reply_to_bot: true do
   'Yo'
 end
 
+# This block react only message reply to bot
 on /Hi/, reply_to_me: true do
   "Hi #{@env.user.name}"
 end
@@ -104,6 +106,50 @@ on /Yo/, reply_to_me: true do
 end
 ```
 
+# Chain methods
+
+If you want to act heavy task your bot, you can use chain/trigger syntax.
+
+```ruby
+require 'mobb'
+
+on 'taks start (\w+)' do |name|
+  chain 'heavy task1', 'heavy task2', name: name
+  'start!'
+end
+
+trigger 'heavy task1' do
+  payload = @env.payload
+  sleep 19
+  "task1 #{payload[:name]} done!"
+end
+
+trigger 'heavy task1' do
+  payload = @env.payload
+  sleep 30
+  "task2 #{payload[:name]} done!"
+end
+```
+
+# Pass
+
+You can pass block to use pass keyword
+
+```ruby
+require 'mobb'
+
+on 'yo' do
+  $stderr.puts 'this block will be pass'
+  pass
+  'this value never evaluted'
+end
+
+on 'yo' do
+  $stderr.puts 'catch!'
+  'yo'
+end
+```
+
 # Service handlers
 
 Mobb is implemented based on [Repp](https://github.com/kinoppyd/repp) Interface.

data/lib/mobb/base.rb

@@ -27,8 +27,8 @@ module Mobb
     end
 
     class Matched
-      attr_reader :pattern, :matched
-      def initialize(pattern, matched) @pattern, @matched = pattern, matched; end
+      attr_reader :pattern, :matched, :captures
+      def initialize(pattern, matched) @pattern, @matched, @captures = pattern, matched, matched.captures; end
     end
 
     def pattern; @pattern; end
@@ -37,7 +37,7 @@ module Mobb
       case pattern
       when Regexp
         if res = pattern.match(string)
-          Matched.new(pattern, res.captures)
+          Matched.new(pattern, res)
         else
           false
         end
@@ -57,14 +57,23 @@ module Mobb
   end
 
   class Base
+    attr_reader :matched
+
     def call(env)
       dup.call!(env)
     end
 
     def call!(env)
       @env = env
+      @body = nil
+      @repp_options = {}
+      @attachments = {}
+      @matched = nil
+      @silent = false
       invoke { dispatch! }
-      [@body, @attachments]
+
+      @body = nil if @silent
+      [@body, @repp_options, @attachments]
     end
 
     def dispatch!
@@ -131,7 +140,8 @@ module Mobb
 
         case res
         when ::Mobb::Matcher::Matched
-          block ? block[self, *(res.matched)] : yield(self, *(res.matched))
+          @matched = res.matched
+          block ? block[self, *(res.captures)] : yield(self, *(res.captures))
         when TrueClass
           block ? block[self] : yield(self)
         else
@@ -142,6 +152,17 @@ module Mobb
 
     def event_eval; throw :halt, yield; end
 
+    def chain(*args)
+      payload = args.last.instance_of?(Hash) ? args.pop : nil
+      @repp_options[:trigger] = { names: args, payload: payload }
+    end
+
+    def say_nothing; @silent = true; end
+
+    def pass(&block)
+      throw :pass, block
+    end
+
     def settings
       self.class.settings
     end
@@ -157,6 +178,13 @@ module Mobb
         /src\/kernel\/bootstrap\/[A-Z]/                     # maglev kernel files
       ]
 
+      DEFAULT_CONDITIONS = {
+        :message => {
+          :react_to_bot => false,
+          :include_myself => false
+        }
+      }
+
       attr_reader :events, :filters
 
       def reset!
@@ -197,6 +225,8 @@ module Mobb
       def cron(pattern, options = {}, &block) event(:ticker, pattern, options, &block); end
       alias :every :cron
 
+      def trigger(name, options = {}, &block) event(:trigger, name, options, &block); end
+
       def event(type, pattern, options, &block)
         signature = compile!(type, pattern, options, &block)
         (@events[type] ||= []) << signature
@@ -210,6 +240,9 @@ module Mobb
 
       def compile!(type, pattern, options, &block)
         at = options.delete(:at)
+
+        defaults = DEFAULT_CONDITIONS[type]
+        options = defaults ? defaults.merge(options) : options
         options.each_pair { |option, args| send(option, *args) }
 
         matcher = case type
@@ -217,6 +250,8 @@ module Mobb
                     compile(pattern, options)
                   when :ticker
                     compile_cron(pattern, at)
+                  when :trigger
+                    compile(pattern, options)
                   else
                     compile(pattern, options)
                   end
@@ -316,9 +351,17 @@ module Mobb
         end
       end
 
-      def ignore_bot(cond)
-        condition do
-          @env.bot? != cond
+      def react_to_bot(cond)
+        source_condition do
+          return true if !@env.respond_to?(:bot?) || cond
+          !@env.bot?
+        end
+      end
+
+      def include_myself(cond)
+        source_condition do
+          return true if !@env.respond_to?(:user) || cond
+          @env.user.name != settings.name
         end
       end
 
@@ -328,6 +371,12 @@ module Mobb
         end
       end
 
+      def silent(cond)
+        dest_condition do |res|
+          res[0] = nil if cond
+        end
+      end
+
       def dest_to(channel)
         dest_condition do |res|
           res.last[:dest_channel] = channel
@@ -467,7 +516,7 @@ module Mobb
       end
     end
 
-    delegate :receive, :on, :every, :cron,
+    delegate :receive, :on, :every, :cron, :trigger,
       :set, :enable, :disable, :clear, :before, :after,
       :helpers, :register
 

data/lib/mobb/version.rb

@@ -1,3 +1,3 @@
 module Mobb
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/mobb.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "repp", "~> 0.3"
+  spec.add_dependency "repp", "~> 0.4"
   spec.add_dependency "whenever", "~> 0.10"
   spec.add_dependency "parse-cron", "~> 0.1"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobb
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - kinoppyd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-01 00:00:00.000000000 Z
+date: 2018-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: repp
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: whenever
   requirement: !ruby/object:Gem::Requirement