tootsie 0.9.20 → 0.9.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/lib/tootsie/image_metadata_extractor.rb +34 -13
  2. data/lib/tootsie/version.rb +1 -1
  3. metadata +34 -34
data/lib/tootsie/image_metadata_extractor.rb CHANGED
@@ -53,19 +53,7 @@ module Tootsie
53
53
  value = nil
54
54
  end
55
55
  else
56
- utf8 = value.dup.force_encoding('utf-8')
57
- if utf8.valid_encoding?
58
- value = utf8
59
- else
60
- begin
61
- value = value.encode('utf-8', 'iso-8859-1')
62
- rescue EncodingError
63
- if @logger
64
- @logger.warn "Invalid characters in EXIF data that are neither UTF-8 nor ISO-8859-1, ignoring it: #{value.inspect}"
65
- end
66
- value = nil
67
- end
68
- end
56
+ value = decode_string(value)
69
57
  end
70
58
  if value
71
59
  entry = {:value => value, :type => type.underscore}
@@ -75,5 +63,38 @@ module Tootsie
75
63
  end
76
64
  end
77
65
 
66
+ def decode_string(value)
67
+ if value.respond_to?(:force_encoding) # Ruby 1.9
68
+ utf8 = value.dup.force_encoding('utf-8')
69
+ if utf8.valid_encoding?
70
+ value = utf8
71
+ else
72
+ begin
73
+ value = value.encode('utf-8', 'iso-8859-1')
74
+ rescue EncodingError
75
+ if @logger
76
+ @logger.warn "Invalid characters in EXIF data that are neither UTF-8 nor ISO-8859-1, ignoring it: #{value.inspect}"
77
+ end
78
+ value = nil
79
+ end
80
+ end
81
+ else # Ruby 1.8
82
+ require 'iconv'
83
+ begin
84
+ Iconv.iconv("utf-8", "utf-8", value)
85
+ rescue Iconv::IllegalSequence, Iconv::InvalidCharacter
86
+ begin
87
+ value = Iconv.iconv("utf-8", "iso-8859-1", value)[0]
88
+ rescue Exception => e
89
+ if @logger
90
+ @logger.warn "Invalid encoding in EXIF data, ignoring value: #{value.inspect}"
91
+ end
92
+ value = nil
93
+ end
94
+ end
95
+ end
96
+ value
97
+ end
98
+
78
99
  end
79
100
  end
data/lib/tootsie/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Tootsie
2
- VERSION = '0.9.20'
2
+ VERSION = '0.9.22'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tootsie
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.20
4
+ version: 0.9.22
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: 2012-03-05 00:00:00.000000000 Z
12
+ date: 2012-03-05 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: json
16
- requirement: &70325833005200 !ruby/object:Gem::Requirement
16
+ requirement: &70096253482980 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 1.6.5
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70325833005200
24
+ version_requirements: *70096253482980
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: sinatra
27
- requirement: &70325833004580 !ruby/object:Gem::Requirement
27
+ requirement: &70096253482300 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '1.0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70325833004580
35
+ version_requirements: *70096253482300
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: activesupport
38
- requirement: &70325833004040 !ruby/object:Gem::Requirement
38
+ requirement: &70096253481660 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 3.0.0
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70325833004040
46
+ version_requirements: *70096253481660
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: httpclient
49
- requirement: &70325833003460 !ruby/object:Gem::Requirement
49
+ requirement: &70096253480880 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 2.2.1
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70325833003460
57
+ version_requirements: *70096253480880
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: builder
60
- requirement: &70325833002620 !ruby/object:Gem::Requirement
60
+ requirement: &70096253479880 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 2.1.2
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70325833002620
68
+ version_requirements: *70096253479880
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: mime-types
71
- requirement: &70325833001320 !ruby/object:Gem::Requirement
71
+ requirement: &70096253479140 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '1.16'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *70325833001320
79
+ version_requirements: *70096253479140
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: xml-simple
82
- requirement: &70325833016980 !ruby/object:Gem::Requirement
82
+ requirement: &70096253478300 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ~>
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: 1.0.12
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *70325833016980
90
+ version_requirements: *70096253478300
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: thin
93
- requirement: &70325833016200 !ruby/object:Gem::Requirement
93
+ requirement: &70096253477520 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ~>
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: 1.2.7
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *70325833016200
101
+ version_requirements: *70096253477520
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: s3
104
- requirement: &70325833014980 !ruby/object:Gem::Requirement
104
+ requirement: &70096253476740 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ~>
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: 0.3.8
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *70325833014980
112
+ version_requirements: *70096253476740
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: bunny
115
- requirement: &70325833013400 !ruby/object:Gem::Requirement
115
+ requirement: &70096253475960 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ~>
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: 0.7.8
121
121
  type: :runtime
122
122
  prerelease: false
123
- version_requirements: *70325833013400
123
+ version_requirements: *70096253475960
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: sqs
126
- requirement: &70325833012720 !ruby/object:Gem::Requirement
126
+ requirement: &70096253474760 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ~>
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: 0.1.2
132
132
  type: :runtime
133
133
  prerelease: false
134
- version_requirements: *70325833012720
134
+ version_requirements: *70096253474760
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: unicorn
137
- requirement: &70325833012120 !ruby/object:Gem::Requirement
137
+ requirement: &70096253472420 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ~>
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: 4.1.1
143
143
  type: :runtime
144
144
  prerelease: false
145
- version_requirements: *70325833012120
145
+ version_requirements: *70096253472420
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: i18n
148
- requirement: &70325833011600 !ruby/object:Gem::Requirement
148
+ requirement: &70096253471680 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
153
153
  version: 0.4.2
154
154
  type: :runtime
155
155
  prerelease: false
156
- version_requirements: *70325833011600
156
+ version_requirements: *70096253471680
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: scashin133-syslog_logger
159
- requirement: &70325833011040 !ruby/object:Gem::Requirement
159
+ requirement: &70096253470740 !ruby/object:Gem::Requirement
160
160
  none: false
161
161
  requirements:
162
162
  - - ~>
@@ -164,10 +164,10 @@ dependencies:
164
164
  version: 1.7.3
165
165
  type: :runtime
166
166
  prerelease: false
167
- version_requirements: *70325833011040
167
+ version_requirements: *70096253470740
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: rspec
170
- requirement: &70325833010420 !ruby/object:Gem::Requirement
170
+ requirement: &70096253469920 !ruby/object:Gem::Requirement
171
171
  none: false
172
172
  requirements:
173
173
  - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
175
175
  version: '0'
176
176
  type: :development
177
177
  prerelease: false
178
- version_requirements: *70325833010420
178
+ version_requirements: *70096253469920
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: rake
181
- requirement: &70325833009500 !ruby/object:Gem::Requirement
181
+ requirement: &70096253469060 !ruby/object:Gem::Requirement
182
182
  none: false
183
183
  requirements:
184
184
  - - ! '>='
@@ -186,7 +186,7 @@ dependencies:
186
186
  version: '0'
187
187
  type: :development
188
188
  prerelease: false
189
- version_requirements: *70325833009500
189
+ version_requirements: *70096253469060
190
190
  description: Tootsie is a simple audio/video/image transcoding/modification application.
191
191
  email:
192
192
  - alex@origo.no