data_collector 0.23.0 → 0.24.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/data_collector/input/dir.rb +1 -1
- data/lib/data_collector/input/generic.rb +1 -1
- data/lib/data_collector/input.rb +5 -1
- data/lib/data_collector/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7745e79eb3836ab3c469cc5da39f395d42c144940b98115c96058fb01f8a629c
|
4
|
+
data.tar.gz: 77aeb246a6a23477d07195c020091999825af21c9639c0a9679017daefeea9e9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e48596ac6e5fc14be89c2aadc50416558fa4a08594d28cccee630c1157dc365a556999c82d303e4669c94e1db88d6b0cf3f044730d0057586220a6c3172b72a6
|
7
|
+
data.tar.gz: 2112dfa9191e8aa948317a16d581a9ea487327030cb013b43937757c144c33ca4fc975faee91fd6731d8f043ed0cefd5ecc28a562351c5de9b96196167871e36
|
@@ -26,7 +26,7 @@ module DataCollector
|
|
26
26
|
private
|
27
27
|
|
28
28
|
def create_listener
|
29
|
-
absolute_path = File.absolute_path("#{
|
29
|
+
absolute_path = File.absolute_path("#{@uri.host}#{@uri.path}")
|
30
30
|
raise DataCollector::Error, "#{@uri.to_s} not found" unless File.exist?(absolute_path)
|
31
31
|
|
32
32
|
@listener ||= Listen.to(absolute_path, @options) do |modified, added, _|
|
@@ -4,7 +4,7 @@ module DataCollector
|
|
4
4
|
class Input
|
5
5
|
class Generic
|
6
6
|
def initialize(uri, options = {})
|
7
|
-
@uri = URI(URI.decode_uri_component(uri.to_s))
|
7
|
+
@uri = URI(URI.decode_uri_component(uri.to_s)) #"#{uri.scheme}://#{URI.decode_uri_component(uri.host)}#{URI.decode_uri_component(uri.path)}"
|
8
8
|
@options = options
|
9
9
|
@running = false
|
10
10
|
|
data/lib/data_collector/input.rb
CHANGED
@@ -160,7 +160,8 @@ module DataCollector
|
|
160
160
|
|
161
161
|
def from_file(uri, options = {})
|
162
162
|
data = nil
|
163
|
-
|
163
|
+
uri = normalize_uri(uri)
|
164
|
+
absolute_path = File.absolute_path(uri)
|
164
165
|
raise DataCollector::Error, "#{uri.to_s} not found" unless File.exist?("#{absolute_path}")
|
165
166
|
unless options.has_key?('raw') && options['raw'] == true
|
166
167
|
@raw = data = File.read("#{absolute_path}")
|
@@ -233,5 +234,8 @@ module DataCollector
|
|
233
234
|
return file_type
|
234
235
|
end
|
235
236
|
|
237
|
+
def normalize_uri(uri)
|
238
|
+
"#{URI.decode_uri_component(uri.host)}#{URI.decode_uri_component(uri.path)}"
|
239
|
+
end
|
236
240
|
end
|
237
241
|
end
|