spiderfw 0.6.4 → 0.6.5

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 (16) hide show
  1. data/CHANGELOG +4 -0
  2. data/VERSION +1 -1
  3. data/apps/core/auth/po/it/spider_auth.po +2 -2
  4. data/apps/core/auth/po/spider_auth.pot +2 -2
  5. data/apps/core/components/po/it/spider_components.po +5 -5
  6. data/apps/core/components/po/spider_components.pot +5 -5
  7. data/apps/core/forms/po/it/spider_forms.po +2 -2
  8. data/apps/core/forms/po/spider_forms.pot +2 -2
  9. data/apps/master/po/master.pot +1 -1
  10. data/apps/messenger/po/it/spider_messenger.po +1 -1
  11. data/apps/messenger/po/spider_messenger.pot +1 -1
  12. data/lib/spiderfw/http/server.rb +4 -2
  13. data/lib/spiderfw/model/condition.rb +1 -1
  14. data/lib/spiderfw/model/mappers/mapper.rb +1 -0
  15. data/lib/spiderfw/model/storage/db/adapters/oracle.rb +3 -2
  16. metadata +3 -3
data/CHANGELOG CHANGED
@@ -1,3 +1,7 @@
1
+ = 0.6.5
2
+ == 29 June, 2011
3
+ * Mapper fixes
4
+
1
5
  = 0.6.4
2
6
  == 29 June, 2011
3
7
  * Fixed non-interactive "spider create home"
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.6.4
1
+ 0.6.5
data/apps/core/auth/po/it/spider_auth.po CHANGED
@@ -6,7 +6,7 @@
6
6
  msgid ""
7
7
  msgstr ""
8
8
  "Project-Id-Version: Spider::Auth 0.1\n"
9
- "POT-Creation-Date: 2011-06-29 11:56+0200\n"
9
+ "POT-Creation-Date: 2011-05-09 17:37+0200\n"
10
10
  "PO-Revision-Date: 2010-11-02 18:13+0100\n"
11
11
  "Last-Translator: Ivan Pirlik <ivan.pirlik@soluzionipa.it>\n"
12
12
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -48,7 +48,7 @@ msgstr "Ultima login"
48
48
  msgid "Login count"
49
49
  msgstr "Numero login"
50
50
 
51
- #: models/mixins/rbac_provider.rb:66
51
+ #: models/mixins/rbac_provider.rb:68
52
52
  msgid "%s permissions"
53
53
  msgstr "Permessi %s"
54
54
 
data/apps/core/auth/po/spider_auth.pot CHANGED
@@ -7,7 +7,7 @@
7
7
  msgid ""
8
8
  msgstr ""
9
9
  "Project-Id-Version: Spider::Auth 0.1\n"
10
- "POT-Creation-Date: 2011-06-29 11:56+0200\n"
10
+ "POT-Creation-Date: 2011-05-09 17:37+0200\n"
11
11
  "PO-Revision-Date: 2009-06-30 16:58+0200\n"
12
12
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
13
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -47,7 +47,7 @@ msgstr ""
47
47
  msgid "Login count"
48
48
  msgstr ""
49
49
 
50
- #: models/mixins/rbac_provider.rb:66
50
+ #: models/mixins/rbac_provider.rb:68
51
51
  msgid "%s permissions"
52
52
  msgstr ""
53
53
 
data/apps/core/components/po/it/spider_components.po CHANGED
@@ -6,7 +6,7 @@
6
6
  msgid ""
7
7
  msgstr ""
8
8
  "Project-Id-Version: Spider::Components 0.1\n"
9
- "POT-Creation-Date: 2011-06-29 11:56+0200\n"
9
+ "POT-Creation-Date: 2011-05-09 17:37+0200\n"
10
10
  "PO-Revision-Date: 2010-11-29 12:51+0100\n"
11
11
  "Last-Translator: Ivan Pirlik <ivan.pirlik@soluzionipa.it>\n"
12
12
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,19 +20,19 @@ msgstr ""
20
20
  msgid "Administration"
21
21
  msgstr "Amministrazione"
22
22
 
23
- #: widgets/admin/admin.rb:48
23
+ #: widgets/admin/admin.rb:37
24
24
  msgid "Manage Data"
