@@ -29,7 +29,7 @@ class ApplicationController < ActionController::Base end def login_required - logged_in? || access_denied_message("You must be logged in to edit a profile.") + logged_in? || access_denied_message("You must be logged to access this page.") end # handles non-html responses in DEV mode when there are exceptions app/controllers/application.rb @@ -8,71 +8,10 @@ module ApplicationHelper @use_login_form ||= !cookies['use_svn'].blank? && cookies['use_svn'].to_s == '1' end - def word_for_change(change) - case change.downcase - when 'a' then 'Added' - when 'd' then 'Deleted' - when 'm' then 'Modified' - when 'mv' then 'Moved' - when 'cp' then 'Copied' - else return change - end - end - def nb_pad(s, num) s.to_s.ljust(num).gsub(' ', '&nbsp;') end -if Object.const_defined?(:Uv) - def highlight_as(filename) - Uv.syntax_for_file(filename) || 'plain_text' - end - - def highlight_syntax_in(node, show_blame=false) - parsed = nil - benchmark "Highlighting #{node.path}" do - parsed = Uv.parse(node.content, "xhtml", highlight_as(node.path.split("/").last), true, Tentacle.source_highlight_theme) - parsed.gsub!(/<span class="line-numbers">(\s+\d+\s+)<\/span>/) do |s| - line_num = $1.to_i - line_len = node.blame.size.to_s.length - rev, username = node.blame[line_num] - %(<span class="line-numbers" id="n-#{line_num}"><span class="blame" title="#{username} modified this code in ##{rev}">#{link_to("#{nb_pad username, node.blame[:username_length]}", hosted_url(current_repository, :changeset, :id => rev))}&nbsp;</span><a href="#n-#{line_num}">#{nb_pad line_num, line_len}</a></span>) - end - parsed.gsub! /^<pre class="/, %(<pre id="source-code" class="#{'noblame ' unless show_blame}) - end - parsed - end -else - def highlight_as(filename) - case filename.split('.').last.downcase - when 'js', 'as' then 'javascript' - when 'rb', 'rakefile', 'rake' then 'ruby' - when 'css' then 'css' - when 'rhtml', 'erb', 'html', 'xml', 'rxml', 'plist' then 'html' - else 'plain' - end - end - - def highlight_syntax_in(node, show_blame=false) - %(<pre class="viewsource"> - <code class="#{highlight_as(node.path.split('/').last)}">#{h node.content}</code> - </pre>) - end - - def blame_for(node) - lines = node.content.split("\n") - lines.each_with_index do |line, i| - rev, username = node.blame[i+1] - line.replace "#{rev} #{username.ljust(node.blame[:username_length])} #{line}" - end - %(<pre><code>#{h lines.join("\n")}</code></pre>) - end -end - - def modified?(flag) - flag.downcase == 'm' - end - def title(ttl) @title = ttl || ' ' end app/helpers/application_helper.rb @@ -110,6 +110,8 @@ <!-- sbar --> <div id="sbar"> <%= yield :sidebar %> + + <%= yield :right %> </div> <!-- /sbar --> <% end -%> app/views/layouts/application.html.erb @@ -9,10 +9,6 @@ require 'ostruct' # Specifies gem version of Rails to use when vendor/rails is not present RAILS_GEM_VERSION = '2.0.2' unless defined? RAILS_GEM_VERSION -# Set this to :path to have URLs like http://my-tentacle.com/repo1/* instead of -# http://repo1.my-tentacle.com/* -# USE_REPO_PATHS = true - # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot') @@ -24,7 +20,7 @@ Rails.plugin_routes = [] # Configuration for external services like S3, Akismet, etc. Rails.mattr_accessor :service_data Rails.service_data = OpenStruct.new - + Rails::Initializer.run do |config| # Settings in config/environments/* take precedence over those specified here @@ -68,7 +64,6 @@ Rails::Initializer.run do |config| # Application configuration should go into files in config/initializers # -- all .rb files in that directory is automatically loaded - # Load Enginized models and all the other engine code we use. Otherwise it won't load models # and other code won't reload. config.to_prepare do config/environment.rb @@ -15,4 +15,12 @@ config.action_view.cache_template_extensions = false config.action_view.debug_rjs = true # Don't care if the mailer can't send -config.action_mailer.raise_delivery_errors = false \ No newline at end of file +config.action_mailer.raise_delivery_errors = false + +# Engines doesn't load models more than once so the code mixing doesn't work. +# This fixes that. +config.after_initialize do + Dir.glob("#{RAILS_ROOT}/vendor/plugins/**/app/models/*.rb").each do |model_file| + load model_file + end +end \ No newline at end of file config/environments/development.rb @@ -18,6 +18,19 @@ ActiveRecord::Schema.define(:version => 7) do t.datetime "updated_at" end + create_table "attachments", :force => true do |t| + t.integer "size" + t.string "content_type" + t.string "filename" + t.integer "height" + t.integer "width" + t.integer "parent_id" + t.string "thumbnail" + t.integer "page_id" + t.datetime "created_at" + t.datetime "updated_at" + end + create_table "avatars", :force => true do |t| t.string "content_type" t.string "filename" @@ -28,6 +41,18 @@ ActiveRecord::Schema.define(:version => 7) do t.integer "height" end + create_table "flags", :force => true do |t| + t.integer "flaggable_id" + t.string "flaggable_type" + t.integer "owner_id" + t.string "owner_type" + t.integer "flagger_id" + t.string "flagger_type" + t.string "reason" + t.datetime "created_at" + t.datetime "updated_at" + end + create_table "forums", :force => true do |t| t.integer "site_id" t.string "name" @@ -56,8 +81,19 @@ ActiveRecord::Schema.define(:version => 7) do t.string "name" t.datetime "created_at" t.datetime "updated_at" - t.integer "topics_count", :default => 0 - t.integer "posts_count", :default => 0 + t.integer "users_count", :default => 0 + t.integer "posts_count", :default => 0 + t.integer "topics_count" + t.boolean "wiki_requires_approval", :default => false + t.boolean "wiki_requires_login_to_post", :default => true + t.boolean "disable_wiki_teh", :default => false + end + + create_table "links", :force => true do |t| + t.integer "from_page_id" + t.integer "to_page_id" + t.datetime "created_at" + t.datetime "updated_at" end create_table "memberships", :force => true do |t| @@ -65,7 +101,6 @@ ActiveRecord::Schema.define(:version => 7) do t.integer "profile_id" t.datetime "created_at" t.datetime "updated_at" - t.boolean "admin", :default => false end create_table "moderatorships", :force => true do |t| @@ -102,6 +137,32 @@ ActiveRecord::Schema.define(:version => 7) do t.binary "value" end + create_table "page_versions", :force => true do |t| + t.integer "page_id" + t.integer "version" + t.string "title" + t.text "body" + t.integer "profile_id" + t.string "permalink" + t.datetime "created_at" + t.datetime "updated_at" + t.boolean "private_page" + t.integer "group_id" + end + + create_table "pages", :force => true do |t| + t.string "title" + t.text "body" + t.integer "profile_id" + t.string "permalink" + t.datetime "created_at" + t.datetime "updated_at" + t.boolean "private_page" + t.integer "version" + t.integer "group_id" + t.datetime "locked_at" + end + create_table "posts", :force => true do |t| t.integer "profile_id" t.integer "topic_id" @@ -118,6 +179,21 @@ ActiveRecord::Schema.define(:version => 7) do add_index "posts", ["created_at", "profile_id"], :name => "index_posts_on_profile_id" add_index "posts", ["created_at", "topic_id"], :name => "index_posts_on_topic_id" + create_table "private_messages", :force => true do |t| + t.integer "sender_id" + t.integer "recipient_id" + t.string "title" + t.text "body" + t.text "body_html" + t.boolean "sender_deleted", :default => false + t.boolean "recipient_deleted", :default => false + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "private_messages", ["sender_id"], :name => "index_private_messages_on_sender_id" + add_index "private_messages", ["recipient_id"], :name => "index_private_messages_on_recipient_id" + create_table "profiles", :force => true do |t| t.integer "user_id" t.string "first_name" db/schema.rb @@ -1,206 +0,0 @@ -namespace :tentacle do - desc "Upgrades Tentacle if it uses the recommended file/directory structure (see tentacle:setup). Run from inside the release directory." - task :upgrade => :check_structure do - unless @in_structure || ENV['WAREHOUSE_FORCE'] - say "Tentacle is not setup to upgrade." - say "Try running 'rake tentacle:setup'" - return - end - - rel_path = "releases/tentacle-#{Tentacle.version}" - - Dir.chdir '../..' - Dir['shared/**/**'].each do |file| - next unless file =~ /^shared\/config/ - rel_file = file.gsub /shared/, rel_path - next unless File.file?(file) - ln_sf File.expand_path(file), File.dirname(rel_file) - end - ln_sf File.expand_path("shared/public/avatars"), File.join(rel_path, 'public', 'avatars') - ln_sf File.expand_path(rel_path), 'current' - Dir.chdir rel_path - - unless ENV['WAREHOUSE_FORCE'] - say "Upgraded to v#{Tentacle.version}" - say "Be sure to restart the Rails application to see the changes take effect." - end - end - - desc "Checks whether the current setup uses the recommended file/directory structure (see tentacle:setup)" - task :check_structure => :init_highline do - @app_root = Pathname.new(Dir.pwd) - - @in_structure = \ - (@app_root.dirname.basename.to_s == 'releases') && - (@app_root.dirname.dirname + 'shared').exist? - end - - desc "Attempts to setup Tentacle with the recommended file/directory structure. It lets you know what it's doing before making the change." - task :setup => :check_structure do - if @in_structure - say "Tentacle is already setup correctly." - else - top_level = ENV['TOP_LEVEL'] || 'tentacle' - rel_path = "releases/tentacle-#{Tentacle.version}" - say "It doesn't look like Tentacle is setup in the recommended structure:" - puts - say "#{@app_root.dirname}/#{top_level}/shared <-- shared config files" - say "#{@app_root.dirname}/#{top_level}/#{rel_path} <-- this tentacle release" - say "#{@app_root.dirname}/#{top_level}/current <-- symlink of latest tentacle release" - puts - say "The added benefits are simpler Web Server configuration and upgradeability." - puts - if agree("Would you like to setup Tentacle like this? [y/n]") - rel_files = ['config/database.yml', 'config/initializers/tentacle.rb', 'public/avatars'].inject({}) do |memo, path| - memo.update path => File.expand_path(path) - end - - mkdir_p "../#{top_level}" - Dir.chdir "../#{top_level}" - mkdir_p 'shared/config/initializers' - mkdir_p 'shared/public' - mkdir_p 'releases' - rel_files.each do |path, full| - next unless File.exist?(full) - cp_r full, File.join('shared', path) - end - touch 'shared/config/initializers/tentacle.rb' unless File.exist?('shared/config/initializers/tentacle.rb') - touch 'shared/config/database.yml' unless File.exist?('shared/config/database.yml') - mkdir_p 'shared/public/avatars' - mv @app_root.to_s, rel_path - - Dir.chdir rel_path - ENV['WAREHOUSE_FORCE'] = '1' - Rake::Task["tentacle:upgrade"].invoke - end - end - end - - desc "Bootstraps Tentacle by checking for various libs, creating your database.yml, and reloading the database schema." - task :bootstrap => :check_structure do - say "Bootstrapping Tentacle v#{Tentacle.version}..." - - puts - say "1) Check for subversion bindings and proper permissions" - say "2) Create Database.yml config file" - say "3) Load Database Schema" - puts - - begin - say "checking for subversion bindings..." - require 'svn/core' - say "... found it!" - rescue - say "You do not have the ruby/svn bindings installed." - raise - end - - say "checking for proper write permissions..." - if File.writable?('config/initializers') - say "... looks good!" - else - say "The config/initializers directy should be writable to rails so Tentacle can store this copy's configuration." - return - end - - puts - say "Step 1 is complete, now to check your database.yml file." - puts - - db_config = "config/database.yml" - db_config = File.readlink(db_config) if File.symlink?(db_config) - - if File.exist?(db_config) - say "It looks like you already have a database.yml file." - @restart = agree("Would you like to CLEAR it and start over? [y/n]") - end - - unless !@restart && File.exist?(db_config) - if @restart || agree("Would you like to create a database.yml file? [y/n]") - options = OpenStruct.new - class << options - def get_binding() binding end - def test_database - @test_database ||= database.gsub(pattern, '') + '_test' - end - end - options.keys = [:adapter, :host, :database, :username, :password, :socket] - options.pattern = /_(dev.*|prod.*|test)$/ - options.adapter = 'mysql' - puts - options.host = ask("Host name: (default = localhost)") - puts - say "This same database will be used for your DEV and PRODUCTION environments." - say "The test database name will be inferred from this database name." - options.database = ask("Database name:") - puts - options.username = ask("User name:") - puts - options.password = ask("Password:") { |q| q.echo = "x" } - puts - options.socket = ask("Socket path: (blank by default)") - [:host, :socket].each do |attr| - if options.send(attr).to_s.size == 0 - options.delete_field(attr) - options.keys.delete(attr) - end - end - require 'erb' - erb = ERB.new(IO.read(File.join(RAILS_ROOT, 'config', 'database.erb')), nil, '<>') - File.open File.expand_path(db_config), 'w' do |f| - f.write erb.result(options.get_binding) - end - say "Your databases:" - say "Development: '#{options.database}'" - say "Production: '#{options.database}'" - say "Test: '#{options.test_database}'" - say "I don't quite feel comfortable creating your database for you (I hardly know you). So, make sure these databases have been created before proceeding." - else - cp 'config/database.sample.yml', db_config - say "I have copied database.sample.yml over. Now, edit #{db_config} with your correct database settings." - return - end - end - - puts - unless agree("Now it's time for Step 3: Load the database schema. All of your data will be overwritten. Are you sure you wish to continue? [y/n]") - raise "Cancelled" - end - puts - - mkdir_p File.join(RAILS_ROOT, 'log') - tentacle_path = File.join(RAILS_ROOT, 'config', 'initializers', 'tentacle.rb') - rm tentacle_path if File.exist?(tentacle_path) - - %w(environment db:schema:load tmp:create).each { |t| Rake::Task[t].invoke } - - say '=' * 80 - puts - say "Tentacle v#{Tentacle.version} is ready to roll." - say "Okay, thanks for bootstrapping! I know I felt some chemistry here, did you?" - say "Now, start the application with 'script/server' and visit http://mydomain.com/ to start the installation process." - puts - say "For help, visit the following:" - say " Official Tentacle Site - http://tentacleapp.com" - say " The Active Reload Forum - http://forum.activereload.net" - say " ActiveReload on IRC (Freenode): #activereload" - end - - task :init_highline do - unless $terminal - RAILS_ENV = 'production' - $LOAD_PATH << 'vendor/highline-1.2.9/lib' - require 'ostruct' - require 'pathname' - require "highline" - require "forwardable" - require 'lib/tentacle' - - $terminal = HighLine.new - class << self - extend Forwardable - def_delegators :$terminal, :agree, :ask, :choose, :say - end - end - end -end \ No newline at end of file lib/tasks/bootstrap.rake config/database.erb config/svn_access.erb config/svn_access.sample.erb lib/tasks/importer.rake lib/vlad/git.rb lib/vlad/monit.rb public/date_slider_data.xml public/date_slider_open.swf syntax/actionscript.syntax syntax/active4d.syntax syntax/active4d_html.syntax syntax/active4d_ini.syntax syntax/active4d_library.syntax syntax/ada.syntax syntax/antlr.syntax syntax/apache.syntax syntax/applescript.syntax syntax/asp.syntax syntax/asp_vb.net.syntax syntax/bibtex.syntax syntax/blog_html.syntax syntax/blog_markdown.syntax syntax/blog_text.syntax syntax/blog_textile.syntax syntax/build.syntax syntax/bulletin_board.syntax syntax/c++.syntax syntax/c.syntax syntax/cake.syntax syntax/camlp4.syntax syntax/cm.syntax syntax/coldfusion.syntax syntax/context_free.syntax syntax/cs.syntax syntax/css.syntax syntax/css_experimental.syntax syntax/csv.syntax syntax/d.syntax syntax/diff.syntax syntax/dokuwiki.syntax syntax/dot.syntax syntax/doxygen.syntax syntax/dylan.syntax syntax/eiffel.syntax syntax/erlang.syntax syntax/f-script.syntax syntax/fortran.syntax syntax/fxscript.syntax syntax/greasemonkey.syntax syntax/gri.syntax syntax/groovy.syntax syntax/gtd.syntax syntax/gtdalt.syntax syntax/haml.syntax syntax/haskell.syntax syntax/html-asp.syntax syntax/html.syntax syntax/html_django.syntax syntax/html_for_asp.net.syntax syntax/html_mason.syntax syntax/html_rails.syntax syntax/html_tcl.syntax syntax/icalendar.syntax syntax/inform.syntax syntax/ini.syntax syntax/installer_distribution_script.syntax syntax/io.syntax syntax/java.syntax syntax/javaproperties.syntax syntax/javascript.syntax syntax/javascript_+_prototype.syntax syntax/javascript_+_prototype_bracketed.syntax syntax/jquery_javascript.syntax syntax/json.syntax syntax/languagedefinition.syntax syntax/latex.syntax syntax/latex_beamer.syntax syntax/latex_log.syntax syntax/latex_memoir.syntax syntax/lexflex.syntax syntax/lighttpd.syntax syntax/lilypond.syntax syntax/lisp.syntax syntax/literate_haskell.syntax syntax/logo.syntax syntax/logtalk.syntax syntax/lua.syntax syntax/m.syntax syntax/macports_portfile.syntax syntax/mail.syntax syntax/makefile.syntax syntax/man.syntax syntax/markdown.syntax syntax/mediawiki.syntax syntax/mel.syntax syntax/mips.syntax syntax/mod_perl.syntax syntax/modula-3.syntax syntax/moinmoin.syntax syntax/mootools.syntax syntax/movable_type.syntax syntax/multimarkdown.syntax syntax/objective-c++.syntax syntax/objective-c.syntax syntax/ocaml.syntax syntax/ocamllex.syntax syntax/ocamlyacc.syntax syntax/opengl.syntax syntax/pascal.syntax syntax/perl.syntax syntax/php.syntax syntax/plain_text.syntax syntax/pmwiki.syntax syntax/postscript.syntax syntax/processing.syntax syntax/prolog.syntax syntax/property_list.syntax syntax/python.syntax syntax/python_django.syntax syntax/qmake_project.syntax syntax/qt_c++.syntax syntax/quake3_config.syntax syntax/r.syntax syntax/r_console.syntax syntax/ragel.syntax syntax/rd_r_documentation.syntax syntax/regexp.syntax syntax/regular_expressions_oniguruma.syntax syntax/regular_expressions_python.syntax syntax/release_notes.syntax syntax/remind.syntax syntax/restructuredtext.syntax syntax/rez.syntax syntax/ruby.syntax syntax/ruby_experimental.syntax syntax/ruby_on_rails.syntax syntax/s5.syntax syntax/scheme.syntax syntax/scilab.syntax syntax/setext.syntax syntax/shell-unix-generic.syntax syntax/slate.syntax syntax/smarty.syntax syntax/sql.syntax syntax/sql_rails.syntax syntax/ssh-config.syntax syntax/standard_ml.syntax syntax/strings_file.syntax syntax/subversion_commit_message.syntax syntax/sweave.syntax syntax/swig.syntax syntax/tcl.syntax syntax/template_toolkit.syntax syntax/tex.syntax syntax/tex_math.syntax syntax/textile.syntax syntax/tsv.syntax syntax/twiki.syntax syntax/txt2tags.syntax syntax/vectorscript.syntax syntax/xhtml_1.0.syntax syntax/xml.syntax syntax/xml_strict.syntax syntax/xsl.syntax syntax/yaml.syntax syntax/yui_javascript.syntax vendor/plugins/friends/lib/friendship.rb vendor/plugins/private_messaging/spec/fixtures/private_messages.yml vendor/plugins/private_messaging/spec/fixtures/profiles.yml vendor/plugins/private_messaging/spec/fixtures/users.yml vendor/plugins/tentacled_beast/app/models/profile/states.rb vendor/plugins/wiki/app/controllers/application.rb 646b4a64fde35c26234380cb5432f58e504d45e5 Jeremy McAnally jeremymcanally@mobile-166-214-092-100.mycingular.net http://github.com/courtenay/tentacle/commit/b2ca1bf0fb36dda6ee39ddffac6c07d368ab781f b2ca1bf0fb36dda6ee39ddffac6c07d368ab781f 2008-05-06T12:35:12-07:00 2008-05-06T12:35:12-07:00 Cleaning out a lot of cruft from enginizing things and stuff left over from Warehouse. 88f262a519550ec19fed10ef57e00805193d4b84 Jeremy McAnally jeremymcanally@mobile-166-214-092-100.mycingular.net