railties/guides/files/javascripts/code_highlighter.js railties/guides/files/javascripts/guides.js railties/guides/files/javascripts/highlighters.js railties/guides/files/stylesheets/main.css railties/guides/files/stylesheets/print.css railties/guides/files/stylesheets/reset.css railties/guides/files/stylesheets/style.css railties/guides/files/stylesheets/syntax.css railties/guides/images/belongs_to.png railties/guides/images/book_icon.gif railties/guides/images/bullet.gif railties/guides/images/chapters_icon.gif railties/guides/images/check_bullet.gif railties/guides/images/credits_pic_blank.gif railties/guides/images/csrf.png railties/guides/images/customized_error_messages.png railties/guides/images/error_messages.png railties/guides/images/feature_tile.gif railties/guides/images/footer_tile.gif railties/guides/images/grey_bullet.gif railties/guides/images/habtm.png railties/guides/images/has_many.png railties/guides/images/has_many_through.png railties/guides/images/has_one.png railties/guides/images/has_one_through.png railties/guides/images/header_backdrop.png railties/guides/images/header_tile.gif railties/guides/images/i18n/demo_localized_pirate.png railties/guides/images/i18n/demo_translated_en.png railties/guides/images/i18n/demo_translated_pirate.png railties/guides/images/i18n/demo_translation_missing.png railties/guides/images/i18n/demo_untranslated.png railties/guides/images/icons/README railties/guides/images/icons/callouts/1.png railties/guides/images/icons/callouts/10.png railties/guides/images/icons/callouts/11.png railties/guides/images/icons/callouts/12.png railties/guides/images/icons/callouts/13.png railties/guides/images/icons/callouts/14.png railties/guides/images/icons/callouts/15.png railties/guides/images/icons/callouts/2.png railties/guides/images/icons/callouts/3.png railties/guides/images/icons/callouts/4.png railties/guides/images/icons/callouts/5.png railties/guides/images/icons/callouts/6.png railties/guides/images/icons/callouts/7.png railties/guides/images/icons/callouts/8.png railties/guides/images/icons/callouts/9.png railties/guides/images/icons/caution.png railties/guides/images/icons/example.png railties/guides/images/icons/home.png railties/guides/images/icons/important.png railties/guides/images/icons/next.png railties/guides/images/icons/note.png railties/guides/images/icons/prev.png railties/guides/images/icons/tip.png railties/guides/images/icons/up.png railties/guides/images/icons/warning.png railties/guides/images/nav_arrow.gif railties/guides/images/polymorphic.png railties/guides/images/posts_index.png railties/guides/images/rails_logo_remix.gif railties/guides/images/rails_welcome.png railties/guides/images/ruby_guides_logo.gif railties/guides/images/ruby_on_rails_by_mike_rundle2.gif railties/guides/images/session_fixation.png railties/guides/images/tab_grey.gif railties/guides/images/tab_info.gif railties/guides/images/tab_note.gif railties/guides/images/tab_red.gif railties/guides/images/tab_yellow.gif railties/guides/images/tab_yellow.png railties/guides/images/validation_error_messages.png railties/guides/rails_guides.rb railties/guides/rails_guides/generator.rb railties/guides/rails_guides/helpers.rb railties/guides/rails_guides/indexer.rb railties/guides/rails_guides/textile_extensions.rb railties/guides/source/2_2_release_notes.textile railties/guides/source/2_3_release_notes.textile railties/guides/source/action_controller_overview.textile railties/guides/source/action_mailer_basics.textile railties/guides/source/active_record_basics.textile railties/guides/source/active_record_querying.textile railties/guides/source/activerecord_validations_callbacks.textile railties/guides/source/association_basics.textile railties/guides/source/caching_with_rails.textile railties/guides/source/command_line.textile railties/guides/source/configuring.textile railties/guides/source/credits.erb.textile railties/guides/source/debugging_rails_applications.textile railties/guides/source/form_helpers.textile railties/guides/source/getting_started.textile railties/guides/source/i18n.textile railties/guides/source/index.erb.textile railties/guides/source/layout.html.erb railties/guides/source/layouts_and_rendering.textile railties/guides/source/migrations.textile railties/guides/source/performance_testing.textile railties/guides/source/plugins.textile railties/guides/source/rails_on_rack.textile railties/guides/source/routing.textile railties/guides/source/security.textile railties/guides/source/testing.textile @@ -14,6 +14,7 @@ railties/pkg railties/test/500.html railties/doc/guides/html/images railties/doc/guides/html/stylesheets +railties/guides/output *.rbc *.swp *.swo .gitignore @@ -1090,6 +1090,22 @@ module ActiveRecord # but it in fact generates a join table name of "paper_boxes_papers". Be aware of this caveat, and use the # custom <tt>:join_table</tt> option if you need to. # + # The join table should not have a primary key or a model associated with it. You must manually generate the + # join table with a migration such as this: + # + # class CreateDevelopersProjectsJoinTable < ActiveRecord::Migration + # def self.up + # create_table :developers_projects, :id => false do |t| + # t.integer :developer_id + # t.integer :project_id + # end + # end + # + # def self.down + # drop_table :developers_projects + # end + # end + # # Deprecated: Any additional fields added to the join table will be placed as attributes when pulling records out through # +has_and_belongs_to_many+ associations. Records returned from join tables with additional attributes will be marked as # readonly (because we can't save changes to the additional attributes). It's strongly recommended that you upgrade any activerecord/lib/active_record/associations.rb @@ -244,6 +244,11 @@ def copy_with_rewritten_ruby_path(src_file, dest_file) end end +desc 'Generate guides (for authors), use ONLY=foo to process just "foo.textile"' +task :guides do + ruby "guides/rails_guides.rb" +end + # Generate documentation ------------------------------------------------------------------ railties/Rakefile @@ -54,15 +54,8 @@ namespace :doc do desc "Generate Rails guides" task :guides do - source = File.join(RAILTIES_PATH, "doc/guides") - destination = File.join(RAILS_ROOT, "doc/guides") - FileUtils.rm_r(destination) if File.directory?(destination) - FileUtils.mkdir(destination) - - FileUtils.cp_r File.join(source, 'html/.'), File.join(destination) - # Copy images and css files to html directory. These dirs are in .gitigore and shouldn't be source controlled. - FileUtils.cp_r File.join(source, 'source/images'), File.join(destination) - FileUtils.cp_r File.join(source, 'source/stylesheets'), File.join(destination, 'stylesheets') + require File.join(RAILTIES_PATH, "guides/rails_guides") + RailsGuides::Generator.new(File.join(RAILS_ROOT, "doc/guides")).generate end namespace :plugins do railties/lib/tasks/documentation.rake bccd2c54b2c7708f881faf9c9464dcf29bd30bef Pratik Naik pratiknaik@gmail.com http://github.com/methodmissing/rails/commit/96d610553e5fdaabc923835ab1f194070ddb4477 96d610553e5fdaabc923835ab1f194070ddb4477 2009-02-05T18:01:22-08:00 2009-02-05T17:57:02-08:00 Merge docrails along with the new guides and guides generation code 5154390d4f47971d522619db9f3826abb771b42f Pratik Naik pratiknaik@gmail.com