simple-websocket-vcr 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4e3bd4ad497538c5854e17f3ec76a2a7f8026d6
-  data.tar.gz: 7d0c14cf83177b9eb994feba28316a58f2661d3d
+  metadata.gz: 371d7113b96864c18d52a21a6023e6359951d11b
+  data.tar.gz: f34d0a2637eb22f57feebb07c082d8f923c4d034
 SHA512:
-  metadata.gz: 5db4b3ba2fec4cfa2378dedd34812533aeac4f520d7c14f6dec58c67d9e1f73ac7104b243765d00b7202171295e2b8ca77bf90e17f041c6f4c2561e2b90a68c6
-  data.tar.gz: 15b87a93f9049c09fbd93ea294c5d4e2d4810a9c859232fba14f68cf38b2267f167ae78448c9cea4fa62141fab6674b07aec4bc8604d03b62a39c07bbbf30904
+  metadata.gz: 31c13008d6bd19de06d4babb02ce090e7dd12ff16587513cb44edd5103cbf56a0639bfbb0da5f5080730786a2a8e42bb0fb16c969046ad3b59ddac0c0eb9fb98
+  data.tar.gz: 6f824eabaff644eff905a0b46bf47fd945f1fc0568f270a14ac37cf5344e604bc4f4db1e4aa58fa5f63bd02f05c79520c0060590fe3085dd05e9882e0f0ddb31

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/README.md

