puffer_pages 0.0.14 → 0.0.15

Sign up to get free protection for your applications and to get access to all the features.
Files changed (107) hide show
  1. data/Gemfile +11 -7
  2. data/Gemfile.lock +130 -114
  3. data/Guardfile +20 -0
  4. data/README.md +3 -3
  5. data/VERSION +1 -1
  6. data/app/assets/javascripts/puffer/codemirror-base.js +1 -0
  7. data/app/assets/javascripts/puffer/codemirror-parser.js +1 -0
  8. data/app/assets/javascripts/puffer/codemirror.js +1 -0
  9. data/{spec/dummy/public/puffer/javascripts → app/assets/javascripts/puffer}/puffer_pages.js +11 -0
  10. data/{lib/generators/puffer_pages/install/templates/puffer/javascripts → app/assets/javascripts/puffer}/right-dialog.js +0 -0
  11. data/{lib/generators/puffer_pages/install/templates/puffer/javascripts → app/assets/javascripts/puffer}/right-tabs.js +0 -0
  12. data/app/assets/stylesheets/codemirror.css +135 -0
  13. data/app/assets/stylesheets/puffer_pages.css +12 -0
  14. data/{lib/generators/puffer_pages/install/templates/puffer → app/assets}/stylesheets/puffer_tree.css +0 -0
  15. data/{lib/generators/puffer_pages/install/templates/controllers → app/controllers/admin}/layouts_controller.rb +0 -0
  16. data/{lib/generators/puffer_pages/install/templates/controllers → app/controllers/admin}/pages_controller.rb +0 -0
  17. data/{lib/generators/puffer_pages/install/templates/controllers → app/controllers/admin}/snippets_controller.rb +0 -0
  18. data/app/controllers/pages_controller.rb +2 -2
  19. data/app/controllers/puffer_pages/layouts_controller.rb +2 -2
  20. data/app/controllers/puffer_pages/pages_controller.rb +1 -2
  21. data/app/controllers/puffer_pages/snippets_controller.rb +2 -2
  22. data/app/helpers/puffer_pages_helper.rb +1 -1
  23. data/app/models/layout.rb +1 -5
  24. data/app/models/page.rb +1 -105
  25. data/app/models/page_part.rb +1 -20
  26. data/app/models/puffer_pages/layout.rb +8 -0
  27. data/app/models/puffer_pages/page.rb +107 -0
  28. data/app/models/puffer_pages/page_part.rb +23 -0
  29. data/app/models/puffer_pages/snippet.rb +6 -0
  30. data/app/models/snippet.rb +1 -3
  31. data/app/views/{puffer_tree → puffer/tree_base}/_record.html.erb +0 -0
  32. data/app/views/{puffer_tree → puffer/tree_base}/toggle.js.erb +0 -0
  33. data/app/views/{puffer_tree → puffer/tree_base}/tree.html.erb +0 -0
  34. data/app/views/puffer_pages/{_page_part_builder.html.erb → pages/_page_part_builder.html.erb} +1 -1
  35. data/app/views/puffer_pages/{_page_parts.html.erb → pages/_page_parts.html.erb} +0 -0
  36. data/app/views/puffer_pages/{_tree_page.html.erb → pages/_tree_page.html.erb} +0 -0
  37. data/config/locales/en.yml +3 -1
  38. data/{lib/generators/puffer_pages/install/templates → db}/migrate/20090422092419_create_pages.rb +0 -0
  39. data/{lib/generators/puffer_pages/install/templates → db}/migrate/20090504132337_create_page_parts.rb +0 -0
  40. data/{lib/generators/puffer_pages/install/templates → db}/migrate/20090506102004_create_layouts.rb +0 -0
  41. data/{lib/generators/puffer_pages/install/templates → db}/migrate/20090510121824_create_snippets.rb +0 -0
  42. data/lib/puffer/inputs/page_parts.rb +0 -1
  43. data/lib/puffer/inputs/page_parts_body.rb +0 -1
  44. data/lib/puffer/tree_base.rb +1 -2
  45. data/lib/puffer_pages/engine.rb +0 -4
  46. data/lib/puffer_pages/liquid/file_system.rb +7 -3
  47. data/lib/puffer_pages/liquid/page_drop.rb +13 -6
  48. data/lib/puffer_pages.rb +0 -5
  49. data/puffer_pages.gemspec +63 -107
  50. data/spec/dummy/Rakefile +1 -1
  51. data/spec/dummy/app/assets/images/rails.png +0 -0
  52. data/spec/dummy/app/assets/javascripts/application.js +9 -0
  53. data/spec/dummy/app/assets/stylesheets/application.css +7 -0
  54. data/spec/dummy/app/controllers/puffer/dashboard_controller.rb +1 -1
  55. data/spec/dummy/app/controllers/puffer/sessions_controller.rb +1 -1
  56. data/spec/dummy/app/views/layouts/application.html.erb +3 -3
  57. data/spec/dummy/config/application.rb +4 -8
  58. data/spec/dummy/config/application.rb.orig +43 -0
  59. data/spec/dummy/config/boot.rb +5 -7
  60. data/spec/dummy/config/boot.rb.orig +6 -0
  61. data/spec/dummy/config/environments/development.rb +4 -3
  62. data/spec/dummy/config/environments/pg_test.rb +5 -1
  63. data/spec/dummy/config/environments/production.rb +14 -12
  64. data/spec/dummy/config/environments/test.rb +5 -1
  65. data/spec/dummy/config/initializers/secret_token.rb +1 -1
  66. data/spec/dummy/config/initializers/session_store.rb +1 -1
  67. data/spec/dummy/config/initializers/wrap_parameters.rb +12 -0
  68. data/spec/dummy/config/locales/en.yml +1 -1
  69. data/spec/dummy/config/routes.rb +3 -1
  70. data/spec/dummy/config/routes.rb.orig +58 -0
  71. data/spec/dummy/db/seeds.rb +7 -0
  72. data/spec/dummy/public/robots.txt +5 -0
  73. data/spec/fabricators/pages_fabricator.rb +1 -0
  74. data/spec/lib/core_spec.rb +1 -1
  75. data/spec/lib/drops_spec.rb +13 -8
  76. data/spec/models/page_spec.rb +4 -3
  77. data/spec/spec_helper.rb +14 -1
  78. metadata +200 -288
  79. data/autotest/discover.rb +0 -2
  80. data/lib/generators/puffer_pages/install/USAGE +0 -6
  81. data/lib/generators/puffer_pages/install/install_generator.rb +0 -24
  82. data/lib/generators/puffer_pages/install/templates/puffer/javascripts/puffer_pages.js +0 -35
  83. data/lib/generators/puffer_pages/install/templates/puffer/stylesheets/puffer_pages.css +0 -4
  84. data/lib/generators/puffer_pages/install/templates/puffer_pages.rb +0 -16
  85. data/spec/dummy/app/controllers/admin/layouts_controller.rb +0 -3
  86. data/spec/dummy/app/controllers/admin/pages_controller.rb +0 -3
  87. data/spec/dummy/app/controllers/admin/snippets_controller.rb +0 -3
  88. data/spec/dummy/config/initializers/puffer.rb +0 -12
  89. data/spec/dummy/config/initializers/puffer_pages.rb +0 -16
  90. data/spec/dummy/public/javascripts/application.js +0 -2
  91. data/spec/dummy/public/javascripts/controls.js +0 -965
  92. data/spec/dummy/public/javascripts/dragdrop.js +0 -974
  93. data/spec/dummy/public/javascripts/effects.js +0 -1123
  94. data/spec/dummy/public/javascripts/prototype.js +0 -6001
  95. data/spec/dummy/public/javascripts/rails.js +0 -175
  96. data/spec/dummy/public/puffer/javascripts/puffer.js +0 -10
  97. data/spec/dummy/public/puffer/javascripts/rails.js +0 -57
  98. data/spec/dummy/public/puffer/javascripts/right-autocompleter.js +0 -621
  99. data/spec/dummy/public/puffer/javascripts/right-calendar.js +0 -1461
  100. data/spec/dummy/public/puffer/javascripts/right-dialog.js +0 -764
  101. data/spec/dummy/public/puffer/javascripts/right-tabs.js +0 -1144
  102. data/spec/dummy/public/puffer/javascripts/right.js +0 -5892
  103. data/spec/dummy/public/puffer/stylesheets/puffer.css +0 -469
  104. data/spec/dummy/public/puffer/stylesheets/puffer_pages.css +0 -4
  105. data/spec/dummy/public/puffer/stylesheets/puffer_tree.css +0 -64
  106. data/spec/dummy/public/puffer/stylesheets/reset.css +0 -60
  107. data/spec/dummy/public/stylesheets/.gitkeep +0 -0
