pubsubstub 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38d41c098792d6b1b14c0a9dddab5dc0bf01eea0
-  data.tar.gz: 5bdef86b12597f01c1e88e812c5dd2bb111f221c
+  metadata.gz: dfd7d496f0e2ce3d0a48c9bc7a88a96b53d14150
+  data.tar.gz: c4849cbfb57dc5f9415edd74beb2737592d35921
 SHA512:
-  metadata.gz: b03ff4a5d49874b7b411bb11544cf55aefcbd01f8f0a756eddb881a87417db0c68efd0ee784fa6f482cdf795556df83092e4ca2141f44b9365a066816d3abf67
-  data.tar.gz: 668ed2d0fc55ce0500da60ffefe9c28067ffaf5c631d9bef95ed0461ca9696770cef4c63f21a08e54f166ec073e3788f93506c523756c6601171c0b9db6eaed9
+  metadata.gz: b6a1b5013dbaef4a34fc7486f9f8095818d599a1083d0361c9e57a9b51698d92048eff0d524d924b6a9826e401583ba572a04c477ba2919c57812d34d02c1212
+  data.tar.gz: 818686cfa16835e0a430c830b4af65fc61820217bc08da80cd9b3128f69f2fa4d8e6828424dcc7b9aa2f2305f34b833744e83cf8e75e193a11587579ee1cecb4

data/.travis.yml

@@ -2,8 +2,8 @@ language: ruby
 rvm:
   - 2.2.2
 gemfile:
-  - gemfiles/Gemfile.sinatra-1.x
-  - gemfiles/Gemfile.sinatra-2.x
+  - gemfiles/Gemfile.rack-1.x
+  - gemfiles/Gemfile.rack-2.x
 services:
   - redis-server
 

data/Gemfile

@@ -3,11 +3,10 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in pubsubstub.gemspec
 gemspec
 
-gem 'sinatra', github: 'sinatra/sinatra', ref: 'a5da6fa82c46436f59ae482d07c1752ab908c852'
 gem "rspec", "3.1.0"
 gem "pry-byebug"
 gem "puma", "~> 3.4"
 gem "thin", "~> 1.6"
 gem "rack-test"
 gem "timecop"
-gem "rake", "~> 10.0"
+gem "rake", "~> 10.0"

data/example/config.ru

@@ -1,4 +1,3 @@
-p File.expand_path('../lib', __dir__)
 $LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
 require 'pubsubstub'
 

data/gemfiles/{Gemfile.sinatra-1.x → Gemfile.rack-1.x}

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'sinatra', '< 2'
+gem 'rack', '< 2'
 gem 'redis', '~> 3.0'
 gem "rspec", "3.1.0"
 gem "pry-byebug"

data/gemfiles/{Gemfile.sinatra-1.x.lock → Gemfile.rack-1.x.lock}

@@ -3,7 +3,7 @@ GEM
   specs:
     byebug (9.0.5)
     coderay (1.1.1)
-    daemons (1.2.3)
+    daemons (1.2.4)
     diff-lcs (1.2.5)
     eventmachine (1.2.0.1)
     method_source (0.8.2)
@@ -14,10 +14,8 @@ GEM
     pry-byebug (3.4.0)
       byebug (~> 9.0)
       pry (~> 0.10)
-    puma (3.5.0)
+    puma (3.6.0)
     rack (1.6.4)
-    rack-protection (1.5.3)
-      rack
     rack-test (0.6.3)
       rack (>= 1.0)
     rake (10.5.0)
@@ -34,16 +32,11 @@ GEM
     rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
-    sinatra (1.4.7)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
     slop (3.6.0)
     thin (1.7.0)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    tilt (2.0.5)
     timecop (0.8.1)
 
 PLATFORMS
@@ -52,11 +45,11 @@ PLATFORMS
 DEPENDENCIES
   pry-byebug
   puma (~> 3.4)
+  rack (< 2)
   rack-test
   rake (~> 10.0)
   redis (~> 3.0)
   rspec (= 3.1.0)
-  sinatra (< 2)
   thin (~> 1.6)
   timecop
 

data/gemfiles/{Gemfile.sinatra-2.x → Gemfile.rack-2.x}

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'sinatra', github: 'sinatra/sinatra', ref: 'a5da6fa82c46436f59ae482d07c1752ab908c852'
+gem 'rack', '~> 2.0'
 gem 'redis', '~> 3.0'
 gem "rspec", "3.1.0"
 gem "pry-byebug"

