textutils 0.9.6 → 0.9.7
Sign up to get free protection for your applications and to get access to all the features.
@@ -13,16 +13,15 @@ class FixtureReader
|
|
13
13
|
include LogUtils::Logging
|
14
14
|
|
15
15
|
|
16
|
-
def self.from_zip( zip_file,
|
16
|
+
def self.from_zip( zip_file, entry_path )
|
17
|
+
entry = zip_file.find_entry( entry_path )
|
17
18
|
|
18
|
-
## fix:
|
19
|
-
##
|
20
|
-
|
19
|
+
## todo/fix: add force encoding to utf-8 ??
|
20
|
+
## check!!!
|
21
|
+
## clean/prepprocess lines
|
22
|
+
## e.g. CR/LF (/r/n) to LF (e.g. /n)
|
23
|
+
text = entry.get_input_stream().read()
|
21
24
|
|
22
|
-
path = name.end_with?('.txt') ? name : "#{name}.txt"
|
23
|
-
|
24
|
-
## get text content from zip
|
25
|
-
text = zip_file.read( path )
|
26
25
|
self.from_string( text )
|
27
26
|
end
|
28
27
|
|
@@ -10,30 +10,16 @@ class ValuesReader
|
|
10
10
|
include TextUtils::ValueHelper # e.g. includes find_grade, find_key_n_title
|
11
11
|
|
12
12
|
|
13
|
-
def self.from_zip( zip_file,
|
14
|
-
## fix: check if name ends in .txt ?? if not add .txt
|
15
|
-
## change name to path ?? e.g. make it required to pass in full entry path??
|
16
|
-
### fix -fix -fix => change name to path
|
17
|
-
|
18
|
-
path = name.end_with?('.txt') ? name : "#{name}.txt"
|
19
|
-
|
20
|
-
## fix: move out of from_zip
|
21
|
-
# map name to name_real_path
|
22
|
-
# name might include !/ for virtual path (gets cut off)
|
23
|
-
# e.g. at-austria!/w-wien/beers becomse w-wien/beers
|
24
|
-
|
25
|
-
pos = path.index( '!/')
|
26
|
-
if pos.nil?
|
27
|
-
real_path = path # not found; real path is the same as name
|
28
|
-
else
|
29
|
-
# cut off everything until !/ e.g.
|
30
|
-
# at-austria!/w-wien/beers becomes
|
31
|
-
# w-wien/beers
|
32
|
-
real_path = path[ (pos+2)..-1 ]
|
33
|
-
end
|
34
|
-
|
13
|
+
def self.from_zip( zip_file, entry_path, more_attribs={} )
|
35
14
|
## get text content from zip
|
36
|
-
|
15
|
+
|
16
|
+
entry = zip_file.find_entry( entry_path )
|
17
|
+
|
18
|
+
## todo/fix: add force encoding to utf-8 ??
|
19
|
+
## check!!!
|
20
|
+
## clean/prepprocess lines
|
21
|
+
## e.g. CR/LF (/r/n) to LF (e.g. /n)
|
22
|
+
text = entry.get_input_stream().read()
|
37
23
|
|
38
24
|
self.from_string( text, more_attribs )
|
39
25
|
end
|
data/lib/textutils/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: textutils
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.9.
|
4
|
+
version: 0.9.7
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2014-11-
|
12
|
+
date: 2014-11-06 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: props
|
16
|
-
requirement: &
|
16
|
+
requirement: &69523480 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: '0'
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *69523480
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: logutils
|
27
|
-
requirement: &
|
27
|
+
requirement: &69523230 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ! '>='
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: '0'
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *69523230
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: rubyzip
|
38
|
-
requirement: &
|
38
|
+
requirement: &69522980 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ! '>='
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: '0'
|
44
44
|
type: :runtime
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *69522980
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: activesupport
|
49
|
-
requirement: &
|
49
|
+
requirement: &69522750 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ! '>='
|
@@ -54,10 +54,10 @@ dependencies:
|
|
54
54
|
version: '0'
|
55
55
|
type: :runtime
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *69522750
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: rdoc
|
60
|
-
requirement: &
|
60
|
+
requirement: &69520650 !ruby/object:Gem::Requirement
|
61
61
|
none: false
|
62
62
|
requirements:
|
63
63
|
- - ~>
|
@@ -65,10 +65,10 @@ dependencies:
|
|
65
65
|
version: '4.0'
|
66
66
|
type: :development
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
68
|
+
version_requirements: *69520650
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: hoe
|
71
|
-
requirement: &
|
71
|
+
requirement: &69520320 !ruby/object:Gem::Requirement
|
72
72
|
none: false
|
73
73
|
requirements:
|
74
74
|
- - ~>
|
@@ -76,7 +76,7 @@ dependencies:
|
|
76
76
|
version: '3.12'
|
77
77
|
type: :development
|
78
78
|
prerelease: false
|
79
|
-
version_requirements: *
|
79
|
+
version_requirements: *69520320
|
80
80
|
description: textutils - Text Filters, Helpers, Readers and More
|
81
81
|
email: ruby-talk@ruby-lang.org
|
82
82
|
executables: []
|