confluence 0.2.0 → 1.0.0

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 (56) hide show
  1. data/Gemfile +6 -0
  2. data/Gemfile.lock +86 -0
  3. data/VERSION +1 -1
  4. data/confluence.gemspec +64 -6
  5. data/lib/confluence.rb +6 -3
  6. data/lib/confluence/railtie.rb +14 -0
  7. data/lib/confluence/railties/resolver.rb +78 -0
  8. data/lib/confluence/templates/%project_name%.cabal.tt +4 -4
  9. data/lib/confluence/templates/Rakefile.tt +4 -4
  10. data/spec/confluence/railtie_spec.rb +7 -0
  11. data/spec/confluence/railties/resolver_spec.rb +160 -0
  12. data/spec/confluence/welcome_controller_spec.rb +37 -0
  13. data/spec/confluence_spec.rb +15 -2
  14. data/spec/fixture/.gitignore +15 -0
  15. data/spec/fixture/README.rdoc +261 -0
  16. data/spec/fixture/Rakefile +7 -0
  17. data/spec/fixture/app/assets/images/rails.png +0 -0
  18. data/spec/fixture/app/assets/javascripts/application.js +13 -0
  19. data/spec/fixture/app/assets/stylesheets/application.css +13 -0
  20. data/spec/fixture/app/controllers/application_controller.rb +3 -0
  21. data/spec/fixture/app/controllers/welcome_controller.rb +3 -0
  22. data/spec/fixture/app/views/layouts/application.html.erb +14 -0
  23. data/spec/fixture/app/views/welcome/index.html.haml +1 -0
  24. data/spec/fixture/config.ru +4 -0
  25. data/spec/fixture/config/application.rb +66 -0
  26. data/spec/fixture/config/boot.rb +6 -0
  27. data/spec/fixture/config/environment.rb +5 -0
  28. data/spec/fixture/config/environments/development.rb +26 -0
  29. data/spec/fixture/config/environments/production.rb +51 -0
  30. data/spec/fixture/config/environments/test.rb +35 -0
  31. data/spec/fixture/config/initializers/backtrace_silencers.rb +7 -0
  32. data/spec/fixture/config/initializers/inflections.rb +15 -0
  33. data/spec/fixture/config/initializers/mime_types.rb +5 -0
  34. data/spec/fixture/config/initializers/secret_token.rb +7 -0
  35. data/spec/fixture/config/initializers/session_store.rb +8 -0
  36. data/spec/fixture/config/initializers/wrap_parameters.rb +10 -0
  37. data/spec/fixture/config/locales/en.yml +5 -0
  38. data/spec/fixture/config/routes.rb +58 -0
  39. data/spec/fixture/lib/assets/.gitkeep +0 -0
  40. data/spec/fixture/lib/tasks/.gitkeep +0 -0
  41. data/spec/fixture/log/.gitkeep +0 -0
  42. data/spec/fixture/public/404.html +26 -0
  43. data/spec/fixture/public/422.html +26 -0
  44. data/spec/fixture/public/500.html +25 -0
  45. data/spec/fixture/public/favicon.ico +0 -0
  46. data/spec/fixture/public/index.html +241 -0
  47. data/spec/fixture/public/robots.txt +5 -0
  48. data/spec/fixture/script/rails +6 -0
  49. data/spec/fixture/vendor/assets/javascripts/.gitkeep +0 -0
  50. data/spec/fixture/vendor/assets/stylesheets/.gitkeep +0 -0
  51. data/spec/fixture/vendor/plugins/.gitkeep +0 -0
  52. data/spec/spec_helper.rb +7 -0
  53. metadata +142 -6
  54. data/lib/confluence/navigator.rb +0 -67
  55. data/spec/confluence/navigator_spec.rb +0 -68
  56. data/spec/support/file_sytem/navigator.rb +0 -9
