simple-websocket-vcr 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 371d7113b96864c18d52a21a6023e6359951d11b
-  data.tar.gz: f34d0a2637eb22f57feebb07c082d8f923c4d034
+  metadata.gz: 78b408bc5fa868fa39eadc1396ff489392afde72
+  data.tar.gz: 1efd70b10211a7b521670188ec85fbcedc6ff4fb
 SHA512:
-  metadata.gz: 31c13008d6bd19de06d4babb02ce090e7dd12ff16587513cb44edd5103cbf56a0639bfbb0da5f5080730786a2a8e42bb0fb16c969046ad3b59ddac0c0eb9fb98
-  data.tar.gz: 6f824eabaff644eff905a0b46bf47fd945f1fc0568f270a14ac37cf5344e604bc4f4db1e4aa58fa5f63bd02f05c79520c0060590fe3085dd05e9882e0f0ddb31
+  metadata.gz: 9fade33794fb192e477ede4ce59bf0d759faa5894ab4f84492bf188d22ebb0926d69976f0f27a4eddcbd86dbd7a5c10921238449ce55b25fbf28473187de4eb7
+  data.tar.gz: 9062c5a2735114ab8e76e6a0f80f16184bf1d4280abf9f442a577d6119b47ec2f20e5aa510a750024b8c28d187a40d2413f0ddc3869e87bc471d0063ffdc7dd9

data/lib/{simple-websocket-vcr → simple_websocket_vcr}/cassette.rb

@@ -1,4 +1,4 @@
-require 'simple-websocket-vcr/errors'
+require 'simple_websocket_vcr/errors'
 require 'fileutils'
 
 module VCR
@@ -8,7 +8,7 @@ module VCR
     class Cassette
       attr_reader :name, :recording
 
-      alias recording? recording
+      alias_method :recording?, :recording
 
       def initialize(name)
         @name = name
@@ -28,17 +28,16 @@ module VCR
           @sessions << []
           @sessions.last
         else
-          raise NoMoreSessionsError if @sessions.empty?
+          fail NoMoreSessionsError if @sessions.empty?
           @sessions.shift
         end
       end
 
       def save
-        if recording?
-          dirname = File.dirname(filename)
-          FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
-          File.open(filename, 'w') { |f| f.write(JSON.pretty_generate(@sessions)) }
-        end
+        return unless recording?
+        dirname = File.dirname(filename)
+        FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
+        File.open(filename, 'w') { |f| f.write(JSON.pretty_generate(@sessions)) }
       end
 
       protected

data/lib/{simple-websocket-vcr → simple_websocket_vcr}/recordable_websocket_client.rb

@@ -1,7 +1,7 @@
 require 'delegate'
 require 'websocket-client-simple'
 require 'base64'
-require 'simple-websocket-vcr/errors'
+require 'simple_websocket_vcr/errors'
 
 module VCR
   module WebSocket
@@ -14,7 +14,7 @@ module VCR
       attr_accessor :recording, :open, :thread
 
       def initialize(cassette, real_client)
-        raise NoCassetteError 'specify the cassette' unless cassette
+        fail NoCassetteError 'specify the cassette' unless cassette
 
         if cassette.recording?
           @live = true
@@ -26,15 +26,13 @@ module VCR
         @recording = cassette.next_session
       end
 
-      def send(data_param, opt = { type: :text })
-        data = data_param.dup
-        data = Base64.encode64(data) if opt[:type] != :text
+      def send(data, opt = { type: :text })
         _write(:send, data, opt)
       end
 
       def on(event, params = {}, &block)
         super(event, params, &block) unless @live
-        _read(:add_listener, event, params, &block)
+        _read(event, params, &block)
       end
 
       def emit(event, *data)
@@ -66,26 +64,26 @@ module VCR
       private
 
       def _write(method, data, opt)
+        text_data = opt[:type] == :text ? data.dup : Base64.encode64(data.dup)
         if @live
           @client.__send__(method, data, opt)
-          @recording << { operation: 'write', data: data }
+          @recording << { operation: 'write', data: text_data }
         else
           sleep 0.5 if @recording.first['operation'] != 'write'
           record = @recording.shift
           _ensure_operation('write', record['operation'])
-          _ensure_data(data, record['data'])
+          _ensure_data(text_data, record['data'])
         end
       end
 
-      def _read(method, event, params, &block)
+      def _read(event, params, &block)
         if @live
           rec = @recording
           @client.on(event, params) do |msg|
-            msg = Base64.decode64(msg) if msg.type != :text
-            rec << { operation: 'read', type: msg.type, data: msg }
-            yield(msg)
+            data = msg.type == :text ? msg.data : Base64.decode64(msg.data)
+            rec << { operation: 'read', type: msg.type, data: data }
+            block.call(msg)
           end
-          @client.__send__(method, event, params, &block)
         else
           wait_for_reads(event, params[:once])
         end
@@ -95,7 +93,7 @@ module VCR
         @thread = Thread.new do
           # if the next recorded operation is a 'read', take all the reads until next write
           # and translate them to the events
-          while @open && !@recording.empty? do
+          while @open && !@recording.empty?
             begin
               if @recording.first['operation'] == 'read'
                 record = @recording.shift
@@ -106,8 +104,9 @@ module VCR
                   self
                 end
                 emit(event, data)
+                break if once
               else
-                sleep 0.1 # TODO config
+                sleep 0.1 # TODO: config
               end
             end
           end
@@ -120,12 +119,12 @@ module VCR
 
       def _ensure_operation(desired, actual)
         string = "Expected to '#{desired}' but the next operation in recording was '#{actual}'"
-        raise string unless desired == actual
+        fail string unless desired == actual
       end
 
       def _ensure_data(desired, actual)
         string = "Expected data to be '#{desired}' but next data in recording was '#{actual}'"
-        raise string unless desired == actual
+        fail string unless desired == actual
       end
     end
   end

data/lib/{simple-websocket-vcr → simple_websocket_vcr}/version.rb

@@ -1,5 +1,5 @@
 module VCR
   module WebSocket
-    VERSION = '0.0.3'.freeze
+    VERSION = '0.0.4'.freeze
   end
 end

data/lib/{simple-websocket-vcr.rb → simple_websocket_vcr.rb}

@@ -1,8 +1,8 @@
-require 'simple-websocket-vcr/cassette'
-require 'simple-websocket-vcr/configuration'
-require 'simple-websocket-vcr/errors'
-require 'simple-websocket-vcr/recordable_websocket_client'
-require 'simple-websocket-vcr/version'
+require 'simple_websocket_vcr/cassette'
+require 'simple_websocket_vcr/configuration'
+require 'simple_websocket_vcr/errors'
+require 'simple_websocket_vcr/recordable_websocket_client'
+require 'simple_websocket_vcr/version'
 require 'json'
 require 'websocket-client-simple'
 
@@ -36,7 +36,7 @@ module VCR
     end
 
     def use_cassette(name, _options = {})
-      raise ArgumentError, '`VCR.use_cassette` requires a block.' unless block_given?
+      fail ArgumentError, '`VCR.use_cassette` requires a block.' unless block_given?
       self.cassette = Cassette.new(name)
       yield
       cassette.save
@@ -44,12 +44,12 @@ module VCR
     end
 
     def record(example, context, options = {}, &block)
-      raise ArgumentError, '`VCR.record` requires a block.' unless block_given?
+      fail ArgumentError, '`VCR.record` requires a block.' unless block_given?
       name = filename_helper(example, context)
       use_cassette(name, options, &block)
     end
 
-    def turn_off!(options = {})
+    def turn_off!(_options = {})
       # TODO: impl
     end
 
@@ -85,7 +85,7 @@ end
 
 module WebSocket::Client::Simple
   class << self
-    alias real_connect connect
+    alias_method :real_connect, :connect
 
     def connect(url, options = {})
       if VCR::WebSocket.configuration.hook_uris.any? { |u| url.include?(u) }

data/simple-websocket-vcr.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'simple-websocket-vcr/version'
+require 'simple_websocket_vcr/version'
 
 Gem::Specification.new do |gem|
   gem.name          = 'simple-websocket-vcr'
@@ -9,7 +9,7 @@ Gem::Specification.new do |gem|
   gem.authors       = ['Jirka Kremser']
   gem.email         = ['jkremser@redhat.com']
   gem.description   = 'Websocket VCR add-on'
