@@ -1,16 +1,11 @@ class Admin::PreferencesController < AdminController - def index - @preferences = Preference.all - end - def edit - @preference = Preference.find_by_name(params[:id]) + @preferences = Preference.all end def update - @preference = Preference.find_by_name(params[:id]) - @preference.update_attribute('value', params[:value]) - flash[:success] = "You have succesfully updated the preference" - redirect_to edit_admin_preference_path(params[:id]) + @preferences = Preference.update_many(params[:preferences]) + flash[:success] = "Preferences have been updated" + redirect_to edit_admin_preferences_path end end app/controllers/admin/preferences_controller.rb @@ -35,8 +35,8 @@ class Preference < ActiveRecord::Base ") end - def self.update_multiple(preference_hash) - preference_hash.each do |key, value| + def self.update_many(preference_hash) + preference_hash.collect do |key, value| logger.info "Setting preference: #{key.to_s}, #{value}" Preference.set(key.to_s, value) end app/models/preference.rb @@ -18,7 +18,7 @@ - if logged_in? %ul#navigation %li= link_to "Posts", admin_posts_path - %li= link_to "Preferences", admin_preferences_path + %li= link_to "Preferences", edit_admin_preferences_path %li= link_to "Logout", logout_url %ul#subnavigation= yield :subnavigation #page app/views/layouts/admin.html.haml @@ -4,7 +4,7 @@ ActionController::Routing::Routes.draw do |map| # Resources map.namespace :admin do |admin| admin.resources :posts - admin.resources :preferences + admin.resource :preferences end map.resources :posts config/routes.rb @@ -5,7 +5,7 @@ describe Admin::PreferencesController do # TODO: Make this part of a global admin_spec and use It Should Behave Like it "requires logging admin privallages" do - get :index + get :edit response.should redirect_to(login_path) end @@ -16,24 +16,18 @@ describe Admin::PreferencesController do describe "list action" do it "should get a collection of preferences" do - get :index + get :edit assigns(:preferences).should_not be_empty end end describe "edit action" do - it "should get a preference" do - get :edit, :id => "name" - assigns(:preference).should_not be_nil - response.should be_success - end - - it "should update the preference" do - put :update, :id => "name", :value => "simple" - assigns(:preference).should_not be_nil + it "should succesfully complete the action" do + Preference.should_receive(:update_many).once.and_return(true) + put :update, :preferences => { :name => "simple", :theme => "fuschia" } + assigns(:preferences).should_not be_nil response.should be_redirect end end end - end spec/controllers/admin/preferences_controller_spec.rb @@ -24,15 +24,15 @@ describe Preference do end end - describe ".update_multiple" do - it "should update multiple rows of preferences" do + describe ".update_many" do + it "should update many rows of preferences" do preferences = { :name => 'testing', :theme => 'testing', :url => 'http://local.testing' } lambda do - Preference.update_multiple(preferences) + Preference.update_many(preferences) end.should change { Preference.get("theme", true) } end end spec/models/preference_spec.rb ba8d66e075339d9db0489ec3e3946c936a9b5223 Zach Inglis zach@lt3media.com http://github.com/zachinglis/mouth/commit/cba812f95c2a262c88e563e1ee229d3af62e3491 cba812f95c2a262c88e563e1ee229d3af62e3491 2008-08-09T10:36:02-07:00 2008-08-09T10:36:02-07:00 Preferences controller actions completed 2ee2d720f34a25f619c89987d88a49827644324f Zach Inglis zach@lt3media.com