@@ -0,0 +1,26 @@
1
+ <!DOCTYPE html>
2
+ <html>
3
+ <head>
4
+ <title>The change you wanted was rejected (422)</title>
5
+ <style type="text/css">
6
+ body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
7
+ div.dialog {
8
+ width: 25em;
9
+ padding: 0 4em;
10
+ margin: 4em auto 0 auto;
11
+ border: 1px solid #ccc;
12
+ border-right-color: #999;
13
+ border-bottom-color: #999;
14
+ }
15
+ h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
16
+ </style>
17
+ </head>
18
+
19
+ <body>
20
+ <!-- This file lives in public/422.html -->
21
+ <div class="dialog">
22
+ <h1>The change you wanted was rejected.</h1>
23
+ <p>Maybe you tried to change something you didn't have access to.</p>
24
+ </div>
25
+ </body>
26
+ </html>
@@ -0,0 +1,25 @@
1
+ <!DOCTYPE html>
2
+ <html>
3
+ <head>
4
+ <title>We're sorry, but something went wrong (500)</title>
5
+ <style type="text/css">
6
+ body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
7
+ div.dialog {
8
+ width: 25em;
9
+ padding: 0 4em;
10
+ margin: 4em auto 0 auto;
11
+ border: 1px solid #ccc;
12
+ border-right-color: #999;
13
+ border-bottom-color: #999;
14
+ }
15
+ h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
16
+ </style>
17
+ </head>
18
+
19
+ <body>
20
+ <!-- This file lives in public/500.html -->
21
+ <div class="dialog">
22
+ <h1>We're sorry, but something went wrong.</h1>
23
+ </div>
24
+ </body>
25
+ </html>
File without changes
@@ -0,0 +1,241 @@
1
+ <!DOCTYPE html>
2
+ <html>
3
+ <head>
4
+ <title>Ruby on Rails: Welcome aboard</title>
5
+ <style type="text/css" media="screen">
6
+ body {
7
+ margin: 0;
8
+ margin-bottom: 25px;
9
+ padding: 0;
10
+ background-color: #f0f0f0;
11
+ font-family: "Lucida Grande", "Bitstream Vera Sans", "Verdana";
12
+ font-size: 13px;
13
+ color: #333;
14
+ }
15
+
16
+ h1 {
17
+ font-size: 28px;
18
+ color: #000;
19
+ }
20
+
21
+ a {color: #03c}
22
+ a:hover {
23
+ background-color: #03c;
24
+ color: white;
25
+ text-decoration: none;
26
+ }
27
+
28
+
29
+ #page {
30
+ background-color: #f0f0f0;
31
+ width: 750px;
32
+ margin: 0;
33
+ margin-left: auto;
34
+ margin-right: auto;
35
+ }
36
+
37
+ #content {
38
+ float: left;
39
+ background-color: white;
40
+ border: 3px solid #aaa;
41
+ border-top: none;
42
+ padding: 25px;
43
+ width: 500px;
44
+ }
45
+
46
+ #sidebar {
47
+ float: right;
48
+ width: 175px;
49
+ }
50
+
51
+ #footer {
52
+ clear: both;
53
+ }
54
+
55
+ #header, #about, #getting-started {
56
+ padding-left: 75px;
57
+ padding-right: 30px;
58
+ }
59
+
60
+
61
+ #header {
62
+ background-image: url("assets/rails.png");
63
+ background-repeat: no-repeat;
64
+ background-position: top left;
65
+ height: 64px;
66
+ }
67
+ #header h1, #header h2 {margin: 0}
68
+ #header h2 {
69
+ color: #888;
70
+ font-weight: normal;
71
+ font-size: 16px;
72
+ }
73
+
74
+
75
+ #about h3 {
76
+ margin: 0;
77
+ margin-bottom: 10px;
78
+ font-size: 14px;
79
+ }
80
+
81
+ #about-content {
82
+ background-color: #ffd;
83
+ border: 1px solid #fc0;
84
+ margin-left: -55px;
85
+ margin-right: -10px;
86
+ }
87
+ #about-content table {
88
+ margin-top: 10px;
89
+ margin-bottom: 10px;
90
+ font-size: 11px;
91
+ border-collapse: collapse;
92
+ }
93
+ #about-content td {
94
+ padding: 10px;
95
+ padding-top: 3px;
96
+ padding-bottom: 3px;
97
+ }
98
+ #about-content td.name {color: #555}
99
+ #about-content td.value {color: #000}
100
+
101
+ #about-content ul {
102
+ padding: 0;
103
+ list-style-type: none;
104
+ }
105
+
106
+ #about-content.failure {
107
+ background-color: #fcc;
108
+ border: 1px solid #f00;
109
+ }
110
+ #about-content.failure p {
111
+ margin: 0;
112
+ padding: 10px;
113
+ }
114
+
115
+
116
+ #getting-started {
117
+ border-top: 1px solid #ccc;
118
+ margin-top: 25px;
119
+ padding-top: 15px;
120
+ }
121
+ #getting-started h1 {
122
+ margin: 0;
123
+ font-size: 20px;
124
+ }
125
+ #getting-started h2 {
126
+ margin: 0;
127
+ font-size: 14px;
128
+ font-weight: normal;
129
+ color: #333;
130
+ margin-bottom: 25px;
131
+ }
132
+ #getting-started ol {
133
+ margin-left: 0;
134
+ padding-left: 0;
135
+ }
136
+ #getting-started li {
137
+ font-size: 18px;
138
+ color: #888;
139
+ margin-bottom: 25px;
140
+ }
141
+ #getting-started li h2 {
142
+ margin: 0;
143
+ font-weight: normal;
144
+ font-size: 18px;
145
+ color: #333;
146
+ }
147
+ #getting-started li p {
148
+ color: #555;
149
+ font-size: 13px;
150
+ }
151
+
152
+
153
+ #sidebar ul {
154
+ margin-left: 0;
155
+ padding-left: 0;
156
+ }
157
+ #sidebar ul h3 {
158
+ margin-top: 25px;
159
+ font-size: 16px;
160
+ padding-bottom: 10px;
161
+ border-bottom: 1px solid #ccc;
162
+ }
163
+ #sidebar li {
164
+ list-style-type: none;
165
+ }
166
+ #sidebar ul.links li {
167
+ margin-bottom: 5px;
168
+ }
169
+
170
+ .filename {
171
+ font-style: italic;
172
+ }
173
+ </style>
174
+ <script type="text/javascript">
175
+ function about() {
176
+ info = document.getElementById('about-content');
177
+ if (window.XMLHttpRequest)
178
+ { xhr = new XMLHttpRequest(); }
179
+ else
180
+ { xhr = new ActiveXObject("Microsoft.XMLHTTP"); }
181
+ xhr.open("GET","rails/info/properties",false);
182
+ xhr.send("");
183
+ info.innerHTML = xhr.responseText;
184
+ info.style.display = 'block'
185
+ }
186
+ </script>
187
+ </head>
188
+ <body>
189
+ <div id="page">
190
+ <div id="sidebar">
191
+ <ul id="sidebar-items">
192
+ <li>
193
+ <h3>Browse the documentation</h3>
194
+ <ul class="links">
195
+ <li><a href="http://guides.rubyonrails.org/">Rails Guides</a></li>
196
+ <li><a href="http://api.rubyonrails.org/">Rails API</a></li>
197
+ <li><a href="http://www.ruby-doc.org/core/">Ruby core</a></li>
198
+ <li><a href="http://www.ruby-doc.org/stdlib/">Ruby standard library</a></li>
199
+ </ul>
200
+ </li>
201
+ </ul>
202
+ </div>
203
+
204
+ <div id="content">
205
+ <div id="header">
206
+ <h1>Welcome aboard</h1>
207
+ <h2>You&rsquo;re riding Ruby on Rails!</h2>
208
+ </div>
209
+
210
+ <div id="about">
211
+ <h3><a href="rails/info/properties" onclick="about(); return false">About your application&rsquo;s environment</a></h3>
212
+ <div id="about-content" style="display: none"></div>
213
+ </div>
214
+
215
+ <div id="getting-started">
216
+ <h1>Getting started</h1>
217
+ <h2>Here&rsquo;s how to get rolling:</h2>
218
+
219
+ <ol>
220
+ <li>
221
+ <h2>Use <code>rails generate</code> to create your models and controllers</h2>
222
+ <p>To see all available options, run it without parameters.</p>
223
+ </li>
224
+
225
+ <li>
226
+ <h2>Set up a default route and remove <span class="filename">public/index.html</span></h2>
227
+ <p>Routes are set up in <span class="filename">config/routes.rb</span>.</p>
228
+ </li>
229
+
230
+ <li>
231
+ <h2>Create your database</h2>
232
+ <p>Run <code>rake db:create</code> to create your database. If you're not using SQLite (the default), edit <span class="filename">config/database.yml</span> with your username and password.</p>
233
+ </li>
234
+ </ol>
235
+ </div>
236
+ </div>
237
+
238
+ <div id="footer">&nbsp;</div>
239
+ </div>
240
+ </body>
241
+ </html>
@@ -0,0 +1,5 @@
1
+ # See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
2
+ #
3
+ # To ban all spiders from the entire site uncomment the next two lines:
4
+ # User-Agent: *
5
+ # Disallow: /
@@ -0,0 +1,6 @@
1
+ #!/usr/bin/env ruby
2
+ # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
3
+
4
+ APP_PATH = File.expand_path('../../config/application', __FILE__)
5
+ require File.expand_path('../../config/boot', __FILE__)
6
+ require 'rails/commands'
File without changes
File without changes
File without changes
data/spec/spec_helper.rb CHANGED
@@ -1,10 +1,17 @@
1
1
  require "simplecov"
