From c4296b59a7f9d667d295f9c37b71f7849b818fb3 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Tue, 28 Jan 2025 22:47:15 +0100 Subject: Big overhaul patch and style changes --- app/controllers/content_controller.rb | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'app/controllers/content_controller.rb') diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb index 1b13456..c62b726 100644 --- a/app/controllers/content_controller.rb +++ b/app/controllers/content_controller.rb @@ -1,30 +1,30 @@ class ContentController < ApplicationController - + # Public - + before_filter :find_page - + # This is the method that renders most of the the public content. It recieves - # a :locale and a :page_path parameter through the params hash. It looks up + # a :locale and a :page_path parameter through the params hash. It looks up # the node with the corresponding unique_name attribute. The method doesn't - # return a node though, the node is really a proxy object for pages. It + # return a node though, the node is really a proxy object for pages. It # returns the most recent page associated to this node instead. def render_page - + expires_in 20.minutes, :public => true - + if @page and @page.public? render( :file => @page.valid_template, :layout => true ) else - render( + render( :file => File.join(RAILS_ROOT, 'public', '404.html'), :status => 404 ) end - + end def render_gallery @@ -35,10 +35,14 @@ class ContentController < ApplicationController render :nothing => true, :status => 404 end end - + private def find_page path = params[:page_path].join('/') - @page = Node.find_page(path) + if path =~ /^[a-zA-Z\:\/\/\.\-\d_]+$/ + @page = Node.find_page(path) + else + @page = nil + end end end -- cgit v1.3 From e0a7e0fec760ba12c8067a37e10c96f1f05876e2 Mon Sep 17 00:00:00 2001 From: erdgeist Date: Wed, 24 Jun 2026 04:13:16 +0200 Subject: Stage 1 complete: Rails 2.3.5 to Rails 3.2.22.5 upgrade - Converted plugins to gems (Gemfile) - Updated config structure (application.rb, boot.rb, environment.rb) - Converted routes to Rails 3 DSL - Converted named_scope to scope throughout models - Converted find(:all, :conditions) to where() chains - Fixed has_many :order to use ordering scope - Updated session store and secret token configuration - Fixed exception_notification middleware configuration - Patched Ruby 2.4 / Rails 3.2 incompatibilities: - Integer/Float duration arithmetic (ActiveSupport) - Arel visit_Integer for PostgreSQL adapter - create_database String/Integer coercion - ActionController consider_all_requests_local - Migrated taggings schema for acts-as-taggable-on - Replaced dynamic_form gem with custom form_error_messages helper - Fixed Rails 3 block helper syntax (form_for, form_tag, fields_for) - Fixed admin layout yield - Updated test suite for Rails 3 APIs --- Gemfile | 32 + Gemfile.lock | 170 +++++ Rakefile | 15 +- app/controllers/admin_controller.rb | 38 +- app/controllers/application_controller.rb | 18 +- app/controllers/content_controller.rb | 4 +- app/controllers/menu_items_controller.rb | 2 +- app/controllers/nodes_controller.rb | 9 +- app/controllers/revisions_controller.rb | 1 + app/controllers/rss_controller.rb | 19 +- app/controllers/tags_controller.rb | 14 +- app/controllers/users_controller.rb | 2 +- app/helpers/application_helper.rb | 11 + app/helpers/content_helper.rb | 10 +- app/models/asset.rb | 29 +- app/models/event.rb | 12 +- app/models/menu_item.rb | 8 +- app/models/node.rb | 17 +- app/models/occurrence.rb | 24 +- app/models/page.rb | 35 +- app/models/permission.rb | 4 +- app/views/assets/edit.html.erb | 6 +- app/views/assets/new.html.erb | 6 +- app/views/content/_search.html.erb | 2 +- app/views/content/_tags.html.erb | 2 +- .../public/no_date_and_author_with_map.html.erb | 8 + app/views/events/edit.html.erb | 6 +- app/views/events/new.html.erb | 6 +- app/views/layouts/admin.html.erb | 2 +- app/views/layouts/application.html.erb | 2 +- app/views/layouts/application.html.erb.bak | 54 ++ app/views/menu_items/edit.html.erb | 4 +- app/views/menu_items/new.html.erb | 4 +- app/views/nodes/edit.html.erb | 10 +- app/views/nodes/index.html.erb | 2 +- app/views/nodes/new.html.erb | 9 +- app/views/occurrences/edit.html.erb | 6 +- app/views/occurrences/new.html.erb | 6 +- app/views/pages/edit.html.erb | 4 +- app/views/pages/new.html.erb | 4 +- app/views/revisions/diff.html.erb | 4 +- app/views/revisions/index.html.erb | 6 +- app/views/sessions/new.html.erb | 4 +- app/views/users/edit.html.erb | 11 +- app/views/users/new.html.erb | 11 +- config/application.rb | 60 ++ config/boot.rb | 113 +--- config/environment.rb | 88 +-- config/environments/development.rb | 27 +- config/environments/production.rb | 53 +- config/environments/test.rb | 55 +- .../initializers/activesupport_duration_patch.rb | 53 ++ config/initializers/arel_patch.rb | 12 + config/initializers/exception_notifier.rb | 6 + config/initializers/postgresql_adapter_patch.rb | 30 + config/initializers/ruby2.rb | 16 + config/initializers/session_store.rb | 16 +- config/locales/de.yml | 5 +- config/routes.rb | 91 ++- ...228_upgrade_taggings_for_acts_as_taggable_on.rb | 19 + lib/awesome_patch.rb | 16 - lib/tasks/development_init.rake | 8 +- lib/tasks/test_db.rake | 19 + public/.well-known/acme-challenge | 1 + public/.well-known/security.txt | 8 + public/black.html | 25 + public/ccc-test | 1 + public/disclosure.ccc.de.asc | 140 ++++ public/images/29c3_banner_156x67px_animation2.gif | Bin 0 -> 12127 bytes public/images/30c3_logo.jpg | Bin 0 -> 25716 bytes public/images/31c3_logo.jpg | Bin 0 -> 9391 bytes public/images/33c3/chaosradio.png | Bin 0 -> 13733 bytes public/images/33c3/fairyrudst.png | Bin 0 -> 5764 bytes public/images/33c3/header.png | Bin 0 -> 23107 bytes public/images/33c3/search_button33c3.png | Bin 0 -> 1991 bytes public/images/34c3-tuwat.1e4e25c.png | Bin 0 -> 32503 bytes public/images/eh22.png | Bin 0 -> 87564 bytes public/images/minecraft.smyck.org | Bin 0 -> 25716 bytes public/images/twitter.svg | 1 + public/leap-seconds.list | 255 +++++++ public/stylesheets/ccc.css_ | 579 ++++++++++++++++ public/stylesheets/ccc.css_old | 257 +++++++ script/rails | 5 + test/fixtures/nodes.yml | 3 +- test/fixtures/users.yml | 4 +- test/functional/content_controller_test.rb | 10 +- test/functional/nodes_controller_test.rb | 6 +- test/functional/users_controller_test.rb | 10 +- test/test_helper.rb | 84 ++- test/unit/page_test.rb | 2 +- test/unit/user_test.rb | 8 +- vendor/plugins/acts_as_list/README | 23 - vendor/plugins/acts_as_list/init.rb | 3 - .../acts_as_list/lib/active_record/acts/list.rb | 256 ------- vendor/plugins/acts_as_list/test/list_test.rb | 332 --------- .../plugins/acts_as_taggable_on_steroids/CHANGELOG | 212 ------ .../acts_as_taggable_on_steroids/MIT-LICENSE | 20 - vendor/plugins/acts_as_taggable_on_steroids/README | 151 ----- .../plugins/acts_as_taggable_on_steroids/Rakefile | 22 - .../acts_as_taggable_on_steroids.gemspec | 54 -- .../acts_as_taggable_migration_generator.rb | 11 - .../templates/migration.rb | 26 - .../plugins/acts_as_taggable_on_steroids/init.rb | 1 - .../lib/acts_as_taggable.rb | 230 ------- .../acts_as_taggable_on_steroids/lib/tag.rb | 71 -- .../acts_as_taggable_on_steroids/lib/tag_list.rb | 108 --- .../acts_as_taggable_on_steroids/lib/tagging.rb | 12 - .../lib/tags_helper.rb | 13 - .../test/abstract_unit.rb | 102 --- .../test/acts_as_taggable_test.rb | 384 ----------- .../test/fixtures/magazine.rb | 3 - .../test/fixtures/magazines.yml | 5 - .../test/fixtures/photo.rb | 8 - .../test/fixtures/photos.yml | 19 - .../test/fixtures/post.rb | 7 - .../test/fixtures/posts.yml | 27 - .../test/fixtures/special_post.rb | 2 - .../test/fixtures/subscription.rb | 4 - .../test/fixtures/subscriptions.yml | 3 - .../test/fixtures/taggings.yml | 107 --- .../test/fixtures/tags.yml | 14 - .../test/fixtures/user.rb | 7 - .../test/fixtures/users.yml | 5 - .../test/tag_list_test.rb | 119 ---- .../acts_as_taggable_on_steroids/test/tag_test.rb | 62 -- .../test/tagging_test.rb | 11 - .../test/tags_helper_test.rb | 25 - vendor/plugins/awesome_nested_set/.autotest | 13 - vendor/plugins/awesome_nested_set/MIT-LICENSE | 20 - vendor/plugins/awesome_nested_set/README.rdoc | 79 --- vendor/plugins/awesome_nested_set/Rakefile | 54 -- vendor/plugins/awesome_nested_set/VERSION | 1 - .../awesome_nested_set/awesome_nested_set.gemspec | 68 -- vendor/plugins/awesome_nested_set/init.rb | 1 - .../awesome_nested_set/lib/awesome_nested_set.rb | 577 ---------------- .../lib/awesome_nested_set/helper.rb | 40 -- vendor/plugins/awesome_nested_set/rails/init.rb | 12 - .../plugins/awesome_nested_set/test/application.rb | 1 - .../test/awesome_nested_set/helper_test.rb | 41 -- .../test/awesome_nested_set_test.rb | 748 --------------------- .../test/fixtures/categories.yml | 34 - .../awesome_nested_set/test/fixtures/category.rb | 15 - .../test/fixtures/departments.yml | 3 - .../awesome_nested_set/test/fixtures/notes.yml | 38 -- .../plugins/awesome_nested_set/test/test_helper.rb | 29 - vendor/plugins/exception_notification/README | 111 --- vendor/plugins/exception_notification/init.rb | 4 - .../lib/exception_notifiable.rb | 99 --- .../lib/exception_notifier.rb | 66 -- .../lib/exception_notifier_helper.rb | 78 --- .../test/exception_notifier_helper_test.rb | 61 -- .../exception_notification/test/test_helper.rb | 7 - .../views/exception_notifier/_backtrace.rhtml | 1 - .../views/exception_notifier/_environment.rhtml | 7 - .../views/exception_notifier/_inspect_model.rhtml | 16 - .../views/exception_notifier/_request.rhtml | 4 - .../views/exception_notifier/_session.rhtml | 2 - .../views/exception_notifier/_title.rhtml | 3 - .../exception_notification.rhtml | 6 - vendor/plugins/globalize2/LICENSE | 21 - vendor/plugins/globalize2/README.textile | 65 -- vendor/plugins/globalize2/Rakefile | 39 -- vendor/plugins/globalize2/VERSION | 1 - vendor/plugins/globalize2/generators/db_backend.rb | 0 .../generators/templates/db_backend_migration.rb | 25 - vendor/plugins/globalize2/globalize2.gemspec | 82 --- vendor/plugins/globalize2/init.rb | 1 - vendor/plugins/globalize2/lib/globalize.rb | 15 - .../globalize2/lib/globalize/active_record.rb | 194 ------ .../lib/globalize/active_record/adapter.rb | 80 --- .../lib/globalize/active_record/attributes.rb | 25 - .../lib/globalize/active_record/migration.rb | 40 -- .../lib/i18n/missing_translations_log_handler.rb | 41 -- .../lib/i18n/missing_translations_raise_handler.rb | 25 - .../test/active_record/fallbacks_test.rb | 102 --- .../test/active_record/migration_test.rb | 118 ---- .../test/active_record/sti_translated_test.rb | 49 -- .../test/active_record/translates_test.rb | 87 --- .../test/active_record/translation_class_test.rb | 30 - .../test/active_record/validation_tests.rb | 75 --- .../plugins/globalize2/test/active_record_test.rb | 442 ------------ vendor/plugins/globalize2/test/all.rb | 2 - vendor/plugins/globalize2/test/data/models.rb | 51 -- .../globalize2/test/data/no_globalize_schema.rb | 11 - .../test/i18n/missing_translations_test.rb | 36 - vendor/plugins/globalize2/test/test_helper.rb | 76 --- vendor/plugins/paperclip/LICENSE | 26 - vendor/plugins/paperclip/README.rdoc | 172 ----- vendor/plugins/paperclip/Rakefile | 77 --- .../plugins/paperclip/generators/paperclip/USAGE | 5 - .../generators/paperclip/paperclip_generator.rb | 27 - .../paperclip/templates/paperclip_migration.rb.erb | 19 - vendor/plugins/paperclip/init.rb | 1 - vendor/plugins/paperclip/lib/paperclip.rb | 318 --------- .../plugins/paperclip/lib/paperclip/attachment.rb | 403 ----------- .../lib/paperclip/callback_compatability.rb | 33 - vendor/plugins/paperclip/lib/paperclip/geometry.rb | 116 ---- vendor/plugins/paperclip/lib/paperclip/iostream.rb | 58 -- vendor/plugins/paperclip/lib/paperclip/matchers.rb | 4 - .../matchers/have_attached_file_matcher.rb | 49 -- .../validate_attachment_content_type_matcher.rb | 66 -- .../validate_attachment_presence_matcher.rb | 48 -- .../matchers/validate_attachment_size_matcher.rb | 83 --- .../plugins/paperclip/lib/paperclip/processor.rb | 48 -- vendor/plugins/paperclip/lib/paperclip/storage.rb | 236 ------- .../plugins/paperclip/lib/paperclip/thumbnail.rb | 70 -- vendor/plugins/paperclip/lib/paperclip/upfile.rb | 48 -- vendor/plugins/paperclip/paperclip.gemspec | 40 -- .../plugins/paperclip/shoulda_macros/paperclip.rb | 68 -- .../plugins/paperclip/tasks/paperclip_tasks.rake | 79 --- vendor/plugins/paperclip/test/.gitignore | 1 - vendor/plugins/paperclip/test/attachment_test.rb | 742 -------------------- vendor/plugins/paperclip/test/fixtures/12k.png | Bin 12093 -> 0 bytes vendor/plugins/paperclip/test/fixtures/50x50.png | Bin 1615 -> 0 bytes vendor/plugins/paperclip/test/fixtures/5k.png | Bin 4456 -> 0 bytes vendor/plugins/paperclip/test/fixtures/bad.png | 1 - vendor/plugins/paperclip/test/fixtures/text.txt | 0 vendor/plugins/paperclip/test/fixtures/twopage.pdf | Bin 8775 -> 0 bytes vendor/plugins/paperclip/test/geometry_test.rb | 168 ----- vendor/plugins/paperclip/test/helper.rb | 82 --- vendor/plugins/paperclip/test/integration_test.rb | 481 ------------- vendor/plugins/paperclip/test/iostream_test.rb | 71 -- .../matchers/have_attached_file_matcher_test.rb | 21 - ...alidate_attachment_content_type_matcher_test.rb | 30 - .../validate_attachment_presence_matcher_test.rb | 21 - .../validate_attachment_size_matcher_test.rb | 50 -- vendor/plugins/paperclip/test/paperclip_test.rb | 233 ------- vendor/plugins/paperclip/test/processor_test.rb | 10 - vendor/plugins/paperclip/test/storage_test.rb | 277 -------- vendor/plugins/paperclip/test/thumbnail_test.rb | 177 ----- vendor/plugins/routing-filter/.gitignore | 1 - vendor/plugins/routing-filter/MIT-LICENSE | 20 - vendor/plugins/routing-filter/README.markdown | 123 ---- vendor/plugins/routing-filter/init.rb | 1 - .../plugins/routing-filter/lib/routing_filter.rb | 69 -- .../routing-filter/lib/routing_filter/base.rb | 15 - .../routing-filter/lib/routing_filter/locale.rb | 35 - .../lib/routing_filter/pagination.rb | 19 - .../plugins/routing-filter/spec/generation_spec.rb | 283 -------- .../routing-filter/spec/recognition_spec.rb | 76 --- .../routing-filter/spec/routing_filter_spec.rb | 70 -- vendor/plugins/routing-filter/spec/spec.opts | 4 - vendor/plugins/routing-filter/spec/spec_helper.rb | 49 -- vendor/plugins/will_paginate/.gitignore | 4 - vendor/plugins/will_paginate/.manifest | 49 -- vendor/plugins/will_paginate/CHANGELOG.rdoc | 110 --- vendor/plugins/will_paginate/LICENSE | 18 - vendor/plugins/will_paginate/README.rdoc | 107 --- vendor/plugins/will_paginate/Rakefile | 62 -- .../will_paginate/examples/apple-circle.gif | Bin 178 -> 0 bytes vendor/plugins/will_paginate/examples/index.haml | 69 -- vendor/plugins/will_paginate/examples/index.html | 92 --- .../plugins/will_paginate/examples/pagination.css | 90 --- .../plugins/will_paginate/examples/pagination.sass | 91 --- vendor/plugins/will_paginate/init.rb | 1 - vendor/plugins/will_paginate/lib/will_paginate.rb | 78 --- .../will_paginate/lib/will_paginate/array.rb | 16 - .../will_paginate/lib/will_paginate/collection.rb | 146 ---- .../will_paginate/lib/will_paginate/core_ext.rb | 32 - .../will_paginate/lib/will_paginate/finder.rb | 264 -------- .../will_paginate/lib/will_paginate/named_scope.rb | 170 ----- .../lib/will_paginate/named_scope_patch.rb | 37 - .../will_paginate/lib/will_paginate/version.rb | 9 - .../lib/will_paginate/view_helpers.rb | 389 ----------- vendor/plugins/will_paginate/test/boot.rb | 21 - .../plugins/will_paginate/test/collection_test.rb | 143 ---- vendor/plugins/will_paginate/test/console | 8 - vendor/plugins/will_paginate/test/finder_test.rb | 476 ------------- .../plugins/will_paginate/test/fixtures/admin.rb | 3 - .../will_paginate/test/fixtures/developer.rb | 14 - .../test/fixtures/developers_projects.yml | 13 - .../plugins/will_paginate/test/fixtures/project.rb | 15 - .../will_paginate/test/fixtures/projects.yml | 6 - .../will_paginate/test/fixtures/replies.yml | 29 - .../plugins/will_paginate/test/fixtures/reply.rb | 7 - .../plugins/will_paginate/test/fixtures/topic.rb | 10 - .../plugins/will_paginate/test/fixtures/topics.yml | 30 - vendor/plugins/will_paginate/test/fixtures/user.rb | 2 - .../plugins/will_paginate/test/fixtures/users.yml | 35 - vendor/plugins/will_paginate/test/helper.rb | 37 - .../test/lib/activerecord_test_case.rb | 36 - .../test/lib/activerecord_test_connector.rb | 75 --- .../will_paginate/test/lib/load_fixtures.rb | 11 - .../will_paginate/test/lib/view_test_process.rb | 171 ----- vendor/plugins/will_paginate/test/tasks.rake | 59 -- vendor/plugins/will_paginate/test/view_test.rb | 365 ---------- vendor/plugins/will_paginate/will_paginate.gemspec | 20 - 287 files changed, 2166 insertions(+), 15648 deletions(-) create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 app/views/custom/page_templates/public/no_date_and_author_with_map.html.erb create mode 100644 app/views/layouts/application.html.erb.bak create mode 100644 config/application.rb create mode 100644 config/initializers/activesupport_duration_patch.rb create mode 100644 config/initializers/arel_patch.rb create mode 100644 config/initializers/exception_notifier.rb create mode 100644 config/initializers/postgresql_adapter_patch.rb create mode 100644 config/initializers/ruby2.rb create mode 100644 db/migrate/20260623232228_upgrade_taggings_for_acts_as_taggable_on.rb delete mode 100644 lib/awesome_patch.rb create mode 100644 lib/tasks/test_db.rake create mode 120000 public/.well-known/acme-challenge create mode 100644 public/.well-known/security.txt create mode 100644 public/black.html create mode 120000 public/ccc-test create mode 100644 public/disclosure.ccc.de.asc create mode 100644 public/images/29c3_banner_156x67px_animation2.gif create mode 100644 public/images/30c3_logo.jpg create mode 100644 public/images/31c3_logo.jpg create mode 100644 public/images/33c3/chaosradio.png create mode 100644 public/images/33c3/fairyrudst.png create mode 100644 public/images/33c3/header.png create mode 100644 public/images/33c3/search_button33c3.png create mode 100644 public/images/34c3-tuwat.1e4e25c.png create mode 100644 public/images/eh22.png create mode 100644 public/images/minecraft.smyck.org create mode 100644 public/images/twitter.svg create mode 100644 public/leap-seconds.list create mode 100644 public/stylesheets/ccc.css_ create mode 100644 public/stylesheets/ccc.css_old create mode 100755 script/rails delete mode 100644 vendor/plugins/acts_as_list/README delete mode 100644 vendor/plugins/acts_as_list/init.rb delete mode 100644 vendor/plugins/acts_as_list/lib/active_record/acts/list.rb delete mode 100644 vendor/plugins/acts_as_list/test/list_test.rb delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/CHANGELOG delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/MIT-LICENSE delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/README delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/Rakefile delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/acts_as_taggable_on_steroids.gemspec delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/generators/acts_as_taggable_migration/acts_as_taggable_migration_generator.rb delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/generators/acts_as_taggable_migration/templates/migration.rb delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/init.rb delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/lib/acts_as_taggable.rb delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/lib/tag.rb delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/lib/tag_list.rb delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/lib/tagging.rb delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/lib/tags_helper.rb delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/test/abstract_unit.rb delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/test/acts_as_taggable_test.rb delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/magazine.rb delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/magazines.yml delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/photo.rb delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/photos.yml delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/post.rb delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/posts.yml delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/special_post.rb delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/subscription.rb delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/subscriptions.yml delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/taggings.yml delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/tags.yml delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/user.rb delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/users.yml delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/test/tag_list_test.rb delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/test/tag_test.rb delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/test/tagging_test.rb delete mode 100644 vendor/plugins/acts_as_taggable_on_steroids/test/tags_helper_test.rb delete mode 100644 vendor/plugins/awesome_nested_set/.autotest delete mode 100644 vendor/plugins/awesome_nested_set/MIT-LICENSE delete mode 100644 vendor/plugins/awesome_nested_set/README.rdoc delete mode 100644 vendor/plugins/awesome_nested_set/Rakefile delete mode 100644 vendor/plugins/awesome_nested_set/VERSION delete mode 100644 vendor/plugins/awesome_nested_set/awesome_nested_set.gemspec delete mode 100644 vendor/plugins/awesome_nested_set/init.rb delete mode 100644 vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb delete mode 100644 vendor/plugins/awesome_nested_set/lib/awesome_nested_set/helper.rb delete mode 100644 vendor/plugins/awesome_nested_set/rails/init.rb delete mode 100644 vendor/plugins/awesome_nested_set/test/application.rb delete mode 100644 vendor/plugins/awesome_nested_set/test/awesome_nested_set/helper_test.rb delete mode 100644 vendor/plugins/awesome_nested_set/test/awesome_nested_set_test.rb delete mode 100644 vendor/plugins/awesome_nested_set/test/fixtures/categories.yml delete mode 100644 vendor/plugins/awesome_nested_set/test/fixtures/category.rb delete mode 100644 vendor/plugins/awesome_nested_set/test/fixtures/departments.yml delete mode 100644 vendor/plugins/awesome_nested_set/test/fixtures/notes.yml delete mode 100644 vendor/plugins/awesome_nested_set/test/test_helper.rb delete mode 100644 vendor/plugins/exception_notification/README delete mode 100644 vendor/plugins/exception_notification/init.rb delete mode 100644 vendor/plugins/exception_notification/lib/exception_notifiable.rb delete mode 100644 vendor/plugins/exception_notification/lib/exception_notifier.rb delete mode 100644 vendor/plugins/exception_notification/lib/exception_notifier_helper.rb delete mode 100644 vendor/plugins/exception_notification/test/exception_notifier_helper_test.rb delete mode 100644 vendor/plugins/exception_notification/test/test_helper.rb delete mode 100644 vendor/plugins/exception_notification/views/exception_notifier/_backtrace.rhtml delete mode 100644 vendor/plugins/exception_notification/views/exception_notifier/_environment.rhtml delete mode 100644 vendor/plugins/exception_notification/views/exception_notifier/_inspect_model.rhtml delete mode 100644 vendor/plugins/exception_notification/views/exception_notifier/_request.rhtml delete mode 100644 vendor/plugins/exception_notification/views/exception_notifier/_session.rhtml delete mode 100644 vendor/plugins/exception_notification/views/exception_notifier/_title.rhtml delete mode 100644 vendor/plugins/exception_notification/views/exception_notifier/exception_notification.rhtml delete mode 100644 vendor/plugins/globalize2/LICENSE delete mode 100644 vendor/plugins/globalize2/README.textile delete mode 100644 vendor/plugins/globalize2/Rakefile delete mode 100644 vendor/plugins/globalize2/VERSION delete mode 100644 vendor/plugins/globalize2/generators/db_backend.rb delete mode 100644 vendor/plugins/globalize2/generators/templates/db_backend_migration.rb delete mode 100644 vendor/plugins/globalize2/globalize2.gemspec delete mode 100644 vendor/plugins/globalize2/init.rb delete mode 100644 vendor/plugins/globalize2/lib/globalize.rb delete mode 100644 vendor/plugins/globalize2/lib/globalize/active_record.rb delete mode 100644 vendor/plugins/globalize2/lib/globalize/active_record/adapter.rb delete mode 100644 vendor/plugins/globalize2/lib/globalize/active_record/attributes.rb delete mode 100644 vendor/plugins/globalize2/lib/globalize/active_record/migration.rb delete mode 100644 vendor/plugins/globalize2/lib/i18n/missing_translations_log_handler.rb delete mode 100644 vendor/plugins/globalize2/lib/i18n/missing_translations_raise_handler.rb delete mode 100644 vendor/plugins/globalize2/test/active_record/fallbacks_test.rb delete mode 100644 vendor/plugins/globalize2/test/active_record/migration_test.rb delete mode 100644 vendor/plugins/globalize2/test/active_record/sti_translated_test.rb delete mode 100644 vendor/plugins/globalize2/test/active_record/translates_test.rb delete mode 100644 vendor/plugins/globalize2/test/active_record/translation_class_test.rb delete mode 100644 vendor/plugins/globalize2/test/active_record/validation_tests.rb delete mode 100644 vendor/plugins/globalize2/test/active_record_test.rb delete mode 100644 vendor/plugins/globalize2/test/all.rb delete mode 100644 vendor/plugins/globalize2/test/data/models.rb delete mode 100644 vendor/plugins/globalize2/test/data/no_globalize_schema.rb delete mode 100644 vendor/plugins/globalize2/test/i18n/missing_translations_test.rb delete mode 100644 vendor/plugins/globalize2/test/test_helper.rb delete mode 100644 vendor/plugins/paperclip/LICENSE delete mode 100644 vendor/plugins/paperclip/README.rdoc delete mode 100644 vendor/plugins/paperclip/Rakefile delete mode 100644 vendor/plugins/paperclip/generators/paperclip/USAGE delete mode 100644 vendor/plugins/paperclip/generators/paperclip/paperclip_generator.rb delete mode 100644 vendor/plugins/paperclip/generators/paperclip/templates/paperclip_migration.rb.erb delete mode 100644 vendor/plugins/paperclip/init.rb delete mode 100644 vendor/plugins/paperclip/lib/paperclip.rb delete mode 100644 vendor/plugins/paperclip/lib/paperclip/attachment.rb delete mode 100644 vendor/plugins/paperclip/lib/paperclip/callback_compatability.rb delete mode 100644 vendor/plugins/paperclip/lib/paperclip/geometry.rb delete mode 100644 vendor/plugins/paperclip/lib/paperclip/iostream.rb delete mode 100644 vendor/plugins/paperclip/lib/paperclip/matchers.rb delete mode 100644 vendor/plugins/paperclip/lib/paperclip/matchers/have_attached_file_matcher.rb delete mode 100644 vendor/plugins/paperclip/lib/paperclip/matchers/validate_attachment_content_type_matcher.rb delete mode 100644 vendor/plugins/paperclip/lib/paperclip/matchers/validate_attachment_presence_matcher.rb delete mode 100644 vendor/plugins/paperclip/lib/paperclip/matchers/validate_attachment_size_matcher.rb delete mode 100644 vendor/plugins/paperclip/lib/paperclip/processor.rb delete mode 100644 vendor/plugins/paperclip/lib/paperclip/storage.rb delete mode 100644 vendor/plugins/paperclip/lib/paperclip/thumbnail.rb delete mode 100644 vendor/plugins/paperclip/lib/paperclip/upfile.rb delete mode 100644 vendor/plugins/paperclip/paperclip.gemspec delete mode 100644 vendor/plugins/paperclip/shoulda_macros/paperclip.rb delete mode 100644 vendor/plugins/paperclip/tasks/paperclip_tasks.rake delete mode 100644 vendor/plugins/paperclip/test/.gitignore delete mode 100644 vendor/plugins/paperclip/test/attachment_test.rb delete mode 100644 vendor/plugins/paperclip/test/fixtures/12k.png delete mode 100644 vendor/plugins/paperclip/test/fixtures/50x50.png delete mode 100644 vendor/plugins/paperclip/test/fixtures/5k.png delete mode 100644 vendor/plugins/paperclip/test/fixtures/bad.png delete mode 100644 vendor/plugins/paperclip/test/fixtures/text.txt delete mode 100644 vendor/plugins/paperclip/test/fixtures/twopage.pdf delete mode 100644 vendor/plugins/paperclip/test/geometry_test.rb delete mode 100644 vendor/plugins/paperclip/test/helper.rb delete mode 100644 vendor/plugins/paperclip/test/integration_test.rb delete mode 100644 vendor/plugins/paperclip/test/iostream_test.rb delete mode 100644 vendor/plugins/paperclip/test/matchers/have_attached_file_matcher_test.rb delete mode 100644 vendor/plugins/paperclip/test/matchers/validate_attachment_content_type_matcher_test.rb delete mode 100644 vendor/plugins/paperclip/test/matchers/validate_attachment_presence_matcher_test.rb delete mode 100644 vendor/plugins/paperclip/test/matchers/validate_attachment_size_matcher_test.rb delete mode 100644 vendor/plugins/paperclip/test/paperclip_test.rb delete mode 100644 vendor/plugins/paperclip/test/processor_test.rb delete mode 100644 vendor/plugins/paperclip/test/storage_test.rb delete mode 100644 vendor/plugins/paperclip/test/thumbnail_test.rb delete mode 100644 vendor/plugins/routing-filter/.gitignore delete mode 100644 vendor/plugins/routing-filter/MIT-LICENSE delete mode 100644 vendor/plugins/routing-filter/README.markdown delete mode 100644 vendor/plugins/routing-filter/init.rb delete mode 100644 vendor/plugins/routing-filter/lib/routing_filter.rb delete mode 100644 vendor/plugins/routing-filter/lib/routing_filter/base.rb delete mode 100644 vendor/plugins/routing-filter/lib/routing_filter/locale.rb delete mode 100644 vendor/plugins/routing-filter/lib/routing_filter/pagination.rb delete mode 100644 vendor/plugins/routing-filter/spec/generation_spec.rb delete mode 100644 vendor/plugins/routing-filter/spec/recognition_spec.rb delete mode 100644 vendor/plugins/routing-filter/spec/routing_filter_spec.rb delete mode 100644 vendor/plugins/routing-filter/spec/spec.opts delete mode 100644 vendor/plugins/routing-filter/spec/spec_helper.rb delete mode 100644 vendor/plugins/will_paginate/.gitignore delete mode 100644 vendor/plugins/will_paginate/.manifest delete mode 100644 vendor/plugins/will_paginate/CHANGELOG.rdoc delete mode 100644 vendor/plugins/will_paginate/LICENSE delete mode 100644 vendor/plugins/will_paginate/README.rdoc delete mode 100644 vendor/plugins/will_paginate/Rakefile delete mode 100644 vendor/plugins/will_paginate/examples/apple-circle.gif delete mode 100644 vendor/plugins/will_paginate/examples/index.haml delete mode 100644 vendor/plugins/will_paginate/examples/index.html delete mode 100644 vendor/plugins/will_paginate/examples/pagination.css delete mode 100644 vendor/plugins/will_paginate/examples/pagination.sass delete mode 100644 vendor/plugins/will_paginate/init.rb delete mode 100644 vendor/plugins/will_paginate/lib/will_paginate.rb delete mode 100644 vendor/plugins/will_paginate/lib/will_paginate/array.rb delete mode 100644 vendor/plugins/will_paginate/lib/will_paginate/collection.rb delete mode 100644 vendor/plugins/will_paginate/lib/will_paginate/core_ext.rb delete mode 100644 vendor/plugins/will_paginate/lib/will_paginate/finder.rb delete mode 100644 vendor/plugins/will_paginate/lib/will_paginate/named_scope.rb delete mode 100644 vendor/plugins/will_paginate/lib/will_paginate/named_scope_patch.rb delete mode 100644 vendor/plugins/will_paginate/lib/will_paginate/version.rb delete mode 100644 vendor/plugins/will_paginate/lib/will_paginate/view_helpers.rb delete mode 100644 vendor/plugins/will_paginate/test/boot.rb delete mode 100644 vendor/plugins/will_paginate/test/collection_test.rb delete mode 100755 vendor/plugins/will_paginate/test/console delete mode 100644 vendor/plugins/will_paginate/test/finder_test.rb delete mode 100644 vendor/plugins/will_paginate/test/fixtures/admin.rb delete mode 100644 vendor/plugins/will_paginate/test/fixtures/developer.rb delete mode 100644 vendor/plugins/will_paginate/test/fixtures/developers_projects.yml delete mode 100644 vendor/plugins/will_paginate/test/fixtures/project.rb delete mode 100644 vendor/plugins/will_paginate/test/fixtures/projects.yml delete mode 100644 vendor/plugins/will_paginate/test/fixtures/replies.yml delete mode 100644 vendor/plugins/will_paginate/test/fixtures/reply.rb delete mode 100644 vendor/plugins/will_paginate/test/fixtures/topic.rb delete mode 100644 vendor/plugins/will_paginate/test/fixtures/topics.yml delete mode 100644 vendor/plugins/will_paginate/test/fixtures/user.rb delete mode 100644 vendor/plugins/will_paginate/test/fixtures/users.yml delete mode 100644 vendor/plugins/will_paginate/test/helper.rb delete mode 100644 vendor/plugins/will_paginate/test/lib/activerecord_test_case.rb delete mode 100644 vendor/plugins/will_paginate/test/lib/activerecord_test_connector.rb delete mode 100644 vendor/plugins/will_paginate/test/lib/load_fixtures.rb delete mode 100644 vendor/plugins/will_paginate/test/lib/view_test_process.rb delete mode 100644 vendor/plugins/will_paginate/test/tasks.rake delete mode 100644 vendor/plugins/will_paginate/test/view_test.rb delete mode 100644 vendor/plugins/will_paginate/will_paginate.gemspec (limited to 'app/controllers/content_controller.rb') diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..9a803c9 --- /dev/null +++ b/Gemfile @@ -0,0 +1,32 @@ +source 'https://rubygems.org' + +gem 'rails', '3.2.22.5' + +gem 'pg', '~> 0.17.0' + +# from your vendor/plugins, now as gems: +gem 'acts-as-taggable-on', '~> 2.4' +gem 'awesome_nested_set', '~> 2.1' +gem 'acts_as_list' +gem 'globalize3', '~> 0.3.0' +gem 'routing-filter', '~> 0.3' +gem 'paperclip', '~> 3.5' +gem 'will_paginate', '~> 3.0' +gem 'exception_notification' +gem 'libxml-ruby', :require => 'xml' + +# gem 'thinking-sphinx', '1.5.0', :require => 'thinking_sphinx' +gem 'unicorn', '~> 1.1' + +group :assets do + gem 'sass-rails', '~> 3.2.3' + gem 'coffee-rails', '~> 3.2.1' + gem 'uglifier', '>= 1.0.3' +end + +group :test do + gem 'test-unit', '~> 3.0' +end + +gem 'chaos_calendar', :git => 'https://github.com/erdgeist/chaoscalendar.git', :require => 'chaos_calendar', :branch => 'erdgeist-ruby1.9' + diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..84425ea --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,170 @@ +GIT + remote: https://github.com/erdgeist/chaoscalendar.git + revision: a1a84e0a1b05f2b64ea7fefb5fa159fccf43abce + branch: erdgeist-ruby1.9 + specs: + chaos_calendar (0.1.3) + +GEM + remote: https://rubygems.org/ + specs: + actionmailer (3.2.22.5) + actionpack (= 3.2.22.5) + mail (~> 2.5.4) + actionpack (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) + builder (~> 3.0.0) + erubis (~> 2.7.0) + journey (~> 1.0.4) + rack (~> 1.4.5) + rack-cache (~> 1.2) + rack-test (~> 0.6.1) + sprockets (~> 2.2.1) + activemodel (3.2.22.5) + activesupport (= 3.2.22.5) + builder (~> 3.0.0) + activerecord (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) + arel (~> 3.0.2) + tzinfo (~> 0.3.29) + activeresource (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) + activesupport (3.2.22.5) + i18n (~> 0.6, >= 0.6.4) + multi_json (~> 1.0) + acts-as-taggable-on (2.4.1) + rails (>= 3, < 5) + acts_as_list (0.9.19) + activerecord (>= 3.0) + arel (3.0.3) + awesome_nested_set (2.1.6) + activerecord (>= 3.0.0) + builder (3.0.4) + climate_control (0.2.0) + cocaine (0.5.8) + climate_control (>= 0.0.3, < 1.0) + coffee-rails (3.2.2) + coffee-script (>= 2.2.0) + railties (~> 3.2.0) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.12.2) + concurrent-ruby (1.3.7) + erubis (2.7.0) + exception_notification (4.1.1) + actionmailer (>= 3.0.4) + activesupport (>= 3.0.4) + execjs (2.9.0) + ffi (1.15.5) + globalize3 (0.3.1) + activemodel (>= 3.0.0) + activerecord (>= 3.0.0) + paper_trail (~> 2) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + journey (1.0.4) + json (1.8.6) + libxml-ruby (3.1.0) + mail (2.5.5) + mime-types (~> 1.16) + treetop (~> 1.4.8) + mime-types (1.25.1) + multi_json (1.15.0) + paper_trail (2.7.2) + activerecord (~> 3.0) + railties (~> 3.0) + paperclip (3.5.4) + activemodel (>= 3.0.0) + activesupport (>= 3.0.0) + cocaine (~> 0.5.3) + mime-types + pg (0.17.1) + polyglot (0.3.5) + power_assert (3.0.1) + rack (1.4.7) + rack-cache (1.15.0) + rack (>= 0.4) + rack-ssl (1.3.4) + rack + rack-test (0.6.3) + rack (>= 1.0) + rails (3.2.22.5) + actionmailer (= 3.2.22.5) + actionpack (= 3.2.22.5) + activerecord (= 3.2.22.5) + activeresource (= 3.2.22.5) + activesupport (= 3.2.22.5) + bundler (~> 1.0) + railties (= 3.2.22.5) + railties (3.2.22.5) + actionpack (= 3.2.22.5) + activesupport (= 3.2.22.5) + rack-ssl (~> 1.3.2) + rake (>= 0.8.7) + rdoc (~> 3.4) + thor (>= 0.14.6, < 2.0) + rake (13.4.2) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + rdoc (3.12.2) + json (~> 1.4) + routing-filter (0.4.0.1) + actionpack (< 4.2) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (3.2.6) + railties (~> 3.2.0) + sass (>= 3.1.10) + tilt (~> 1.3) + sprockets (2.2.3) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + test-unit (3.7.8) + power_assert + thor (1.2.2) + tilt (1.4.1) + treetop (1.4.15) + polyglot + polyglot (>= 0.3.1) + tzinfo (0.3.62) + uglifier (4.2.1) + execjs (>= 0.3.0, < 3) + unicorn (1.1.7) + rack + will_paginate (3.3.1) + +PLATFORMS + ruby + +DEPENDENCIES + acts-as-taggable-on (~> 2.4) + acts_as_list + awesome_nested_set (~> 2.1) + chaos_calendar! + coffee-rails (~> 3.2.1) + exception_notification + globalize3 (~> 0.3.0) + libxml-ruby + paperclip (~> 3.5) + pg (~> 0.17.0) + rails (= 3.2.22.5) + routing-filter (~> 0.3) + sass-rails (~> 3.2.3) + test-unit (~> 3.0) + uglifier (>= 1.0.3) + unicorn (~> 1.1) + will_paginate (~> 3.0) + +BUNDLED WITH + 1.17.3 diff --git a/Rakefile b/Rakefile index b8e1d62..485c345 100644 --- a/Rakefile +++ b/Rakefile @@ -1,13 +1,6 @@ -# Add your own tasks in files placed in lib/tasks ending in .rake, -# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. +require File.expand_path('../config/application', __FILE__) -require(File.join(File.dirname(__FILE__), 'config', 'boot')) +Cccms::Application.load_tasks -require 'rake' -require 'rake/testtask' - -#require 'rake/rdoctask' -#require 'rdoc/task' - -require 'tasks/rails' -require 'thinking_sphinx/tasks' +# TODO: re-enable when Thinking Sphinx is upgraded +# require 'thinking_sphinx/tasks' diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index f3cc221..18c4104 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -5,21 +5,15 @@ class AdminController < ApplicationController before_filter :login_required def index - @drafts = Node.all( - :limit => 50, - :order => "updated_at desc", - :conditions => ["draft_id IS NOT NULL"] - ) - @drafts_count = Node.count( - :conditions => ["draft_id IS NOT NULL"] - ) - @recent_changes = Node.all( - :limit => 50, - :order => "updated_at desc", - :conditions => [ - "updated_at < ? AND updated_at > ? AND parent_id IS NOT NULL", Time.now, Time.now-14.days - ] - ) + @drafts = Node.where("draft_id IS NOT NULL") + .limit(50).order("updated_at desc") + + @drafts_count = Node.where("draft_id IS NOT NULL").count + + @recent_changes = Node.where( + "updated_at < ? AND updated_at > ? AND parent_id IS NOT NULL", + Time.now, Time.now - 14.days + ).limit(50).order("updated_at desc") all_nodes = Node.root.self_and_descendants @sitemap_depth = {} @@ -28,16 +22,12 @@ class AdminController < ApplicationController end @sitemap = all_nodes.to_a.sort! { |node1,node2| node1.lft <=> node2.lft }.delete_if { |node| node.update? } - @mypages = Page.all( - :conditions => [ "user_id = ? or editor_id = ?", @current_user, @current_user] - ) - - @mynodes = Node.all( - :order => "updated_at desc", - :joins => :pages, - :conditions => [ "pages.user_id = ? or pages.editor_id = ?", @current_user, @current_user ] - ).uniq.first(50) + @mypages = Page.where("user_id = ? or editor_id = ?", @current_user, @current_user) + @mynodes = Node.joins(:pages) + .where("pages.user_id = ? or pages.editor_id = ?", @current_user, @current_user) + .order("updated_at desc") + .uniq.first(50) end def search diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 89cd330..4d0ed2e 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,25 +2,19 @@ # Likewise, all the methods added will be available for all controllers. class ApplicationController < ActionController::Base - - include ExceptionNotifiable include AuthenticatedSystem - helper :all # include all helpers, all the time protect_from_forgery # See ActionController::RequestForgeryProtection for details - # Scrub sensitive parameters from your log - filter_parameter_logging :password, :password_confirmation - before_filter :set_locale protected - def set_locale - if params[:locale] && I18n.available_locales.include?(params[:locale].to_sym) - I18n.locale = params[:locale].to_sym - else - params.delete(:locale) - end + def set_locale + if params[:locale] && I18n.available_locales.include?(params[:locale].to_sym) + I18n.locale = params[:locale].to_sym + else + params.delete(:locale) end + end end diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb index c62b726..4248239 100644 --- a/app/controllers/content_controller.rb +++ b/app/controllers/content_controller.rb @@ -20,7 +20,7 @@ class ContentController < ApplicationController ) else render( - :file => File.join(RAILS_ROOT, 'public', '404.html'), + :file => Rails.root.join('public', '404.html'), :status => 404 ) end @@ -38,7 +38,7 @@ class ContentController < ApplicationController private def find_page - path = params[:page_path].join('/') + path = params[:page_path].is_a?(Array) ? params[:page_path].join('/') : params[:page_path] if path =~ /^[a-zA-Z\:\/\/\.\-\d_]+$/ @page = Node.find_page(path) else diff --git a/app/controllers/menu_items_controller.rb b/app/controllers/menu_items_controller.rb index 808da15..24a3d5e 100644 --- a/app/controllers/menu_items_controller.rb +++ b/app/controllers/menu_items_controller.rb @@ -7,7 +7,7 @@ class MenuItemsController < ApplicationController layout 'admin' def index - @menu_items = MenuItem.all(:order => "position ASC") + @menu_items = MenuItem.order("position ASC").all end def show diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb index 95aed48..7c082c4 100644 --- a/app/controllers/nodes_controller.rb +++ b/app/controllers/nodes_controller.rb @@ -15,12 +15,9 @@ class NodesController < ApplicationController ] def index - @nodes = Node.root.descendants.paginate( - :include => [:head, :draft], - :page => params[:page], - :per_page => 25, - :order => 'id DESC' - ) + @nodes = Node.root.descendants.includes(:head, :draft) + .order('id DESC') + .paginate(:page => params[:page], :per_page => 25) end def new diff --git a/app/controllers/revisions_controller.rb b/app/controllers/revisions_controller.rb index 05e8acc..8c16730 100644 --- a/app/controllers/revisions_controller.rb +++ b/app/controllers/revisions_controller.rb @@ -8,6 +8,7 @@ class RevisionsController < ApplicationController def index @node = Node.find(params[:node_id]) + @pages = @node.pages.all end def diff diff --git a/app/controllers/rss_controller.rb b/app/controllers/rss_controller.rb index acffc0e..70a642c 100644 --- a/app/controllers/rss_controller.rb +++ b/app/controllers/rss_controller.rb @@ -7,12 +7,9 @@ class RssController < ApplicationController expires_in 31.minutes, :public => true I18n.locale = :de - - @items = Page.heads.find_tagged_with( - "update", - :order => "published_at DESC", - :limit => 20 - ) + + @items = Page.heads.tagged_with("update") + .order("published_at DESC").limit(20) respond_to do |format| format.xml {} @@ -21,13 +18,9 @@ class RssController < ApplicationController end def recent_changes - @items = Page.all( - :limit => 20, - :order => "updated_at desc", - :conditions => [ - "updated_at < ? AND updated_at > ?", Time.now, Time.now-14.days - ] - ) + @items = Page.where( + "updated_at < ? AND updated_at > ?", Time.now, Time.now - 14.days + ).limit(20).order("updated_at desc") end protected diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index bf64b73..f09d560 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -5,7 +5,7 @@ class TagsController < ApplicationController def index @page = Page.new :title => "Tags" - @tags = Tag.all(:limit => 500) + @tags = Tag.limit(500).all end def show @@ -16,14 +16,12 @@ class TagsController < ApplicationController @tag = @tag ? @tag.name : tag_name @page = Page.new - params[:page] = ( params[:page].is_a?(Fixnum) ? params[:page] : 1 ) + params[:page] = (params[:page].is_a?(Integer) ? params[:page] : 1) - @pages = Page.heads.paginate( - Page.find_options_for_find_tagged_with(@tag).merge( - :order => 'published_at DESC', - :page=>params[:page], - :per_page => 23 - ) + @pages = Page.heads.tagged_with(@tag).paginate( + :order => 'published_at DESC', + :page => params[:page], + :per_page => 23 ) respond_to do |format| diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 87df678..b7914c4 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -9,7 +9,7 @@ class UsersController < ApplicationController layout 'admin' def index - @users = User.all(:order => "login ASC").group_by do |user| + @users = User.order("login ASC").all.group_by do |user| user.admin? ? :admin : :user end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 22a7940..0be66e9 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,3 +1,14 @@ # Methods added to this helper will be available to all templates in the application. module ApplicationHelper + def form_error_messages(form_object) + object = form_object.is_a?(ActionView::Helpers::FormBuilder) ? form_object.object : form_object + return "" unless object && object.errors.any? + content_tag(:div, :class => "error_messages") do + content_tag(:ul) do + object.errors.full_messages.map do |msg| + content_tag(:li, msg) + end.join.html_safe + end + end + end end diff --git a/app/helpers/content_helper.rb b/app/helpers/content_helper.rb index 17364f8..dbe468e 100644 --- a/app/helpers/content_helper.rb +++ b/app/helpers/content_helper.rb @@ -1,7 +1,7 @@ module ContentHelper def main_menu - menu_items = MenuItem.all(:order => "position ASC") + menu_items = MenuItem.order("position ASC").all render( :partial => 'content/main_navigation', :locals => {:menu_items => menu_items} @@ -51,7 +51,7 @@ module ContentHelper end def page_title - if @page.title && @page.title != "" + if @page && @page.title && @page.title != "" "CCC | #{@page.title}" else "CCC | Chaos Computer Club" @@ -75,7 +75,7 @@ module ContentHelper def aggregate? content options = {} - cccms_attributes = ActionView::Base.sanitized_allowed_attributes + [ 'lang' ] + cccms_attributes = ActionView::Base.sanitized_allowed_attributes + ['lang'] begin if content =~ /]*)>/ @@ -126,9 +126,7 @@ module ContentHelper # Check if a custom partial exists in the proper location def partial_exists? partial File.exist?( - File.join( - RAILS_ROOT, 'app', 'views', 'custom', 'partials', "_#{partial}.html.erb" - ) + Rails.root.join('app', 'views', 'custom', 'partials', "_#{partial}.html.erb") ) end diff --git a/app/models/asset.rb b/app/models/asset.rb index 5bfea76..d27c525 100644 --- a/app/models/asset.rb +++ b/app/models/asset.rb @@ -11,29 +11,8 @@ class Asset < ActiveRecord::Base :headline => "460x250#" } ) - - named_scope :images, :conditions => { - :upload_content_type => [ - "image/gif", - "image/jpeg", - "image/png" - ] - } - - named_scope :documents, :conditions => { - :upload_content_type => [ - "application/pdf", - "text/plain", - "text/rtf" - ] - } - - named_scope :audio, :conditions => { - :upload_content_type => [ - "audio/mpeg", - "audio/x-m4a", - "audio/wav", - "audio/x-wav" - ] - } + + scope :images, where(:upload_content_type => ["image/gif", "image/jpeg", "image/png"]) + scope :documents, where(:upload_content_type => ["application/pdf", "text/plain", "text/rtf"]) + scope :audio, where(:upload_content_type => ["audio/mpeg", "audio/x-m4a", "audio/wav", "audio/x-wav"]) end diff --git a/app/models/event.rb b/app/models/event.rb index 60b8521..23deed6 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -12,14 +12,12 @@ class Event < ActiveRecord::Base # Instance Methods def occurrences_in_range start_time, end_time - self.occurrences.find( - :all, :conditions => [ - "start_time > ? AND end_time < ?", - start_time, end_time - ] + self.occurrences.where( + "start_time > ? AND end_time < ?", + start_time, end_time ) - end - + end + private def generate_occurences Occurrence.generate self diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 054e7ee..d1ddc68 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -1,6 +1,6 @@ class MenuItem < ActiveRecord::Base - - default_scope :conditions => {:type => "MenuItem"} + + default_scope where(:type => "MenuItem") translates :title @@ -24,5 +24,5 @@ end class FeaturedArticle < MenuItem - default_scope :conditions => {:type => "FeaturedArticle"} -end \ No newline at end of file + default_scope where(:type => "FeaturedArticle") +end diff --git a/app/models/node.rb b/app/models/node.rb index 75122d1..1b80565 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -24,12 +24,12 @@ class Node < ActiveRecord::Base validate :borders # This should never ever happen. # Index for Fulltext Search - define_index do - indexes head.translations.title - indexes slug - indexes unique_name - indexes head.translations.body - end + # define_index do + # indexes head.translations.title + # indexes slug + # indexes unique_name + # indexes head.translations.body + # end # Class methods @@ -39,8 +39,8 @@ class Node < ActiveRecord::Base # revision with -1. It raises an Argument error if the revision is not a # Fixnum def self.find_page path, revision = -1 - unless revision.class == Fixnum - raise ArgumentError, "revision must be a Fixnum" + unless revision.is_a?(Integer) + raise ArgumentError, "revision must be a Integer" end node = Node.find_by_unique_name(path) @@ -111,6 +111,7 @@ class Node < ActiveRecord::Base end self.save! + self.update_unique_name self.unlock! self end diff --git a/app/models/occurrence.rb b/app/models/occurrence.rb index 62432d5..0760d5e 100644 --- a/app/models/occurrence.rb +++ b/app/models/occurrence.rb @@ -11,25 +11,17 @@ class Occurrence < ActiveRecord::Base # Class Methods def self.find_in_range start_time, end_time - find( - :all, - :include => :node, - :conditions => [ - "start_time > ? AND end_time < ?", start_time, end_time - ], - :order => "start_time" - ) + includes(:node) + .where("start_time > ? AND end_time < ?", start_time, end_time) + .order("start_time") end - + def self.find_next - find( - :all, - :limit => 1, - :include => :node, - :conditions => ["start_time > ?", Time.now] - ) + includes(:node) + .where("start_time > ?", Time.now) + .limit(1) end - + # Deletes all Occurrences which belong to the given event. Afterwards a few # variables are set to save repetitive queries. The occurrences of the given # event are then calculated and created. diff --git a/app/models/page.rb b/app/models/page.rb index f804353..05abd43 100644 --- a/app/models/page.rb +++ b/app/models/page.rb @@ -3,23 +3,11 @@ require 'xml' class Page < ActiveRecord::Base PUBLIC_TEMPLATE_PATH = File.join(%w(custom page_templates public)) - FULL_PUBLIC_TEMPLATE_PATH = File.join(RAILS_ROOT, 'app', 'views', PUBLIC_TEMPLATE_PATH) + FULL_PUBLIC_TEMPLATE_PATH = Rails.root.join('app', 'views', PUBLIC_TEMPLATE_PATH) # named scopes - - named_scope( - :drafts, - :joins => :node, - :include => [:translations], - :conditions => ["nodes.draft_id = pages.id"] - ) - - named_scope( - :heads, - :joins => :node, - :include => [:translations], - :conditions => ["nodes.head_id = pages.id"] - ) + scope :drafts, joins(:node).includes(:translations).where("nodes.draft_id = pages.id") + scope :heads, joins(:node).includes(:translations).where("nodes.head_id = pages.id") # Mixins and Plugins acts_as_taggable @@ -62,15 +50,16 @@ class Page < ActiveRecord::Base options = defaults.merge options - Page.heads.paginate( - find_options_for_find_tagged_with( - options[:tags].gsub(/\s/, ","), :match_all => true, :conditions => options[:conditions] - ).merge( - :page => page, - :per_page => options[:limit], - :order => "#{options[:order_by]} #{options[:order_direction]}" + scope = Page.heads + unless options[:tags].blank? + scope = scope.tagged_with( + options[:tags].gsub(/\s/, ",").split(",").map(&:strip), + :match_all => true ) - ) + end + + scope.order("#{options[:order_by]} #{options[:order_direction]}") + .paginate(:page => page, :per_page => options[:limit]) end def self.custom_templates diff --git a/app/models/permission.rb b/app/models/permission.rb index 438538e..a7a30ed 100644 --- a/app/models/permission.rb +++ b/app/models/permission.rb @@ -8,6 +8,6 @@ class Permission < ActiveRecord::Base belongs_to :node # Named scopes - named_scope :for_node, lambda { |node| { :conditions => ['node_id = ?', (node.is_a? Node ? node.id : node)] } } - named_scope :for_user, lambda { |user| { :conditions => ['user_id = ?', (user.is_a? User ? user.id : user)] } } + scope :for_node, lambda { |node| where('node_id = ?', (node.is_a?(Node) ? node.id : node)) } + scope :for_user, lambda { |user| where('user_id = ?', (user.is_a?(User) ? user.id : user)) } end diff --git a/app/views/assets/edit.html.erb b/app/views/assets/edit.html.erb index d60db94..e65d600 100644 --- a/app/views/assets/edit.html.erb +++ b/app/views/assets/edit.html.erb @@ -1,7 +1,7 @@

Editing asset

-<% form_for(@asset) do |f| %> - <%= f.error_messages %> +<%= form_for(@asset) do |f| %> + <%= form_error_messages(f) %>

<%= f.submit 'Update' %> @@ -9,4 +9,4 @@ <% end %> <%= link_to 'Show', @asset %> | -<%= link_to 'Back', assets_path %> \ No newline at end of file +<%= link_to 'Back', assets_path %> diff --git a/app/views/assets/new.html.erb b/app/views/assets/new.html.erb index 366488f..6c1310a 100644 --- a/app/views/assets/new.html.erb +++ b/app/views/assets/new.html.erb @@ -1,7 +1,7 @@

New asset

-<% form_for(@asset, :html => { :multipart => true }) do |f| %> - <%= f.error_messages %> +<%= form_for(@asset, :html => { :multipart => true }) do |f| %> + <%= form_error_messages(f) %>

<%= f.label :name %>
@@ -14,4 +14,4 @@

<% end %> -<%= link_to 'Back', assets_path %> \ No newline at end of file +<%= link_to 'Back', assets_path %> diff --git a/app/views/content/_search.html.erb b/app/views/content/_search.html.erb index e654462..aa91424 100644 --- a/app/views/content/_search.html.erb +++ b/app/views/content/_search.html.erb @@ -1,3 +1,3 @@ -<% form_tag search_path, :method => 'get' do %> +<%= form_tag search_path, :method => 'get' do %>
<%= text_field_tag :search_term, params[:search_term], :placeholder => 'suchen', :type => 'search' %>
<% end %> diff --git a/app/views/content/_tags.html.erb b/app/views/content/_tags.html.erb index fd808b6..169ae84 100644 --- a/app/views/content/_tags.html.erb +++ b/app/views/content/_tags.html.erb @@ -1,4 +1,4 @@ -<% unless @page.tags.empty? %> +<% unless @page.nil? || @page.tags.empty? %>

Tags

    diff --git a/app/views/custom/page_templates/public/no_date_and_author_with_map.html.erb b/app/views/custom/page_templates/public/no_date_and_author_with_map.html.erb new file mode 100644 index 0000000..6e86edf --- /dev/null +++ b/app/views/custom/page_templates/public/no_date_and_author_with_map.html.erb @@ -0,0 +1,8 @@ +
    +

    <%= @page.title %>

    +

    <%= sanitize( @page.abstract ) %>

    + + <%= aggregate?(@page.body) %> + + +<%= will_paginate(@content_collection) if @content_collection %> diff --git a/app/views/events/edit.html.erb b/app/views/events/edit.html.erb index 17b6980..824cd66 100644 --- a/app/views/events/edit.html.erb +++ b/app/views/events/edit.html.erb @@ -6,8 +6,8 @@

    Editing event

    -<% form_for(@event) do |f| %> - <%= f.error_messages %> +<%= form_for(@event) do |f| %> + <%= form_error_messages(f) %>

    <%= f.label :start_time %>
    @@ -47,4 +47,4 @@

    <%= f.submit 'Update' %>

    -<% end %> \ No newline at end of file +<% end %> diff --git a/app/views/events/new.html.erb b/app/views/events/new.html.erb index 8c9812e..cd892c5 100644 --- a/app/views/events/new.html.erb +++ b/app/views/events/new.html.erb @@ -1,7 +1,7 @@

    New event

    -<% form_for(@event) do |f| %> - <%= f.error_messages %> +<%= form_for(@event) do |f| %> + <%= form_error_messages(f) %>

    <%= f.label :start_time %>
    @@ -43,4 +43,4 @@

    <% end %> -<%= link_to 'Back', events_path %> \ No newline at end of file +<%= link_to 'Back', events_path %> diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index 97b81df..9f36021 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -34,7 +34,7 @@ <% end %>
    - <%= yield :layout %> + <%= yield %>
    diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index d2a624f..2a46f09 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -28,7 +28,7 @@ - +
    diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 2a46f09..84dcdc6 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -16,8 +16,8 @@ <%= stylesheet_link_tag "shadowbox" %> <%= javascript_include_tag 'public' %> - <%= auto_discovery_link_tag(:atom, {:locale => :de, :controller => "rss", :action => "updates", :format => :xml}) %> - <%= auto_discovery_link_tag(:rss, {:locale => :de, :controller => "rss", :action => "updates", :format => :rdf}) %> + <%= auto_discovery_link_tag(:atom, '/rss/updates.xml', title: "ATOM") %> + <%= auto_discovery_link_tag(:rss, '/rss/updates.rdf', title: "RSS") %>