websockethook 0.1.02 → 0.1.03

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3de140b85addf488c702602161163a39fdc57c4c
-  data.tar.gz: 4760c900e26e41906797fa2507055ccd1a071513
+  metadata.gz: f12e791fa2429ff43a0fe5834535487685cb8ee7
+  data.tar.gz: 8ab40acc4243e3709e58949a9afe5b3030c7bd58
 SHA512:
-  metadata.gz: d4fd1b06e74a31316717c5602423e696a58d5e59d38c4d0e361131e458e35afe9dfca5d5a0c93a14264ee2e791e247449b521de4ae8a6eda8eb41c3125cf6075
-  data.tar.gz: 044cfb3186721a4d950c05ca602d6697b740a627bb3203407e48e508d54cf6500ec284117b91c1a60b62f989771eb9e9b2535d47af7bc86e044918beb3fcb66e
+  metadata.gz: 9bdffa58da91db7c2c0857879466dda153b736518b19e0c6ef76f6e04f50ecf299c3a877a5451382a572a23235ddfb4b082b56e53b37c584c95f2546a686d33f
+  data.tar.gz: c0387e1e207b2b01b6cdac83398c41e3c9db94f37b2924a6e83f9a0ab878e559ee316c7dd186fba9946cd01c16686ebac86338df2089df2acc5ae4347d7d23ad

data/lib/websockethook.rb

@@ -3,33 +3,24 @@ require 'json'
 require 'eventmachine'
 
 class WebSocketHook
-  DEFAULT_HOST = 'ws://web.sockethook.io'
+  DEFAULT_HOST       = 'ws://websockethook.io'
+  DEFAULT_SLEEP      = 0.1
+  DEFAULT_KEEP_ALIVE = true
+  DEFAULT_PING       = 20
 
   def initialize(options = {})
     @stopping = false
-    @hooks    = []
     initialize_host options
     initialize_pause options
     initialize_keep_alive options
     initialize_ping options
-    initialize_hooks options
   end
 
-  def register(id)
-    fail "Hook id '#{id}' must be a String" unless id.is_a?(String)
-    fail "Hook id must only be alphanumeric, '_', '.', or '_'" unless /^[a-zA-Z0-9\-_\.]*$/ === id
-    @hooks << id unless @hooks.include?(id)
-  end
-
-  def unregister(id)
-    @hooks.delete(id)
-  end
-
-  def listen(&block)
+  def listen(id=nil, &block)
     fail 'Block must be provided' unless block && block.is_a?(Proc)
     begin
       @stopping = false
-      listener(&block)
+      listener(id, &block)
       restart = @keep_alive && !@stopping
       if restart
         block.call type: 'restart', message: 'restarting connection since it was lost'
@@ -51,38 +42,30 @@ class WebSocketHook
   end
 
   def initialize_pause(options = {})
-    @pause = options[:sleep] || 0.1
+    @pause = options[:sleep] || DEFAULT_SLEEP
     fail 'Pause (:pause) must be a float or integer' unless @pause.is_a?(Float) || @pause.is_a?(Integer)
   end
 
   def initialize_keep_alive(options = {})
-    @keep_alive = options[:keep_alive] || true
+    @keep_alive = options[:keep_alive] || DEFAULT_KEEP_ALIVE
     fail 'Keep Alive (:keep_alive) must be a boolean (true/false)' unless @keep_alive == true || @keep_alive == false
   end
 
   def initialize_ping(options = {})
-    @ping = options[:ping] || 20
+    @ping = options[:ping] || DEFAULT_PING
     fail 'Ping (:ping) must be an integer' unless @ping.is_a?(Integer)
   end
 
-  def initialize_hooks(options = {})
-    hooks  = options[:hooks] || []
-    fail 'Hooks (:hooks) must be an array' unless hooks.is_a?(Array)
-    hooks.each { |hook| register(hook) }
-  end
-
   def stop_em
     EM.stop
   rescue
   end
 
-  def listener(&block)
+  def listener(id, &block)
     websocket(block) do |ws|
       ws.on :open do
         block.call type: 'open'
-        @hooks.each do |hook|
-          ws.send({type:'register',id:hook}.to_json)
-        end
+        ws.send({type:'register',id:id}.to_json)
       end
       ws.on :message do |message|
         data = nil

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 require 'codeclimate-test-reporter'
 require 'rspec'
-require 'wrong'
 
 CodeClimate::TestReporter.start if ENV['CODECLIMATE_REPO_TOKEN']
 

data/spec/websockethook_spec.rb