2
2
  SimpleCov.start
3
+ ENV["RAILS_ENV"] ||= 'test'
3
4
 
5
+ require File.join(File.dirname(__FILE__), "fixture", "config", "environment")
6
+ require 'haml'
7
+ require 'header_navigation'
4
8
  require 'rspec'
9
+ require 'rspec/rails'
10
+ require 'rspec/autorun'
5
11
  Dir[File.expand_path("../lib/*.rb", File.dirname(__FILE__))].each { |source| require source }
6
12
  Dir[File.join(File.dirname(__FILE__), "support", "**", "*.rb")].each { |help| require help }
7
13
 
14
+
8
15
  RSpec.configure {|c| c.fail_fast = true}
9
16
  RSpec.instance_exec do
10
17
  RSPEC_ROOT = File.expand_path(".", File.dirname(__FILE__))
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: confluence
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 1.0.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-02-19 00:00:00.000000000 Z
12
+ date: 2013-02-20 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake
@@ -123,6 +123,22 @@ dependencies:
123
123
  - - ! '>='
124
124
  - !ruby/object:Gem::Version
125
125
  version: '0'
126
+ - !ruby/object:Gem::Dependency
127
+ name: git
128
+ requirement: !ruby/object:Gem::Requirement
129
+ none: false
130
+ requirements:
131
+ - - ! '>='
132
+ - !ruby/object:Gem::Version
133
+ version: '0'
134
+ type: :runtime
135
+ prerelease: false
136
+ version_requirements: !ruby/object:Gem::Requirement
137
+ none: false
138
+ requirements:
139
+ - - ! '>='
140
+ - !ruby/object:Gem::Version
141
+ version: '0'
126
142
  - !ruby/object:Gem::Dependency