data/lib/puffer_pages.rb CHANGED
@@ -22,8 +22,3 @@ require 'puffer_pages/extensions/mapper'
22
22
  #require 'puffer_pages/liquid/tags/yield'
23
23
  require 'puffer_pages/liquid/tags/stylesheets'
24
24
  require 'puffer_pages/liquid/tags/javascripts'
25
-
26
- Puffer.setup do |config|
27
- config.javascripts += %w(right-dialog right-tabs puffer_pages)
28
- config.stylesheets += %w(puffer_pages puffer_tree)
29
- end
data/puffer_pages.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{puffer_pages}
8
- s.version = "0.0.14"
8
+ s.version = "0.0.15"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["pyromaniac"]
12
- s.date = %q{2011-03-01}
12
+ s.date = %q{2011-07-28}
13
13
  s.description = %q{Puffer pages is integratable rails CMS with puffer admin interface}
14
14
  s.email = %q{kinwizard@gmail.com}
15
15
  s.extra_rdoc_files = [
@@ -19,10 +19,23 @@ Gem::Specification.new do |s|
19
19
  ".rspec",
20
20
  "Gemfile",
21
21
  "Gemfile.lock",
22
+ "Guardfile",
22
23
  "MIT-LICENSE",
23
24
  "README.md",
24
25
  "Rakefile",
25
26
  "VERSION",
27
+ "app/assets/javascripts/puffer/codemirror-base.js",
28
+ "app/assets/javascripts/puffer/codemirror-parser.js",
29
+ "app/assets/javascripts/puffer/codemirror.js",
30
+ "app/assets/javascripts/puffer/puffer_pages.js",
31
+ "app/assets/javascripts/puffer/right-dialog.js",
32
+ "app/assets/javascripts/puffer/right-tabs.js",
33
+ "app/assets/stylesheets/codemirror.css",
34
+ "app/assets/stylesheets/puffer_pages.css",
35
+ "app/assets/stylesheets/puffer_tree.css",
36
+ "app/controllers/admin/layouts_controller.rb",
37
+ "app/controllers/admin/pages_controller.rb",
38
+ "app/controllers/admin/snippets_controller.rb",
26
39
  "app/controllers/pages_controller.rb",
27
40
  "app/controllers/puffer_pages/layouts_controller.rb",
28
41
  "app/controllers/puffer_pages/pages_controller.rb",
@@ -32,31 +45,23 @@ Gem::Specification.new do |s|
32
45
  "app/models/layout.rb",
33
46
  "app/models/page.rb",
34
47
  "app/models/page_part.rb",
48
+ "app/models/puffer_pages/layout.rb",
49
+ "app/models/puffer_pages/page.rb",
50
+ "app/models/puffer_pages/page_part.rb",
51
+ "app/models/puffer_pages/snippet.rb",
35
52
  "app/models/snippet.rb",
36
- "app/views/puffer_pages/_page_part_builder.html.erb",
37
- "app/views/puffer_pages/_page_parts.html.erb",
38
- "app/views/puffer_pages/_tree_page.html.erb",
39
- "app/views/puffer_tree/_record.html.erb",
40
- "app/views/puffer_tree/toggle.js.erb",
41
- "app/views/puffer_tree/tree.html.erb",
42
- "autotest/discover.rb",
53
+ "app/views/puffer/tree_base/_record.html.erb",
54
+ "app/views/puffer/tree_base/toggle.js.erb",
55
+ "app/views/puffer/tree_base/tree.html.erb",
56
+ "app/views/puffer_pages/pages/_page_part_builder.html.erb",
57
+ "app/views/puffer_pages/pages/_page_parts.html.erb",
58
+ "app/views/puffer_pages/pages/_tree_page.html.erb",
43
59
  "config/locales/en.yml",
44
60
  "config/puffer_routes.rb",
45
- "lib/generators/puffer_pages/install/USAGE",
46
- "lib/generators/puffer_pages/install/install_generator.rb",
47
- "lib/generators/puffer_pages/install/templates/controllers/layouts_controller.rb",
48
- "lib/generators/puffer_pages/install/templates/controllers/pages_controller.rb",
49
- "lib/generators/puffer_pages/install/templates/controllers/snippets_controller.rb",
50
- "lib/generators/puffer_pages/install/templates/migrate/20090422092419_create_pages.rb",
51
- "lib/generators/puffer_pages/install/templates/migrate/20090504132337_create_page_parts.rb",
52
- "lib/generators/puffer_pages/install/templates/migrate/20090506102004_create_layouts.rb",
53
- "lib/generators/puffer_pages/install/templates/migrate/20090510121824_create_snippets.rb",
54
- "lib/generators/puffer_pages/install/templates/puffer/javascripts/puffer_pages.js",
55
- "lib/generators/puffer_pages/install/templates/puffer/javascripts/right-dialog.js",
56
- "lib/generators/puffer_pages/install/templates/puffer/javascripts/right-tabs.js",
57
- "lib/generators/puffer_pages/install/templates/puffer/stylesheets/puffer_pages.css",
58
- "lib/generators/puffer_pages/install/templates/puffer/stylesheets/puffer_tree.css",
59
- "lib/generators/puffer_pages/install/templates/puffer_pages.rb",
61
+ "db/migrate/20090422092419_create_pages.rb",
62
+ "db/migrate/20090504132337_create_page_parts.rb",
63
+ "db/migrate/20090506102004_create_layouts.rb",
64
+ "db/migrate/20090510121824_create_snippets.rb",
60
65
  "lib/puffer/inputs/page_parts.rb",
61
66
  "lib/puffer/inputs/page_parts_body.rb",
62
67
  "lib/puffer/tree_base.rb",
@@ -72,9 +77,9 @@ Gem::Specification.new do |s|
72
77
  "lib/puffer_pages/liquid/tracker.rb",
73
78
  "puffer_pages.gemspec",
74
79
  "spec/dummy/Rakefile",
75
- "spec/dummy/app/controllers/admin/layouts_controller.rb",
76
- "spec/dummy/app/controllers/admin/pages_controller.rb",
77
- "spec/dummy/app/controllers/admin/snippets_controller.rb",
80
+ "spec/dummy/app/assets/images/rails.png",
81
+ "spec/dummy/app/assets/javascripts/application.js",
82
+ "spec/dummy/app/assets/stylesheets/application.css",
78
83
  "spec/dummy/app/controllers/application_controller.rb",
79
84
  "spec/dummy/app/controllers/puffer/dashboard_controller.rb",
80
85
  "spec/dummy/app/controllers/puffer/sessions_controller.rb",
@@ -82,7 +87,9 @@ Gem::Specification.new do |s|
82
87
  "spec/dummy/app/views/layouts/application.html.erb",
83
88
  "spec/dummy/config.ru",
84
89
  "spec/dummy/config/application.rb",
90
+ "spec/dummy/config/application.rb.orig",
85
91
  "spec/dummy/config/boot.rb",
92
+ "spec/dummy/config/boot.rb.orig",
86
93
  "spec/dummy/config/database.yml",
87
94
  "spec/dummy/config/environment.rb",
88
95
  "spec/dummy/config/environments/development.rb",
@@ -92,40 +99,23 @@ Gem::Specification.new do |s|
92
99
  "spec/dummy/config/initializers/backtrace_silencers.rb",
93
100
  "spec/dummy/config/initializers/inflections.rb",
94
101
  "spec/dummy/config/initializers/mime_types.rb",
95
- "spec/dummy/config/initializers/puffer.rb",
96
- "spec/dummy/config/initializers/puffer_pages.rb",
97
102
  "spec/dummy/config/initializers/secret_token.rb",
98
103
  "spec/dummy/config/initializers/session_store.rb",
104
+ "spec/dummy/config/initializers/wrap_parameters.rb",
99
105
  "spec/dummy/config/locales/en.yml",
100
106
  "spec/dummy/config/routes.rb",
107
+ "spec/dummy/config/routes.rb.orig",
101
108
  "spec/dummy/db/migrate/20090422092419_create_pages.rb",
102
109
  "spec/dummy/db/migrate/20090504132337_create_page_parts.rb",
103
110
  "spec/dummy/db/migrate/20090506102004_create_layouts.rb",
104
111
  "spec/dummy/db/migrate/20090510121824_create_snippets.rb",
105
112
  "spec/dummy/db/schema.rb",
113
+ "spec/dummy/db/seeds.rb",
106
114
  "spec/dummy/public/404.html",
107
115
  "spec/dummy/public/422.html",
108
116
  "spec/dummy/public/500.html",
109
117
  "spec/dummy/public/favicon.ico",
110
- "spec/dummy/public/javascripts/application.js",
111
- "spec/dummy/public/javascripts/controls.js",
112
- "spec/dummy/public/javascripts/dragdrop.js",
113
- "spec/dummy/public/javascripts/effects.js",
114
- "spec/dummy/public/javascripts/prototype.js",
115
- "spec/dummy/public/javascripts/rails.js",
116
- "spec/dummy/public/puffer/javascripts/puffer.js",
117
- "spec/dummy/public/puffer/javascripts/puffer_pages.js",
118
- "spec/dummy/public/puffer/javascripts/rails.js",
119
- "spec/dummy/public/puffer/javascripts/right-autocompleter.js",
120
- "spec/dummy/public/puffer/javascripts/right-calendar.js",
121
- "spec/dummy/public/puffer/javascripts/right-dialog.js",
122
- "spec/dummy/public/puffer/javascripts/right-tabs.js",
123
- "spec/dummy/public/puffer/javascripts/right.js",
124
- "spec/dummy/public/puffer/stylesheets/puffer.css",
125
- "spec/dummy/public/puffer/stylesheets/puffer_pages.css",
126
- "spec/dummy/public/puffer/stylesheets/puffer_tree.css",
127
- "spec/dummy/public/puffer/stylesheets/reset.css",
128
- "spec/dummy/public/stylesheets/.gitkeep",
118
+ "spec/dummy/public/robots.txt",
129
119
  "spec/dummy/script/rails",
130
120
  "spec/fabricators/layouts_fabricator.rb",
131
121
  "spec/fabricators/page_parts_fabricator.rb",
@@ -141,98 +131,64 @@ Gem::Specification.new do |s|
141
131
  ]
