uv-rays 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 144879cc69e227ca059cecbd2b4abf92d6fd0284
-  data.tar.gz: e57957308a1ba65488d48e8c451794161af23476
+  metadata.gz: 7b968faec5c418f8ee37b41606159333d3f0458f
+  data.tar.gz: d0ba56974349746c9db68e4b52abdf26bc60803c
 SHA512:
-  metadata.gz: 518a38b3f152899f36af5cd9488ffd1cd6ec7f983ca01cb8e909e8f831de9a7ee049fe8dbffe6e9b6bf2d2366e34907fb2ff5dd3f945b55de63a5ec6319510c7
-  data.tar.gz: 21751e286a6a2aa6e9dbd873c1712611dff769a52778fadaeb6d1b88600682c6be8d243f6995c64ae960578356cdc20b9a36e3b432704cf6bff59a0f8d2a4bae
+  metadata.gz: 2eb3efe38bb16b15ee9b90fbe049c40b09effecdcdd142eb309a90fb07ddbf287d3cfe090668b141aad692f595f568d913e03a2d656ccfea78f7d931b14adadf
+  data.tar.gz: ff93f781f3e477cdaa01040ce49c150555254366a5b344a15152e9e5b8825354cb6a29aac5d1b01733060b2cc1adcc4652485de00ca756ff94ad724d86f529d8

data/lib/uv-rays/abstract_tokenizer.rb

@@ -47,7 +47,8 @@ module UV
 
                 entities = []
                 messages.each do |msg|
-                    entities << msg if @callback.call(msg)
+                    result = @callback.call(msg)
+                    entities << msg[0...result] if result
                 end
 
                 # Check if buffering is required

data/lib/uv-rays/buffered_tokenizer.rb

@@ -31,7 +31,6 @@ module UV
             if @delimiter
                 @extract_method = method(:delimiter_extract)
             elsif @indicator && @msg_length
-                @length_index = @msg_length - 1
                 @extract_method = method(:length_extract)
             else
                 raise ArgumentError, 'no delimiter provided'
@@ -112,13 +111,13 @@ module UV
 
             # Select messages of the right size then remove junk data
             messages.select! { |msg| msg.length >= @msg_length ? true : false }
-            messages.map! { |msg| msg[0..@length_index] }
+            messages.map! { |msg| msg[0...@msg_length] }
 
             if last.length >= @msg_length
-                messages << last[0..@length_index]
+                messages << last[0...@msg_length]
                 @input = last[@msg_length..-1]
             else
-                @input = "#{@indicator}#{last}"
+                reset("#{@indicator}#{last}")
             end
 
             check_buffer_limits
@@ -151,8 +150,8 @@ module UV
             end
         end
 
-        def reset
-            @input = ''
+        def reset(value = '')
+            @input = value
             @input.force_encoding(@encoding) if @encoding
         end
     end

data/lib/uv-rays/version.rb

@@ -1,3 +1,3 @@
 module UV
-    VERSION = '1.0.5'
+    VERSION = '1.0.6'
 end

data/spec/abstract_tokenizer_spec.rb

@@ -41,6 +41,14 @@ describe UV::AbstractTokenizer do
         expect(result).to eq(['1234', '1234'])
         expect(@buffer.flush).to eq('56')    # as we've indicated a message length of 4
     end
+
+    it "should not return junk data" do
+        msg1 = "Start123456Start123456"
+
+        result = @buffer.extract(msg1)
+        expect(result).to eq(['1234', '1234'])
+        expect(@buffer.flush).to eq('56')    # as we've indicated a message length of 4
+    end
     
     it "should tokenize messages where the indicator is split" do
         msg1 = "123Star"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uv-rays
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libuv