puffer_pages 0.0.15 → 0.0.16

Sign up to get free protection for your applications and to get access to all the features.
Files changed (37) hide show
  1. data/Gemfile +1 -1
  2. data/Gemfile.lock +5 -5
  3. data/VERSION +1 -1
  4. data/app/assets/javascripts/puffer_pages/application.js +6 -0
  5. data/app/assets/javascripts/{puffer → puffer_pages}/codemirror-base.js +0 -0
  6. data/app/assets/javascripts/{puffer → puffer_pages}/codemirror-parser.js +0 -0
  7. data/app/assets/javascripts/{puffer → puffer_pages}/codemirror.js +0 -0
  8. data/app/assets/javascripts/{puffer → puffer_pages}/puffer_pages.js +0 -0
  9. data/app/assets/javascripts/{puffer → puffer_pages}/right-dialog.js +0 -0
  10. data/app/assets/javascripts/{puffer → puffer_pages}/right-tabs.js +0 -0
  11. data/app/assets/stylesheets/puffer_pages/application.css +4 -0
  12. data/app/assets/stylesheets/{codemirror.css → puffer_pages/codemirror.css} +0 -0
  13. data/app/assets/stylesheets/{puffer_pages.css → puffer_pages/puffer_pages.css} +0 -0
  14. data/app/controllers/admin/layouts_controller.rb +1 -1
  15. data/app/controllers/admin/pages_controller.rb +1 -1
  16. data/app/controllers/admin/snippets_controller.rb +1 -1
  17. data/app/controllers/puffer_pages/{layouts_controller.rb → layouts_base.rb} +1 -1
  18. data/app/controllers/puffer_pages/{pages_controller.rb → pages_base.rb} +1 -1
  19. data/app/controllers/puffer_pages/{snippets_controller.rb → snippets_base.rb} +1 -1
  20. data/app/models/puffer_pages/page.rb +1 -0
  21. data/app/views/puffer_pages/{pages → pages_base}/_page_part_builder.html.erb +0 -0
  22. data/app/views/puffer_pages/{pages → pages_base}/_page_parts.html.erb +0 -0
  23. data/app/views/puffer_pages/{pages → pages_base}/_tree_page.html.erb +0 -0
  24. data/puffer_pages.gemspec +21 -29
  25. data/spec/dummy/config/routes.rb +0 -7
  26. data/spec/models/page_spec.rb +1 -0
  27. metadata +52 -60
  28. data/app/assets/stylesheets/puffer_tree.css +0 -65
  29. data/app/helpers/puffer_tree_helper.rb +0 -15
  30. data/app/views/puffer/tree_base/_record.html.erb +0 -27
  31. data/app/views/puffer/tree_base/toggle.js.erb +0 -6
  32. data/app/views/puffer/tree_base/tree.html.erb +0 -38
  33. data/lib/puffer/tree_base.rb +0 -54
  34. data/spec/dummy/app/controllers/puffer/dashboard_controller.rb +0 -7
  35. data/spec/dummy/app/controllers/puffer/sessions_controller.rb +0 -29
  36. data/spec/dummy/config/application.rb.orig +0 -43
  37. data/spec/dummy/config/routes.rb.orig +0 -58
data/Gemfile CHANGED
@@ -1,6 +1,6 @@
1
1
  source "http://rubygems.org"
2
2
 
3
- gem 'rails', '>= 3.1.0.rc4'
3
+ gem 'rails', '>= 3.1.0.rc5'
4
4
  gem 'puffer', :git => 'git://github.com/puffer/puffer.git'
5
5
  gem 'liquid', :git => 'git://github.com/puffer/liquid.git'
6
6
  gem 'nested_set'
data/Gemfile.lock CHANGED
@@ -6,12 +6,12 @@ GIT
6
6
 
7
7
  GIT
8
8
  remote: git://github.com/puffer/puffer.git
9
- revision: 64792e0691ee4c9031028eaac84dbb15a5db9e17
9
+ revision: 6fae9386a020bbaf20371381c0ee3b1a5ad7d4fa
10
10
  specs:
11
- puffer (0.0.20)
11
+ puffer (0.0.22)
12
12
  apotomo
13
13
  kaminari
14
- rails (>= 3.1.0.rc4)
14
+ rails (>= 3.1.0.rc5)
15
15
 
16
16
  GEM
17
17
  remote: http://rubygems.org/
@@ -126,7 +126,7 @@ GEM
126
126
  rdoc (~> 3.4)
127
127
  thor (~> 0.14.6)
128
128
  rake (0.9.2)
129
- rdoc (3.8)
129
+ rdoc (3.9.1)
130
130
  rspec (2.6.0)
131
131
  rspec-core (~> 2.6.0)
132
132
  rspec-expectations (~> 2.6.0)
@@ -179,6 +179,6 @@ DEPENDENCIES
179
179
  nested_set
180
180
  pg
181
181
  puffer!
182
- rails (>= 3.1.0.rc4)
182
+ rails (>= 3.1.0.rc5)
183
183
  rspec-rails
184
184
  sqlite3-ruby
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.0.15
1
+ 0.0.16
@@ -0,0 +1,6 @@
1
+ //= require puffer/right-tabs
2
+ //= require puffer/right-dialog
3
+ //= require puffer/puffer_pages
4
+ //= require puffer/codemirror
5
+ //= require puffer/codemirror-base
6
+ //= require puffer/codemirror-parser
@@ -0,0 +1,4 @@
1
+ /*
2
+ *= require puffer_pages/puffer_pages
3
+ *= require puffer_pages/codemirror
4
+ */
@@ -1,3 +1,3 @@
1
- class Admin::LayoutsController < PufferPages::LayoutsController
1
+ class Admin::LayoutsController < PufferPages::LayoutsBase
2
2
 
3
3
  end
@@ -1,3 +1,3 @@
1
- class Admin::PagesController < PufferPages::PagesController
1
+ class Admin::PagesController < PufferPages::PagesBase
2
2
 
3
3
  end
@@ -1,3 +1,3 @@
1
- class Admin::SnippetsController < PufferPages::SnippetsController
1
+ class Admin::SnippetsController < PufferPages::SnippetsBase
2
2
 
3
3
  end
@@ -1,4 +1,4 @@
1
- class PufferPages::LayoutsController < Puffer::Base
1
+ class PufferPages::LayoutsBase < Puffer::Base
2
2
  unloadable
3
3
 
4
4
  setup do
@@ -1,4 +1,4 @@
1
- class PufferPages::PagesController < Puffer::TreeBase
1
+ class PufferPages::PagesBase < Puffer::TreeBase
2
2
  unloadable
3
3
 
4
4
  helper :puffer_pages
@@ -1,4 +1,4 @@
1
- class PufferPages::SnippetsController < Puffer::Base
1
+ class PufferPages::SnippetsBase < Puffer::Base
2
2
  unloadable
3
3
 
4
4
  setup do
@@ -1,3 +1,4 @@
1
+ # encoding: UTF-8
1
2
  class PufferPages::Page < ActiveRecord::Base
2
3
  self.abstract_class = true
