simple-websocket-vcr 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07db3b356fae49d8678be826db4385fc6bf6880f
-  data.tar.gz: 5d854b9545dd30e617db2a79f2ecdb3ec87a4dca
+  metadata.gz: a7afb7894a207b315a358e261bf424af389b4ff6
+  data.tar.gz: c89e7986e60e765c8c635141bf2088e0f97c1e29
 SHA512:
-  metadata.gz: a41b9ad0e2d7411300cd34c4686e3fee453bf2d3c35e2817f12a0adc45b35d21d5a7267da88f743902fa218b1ed45801030c3f68711723ee759a0e055b2c45a0
-  data.tar.gz: 0571ed4745e4adef046058de4acd5ada65d9fea41965c7183085f5f33bcd72fa7b79cddceeb190fec0a79bdcbf5ea1b122e990b3b25c69b5c5d59feced7b293d
+  metadata.gz: c4c5bb740f4b7771a25eb472a58b90d0a9fa9811ad16d5065cdc15d76e322eabd95366d48933a4559df193d3483af0bd3d2216352b6358b0ba370fe590eef40c
+  data.tar.gz: f94270cdcc1f91d34d4d8d0db6bfde3934e75066a834fc263c8139bfa19272a6a2ef22b354a79d93f6489c08bb3d2fc17ff43335d3a4fd902017f7b2a9c6c52d

data/.travis.yml

@@ -1,6 +1,4 @@
 language: ruby
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-#  - 2.3 not yet on Travis
+  - 2.3
+  - 2.4

data/lib/simple_websocket_vcr.rb

@@ -10,6 +10,7 @@ require 'simple_websocket_vcr/monkey_patch'
 
 module WebSocketVCR
   extend self
+  attr_accessor :cassette
 
   # @return [String] the current version.
   # @note This string also has singleton methods:
@@ -50,14 +51,6 @@ module WebSocketVCR
     @configuration ||= Configuration.new
   end
 
-  def cassette
-    @cassette
-  end
-
-  def cassette=(v)
-    @cassette = v
-  end
-
   def disabled
     @disabled || false
   end

data/lib/simple_websocket_vcr/cassette.rb

@@ -65,20 +65,13 @@ module WebSocketVCR
     def initialize_sessions(filename)
       file_content = File.open(filename, &:read)
 
-      # do the ERB substitution
-      unless @options[:erb].nil?
-        require 'ostruct'
-        namespace = OpenStruct.new(@options[:erb])
-        file_content = ERB.new(file_content).result(namespace.instance_eval { binding })
-      end
-
       # parse JSON/YAML
       if @using_json
         parsed_content = JSON.parse(file_content)
-        sessions = RecordedJsonSession.load(parsed_content)
+        sessions = RecordedJsonSession.load(parsed_content, @options[:erb])
       else
         parsed_content = YAML.load(file_content)
-        sessions = RecordedYamlSession.load(parsed_content)
+        sessions = RecordedYamlSession.load(parsed_content, @options[:erb])
       end
       sessions
     end
@@ -94,7 +87,7 @@ module WebSocketVCR
 
     def store(entry)
       hash = entry.is_a?(RecordEntry) ? entry.attributes.map(&:to_s) : Hash[entry.map { |k, v| [k.to_s, v.to_s] }]
-      if !hash['data'].nil? && !@erb_variables.nil?
+      if !hash['data'].nil? && !@erb_variables.nil? && hash['type'] != 'binary'
         @erb_variables.each do |k, v|
           hash['data'].gsub! v.to_s, "<%= #{k} %>"
         end
@@ -103,11 +96,11 @@ module WebSocketVCR
     end
 
     def next
-      RecordEntry.parse(@record_entries.shift)
+      RecordEntry.parse(@record_entries.shift, @erb_variables)
     end
 
     def head
-      @record_entries.empty? ? nil : RecordEntry.parse(@record_entries.first)
+      @record_entries.empty? ? nil : RecordEntry.parse(@record_entries.first, @erb_variables)
     end
 
     def method_missing(method_name, *args, &block)
@@ -116,25 +109,33 @@ module WebSocketVCR
   end
 
   class RecordedJsonSession < RecordedSession
-    def self.load(json)
-      json.map { |session| RecordedJsonSession.new(session) }
+    def self.load(json, erb_variables = nil)
+      json.map { |session| RecordedJsonSession.new(session, erb_variables) }
     end
   end
 
   class RecordedYamlSession < RecordedSession
-    def self.load(yaml)
-      yaml['websocket_interactions'].map { |session| RecordedYamlSession.new(session) }
+    def self.load(yaml, erb_variables = nil)
+      yaml['websocket_interactions'].map { |session| RecordedYamlSession.new(session, erb_variables) }
     end
   end
 
   class RecordEntry
     attr_accessor :operation, :type, :data
 
-    def self.parse(obj)
+    def self.parse(obj, erb_variables = nil)
       record_entry = RecordEntry.new
       record_entry.operation = obj['operation']
       record_entry.type = obj['type'] if obj['type']
       record_entry.data = obj['data'] if obj['data']
+
+      # do the ERB substitution
+      if erb_variables && record_entry.type != 'binary'
+        require 'ostruct'
+        namespace = OpenStruct.new(erb_variables)
+        record_entry.data = ERB.new(record_entry.data).result(namespace.instance_eval { binding })
+      end
+
       record_entry
     end
   end

data/lib/simple_websocket_vcr/recordable_websocket_client.rb

