rflow-components-file 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa2b086c386d304dd154c6729041e1add17af281
-  data.tar.gz: 7300dc71ae866472d2a0438e3c35f5d0a19ac817
+  metadata.gz: b3fb18f29b55805334491346a6b5367fd9d2b0aa
+  data.tar.gz: 9d34329433db0a8bfe12ed2571407bcdcc60e087
 SHA512:
-  metadata.gz: 8fe8e5744a4cca4fc3c997df67c5fe086c67b9bb94b0b056a8f965ae1a55082ffb96d6aa9a672823ef350fb0559c5b0c1c45b8d6688d39844c89cd0ad6619407
-  data.tar.gz: 23709aef638491a3beb52d65b7af50d5022a592757aaac3f31505abf4407c06c8348838bd67dfd2c2548c3071159dd3923cb132c6299d49443504471807d1bb3
+  metadata.gz: 7ca31d49b46b5cf32922db20d8cc3d2c9dfe11891c3805ddbebea19df4b0d08cb104918d1c2c3f468b2e0a6b8f03a5bb64022519078e46e9b3ae580d448962d3
+  data.tar.gz: 211b962929e93b7dd6f3147bad0336370e7ad653842dede1584d8005f7f2c0d3ab2fb13baf4447b4d443653a1d6ce9e77a3de89568230f374894d293decc02b6

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.2
+ruby-2.3.1

data/lib/rflow/components/file/output_to_disk.rb

@@ -1,3 +1,5 @@
+require 'uuidtools'
+
 class RFlow
   module Components
     module File
@@ -30,7 +32,6 @@ class RFlow
         # if passed properties, will look for data_uuid property and use as suffix preamble
         def write_to_file(properties)
           properties ||= {}
-          @output_file_entropy = 1
           begin
             final_output_file_name = output_file_name(properties)
 
@@ -48,11 +49,7 @@ class RFlow
             end
             ::File.rename(temp_output_file_path, final_output_file_path)
             final_output_file_path
-          rescue Errno::EEXIST => e
-            RFlow.logger.debug { "#{self.class}: File #{temp_output_file_path} exists, increasing entropy" }
-            @output_file_entropy += 1
-            retry
-          rescue StandardError => e
+          rescue StandardError, Errno::EEXIST => e
             RFlow.logger.error { "#{self.class} encountered #{e.message} when creating #{temp_output_file_path}" }
             begin
               ::File.delete(temp_output_file_path)
@@ -65,12 +62,9 @@ class RFlow
 
         private
         def output_file_name(properties)
-          uuid = properties['data_uuid']
-          "#{file_name_prefix}.#{current_timestamp}.#{output_file_entropy_string}#{uuid ? ".#{uuid}" : ''}#{file_name_suffix}"
-        end
-
-        def output_file_entropy_string
-          sprintf("%04d", @output_file_entropy || 1)
+          uuid = properties['data_uuid'] || UUIDTools::UUID.random_create.to_s
+          priority = properties['priority'] || 0
+          "#{file_name_prefix}.#{'%03d' % priority}.#{current_timestamp}.#{uuid}#{file_name_suffix}"
         end
 
         def current_timestamp

data/lib/rflow/components/file/version.rb

@@ -1,7 +1,7 @@
 class RFlow
   module Components
     module File
-      VERSION = "1.1.1"
+      VERSION = "1.2.0"
     end
   end
 end

data/spec/rflow/components/file/output_raw_to_files_spec.rb

@@ -13,12 +13,22 @@ class RFlow
         let(:component) { described_class.new.tap {|c| c.configure!(config) } }
 
         it 'should correctly process file name prefix/suffix when given message properties with no uuid' do
-          expect(component.send(:output_file_name, {})).to match(/boom.*0001.town/)
+          expect(component.send(:output_file_name, {})).to match(/boom\.000\..+\.[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\.town/)
         end
 
-        it 'should correctly process file name prefix/suffix when given message properties' do
+        it 'should correctly process file name prefix/suffix when given message properties with priority' do
+          props = { 'priority' => 5 }
+          expect(component.send(:output_file_name, props)).to match(/boom\.005\..+\.[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\.town/)
+        end
+
+        it 'should correctly process file name prefix/suffix when given message properties with uuid' do
           props = { 'data_uuid' => 'uuid' }
-          expect(component.send(:output_file_name, props)).to match(/boom.*\.0001\.uuid\.town/)
+          expect(component.send(:output_file_name, props)).to match(/boom\.000\..+\.uuid\.town/)
+        end
+
+        it 'should correctly process file name prefix/suffix when given message properties with uuid and priority' do
+          props = { 'data_uuid' => 'uuid', 'priority' => 5 }
+          expect(component.send(:output_file_name, props)).to match(/boom\.005\..+\.uuid\.town/)
         end
 
         it "should do stuff" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rflow-components-file
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Michael L. Artz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rflow
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rflow-components-file
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Components that operate on files for the RFlow FBP framework