127
143
  name: jeweler
128
144
  requirement: !ruby/object:Gem::Requirement
@@ -139,6 +155,86 @@ dependencies:
139
155
  - - ~>
140
156
  - !ruby/object:Gem::Version
141
157
  version: 1.8.4
158
+ - !ruby/object:Gem::Dependency
159
+ name: rails
160
+ requirement: !ruby/object:Gem::Requirement
161
+ none: false
162
+ requirements:
163
+ - - ! '>='
164
+ - !ruby/object:Gem::Version
165
+ version: '0'
166
+ type: :development
167
+ prerelease: false
168
+ version_requirements: !ruby/object:Gem::Requirement
169
+ none: false
170
+ requirements:
171
+ - - ! '>='
172
+ - !ruby/object:Gem::Version
173
+ version: '0'
174
+ - !ruby/object:Gem::Dependency
175
+ name: haml
176
+ requirement: !ruby/object:Gem::Requirement
177
+ none: false
178
+ requirements:
179
+ - - ! '>='
180
+ - !ruby/object:Gem::Version
181
+ version: '0'
182
+ type: :development
183
+ prerelease: false
184
+ version_requirements: !ruby/object:Gem::Requirement
185
+ none: false
186
+ requirements:
187
+ - - ! '>='
188
+ - !ruby/object:Gem::Version
189
+ version: '0'
190
+ - !ruby/object:Gem::Dependency
191
+ name: rspec
192
+ requirement: !ruby/object:Gem::Requirement
193
+ none: false
194
+ requirements:
195
+ - - ! '>='
196
+ - !ruby/object:Gem::Version
197
+ version: '0'
198
+ type: :development
199
+ prerelease: false
200
+ version_requirements: !ruby/object:Gem::Requirement
201
+ none: false
202
+ requirements:
203
+ - - ! '>='
204
+ - !ruby/object:Gem::Version
205
+ version: '0'
206
+ - !ruby/object:Gem::Dependency
207
+ name: rspec-rails
208
+ requirement: !ruby/object:Gem::Requirement
209
+ none: false
210
+ requirements:
211
+ - - ! '>='
212
+ - !ruby/object:Gem::Version
213
+ version: '0'
214
+ type: :development
215
+ prerelease: false
216
+ version_requirements: !ruby/object:Gem::Requirement
217
+ none: false
218
+ requirements:
219
+ - - ! '>='
220
+ - !ruby/object:Gem::Version
221
+ version: '0'
222
+ - !ruby/object:Gem::Dependency
223
+ name: header_navigation
224
+ requirement: !ruby/object:Gem::Requirement
225
+ none: false
226
+ requirements:
227
+ - - ~>
228
+ - !ruby/object:Gem::Version
229
+ version: 0.0.1
230
+ type: :development
231
+ prerelease: false
232
+ version_requirements: !ruby/object:Gem::Requirement
233
+ none: false
234
+ requirements:
235
+ - - ~>
236
+ - !ruby/object:Gem::Version
237
+ version: 0.0.1
142
238
  description: confluence is the merging of rivers. In particular, it is the merging
