+ <%= yield %>
+
+ Madrid
+elenaypunto@gmail.com
+Estudiante de ingeniería de Telecomunicaciones
+ + +Madrid
+carlosgonza88@gmail.com
+Estudiante de ingeniería de Telecomunicaciones
diff --git a/app/views/sites/index.html.erb b/app/views/sites/index.html.erb index f1034b8..89f091a 100644 --- a/app/views/sites/index.html.erb +++ b/app/views/sites/index.html.erb @@ -6,7 +6,9 @@| Order | +Selected site | ++ | + | + |
|---|---|---|---|---|
| + <%= trip.trip_id %> + | ++ <%= t = Site.find_by_id(trip.site_id).name %> + | +
+ <%= link_to 'Show', site_path(trip.site_id) %> + <%= link_to 'Edit', edit_trip_path(trip) %> + <%= link_to 'Destroy', trip, confirm: 'Are you sure?', method: :delete %> + |
<%= notice %>
+ ++ Trip name: + <%= @trip.site_id %> +
+ ++ Trip: + <%= @trip.id %> +
+ + +<%= link_to 'Edit', edit_trip_path(@trip) %> | +<%= link_to 'Back', trips_path %> diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 697d0c8..b43a624 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,6 +1,6 @@ # Be sure to restart your server when you modify this file. -Planet::Application.config.session_store :cookie_store, key: '_planet_session' +Planet::Application.config.session_store :cookie_store, :key=> '_planet_session' # Use the database for sessions instead of the cookie-based default, # which shouldn't be used to store highly confidential information diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb index 999df20..8b5b128 100644 --- a/config/initializers/wrap_parameters.rb +++ b/config/initializers/wrap_parameters.rb @@ -5,7 +5,7 @@ # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. ActiveSupport.on_load(:action_controller) do - wrap_parameters format: [:json] + wrap_parameters format=[:json] end # Disable root element in JSON by default. diff --git a/config/routes.rb b/config/routes.rb index 4572a56..e621836 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,9 @@ Planet::Application.routes.draw do + resources :trips + + get "planet/author" + resources :sites resources :types diff --git a/config/wrap_parameters.rb b/config/wrap_parameters.rb new file mode 100644 index 0000000..b871673 --- /dev/null +++ b/config/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. +# +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format= [:json] +end + +# Disable root element in JSON by default. +ActiveSupport.on_load(:active_record) do + self.include_root_in_json = false +end diff --git a/db/migrate/20111216152020_create_trips.rb b/db/migrate/20111216152020_create_trips.rb new file mode 100644 index 0000000..2a77ffd --- /dev/null +++ b/db/migrate/20111216152020_create_trips.rb @@ -0,0 +1,12 @@ +class CreateTrips < ActiveRecord::Migration + def change + create_table :trips do |t| + + t.integer :trip_id + t.integer :site_id + + t.timestamps + end + + end +end diff --git a/db/schema.rb b/db/schema.rb index 3717026..f283a91 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # This file is auto-generated from the current state of the database. Instead # of editing this file, please use the migrations feature of Active Record to # incrementally modify your database, and then regenerate this schema definition. @@ -11,7 +10,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20111127165324) do +ActiveRecord::Schema.define(:version => 20111216152020) do create_table "sites", :force => true do |t| t.string "name" @@ -25,6 +24,13 @@ t.datetime "updated_at" end + create_table "trips", :force => true do |t| + t.integer "trip_id" + t.integer "site_id" + t.datetime "created_at" + t.datetime "updated_at" + end + create_table "types", :force => true do |t| t.string "name" t.text "description" diff --git a/test/fixtures/trips.yml b/test/fixtures/trips.yml new file mode 100644 index 0000000..8feb428 --- /dev/null +++ b/test/fixtures/trips.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html + +one: + trip_name: MyString + trip_id: 1 + +two: + trip_name: MyString + trip_id: 1 diff --git a/test/functional/planet_controller_test.rb b/test/functional/planet_controller_test.rb index 88229e0..c614714 100644 --- a/test/functional/planet_controller_test.rb +++ b/test/functional/planet_controller_test.rb @@ -1,13 +1,8 @@ require 'test_helper' class PlanetControllerTest < ActionController::TestCase - test "should get index" do - get :index - assert_response :success - end - - test "should get contact" do - get :contact + test "should get author" do + get :author assert_response :success end diff --git a/test/functional/trips_controller_test.rb b/test/functional/trips_controller_test.rb new file mode 100644 index 0000000..d7b24ba --- /dev/null +++ b/test/functional/trips_controller_test.rb @@ -0,0 +1,49 @@ +require 'test_helper' + +class TripsControllerTest < ActionController::TestCase + setup do + @trip = trips(:one) + end + + test "should get index" do + get :index + assert_response :success + assert_not_nil assigns(:trips) + end + + test "should get new" do + get :new + assert_response :success + end + + test "should create trip" do + assert_difference('Trip.count') do + post :create, trip: @trip.attributes + end + + assert_redirected_to trip_path(assigns(:trip)) + end + + test "should show trip" do + get :show, id: @trip.to_param + assert_response :success + end + + test "should get edit" do + get :edit, id: @trip.to_param + assert_response :success + end + + test "should update trip" do + put :update, id: @trip.to_param, trip: @trip.attributes + assert_redirected_to trip_path(assigns(:trip)) + end + + test "should destroy trip" do + assert_difference('Trip.count', -1) do + delete :destroy, id: @trip.to_param + end + + assert_redirected_to trips_path + end +end diff --git a/test/unit/helpers/trips_helper_test.rb b/test/unit/helpers/trips_helper_test.rb new file mode 100644 index 0000000..dcfddff --- /dev/null +++ b/test/unit/helpers/trips_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class TripsHelperTest < ActionView::TestCase +end diff --git a/test/unit/trip_test.rb b/test/unit/trip_test.rb new file mode 100644 index 0000000..1ed8ca6 --- /dev/null +++ b/test/unit/trip_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class TripTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end