diff --git a/rails/map-mash/README b/rails/map-mash/README deleted file mode 100644 index 37ec8ea..0000000 --- a/rails/map-mash/README +++ /dev/null @@ -1,243 +0,0 @@ -== Welcome to Rails - -Rails is a web-application framework that includes everything needed to create -database-backed web applications according to the Model-View-Control pattern. - -This pattern splits the view (also called the presentation) into "dumb" templates -that are primarily responsible for inserting pre-built data in between HTML tags. -The model contains the "smart" domain objects (such as Account, Product, Person, -Post) that holds all the business logic and knows how to persist themselves to -a database. The controller handles the incoming requests (such as Save New Account, -Update Product, Show Post) by manipulating the model and directing data to the view. - -In Rails, the model is handled by what's called an object-relational mapping -layer entitled Active Record. This layer allows you to present the data from -database rows as objects and embellish these data objects with business logic -methods. You can read more about Active Record in -link:files/vendor/rails/activerecord/README.html. - -The controller and view are handled by the Action Pack, which handles both -layers by its two parts: Action View and Action Controller. These two layers -are bundled in a single package due to their heavy interdependence. This is -unlike the relationship between the Active Record and Action Pack that is much -more separate. Each of these packages can be used independently outside of -Rails. You can read more about Action Pack in -link:files/vendor/rails/actionpack/README.html. - - -== Getting Started - -1. At the command prompt, start a new Rails application using the rails command - and your application name. Ex: rails myapp -2. Change directory into myapp and start the web server: script/server (run with --help for options) -3. Go to http://localhost:3000/ and get "Welcome aboard: You're riding the Rails!" -4. Follow the guidelines to start developing your application - - -== Web Servers - -By default, Rails will try to use Mongrel if it's are installed when started with script/server, otherwise Rails will use WEBrick, the webserver that ships with Ruby. But you can also use Rails -with a variety of other web servers. - -Mongrel is a Ruby-based webserver with a C component (which requires compilation) that is -suitable for development and deployment of Rails applications. If you have Ruby Gems installed, -getting up and running with mongrel is as easy as: gem install mongrel. -More info at: http://mongrel.rubyforge.org - -Say other Ruby web servers like Thin and Ebb or regular web servers like Apache or LiteSpeed or -Lighttpd or IIS. The Ruby web servers are run through Rack and the latter can either be setup to use -FCGI or proxy to a pack of Mongrels/Thin/Ebb servers. - -== Apache .htaccess example for FCGI/CGI - -# General Apache options -AddHandler fastcgi-script .fcgi -AddHandler cgi-script .cgi -Options +FollowSymLinks +ExecCGI - -# If you don't want Rails to look in certain directories, -# use the following rewrite rules so that Apache won't rewrite certain requests -# -# Example: -# RewriteCond %{REQUEST_URI} ^/notrails.* -# RewriteRule .* - [L] - -# Redirect all requests not available on the filesystem to Rails -# By default the cgi dispatcher is used which is very slow -# -# For better performance replace the dispatcher with the fastcgi one -# -# Example: -# RewriteRule ^(.*)$ dispatch.fcgi [QSA,L] -RewriteEngine On - -# If your Rails application is accessed via an Alias directive, -# then you MUST also set the RewriteBase in this htaccess file. -# -# Example: -# Alias /myrailsapp /path/to/myrailsapp/public -# RewriteBase /myrailsapp - -RewriteRule ^$ index.html [QSA] -RewriteRule ^([^.]+)$ $1.html [QSA] -RewriteCond %{REQUEST_FILENAME} !-f -RewriteRule ^(.*)$ dispatch.cgi [QSA,L] - -# In case Rails experiences terminal errors -# Instead of displaying this message you can supply a file here which will be rendered instead -# -# Example: -# ErrorDocument 500 /500.html - -ErrorDocument 500 "
<%= flash[:notice] %>
+ +<%= yield %> + + + diff --git a/rails/map-mash/app/views/mash_tournaments/edit.html.erb b/rails/map-mash/app/views/mash_tournaments/edit.html.erb new file mode 100644 index 0000000..3dda81d --- /dev/null +++ b/rails/map-mash/app/views/mash_tournaments/edit.html.erb @@ -0,0 +1,12 @@ ++ <%= f.submit 'Update' %> +
+<% end %> + +<%= link_to 'Show', @mash_tournament %> | +<%= link_to 'Back', mash_tournaments_path %> \ No newline at end of file diff --git a/rails/map-mash/app/views/mash_tournaments/index.html.erb b/rails/map-mash/app/views/mash_tournaments/index.html.erb new file mode 100644 index 0000000..ee7e8d8 --- /dev/null +++ b/rails/map-mash/app/views/mash_tournaments/index.html.erb @@ -0,0 +1,18 @@ +<%= link_to 'Show', mash_tournament %> | +<%= link_to 'Edit', edit_mash_tournament_path(mash_tournament) %> | +<%= link_to 'Destroy', mash_tournament, :confirm => 'Are you sure?', :method => :delete %> | +
+ <%= f.submit 'Create' %> +
+<% end %> + +<%= link_to 'Back', mash_tournaments_path %> \ No newline at end of file diff --git a/rails/map-mash/app/views/mash_tournaments/show.html.erb b/rails/map-mash/app/views/mash_tournaments/show.html.erb new file mode 100644 index 0000000..17bc405 --- /dev/null +++ b/rails/map-mash/app/views/mash_tournaments/show.html.erb @@ -0,0 +1,3 @@ + +<%= link_to 'Edit', edit_mash_tournament_path(@mash_tournament) %> | +<%= link_to 'Back', mash_tournaments_path %> \ No newline at end of file diff --git a/rails/map-mash/db/migrate/20120309130609_create_mash_tournaments.rb b/rails/map-mash/db/migrate/20120309130609_create_mash_tournaments.rb index dcadc75..af09942 100644 --- a/rails/map-mash/db/migrate/20120309130609_create_mash_tournaments.rb +++ b/rails/map-mash/db/migrate/20120309130609_create_mash_tournaments.rb @@ -1,13 +1,16 @@ class CreateMashTournaments < ActiveRecord::Migration def self.up create_table :mash_tournaments do |t| - t.integer :requester_id + t.references :requester, :null => false t.timestamps end + + add_index :mash_tournaments, [:requester_id] end def self.down drop_table :mash_tournaments + remove_index :mash_tournaments, [:requester_id] end end diff --git a/rails/map-mash/db/schema.rb b/rails/map-mash/db/schema.rb index dec9469..052004c 100644 --- a/rails/map-mash/db/schema.rb +++ b/rails/map-mash/db/schema.rb @@ -22,11 +22,13 @@ ActiveRecord::Schema.define(:version => 20120309130609) do add_index "maps", ["points"], :name => "index_maps_on_points" create_table "mash_tournaments", :force => true do |t| - t.integer "requester_id" + t.integer "requester_id", :null => false t.datetime "created_at" t.datetime "updated_at" end + add_index "mash_tournaments", ["requester_id"], :name => "index_mash_tournaments_on_requester_id" + create_table "mashes", :force => true do |t| t.integer "requester_id", :null => false t.integer "map_a_id", :null => false diff --git a/rails/map-mash/spec/controllers/mash_tournaments_controller_spec.rb b/rails/map-mash/spec/controllers/mash_tournaments_controller_spec.rb new file mode 100644 index 0000000..184b5f5 --- /dev/null +++ b/rails/map-mash/spec/controllers/mash_tournaments_controller_spec.rb @@ -0,0 +1,131 @@ +require 'spec_helper' + +describe MashTournamentsController do + + def mock_mash_tournament(stubs={}) + @mock_mash_tournament ||= mock_model(MashTournament, stubs) + end + + describe "GET index" do + it "assigns all mash_tournaments as @mash_tournaments" do + MashTournament.stub(:find).with(:all).and_return([mock_mash_tournament]) + get :index + assigns[:mash_tournaments].should == [mock_mash_tournament] + end + end + + describe "GET show" do + it "assigns the requested mash_tournament as @mash_tournament" do + MashTournament.stub(:find).with("37").and_return(mock_mash_tournament) + get :show, :id => "37" + assigns[:mash_tournament].should equal(mock_mash_tournament) + end + end + + describe "GET new" do + it "assigns a new mash_tournament as @mash_tournament" do + MashTournament.stub(:new).and_return(mock_mash_tournament) + get :new + assigns[:mash_tournament].should equal(mock_mash_tournament) + end + end + + describe "GET edit" do + it "assigns the requested mash_tournament as @mash_tournament" do + MashTournament.stub(:find).with("37").and_return(mock_mash_tournament) + get :edit, :id => "37" + assigns[:mash_tournament].should equal(mock_mash_tournament) + end + end + + describe "POST create" do + + describe "with valid params" do + it "assigns a newly created mash_tournament as @mash_tournament" do + MashTournament.stub(:new).with({'these' => 'params'}).and_return(mock_mash_tournament(:save => true)) + post :create, :mash_tournament => {:these => 'params'} + assigns[:mash_tournament].should equal(mock_mash_tournament) + end + + it "redirects to the created mash_tournament" do + MashTournament.stub(:new).and_return(mock_mash_tournament(:save => true)) + post :create, :mash_tournament => {} + response.should redirect_to(mash_tournament_url(mock_mash_tournament)) + end + end + + describe "with invalid params" do + it "assigns a newly created but unsaved mash_tournament as @mash_tournament" do + MashTournament.stub(:new).with({'these' => 'params'}).and_return(mock_mash_tournament(:save => false)) + post :create, :mash_tournament => {:these => 'params'} + assigns[:mash_tournament].should equal(mock_mash_tournament) + end + + it "re-renders the 'new' template" do + MashTournament.stub(:new).and_return(mock_mash_tournament(:save => false)) + post :create, :mash_tournament => {} + response.should render_template('new') + end + end + + end + + describe "PUT update" do + + describe "with valid params" do + it "updates the requested mash_tournament" do + MashTournament.should_receive(:find).with("37").and_return(mock_mash_tournament) + mock_mash_tournament.should_receive(:update_attributes).with({'these' => 'params'}) + put :update, :id => "37", :mash_tournament => {:these => 'params'} + end + + it "assigns the requested mash_tournament as @mash_tournament" do + MashTournament.stub(:find).and_return(mock_mash_tournament(:update_attributes => true)) + put :update, :id => "1" + assigns[:mash_tournament].should equal(mock_mash_tournament) + end + + it "redirects to the mash_tournament" do + MashTournament.stub(:find).and_return(mock_mash_tournament(:update_attributes => true)) + put :update, :id => "1" + response.should redirect_to(mash_tournament_url(mock_mash_tournament)) + end + end + + describe "with invalid params" do + it "updates the requested mash_tournament" do + MashTournament.should_receive(:find).with("37").and_return(mock_mash_tournament) + mock_mash_tournament.should_receive(:update_attributes).with({'these' => 'params'}) + put :update, :id => "37", :mash_tournament => {:these => 'params'} + end + + it "assigns the mash_tournament as @mash_tournament" do + MashTournament.stub(:find).and_return(mock_mash_tournament(:update_attributes => false)) + put :update, :id => "1" + assigns[:mash_tournament].should equal(mock_mash_tournament) + end + + it "re-renders the 'edit' template" do + MashTournament.stub(:find).and_return(mock_mash_tournament(:update_attributes => false)) + put :update, :id => "1" + response.should render_template('edit') + end + end + + end + + describe "DELETE destroy" do + it "destroys the requested mash_tournament" do + MashTournament.should_receive(:find).with("37").and_return(mock_mash_tournament) + mock_mash_tournament.should_receive(:destroy) + delete :destroy, :id => "37" + end + + it "redirects to the mash_tournaments list" do + MashTournament.stub(:find).and_return(mock_mash_tournament(:destroy => true)) + delete :destroy, :id => "1" + response.should redirect_to(mash_tournaments_url) + end + end + +end diff --git a/rails/map-mash/spec/helpers/mash_tournaments_helper_spec.rb b/rails/map-mash/spec/helpers/mash_tournaments_helper_spec.rb new file mode 100644 index 0000000..d666249 --- /dev/null +++ b/rails/map-mash/spec/helpers/mash_tournaments_helper_spec.rb @@ -0,0 +1,11 @@ +require 'spec_helper' + +describe MashTournamentsHelper do + + #Delete this example and add some real ones or delete this file + it "is included in the helper object" do + included_modules = (class << helper; self; end).send :included_modules + included_modules.should include(MashTournamentsHelper) + end + +end diff --git a/rails/map-mash/spec/integration/mash_tournaments_spec.rb b/rails/map-mash/spec/integration/mash_tournaments_spec.rb new file mode 100644 index 0000000..94a383a --- /dev/null +++ b/rails/map-mash/spec/integration/mash_tournaments_spec.rb @@ -0,0 +1,4 @@ +require 'spec_helper' + +describe "MashTournaments" do +end diff --git a/rails/map-mash/spec/routing/mash_tournaments_routing_spec.rb b/rails/map-mash/spec/routing/mash_tournaments_routing_spec.rb new file mode 100644 index 0000000..91c241f --- /dev/null +++ b/rails/map-mash/spec/routing/mash_tournaments_routing_spec.rb @@ -0,0 +1,33 @@ +require 'spec_helper' + +describe MashTournamentsController do + describe "routing" do + it "recognizes and generates #index" do + { :get => "/mash_tournaments" }.should route_to(:controller => "mash_tournaments", :action => "index") + end + + it "recognizes and generates #new" do + { :get => "/mash_tournaments/new" }.should route_to(:controller => "mash_tournaments", :action => "new") + end + + it "recognizes and generates #show" do + { :get => "/mash_tournaments/1" }.should route_to(:controller => "mash_tournaments", :action => "show", :id => "1") + end + + it "recognizes and generates #edit" do + { :get => "/mash_tournaments/1/edit" }.should route_to(:controller => "mash_tournaments", :action => "edit", :id => "1") + end + + it "recognizes and generates #create" do + { :post => "/mash_tournaments" }.should route_to(:controller => "mash_tournaments", :action => "create") + end + + it "recognizes and generates #update" do + { :put => "/mash_tournaments/1" }.should route_to(:controller => "mash_tournaments", :action => "update", :id => "1") + end + + it "recognizes and generates #destroy" do + { :delete => "/mash_tournaments/1" }.should route_to(:controller => "mash_tournaments", :action => "destroy", :id => "1") + end + end +end diff --git a/rails/map-mash/spec/views/mash_tournaments/edit.html.erb_spec.rb b/rails/map-mash/spec/views/mash_tournaments/edit.html.erb_spec.rb new file mode 100644 index 0000000..8af75cc --- /dev/null +++ b/rails/map-mash/spec/views/mash_tournaments/edit.html.erb_spec.rb @@ -0,0 +1,18 @@ +require 'spec_helper' + +describe "/mash_tournaments/edit.html.erb" do + include MashTournamentsHelper + + before(:each) do + assigns[:mash_tournament] = @mash_tournament = stub_model(MashTournament, + :new_record? => false + ) + end + + it "renders the edit mash_tournament form" do + render + + response.should have_tag("form[action=#{mash_tournament_path(@mash_tournament)}][method=post]") do + end + end +end diff --git a/rails/map-mash/spec/views/mash_tournaments/index.html.erb_spec.rb b/rails/map-mash/spec/views/mash_tournaments/index.html.erb_spec.rb new file mode 100644 index 0000000..074b1bd --- /dev/null +++ b/rails/map-mash/spec/views/mash_tournaments/index.html.erb_spec.rb @@ -0,0 +1,16 @@ +require 'spec_helper' + +describe "/mash_tournaments/index.html.erb" do + include MashTournamentsHelper + + before(:each) do + assigns[:mash_tournaments] = [ + stub_model(MashTournament), + stub_model(MashTournament) + ] + end + + it "renders a list of mash_tournaments" do + render + end +end diff --git a/rails/map-mash/spec/views/mash_tournaments/new.html.erb_spec.rb b/rails/map-mash/spec/views/mash_tournaments/new.html.erb_spec.rb new file mode 100644 index 0000000..3bf3cae --- /dev/null +++ b/rails/map-mash/spec/views/mash_tournaments/new.html.erb_spec.rb @@ -0,0 +1,18 @@ +require 'spec_helper' + +describe "/mash_tournaments/new.html.erb" do + include MashTournamentsHelper + + before(:each) do + assigns[:mash_tournament] = stub_model(MashTournament, + :new_record? => true + ) + end + + it "renders new mash_tournament form" do + render + + response.should have_tag("form[action=?][method=post]", mash_tournaments_path) do + end + end +end diff --git a/rails/map-mash/spec/views/mash_tournaments/show.html.erb_spec.rb b/rails/map-mash/spec/views/mash_tournaments/show.html.erb_spec.rb new file mode 100644 index 0000000..055a930 --- /dev/null +++ b/rails/map-mash/spec/views/mash_tournaments/show.html.erb_spec.rb @@ -0,0 +1,12 @@ +require 'spec_helper' + +describe "/mash_tournaments/show.html.erb" do + include MashTournamentsHelper + before(:each) do + assigns[:mash_tournament] = @mash_tournament = stub_model(MashTournament) + end + + it "renders attributes in" do + render + end +end