@@ -79,16 +79,16 @@ module WebSocketVCR
       if @live
         rec = @session
         @client.on(event, params) do |msg|
-          data = msg.type == :text ? msg.data : Base64.decode64(msg.data)
+          data = msg.type.to_s == 'text' ? msg.data : Base64.encode64(msg.data)
           rec.store(operation: 'read', type: msg.type, data: data)
           yield(msg)
         end
       else
-        wait_for_reads(event, params[:once])
+        wait_for_reads(event) unless @thread && @thread.alive?
       end
     end
 
-    def wait_for_reads(event, once = false)
+    def wait_for_reads(event)
       @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
@@ -97,7 +97,7 @@ module WebSocketVCR
             if @session.head.operation == 'read'
               record = @session.next
               data = record.data
-              data = Base64.decode64(msg) if record.type != 'text'
+              data = Base64.decode64(data) if record.type != 'text'
               data = ::WebSocket::Frame::Data.new(data)
 
               def data.data
@@ -105,7 +105,7 @@ module WebSocketVCR
               end
 
               emit(event, data)
-              break if once
+              break if __events.empty?
             else
               sleep 0.1 # TODO: config
             end

data/lib/simple_websocket_vcr/version.rb

@@ -1,3 +1,3 @@
 module WebSocketVCR
-  VERSION = '0.0.7'
+  VERSION = '0.1.0'
 end

data/spec/fixtures/vcr_cassettes/EXPLICIT/some_explicitly_specified_cassette_should_be_re-recorded.yml

@@ -0,0 +1,46 @@
+---
+websocket_interactions:
+- - operation: read
+    type: text
+    data: WelcomeResponse={"sessionId":"_Q8LZN4jeyX27Qb2qjiz_3HR9Ckoa1S-pHMaJi9q"}
+  - operation: write
+    data: something_1
+  - 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.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
+    data: something_2
+  - 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.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/vcr_spec.rb

@@ -157,20 +157,30 @@ describe 'VCR for WS' do
     WebSocketVCR.configure do |c|
       c.hook_uris = [HOST]
     end
-    cassette_path = '/EXPLICIT/some_explicitly_specified_cassette_that_should_be_re-recorded'
+    cassette_path = '/EXPLICIT/some_explicitly_specified_cassette_should_be_re-recorded'
+
+    # run the test for the 1st time
     WebSocketVCR.use_cassette(cassette_path) do
       test_complex
     end
+    if ON_TRAVIS
+      expect do
+        WebSocketVCR.use_cassette(cassette_path, record: :all) do
+          test_complex
+        end
+        fail 'this code should not be reachable'
+      end.to raise_error(/Connection refused/)
+    else
+      file_path = "#{WebSocketVCR.configuration.cassette_library_dir}#{cassette_path}.yml"
+      original_last_modified = File.mtime(file_path)
 
-    file_path = "#{WebSocketVCR.configuration.cassette_library_dir}#{cassette_path}.yml"
-    original_last_modified = File.mtime(file_path)
-
-    # run the test again w/ record: :all option set
-    WebSocketVCR.use_cassette(cassette_path, record: :all) do
-      test_complex
+      # run the test again w/ record: :all option set
+      WebSocketVCR.use_cassette(cassette_path, record: :all) do
+        test_complex
+      end
+      new_last_modified = File.mtime(file_path)
+      expect(original_last_modified).to be < new_last_modified
     end
-    new_last_modified = File.mtime(file_path)
-    expect(original_last_modified).to be < new_last_modified
   end
 
   context 'automatically picked cassette name is ok, when using context foo' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple-websocket-vcr
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Jirka Kremser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2017-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-client-simple
@@ -147,7 +147,7 @@ files:
 - lib/simple_websocket_vcr/recordable_websocket_client.rb
 - lib/simple_websocket_vcr/version.rb
 - simple-websocket-vcr.gemspec
-- spec/fixtures/vcr_cassettes/EXPLICIT/.gitignore
+- spec/fixtures/vcr_cassettes/EXPLICIT/some_explicitly_specified_cassette_should_be_re-recorded.yml
 - spec/fixtures/vcr_cassettes/EXPLICIT/some_explicitly_specified_json_cassette.json
 - spec/fixtures/vcr_cassettes/EXPLICIT/some_explicitly_specified_yaml_cassette.yml
 - spec/fixtures/vcr_cassettes/EXPLICIT/some_other_template.yml
@@ -184,12 +184,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: simple_websocket_vcr is VCR add-on for websockets.
 test_files:
-- spec/fixtures/vcr_cassettes/EXPLICIT/.gitignore
+- spec/fixtures/vcr_cassettes/EXPLICIT/some_explicitly_specified_cassette_should_be_re-recorded.yml
 - spec/fixtures/vcr_cassettes/EXPLICIT/some_explicitly_specified_json_cassette.json
 - spec/fixtures/vcr_cassettes/EXPLICIT/some_explicitly_specified_yaml_cassette.yml
 - spec/fixtures/vcr_cassettes/EXPLICIT/some_other_template.yml
@@ -206,4 +206,3 @@ test_files:
 - spec/fixtures/vcr_cassettes/VCR_for_WS/should_record_the_very_first_message_caught_on_the_client_yielded_by_the_connect_method.yml
 - spec/spec_helper.rb
 - spec/vcr_spec.rb
-has_rdoc: 

data/spec/fixtures/vcr_cassettes/EXPLICIT/.gitignore

@@ -1 +0,0 @@
-some_explicitly_specified_cassette_that_should_be_re-recorded.*