143
239
  of the fay-haskell-coffee-js river with the scss-css river with the psd-png river
144
240
  into the rails-ruby-haml rivers
@@ -161,7 +257,8 @@ files:
161
257
  - bin/confluence
162
258
  - confluence.gemspec
163
259
  - lib/confluence.rb
164
- - lib/confluence/navigator.rb
260
+ - lib/confluence/railtie.rb
261
+ - lib/confluence/railties/resolver.rb
165
262
  - lib/confluence/templates/%project_name%.cabal.tt
166
263
  - lib/confluence/templates/.document
167
264
  - lib/confluence/templates/.gitignore
@@ -220,10 +317,49 @@ files:
220
317
  - lib/confluence/templates/test/integration/vendor/assets/stylesheets/.gitkeep
221
318
  - lib/confluence/templates/test/integration/vendor/plugins/.gitkeep
222
319
  - lib/confluence/templates/test/javascripts/README.markdown.tt
223
- - spec/confluence/navigator_spec.rb
320
+ - spec/confluence/railtie_spec.rb
321
+ - spec/confluence/railties/resolver_spec.rb
322
+ - spec/confluence/welcome_controller_spec.rb
224
323
  - spec/confluence_spec.rb
324
+ - spec/fixture/.gitignore
325
+ - spec/fixture/README.rdoc
326
+ - spec/fixture/Rakefile
327
+ - spec/fixture/app/assets/images/rails.png
328
+ - spec/fixture/app/assets/javascripts/application.js
329
+ - spec/fixture/app/assets/stylesheets/application.css
330
+ - spec/fixture/app/controllers/application_controller.rb
331
+ - spec/fixture/app/controllers/welcome_controller.rb
332
+ - spec/fixture/app/views/layouts/application.html.erb
333
+ - spec/fixture/app/views/welcome/index.html.haml
334
+ - spec/fixture/config.ru
335
+ - spec/fixture/config/application.rb
336
+ - spec/fixture/config/boot.rb
337
+ - spec/fixture/config/environment.rb
338
+ - spec/fixture/config/environments/development.rb
339
+ - spec/fixture/config/environments/production.rb
340
+ - spec/fixture/config/environments/test.rb
341
+ - spec/fixture/config/initializers/backtrace_silencers.rb
342
+ - spec/fixture/config/initializers/inflections.rb
343
+ - spec/fixture/config/initializers/mime_types.rb
344
+ - spec/fixture/config/initializers/secret_token.rb
345
+ - spec/fixture/config/initializers/session_store.rb
346
+ - spec/fixture/config/initializers/wrap_parameters.rb
347
+ - spec/fixture/config/locales/en.yml
348
+ - spec/fixture/config/routes.rb
349
+ - spec/fixture/lib/assets/.gitkeep
350
+ - spec/fixture/lib/tasks/.gitkeep
351
+ - spec/fixture/log/.gitkeep
352
+ - spec/fixture/public/404.html
353
+ - spec/fixture/public/422.html
354
+ - spec/fixture/public/500.html
355
+ - spec/fixture/public/favicon.ico
356
+ - spec/fixture/public/index.html
357
+ - spec/fixture/public/robots.txt
358
+ - spec/fixture/script/rails
359
+ - spec/fixture/vendor/assets/javascripts/.gitkeep
360
+ - spec/fixture/vendor/assets/stylesheets/.gitkeep
361
+ - spec/fixture/vendor/plugins/.gitkeep
225
362
  - spec/spec_helper.rb
226
- - spec/support/file_sytem/navigator.rb
227
363
  homepage: http://github.com/foxnewsnetwork/confluence
228
364
  licenses:
229
365
  - MIT
@@ -239,7 +375,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
239
375
  version: '0'
240
376
  segments:
241
377
  - 0
242
- hash: 1833576747292622181
378
+ hash: 1584253182828020057
243
379
  required_rubygems_version: !ruby/object:Gem::Requirement
244
380
  none: false
245
381
  requirements: