Pimki 1.6.092 → 1.7.092

Sign up to get free protection for your applications and to get access to all the features.
Files changed (45) hide show
  1. data/README-PIMKI +13 -4
  2. data/app/controllers/wiki.rb +157 -62
  3. data/app/models/chunks/acronym.rb +19 -0
  4. data/app/models/chunks/category.rb +4 -2
  5. data/app/models/chunks/todo.rb +0 -1
  6. data/app/models/chunks/wiki.rb +19 -5
  7. data/app/models/revision.rb +2 -0
  8. data/app/models/web.rb +38 -38
  9. data/app/models/web_test.rb +1 -1
  10. data/app/models/wiki_service.rb +8 -7
  11. data/app/models/wiki_words.rb +3 -2
  12. data/app/models/wiki_words_test.rb +10 -0
  13. data/app/views/error.rhtml +4 -2
  14. data/app/views/menu.rhtml +1 -5
  15. data/app/views/navigation.rhtml +6 -6
  16. data/app/views/static_style_sheet.rhtml +25 -5
  17. data/app/views/textile_help.rhtml +1 -1
  18. data/app/views/top.rhtml +59 -57
  19. data/app/views/wiki/adv_search.rhtml +2 -2
  20. data/app/views/wiki/authors.rhtml +1 -1
  21. data/app/views/wiki/bliki.rhtml +7 -5
  22. data/app/views/wiki/bliki_edit.rhtml +2 -1
  23. data/app/views/wiki/bliki_new.rhtml +2 -1
  24. data/app/views/wiki/bliki_revision.rhtml +12 -19
  25. data/app/views/wiki/edit.rhtml +4 -4
  26. data/app/views/wiki/edit_menu.rhtml +2 -1
  27. data/app/views/wiki/edit_web.rhtml +83 -21
  28. data/app/views/wiki/export.rhtml +7 -0
  29. data/app/views/wiki/feeds.rhtml +7 -3
  30. data/app/views/wiki/glossary.rhtml +27 -0
  31. data/app/views/wiki/list.rhtml +5 -1
  32. data/app/views/wiki/login.rhtml +1 -0
  33. data/app/views/wiki/mind.rhtml +14 -2
  34. data/app/views/wiki/new_system.rhtml +3 -3
  35. data/app/views/wiki/new_web.rhtml +5 -1
  36. data/app/views/wiki/page.rhtml +1 -8
  37. data/app/views/wiki/published.rhtml +38 -0
  38. data/app/views/wiki/recently_revised.rhtml +6 -0
  39. data/app/views/wiki/rss_feed.rhtml +46 -0
  40. data/app/views/wiki/test.rhtml +25 -0
  41. data/app/views/wiki/todo.rhtml +5 -2
  42. data/app/views/wiki/web_list.rhtml +5 -1
  43. data/libraries/secure_web_controller_server.rb +106 -0
  44. data/pimki.rb +11 -7
  45. metadata +11 -4
data/pimki.rb CHANGED
@@ -43,12 +43,15 @@ rescue Errno::ENOENT
43
43
  pdflatex_available = false
44
44
  end
45
45
 
46
+ graphviz_available = (`dot -V 2>&1` =~ /dot version/)
47
+
46
48
  OPTIONS = {
47
49
  :server_type => fork_available ? Daemon : SimpleServer,
48
50
  :port => 2500,
49
51
  :storage => "#{Dir.pwd}/storage",
50
52
  :pdflatex => pdflatex_available,
51
- :redcloth => '3'
53
+ :redcloth => '3',
54
+ :graphviz_available => graphviz_available
52
55
  }
53
56
 
54
57
  ARGV.options do |opts|
@@ -85,13 +88,15 @@ Socket.do_not_reverse_lookup = true
85
88
 
86
89
  # RedCloth + Modifications: {{{
87
90
  begin
