mobb 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1786f31311eda789fd50527e7a5cbdbce91c63388668ba248db37f32f5c2578
-  data.tar.gz: c89c89b84d4e6298152dd78113d941bc397dfa2c65ea352bafa084caa5a5d009
+  metadata.gz: 37a6be9b2a1986d9bee5a4d1b65db94b9439b43851f9a251573ea979744f28a3
+  data.tar.gz: 4473258177b3a6c6dc409300930281507e44505705a1751981c23aad1882d504
 SHA512:
-  metadata.gz: 74778071b90f9656e2cd2e29b8b88e98ccf6168c05f33c0af44c82036f1214eac7ac8bc6742cd6658a2039849fa35bc117cf55e515cb409e0945cc80b859b03c
-  data.tar.gz: a0c47902564e323ccb4be959451ec21d433ceedb66f656efa1d56762e1705e0fea316f92ce1c03444bc1100f5ebe45e3381a9bb75e59c9b4ed3bd14db77f4600
+  metadata.gz: d39ac2495a95a3aec44d99e6fed4362e177c135f54bf1b0b0ae8d46e164d56bad8bcd919fcd422fe13309f55da71d70b9a417a90ef5e235147e72f6b4ce06ee6
+  data.tar.gz: d0956d5143950ef3ef82e6ccc63c4347baf37b8431b221157b7b924cda36857f2871418b14e6826ced801b59aac9cec2aef341945be22d877a83e20709626783

data/examples/slack_bot.rb

@@ -9,15 +9,16 @@ end
 
 # Warning this is bad implementation
 # inifinity loop happend
-receive "Yo", laziness: true do
-  "Yo"
-end
+# TODO: now broken
+#receive "Yo", laziness: true do
+#  "Yo"
+#end
 
 receive /hey (\w+)/ do |someone|
   "hey #{someone}, waz up?"
 end
 
-# This function is not implements yet
-#every 1.day, at: '15:30', exclude: :holiday do
-#  'Stund up daily meeting time!'
-#end
+# Need dest_to condition to cron/every task
+every :day, at: '12:30', dest_to: 'times_kinoppyd' do
+  'Stund up daily meeting time!'
+end

data/lib/mobb/base.rb

@@ -1,20 +1,24 @@
 require 'repp'
+require 'whenever'
+require 'parse-cron'
+
 require "mobb/version"
 
 module Mobb
   class Matcher
-    def initialize(pattern, options) @pattern, @options = pattern, options; end
+    def initialize(pattern, options = {}) @pattern, @options = pattern, options; end
     def regexp?; pattern.is_a?(Regexp); end
     def inspect; "pattern: #{@pattern}, options #{@options}"; end
-    def invoke(time = Time.now) @options[:last_invoked] = time; end
+    def cron?; pattern.is_a?(CronParser); end
+    def tick(time = Time.now) @options[:last_tick] = time; end
+    def last_tick; @options[:last_tick] end
 
     def match?(context)
       case context
       when String
         string_matcher(context)
       when Time
-        # TODO: do something
-        false
+        cron_matcher(context)
       when Array
         context.all? { |c| match?(c) }
       else
@@ -43,6 +47,13 @@ module Mobb
         false
       end
     end
+
+    def cron_matcher(time)
+      last = last_tick
+      tick(time) if !last || time > last
+      return false if time < last
+      pattern.next(time) == pattern.next(last) ? false : true
+    end
   end
 
   class Base
@@ -50,20 +61,12 @@ module Mobb
       dup.call!(env)
     end
 
-    def tick(env)
-      dup.tick!(env)
-    end
-
     def call!(env)
       @env = env
       invoke { dispatch! }
       [@body, @attachments]
     end
 
-    def tick!(env)
-      fail # TODO: write logic here
-    end
-
     def dispatch!
       # TODO: encode input messages
 
@@ -92,9 +95,12 @@ module Mobb
 
     def handle_event(base = settings, passed_block = nil)
       if responds = base.events[@env.event_type]
