pluggaloid 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 22d2fff547e70f4cbdd07e07df3c632a6675e63b
-  data.tar.gz: 2716bfd1298173ec228fb7b6abe0bca74a4ff27e
+SHA256:
+  metadata.gz: c2e0d7c80c5e6e013d8adfd22d6e242fb15bd00e1df0b1667443132c4307e846
+  data.tar.gz: 647c05b3f6e5083798ec8d90852dc16c6f29ff539f110b317340eaee50b01a25
 SHA512:
-  metadata.gz: a6ac01165703f2d295e3607ab7c0ead1647336d5f7f419f2aebdb9454f491a464a42d72ef4ae6bae9072737b733258b2abd62f8529114575797509b2cca0c890
-  data.tar.gz: 6b496c9548ffc9e1c5dbb601a7de3b43fcacca41ad76d0660d4fd4b21c02890db2ff90549e3971bd862563cd9039418201fe690abdc6405883d1ba64272a65a9
+  metadata.gz: 5a629bf91f585251405c72a7e561f9de3275d4d20fd3bfad2cfc511c1c1acd47f17d365cc3a51b7417e20310d846f1fbeb7d0253aa6a61a648af5a81959a7826
+  data.tar.gz: d890f710693d94ba7564f1744e51fd18b83e00b4c4597085e254b6da302d7eaa1c6db53ef2129aab6f981c68c295aa5e8b4521099ff78e6e006b87dea50ab2cb

data/lib/pluggaloid/event.rb

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 
 class Pluggaloid::Event
+  Lock = Mutex.new
+
   include InstanceStorage
 
   # オプション。以下のキーを持つHash
@@ -14,8 +16,9 @@ class Pluggaloid::Event
   def initialize(*args)
     super
     @options = {}
-    @listeners = []
-    @filters = [] end
+    @listeners = [].freeze
+    @filters = [].freeze
+  end
 
   def vm
     self.class.vm end
@@ -60,15 +63,25 @@ class Pluggaloid::Event
 
   def add_listener(listener)
     unless listener.is_a? Pluggaloid::Listener
-      raise Pluggaloid::ArgumentError, "First argument must be Pluggaloid::Listener, but given #{listener.class}." end
-    if @listeners.map(&:slug).include?(listener.slug)
-      raise Pluggaloid::DuplicateListenerSlugError, "Listener slug #{listener.slug} already exists." end
-    @listeners << listener
-    self end
+      raise Pluggaloid::ArgumentError, "First argument must be Pluggaloid::Listener, but given #{listener.class}."
+    end
+    Lock.synchronize do
+      if @listeners.map(&:slug).include?(listener.slug)
+        raise Pluggaloid::DuplicateListenerSlugError, "Listener slug #{listener.slug} already exists."
+      end
+      @listeners = [*@listeners, listener].freeze
+    end
+    self
+  end
 
-  def delete_listener(event_filter)
-    @listeners.delete(event_filter)
-    self end
+  def delete_listener(listener)
+    Lock.synchronize do
+      @listeners = @listeners.dup
+      @listeners.delete(listener)
+      @listeners.freeze
+    end
+    self
+  end
 
   # イベントフィルタを追加する
   # ==== Args
@@ -78,8 +91,9 @@ class Pluggaloid::Event
   def add_filter(event_filter)
     unless event_filter.is_a? Pluggaloid::Filter
       raise Pluggaloid::ArgumentError, "First argument must be Pluggaloid::Filter, but given #{event_filter.class}." end
-    @filters << event_filter
-    self end
+    @filters = [*@filters, event_filter].freeze
+    self
+  end
 
   # イベントフィルタを削除する
   # ==== Args
@@ -87,14 +101,22 @@ class Pluggaloid::Event
   # ==== Return
   # self
   def delete_filter(event_filter)
-    @filters.delete(event_filter)
-    self end
+    Lock.synchronize do
+      @filters = @filters.dup
+      @filters.delete(event_filter)
+      @filters.freeze
+    end
+    self
+  end
 
   private
   def call_all_listeners(args)
     catch(:plugin_exit) do
       @listeners.each do |listener|
