svent 0.1.0 → 0.2.0

data/.travis.yml

@@ -0,0 +1,23 @@
+sudo: false
+language: ruby
+cache: bundler
+before_install: gem update bundler
+addons:
+    code_climate:
+        repo_token: 6896a20297dac7ea23f4786a3e91357ed5714984a14662892389722c3aeaf085
+matrix:
+  include:
+    - rvm: 2.1.0
+    - rvm: 2.1.10
+    - rvm: 2.2.5
+    - rvm: 2.3.1
+    - rvm: ruby-head
+    - rvm: jruby-9.1.5.0
+      env: JRUBY_OPTS='--debug' # get more accurate coverage data
+    - rvm: rbx-3
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-9.1.5.0
+    - rvm: rbx-3
+  fast_finish: true
+script: bundle exec rake

data/Gemfile

@@ -2,3 +2,10 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in svent.gemspec
 gemspec
+
+group :test do
+  gem 'rails'
+  gem 'rubocop'
+  gem 'simplecov'
+  gem 'codeclimate-test-reporter'
+end

data/README.md

@@ -1,4 +1,7 @@
 # Svent
+[![Gem Version](https://badge.fury.io/rb/svent.svg)](http://badge.fury.io/rb/svent)
+[![Build Status](https://travis-ci.org/molingyu/svent.svg?branch=master)](https://travis-ci.org/molingyu/svent)
+[![Code Climate](https://codeclimate.com/github/molingyu/svent/badges/gpa.svg)](https://codeclimate.com/github/molingyu/svent)
 
 Svent is an async event framework implemented with Fiber.Used for game or GUI event handling.
 
@@ -52,7 +55,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/svent. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/molingyu/svent. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License

data/Rakefile

@@ -1,2 +1,17 @@
-require "bundler/gem_tasks"
-task :default => :spec
+require 'bundler/gem_tasks'
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList["spec/*_spec.rb"]
+end
+
+begin
+  require 'rubocop/rake_task'
+  RuboCop::RakeTask.new
+rescue LoadError
+  task :rubocop do
+    $stderr.puts 'Rubocop is disabled'
+  end
+end
+
+task default: [:spec, :rubocop]

data/lib/svent.rb

@@ -1,11 +1,17 @@
+module Svent
+
+  DEBUG = false
+
+end
+
 require_relative "svent/version"
-require_relative 'svent/event'
-require_relative 'svent/event_callback_fiber'
 require_relative 'svent/event_manger'
 
 module Svent
 
   def self.run(event_manger = EventManger.new, &block)
+    $log = open('debug.log', 'w') if DEBUG
+    @stop = false
     @event_manger = event_manger
     block[@event_manger] if block
     @event_manger.update until @stop

data/lib/svent/event.rb

@@ -5,19 +5,19 @@ module Svent
 
   class Event
     extend Forwardable
-    def_delegators :@list, :delete, :each, :push, :length, :[]=
+    def_delegators :@list, :delete, :each, :push, :length, :[]=, :[]
 
     attr_reader :name
-    attr_reader :type
+    attr_reader :info
 
-    def initialize(name, type)
+    def initialize(name, info)
       @list = []
       @name = name
-      @type = type
+      @info = info
     end
 
     def reverse
-      event = Event.new(@name, @type)
+      event = Event.new(@name, @info)
       event.instance_variable_set(:@list, @list.reverse)
       event
     end

data/lib/svent/event_callback_fiber.rb

@@ -9,14 +9,15 @@ module Svent
     attr_reader :info
     attr_reader :callback
 
-    def initialize(event_manger, name, callback, info)
+    def initialize(helper, name, callback, info)
       @name = name
       @info = info
       @callback = callback
       @fiber = Fiber.new do
-        @callback.call(event_manger, info)
+        @callback.call(helper, info)
         @fiber = nil
       end
+      # self.resume
       @return = nil
     end
 

data/lib/svent/event_manger.rb

@@ -1,34 +1,143 @@
 # encoding:utf-8
+require_relative 'event'
+require_relative 'event_callback_fiber'
 
 module Svent
 
   class EventManger
 
+    module Helper
+      class << self
+
+        attr_writer :this
+
+        def init(events, callback_fibers)
+          @this = nil
+          @events = events
+          @callback_fibers = callback_fibers
+          @timers = {}
+          @counters = {}
+          @timer_filters = {}
+          @counter_filters = {}
+        end
+
+        def after_delete
+          @events[@this.name].delete(@this.callback)
+        end
+
+        def delete
+          after_delete
+          Fiber.yield true
+        end
+
+        def ok?(info = nil, &block)
+          Kernel.loop do
+            break if block.call(info)
+            Fiber.yield
+          end
+        end
+
+        def loop(condition, info = nil, &block)
+          Kernel.loop do
+            break if condition.call
+            block.call(info)
+            Fiber.yield
+          end
+        end
+
+        def filter(&block)
+          Fiber.yield true unless block.call
+        end
+
+        def wait(value)
+          timer = @timers[@this.object_id]
+          timer = Time.now unless timer
+          loop do
+            break @timers.delete(@this.object_id) unless Time.now - timer < value
+            Fiber.yield
+          end
+        end
+
+        def times(value)
+          counter = @counters[@this.object_id]
+          counter ? @counters[@this.object_id] += 1 : @counters[@this.object_id] = 1
+          loop do
+            break @counters.delete(@this.object_id) if counter > value
+            Fiber.yield
+          end
+        end
+
+        def wait_filter(value)
+          timer_filter = @timer_filters[@this.object_id]
+          return timer_filter = Time.now unless timer_filter
+          loop do
+            break @timer_filters.delete(@this.object_id) unless Time.now - timer_filter < value
+            Fiber.yield true
+          end
+        end
+
+        def times_filter(value)
+          counter_filter = @counter_filters[@this.object_id]
+          counter_filter ? @counter_filters[@this.object_id] += 1 : (return @counter_filters[@this.object_id] = 1)
+          loop do
+            break @counter_filters.delete(@this.object_id) if @counter_filters[object_id] > value
+            Fiber.yield true
+          end
+        end
+
+      end
+    end
+
     attr_reader :events
-    attr_reader :this
-    attr_reader :timers
-    attr_reader :counters
-    attr_reader :timer_filters
-    attr_reader :counter_filters
 
     def initialize
       @events = {}
-      @this = nil
       @event_callback_fibers = []
-      @timers = {}
-      @counters = {}
-      @timer_filters = {}
-      @counter_filters = {}
+      @next_callback_fibers = []
+      Helper.init(@events, @event_callback_fibers)
+    end
+
+    def stop
+      trigger(:event_manger_stop)
+      trigger(:event_manger_stop?)
+    end
+
+    def stop?
+      @next_callback_fibers == [] && @event_callback_fibers == []
+    end
+
+    if Svent::DEBUG
+      def debug_arr
+        arr = []
+        next_arr = []
+        @event_callback_fibers.each{|o| arr.push [o.name, o.object_id] }
+        @next_callback_fibers.each{|o| next_arr.push [o.name, o.object_id] }
+        {callback: arr, next: next_arr}
+      end
+
+      def logger(*arg)
+        str = ''
+        arg.each{ |s| str += "#{s}, " }
+        $log.write "#{str[0, str.size - 2]}\n"
+      end
     end
 
     def update
+      logger '='*4+'update' if Svent::DEBUG
       if @event_callback_fibers != []
-        @event_callback_fibers.each do |obj|
-          next @event_callback_fibers.delete(obj) unless obj.alive?
-          @this = obj
+        @next_callback_fibers = []
+        loop do
+          obj = @event_callback_fibers.pop
+          break unless obj
+          logger "==fiber-#{obj.name}(#{obj.object_id}) call:" if Svent::DEBUG
+          logger'before:', debug_arr, @event_callback_fibers.size if Svent::DEBUG
+          Helper.this = obj
           obj.resume
-          @this = nil
+          Helper.this = nil
+          logger'after:', debug_arr, @event_callback_fibers.size if Svent::DEBUG
+          @next_callback_fibers.push obj if obj.alive?
         end
+        @event_callback_fibers = @next_callback_fibers
       end
     end
 
@@ -40,83 +149,32 @@ module Svent
       end
       name = name.to_sym if name.class == String
       event = @events[name]
-      event.each{ |callback| @event_callback_fibers.push(EventCallbackFiber.new(self, name, callback, info)) } if event
+      event.each{ |callback| @event_callback_fibers.push(EventCallbackFiber.new(Helper, name, callback, info)) } if event
+      logger 'trigger:', name, debug_arr, @event_callback_fibers.size if Svent::DEBUG
     end
 
-    def on(name, type = nil, index = nil, &callback)
+    def on(name, info = nil, index = nil, &callback)
       name = name.to_sym if name.class == String
       if name == :event_manger_stop?
         raise 'error:The event(:event_manger_stop?) can only have one callback.' if @events.include?(:event_manger_stop?)
       end
-      event = @events[name] ||= Event.new(name, type)
+      event = @events[name] ||= Event.new(name, info)
       index = event.length unless index
       event[index] = callback
     end
 
-    def stop
-      trigger(:event_manger_stop)
-      trigger(:event_manger_stop?)
-    end
-
-    def stop?
-      @event_callback_fibers.size == 1 && @event_callback_fibers.last.name == :event_manger_stop?
-    end
-
-    def delete
-      @events[@this.name].delete(@this.callback)
+    def event(name, info)
+      @events[name] ? @events[name].info = info : Event.new(name, info)
     end
 
-    def delete_after
-      delete
-      Fiber.yield true
+    def event_info(name, key, value)
+      event = @events[name] ||= Event.new(name, info)
+      event.info[key] = value
     end
 
-    def ok?(&block)
-      loop do
-        break if block.call
-        Fiber.yield
-      end
-    end
-
-    def filter(&block)
-      Fiber.yield true unless block.call
-    end
-
-    def wait(value)
-      timer = @timers[@this.object_id]
-      timer = Time.now unless timer
-      loop do
-        break @timers.delete(@this.object_id) unless Time.now - timer < value
-        Fiber.yield
-      end
-    end
-
-    def times(value)
-      counter = @counters[@this.object_id]
-      counter ? counter += 1 : counter = 1
-      loop do
-        break @counters.delete(@this.object_id) if counter > value
-        Fiber.yield
-      end
-    end
-
-    def wait_filter(value)
-      timer_filter = @timer_filters[@this.object_id]
-      return timer_filter = Time.now unless timer_filter
-      loop do
-        break @timer_filters.delete(@this.object_id) unless Time.now - timer_filter < value
-        Fiber.yield true
-      end
-    end
-
-    def times_filter(value)
-      object_id =
-      counter_filter = @counter_filters[@this.object_id]
-      counter_filter ? counter_filter += 1 : (return counter_filter = 1)
-      loop do
-        break @counter_filters.delete(@this.object_id) if @counter_filters[object_id] > value
-        Fiber.yield true
-      end
+    def have(name)
+      @events.each { |event| return true if event.name == name }
+      false
     end
 
   end

data/lib/svent/version.rb

@@ -1,3 +1,3 @@
 module Svent
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/svent.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
+
 end

data/test.rb

@@ -0,0 +1,30 @@
+require_relative 'lib/svent'
+
+Svent.run do |em|
+
+  em.on(:exit) do |_, info|
+    puts 'bye!'
+    info[:exit] = true
+    Svent.stop
+  end
+
+  em.on(:hello) do
+    puts 'world!'
+  end
+
+  em.on(:input) do |_, info|
+    input = info.input.chop
+    p "help!#{info.input}"
+    em.trigger(:exit, info) if input == 'exit'
+    em.trigger(:hello, info) if input == 'hello'
+  end
+
+  em.on(:run) do |helper, info|
+    helper.loop(lambda{ info.exit }) do
+      print info.code
+      info[:input] = gets
+      em.trigger(:input, info)
+    end
+  end
+  em.trigger(:run, {code: 'StartScene>', exit: false})
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svent
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - molingyu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2016-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,6 +46,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
+- ".rubocop.yml"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -59,6 +62,7 @@ files:
 - lib/svent/event_manger.rb
 - lib/svent/version.rb
 - svent.gemspec
+- test.rb
 homepage: https://github.com/molingyu/svent
 licenses:
 - MIT