data/gemfiles/{Gemfile.sinatra-2.x.lock → Gemfile.rack-2.x.lock}

@@ -1,25 +1,12 @@
-GIT
-  remote: git://github.com/sinatra/sinatra.git
-  revision: a5da6fa82c46436f59ae482d07c1752ab908c852
-  ref: a5da6fa82c46436f59ae482d07c1752ab908c852
-  specs:
-    sinatra (2.0.0.pre.alpha)
-      mustermann (~> 0.4)
-      rack (~> 2.0)
-      rack-protection (~> 1.5)
-      tilt (~> 2.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
     byebug (9.0.5)
     coderay (1.1.1)
-    daemons (1.2.3)
+    daemons (1.2.4)
     diff-lcs (1.2.5)
     eventmachine (1.2.0.1)
     method_source (0.8.2)
-    mustermann (0.4.0)
-      tool (~> 0.2)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -27,10 +14,8 @@ GEM
     pry-byebug (3.4.0)
       byebug (~> 9.0)
       pry (~> 0.10)
-    puma (3.5.0)
+    puma (3.6.0)
     rack (2.0.1)
-    rack-protection (1.5.3)
-      rack
     rack-test (0.6.3)
       rack (>= 1.0)
     rake (10.5.0)
@@ -52,9 +37,7 @@ GEM
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    tilt (2.0.5)
     timecop (0.8.1)
-    tool (0.2.3)
 
 PLATFORMS
   ruby
@@ -62,11 +45,11 @@ PLATFORMS
 DEPENDENCIES
   pry-byebug
   puma (~> 3.4)
+  rack (~> 2.0)
   rack-test
   rake (~> 10.0)
   redis (~> 3.0)
   rspec (= 3.1.0)
-  sinatra!
   thin (~> 1.6)
   timecop
 

data/lib/pubsubstub/application.rb

@@ -1,6 +1,22 @@
 module Pubsubstub
-  class Application < Sinatra::Base
-    use PublishAction
-    use StreamAction
+  class Application
+    def initialize(*)
+      @publish = PublishAction.new
+      @stream = StreamAction.new
+    end
+
+    def self.call(env)
+      @instance ||= new
+      @instance.call(env)
+    end
+
+    def call(env)
+      request = Rack::Request.new(env)
+      if request.get?
+        @stream.call(env)
+      else
+        @publish.call(env)
+      end
+    end
   end
 end

data/lib/pubsubstub/publish_action.rb

@@ -1,10 +1,14 @@
 module Pubsubstub
-  class PublishAction < Pubsubstub::Action
-    post '/' do
-      (params[:channels] || [:default]).each do |channel_name|
-        Pubsubstub.publish(channel_name, params[:data], name: params[:event])
+  class PublishAction
+    def initialize(*)
+    end
+
+    def call(env)
+      request = Rack::Request.new(env)
+      channels = (request.params['channels'] || [:default]).each do |channel_name|
+        Pubsubstub.publish(channel_name, request.params['data'], name: request.params['event'])
       end
-      ""
+      [200, {}, ['']]
     end
   end
 end

data/lib/pubsubstub/stream.rb

@@ -0,0 +1,25 @@
+class Stream
+  def initialize(&callback)
+    @callback = callback
+    @closed = false
+  end
+
+  def close
+    @closed = true
+  end
+
+  def each(&front)
+    @front = front
+    @callback.call(self)
+    close
+  end
+
+  def <<(data)
+    @front.call(data.to_s)
+    self
+  end
+
+  def closed?
+    @closed
+  end
+end

data/lib/pubsubstub/stream_action.rb

@@ -1,44 +1,39 @@
 module Pubsubstub
-  class StreamAction < Pubsubstub::Action
+  class StreamAction
+    HEADERS = {
+      'Content-Type' => 'text/event-stream',
+      'Cache-Control' => 'no-cache',
+      'X-Accel-Buffering' => 'no',
+      'Connection' => 'keep-alive',
+    }.freeze
     include Logging
 
     def initialize(*)
-      super
       @subscriptions = Set.new
       @mutex = Mutex.new
     end
 
-    get '/', provides: 'text/event-stream' do
-      status(200)
-      headers({
-        'Cache-Control' => 'no-cache',
-        'X-Accel-Buffering' => 'no',
-        'Connection' => 'keep-alive',
-      })
+    def call(env)
+      spawn_helper_threads
+      last_event_id = env['HTTP_LAST_EVENT_ID']
+      request = Rack::Request.new(env)
+      channels = (request.params['channels'] || [:default]).map(&Channel.method(:new))
 
-      if event_machine?
-        send_scrollback
+      stream = if event_machine?
+        send_scrollback(channels, last_event_id)
       else
-        subscribe_connection
+        subscribe_connection(channels, last_event_id)
       end
-    end
-
-    def call(*)
-      spawn_helper_threads
-      super
+      [200, HEADERS, stream]
     end
 
     private
 
-    def last_event_id
-      request.env['HTTP_LAST_EVENT_ID']
-    end
-
-    def send_scrollback
+    def send_scrollback(channels, last_event_id)
       scrollback_events = []
       scrollback_events = channels.flat_map { |c| c.scrollback(since: last_event_id) } if last_event_id
       scrollback_events = [Pubsubstub.heartbeat_event] if scrollback_events.empty?
-      stream do |connection|
+      Stream.new do |connection|
         scrollback_events.each do |event|
           connection << event.to_message
         end
@@ -49,12 +44,8 @@ module Pubsubstub
       defined?(EventMachine) && EventMachine.reactor_running?
     end
 
-    def channels
-      (params[:channels] || [:default]).map(&Channel.method(:new))
-    end
-
-    def subscribe_connection
-      stream do |connection|
+    def subscribe_connection(channels, last_event_id)
+      Stream.new do |connection|
         subscription = register(channels, connection)
         begin
           subscription.stream(last_event_id)

data/lib/pubsubstub/version.rb

@@ -1,3 +1,3 @@
 module Pubsubstub
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/pubsubstub.rb

@@ -3,7 +3,7 @@ require "mutex_m"
 require "json"
 require "set"
 
-require "sinatra"
+require "rack/request"
 require "redis"
 require "pubsubstub/version"
 require "pubsubstub/logging"
@@ -11,7 +11,7 @@ require "pubsubstub/channel"
 require "pubsubstub/subscriber"
 require "pubsubstub/subscription"
 require "pubsubstub/event"
-require "pubsubstub/action"
+require "pubsubstub/stream"
 require "pubsubstub/stream_action"
 require "pubsubstub/publish_action"
 require "pubsubstub/application"

data/pubsubstub.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'sinatra', '>= 1.4.7', '< 3'
-  spec.add_dependency 'redis', '~> 3.0'
+  spec.add_dependency 'rack'
+  spec.add_dependency 'redis', "~> 3.0"
 
   spec.add_development_dependency "bundler", "~> 1.5"
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: pubsubstub
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Guillaume Malette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.7
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.7
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -80,17 +74,17 @@ files:
 - example/Gemfile
 - example/config.ru
 - example/puma_config.rb
-- gemfiles/Gemfile.sinatra-1.x
-- gemfiles/Gemfile.sinatra-1.x.lock
-- gemfiles/Gemfile.sinatra-2.x
-- gemfiles/Gemfile.sinatra-2.x.lock
+- gemfiles/Gemfile.rack-1.x
+- gemfiles/Gemfile.rack-1.x.lock
+- gemfiles/Gemfile.rack-2.x
+- gemfiles/Gemfile.rack-2.x.lock
 - lib/pubsubstub.rb
-- lib/pubsubstub/action.rb
 - lib/pubsubstub/application.rb
 - lib/pubsubstub/channel.rb
 - lib/pubsubstub/event.rb
 - lib/pubsubstub/logging.rb
 - lib/pubsubstub/publish_action.rb
+- lib/pubsubstub/stream.rb
 - lib/pubsubstub/stream_action.rb
 - lib/pubsubstub/subscriber.rb
 - lib/pubsubstub/subscription.rb

data/lib/pubsubstub/action.rb

@@ -1,13 +0,0 @@
-module Pubsubstub
-  class Action < Sinatra::Base
-    configure :production, :development do
-      enable :logging
-    end
-
-    configure :test do
-      set :dump_errors, false
-      set :raise_errors, true
-      set :show_exceptions, false
-    end
-  end
-end