-        listener.call(*args) end end end
+        listener.call(*args)
+      end
+    end
+  end
 
   class << self
     attr_accessor :filter_another_thread, :vm

data/lib/pluggaloid/filter.rb

@@ -1,12 +1,17 @@
 # -*- coding: utf-8 -*-
 
 class Pluggaloid::Filter < Pluggaloid::Handler
+  NotConverted = Class.new
+  THROUGH = NotConverted.new.freeze
+
   # フィルタ内部で使う。フィルタの実行をキャンセルする。Plugin#filtering はfalseを返し、
   # イベントのフィルタの場合は、そのイベントの実行自体をキャンセルする。
   # また、 _result_ が渡された場合、Event#filtering の戻り値は _result_ になる。
   def self.cancel!(result=false)
     throw :filter_exit, result end
 
+  CANCEL_PROC = method(:cancel!)
+
   # ==== Args
   # [event] 監視するEventのインスタンス
   # [name:] 名前(String | nil)
@@ -15,7 +20,7 @@ class Pluggaloid::Filter < Pluggaloid::Handler
   # [&callback] コールバック
   def initialize(event, **kwrest, &callback)
     super
-    @callback = Proc.new
+    @callback = callback
     event.add_filter self end
 
   # イベントを実行する
@@ -25,10 +30,16 @@ class Pluggaloid::Filter < Pluggaloid::Handler
   # 加工後の引数の配列
   def filtering(*args)
     length = args.size
-    result = @callback.call(*args, &self.class.method(:cancel!))
-    if length != result.size
-      raise Pluggaloid::FilterError, "filter changes arguments length (#{length} to #{result.size})" end
-    result end
+    result = @callback.call(*args, &CANCEL_PROC)
+    case
+    when THROUGH == result
+      args
+    when length != result.size
+      raise Pluggaloid::FilterError, "filter changes arguments length (#{length} to #{result.size})"
+    else
+      result
+    end
+  end
 
   # このリスナを削除する
   # ==== Return

data/lib/pluggaloid/handler_tag.rb

@@ -48,12 +48,12 @@ class Pluggaloid::HandlerTag < Pluggaloid::Identity
   # このTagがついている Pluggaloid::Listener と Pluggaloid::Filter を全て列挙する
   # ==== Return
   # Enumerable
-  def each
-    if block_given?
+  def each(&block)
+    if block
       Enumerator.new do |y|
         listeners{|x| y << x }
         filters{|x| y << x }
-      end.each(&Proc.new)
+      end.each(&block)
     else
       Enumerator.new do |y|
         listeners{|x| y << x }
@@ -65,9 +65,9 @@ class Pluggaloid::HandlerTag < Pluggaloid::Identity
   # このTagがついている Pluggaloid::Listener を全て列挙する
   # ==== Return
   # Enumerable
-  def listeners
-    if block_given?
-      listeners.each(&Proc.new)
+  def listeners(&block)
+    if block
+      listeners.each(&block)
     else
       @plugin.to_enum(:listeners).lazy.select{|l| l.tags.include?(self) }
     end
@@ -76,9 +76,9 @@ class Pluggaloid::HandlerTag < Pluggaloid::Identity
   # このTagがついている Pluggaloid::Filter を全て列挙する
   # ==== Return
   # Enumerable
-  def filters
-    if block_given?
-      filters.each(&Proc.new)
+  def filters(&block)
+    if block
+      filters.each(&block)
     else
       @plugin.to_enum(:filters).lazy.select{|l| l.tags.include?(self) }
     end

data/lib/pluggaloid/listener.rb

@@ -15,7 +15,7 @@ class Pluggaloid::Listener < Pluggaloid::Handler
   # [&callback] コールバック
   def initialize(event, **kwrest, &callback)
     super
-    @callback = Proc.new
+    @callback = callback
     event.add_listener(self) end
 
   # イベントを実行する

data/lib/pluggaloid/plugin.rb

@@ -134,7 +134,7 @@ module Pluggaloid
     # [name] タグ名
     # ==== Return
     # Pluggaloid::HandlerTag
