spiderfw 0.6.31 → 0.6.32

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
- ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- NWEwOTk1YTQzOTMwZGI2MGE4NmQ3MjRlYzg3MTgzM2M5MTFlMmQ1Mg==
5
- data.tar.gz: !binary |-
6
- YTA4MTkwMDdkYjExMzI5YTlmM2YwN2FjMzY3N2ZhN2IxNzRhOWE0YQ==
7
- SHA512:
8
- metadata.gz: !binary |-
9
- MDljZjBhMzhhNTc2NjAxZTcxMGFkZDU3ZmFkNzY4MmRkNzNlNWQzMTM2Nzdl
10
- ZTY0YzQ5YWM5OWZkNTBiZThjYmVmNGNiODk4Yzk5Y2MzYzExYTYzOTM5ZjBm
11
- NDg5NDE4NGJkM2U1MzUyZWY4Zjk4MmZiZWUxYjY5Mjg2M2FiNzI=
12
- data.tar.gz: !binary |-
13
- ZDBjYWE1YWM0YTJiM2RiYmE4MjU3YjNmMDAwZjk2ZmU3YjUyMDZhOTdhMWQz
14
- ZGU5ZDBjMjI4ODljOGM5N2U1Y2I4NzllZjMxYjg3YzUzMTViMmE5NDZmYmU1
15
- NzY1Mjg5NWVkYzMxNGVkZTE5MTEwZmU5YTZlNWVlMmUwMjM3MDM=
1
+ ---
2
+ SHA1:
3
+ data.tar.gz: ed9ddb5b4c1865b4c31b437e6bb1460d3f5f5392
4
+ metadata.gz: bde80c29ac3242b2ece307d7d44c5ff87bc68c94
5
+ SHA512:
6
+ data.tar.gz: 1b78d54308ecddb3ed944e14b8b3e894b31ef34d7138b8e0027df687ee9b284d036030258c6190527d75096cd1097e11cd05b5e6e9d4e94e10672cac6f992131
7
+ metadata.gz: dcc373c6206c502c4b402bf7c376fcd26d4c99b38d1ec10d4ee0a9afa803ef983f476115c476e7e1f8f4e54b2b1d9d02dddc9497e3748ad7ffec0d1bc0c9b6a4
data/CHANGELOG CHANGED
@@ -1,3 +1,8 @@
1
+ == 0.6.32
2
+ * Correzioni per gestione transazioni e metodi per lista per mod cms
3
+ * Aggiunto il force_encoding sui campi della mail per problemi con accenti
4
+ * Correzione al env.rb per problemi di encoding
5
+
1
6
  == 0.6.31
2
7
  * Forzato il logout se password sbagliata per problemi con amministratori servizi
3
8
  * Corretto in table.rb il controllo sugli elementi multipli per problema
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.6.31
1
+ 0.6.32
@@ -47,11 +47,11 @@ module Spider; module Messenger
47
47
  text = ERB.new(IO.read(path)).result(scene_binding)
48
48
  end
49
49
  mail = Mail.new
50
- mail[:to] = to
51
- mail[:from] = from
50
+ mail[:to] = (to.respond_to?(:force_encoding) ? to.force_encoding('UTF-8') : to)
51
+ mail[:from] = (from.respond_to?(:force_encoding) ? from.force_encoding('UTF-8') : from)
52
52
  mail.charset = "UTF-8"
53
53
  headers.each do |key, value|
54
- mail[key] = value
54
+ mail[key] = (value.respond_to?(:force_encoding) ? value.force_encoding('UTF-8') : value)
55
55
  end
56
56
 
57
57
  if html
data/lib/spiderfw/env.rb CHANGED
@@ -1,5 +1,9 @@
1
1
  RUBY_VERSION_PARTS = RUBY_VERSION.split('.')
2
2
  ENV['LC_CTYPE'] = 'en_US.UTF-8'
3
+ if RUBY_VERSION =~ /1.9/
4
+ Encoding.default_external = Encoding::UTF_8
5
+ #Encoding.default_internal = Encoding::UTF_8
6
+ end
3
7
  $SPIDER_PATH ||= File.expand_path(File.dirname(__FILE__)+'/../..')
4
8
  $SPIDER_PATHS ||= {}
5
9
  $SPIDER_PATHS[:core_apps] ||= File.join($SPIDER_PATH, 'apps')
@@ -10,6 +10,15 @@ module Spider; module Model
10
10
  def list_mixin_modified_elements
11
11
  @list_mixin_modified_elements ||= {}
12
12
  end
13
+
14
+
15
+ def _ignore_list!
16
+ @list_mixin_ignore = true
17
+ end
18
+
19
+ def _ignore_list?
20
+ @list_mixin_ignore
21
+ end
13
22
 
14
23
  module MapperMethods
15
24
 
@@ -151,12 +151,12 @@ module Spider; module Model; module Storage; module Db
151
151
 
152
152
 
153
153
  def do_commit
154
- curr[:conn].commit if curr[:conn]
154
+ curr[:conn].commit unless curr[:conn].blank?
155
155
  curr[:in_transaction] = false
156
156
  end
157
157
 
158
158
  def do_rollback
159
- curr[:conn].rollback if curr[:conn]
159
+ curr[:conn].rollback unless curr[:conn].blank?
160
160
  curr[:in_transaction] = false
161
161
  end
162
162
 
@@ -212,7 +212,7 @@ module Spider; module Model; module Storage; module Db
212
212
  return res
213
213
  end
214
214
  rescue => exc
215
- release
215
+ release if !in_transaction?
216
216
  if (exc.message =~ /Duplicate entry/)
217
217
  raise Spider::Model::Storage::DuplicateKey
218
218
  else
@@ -220,7 +220,7 @@ module Spider; module Model; module Storage; module Db
220
220
  end
221
221
  ensure
222
222
  query_finished
223
- release if curr[:conn] && !in_transaction?
223
+ release if !curr[:conn].blank? && !in_transaction?
224
224
  end
225
225
  end
226
226
 
metadata CHANGED
@@ -1,260 +1,188 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: spiderfw
3
- version: !ruby/object:Gem::Version
4
- version: 0.6.31
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.6.32
5
5
  platform: ruby
6
- authors:
6
+ authors:
7
7
  - Ivan Pirlik
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-09-11 00:00:00.000000000 Z
12
- dependencies:
13
- - !ruby/object:Gem::Dependency
11
+
12
+ date: 2014-09-19 00:00:00 Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
14
15
  name: cmdparse
15
- requirement: !ruby/object:Gem::Requirement
16
- requirements:
17
- - - ! '>'
18
- - !ruby/object:Gem::Version
19
- version: 2.0.0
20
- type: :runtime
21
16
  prerelease: false
22
- version_requirements: !ruby/object:Gem::Requirement
23
- requirements:
24
- - - ! '>'
25
- - !ruby/object:Gem::Version
17
+ requirement: &id001 !ruby/object:Gem::Requirement
18
+ requirements:
19
+ - - ">"
20
+ - !ruby/object:Gem::Version
26
21
  version: 2.0.0
27
- - !ruby/object:Gem::Dependency
28
- name: fast_gettext
29
- requirement: !ruby/object:Gem::Requirement
30
- requirements:
31
- - - ! '>='
32
- - !ruby/object:Gem::Version
33
- version: 0.5.13
34
22
  type: :runtime
23
+ version_requirements: *id001
24
+ - !ruby/object:Gem::Dependency
25
+ name: fast_gettext
35
26
  prerelease: false
36
- version_requirements: !ruby/object:Gem::Requirement
37
- requirements:
38
- - - ! '>='
39
- - !ruby/object:Gem::Version
27
+ requirement: &id002 !ruby/object:Gem::Requirement
28
+ requirements:
29
+ - - ">="
30
+ - !ruby/object:Gem::Version
40
31
  version: 0.5.13
41
- - !ruby/object:Gem::Dependency
42
- name: hpricot
43
- requirement: !ruby/object:Gem::Requirement
44
- requirements:
45
- - - ! '>'
46
- - !ruby/object:Gem::Version
47
- version: '0.8'
48
32
  type: :runtime
33
+ version_requirements: *id002
34
+ - !ruby/object:Gem::Dependency
35
+ name: hpricot
49
36
  prerelease: false
50
- version_requirements: !ruby/object:Gem::Requirement
51
- requirements:
52
- - - ! '>'
53
- - !ruby/object:Gem::Version
54
- version: '0.8'
55
- - !ruby/object:Gem::Dependency
56
- name: json_pure
57
- requirement: !ruby/object:Gem::Requirement
58
- requirements:
59
- - - ! '>'
60
- - !ruby/object:Gem::Version
61
- version: '1.1'
37
+ requirement: &id003 !ruby/object:Gem::Requirement
38
+ requirements:
39
+ - - ">"
40
+ - !ruby/object:Gem::Version
41
+ version: "0.8"
62
42
  type: :runtime