3
4
 
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.15"
8
+ s.version = "0.0.16"
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-07-28}
12
+ s.date = %q{2011-08-01}
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 = [
@@ -24,24 +24,24 @@ Gem::Specification.new do |s|
24
24
  "README.md",
25
25
  "Rakefile",
26
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",
27
+ "app/assets/javascripts/puffer_pages/application.js",
28
+ "app/assets/javascripts/puffer_pages/codemirror-base.js",
29
+ "app/assets/javascripts/puffer_pages/codemirror-parser.js",
30
+ "app/assets/javascripts/puffer_pages/codemirror.js",
31
+ "app/assets/javascripts/puffer_pages/puffer_pages.js",
32
+ "app/assets/javascripts/puffer_pages/right-dialog.js",
33
+ "app/assets/javascripts/puffer_pages/right-tabs.js",
34
+ "app/assets/stylesheets/puffer_pages/application.css",
35
+ "app/assets/stylesheets/puffer_pages/codemirror.css",
36
+ "app/assets/stylesheets/puffer_pages/puffer_pages.css",
36
37
  "app/controllers/admin/layouts_controller.rb",
37
38
  "app/controllers/admin/pages_controller.rb",
38
39
  "app/controllers/admin/snippets_controller.rb",
39
40
  "app/controllers/pages_controller.rb",
40
- "app/controllers/puffer_pages/layouts_controller.rb",
41
- "app/controllers/puffer_pages/pages_controller.rb",
42
- "app/controllers/puffer_pages/snippets_controller.rb",
41
+ "app/controllers/puffer_pages/layouts_base.rb",
42
+ "app/controllers/puffer_pages/pages_base.rb",
43
+ "app/controllers/puffer_pages/snippets_base.rb",
43
44
  "app/helpers/puffer_pages_helper.rb",
44
- "app/helpers/puffer_tree_helper.rb",
45
45
  "app/models/layout.rb",
46
46
  "app/models/page.rb",
47
47
  "app/models/page_part.rb",
@@ -50,12 +50,9 @@ Gem::Specification.new do |s|
50
50
  "app/models/puffer_pages/page_part.rb",
51
51
  "app/models/puffer_pages/snippet.rb",
52
52
  "app/models/snippet.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",
53
+ "app/views/puffer_pages/pages_base/_page_part_builder.html.erb",
54
+ "app/views/puffer_pages/pages_base/_page_parts.html.erb",
55
+ "app/views/puffer_pages/pages_base/_tree_page.html.erb",
59
56
  "config/locales/en.yml",
60
57
  "config/puffer_routes.rb",
61
58
  "db/migrate/20090422092419_create_pages.rb",
@@ -64,7 +61,6 @@ Gem::Specification.new do |s|
64
61
  "db/migrate/20090510121824_create_snippets.rb",
65
62
  "lib/puffer/inputs/page_parts.rb",
66
63
  "lib/puffer/inputs/page_parts_body.rb",
67
- "lib/puffer/tree_base.rb",
68
64
  "lib/puffer_pages.rb",
69
65
  "lib/puffer_pages/engine.rb",
70
66
  "lib/puffer_pages/extensions/core.rb",
@@ -81,13 +77,10 @@ Gem::Specification.new do |s|
81
77
  "spec/dummy/app/assets/javascripts/application.js",
82
78
  "spec/dummy/app/assets/stylesheets/application.css",
83
79
  "spec/dummy/app/controllers/application_controller.rb",
84
- "spec/dummy/app/controllers/puffer/dashboard_controller.rb",
85
- "spec/dummy/app/controllers/puffer/sessions_controller.rb",
86
80
  "spec/dummy/app/helpers/application_helper.rb",
87
81
  "spec/dummy/app/views/layouts/application.html.erb",
88
82
  "spec/dummy/config.ru",
89
83
  "spec/dummy/config/application.rb",
90
- "spec/dummy/config/application.rb.orig",
91
84
  "spec/dummy/config/boot.rb",
92
85
  "spec/dummy/config/boot.rb.orig",
93
86
  "spec/dummy/config/database.yml",
@@ -104,7 +97,6 @@ Gem::Specification.new do |s|
104
97
  "spec/dummy/config/initializers/wrap_parameters.rb",
105
98
  "spec/dummy/config/locales/en.yml",
106
99
  "spec/dummy/config/routes.rb",
107
- "spec/dummy/config/routes.rb.orig",
108
100
  "spec/dummy/db/migrate/20090422092419_create_pages.rb",
109
101
  "spec/dummy/db/migrate/20090504132337_create_page_parts.rb",
110
102
  "spec/dummy/db/migrate/20090506102004_create_layouts.rb",
@@ -138,7 +130,7 @@ Gem::Specification.new do |s|
138
130
  s.specification_version = 3
139
131
 
140
132
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
141
- s.add_runtime_dependency(%q<rails>, [">= 3.1.0.rc4"])
133
+ s.add_runtime_dependency(%q<rails>, [">= 3.1.0.rc5"])
142
134
  s.add_runtime_dependency(%q<puffer>, [">= 0"])
143
135
  s.add_runtime_dependency(%q<liquid>, [">= 0"])
144
136
  s.add_runtime_dependency(%q<nested_set>, [">= 0"])
@@ -155,7 +147,7 @@ Gem::Specification.new do |s|
155
147
  s.add_development_dependency(%q<fabrication>, [">= 0"])
156
148
  s.add_development_dependency(%q<jeweler>, [">= 0"])
157
149
  else
158
- s.add_dependency(%q<rails>, [">= 3.1.0.rc4"])
150
+ s.add_dependency(%q<rails>, [">= 3.1.0.rc5"])
159
151
  s.add_dependency(%q<puffer>, [">= 0"])
160
152
  s.add_dependency(%q<liquid>, [">= 0"])
161
153
  s.add_dependency(%q<nested_set>, [">= 0"])
@@ -173,7 +165,7 @@ Gem::Specification.new do |s|
173
165
  s.add_dependency(%q<jeweler>, [">= 0"])
174
166
  end
175
167
  else
176
- s.add_dependency(%q<rails>, [">= 3.1.0.rc4"])
168
+ s.add_dependency(%q<rails>, [">= 3.1.0.rc5"])
177
169
  s.add_dependency(%q<puffer>, [">= 0"])
178
170
  s.add_dependency(%q<liquid>, [">= 0"])
179
171
  s.add_dependency(%q<nested_set>, [">= 0"])
@@ -1,18 +1,11 @@
1
1
  Dummy::Application.routes.draw do
2
2
 
3
- namespace :puffer do
4
- root :to => 'dashboard#index'
5
- resource :session
6
- end
7
-
8
3
  namespace :admin do
9
4
  resources :pages
10
5
  resources :layouts
11
6
  resources :snippets
12
7
  end
13
8
 
14
- match '/admin' => 'puffer/dashboard#index', :as => :admin
15
-
16
9
  # The priority is based upon order of creation:
17
10
  # first created -> highest priority.
18
11
 
@@ -1,3 +1,4 @@
1
+ # encoding: UTF-8
1
2
  require 'spec_helper'
2
3
 
3
4
  describe Page do
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: puffer_pages
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.15
4
+ version: 0.0.16
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,23 +9,23 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-07-28 00:00:00.000000000 +04:00
12
+ date: 2011-08-01 00:00:00.000000000 +04:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
17
- requirement: &25533340 !ruby/object:Gem::Requirement
17
+ requirement: &20350880 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ! '>='
21
21
  - !ruby/object:Gem::Version
22
- version: 3.1.0.rc4
22
+ version: 3.1.0.rc5
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *25533340
25
+ version_requirements: *20350880
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: puffer
28
- requirement: &25532820 !ruby/object:Gem::Requirement
28
+ requirement: &20350240 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *25532820
36
+ version_requirements: *20350240
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: liquid
39
- requirement: &25532300 !ruby/object:Gem::Requirement
39
+ requirement: &20349600 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
44
44
  version: '0'
45
45
  type: :runtime
46
46
  prerelease: false
47
- version_requirements: *25532300
47
+ version_requirements: *20349600
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: nested_set
50
- requirement: &25531780 !ruby/object:Gem::Requirement
50
+ requirement: &20348860 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
55
55
  version: '0'
56
56
  type: :runtime
57
57
  prerelease: false
58
- version_requirements: *25531780
58
+ version_requirements: *20348860
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: sqlite3-ruby
61
- requirement: &25531280 !ruby/object:Gem::Requirement
61
+ requirement: &20348220 !ruby/object:Gem::Requirement
62
62
  none: false
63
63
  requirements:
64
64
  - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
66
66
  version: '0'
67
67
  type: :development
68
68
  prerelease: false
69
- version_requirements: *25531280
69
+ version_requirements: *20348220
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: pg
72
- requirement: &25530780 !ruby/object:Gem::Requirement
72
+ requirement: &20347580 !ruby/object:Gem::Requirement
73
73
  none: false
74
74
  requirements:
75
75
  - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
77
77
  version: '0'
78
78
  type: :development
79
79
  prerelease: false
80
- version_requirements: *25530780
80
+ version_requirements: *20347580
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: mysql
83
- requirement: &25530280 !ruby/object:Gem::Requirement
83
+ requirement: &20346940 !ruby/object:Gem::Requirement
84
84
  none: false
85
85
  requirements:
86
86
  - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
88
88
  version: '0'
89
89
  type: :development
90
90
  prerelease: false
91
- version_requirements: *25530280
91
+ version_requirements: *20346940
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: rspec-rails
94
- requirement: &25529740 !ruby/object:Gem::Requirement
94
+ requirement: &20346360 !ruby/object:Gem::Requirement
95
95
  none: false
96
96
  requirements:
97
97
  - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
99
99
  version: '0'
100
100
  type: :development
101
101
  prerelease: false
102
- version_requirements: *25529740
102
+ version_requirements: *20346360
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: capybara
105
- requirement: &25529200 !ruby/object:Gem::Requirement
105
+ requirement: &20345700 !ruby/object:Gem::Requirement
106
106
  none: false
107
107
  requirements:
108
108
  - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
110
110
  version: 0.4.0
111
111
  type: :development
112
112
  prerelease: false
113
- version_requirements: *25529200
113
+ version_requirements: *20345700
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: database_cleaner
116
- requirement: &25522140 !ruby/object:Gem::Requirement
116
+ requirement: &20345100 !ruby/object:Gem::Requirement
117
117
  none: false
118
118
  requirements:
119
119
  - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
121
121
  version: '0'
122
122
  type: :development
123
123
  prerelease: false
124
- version_requirements: *25522140
124
+ version_requirements: *20345100
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: guard
127
- requirement: &25521560 !ruby/object:Gem::Requirement
127
+ requirement: &20344460 !ruby/object:Gem::Requirement
128
128
  none: false
129
129
  requirements:
130
130
  - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
132
132
  version: '0'
133
133
  type: :development
134
134
  prerelease: false
135
- version_requirements: *25521560
135
+ version_requirements: *20344460
136
136
  - !ruby/object:Gem::Dependency
137
137
  name: libnotify
138
- requirement: &25520980 !ruby/object:Gem::Requirement
138
+ requirement: &20305060 !ruby/object:Gem::Requirement
139
139
  none: false
140
140
  requirements:
141
141
  - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
143
143
  version: '0'
144
144
  type: :development
145
145
  prerelease: false
146
- version_requirements: *25520980
146
+ version_requirements: *20305060
147
147
  - !ruby/object:Gem::Dependency
148
148
  name: guard-rspec
149
- requirement: &25520280 !ruby/object:Gem::Requirement
149
+ requirement: &20304380 !ruby/object:Gem::Requirement
150
150
  none: false
151
151
  requirements:
152
152
  - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
154
154
  version: '0'
155
155
  type: :development
156
156
  prerelease: false
157
- version_requirements: *25520280
157
+ version_requirements: *20304380
158
158
  - !ruby/object:Gem::Dependency
159
159
  name: forgery
160
- requirement: &25519680 !ruby/object:Gem::Requirement
160
+ requirement: &20303720 !ruby/object:Gem::Requirement
161
161
  none: false
162
162
  requirements:
163
163
  - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
165
165
  version: '0'
166
166
  type: :development
167
167
  prerelease: false
168
- version_requirements: *25519680
168
+ version_requirements: *20303720
169
169
  - !ruby/object:Gem::Dependency
170
170
  name: fabrication
171
- requirement: &25519080 !ruby/object:Gem::Requirement
171
+ requirement: &20302880 !ruby/object:Gem::Requirement
172
172
  none: false
173
173
  requirements:
174
174
  - - ! '>='
@@ -176,10 +176,10 @@ dependencies:
176
176
  version: '0'
177
177
  type: :development
178
178
  prerelease: false
179
- version_requirements: *25519080
179
+ version_requirements: *20302880
180
180
  - !ruby/object:Gem::Dependency
181
181
  name: jeweler
182
- requirement: &25518440 !ruby/object:Gem::Requirement
182
+ requirement: &20302100 !ruby/object:Gem::Requirement
183
183
  none: false
184
184
  requirements:
185
185
  - - ! '>='
@@ -187,7 +187,7 @@ dependencies:
187
187
  version: '0'
188
188
  type: :development
189
189
  prerelease: false
190
- version_requirements: *25518440
190
+ version_requirements: *20302100
191
191
  description: Puffer pages is integratable rails CMS with puffer admin interface
192
192
  email: kinwizard@gmail.com
193
193
  executables: []
@@ -203,24 +203,24 @@ files:
203
203
  - README.md
204
204
  - Rakefile
205
205
  - VERSION
206
- - app/assets/javascripts/puffer/codemirror-base.js
207
- - app/assets/javascripts/puffer/codemirror-parser.js
208
- - app/assets/javascripts/puffer/codemirror.js
209
- - app/assets/javascripts/puffer/puffer_pages.js
210
- - app/assets/javascripts/puffer/right-dialog.js
211
- - app/assets/javascripts/puffer/right-tabs.js
212
- - app/assets/stylesheets/codemirror.css
213
- - app/assets/stylesheets/puffer_pages.css
214
- - app/assets/stylesheets/puffer_tree.css
206
+ - app/assets/javascripts/puffer_pages/application.js
207
+ - app/assets/javascripts/puffer_pages/codemirror-base.js
208
+ - app/assets/javascripts/puffer_pages/codemirror-parser.js
209
+ - app/assets/javascripts/puffer_pages/codemirror.js
210
+ - app/assets/javascripts/puffer_pages/puffer_pages.js
211
+ - app/assets/javascripts/puffer_pages/right-dialog.js
212
+ - app/assets/javascripts/puffer_pages/right-tabs.js
213
+ - app/assets/stylesheets/puffer_pages/application.css
214
+ - app/assets/stylesheets/puffer_pages/codemirror.css
215
+ - app/assets/stylesheets/puffer_pages/puffer_pages.css
215
216
  - app/controllers/admin/layouts_controller.rb
216
217
  - app/controllers/admin/pages_controller.rb
217
218
  - app/controllers/admin/snippets_controller.rb
218
219
  - app/controllers/pages_controller.rb
219
- - app/controllers/puffer_pages/layouts_controller.rb
220
- - app/controllers/puffer_pages/pages_controller.rb
221
- - app/controllers/puffer_pages/snippets_controller.rb
220
+ - app/controllers/puffer_pages/layouts_base.rb
221
+ - app/controllers/puffer_pages/pages_base.rb
222
+ - app/controllers/puffer_pages/snippets_base.rb
222
223
  - app/helpers/puffer_pages_helper.rb
223
- - app/helpers/puffer_tree_helper.rb
224
224
  - app/models/layout.rb
225
225
  - app/models/page.rb
226
226
  - app/models/page_part.rb
@@ -229,12 +229,9 @@ files:
229
229
  - app/models/puffer_pages/page_part.rb
230
230
  - app/models/puffer_pages/snippet.rb
231
231
  - app/models/snippet.rb
232
- - app/views/puffer/tree_base/_record.html.erb
233
- - app/views/puffer/tree_base/toggle.js.erb
234
- - app/views/puffer/tree_base/tree.html.erb
235
- - app/views/puffer_pages/pages/_page_part_builder.html.erb
236
- - app/views/puffer_pages/pages/_page_parts.html.erb
237
- - app/views/puffer_pages/pages/_tree_page.html.erb
232
+ - app/views/puffer_pages/pages_base/_page_part_builder.html.erb
233
+ - app/views/puffer_pages/pages_base/_page_parts.html.erb
234
+ - app/views/puffer_pages/pages_base/_tree_page.html.erb
238
235
  - config/locales/en.yml
239
236
  - config/puffer_routes.rb
240
237
  - db/migrate/20090422092419_create_pages.rb
@@ -243,7 +240,6 @@ files:
243
240
  - db/migrate/20090510121824_create_snippets.rb
244
241
  - lib/puffer/inputs/page_parts.rb
245
242
  - lib/puffer/inputs/page_parts_body.rb
246
- - lib/puffer/tree_base.rb
247
243
  - lib/puffer_pages.rb
248
244
  - lib/puffer_pages/engine.rb
249
245
  - lib/puffer_pages/extensions/core.rb
@@ -260,13 +256,10 @@ files:
260
256
  - spec/dummy/app/assets/javascripts/application.js
261
257
  - spec/dummy/app/assets/stylesheets/application.css
262
258
  - spec/dummy/app/controllers/application_controller.rb
263
- - spec/dummy/app/controllers/puffer/dashboard_controller.rb
264
- - spec/dummy/app/controllers/puffer/sessions_controller.rb
265
259
  - spec/dummy/app/helpers/application_helper.rb
266
260
  - spec/dummy/app/views/layouts/application.html.erb
267
261
  - spec/dummy/config.ru
268
262
  - spec/dummy/config/application.rb
269
- - spec/dummy/config/application.rb.orig
270
263
  - spec/dummy/config/boot.rb
271
264
  - spec/dummy/config/boot.rb.orig
272
265
  - spec/dummy/config/database.yml
@@ -283,7 +276,6 @@ files:
283
276
  - spec/dummy/config/initializers/wrap_parameters.rb
284
277
  - spec/dummy/config/locales/en.yml
285
278
  - spec/dummy/config/routes.rb
286
- - spec/dummy/config/routes.rb.orig
287
279
  - spec/dummy/db/migrate/20090422092419_create_pages.rb
288
280
  - spec/dummy/db/migrate/20090504132337_create_page_parts.rb
289
281
  - spec/dummy/db/migrate/20090506102004_create_layouts.rb
@@ -322,7 +314,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
322
314
  version: '0'
323
315
  segments:
324
316
  - 0
325
- hash: -3292772880239037426
317
+ hash: -1916490092138134564
326
318
  required_rubygems_version: !ruby/object:Gem::Requirement
327
319
  none: false
328
320
  requirements:
@@ -1,65 +0,0 @@
1
- .puffer_tree *
2
- {
3
- font-size: 8pt;
4
- }
5
-
6
- .puffer_tree li
7
- {
8
- list-style: none;
9
- position: relative;
10
- }
11
-
12
- .puffer_tree li ul
13
- {
14
- margin-left: 20px;
15
- }
16
-
17
- .puffer_tree li .record
18
- {
19
- margin-bottom: 5px;
20
- border: 1px solid #ddd;
21
- border-radius: 5px;
22
- -moz-border-radius: 5px;
23
- -webkit-border-radius: 5px;
24
- }
25
-
26
- .puffer_tree li .record dt
27
- {
28
- white-space: nowrap;
29
- }
30
-
31
- .puffer_tree li .record dd
32
- {
33
- width: 50px;
34
- white-space: nowrap;
35
- padding: 5px;
36
- padding-left: 20px;
37
- }
38
-
39
- .puffer_tree li .record dt > span
40
- {
41
- display: table-cell;
42
- *display: inline;
43
- zoom: 1;
44
- padding: 5px;
45
- white-space: normal;
46
- vertical-align: top;
47
- }
48
-
49
- .puffer_tree li .record dt > span.handle
50
- {
51
- padding-right: 10px;
52
- color: #999;
53
- }
54
-
55
- .puffer_tree li .record .toggle
56
- {
57
- position: absolute;
58
- left: -20px;
59
- }
60
-
61
- .puffer_tree li .record .toggle a
62
- {
63
- color: #999;
64
- text-decoration: none;
65
- }
@@ -1,15 +0,0 @@
1
- module PufferTreeHelper
2
-
3
- def puffer_tree hash, options = {}, &block
4
- content_tag :ul, options do
5
- puffer_tree_node hash, &block
6
- end if hash.present?
7
- end
8
-
9
- def puffer_tree_node hash, &block
10
- hash.keys.each do |node|
11
- block.call node, render_tree(hash[node], &block)
12
- end if hash.present?
13
- end
14
-
15
- end
@@ -1,27 +0,0 @@
1
- <li id="<%= dom_id record %>">
2
- <dl class="record columns">
3
- <dt class="column">
4
- <% unless record.leaf? || record.root? %>
5
- <span class="toggle">
6
- <% if children.blank? %>
7
- <%= link_to '+', resource.member_path(record, :action => :expand), :remote => true %>
8
- <% else %>
9
- <%= link_to '–', resource.member_path(record, :action => :collapse), :remote => true %>
10
- <% end %>
11
- </span>
12
- <% end %>
13
- <span class="handle">⇅</span>
14
- <% tree_fields.each do |field| -%>
15
- <span><%= render_field field, record %></span>
16
- <% end -%>
17
- </dt>
18
- <dd class="column">
19
- <%= link_to 'edit', resource.edit_path(record) if update_fields.present? %>
20
- <% controller._members.each do |member| %>
21
- <%= link_to member.label, resource.member_path(record, :action => member.action) if member.display? %>
22
- <% end %>
23
- <%= link_to 'destroy', resource.member_path(record), :confirm => "Are you sure?", :method => :delete if configuration.destroy %>
24
- </dd>
25
- </dl>
26
- <%= children %>
27
- </li>
@@ -1,6 +0,0 @@
1
- <% nodes = capture do %>
2
- <% puffer_tree_node records do |record, children| %>
3
- <%= render :partial => 'record', :object => record, :locals => {:children => children} %>
4
- <% end %>
5
- <% end %>
6
- $('<%= dom_id @parent %>').replace('<%= escape_javascript nodes %>')
@@ -1,38 +0,0 @@
1
- <% @title = resource.human %>
2
- <h1><%= @title %> Tree</h1>
3
- <% if records.present? %>
4
- <%= puffer_tree records, :class => 'puffer_tree' do |record, children| %>
5
- <%= render :partial => 'record', :object => record, :locals => {:children => children} %>
6
- <% end %>
7
- <% else %>
8
- <p>Sorry, but there is no records in <%= resource.human %></p>
9
- <% end %>
10
-
11
- <% if false %>
12
- <table class="list_table">
13
- <thead>
14
- <tr>
15
- <% index_fields.each do |field| -%>
16
- <th><%= render_head field %></th>
17
- <% end -%>
18
- <th class="actions">Actions</th>
19
- </tr>
20
- </thead>
21
- <tbody>
22
- <% records.each do |record| -%>
23
- <tr>
24
- <% index_fields.each do |field| -%>
25
- <td><%= render_field field, record %></td>
26
- <% end -%>
27
- <td class="actions">
28
- <%= link_to 'edit', resource.edit_path(record) if update_fields.present? %>
29
- <% controller._members.each do |member| %>
30
- <%= link_to member.label, resource.member_path(record, :action => member.action) if member.display? %>
31
- <% end %>
32
- <%= link_to 'destroy', resource.member_path(record), :confirm => "Are you sure?", :method => :delete if configuration.destroy %>
33
- </td>
34
- </tr>
35
- <% end -%>
36
- </tbody>
37
- </table>
38
- <% end %>
@@ -1,54 +0,0 @@
1
- module Puffer
2
- class TreeBase < Puffer::Base
3
- unloadable
4
-
5
- helper :puffer_tree
6
-
7
- define_fields :tree
8
-
9
- def self.tree_fi elds
10
- _tree_fields.presence || index_fields
11
- end
12
-
13
- def index
14
- return super if params[:search]
15
- @records = resource.collection_scope.includes(resource.includes)
16
- if session[:expanded].present?
17
- @records = @records.where(["depth in (0, 1) or parent_id in (#{session[:expanded].join(', ')})"]).arrange
18
- else
19
- @records = @records.where(:depth => [0, 1]).arrange
20
- end
21
- render 'tree'
22
- end
23
-
24
- member do
25
- get :inherit, :label => 'new page'
26
- get :expand, :display => false
27
- get :collapse, :display => false
28
- end
29
-
30
- def inherit
31
- @parent = resource.member
32
- @record = @parent.children.new
33
- render 'new'
34
- end
35
-
36
- def expand
37
- @parent = resource.member
38
- session[:expanded] ||= []
39
- session[:expanded].push params[:id] if @parent
40
- session[:expanded].uniq!
41
- @records = @parent.self_and_descendants.where(:parent_id => [@parent.parent_id] + session[:expanded]).includes(resource.includes).arrange
42
- render 'toggle'
43
- end
44
-
45
- def collapse
46
- @parent = resource.member
47
- session[:expanded] ||= []
48
- session[:expanded].delete params[:id]
49
- @records = resource.collection_scope.where(:id => [@parent.id]).includes(resource.includes).arrange
50
- render 'toggle'
51
- end
52
-
53
- end
54
- end
@@ -1,7 +0,0 @@
1
- class Puffer::DashboardController < Puffer::Dashboard
2
-
3
- def index
4
- p Rails.application.routes.puffer
5
- end
6
-
7
- end
@@ -1,29 +0,0 @@
1
- class Puffer::SessionsController < Puffer::Sessions
2
- # This is example session controller for puffer authentication.
3
- # You can define your own actions.
4
- # Also, you can redefine <tt>new<tt> action view as you wish,
5
- # but more effectively will be definig fields with standart
6
- # puffer DSL:
7
- # create do
8
- # field :login
9
- # field :password
10
- # field :remember_me
11
- # end
12
- #
13
- # By default defined <tt>email<tt> and <tt>password<tt> fields.
14
-
15
- def new
16
- # @record = UserSession.new
17
- end
18
-
19
- def create
20
- # @record = UserSession.new params[:user_session]
21
- # respond_with record, :location => puffer_root_url
22
- end
23
-
24
- def destroy
25
- # @record = UserSession.find
26
- # @record.destroy
27
- end
28
-
29
- end
@@ -1,43 +0,0 @@
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,58 +0,0 @@
1
- Dummy::Application.routes.draw do
2
- # The priority is based upon order of creation:
3
- # first created -> highest priority.
4
-
5
- # Sample of regular route:
6
- # match 'products/:id' => 'catalog#view'
7
- # Keep in mind you can assign values other than :controller and :action
8
-
9
- # Sample of named route:
10
- # match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
11
- # This route can be invoked with purchase_url(:id => product.id)
12
-
13
- # Sample resource route (maps HTTP verbs to controller actions automatically):
14
- # resources :products
15
-
16
- # Sample resource route with options:
17
- # resources :products do
18
- # member do
19
- # get 'short'
20
- # post 'toggle'
21
- # end
22
- #
23
- # collection do
24
- # get 'sold'
25
- # end
26
- # end
27
-
28
- # Sample resource route with sub-resources:
29
- # resources :products do
30
- # resources :comments, :sales
31
- # resource :seller
32
- # end
33
-
34
- # Sample resource route with more complex sub-resources
35
- # resources :products do
36
- # resources :comments
37
- # resources :sales do
38
- # get 'recent', :on => :collection
39
- # end
40
- # end
41
-
42
- # Sample resource route within a namespace:
43
- # namespace :admin do
44
- # # Directs /admin/products/* to Admin::ProductsController
45
- # # (app/controllers/admin/products_controller.rb)
46
- # resources :products
47
- # end
48
-
49
- # You can have the root of your site routed with "root"
50
- # just remember to delete public/index.html.
51
- # root :to => 'welcome#index'
52
-
53
- # See how all your routes lay out with "rake routes"
54
-
55
- # This is a legacy wild controller route that's not recommended for RESTful applications.
56
- # Note: This route will make all actions in every controller accessible via GET requests.
57
- # match ':controller(/:action(/:id(.:format)))'
58
- end