-    def handler_tag(slug=SecureRandom.uuid, name=slug)
+    def handler_tag(slug=SecureRandom.uuid, name=slug, &block)
       tag = case slug
             when String, Symbol
               vm.HandlerTag.new(slug: slug.to_sym, name: name.to_s, plugin: self)
@@ -143,9 +143,9 @@ module Pluggaloid
             else
               raise Pluggaloid::TypeError, "Argument `slug' must be instance of Symbol, String or Pluggaloid::HandlerTag, but given #{slug.class}."
             end
-      if block_given?
+      if block
         handlers = @events + @filters
-        yield tag
+        block.(tag)
         (@events + @filters - handlers).each do |handler|
           handler.add_tag(tag)
         end
@@ -157,9 +157,9 @@ module Pluggaloid
     # イベントリスナを列挙する
     # ==== Return
     # Set of Pluggaloid::Listener
-    def listeners
-      if block_given?
-        @events.each(&Proc.new)
+    def listeners(&block)
+      if block
+        @events.each(&block)
       else
         @events.dup
       end
@@ -168,9 +168,9 @@ module Pluggaloid
     # フィルタを列挙する
     # ==== Return
     # Set of Pluggaloid::Filter
-    def filters
-      if block_given?
-        @filters.each(&Proc.new)
+    def filters(&block)
+      if block
+        @filters.each(&block)
       else
         @filters.dup
       end
@@ -232,8 +232,7 @@ module Pluggaloid
       self end
 
     # プラグインが Plugin.uninstall される時に呼ばれるブロックを登録する。
-    def onunload
-      callback = Proc.new
+    def onunload(&callback)
       add_event(:unload) do |plugin_slug|
         if plugin_slug == self.name
           callback.call
@@ -246,15 +245,16 @@ module Pluggaloid
     # on_?name :: add_event(name)
     # filter_?name :: add_event_filter(name)
     def method_missing(method, *args, **kwrest, &proc)
-      case method.to_s
-      when /\Aon_?(.+)\Z/
-        add_event($1.to_sym, *args, **kwrest, &proc)
-      when /\Afilter_?(.+)\Z/
-        add_event_filter($1.to_sym, **kwrest, &proc)
-      when /\Ahook_?(.+)\Z/
-        add_event_hook($1.to_sym, &proc)
-      else
-        super end end
+      method_name = method.to_s
+      case
+      when method_name.start_with?('on')
+        event_name = method_name[(method_name[2] == '_' ? 3 : 2)..method_name.size]
+        add_event(event_name.to_sym, *args, **kwrest, &proc)
+      when method_name.start_with?('filter')
+        event_name = method_name[(method_name[6] == '_' ? 7 : 6)..method_name.size]
+        add_event_filter(event_name.to_sym, **kwrest, &proc)
+      end
+    end
 
     private
 

data/lib/pluggaloid/version.rb

@@ -1,3 +1,3 @@
 module Pluggaloid
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/pluggaloid.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["toshi.alternative@gmail.com"]
   spec.summary       = %q{Extensible plugin system}
   spec.description   = %q{Pluggaloid is extensible plugin system for mikutter.}
-  spec.homepage      = ""
+  spec.homepage      = "https://rubygems.org/gems/pluggaloid"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/test/helper.rb

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
 module PluggaloidTestHelper
-  def eval_all_events(delayer=Delayer)
+  def eval_all_events(delayer=Delayer, &block)
     native = Thread.list
-    yield if block_given?
+    block.() if block
     delayer.run while not(delayer.empty? and (Thread.list - native).empty?)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluggaloid
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Toshiaki Asai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-09 00:00:00.000000000 Z
+date: 2019-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delayer
@@ -113,7 +113,7 @@ files:
 - test/helper.rb
 - test/multi_vm_test.rb
 - test/plugin_test.rb
-homepage: ''
+homepage: https://rubygems.org/gems/pluggaloid
 licenses:
 - MIT
 metadata: {}
@@ -132,8 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Extensible plugin system