43
+ version_requirements: *id003
44
+ - !ruby/object:Gem::Dependency
45
+ name: json_pure
63
46
  prerelease: false
64
- version_requirements: !ruby/object:Gem::Requirement
65
- requirements:
66
- - - ! '>'
67
- - !ruby/object:Gem::Version
68
- version: '1.1'
69
- - !ruby/object:Gem::Dependency
70
- name: uuidtools
71
- requirement: !ruby/object:Gem::Requirement
72
- requirements:
73
- - - ! '>'
74
- - !ruby/object:Gem::Version
75
- version: '2.1'
47
+ requirement: &id004 !ruby/object:Gem::Requirement
48
+ requirements:
49
+ - - ">"
50
+ - !ruby/object:Gem::Version
51
+ version: "1.1"
76
52
  type: :runtime
53
+ version_requirements: *id004
54
+ - !ruby/object:Gem::Dependency
55
+ name: uuidtools
77
56
  prerelease: false
78
- version_requirements: !ruby/object:Gem::Requirement
79
- requirements:
80
- - - ! '>'
81
- - !ruby/object:Gem::Version
82
- version: '2.1'
83
- - !ruby/object:Gem::Dependency
84
- name: rufus-scheduler
85
- requirement: !ruby/object:Gem::Requirement
86
- requirements:
87
- - - ! '>'
88
- - !ruby/object:Gem::Version
89
- version: '1.0'
57
+ requirement: &id005 !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - ">"
60
+ - !ruby/object:Gem::Version
61
+ version: "2.1"
90
62
  type: :runtime
63
+ version_requirements: *id005
64
+ - !ruby/object:Gem::Dependency
65
+ name: rufus-scheduler
91
66
  prerelease: false
92
- version_requirements: !ruby/object:Gem::Requirement
93
- requirements:
94
- - - ! '>'
95
- - !ruby/object:Gem::Version
96
- version: '1.0'
97
- - !ruby/object:Gem::Dependency
98
- name: mime-types
99
- requirement: !ruby/object:Gem::Requirement
100
- requirements:
101
- - - ! '>'
102
- - !ruby/object:Gem::Version
103
- version: '1.0'
67
+ requirement: &id006 !ruby/object:Gem::Requirement
68
+ requirements:
69
+ - - ">"
70
+ - !ruby/object:Gem::Version
71
+ version: "1.0"
104
72
  type: :runtime
73
+ version_requirements: *id006
74
+ - !ruby/object:Gem::Dependency
75
+ name: mime-types
105
76
  prerelease: false
106
- version_requirements: !ruby/object:Gem::Requirement
107
- requirements:
108
- - - ! '>'
109
- - !ruby/object:Gem::Version
110
- version: '1.0'
111
- - !ruby/object:Gem::Dependency
112
- name: locale
113
- requirement: !ruby/object:Gem::Requirement
114
- requirements:
115
- - - ! '>'
116
- - !ruby/object:Gem::Version
117
- version: '2.0'
77
+ requirement: &id007 !ruby/object:Gem::Requirement
78
+ requirements:
79
+ - - ">"
80
+ - !ruby/object:Gem::Version
81
+ version: "1.0"
118
82
  type: :runtime
83
+ version_requirements: *id007
84
+ - !ruby/object:Gem::Dependency
85
+ name: locale
119
86
  prerelease: false
120
- version_requirements: !ruby/object:Gem::Requirement
121
- requirements:
122
- - - ! '>'
123
- - !ruby/object:Gem::Version
124
- version: '2.0'
125
- - !ruby/object:Gem::Dependency
126
- name: builder
127
- requirement: !ruby/object:Gem::Requirement
128
- requirements:
129
- - - ! '>'
130
- - !ruby/object:Gem::Version
131
- version: '2.1'
87
+ requirement: &id008 !ruby/object:Gem::Requirement
88
+ requirements:
89
+ - - ">"
90
+ - !ruby/object:Gem::Version
91
+ version: "2.0"
132
92
  type: :runtime