-        responds.each do |pattern, block, conditions|
-          process_event(pattern, conditions) do |*args|
-            event_eval { block[*args] }
+        responds.each do |pattern, block, before_conditions, after_conditions|
+          process_event(pattern, before_conditions) do |*args|
+            event_eval do
+              res = block[*args]
+              after_conditions.inject(res) { |acc, c| c.bind(self).call(acc) }
+            end
           end
         end
       end
@@ -140,7 +146,8 @@ module Mobb
 
       def reset!
         @events = {}
-        @conditions = []
+        @before_conditions = []
+        @after_conditions = []
       end
 
       def settings
@@ -150,27 +157,44 @@ module Mobb
       def receive(pattern, options = {}, &block) event(:message, pattern, options, &block); end
       alias :on :receive
 
-      #def every(pattern, options = {}, &block) event(:cron, pattern, options, &block); end
+      def every(pattern, options = {}, &block) event(:ticker, pattern, options, &block); end
+
+      def cron(pattern, options = {}, &block) event(:ticker, pattern, options, &block); end
 
       def event(type, pattern, options, &block)
         (@events[type] ||= []) << compile!(type, pattern, options, &block)
       end
 
       def compile!(type, pattern, options, &block)
+        at = options.delete(:at)
         options.each_pair { |option, args| send(option, *args) }
 
-        matcher = compile(pattern, options)
+        matcher = case type
+                  when :message
+                    compile(pattern, options)
+                  when :ticker
+                    compile_cron(pattern, at)
+                  end
         unbound_method = generate_method("#{type}", &block)
-        conditions, @conditions = @conditions, []
+        before_conditions, @before_conditions = @before_conditions, []
+        after_conditions, @after_conditions = @after_conditions, []
         wrapper = block.arity != 0 ?
           proc { |instance, args| unbound_method.bind(instance).call(*args) } :
           proc { |instance, args| unbound_method.bind(instance).call }
 
-        [ matcher, wrapper, conditions ]
+        [ matcher, wrapper, before_conditions, after_conditions ]
       end
 
       def compile(pattern, options) Matcher.new(pattern, options); end
 
+      def compile_cron(time, at)
+        if String === time
+          Matcher.new(CronParser.new(time))
+        else
+          Matcher.new(CronParser.new(Whenever::Output::Cron.new(time, nil, at).time_in_cron_syntax))
+        end
+      end
+
       def generate_method(name, &block)
         define_method(name, &block)
         method = instance_method(name)
@@ -224,7 +248,18 @@ module Mobb
       end
 
       def condition(name = "#{caller.first[/`.*'/]} condition", &block)
-        @conditions << generate_method(name, &block)
+        @before_conditions << generate_method(name, &block)
+      end
+      alias :before_condition :condition
+
+      def after_condition(name = "#{caller.first[/`.*'/]} condition", &block)
+        @after_conditions << generate_method(name) do |res|
+          if String === res
+            res = [res, {}]
+          end
+          block.call(res)
+          res
+        end
       end
 
       def ignore_bot(cond)
@@ -239,6 +274,12 @@ module Mobb
         end
       end
 
+      def dest_to(channel)
+        after_condition do |res|
+          res.last[:dest_channel] = channel
+        end
+      end
+
       def enable(*options) options.each { |option| set(option, true) }; end
       def disable(*options) options.each { |option| set(option, false) }; end
       def clear(*options) options.each { |option| set(option, nil) }; end
@@ -372,7 +413,7 @@ module Mobb
       end
     end
 
-    delegate :receive, :on, #:every,
+    delegate :receive, :on, :every, :cron,
       :set, :enable, :disable, :clear,
       :helpers
 

data/lib/mobb/version.rb

@@ -1,3 +1,3 @@
 module Mobb
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/mobb.gemspec

@@ -19,7 +19,9 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "repp", "~> 0.2"
+  spec.add_dependency "repp", "~> 0.3"
+  spec.add_dependency "whenever", "~> 0.10"
+  spec.add_dependency "parse-cron", "~> 0.1"
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - kinoppyd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-26 00:00:00.000000000 Z
+date: 2018-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: repp
@@ -16,14 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: whenever
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: parse-cron
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement