em-midori 0.0.7.1 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f7f8a1b850464054976e3121d2af323f7d262d7
-  data.tar.gz: 895e02b6b9d960b27ad632aed6914ceb55325b64
+  metadata.gz: a8ed2aa28d8f33b3189c8580e3710ee0c9082f24
+  data.tar.gz: f72b5ff4d67f06b619776484da4f8581b56c27df
 SHA512:
-  metadata.gz: 7b34dccdc4c7bd99483a7a2848ea95668fd24d1c305f720ad112be9aaa18de0a0f9adb35f097701d049a5f782ef3cfa238164789f2f1b24311e185ad8c446ef7
-  data.tar.gz: fa306bae699e386b308f248151aea2656231c85893daaddc36db3a422375e77c8bfd68a184bdfb0dcafa2e84d88cdef36e966c969d34404e071b1d88c37aaf68
+  metadata.gz: 1de935f59439205ea7d3b909410979fe4feade4d3a38a25541ef9ae79b96d82f99598ff274a942dab10ba627168f81473319d7e0822eb350e1e29be7ae0d9ab9
+  data.tar.gz: 5663cf9ab2ebbe09dd9c0cde0a36becc8cdc9c9f4809a91bb8957283d0a2aa1676fac04be0f1255045b9320655e0c3c31dd2225036aa08d51cab65e4ea8a41d2

data/CONTRIBUTE_CODE_OF_CONDUCT.md

@@ -1,24 +1,41 @@
-# Contributor Code of Conduct
+# Contributor Covenant Code of Conduct
 
-As contributors and maintainers of this project, and in the interest of
-fostering an open and welcoming community, we pledge to respect all people who
-contribute through reporting issues, posting feature requests, updating
-documentation, submitting pull requests or patches, and other activities.
+## Our Pledge
 
-We are committed to making participation in this project a harassment-free
-experience for everyone, regardless of level of experience, gender, gender
-identity and expression, sexual orientation, disability, personal appearance,
-body size, race, ethnicity, age, religion, or nationality.
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing other's private information, such as physical or electronic
-  addresses, without explicit permission
-* Other unethical or unprofessional conduct
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
 
 Project maintainers have the right and responsibility to remove, edit, or
 reject comments, commits, code, wiki edits, issues, and other contributions
@@ -26,24 +43,32 @@ that are not aligned to this Code of Conduct, or to ban temporarily or
 permanently any contributor for other behaviors that they deem inappropriate,
 threatening, offensive, or harmful.
 
-By adopting this Code of Conduct, project maintainers commit themselves to
-fairly and consistently applying these principles to every aspect of managing
-this project. Project maintainers who do not follow or enforce the Code of
-Conduct may be permanently removed from the project team.
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
 
-This code of conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community.
+## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting a project maintainer at delton@heckpsi.com. All
+reported by contacting the project team at dsh0416@gmail.com. All
 complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. Maintainers are
-obligated to maintain confidentiality with regard to the reporter of an
-incident.
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.3.0, available at
-[http://contributor-covenant.org/version/1/3/0/][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
 
 [homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/3/0/
+[version]: http://contributor-covenant.org/version/1/4/

data/lib/em-midori.rb

@@ -1,17 +1,20 @@
 require 'digest/sha1'
 require 'stringio'
 require 'eventmachine'
+require 'fiber'
 
-require 'em-midori/version'
-require 'em-midori/string'
-require 'em-midori/const'
-require 'em-midori/define_class'
-require 'em-midori/error'
-require 'em-midori/clean_room'
-require 'em-midori/em_midori'
-require 'em-midori/request'
-require 'em-midori/response'
-require 'em-midori/api'
-require 'em-midori/route'
-require 'em-midori/server'
-require 'em-midori/websocket'
+require_relative 'em-midori/version'
+require_relative 'em-midori/string'
+require_relative 'em-midori/promise'
+require_relative 'em-midori/const'
+require_relative 'em-midori/define_class'
+require_relative 'em-midori/error'
+require_relative 'em-midori/clean_room'
+require_relative 'em-midori/em_midori'
+require_relative 'em-midori/request'
+require_relative 'em-midori/response'
+require_relative 'em-midori/api'
+require_relative 'em-midori/route'
+require_relative 'em-midori/server'
+require_relative 'em-midori/websocket'
+require_relative 'em-midori/eventsource'

data/lib/em-midori/api.rb

@@ -191,6 +191,14 @@ class Midori::API
                                                     }, '')
           result = -> { clean_room.instance_exec(connection.websocket, *matched, &route.function) }.call
           return Midori::Response.new
