uv-rays 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 026fc66184b7c4e5ef1f3495481ba5e469540fef
-  data.tar.gz: f97d7dfacd1fa1afb821e75c4561f16a855bc397
+  metadata.gz: 144879cc69e227ca059cecbd2b4abf92d6fd0284
+  data.tar.gz: e57957308a1ba65488d48e8c451794161af23476
 SHA512:
-  metadata.gz: 8bed0f3074a3000685e04f311c385fde102dc34494a16b7c5934418031514febe3c3f3e366c9885f874ebaf7dfeaacaa3309ec5719e761e18a95f1b51a463e39
-  data.tar.gz: 148a330ff8f7a551116f1483b4a5a7453975b7af3b6553df7f2e71e97fd2982bc99982191a8486c9a30ddb79ed5c879e6a73032a7fe7440e5935df8eb0a76a2c
+  metadata.gz: 518a38b3f152899f36af5cd9488ffd1cd6ec7f983ca01cb8e909e8f831de9a7ee049fe8dbffe6e9b6bf2d2366e34907fb2ff5dd3f945b55de63a5ec6319510c7
+  data.tar.gz: 21751e286a6a2aa6e9dbd873c1712611dff769a52778fadaeb6d1b88600682c6be8d243f6995c64ae960578356cdc20b9a36e3b432704cf6bff59a0f8d2a4bae

data/lib/uv-rays/buffered_tokenizer.rb

@@ -22,19 +22,22 @@ module UV
         def initialize(options)
             @delimiter  = options[:delimiter]
             @indicator  = options[:indicator]
+            @msg_length = options[:msg_length]
             @size_limit = options[:size_limit]
             @min_length = options[:min_length] || 1
             @verbose    = options[:verbose] if @size_limit
             @encoding   = options[:encoding]
 
-            raise ArgumentError, 'no delimiter provided' unless @delimiter
-
-            @input = ''
-            if @encoding
-                @input.force_encoding(@encoding)
-                @delimiter.force_encoding(@encoding) if @delimiter.is_a?(String)
-                @indicator.force_encoding(@encoding) if @indicator.is_a?(String)
+            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'
             end
+
+            init_buffer
         end
 
         # Extract takes an arbitrary string of input data and returns an array of
@@ -50,6 +53,29 @@ module UV
             data.force_encoding(@encoding) if @encoding
             @input << data
 
+            @extract_method.call
+        end
+
+        # Flush the contents of the input buffer, i.e. return the input buffer even though
+        # a token has not yet been encountered.
+        #
+        # @return [String]
+        def flush
+            buffer = @input
+            reset
+            buffer
+        end
+
+        # @return [Boolean]
+        def empty?
+            @input.empty?
+        end
+
+
+        private
+
+
+        def delimiter_extract
             # Extract token-delimited entities from the input string with the split command.
             # There's a bit of craftiness here with the -1 parameter.    Normally split would
             # behave no differently regardless of if the token lies at the very end of the
@@ -70,7 +96,38 @@ module UV
                 @input = entities.pop
             end
 
-            # Check to see if the buffer has exceeded capacity, if we're imposing a limit
+            check_buffer_limits
+
+            # Check min-length is met
+            entities.select! {|msg| msg.length >= @min_length}
+
+            return entities
+        end
+
+        def length_extract
+            messages = @input.split(@indicator, -1)
+            messages.shift # discard junk data
+
+            last = messages.pop || ''
+
+            # 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] }
+
+            if last.length >= @msg_length
+                messages << last[0..@length_index]
+                @input = last[@msg_length..-1]
+            else
+                @input = "#{@indicator}#{last}"
+            end
+
+            check_buffer_limits
+
+            return messages
+        end
+
+        # Check to see if the buffer has exceeded capacity, if we're imposing a limit
+        def check_buffer_limits
             if @size_limit && @input.size > @size_limit
                 if @indicator && @indicator.respond_to?(:length) # check for regex
                     # save enough of the buffer that if one character of the indicator were
@@ -83,32 +140,17 @@ module UV
                 end
                 raise 'input buffer exceeded limit' if @verbose
             end
-
-            # Check min-length is met
-            entities.select! {|msg| msg.length >= @min_length}
-
-            return entities
-        end
-
-        # Flush the contents of the input buffer, i.e. return the input buffer even though
-        # a token has not yet been encountered.
-        #
-        # @return [String]
-        def flush
-            buffer = @input
-            reset
-            buffer
         end
 
-        # @return [Boolean]
-        def empty?
-            @input.empty?
+        def init_buffer
+            @input = ''
+            if @encoding
+                @input.force_encoding(@encoding)
+                @delimiter.force_encoding(@encoding) if @delimiter.is_a?(String)
+                @indicator.force_encoding(@encoding) if @indicator.is_a?(String)
+            end
         end
 
-
-        private
-
-
         def reset
             @input = ''
             @input.force_encoding(@encoding) if @encoding

data/lib/uv-rays/scheduler/time.rb

@@ -27,7 +27,7 @@ module UV
     class Scheduler
 
         def self.parse_in(o, quiet = false)
-            # if o is an integer we are looking at seconds
+            # if o is an integer we are looking at ms
             o.is_a?(String) ? parse_duration(o, quiet) : o
         end
 

data/lib/uv-rays/version.rb

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

data/spec/buffered_tokenizer_spec.rb

@@ -173,6 +173,77 @@ describe UV::BufferedTokenizer do
         end
     end
 
+    describe 'indicator with length' do
+        before :each do
+            @buffer = UV::BufferedTokenizer.new({
+                indicator: "GO",
+                msg_length: 4 # length without the indicator
+            })
+        end
+
+        it "should not return anything when a complete message is not available" do
+            msg1 = "GO123"
+
+            result = @buffer.extract(msg1)
+            expect(result).to eq([])
+        end
+
+        it "should not return anything when the messages is empty" do
+            msg1 = ""
+
+            result = @buffer.extract(msg1)
+            expect(result).to eq([])
+        end
+
+        it "should tokenize messages where the data is a complete message" do
+            msg1 = "GO1234"
+
+            result = @buffer.extract(msg1)
+            expect(result).to eq(['1234'])
+        end
+
+        it "should discard data that is not relevant" do
+            msg1 = "1234-GO1234"
+
+            result = @buffer.extract(msg1)
+            expect(result).to eq(['1234'])
+        end
+
+        it "should return multiple complete messages" do
+            msg1 = "GO1234GOhome"
+
+            result = @buffer.extract(msg1)
+            expect(result).to eq(['1234', 'home'])
+        end
+
+        it "should discard data between multiple complete messages" do
+            msg1 = "1234-GO123412345-GOhome"
+
+            result = @buffer.extract(msg1)
+            expect(result).to eq(['1234', 'home'])
+        end
+
+        it "should tokenize messages where the indicator is split" do
+            msg1 = "GOtestG"
+            msg2 = "Owhoa"
+
+            result = @buffer.extract(msg1)
+            expect(result).to eq(['test'])
+            result = @buffer.extract(msg2)
+            expect(result).to eq(['whoa'])
+        end
+
+        it "should tokenize messages where the indicator is split and there is discard data" do
+            msg1 = "GOtest\n\r1234G"
+            msg2 = "Owhoa\n"
+
+            result = @buffer.extract(msg1)
+            expect(result).to eq(['test'])
+            result = @buffer.extract(msg2)
+            expect(result).to eq(['whoa'])
+        end
+    end
+
     describe 'buffer size limit with indicator' do
         before :each do
             @buffer = UV::BufferedTokenizer.new({

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uv-rays
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libuv
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Abstractions for working with Libuv