slappy 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b0b9c15815b3cf1132917f497bf462ac226e8ae
-  data.tar.gz: 6b56d7a4a85eaac4c46e988a6e2e5728058d6658
+  metadata.gz: 2cda9ebb75413427151ae533a04d020a9e9db638
+  data.tar.gz: 582468f8b8eb1760fceb92b3b26f6dd83aa07957
 SHA512:
-  metadata.gz: fcba756785fa377ca2a3e65164edde9a1fea85f7ae66ac45bb5751e1a1fd5cb3372f1350e18702790ae0768d72f83add8bef188955b93e9d306a86f415c9cfe5
-  data.tar.gz: c27d86356d760e5a7fe3d1ea67b83b58a96758242eb2509d1e9eaf7b2a5703401df30c6b0772c8bb2d804f782c562e3cad7cab781742b5bf9d0b63510d1c5b25
+  metadata.gz: 85575d21f7b3e1c04d65f9a685e133eeb941e42e8bdffbe5637690be61c09f7e9995d0cc963f1c63a6db035ee3b55c2d7e98218f209f93432ae0575e1c9cd971
+  data.tar.gz: 526f35c3436c164a3df4846a7a3641a5107130b04d8c8f204191c666d9cca1e10de4d6837e9b0dad265bee7eb6a20ac20f458f9e1f3eec9060db13647e83455a

data/README.md

@@ -199,6 +199,10 @@ Slappy.start #=> Start WebSocket connection
 
 ## Release Note
 
+- v0.5.2
+  - Add debug logging
+  - Fix schedule id is not normality
+
 - v0.5.1
   - Fix monitor event disabled
 

data/lib/slappy/client.rb

@@ -1,5 +1,7 @@
 module Slappy
   class Client
+    include Slappy::Debuggable
+
     attr_reader :start_time
 
     def initialize
@@ -17,22 +19,26 @@ module Slappy
         register_event event_name, listeners
       end
       set_signal_trap
+      Debug.log 'Slappy start'
       client.start
     end
 
     def hello(&block)
       @callbacks[:hello] ||= []
       @callbacks[:hello].push block
+      Debug.log "Add hello event(#{@callbacks[:hello].size})"
     end
 
     def hear(pattern, &block)
       @callbacks[:message] ||= []
       @callbacks[:message].push Listener::TextListener.new(pattern, block)
+      Debug.log "Add here event(#{@callbacks[:message].size}): #{pattern}"
     end
 
     def monitor(type, &block)
       @callbacks[type.to_sym] ||= []
       @callbacks[type.to_sym].push Listener::TypeListener.new(type, block)
+      Debug.log "Add monitor event(#{@callbacks[type.to_sym].size}): #{type}"
     end
 
     def say(text, options = {})
@@ -40,9 +46,10 @@ module Slappy
       Messanger.new(options).message
     end
 
-    def schedule(schedule, options = {}, &block)
+    def schedule(pattern, options = {}, &block)
       @schedule ||= Schedule.new
-      @schedule.register schedule, options, &block
+      @schedule.register pattern, options, &block
+      Debug.log "Add schedule event(#{@schedule.list.size}): #{pattern}"
     end
 
     private

data/lib/slappy/concerns/debuggable.rb

@@ -0,0 +1,12 @@
+module Slappy
+  module Debuggable
+    def self.included(klass)
+      mod = Module.new do
+        define_singleton_method :log do |message|
+          Slappy.logger.try(:debug, "[#{klass.name}] #{message}")
+        end
+      end
+      klass.const_set(:Debug, mod)
+    end
+  end
+end

data/lib/slappy/listeners/concerns/listenable.rb

@@ -2,6 +2,7 @@ module Slappy
   module Listener
     module Listenable
       include ActiveSupport::Concern
+      include Slappy::Debuggable
 
       attr_reader :pattern
 
@@ -11,14 +12,26 @@ module Slappy
       end
 
       def call(event)
-        return unless time_valid?(event)
+        Debug.log "Listen event call: #{target_element}:#{event.send(target_element)}"
+
+        unless time_valid?(event)
+          Debug.log 'Event happend in before start time'
+          return
+        end
 
         target = event.send(target_element)
-        return unless target
+        unless target
+          Debug.log 'Target is nil'
+          return
+        end
 
         event.matches = target.match pattern
-        return unless event.matches
+        unless event.matches
+          Debug.log "Target is not match pattern(#{pattern})"
+          return
+        end
 
+        Debug.log "Callback event call: #{pattern}"
         @callback.call(event)
       end
 

data/lib/slappy/schedule.rb

@@ -2,6 +2,8 @@ require 'securerandom'
 
 module Slappy
   class Schedule
+    include Slappy::Debuggable
+
     class OverScheduleError < StandardError; end
     class InvalidFormatError < StandardError; end
 
@@ -9,8 +11,15 @@ module Slappy
 
     def register(schedule, options = {}, &block)
       id = options[:id] || generate_id
-      schedule_list[id] = Thread.new { Chrono::Trigger.new(schedule) { block.call }.run }
-      Slappy.logger.try(:debug, "Schedule registerd to #{schedule}")
+      list[id] = Thread.new do
+        time = Chrono::Iterator.new(schedule).next
+        Debug.log "Schedule #{id} registerd to #{schedule}, first call to #{time}"
+        Chrono::Trigger.new(schedule) do
+          block.call
+          time = Chrono::Iterator.new(schedule).next
+          Debug.log "Schedule #{id} called by #{schedule}, next call to #{time}"
+        end.run
+      end
       id
     end
 
@@ -19,20 +28,21 @@ module Slappy
       if registered
         @schedule_list[id].kill
         @schedule_list.delete id
+        Debug.log "Schedule #{id} deleted"
       end
       registered
     end
 
-    private
-
-    def schedule_list
+    def list
       @schedule_list ||= {}
     end
 
+    private
+
     def generate_id
-      figure = Math.log10(DEFAULT_MAX_THREAD) + 1
-      id = format("%0#{figure}d", SecureRandom.random_number(DEFAULT_MAX_THREAD))
-      id = generate_id if schedule_list.include? id
+      digit = Math.log10(DEFAULT_MAX_THREAD).to_i + 1
+      id = format("%0#{digit}d", SecureRandom.random_number(DEFAULT_MAX_THREAD))
+      id = generate_id if list.include? id
       id
     end
   end

data/lib/slappy/version.rb

@@ -1,3 +1,3 @@
 module Slappy
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/lib/slappy.rb

@@ -1,6 +1,4 @@
 require 'active_support'
-require 'active_support/core_ext'
-require 'active_support/concern'
 require 'chrono'
 require 'forwardable'
 require 'hashie'
@@ -34,6 +32,7 @@ module Slappy
   end
 end
 
+require 'slappy/concerns/debuggable'
 require 'slappy/slack_api/concerns/findable'
 require 'slappy/slack_api/base'
 require 'slappy/slack_api/channel'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slappy
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - wakaba260
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-api
@@ -245,6 +245,7 @@ files:
 - lib/slappy/client.rb
 - lib/slappy/commands/generator.rb
 - lib/slappy/commands/run.rb
+- lib/slappy/concerns/debuggable.rb
 - lib/slappy/configuration.rb
 - lib/slappy/configuration/robot.rb
 - lib/slappy/dsl.rb