25
25
  msgstr "Gestisci i Dati"
26
26
 
27
- #: widgets/admin/admin.rb:53
27
+ #: widgets/admin/admin.rb:42
28
28
  msgid "guest"
29
29
  msgstr "ospite"
30
30
 
31
- #: widgets/crud/crud.rb:116
31
+ #: widgets/crud/crud.rb:95
32
32
  msgid "Cancel"
33
33
  msgstr "Annulla"
34
34
 
35
- #: widgets/crud/crud.rb:117
35
+ #: widgets/crud/crud.rb:96
36
36
  msgid "Ok"
37
37
  msgstr "Ok"
38
38
 
data/apps/core/components/po/spider_components.pot CHANGED
@@ -7,7 +7,7 @@
7
7
  msgid ""
8
8
  msgstr ""
9
9
  "Project-Id-Version: Spider::Components 0.1\n"
10
- "POT-Creation-Date: 2011-06-29 11:56+0200\n"
10
+ "POT-Creation-Date: 2011-05-09 17:37+0200\n"
11
11
  "PO-Revision-Date: 2009-06-30 16:58+0200\n"
12
12
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
13
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,19 +21,19 @@ msgstr ""
21
21
  msgid "Administration"
22
22
  msgstr ""
23
23
 
24
- #: widgets/admin/admin.rb:48
24
+ #: widgets/admin/admin.rb:37
25
25
  msgid "Manage Data"
26
26
  msgstr ""
27
27
 
28
- #: widgets/admin/admin.rb:53
28
+ #: widgets/admin/admin.rb:42
29
29
  msgid "guest"
30
30
  msgstr ""
31
31
 
32
- #: widgets/crud/crud.rb:116
32
+ #: widgets/crud/crud.rb:95
33
33
  msgid "Cancel"
34
34
  msgstr ""
35
35
 
36
- #: widgets/crud/crud.rb:117
36
+ #: widgets/crud/crud.rb:96
37
37
  msgid "Ok"
38
38
  msgstr ""
39
39
 
data/apps/core/forms/po/it/spider_forms.po CHANGED
@@ -6,7 +6,7 @@
6
6
  msgid ""
7
7
  msgstr ""
8
8
  "Project-Id-Version: Spider::Forms 0.1\n"
9
- "POT-Creation-Date: 2011-06-29 11:56+0200\n"
9
+ "POT-Creation-Date: 2011-05-09 17:37+0200\n"
10
10
  "PO-Revision-Date: 2010-11-29 12:52+0100\n"
11
11
  "Last-Translator: Ivan Pirlik <ivan.pirlik@soluzionipa.it>\n"
12
12
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,7 +36,7 @@ msgstr "%s e rimani"
36
36
  msgid "%s is not a valid date"
37
37
  msgstr "%s non è una data valida"
38
38
 
39
- #: widgets/inputs/input/input.rb:95
39
+ #: widgets/inputs/input/input.rb:91
40
40
  msgid "%s is required"
41
41
  msgstr "Il campo %s è obbligatorio"
42
42
 
data/apps/core/forms/po/spider_forms.pot CHANGED
@@ -7,7 +7,7 @@
7
7
  msgid ""
8
8
  msgstr ""
9
9
  "Project-Id-Version: Spider::Forms 0.1\n"
10
- "POT-Creation-Date: 2011-06-29 11:56+0200\n"
10
+ "POT-Creation-Date: 2011-05-09 17:37+0200\n"
11
11
  "PO-Revision-Date: 2009-06-30 17:03+0200\n"
12
12
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
13
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,7 +37,7 @@ msgstr ""
37
37
  msgid "%s is not a valid date"
38
38
  msgstr ""
39
39
 
40
- #: widgets/inputs/input/input.rb:95
40
+ #: widgets/inputs/input/input.rb:91
41
41
  msgid "%s is required"
42
42
  msgstr ""
43
43
 
data/apps/master/po/master.pot CHANGED
@@ -7,7 +7,7 @@
7
7
  msgid ""
8
8
  msgstr ""
9
9
  "Project-Id-Version: Spider::Master 0.1\n"