+        elsif request.eventsource?
+          connection.send_data Midori::Response.new(200, {
+                                                      'Content-Type' => 'text-event-stream',
+                                                      'Cache-Control' => 'no-cache',
+                                                      'Connection' => 'keep-alive'
+          }, '')
+          result = -> { clean_room.instance_exec(connection.eventsource, *matched, &route.function) }.call
+          return Midori::Response.new
         else
           result = -> { clean_room.instance_exec(*matched, &route.function) }.call
         end

data/lib/em-midori/error.rb

@@ -5,4 +5,5 @@ module Midori::Error
   class NotMasked < StandardError; end
   class FrameEnd < StandardError; end
   class PingPongSizeTooLarge < StandardError; end
+  class EventSourceTypeError < StandardError; end
 end

data/lib/em-midori/eventsource.rb

@@ -0,0 +1,13 @@
+class Midori::EventSource
+  attr_accessor :connection
+
+  def initialize(connection)
+    @connection = connection
+  end
+
+  def send(data)
+    raise Midori::Error::EventSourceTypeError unless data.is_a?String
+    @connection.send_data(data.split("\n").map {|str| "data: #{str}\n"}.join + "\n")
+    @connection.close_connection_after_writing
+  end
+end

data/lib/em-midori/promise.rb

@@ -0,0 +1,30 @@
+# Referenced from {Qiita}[http://qiita.com/south37/items/99a60345b22ef395d424]
+class Promise
+  def initialize(callback)
+    @callback = callback
+  end
+
+  def then(resolve = ->() {}, reject = ->() {})
+    @callback.call(resolve, reject)
+  end
+end
+
+def async_internal(fiber)
+  chain = ->(result) {
+    return if result.class != Promise
+    result.then(->(val) {
+        chain.call(fiber.resume(val))
+    })
+  }
+  chain.call(fiber.resume)
+end
+
+def async(method_name, &block)
+  define_singleton_method method_name, ->(*args) {
+    async_internal(Fiber.new {block.call(*args)})
+  }
+end
+
+def await(promise)
+  Fiber.yield promise
+end

data/lib/em-midori/server.rb

@@ -1,24 +1,27 @@
 module Midori::Server
-  attr_accessor :request, :api, :websocket
+  attr_accessor :request, :api, :websocket, :eventsource
 
   def initialize(api)
     @api = api
     @request = Midori::Request.new
     @websocket = Midori::WebSocket.new(self)
+    @eventsource = Midori::EventSource.new(self)
   end
 
   def receive_data(data)
-    start_time = Time.now
-    data = StringIO.new(data)
-    port, ip = Socket.unpack_sockaddr_in(get_peername)
-    @request.ip = ip
-    @request.port = port
-    if @request.parsed?
-      websocket_request(data)
-    else
-      receive_new_request(data)
-    end
-    puts "#{@request.ip} - - [#{Time.now.inspect}] \"#{@request.method} #{@request.path} #{@request.protocol}\" #{@response.status} #{(Time.now.to_f - start_time.to_f).round(5)}".green
+    ->() {async_internal(Fiber.new do
+      start_time = Time.now
+      data = StringIO.new(data)
+      port, ip = Socket.unpack_sockaddr_in(get_peername)
+      @request.ip = ip
+      @request.port = port
+      if @request.parsed?
+        websocket_request(data)
+      else
+        receive_new_request(data)
+      end
+      puts "#{@request.ip} - - [#{Time.now.inspect}] \"#{@request.method} #{@request.path} #{@request.protocol}\" #{@response.status} #{(Time.now.to_f - start_time.to_f).round(5)}".green
+    end)}.call
   end
 
   def receive_new_request(data)

data/lib/em-midori/version.rb

@@ -1,3 +1,3 @@
 module Midori
-  VERSION = '0.0.7.1'.freeze
+  VERSION = '0.0.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-midori
 version: !ruby/object:Gem::Version
-  version: 0.0.7.1
+  version: 0.0.8
 platform: ruby
 authors:
 - HeckPsi Lab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -51,6 +51,8 @@ files:
 - lib/em-midori/define_class.rb
 - lib/em-midori/em_midori.rb
 - lib/em-midori/error.rb
+- lib/em-midori/eventsource.rb
+- lib/em-midori/promise.rb
 - lib/em-midori/request.rb
 - lib/em-midori/response.rb
 - lib/em-midori/route.rb
@@ -58,6 +60,7 @@ files:
 - lib/em-midori/string.rb
 - lib/em-midori/version.rb
 - lib/em-midori/websocket.rb
+- logo.png
 homepage: https://github.com/heckpsi-lab/em-midori
 licenses:
 - MIT