@@ -2,4 +2,7 @@
 
 [![Build Status](https://travis-ci.org/Jiri-Kremser/simple-websocket-vcr.png?branch=master)](https://travis-ci.org/Jiri-Kremser/simple-websocket-vcr)
 
-TODO: this
+[![Coverage](https://coveralls.io/repos/github/Jiri-Kremser/simple-websocket-vcr/badge.svg?branch=master)](https://coveralls.io/github/Jiri-Kremser/simple-websocket-vcr?branch=master)
+
+
+TODO: this

data/Rakefile

@@ -1,4 +1,8 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new('spec')
-task default: :spec
+require 'rubocop/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new
+
+task default: [:rubocop, :spec]

data/lib/simple-websocket-vcr/recordable_websocket_client.rb

@@ -11,7 +11,7 @@ module VCR
       include EventEmitter
 
       attr_reader :live, :client
-      attr_accessor :recording, :open
+      attr_accessor :recording, :open, :thread
 
       def initialize(cassette, real_client)
         raise NoCassetteError 'specify the cassette' unless cassette
@@ -32,18 +32,18 @@ module VCR
         _write(:send, data, opt)
       end
 
-      # or on
       def on(event, params = {}, &block)
+        super(event, params, &block) unless @live
         _read(:add_listener, event, params, &block)
       end
 
       def emit(event, *data)
-        @recording << { operation: 'read', data: data } if live
+        @recording << { operation: 'read', data: data } if @live
         super(event, *data)
       end
 
       def open?
-        if live
+        if @live
           @client.open?
         else
           @open
@@ -51,12 +51,14 @@ module VCR
       end
 
       def close
-        if live
+        if @live
           @recording << { operation: 'close' }
           @client.close
         else
+          sleep 0.5 if @recording.first['operation'] != 'close'
           record = @recording.shift
           _ensure_operation('close', record['operation'])
+          Thread.kill @thread if @thread
           @open = false
         end
       end
@@ -64,10 +66,11 @@ module VCR
       private
 
       def _write(method, data, opt)
-        if live
+        if @live
           @client.__send__(method, data, opt)
           @recording << { operation: 'write', data: data }
         else
+          sleep 0.5 if @recording.first['operation'] != 'write'
           record = @recording.shift
           _ensure_operation('write', record['operation'])
           _ensure_data(data, record['data'])
@@ -75,7 +78,7 @@ module VCR
       end
 
       def _read(method, event, params, &block)
-        if live
+        if @live
           rec = @recording
           @client.on(event, params) do |msg|
             msg = Base64.decode64(msg) if msg.type != :text
@@ -84,13 +87,30 @@ module VCR
           end
           @client.__send__(method, event, params, &block)
         else
-          raise EOFError if @recording.empty?
-          record = _take_first_read
-          return if record.nil?
-          _ensure_operation('read', record['operation'])
-          data = record['data']
-          data = Base64.decode64(msg) if record['type'] != 'text'
-          emit(event, data)
+          wait_for_reads(event, params[:once])
+        end
+      end
+
+      def wait_for_reads(event, once = false)
+        @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
+            begin
+              if @recording.first['operation'] == 'read'
+                record = @recording.shift
+                data = record['data']
+                data = Base64.decode64(msg) if record['type'] != 'text'
+                data = ::WebSocket::Frame::Data.new(data)
+                def data.data
+                  self
+                end
+                emit(event, data)
+              else
+                sleep 0.1 # TODO config
+              end
+            end
+          end
         end
       end
 
@@ -99,13 +119,13 @@ module VCR
       end
 
       def _ensure_operation(desired, actual)
-        string = "Expected to '#{desired}' but next in recording was '#{actual}'"
-        raise OperationMismatchError string unless desired == actual
+        string = "Expected to '#{desired}' but the next operation in recording was '#{actual}'"
+        raise string unless desired == actual
       end
 
       def _ensure_data(desired, actual)
-        string = "Expected data to be '#{desired}' but next in recording was '#{actual}'"
-        raise DataMismatchError string unless desired == actual
+        string = "Expected data to be '#{desired}' but next data in recording was '#{actual}'"
+        raise string unless desired == actual
       end
     end
   end

data/lib/simple-websocket-vcr/version.rb

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

data/lib/simple-websocket-vcr.rb

@@ -54,13 +54,17 @@ module VCR
     end
 
     def turned_on?
-      # TODO: impl
+      !@cassette.nil?
     end
 
     def turn_on!
       # TODO: impl
     end
 
+    def live?
+      @cassette && @cassette.recording?
+    end
+
     private
 
     def filename_helper(example, context)

data/simple-websocket-vcr.gemspec

@@ -19,7 +19,12 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_development_dependency('rspec-rails', '~> 3.0')
-  gem.add_development_dependency('rake', '~> 11')
-  gem.add_development_dependency('websocket-client-simple', '~> 0.3')
+  gem.add_development_dependency 'shoulda'
+  gem.add_development_dependency 'rspec-rails', '~> 3.0'
+  gem.add_development_dependency 'rake', '~> 11'
+  gem.add_development_dependency 'vcr'
+  gem.add_development_dependency 'webmock', '~> 1.7'
+  gem.add_development_dependency 'rubocop', '= 0.34.2'
+  gem.add_development_dependency 'websocket-client-simple', '~> 0.3'
+  gem.add_development_dependency 'coveralls'
 end

data/spec/spec_helper.rb

@@ -1,3 +1,7 @@
+# This needs to go before all requires to be able to record full coverage
+require 'coveralls'
+Coveralls.wear!
+
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   config.order = 'random'

data/spec/vcr_spec.rb

@@ -3,6 +3,15 @@ require 'thread'
 require 'websocket-client-simple'
 require 'json'
 
+
+# class Object
+#   alias real_sleep sleep
+#
+#   def sleep(*args)
+#     real_sleep(*args) if !VCR::WebSocket.cassette || VCR::WebSocket.cassette.recording?
+#   end
+# end
+
 describe 'VCR for WS' do
   HOST = 'localhost:8080'.freeze
 
@@ -10,6 +19,10 @@ describe 'VCR for WS' do
     e
   end
 
+  let(:should_sleep) do |_|
+    !VCR::WebSocket.cassette || VCR::WebSocket.cassette.recording?
+  end
+
   before(:each) do
     VCR::WebSocket.configuration.reset_defaults!
   end
@@ -23,7 +36,7 @@ describe 'VCR for WS' do
       c = WebSocket::Client::Simple.connect url do |client|
         client.on(:message, once: true, &:data)
       end
-      sleep 1
+      sleep 1 if should_sleep
 
       expect(c).not_to be nil
       expect(c.open?).to be true
@@ -39,7 +52,7 @@ describe 'VCR for WS' do
       c = WebSocket::Client::Simple.connect url do |client|
         client.on(:message, once: true, &:data)
       end
-      sleep 1
+      sleep 1 if should_sleep
       c.send('something 1')
       c.send('something 2')
       c.send('something 3')
@@ -58,11 +71,11 @@ describe 'VCR for WS' do
       c = WebSocket::Client::Simple.connect url do |client|
         client.on(:message, once: true, &:data)
       end
-      sleep 1
+      sleep 1 if should_sleep
 
       expect(c).not_to be nil
       expect(c.open?).to be true
-      sleep 1
+      sleep 1 if should_sleep
       c.close
       expect(c.open?).to be false
     end
@@ -78,20 +91,20 @@ describe 'VCR for WS' do
       c = WebSocket::Client::Simple.connect url do |client|
         client.on(:message, once: true, &:data)
       end
-      sleep 1
+      sleep 1 if should_sleep
       c.send('something_1')
       c.on(:message, once: true, &:data)
-      sleep 1
+      sleep 1 if should_sleep
 
       c.send('something_2')
       c.on(:message, once: true, &:data)
-      sleep 1
+      sleep 1 if should_sleep
 
       expect(c).not_to be nil
       expect(c.open?).to be true
       c.close
       expect(c.open?).to be false
-      sleep 1
+      sleep 1 if should_sleep
     end
 
     # check that everything was recorded in the json file

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: simple-websocket-vcr
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jirka Kremser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '11'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.34.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.34.2
 - !ruby/object:Gem::Dependency
   name: websocket-client-simple
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Websocket VCR add-on
 email:
 - jkremser@redhat.com
@@ -59,6 +129,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"