10
- "POT-Creation-Date: 2011-06-29 11:56+0200\n"
10
+ "POT-Creation-Date: 2011-05-09 17:37+0200\n"
11
11
  "PO-Revision-Date: 2011-05-09 17:31+0200\n"
12
12
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
13
  "Language-Team: LANGUAGE <LL@li.org>\n"
data/apps/messenger/po/it/spider_messenger.po CHANGED
@@ -6,7 +6,7 @@
6
6
  msgid ""
7
7
  msgstr ""
8
8
  "Project-Id-Version: Spider::Messenger 0.1\n"
9
- "POT-Creation-Date: 2011-06-29 11:56+0200\n"
9
+ "POT-Creation-Date: 2011-05-09 17:37+0200\n"
10
10
  "PO-Revision-Date: 2010-11-29 12:53+0100\n"
11
11
  "Last-Translator: Ivan Pirlik <ivan.pirlik@soluzionipa.it>\n"
12
12
  "Language-Team: LANGUAGE <LL@li.org>\n"
data/apps/messenger/po/spider_messenger.pot CHANGED
@@ -7,7 +7,7 @@
7
7
  msgid ""
8
8
  msgstr ""
9
9
  "Project-Id-Version: Spider::Messenger 0.1\n"
10
- "POT-Creation-Date: 2011-06-29 11:56+0200\n"
10
+ "POT-Creation-Date: 2011-05-09 17:37+0200\n"
11
11
  "PO-Revision-Date: 2009-06-30 16:44+0200\n"
12
12
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
13
  "Language-Team: LANGUAGE <LL@li.org>\n"
data/lib/spiderfw/http/server.rb CHANGED
@@ -109,7 +109,7 @@ module Spider; module HTTP
109
109
  Process.detach(forked)
110
110
  else
111
111
  Spider.init_base
112
- spawner_started = true
112
+ spawner_started = false
113
113
  if Spider.conf.get('webserver.respawn_on_change')
114
114
  Spider.start_loggers
115
115
  begin
@@ -119,7 +119,9 @@ module Spider; module HTTP
119
119
  end
120
120
  spawner = Spawner.new({'spawn' => start})
121
121
  spawner.run('spawn')
122
- rescue
122
+ spawner_started = true
123
+ rescue LoadError => exc
124
+ raise unless exc.message =~ /fssm/
123
125
  Spider.logger.error("Install 'fssm' gem to enable respawning")
124
126
  end
125
127
  end
data/lib/spiderfw/model/condition.rb CHANGED
@@ -378,7 +378,7 @@ module Spider; module Model
378
378
  def conditions_for(*element_names)
379
379
  conds = []
380
380
  element_names.each do |el|
381
- if self[el]
381
+ if self.key?(el)
382
382
  conds << self
383
383
  break
384
384
  end
data/lib/spiderfw/model/mappers/mapper.rb CHANGED
@@ -1173,6 +1173,7 @@ module Spider; module Model
1173
1173
  def extended(obj)
1174
1174
  obj.define_schema &@schema_define_proc if @schema_define_proc
1175
1175
  obj.with_schema &@schema_proc if @schema_proc
1176
+ obj.no_map(*@no_map_elements.keys) if @no_map_elements
1176
1177
  end
1177
1178
 
1178
1179
  def no_map(*els)
data/lib/spiderfw/model/storage/db/adapters/oracle.rb CHANGED
@@ -203,9 +203,10 @@ module Spider; module Model; module Storage; module Db
203
203
  else
204
204
  val = bound_vars ? ":#{(curr[:bind_cnt] += 1)}" : value
205
205
  sql = "#{key} #{comp} #{val}"
206
+ if comp == '<>'
207
+ sql = "(#{sql} or #{key} IS NULL)"
208
+ end
206
209
  end
207
-
208
-
209
210
  end
210
211
  return sql
211
212
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spiderfw
3
3
  version: !ruby/object:Gem::Version
4
- hash: 15
4
+ hash: 13
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 6
9
- - 4
10
- version: 0.6.4
9
+ - 5
10
+ version: 0.6.5
11
11
  platform: ruby
12
12
  authors:
13
13
  - Ivan Pirlik