@@ -4,97 +4,57 @@ require 'securerandom'
 require 'rest-client'
 
 describe WebSocketHook do
-  include Wrong
-
-  it 'can initialize' do
-    expect do
-      ws = WebSocketHook.new
-    end.to_not raise_error
-  end
-
-  it 'can register a hook' do
-    ws = WebSocketHook.new
-    data = []
-    t = Thread.new { ws.listen { |msg| data << msg } }
-
-    eventually do
-      data.any? do |line|
-        line[:type] == 'registered'
-      end
-    end
-
-    ws.stop
-    t.kill
+  before :each do
+      @ws     = WebSocketHook.new
+      @logger = double('@logger', log: true)
   end
 
   it 'can open and close' do
-    ws = WebSocketHook.new
-    data = []
-    t = Thread.new { ws.listen { |msg| data << msg } }
+    expect(@logger).to receive(:log).with({type: 'open'})
+    expect(@logger).to receive(:log).with({type: 'close'})
+    expect(@logger).to receive(:log).with({type: 'stopped'})
 
-    eventually do
-      data.any? do |line|
-        line[:type] == 'open'
-      end
+    @ws.listen 'test' do |msg|
+      @logger.log(msg)
+      @ws.stop
     end
 
-    ws.stop
-
-    eventually do
-      data.any? do |line|
-        line[:type] == 'close'
-      end
-    end
-    
-    t.kill
   end
 
-  it 'can register a hook with an id' do
-    id = "test_#{SecureRandom.hex(4)}"
-    ws = WebSocketHook.new
-    ws.register id
-    data = []
-    t = Thread.new { ws.listen { |msg| data << msg } }
-
-    eventually do
-      data.any? do |line|
-        line[:type] == 'registered' && line[:data][:id] == id
+  it 'can trigger a hook with data' do
+    expect(@logger).to receive(:log).with({type: 'open'})
+    expect(@logger).to receive(:log).with({type: 'registered', data: anything()})
+    expect(@logger).to receive(:log).with({type: 'hook', id: anything(), data: {this_is_a:'test'}})
+    expect(@logger).to receive(:log).with({type: 'close'})
+    expect(@logger).to receive(:log).with({type: 'stopped'})
+
+    @ws.listen do |msg|
+      @logger.log(msg)
+      
+      if msg[:type] == 'registered'
+        hook_url = msg[:data][:url]
+        RestClient.post(hook_url,this_is_a:'test')        
       end
-    end
 
-    ws.stop
-    t.kill
+      @ws.stop if msg[:type] == 'hook'
+    end    
   end
 
-  it 'can trigger a hook with data' do
+  it 'can register a custom id' do
     id = "test_#{SecureRandom.hex(4)}"
-    ws = WebSocketHook.new
-    ws.register id
-    data = []
-    t = Thread.new { ws.listen { |msg| data << msg } }
-    hook_url = ''
-
-    check_eventually data do |line|
-      found = line[:type] == 'registered' && line[:data][:id] == id
-      hook_url = line[:data][:url] if found
-      found
-    end
 
-    RestClient.post(hook_url,this_is_a:'test')
-
-    check_eventually data do |line|
-      line[:type] == 'hook' && line[:data] == {this_is_a:'test'}
-    end
-
-    ws.stop
-    t.kill
-  end
-
-  def check_eventually(data, &block)
-    eventually do
-      data.any? do |line|
-        block.yield(line)
+    expect(@logger).to receive(:log).with({type: 'open'})
+    expect(@logger).to receive(:log).with({type: 'registered', data: anything()})
+    expect(@logger).to receive(:log).with({type: 'registered', data: {id:id, path:"/hook/#{id}",url:"http://websockethook.io/hook/#{id}"}})
+    expect(@logger).to receive(:log).with({type: 'close'})
+    expect(@logger).to receive(:log).with({type: 'stopped'})
+
+    @ws.listen id do |msg|
+      @logger.log(msg)
+      
+      if msg[:type] == 'registered' && msg[:data][:id] == id
+        @ws.stop
       end
-    end
+    end    
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: websockethook
 version: !ruby/object:Gem::Version
-  version: 0.1.02
+  version: 0.1.03
 platform: ruby
 authors:
 - Maciej Skierkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -16,70 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.10.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.10.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 11.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
-- !ruby/object:Gem::Dependency
-  name: wrong
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 11.1.2
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -124,10 +110,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A library for use the free web.sockethook.io service
 test_files:
 - "./spec/spec_helper.rb"
 - "./spec/websockethook_spec.rb"
+has_rdoc: