constructor-cms 0.5.8 → 0.6.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (56) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +3 -3
  3. data/README.md +1 -1
  4. data/{script → bin}/rails +1 -1
  5. data/constructor-cms.gemspec +1 -3
  6. data/core/app/controllers/constructor_core/application_controller.rb +1 -1
  7. data/core/app/controllers/constructor_core/users_controller.rb +2 -2
  8. data/core/app/models/constructor_core/user.rb +0 -1
  9. data/core/config/initializers/devise.rb +8 -8
  10. data/core/constructor-core.gemspec +2 -2
  11. data/core/lib/constructor_core/version.rb +1 -1
  12. data/pages/app/controllers/constructor_pages/fields_controller.rb +11 -2
  13. data/pages/app/controllers/constructor_pages/pages_controller.rb +20 -12
  14. data/pages/app/controllers/constructor_pages/templates_controller.rb +13 -7
  15. data/pages/app/models/constructor_pages/field.rb +1 -3
  16. data/pages/app/models/constructor_pages/page.rb +15 -21
  17. data/pages/app/models/constructor_pages/template.rb +0 -3
  18. data/pages/app/models/constructor_pages/types/boolean_type.rb +1 -2
  19. data/pages/app/models/constructor_pages/types/date_type.rb +1 -6
  20. data/pages/app/models/constructor_pages/types/float_type.rb +1 -2
  21. data/pages/app/models/constructor_pages/types/html_type.rb +1 -2
  22. data/pages/app/models/constructor_pages/types/image_type.rb +3 -2
  23. data/pages/app/models/constructor_pages/types/integer_type.rb +1 -2
  24. data/pages/app/models/constructor_pages/types/string_type.rb +1 -2
  25. data/pages/app/models/constructor_pages/types/text_type.rb +1 -2
  26. data/pages/app/views/constructor_pages/fields/types/_date.haml +1 -1
  27. data/pages/app/views/constructor_pages/pages/_form.haml +2 -2
  28. data/pages/app/views/constructor_pages/pages/index.haml +4 -4
  29. data/pages/app/views/constructor_pages/templates/_form.haml +2 -2
  30. data/pages/config/locales/ru.yml +0 -1
  31. data/pages/constructor-pages.gemspec +2 -1
  32. data/spec/dummy/README.rdoc +15 -248
  33. data/spec/dummy/Rakefile +0 -1
  34. data/spec/dummy/app/controllers/application_controller.rb +1 -1
  35. data/spec/dummy/bin/bundle +3 -0
  36. data/spec/dummy/bin/rails +4 -0
  37. data/spec/dummy/bin/rake +4 -0
  38. data/spec/dummy/config.ru +1 -1
  39. data/spec/dummy/config/application.rb +4 -43
  40. data/spec/dummy/config/boot.rb +2 -3
  41. data/spec/dummy/config/environment.rb +2 -2
  42. data/spec/dummy/config/environments/development.rb +11 -19
  43. data/spec/dummy/config/environments/production.rb +40 -27
  44. data/spec/dummy/config/environments/test.rb +13 -14
  45. data/spec/dummy/config/initializers/filter_parameter_logging.rb +4 -0
  46. data/spec/dummy/config/initializers/inflections.rb +6 -5
  47. data/spec/dummy/config/initializers/secret_token.rb +7 -2
  48. data/spec/dummy/config/initializers/session_store.rb +0 -5
  49. data/spec/dummy/config/initializers/wrap_parameters.rb +6 -6
  50. data/spec/dummy/config/routes.rb +2 -57
  51. data/spec/dummy/public/404.html +48 -16
  52. data/spec/dummy/public/422.html +48 -16
  53. data/spec/dummy/public/500.html +48 -16
  54. data/spec/dummy/public/robots.txt +1 -1
  55. metadata +19 -27
  56. data/spec/dummy/script/rails +0 -6
@@ -2,9 +2,8 @@
2
2
 
3
3
  module ConstructorPages
4
4
  module Types
5
+ # HTML type. Render ckeditor wysiwyg.
5
6
  class HtmlType < ActiveRecord::Base
6
- attr_accessible :value, :field_id, :field, :page_id, :page
7
-
8
7
  belongs_to :field
9
8
  belongs_to :page
10
9
  end
@@ -2,16 +2,17 @@
2
2
 
3
3
  module ConstructorPages
4
4
  module Types
5
+ # Image type. Render select file field.
5
6
  class ImageType < ActiveRecord::Base
6
- attr_accessible :value, :field_id, :field, :page_id, :page
7
-
8
7
  belongs_to :field
9
8
  belongs_to :page
10
9
 
11
10
  image_accessor :value
12
11
 
13
12
  validates :value, :presence => true
13
+ # Max size is 5 MB
14
14
  validates_size_of :value, :maximum => 5.megabytes, :message => :incorrect_size
15
+ # Accept only jpeg, png, gif
15
16
  validates_property :mime_type, :of => :value, :in => %w(image/jpeg image/png image/gif), :message => :incorrect_format
16
17
  end
17
18
  end
@@ -2,9 +2,8 @@
2
2
 
3
3
  module ConstructorPages
4
4
  module Types
5
+ # Integer type. Render small text field.
5
6
  class IntegerType < ActiveRecord::Base
6
- attr_accessible :value, :field_id, :field, :page_id, :page
7
-
8
7
  belongs_to :field
9
8
  belongs_to :page
10
9
  end
@@ -2,9 +2,8 @@
2
2
 
3
3
  module ConstructorPages
4
4
  module Types
5
+ # String type. Render large text field.
5
6
  class StringType < ActiveRecord::Base
6
- attr_accessible :value, :field_id, :field, :page_id, :page
7
-
8
7
  belongs_to :field
9
8
  belongs_to :page
10
9
  end
@@ -2,9 +2,8 @@
2
2
 
3
3
  module ConstructorPages
4
4
  module Types
5
+ # Text type. Render textarea.
5
6
  class TextType < ActiveRecord::Base
6
- attr_accessible :value, :field_id, :field, :page_id, :page
7
-
8
7
  belongs_to :field
9
8
  belongs_to :page
10
9
  end
@@ -1 +1 @@
1
- = date_select "fields[#{field.code_name}]", "date", default: page.get_field_value(field.code_name)
1
+ = text_field_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), type: :date
@@ -93,5 +93,5 @@
93
93
  .span12
94
94
  .form-actions
95
95
  = f.submit :class => "btn btn-primary"
96
- = link_to t(:cancel), pages_url, :class => "btn"
97
- = link_to t(:delete_page), @page, :confirm => t(:are_you_sure?), :method => :delete, :class => "btn btn-danger pull-right" unless @page.new_record?
96
+ = link_to t(:cancel), pages_url, class: 'btn'
97
+ = link_to t(:delete_page), @page, method: :delete, data: {confirm: t(:are_you_sure?)}, class: 'btn btn-danger pull-right' unless @page.new_record?
@@ -21,8 +21,8 @@
21
21
  </li>
22
22
 
23
23
  <li>
24
- - if page.active == true
25
- = link_to page.name, page.full_url, :class => "btn btn-link"
24
+ - if page.published?
25
+ = link_to page.name, page.full_url, class: 'btn btn-link'
26
26
  - else
27
27
  %button.btn.disabled= page.name
28
28
 
@@ -42,9 +42,9 @@
42
42
  - else
43
43
  = link_to "<i class='icon-chevron-down'></i> #{t :add} #{ConstructorPages::Template.find(page.template.child_id).name.downcase}".html_safe, new_child_page_path(page), :class => "btn btn-success btn-mini"
44
44
 
45
- = link_to "<i class='icon-remove'></i> #{t :delete}".html_safe, page_path(page), confirm: t(:are_you_sure?), method: :delete, class: 'btn btn-danger btn-mini pull-right'
45
+ = link_to "<i class='icon-remove'></i> #{t :delete}".html_safe, page_path(page), method: :delete, class: 'btn btn-danger btn-mini pull-right', data: {confirm: t(:are_you_sure?)}
46
+
46
47
 
47
-
48
48
 
49
49
  - level = page.level
50
50
  - last_page = page
@@ -37,11 +37,11 @@
37
37
  = link_to "<i class='icon-arrow-up'></i>".html_safe, field_move_up_path(field), :class => "btn btn-mini #{"disabled" if field.first?}"
38
38
 
39
39
  = link_to "<i class='icon-pencil icon-white'></i>".html_safe, edit_field_path(field, field.template), :class => "btn btn-mini btn-primary"
40
- = link_to "<i class='icon-remove icon-white'></i>".html_safe, field_path(field), :method => :delete, :confirm => t(:are_you_sure?), :class => "btn btn-mini btn-danger"
40
+ = link_to "<i class='icon-remove icon-white'></i>".html_safe, field_path(field), method: :delete, data: {confirm: t(:are_you_sure?)}, class: 'btn btn-mini btn-danger'
41
41
 
42
42
  .row-fluid
43
43
  .span12
44
44
  .form-actions
45
45
  = f.submit :class => "btn btn-primary"
46
46
  = link_to t(:cancel), templates_url, :class => "btn"
47
- = link_to t(:delete_template), @template, :confirm => t(:are_you_sure?), :method => :delete, :class => "btn btn-danger pull-right" unless @template.new_record?
47
+ = link_to t(:delete_template), @template, method: :delete, data: {confirm: t(:are_you_sure?)}, class: 'btn btn-danger pull-right' unless @template.new_record?
@@ -8,7 +8,6 @@ ru:
8
8
  are_you_sure?: 'Вы уверены?'
9
9
  display_in: 'Отображать в'
10
10
 
11
-
12
11
  menu: 'Меню'
13
12
  breadcrumbs: 'Хлебные крошки'
14
13
 
@@ -21,9 +21,10 @@ Gem::Specification.new do |s|
21
21
 
22
22
  s.add_dependency 'dragonfly'
23
23
  s.add_dependency 'rack-cache'
24
- s.add_dependency 'awesome_nested_set', '~> 2.0'
24
+ s.add_dependency 'awesome_nested_set'
25
25
  s.add_dependency 'haml-rails'
26
26
  s.add_dependency 'acts_as_list'
27
+ s.add_dependency 'russian'
27
28
 
28
29
  s.add_development_dependency 'rspec-rails'
29
30
  s.add_development_dependency 'capybara'
@@ -1,261 +1,28 @@
1
- == Welcome to Rails
1
+ == README
2
2
 
3
- Rails is a web-application framework that includes everything needed to create
4
- database-backed web applications according to the Model-View-Control pattern.
3
+ This README would normally document whatever steps are necessary to get the
4
+ application up and running.
5
5
 
6
- This pattern splits the view (also called the presentation) into "dumb"
7
- templates that are primarily responsible for inserting pre-built data in between
8
- HTML tags. The model contains the "smart" domain objects (such as Account,
9
- Product, Person, Post) that holds all the business logic and knows how to
10
- persist themselves to a database. The controller handles the incoming requests
11
- (such as Save New Account, Update Product, Show Post) by manipulating the model
12
- and directing data to the view.
6
+ Things you may want to cover:
13
7
 
14
- In Rails, the model is handled by what's called an object-relational mapping
15
- layer entitled Active Record. This layer allows you to present the data from
16
- database rows as objects and embellish these data objects with business logic
17
- methods. You can read more about Active Record in
18
- link:files/vendor/rails/activerecord/README.html.
8
+ * Ruby version
19
9
 
20
- The controller and view are handled by the Action Pack, which handles both
21
- layers by its two parts: Action View and Action Controller. These two layers
22
- are bundled in a single package due to their heavy interdependence. This is
23
- unlike the relationship between the Active Record and Action Pack that is much
24
- more separate. Each of these packages can be used independently outside of
25
- Rails. You can read more about Action Pack in
26
- link:files/vendor/rails/actionpack/README.html.
10
+ * System dependencies
27
11
 
12
+ * Configuration
28
13
 
29
- == Getting Started
14
+ * Database creation
30
15
 
31
- 1. At the command prompt, create a new Rails application:
32
- <tt>rails new myapp</tt> (where <tt>myapp</tt> is the application name)
16
+ * Database initialization
33
17
 
34
- 2. Change directory to <tt>myapp</tt> and start the web server:
35
- <tt>cd myapp; rails server</tt> (run with --help for options)
18
+ * How to run the test suite
36
19
 
37
- 3. Go to http://localhost:3000/ and you'll see:
38
- "Welcome aboard: You're riding Ruby on Rails!"
20
+ * Services (job queues, cache servers, search engines, etc.)
39
21
 
40
- 4. Follow the guidelines to start developing your application. You can find
41
- the following resources handy:
22
+ * Deployment instructions
42
23
 
43
- * The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html
44
- * Ruby on Rails Tutorial Book: http://www.railstutorial.org/
24
+ * ...
45
25
 
46
26
 
47
- == Debugging Rails
48
-
49
- Sometimes your application goes wrong. Fortunately there are a lot of tools that
50
- will help you debug it and get it back on the rails.
51
-
52
- First area to check is the application log files. Have "tail -f" commands
53
- running on the server.log and development.log. Rails will automatically display
54
- debugging and runtime information to these files. Debugging info will also be
55
- shown in the browser on requests from 127.0.0.1.
56
-
57
- You can also log your own messages directly into the log file from your code
58
- using the Ruby logger class from inside your controllers. Example:
59
-
60
- class WeblogController < ActionController::Base
61
- def destroy
62
- @weblog = Weblog.find(params[:id])
63
- @weblog.destroy
64
- logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
65
- end
66
- end
67
-
68
- The result will be a message in your log file along the lines of:
69
-
70
- Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1!
71
-
72
- More information on how to use the logger is at http://www.ruby-doc.org/core/
73
-
74
- Also, Ruby documentation can be found at http://www.ruby-lang.org/. There are
75
- several books available online as well:
76
-
77
- * Programming Ruby: http://www.ruby-doc.org/docs/ProgrammingRuby/ (Pickaxe)
78
- * Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide)
79
-
80
- These two books will bring you up to speed on the Ruby language and also on
81
- programming in general.
82
-
83
-
84
- == Debugger
85
-
86
- Debugger support is available through the debugger command when you start your
87
- Mongrel or WEBrick server with --debugger. This means that you can break out of
88
- execution at any point in the code, investigate and change the model, and then,
89
- resume execution! You need to install ruby-debug to run the server in debugging
90
- mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
91
-
92
- class WeblogController < ActionController::Base
93
- def index
94
- @posts = Post.all
95
- debugger
96
- end
97
- end
98
-
99
- So the controller will accept the action, run the first line, then present you
100
- with a IRB prompt in the server window. Here you can do things like:
101
-
102
- >> @posts.inspect
103
- => "[#<Post:0x14a6be8
104
- @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>,
105
- #<Post:0x14a6620
106
- @attributes={"title"=>"Rails", "body"=>"Only ten..", "id"=>"2"}>]"
107
- >> @posts.first.title = "hello from a debugger"
108
- => "hello from a debugger"
109
-
110
- ...and even better, you can examine how your runtime objects actually work:
111
-
112
- >> f = @posts.first
113
- => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
114
- >> f.
115
- Display all 152 possibilities? (y or n)
116
-
117
- Finally, when you're ready to resume execution, you can enter "cont".
118
-
119
-
120
- == Console
121
-
122
- The console is a Ruby shell, which allows you to interact with your
123
- application's domain model. Here you'll have all parts of the application
124
- configured, just like it is when the application is running. You can inspect
125
- domain models, change values, and save to the database. Starting the script
126
- without arguments will launch it in the development environment.
127
-
128
- To start the console, run <tt>rails console</tt> from the application
129
- directory.
130
-
131
- Options:
132
-
133
- * Passing the <tt>-s, --sandbox</tt> argument will rollback any modifications
134
- made to the database.
135
- * Passing an environment name as an argument will load the corresponding
136
- environment. Example: <tt>rails console production</tt>.
137
-
138
- To reload your controllers and models after launching the console run
139
- <tt>reload!</tt>
140
-
141
- More information about irb can be found at:
142
- link:http://www.rubycentral.org/pickaxe/irb.html
143
-
144
-
145
- == dbconsole
146
-
147
- You can go to the command line of your database directly through <tt>rails
148
- dbconsole</tt>. You would be connected to the database with the credentials
149
- defined in database.yml. Starting the script without arguments will connect you
150
- to the development database. Passing an argument will connect you to a different
151
- database, like <tt>rails dbconsole production</tt>. Currently works for MySQL,
152
- PostgreSQL and SQLite 3.
153
-
154
- == Description of Contents
155
-
156
- The default directory structure of a generated Ruby on Rails application:
157
-
158
- |-- app
159
- | |-- assets
160
- | | |-- images
161
- | | |-- javascripts
162
- | | `-- stylesheets
163
- | |-- controllers
164
- | |-- helpers
165
- | |-- mailers
166
- | |-- models
167
- | `-- views
168
- | `-- layouts
169
- |-- config
170
- | |-- environments
171
- | |-- initializers
172
- | `-- locales
173
- |-- db
174
- |-- doc
175
- |-- lib
176
- | |-- assets
177
- | `-- tasks
178
- |-- log
179
- |-- public
180
- |-- script
181
- |-- test
182
- | |-- fixtures
183
- | |-- functional
184
- | |-- integration
185
- | |-- performance
186
- | `-- unit
187
- |-- tmp
188
- | `-- cache
189
- | `-- assets
190
- `-- vendor
191
- |-- assets
192
- | |-- javascripts
193
- | `-- stylesheets
194
- `-- plugins
195
-
196
- app
197
- Holds all the code that's specific to this particular application.
198
-
199
- app/assets
200
- Contains subdirectories for images, stylesheets, and JavaScript files.
201
-
202
- app/controllers
203
- Holds controllers that should be named like weblogs_controller.rb for
204
- automated URL mapping. All controllers should descend from
205
- ApplicationController which itself descends from ActionController::Base.
206
-
207
- app/models
208
- Holds models that should be named like post.rb. Models descend from
209
- ActiveRecord::Base by default.
210
-
211
- app/views
212
- Holds the template files for the view that should be named like
213
- weblogs/index.html.erb for the WeblogsController#index action. All views use
214
- eRuby syntax by default.
215
-
216
- app/views/layouts
217
- Holds the template files for layouts to be used with views. This models the
218
- common header/footer method of wrapping views. In your views, define a layout
219
- using the <tt>layout :default</tt> and create a file named default.html.erb.
220
- Inside default.html.erb, call <% yield %> to render the view using this
221
- layout.
222
-
223
- app/helpers
224
- Holds view helpers that should be named like weblogs_helper.rb. These are
225
- generated for you automatically when using generators for controllers.
226
- Helpers can be used to wrap functionality for your views into methods.
227
-
228
- config
229
- Configuration files for the Rails environment, the routing map, the database,
230
- and other dependencies.
231
-
232
- db
233
- Contains the database schema in schema.rb. db/migrate contains all the
234
- sequence of Migrations for your schema.
235
-
236
- doc
237
- This directory is where your application documentation will be stored when
238
- generated using <tt>rake doc:app</tt>
239
-
240
- lib
241
- Application specific libraries. Basically, any kind of custom code that
242
- doesn't belong under controllers, models, or helpers. This directory is in
243
- the load path.
244
-
245
- public
246
- The directory available for the web server. Also contains the dispatchers and the
247
- default HTML files. This should be set as the DOCUMENT_ROOT of your web
248
- server.
249
-
250
- script
251
- Helper scripts for automation and generation.
252
-
253
- test
254
- Unit and functional tests along with fixtures. When using the rails generate
255
- command, template test files will be generated for you and placed in this
256
- directory.
257
-
258
- vendor
259
- External libraries that the application depends on. Also includes the plugins
260
- subdirectory. If the app has frozen rails, those gems also go here, under
261
- vendor/rails/. This directory is in the load path.
27
+ Please feel free to use a different markup language if you do not plan to run
28
+ <tt>rake doc:app</tt>.
data/spec/dummy/Rakefile CHANGED
@@ -1,4 +1,3 @@
1
- #!/usr/bin/env rake
2
1
  # Add your own tasks in files placed in lib/tasks ending in .rake,
3
2
  # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
4
3
 
@@ -1,3 +1,3 @@
1
1
  class ApplicationController < ActionController::Base
2
- protect_from_forgery
2
+ protect_from_forgery with: :exception
3
3
  end
@@ -0,0 +1,3 @@
1
+ #!/usr/bin/env ruby
2
+ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
3
+ load Gem.bin_path('bundler', 'bundle')
@@ -0,0 +1,4 @@
1
+ #!/usr/bin/env ruby
2
+ APP_PATH = File.expand_path('../../config/application', __FILE__)
3
+ require_relative '../config/boot'
4
+ require 'rails/commands'
@@ -0,0 +1,4 @@
1
+ #!/usr/bin/env ruby
2
+ require_relative '../config/boot'
3
+ require 'rake'
4
+ Rake.application.run