142
132
  s.homepage = %q{http://github.com/puffer/puffer_pages}
143
133
  s.require_paths = ["lib"]
144
- s.rubygems_version = %q{1.4.2}
134
+ s.rubygems_version = %q{1.6.2}
145
135
  s.summary = %q{Content management system}
146
- s.test_files = [
147
- "spec/dummy/app/controllers/admin/layouts_controller.rb",
148
- "spec/dummy/app/controllers/admin/pages_controller.rb",
149
- "spec/dummy/app/controllers/admin/snippets_controller.rb",
150
- "spec/dummy/app/controllers/application_controller.rb",
151
- "spec/dummy/app/controllers/puffer/dashboard_controller.rb",
152
- "spec/dummy/app/controllers/puffer/sessions_controller.rb",
153
- "spec/dummy/app/helpers/application_helper.rb",
154
- "spec/dummy/config/application.rb",
155
- "spec/dummy/config/boot.rb",
156
- "spec/dummy/config/environment.rb",
157
- "spec/dummy/config/environments/development.rb",
158
- "spec/dummy/config/environments/pg_test.rb",
159
- "spec/dummy/config/environments/production.rb",
160
- "spec/dummy/config/environments/test.rb",
161
- "spec/dummy/config/initializers/backtrace_silencers.rb",
162
- "spec/dummy/config/initializers/inflections.rb",
163
- "spec/dummy/config/initializers/mime_types.rb",
164
- "spec/dummy/config/initializers/puffer.rb",
165
- "spec/dummy/config/initializers/puffer_pages.rb",
166
- "spec/dummy/config/initializers/secret_token.rb",
167
- "spec/dummy/config/initializers/session_store.rb",
168
- "spec/dummy/config/routes.rb",
169
- "spec/dummy/db/migrate/20090422092419_create_pages.rb",
170
- "spec/dummy/db/migrate/20090504132337_create_page_parts.rb",
171
- "spec/dummy/db/migrate/20090506102004_create_layouts.rb",
172
- "spec/dummy/db/migrate/20090510121824_create_snippets.rb",
173
- "spec/dummy/db/schema.rb",
174
- "spec/fabricators/layouts_fabricator.rb",
175
- "spec/fabricators/page_parts_fabricator.rb",
176
- "spec/fabricators/pages_fabricator.rb",
177
- "spec/fabricators/snippets_fabricator.rb",
178
- "spec/integration/navigation_spec.rb",
179
- "spec/lib/core_spec.rb",
180
- "spec/lib/drops_spec.rb",
181
- "spec/lib/tags_spec.rb",
182
- "spec/models/page_spec.rb",
183
- "spec/puffer_pages_spec.rb",
184
- "spec/spec_helper.rb"
185
- ]
186
136
 
187
137
  if s.respond_to? :specification_version then
188
138
  s.specification_version = 3
189
139
 
190
140
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
191
- s.add_runtime_dependency(%q<rails>, [">= 0"])
141
+ s.add_runtime_dependency(%q<rails>, [">= 3.1.0.rc4"])
142
+ s.add_runtime_dependency(%q<puffer>, [">= 0"])
192
143
  s.add_runtime_dependency(%q<liquid>, [">= 0"])
193
144
  s.add_runtime_dependency(%q<nested_set>, [">= 0"])
194
- s.add_runtime_dependency(%q<puffer>, [">= 0.0.17"])
195
- s.add_development_dependency(%q<capybara>, [">= 0.4.0"])
196
145
  s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
197
146
  s.add_development_dependency(%q<pg>, [">= 0"])
198
147
  s.add_development_dependency(%q<mysql>, [">= 0"])
199
148
  s.add_development_dependency(%q<rspec-rails>, [">= 0"])
200
- s.add_development_dependency(%q<autotest>, [">= 0"])
149
+ s.add_development_dependency(%q<capybara>, [">= 0.4.0"])
150
+ s.add_development_dependency(%q<database_cleaner>, [">= 0"])
151
+ s.add_development_dependency(%q<guard>, [">= 0"])
152
+ s.add_development_dependency(%q<libnotify>, [">= 0"])
153
+ s.add_development_dependency(%q<guard-rspec>, [">= 0"])
201
154
  s.add_development_dependency(%q<forgery>, [">= 0"])
202
- s.add_development_dependency(%q<fabrication>, ["= 0.9.2"])
155
+ s.add_development_dependency(%q<fabrication>, [">= 0"])
203
156
  s.add_development_dependency(%q<jeweler>, [">= 0"])
204
- s.add_development_dependency(%q<mongrel>, [">= 0"])
205
157
  else
206
- s.add_dependency(%q<rails>, [">= 0"])
158
+ s.add_dependency(%q<rails>, [">= 3.1.0.rc4"])
159
+ s.add_dependency(%q<puffer>, [">= 0"])
207
160
  s.add_dependency(%q<liquid>, [">= 0"])
208
161
  s.add_dependency(%q<nested_set>, [">= 0"])
209
- s.add_dependency(%q<puffer>, [">= 0.0.17"])
210
- s.add_dependency(%q<capybara>, [">= 0.4.0"])
211
162
  s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
212
163
  s.add_dependency(%q<pg>, [">= 0"])
213
164
  s.add_dependency(%q<mysql>, [">= 0"])
214
165
  s.add_dependency(%q<rspec-rails>, [">= 0"])
215
- s.add_dependency(%q<autotest>, [">= 0"])
166
+ s.add_dependency(%q<capybara>, [">= 0.4.0"])
167
+ s.add_dependency(%q<database_cleaner>, [">= 0"])
168
+ s.add_dependency(%q<guard>, [">= 0"])
169
+ s.add_dependency(%q<libnotify>, [">= 0"])
170
+ s.add_dependency(%q<guard-rspec>, [">= 0"])
216
171
  s.add_dependency(%q<forgery>, [">= 0"])
217
- s.add_dependency(%q<fabrication>, ["= 0.9.2"])
172
+ s.add_dependency(%q<fabrication>, [">= 0"])
218
173
  s.add_dependency(%q<jeweler>, [">= 0"])
219
- s.add_dependency(%q<mongrel>, [">= 0"])
220
174
  end
221
175
  else
222
- s.add_dependency(%q<rails>, [">= 0"])
176
+ s.add_dependency(%q<rails>, [">= 3.1.0.rc4"])
177
+ s.add_dependency(%q<puffer>, [">= 0"])
223
178
  s.add_dependency(%q<liquid>, [">= 0"])
224
179
  s.add_dependency(%q<nested_set>, [">= 0"])
225
- s.add_dependency(%q<puffer>, [">= 0.0.17"])
226
- s.add_dependency(%q<capybara>, [">= 0.4.0"])
227
180
  s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
228
181
  s.add_dependency(%q<pg>, [">= 0"])
229
182
  s.add_dependency(%q<mysql>, [">= 0"])
230
183
  s.add_dependency(%q<rspec-rails>, [">= 0"])
231
- s.add_dependency(%q<autotest>, [">= 0"])
184
+ s.add_dependency(%q<capybara>, [">= 0.4.0"])
185
+ s.add_dependency(%q<database_cleaner>, [">= 0"])
186
+ s.add_dependency(%q<guard>, [">= 0"])
187
+ s.add_dependency(%q<libnotify>, [">= 0"])
188
+ s.add_dependency(%q<guard-rspec>, [">= 0"])
232
189
  s.add_dependency(%q<forgery>, [">= 0"])
233
- s.add_dependency(%q<fabrication>, ["= 0.9.2"])
190
+ s.add_dependency(%q<fabrication>, [">= 0"])
234
191
  s.add_dependency(%q<jeweler>, [">= 0"])
235
- s.add_dependency(%q<mongrel>, [">= 0"])
236
192
  end
237
193
  end
238
194
 
data/spec/dummy/Rakefile CHANGED
@@ -1,7 +1,7 @@
1
+ #!/usr/bin/env rake
1
2
  # Add your own tasks in files placed in lib/tasks ending in .rake,
2
3
  # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
3
4
 
4
5
  require File.expand_path('../config/application', __FILE__)
5
- require 'rake'
6
6
 
7
7
  Dummy::Application.load_tasks
@@ -0,0 +1,9 @@
1
+ // This is a manifest file that'll be compiled into including all the files listed below.
2
+ // Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
3
+ // be included in the compiled file accessible from http://example.com/assets/application.js
4
+ // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
5
+ // the compiled file.
6
+ //
7
+ //= require jquery
8
+ //= require jquery_ujs
9
+ //= require_tree .
@@ -0,0 +1,7 @@
1
+ /*
2
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
3
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
4
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
5
+ *= require_self
6
+ *= require_tree .
7
+ */
@@ -1,4 +1,4 @@
1
- class Puffer::DashboardController < Puffer::DashboardBase
1
+ class Puffer::DashboardController < Puffer::Dashboard
2
2
 
3
3
  def index
4
4
  p Rails.application.routes.puffer
@@ -1,4 +1,4 @@
1
- class Puffer::SessionsController < Puffer::SessionsBase
1
+ class Puffer::SessionsController < Puffer::Sessions
2
2
  # This is example session controller for puffer authentication.
3
3
  # You can define your own actions.
4
4
  # Also, you can redefine <tt>new<tt> action view as you wish,
@@ -2,9 +2,9 @@
2
2
  <html>
3
3
  <head>
4
4
  <title>Dummy</title>
5
- <%= stylesheet_link_tag :all %>
6
- <%= javascript_include_tag :defaults %>
7
- <%= csrf_meta_tag %>
5
+ <%= stylesheet_link_tag "application" %>
6
+ <%= javascript_include_tag "application" %>
7
+ <%= csrf_meta_tags %>
8
8
  </head>
9
9
  <body>
10
10
 
@@ -1,10 +1,6 @@
1
1
  require File.expand_path('../boot', __FILE__)
2
2
 
3
- require "active_model/railtie"
4
- require "active_record/railtie"
5
- require "action_controller/railtie"
6
- require "action_view/railtie"
7
- require "action_mailer/railtie"
3
+ require 'rails/all'
8
4
 
9
5
  Bundler.require
10
6
  require "puffer_pages"
@@ -33,13 +29,13 @@ module Dummy
33
29
  # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
34
30
  # config.i18n.default_locale = :de
35
31
 
36
- # JavaScript files you want as :defaults (application.js is always included).
37
- # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
38
-
39
32
  # Configure the default encoding used in templates for Ruby 1.9.
40
33
  config.encoding = "utf-8"
41
34
 
42
35
  # Configure sensitive parameters which will be filtered from the log file.
43
36
  config.filter_parameters += [:password]
37
+
38
+ # Enable the asset pipeline
39
+ config.assets.enabled = true
44
40
  end
45
41
  end
@@ -0,0 +1,43 @@
1
+ require File.expand_path('../boot', __FILE__)
2
+
3
+ require 'rails/all'
4
+
5
+ # If you have a Gemfile, require the default gems, the ones in the
6
+ # current environment and also include :assets gems if in development
7
+ # or test environments.
8
+ Bundler.require *Rails.groups(:assets) if defined?(Bundler)
9
+
10
+ module Dummy
11
+ class Application < Rails::Application
12
+ # Settings in config/environments/* take precedence over those specified here.
13
+ # Application configuration should go into files in config/initializers
14
+ # -- all .rb files in that directory are automatically loaded.
15
+
16
+ # Custom directories with classes and modules you want to be autoloadable.
17
+ # config.autoload_paths += %W(#{config.root}/extras)
18
+
19
+ # Only load the plugins named here, in the order given (default is alphabetical).
20
+ # :all can be used as a placeholder for all plugins not explicitly named.
21
+ # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
22
+
23
+ # Activate observers that should always be running.
24
+ # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
25
+
26
+ # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
27
+ # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
28
+ # config.time_zone = 'Central Time (US & Canada)'
29
+
30
+ # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
31
+ # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
32
+ # config.i18n.default_locale = :de
33
+
34
+ # Configure the default encoding used in templates for Ruby 1.9.
35
+ config.encoding = "utf-8"
36
+
37
+ # Configure sensitive parameters which will be filtered from the log file.
38
+ config.filter_parameters += [:password]
39
+
40
+ # Enable the asset pipeline
41
+ config.assets.enabled = true
42
+ end
43
+ end
@@ -1,10 +1,8 @@
1
1
  require 'rubygems'
2
- gemfile = File.expand_path('../../../../Gemfile', __FILE__)
3
2
 
4
- if File.exist?(gemfile)
5
- ENV['BUNDLE_GEMFILE'] = gemfile
6
- require 'bundler'
7
- Bundler.setup
8
- end
3
+ # Set up gems listed in the Gemfile.
4
+ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
9
5
 
10
- $:.unshift File.expand_path('../../../../lib', __FILE__)
6
+ require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
7
+
8
+ $:.unshift File.expand_path('../../../../lib', __FILE__)
@@ -0,0 +1,6 @@
1
+ require 'rubygems'
2
+
3
+ # Set up gems listed in the Gemfile.
4
+ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
5
+
6
+ require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
@@ -3,7 +3,7 @@ Dummy::Application.configure do
3
3
 
4
4
  # In the development environment your application's code is reloaded on
5
5
  # every request. This slows down response time but is perfect for development
6
- # since you don't have to restart the webserver when you make code changes.
6
+ # since you don't have to restart the web server when you make code changes.
7
7
  config.cache_classes = false
8
8
 
9
9
  # Log error messages when you accidentally call methods on nil.
@@ -11,7 +11,6 @@ Dummy::Application.configure do
11
11
 
12
12
  # Show full error reports and disable caching
13
13
  config.consider_all_requests_local = true
14
- config.action_view.debug_rjs = true
15
14
  config.action_controller.perform_caching = false
16
15
 
17
16
  # Don't care if the mailer can't send
@@ -22,5 +21,7 @@ Dummy::Application.configure do
22
21
 
23
22
  # Only use best-standards-support built into browsers
24
23
  config.action_dispatch.best_standards_support = :builtin
25
- end
26
24
 
25
+ # Do not compress assets
26
+ config.assets.compress = false
27
+ end
@@ -7,7 +7,11 @@ Dummy::Application.configure do
7
7
  # and recreated between test runs. Don't rely on the data there!
8
8
  config.cache_classes = true
9
9
 
10
- # Log error messages when you accidentally call methods on nil.
10
+ # Configure static asset server for tests with Cache-Control for performance
11
+ config.serve_static_assets = true
12
+ config.static_cache_control = "public, max-age=3600"
13
+
14
+ # Log error messages when you accidentally call methods on nil
11
15
  config.whiny_nils = true
12
16
 
13
17
  # Show full error reports and disable caching
@@ -1,7 +1,6 @@
1
1
  Dummy::Application.configure do
2
2
  # Settings specified here will take precedence over those in config/application.rb
3
3
 
4
- # The production environment is meant for finished, "live" apps.
5
4
  # Code is not reloaded between requests
6
5
  config.cache_classes = true
7
6
 
@@ -9,14 +8,18 @@ Dummy::Application.configure do
9
8
  config.consider_all_requests_local = false
10
9
  config.action_controller.perform_caching = true
11
10
 
12
- # Specifies the header that your server uses for sending files
13
- config.action_dispatch.x_sendfile_header = "X-Sendfile"
11
+ # Disable Rails's static asset server (Apache or nginx will already do this)
12
+ config.serve_static_assets = false
14
13
 
15
- # For nginx:
16
- # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
14
+ # Compress JavaScripts and CSS
15
+ config.assets.compress = true
16
+
17
+ # Specifies the header that your server uses for sending files
18
+ # (comment out if your front-end server doesn't support this)
19
+ config.action_dispatch.x_sendfile_header = "X-Sendfile" # Use 'X-Accel-Redirect' for nginx
17
20
 
18
- # If you have no front-end server that supports something like X-Sendfile,
19
- # just comment this out and Rails will serve the files
21
+ # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
22
+ # config.force_ssl = true
20
23
 
21
24
  # See everything in the log (default is :info)
22
25
  # config.log_level = :debug
@@ -27,13 +30,12 @@ Dummy::Application.configure do
27
30
  # Use a different cache store in production
28
31
  # config.cache_store = :mem_cache_store
29
32
 
30
- # Disable Rails's static asset server
31
- # In production, Apache or nginx will already do this
32
- config.serve_static_assets = false
33
-
34
- # Enable serving of images, stylesheets, and javascripts from an asset server
33
+ # Enable serving of images, stylesheets, and JavaScripts from an asset server
35
34
  # config.action_controller.asset_host = "http://assets.example.com"
36
35
 
36
+ # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
37
+ # config.assets.precompile += %w( search.js )
38
+
37
39
  # Disable delivery errors, bad email addresses will be ignored
38
40
  # config.action_mailer.raise_delivery_errors = false
39
41
 
@@ -7,7 +7,11 @@ Dummy::Application.configure do
7
7
  # and recreated between test runs. Don't rely on the data there!
8
8
  config.cache_classes = true
9
9
 
10
- # Log error messages when you accidentally call methods on nil.
10
+ # Configure static asset server for tests with Cache-Control for performance
11
+ config.serve_static_assets = true
12
+ config.static_cache_control = "public, max-age=3600"
13
+
14
+ # Log error messages when you accidentally call methods on nil
11
15
  config.whiny_nils = true
12
16
 
13
17
  # Show full error reports and disable caching
@@ -4,4 +4,4 @@
4
4
  # If you change this key, all old signed cookies will become invalid!
5
5
  # Make sure the secret is at least 30 characters and all random,
6
6
  # no regular words or you'll be exposed to dictionary attacks.
7
- Dummy::Application.config.secret_token = '37eb6cd82442a27f551ca58761187a19cda1f2a0d467036e9eef5ec970675d0d66750344db7367031d3500a5bdf997f6562812ea52aac96f76951f47eaf0e9da'
7
+ Dummy::Application.config.secret_token = '41d9a6d7e86b4e67cecf3f216e3e7acd3ca080b1cebf7fa467f351241dfe51686208dff2079101d3b4f83d1a954c17e874da814be144d0ff7539621b74c2cdb1'
@@ -1,6 +1,6 @@
1
1
  # Be sure to restart your server when you modify this file.
2
2
 
3
- Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
3
+ Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
4
4
 
5
5
  # Use the database for sessions instead of the cookie-based default,
6
6
  # which shouldn't be used to store highly confidential information
@@ -0,0 +1,12 @@
1
+ # Be sure to restart your server when you modify this file.
2
+ #
3
+ # This file contains settings for ActionController::ParamsWrapper which
4
+ # is enabled by default.
5
+
6
+ # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
7
+ ActionController::Base.wrap_parameters format: [:json]
8
+
9
+ # Disable root element in JSON by default.
10
+ if defined?(ActiveRecord)
11
+ ActiveRecord::Base.include_root_in_json = false
12
+ end
@@ -1,5 +1,5 @@
1
1
  # Sample localization file for English. Add more files in this directory for other locales.
2
- # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
2
+ # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
3
3
 
4
4
  en:
5
5
  hello: "Hello world"
@@ -11,6 +11,8 @@ Dummy::Application.routes.draw do
11
11
  resources :snippets
12
12
  end
13
13
 
14
+ match '/admin' => 'puffer/dashboard#index', :as => :admin
15
+
14
16
  # The priority is based upon order of creation:
15
17
  # first created -> highest priority.
16
18
 
@@ -60,7 +62,7 @@ Dummy::Application.routes.draw do
60
62
 
61
63
  # You can have the root of your site routed with "root"
62
64
  # just remember to delete public/index.html.
63
- # root :to => "welcome#index"
65
+ # root :to => 'welcome#index'
64
66
 
65
67
  # See how all your routes lay out with "rake routes"
66
68