93
+ version_requirements: *id008
94
+ - !ruby/object:Gem::Dependency
95
+ name: builder
133
96
  prerelease: false
134
- version_requirements: !ruby/object:Gem::Requirement
135
- requirements:
136
- - - ! '>'
137
- - !ruby/object:Gem::Version
138
- version: '2.1'
139
- - !ruby/object:Gem::Dependency
140
- name: macaddr
141
- requirement: !ruby/object:Gem::Requirement
142
- requirements:
143
- - - ! '>='
144
- - !ruby/object:Gem::Version
145
- version: 1.0.0
97
+ requirement: &id009 !ruby/object:Gem::Requirement
98
+ requirements:
99
+ - - ">"
100
+ - !ruby/object:Gem::Version
101
+ version: "2.1"
146
102
  type: :runtime
103
+ version_requirements: *id009
104
+ - !ruby/object:Gem::Dependency
105
+ name: macaddr
147
106
  prerelease: false
148
- version_requirements: !ruby/object:Gem::Requirement
149
- requirements:
150
- - - ! '>='
151
- - !ruby/object:Gem::Version
107
+ requirement: &id010 !ruby/object:Gem::Requirement
108
+ requirements:
109
+ - - ">="
110
+ - !ruby/object:Gem::Version
152
111
  version: 1.0.0
153
- - !ruby/object:Gem::Dependency
154
- name: bundler
155
- requirement: !ruby/object:Gem::Requirement
156
- requirements:
157
- - - ! '>='
158
- - !ruby/object:Gem::Version
159
- version: '0'
160
112
  type: :runtime
113
+ version_requirements: *id010
114
+ - !ruby/object:Gem::Dependency
115
+ name: bundler
161
116
  prerelease: false
162
- version_requirements: !ruby/object:Gem::Requirement
163
- requirements:
164
- - - ! '>='
165
- - !ruby/object:Gem::Version
166
- version: '0'
167
- - !ruby/object:Gem::Dependency
168
- name: mail
169
- requirement: !ruby/object:Gem::Requirement
170
- requirements:
171
- - - ! '>='
172
- - !ruby/object:Gem::Version
173
- version: '0'
117
+ requirement: &id011 !ruby/object:Gem::Requirement
118
+ requirements:
119
+ - &id012
120
+ - ">="
121
+ - !ruby/object:Gem::Version
122
+ version: "0"
174
123
  type: :runtime
124
+ version_requirements: *id011
125
+ - !ruby/object:Gem::Dependency
126
+ name: mail
175
127
  prerelease: false
176
- version_requirements: !ruby/object:Gem::Requirement
177
- requirements:
178
- - - ! '>='
179
- - !ruby/object:Gem::Version
180
- version: '0'
181
- - !ruby/object:Gem::Dependency
182
- name: backports
183
- requirement: !ruby/object:Gem::Requirement
184
- requirements:
185
- - - ! '>='
186
- - !ruby/object:Gem::Version
187
- version: '0'
128
+ requirement: &id013 !ruby/object:Gem::Requirement
129
+ requirements:
130
+ - *id012
188
131
  type: :runtime
132
+ version_requirements: *id013
133
+ - !ruby/object:Gem::Dependency
134
+ name: backports
189
135
  prerelease: false
190
- version_requirements: !ruby/object:Gem::Requirement
191
- requirements:
192
- - - ! '>='
193
- - !ruby/object:Gem::Version
194
- version: '0'
195
- - !ruby/object:Gem::Dependency
196
- name: rack
197
- requirement: !ruby/object:Gem::Requirement
198
- requirements:
199
- - - ! '>='
200
- - !ruby/object:Gem::Version
201
- version: '0'
136
+ requirement: &id014 !ruby/object:Gem::Requirement
137
+ requirements:
138
+ - *id012
202
139
  type: :runtime
140
+ version_requirements: *id014
141
+ - !ruby/object:Gem::Dependency
142
+ name: rack
203
143
  prerelease: false
204
- version_requirements: !ruby/object:Gem::Requirement
205
- requirements:
206
- - - ! '>='
207
- - !ruby/object:Gem::Version
208
- version: '0'
209
- - !ruby/object:Gem::Dependency
144
+ requirement: &id015 !ruby/object:Gem::Requirement
145
+ requirements:
146
+ - *id012
147
+ type: :runtime
148
+ version_requirements: *id015
149
+ - !ruby/object:Gem::Dependency
210
150
  name: rake