88
- if Gem.source_index.search('redcloth').map { |s| s.version.version }.include? OPTIONS[:redcloth]
89
- require_gem 'RedCloth', "#{OPTIONS[:redcloth]}"
90
- else
91
- require_gem 'RedCloth', "~> #{OPTIONS[:redcloth]}"
91
+ if defined? Gem
92
+ if Gem.source_index.search('redcloth').map { |s| s.version.version }.include? OPTIONS[:redcloth]
93
+ require_gem 'RedCloth', "#{OPTIONS[:redcloth]}"
94
+ else
95
+ require_gem 'RedCloth', "~> #{OPTIONS[:redcloth]}"
96
+ end
92
97
  end
93
98
 
94
- rescue LoadError => detail
99
+ rescue LoadError, NoMethodError => detail
95
100
  if OPTIONS[:redcloth] < '3'
96
101
  require 'redcloth_2.0.11'
97
102
  else
@@ -153,7 +158,6 @@ if ['3.0.0', '3.0.1'].include? RedCloth::VERSION
153
158
  end #}}}
154
159
  end #}}}
155
160
  end #}}}
156
- puts RedCloth::VERSION
157
161
 
158
162
  # Start the application: {{{
159
163
  storage_dir = OPTIONS[:storage] + "/" + OPTIONS[:port].to_s
metadata CHANGED
@@ -1,17 +1,20 @@
1
1
  --- !ruby/object:Gem::Specification
2
- rubygems_version: 0.8.8
2
+ rubygems_version: 0.8.10
3
3
  specification_version: 1
4
4
  name: Pimki
5
5
  version: !ruby/object:Gem::Version
6
- version: 1.6.092
7
- date: 2005-03-17
6
+ version: 1.7.092
7
+ date: 2005-05-01
8
8
  summary: "A Personal Information Manager (PIM) based on Instiki's Wiki technology."
9
9
  require_paths:
10
10
  - libraries
11
11
  email: assaph@gmail.com
12
12
  homepage: http://pimki.rubyforge.org
13
13
  rubyforge_project: pimki
14
- description: "Pimki in a Personal Information Manager based on Instiki's Wiki technology. Besides all the rich features and excellent look of Instiki, a few features have been added, such as: a personal blog, todo lists, graphical mapping, quick-links, advanced search and others."
14
+ description: "Pimki in a Personal Information Manager based on Instiki's Wiki technology.
15
+ Besides all the rich features and excellent look of Instiki, a few features have
16
+ been added, such as: a personal blog, todo lists, graphical mapping,
17
+ quick-links, advanced search and others."
15
18
  autorequire:
16
19
  default_executable: pimki.rb
17
20
  bindir: "."
@@ -51,6 +54,7 @@ files:
51
54
  - app/models/wiki_service_test.rb
52
55
  - app/models/wiki_words.rb
53
56
  - app/models/wiki_words_test.rb
57
+ - app/models/chunks/acronym.rb
54
58
  - app/models/chunks/category.rb
55
59
  - app/models/chunks/category_test.rb
56
60
  - app/models/chunks/chunk.rb
@@ -90,6 +94,7 @@ files:
90
94
  - app/views/wiki/edit_web.rhtml
91
95
  - app/views/wiki/export.rhtml
92
96
  - app/views/wiki/feeds.rhtml
97
+ - app/views/wiki/glossary.rhtml
93
98
  - app/views/wiki/list.rhtml
94
99
  - app/views/wiki/locked.rhtml
95
100
  - app/views/wiki/login.rhtml
@@ -105,6 +110,7 @@ files:
105
110
  - app/views/wiki/rollback.rhtml
106
111
  - app/views/wiki/rss_feed.rhtml
107
112
  - app/views/wiki/search.rhtml
113
+ - app/views/wiki/test.rhtml
108
114
  - app/views/wiki/tex.rhtml
109
115
  - app/views/wiki/tex_web.rhtml
110
116
  - app/views/wiki/todo.rhtml
@@ -119,6 +125,7 @@ files:
119
125
  - libraries/redcloth_2.0.11.rb
120
126
  - libraries/redcloth_for_tex.rb
121
127
  - libraries/redcloth_for_tex_test.rb
128
+ - libraries/secure_web_controller_server.rb
122
129
  - libraries/view_helper.rb
123
130
  - libraries/web_controller_server.rb
124
131
  - libraries/diff/diff.rb