-  gem.summary       = 'simple-websocket-vcr is VCR add-on for websockets.'
+  gem.summary       = 'simple_websocket_vcr is VCR add-on for websockets.'
   gem.homepage      = 'https://github.com/Jiri-Kremser/simple-websocket-vcr'
   gem.license       = 'Apache-2.0'
   gem.required_ruby_version = '>= 2.0.0'

data/spec/fixtures/vcr_cassettes/EXPLICIT/some_explicitly_specified_cassette.json

@@ -3,7 +3,7 @@
     {
       "operation": "read",
       "type": "text",
-      "data": "WelcomeResponse={\"sessionId\":\"GmAOS1avTLE0453s0l3o8HkLUCmVMlRlIBHqK2cN\"}"
+      "data": "WelcomeResponse={\"sessionId\":\"43RYOpJQT3ZpP5fHj_Nxs9Ef7QcOA79vPZtPjXn2\"}"
     },
     {
       "operation": "write",
@@ -12,7 +12,7 @@
     {
       "operation": "read",
       "type": "text",
-      "data": "GenericErrorResponse={\"errorMessage\":\"Failed to process message [?]\",\"stackTrace\":\"java.lang.IllegalArgumentException: Cannot deserialize: [something_1]\\n\\tat org.hawkular.cmdgw.api.ApiDeserializer.fromHawkularFormat(ApiDeserializer.java:68)\\n\\tat org.hawkular.cmdgw.api.ApiDeserializer.deserialize(ApiDeserializer.java:84)\\n\\tat org.hawkular.cmdgw.command.ws.server.AbstractGatewayWebSocket.onMessage(AbstractGatewayWebSocket.java:213)\\n\\tat sun.reflect.GeneratedMethodAccessor544.invoke(Unknown Source)\\n\\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\\n\\tat java.lang.reflect.Method.invoke(Method.java:497)\\n\\tat io.undertow.websockets.jsr.annotated.BoundMethod.invoke(BoundMethod.java:87)\\n\\tat io.undertow.websockets.jsr.annotated.AnnotatedEndpoint$2$1.run(AnnotatedEndpoint.java:150)\\n\\tat io.undertow.websockets.jsr.ServerWebSocketContainer.invokeEndpointMethod(ServerWebSocketContainer.java:553)\\n\\tat io.undertow.websockets.jsr.annotated.AnnotatedEndpoint$2.onMessage(AnnotatedEndpoint.java:145)\\n\\tat io.undertow.websockets.jsr.FrameHandler$7.run(FrameHandler.java:283)\\n\\tat io.undertow.websockets.jsr.ServerWebSocketContainer.invokeEndpointMethod(ServerWebSocketContainer.java:553)\\n\\tat io.undertow.websockets.jsr.ServerWebSocketContainer$5.run(ServerWebSocketContainer.java:538)\\n\\tat io.undertow.websockets.jsr.OrderedExecutor$ExecutorTask.run(OrderedExecutor.java:67)\\n\\tat java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)\\n\\tat java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)\\n\\tat java.lang.Thread.run(Thread.java:745)\\n\"}"
+      "data": "GenericErrorResponse={\"errorMessage\":\"Failed to process message [?]\",\"stackTrace\":\"java.lang.IllegalArgumentException: Cannot deserialize: [something_1]\\n\\tat org.hawkular.cmdgw.api.ApiDeserializer.fromHawkularFormat(ApiDeserializer.java:68)\\n\\tat org.hawkular.cmdgw.api.ApiDeserializer.deserialize(ApiDeserializer.java:84)\\n\\tat org.hawkular.cmdgw.command.ws.server.AbstractGatewayWebSocket.onMessage(AbstractGatewayWebSocket.java:213)\\n\\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\\n\\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\\n\\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\\n\\tat java.lang.reflect.Method.invoke(Method.java:497)\\n\\tat io.undertow.websockets.jsr.annotated.BoundMethod.invoke(BoundMethod.java:87)\\n\\tat io.undertow.websockets.jsr.annotated.AnnotatedEndpoint$2$1.run(AnnotatedEndpoint.java:150)\\n\\tat io.undertow.websockets.jsr.ServerWebSocketContainer.invokeEndpointMethod(ServerWebSocketContainer.java:553)\\n\\tat io.undertow.websockets.jsr.annotated.AnnotatedEndpoint$2.onMessage(AnnotatedEndpoint.java:145)\\n\\tat io.undertow.websockets.jsr.FrameHandler$7.run(FrameHandler.java:283)\\n\\tat io.undertow.websockets.jsr.ServerWebSocketContainer.invokeEndpointMethod(ServerWebSocketContainer.java:553)\\n\\tat io.undertow.websockets.jsr.ServerWebSocketContainer$5.run(ServerWebSocketContainer.java:538)\\n\\tat io.undertow.websockets.jsr.OrderedExecutor$ExecutorTask.run(OrderedExecutor.java:67)\\n\\tat java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)\\n\\tat java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)\\n\\tat java.lang.Thread.run(Thread.java:745)\\n\"}"
     },
     {
       "operation": "write",
@@ -21,7 +21,7 @@
     {
       "operation": "read",
       "type": "text",
-      "data": "GenericErrorResponse={\"errorMessage\":\"Failed to process message [?]\",\"stackTrace\":\"java.lang.IllegalArgumentException: Cannot deserialize: [something_2]\\n\\tat org.hawkular.cmdgw.api.ApiDeserializer.fromHawkularFormat(ApiDeserializer.java:68)\\n\\tat org.hawkular.cmdgw.api.ApiDeserializer.deserialize(ApiDeserializer.java:84)\\n\\tat org.hawkular.cmdgw.command.ws.server.AbstractGatewayWebSocket.onMessage(AbstractGatewayWebSocket.java:213)\\n\\tat sun.reflect.GeneratedMethodAccessor544.invoke(Unknown Source)\\n\\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\\n\\tat java.lang.reflect.Method.invoke(Method.java:497)\\n\\tat io.undertow.websockets.jsr.annotated.BoundMethod.invoke(BoundMethod.java:87)\\n\\tat io.undertow.websockets.jsr.annotated.AnnotatedEndpoint$2$1.run(AnnotatedEndpoint.java:150)\\n\\tat io.undertow.websockets.jsr.ServerWebSocketContainer.invokeEndpointMethod(ServerWebSocketContainer.java:553)\\n\\tat io.undertow.websockets.jsr.annotated.AnnotatedEndpoint$2.onMessage(AnnotatedEndpoint.java:145)\\n\\tat io.undertow.websockets.jsr.FrameHandler$7.run(FrameHandler.java:283)\\n\\tat io.undertow.websockets.jsr.ServerWebSocketContainer.invokeEndpointMethod(ServerWebSocketContainer.java:553)\\n\\tat io.undertow.websockets.jsr.ServerWebSocketContainer$5.run(ServerWebSocketContainer.java:538)\\n\\tat io.undertow.websockets.jsr.OrderedExecutor$ExecutorTask.run(OrderedExecutor.java:67)\\n\\tat java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)\\n\\tat java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)\\n\\tat java.lang.Thread.run(Thread.java:745)\\n\"}"
+      "data": "GenericErrorResponse={\"errorMessage\":\"Failed to process message [?]\",\"stackTrace\":\"java.lang.IllegalArgumentException: Cannot deserialize: [something_2]\\n\\tat org.hawkular.cmdgw.api.ApiDeserializer.fromHawkularFormat(ApiDeserializer.java:68)\\n\\tat org.hawkular.cmdgw.api.ApiDeserializer.deserialize(ApiDeserializer.java:84)\\n\\tat org.hawkular.cmdgw.command.ws.server.AbstractGatewayWebSocket.onMessage(AbstractGatewayWebSocket.java:213)\\n\\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\\n\\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\\n\\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\\n\\tat java.lang.reflect.Method.invoke(Method.java:497)\\n\\tat io.undertow.websockets.jsr.annotated.BoundMethod.invoke(BoundMethod.java:87)\\n\\tat io.undertow.websockets.jsr.annotated.AnnotatedEndpoint$2$1.run(AnnotatedEndpoint.java:150)\\n\\tat io.undertow.websockets.jsr.ServerWebSocketContainer.invokeEndpointMethod(ServerWebSocketContainer.java:553)\\n\\tat io.undertow.websockets.jsr.annotated.AnnotatedEndpoint$2.onMessage(AnnotatedEndpoint.java:145)\\n\\tat io.undertow.websockets.jsr.FrameHandler$7.run(FrameHandler.java:283)\\n\\tat io.undertow.websockets.jsr.ServerWebSocketContainer.invokeEndpointMethod(ServerWebSocketContainer.java:553)\\n\\tat io.undertow.websockets.jsr.ServerWebSocketContainer$5.run(ServerWebSocketContainer.java:538)\\n\\tat io.undertow.websockets.jsr.OrderedExecutor$ExecutorTask.run(OrderedExecutor.java:67)\\n\\tat java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)\\n\\tat java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)\\n\\tat java.lang.Thread.run(Thread.java:745)\\n\"}"
     },
     {
       "operation": "close"

data/spec/fixtures/vcr_cassettes/VCR_for_WS/should_record_also_the_outgoing_communication.json

@@ -3,7 +3,7 @@
     {
       "operation": "read",
       "type": "text",
-      "data": "WelcomeResponse={\"sessionId\":\"-gGp6ATYH0bEfiOtumWEnieSFNgRtHL3i0RAndui\"}"
+      "data": "WelcomeResponse={\"sessionId\":\"Npoxsxm47DZ06kzME4OYcmf7ghKFQdqHx-774R0x\"}"
     },
     {
       "operation": "write",

data/spec/fixtures/vcr_cassettes/VCR_for_WS/should_record_the_closing_event.json

@@ -3,7 +3,7 @@
     {
       "operation": "read",
       "type": "text",
-      "data": "WelcomeResponse={\"sessionId\":\"QDPovsVv6q8eZx4ARSa6tdU4PJDJH1Bo4j45u3SQ\"}"
+      "data": "WelcomeResponse={\"sessionId\":\"2EmXcWEVbBBotTuwusO2-WJRX1oAuDEH9YdCd_Y5\"}"
     },
     {
       "operation": "close"

data/spec/fixtures/vcr_cassettes/VCR_for_WS/should_record_the_very_first_message_caught_on_the_client_yielded_by_the_connect_method.json

@@ -3,7 +3,7 @@
     {
       "operation": "read",
       "type": "text",
-      "data": "WelcomeResponse={\"sessionId\":\"_f8ZS9Q2r_Tn9BVdz5vGoJueZ-dl4pbv6erAM8am\"}"
+      "data": "WelcomeResponse={\"sessionId\":\"VQEYmpDd6qeDCxSdjoCVsNo_syHEbXXzdLFw5SC_\"}"
     }
   ]
 ]

data/spec/vcr_spec.rb

@@ -1,9 +1,8 @@
-require 'simple-websocket-vcr'
+require 'simple_websocket_vcr'
 require 'thread'
 require 'websocket-client-simple'
 require 'json'
 
-
 # class Object
 #   alias real_sleep sleep
 #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple-websocket-vcr
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jirka Kremser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -139,12 +139,12 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- lib/simple-websocket-vcr.rb
-- lib/simple-websocket-vcr/cassette.rb
-- lib/simple-websocket-vcr/configuration.rb
-- lib/simple-websocket-vcr/errors.rb
-- lib/simple-websocket-vcr/recordable_websocket_client.rb
-- lib/simple-websocket-vcr/version.rb
+- lib/simple_websocket_vcr.rb
+- lib/simple_websocket_vcr/cassette.rb
+- lib/simple_websocket_vcr/configuration.rb
+- lib/simple_websocket_vcr/errors.rb
+- lib/simple_websocket_vcr/recordable_websocket_client.rb
+- lib/simple_websocket_vcr/version.rb
 - simple-websocket-vcr.gemspec
 - spec/fixtures/vcr_cassettes/EXPLICIT/some_explicitly_specified_cassette.json
 - spec/fixtures/vcr_cassettes/VCR_for_WS/automatically_picked_cassette_name_is_ok,_when_describing_parent_and_example_child1.json
@@ -178,7 +178,7 @@ rubyforge_project:
 rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
-summary: simple-websocket-vcr is VCR add-on for websockets.
+summary: simple_websocket_vcr is VCR add-on for websockets.
 test_files:
 - spec/fixtures/vcr_cassettes/EXPLICIT/some_explicitly_specified_cassette.json
 - spec/fixtures/vcr_cassettes/VCR_for_WS/automatically_picked_cassette_name_is_ok,_when_describing_parent_and_example_child1.json