211
- requirement: !ruby/object:Gem::Requirement
212
- requirements:
213
- - - ! '>'
214
- - !ruby/object:Gem::Version
215
- version: 0.7.3
216
- type: :development
217
151
  prerelease: false
218
- version_requirements: !ruby/object:Gem::Requirement
219
- requirements:
220
- - - ! '>'
221
- - !ruby/object:Gem::Version
152
+ requirement: &id016 !ruby/object:Gem::Requirement
153
+ requirements:
154
+ - - ">"
155
+ - !ruby/object:Gem::Version
222
156
  version: 0.7.3
223
- - !ruby/object:Gem::Dependency
224
- name: gettext
225
- requirement: !ruby/object:Gem::Requirement
226
- requirements:
227
- - - ! '>='
228
- - !ruby/object:Gem::Version
229
- version: 2.1.0
230
157
  type: :development
158
+ version_requirements: *id016
159
+ - !ruby/object:Gem::Dependency
160
+ name: gettext
231
161
  prerelease: false
232
- version_requirements: !ruby/object:Gem::Requirement
233
- requirements:
234
- - - ! '>='
235
- - !ruby/object:Gem::Version
162
+ requirement: &id017 !ruby/object:Gem::Requirement
163
+ requirements:
164
+ - - ">="
165
+ - !ruby/object:Gem::Version
236
166
  version: 2.1.0
237
- - !ruby/object:Gem::Dependency
238
- name: fssm
239
- requirement: !ruby/object:Gem::Requirement
240
- requirements:
241
- - - ! '>='
242
- - !ruby/object:Gem::Version
243
- version: '0'
244
167
  type: :development
168
+ version_requirements: *id017
169
+ - !ruby/object:Gem::Dependency
170
+ name: fssm
245
171
  prerelease: false
246
- version_requirements: !ruby/object:Gem::Requirement
247
- requirements:
248
- - - ! '>='
249
- - !ruby/object:Gem::Version
250
- version: '0'
172
+ requirement: &id018 !ruby/object:Gem::Requirement
173
+ requirements:
174
+ - *id012
175
+ type: :development
176
+ version_requirements: *id018
251
177
  description: Spider is yet another Ruby framework.
252
178
  email: abmajor7@gmail.com
253
- executables:
179
+ executables:
254
180
  - spider
255
181
  extensions: []
182
+
256
183
  extra_rdoc_files: []
257
- files:
184
+
185
+ files:
258
186
  - README.rdoc
259
187
  - VERSION
260
188
  - CHANGELOG
@@ -1615,27 +1543,26 @@ files:
1615
1543
  - templates/email/error.erb
1616
1544
  homepage: http://github.com/me/spider
1617
1545
  licenses: []
1546
+
1618
1547
  metadata: {}
1548
+
1619
1549
  post_install_message:
1620
1550
  rdoc_options: []
1621
- require_paths:
1551
+
1552
+ require_paths:
1622
1553
  - lib
1623
- required_ruby_version: !ruby/object:Gem::Requirement
1624
- requirements:
1625
- - - ! '>='
1626
- - !ruby/object:Gem::Version
1627
- version: '0'
1628
- required_rubygems_version: !ruby/object:Gem::Requirement
1629
- requirements:
1630
- - - ! '>='
1631
- - !ruby/object:Gem::Version
1632
- version: '0'
1633
- requirements:
1634
- - ! 'Optional dependencies: ripl, ripl-irb, ripl-multi_line, json, openssl, sqlite3,
1635
- mongrel, ruby-oci8 >2.0, mysql, yui-compressor, cldr'
1554
+ required_ruby_version: !ruby/object:Gem::Requirement
1555
+ requirements:
1556
+ - *id012
1557
+ required_rubygems_version: !ruby/object:Gem::Requirement
1558
+ requirements:
1559
+ - *id012
1560
+ requirements:
1561
+ - "Optional dependencies: ripl, ripl-irb, ripl-multi_line, json, openssl, sqlite3, mongrel, ruby-oci8 >2.0, mysql, yui-compressor, cldr"
1636
1562
  rubyforge_project:
1637
- rubygems_version: 2.1.11
1563
+ rubygems_version: 2.0.14
1638
1564
  signing_key:
1639
1565
  specification_version: 4
1640
1566
  summary: A (web) framework
1641
1567
  test_files: []
1568
+