config/countries.yml @@ -43,8 +43,8 @@ class Admin::ProductsController < ApplicationController respond_to do |format| if @product.save flash[:notice] = 'Product was successfully created.' - format.html { redirect_to product_url(@product) } - format.xml { head :created, :location => product_url(@product) } + format.html { redirect_to admin_product_url(@product) } + format.xml { head :created, :location => admin_product_url(@product) } else format.html { render :action => "new" } format.xml { render :xml => @product.errors.to_xml } @@ -60,7 +60,7 @@ class Admin::ProductsController < ApplicationController respond_to do |format| if @product.update_attributes(params[:product]) flash[:notice] = 'Product was successfully updated.' - format.html { redirect_to product_url(@product) } + format.html { redirect_to admin_product_url(@product) } format.xml { head :ok } else format.html { render :action => "edit" } @@ -76,7 +76,7 @@ class Admin::ProductsController < ApplicationController @product.destroy respond_to do |format| - format.html { redirect_to products_url } + format.html { redirect_to admin_products_url } format.xml { head :ok } end end app/controllers/admin/products_controller.rb @@ -1,3 +1,15 @@ # Methods added to this helper will be available to all templates in the application. +def load_country_names() + app_root = File.dirname(__FILE__) + '/../..' + config_dir = app_root + '/config/' + ymlpath = File.expand_path(config_dir + 'countries.yml') + $COUNTRY_NAMES = YAML.load(File.open(ymlpath)) +end + +load_country_names() + module ApplicationHelper + def country_name(country_code) + return $COUNTRY_NAMES[country_code] + end end app/helpers/application_helper.rb @@ -1,54 +1,3 @@ -COUNTRY_MAPPING = { - "US" => "United States", "AL" => "Albania", "DZ" => "Algeria", "AD" => "Andorra", "AO" => "Angola", - "AI" => "Anguilla", "AG" => "Antigua and Barbuda", "AR" => "Argentina", "AM" => "Armenia", - "AW" => "Aruba", "AU" => "Australia", "AT" => "Austria", "AZ" => "Azerbaijan Republic", - "BS" => "Bahamas", "BH" => "Bahrain", "BB" => "Barbados", "BE" => "Belgium", "BZ" => "Belize", - "BJ" => "Benin", "BM" => "Bermuda", "BT" => "Bhutan", "BO" => "Bolivia", - "BA" => "Bosnia and Herzegovina", "BW" => "Botswana", "BR" => "Brazil", - "VG" => "British Virgin Islands", "BN" => "Brunei", "BG" => "Bulgaria", "BF" => "Burkina Faso", - "BI" => "Burundi", "KH" => "Cambodia", "CA" => "Canada", "CV" => "Cape Verde", - "KY" => "Cayman Islands", "TD" => "Chad", "CL" => "Chile", "C2" => "China", "CO" => "Colombia", - "KM" => "Comoros", "CK" => "Cook Islands", "CR" => "Costa Rica", "HR" => "Croatia", - "CY" => "Cyprus", "CZ" => "Czech Republic", "CD" => "Democratic Republic of the Congo", - "DK" => "Denmark", "DJ" => "Djibouti", "DM" => "Dominica", "DO" => "Dominican Republic", - "EC" => "Ecuador", "SV" => "El Salvador", "ER" => "Eritrea", "EE" => "Estonia", "ET" => "Ethiopia", - "FK" => "Falkland Islands", "FO" => "Faroe Islands", "FM" => "Federated States of Micronesia", - "FJ" => "Fiji", "FI" => "Finland", "FR" => "France", "GF" => "French Guiana", - "PF" => "French Polynesia", "GA" => "Gabon Republic", "GM" => "Gambia", "DE" => "Germany", - "GI" => "Gibraltar", "GR" => "Greece", "GL" => "Greenland", "GD" => "Grenada", - "GP" => "Guadeloupe", "GT" => "Guatemala", "GN" => "Guinea", "GW" => "Guinea Bissau", - "GY" => "Guyana", "HN" => "Honduras", "HK" => "Hong Kong", "HU" => "Hungary", "IS" => "Iceland", - "IN" => "India", "ID" => "Indonesia", "IE" => "Ireland", "IL" => "Israel", "IT" => "Italy", - "JM" => "Jamaica", "JP" => "Japan", "JO" => "Jordan", "KZ" => "Kazakhstan", "KE" => "Kenya", - "KI" => "Kiribati", "KW" => "Kuwait", "KG" => "Kyrgyzstan", "LA" => "Laos", "LV" => "Latvia", - "LS" => "Lesotho", "LI" => "Liechtenstein", "LT" => "Lithuania", "LU" => "Luxembourg", - "MG" => "Madagascar", "MW" => "Malawi", "MY" => "Malaysia", "MV" => "Maldives", "ML" => "Mali", - "MT" => "Malta", "MH" => "Marshall Islands", "MQ" => "Martinique", "MR" => "Mauritania", - "MU" => "Mauritius", "YT" => "Mayotte", "MX" => "Mexico", "MN" => "Mongolia", "MS" => "Montserrat", - "MA" => "Morocco", "MZ" => "Mozambique", "NA" => "Namibia", "NR" => "Nauru", "NP" => "Nepal", - "NL" => "Netherlands", "AN" => "Netherlands Antilles", "NC" => "New Caledonia", - "NZ" => "New Zealand", "NI" => "Nicaragua", "NE" => "Niger", "NU" => "Niue", - "NF" => "Norfolk Island", "NO" => "Norway", "OM" => "Oman", "PW" => "Palau", "PA" => "Panama", - "PG" => "Papua New Guinea", "PE" => "Peru", "PH" => "Philippines", "PN" => "Pitcairn Islands", - "PL" => "Poland", "PT" => "Portugal", "QA" => "Qatar", "CG" => "Republic of the Congo", - "RE" => "Reunion", "RO" => "Romania", "RU" => "Russia", "RW" => "Rwanda", - "VC" => "Saint Vincent and the Grenadines", "WS" => "Samoa", "SM" => "San Marino", - "ST" => "São Tomé and Príncipe", "SA" => "Saudi Arabia", "SN" => "Senegal", "SC" => "Seychelles", - "SL" => "Sierra Leone", "SG" => "Singapore", "SK" => "Slovakia", "SI" => "Slovenia", - "SB" => "Solomon Islands", "SO" => "Somalia", "ZA" => "South Africa", "KR" => "South Korea", - "ES" => "Spain", "LK" => "Sri Lanka", "SH" => "St. Helena", "KN" => "St. Kitts and Nevis", - "LC" => "St. Lucia", "PM" => "St. Pierre and Miquelon", "SR" => "Suriname", - "SJ" => "Svalbard and Jan Mayen Islands", "SZ" => "Swaziland", "SE" => "Sweden", - "CH" => "Switzerland", "TW" => "Taiwan", "TJ" => "Tajikistan", "TZ" => "Tanzania", - "TH" => "Thailand", "TG" => "Togo", "TO" => "Tonga", "TT" => "Trinidad and Tobago", - "TN" => "Tunisia", "TR" => "Turkey", "TM" => "Turkmenistan", "TC" => "Turks and Caicos Islands", - "TV" => "Tuvalu", "UG" => "Uganda", "UA" => "Ukraine", "AE" => "United Arab Emirates", - "GB" => "United Kingdom", "UY" => "Uruguay", "VU" => "Vanuatu", "VA" => "Vatican City State", - "VE" => "Venezuela", "VN" => "Vietnam", "WF" => "Wallis and Futuna Islands", "YE" => "Yemen", - "ZM" => "Zambia" -} - - class Order < ActiveRecord::Base has_many :line_items belongs_to :coupon @@ -163,10 +112,6 @@ class Order < ActiveRecord::Base end end - def country_name - return COUNTRY_MAPPING[self.country] - end - def first_name=(value) write_attribute(:first_name, value.strip()) end app/models/order.rb @@ -14,7 +14,7 @@ N/A <% else -%> <%= @order.address1 -%><%= ', ' + @order.address2 if @order.address2 && ! @order.address2.blank? %> <%= @order.city %>, <%= @order.state %> <%= @order.zipcode %> -<%= @order.country_name %> +<%= country_name(@order.country) %> <% end -%> Payment: app/views/order_mailer/lost_license_sent.rhtml @@ -49,7 +49,7 @@ N/A <% else -%> <%= @order.address1 -%><%= ', ' + @order.address2 if @order.address2 && ! @order.address2.blank? %> <%= @order.city %>, <%= @order.state %> <%= @order.zipcode %> -<%= @order.country_name %> +<%= country_name(@order.country) %> <% end -%> Payment: app/views/order_mailer/thankyou_plain.rhtml @@ -84,7 +84,7 @@ body { margin: 0 50pt; } <%=h @order.address1 -%><%=h ', ' + @order.address2 if @order.address2 && ! @order.address2.blank? -%><br/> <%=h @order.city %>, <%=h @order.state %> <%=h @order.zipcode %><br/> - <%=h @order.country_name %> + <%=h country_name(@order.country) %> <% end -%> </td> <td id="payment" style="width:35%;padding:5px 0;border-bottom: 3px double #ddd"> app/views/store/order/_receipt.rhtml @@ -53,7 +53,7 @@ class AdminProductsControllerTest < Test::Unit::TestCase post :create, {:product => {:code => "product_new_1", :name => "New Product v1"}}, {:logged_in => true} assert_response :redirect - assert_redirected_to :controller => 'admin/products' , :action => 'show' + assert_redirected_to admin_product_url(Product.find(:all).last) assert_equal num_products + 1, Product.count end test/functional/admin_products_controller_test.rb 27e0d233e544c645940ce8116355741db4a908d8 Andy Kim andy@potionfactory.com http://github.com/potionfactory/potionstore/commit/feb9aa0bbde6640762725380dc1b185da5f5baea feb9aa0bbde6640762725380dc1b185da5f5baea 2008-12-17T17:34:55-08:00 2008-12-17T16:26:13-08:00 Refactored out country mapping into a YML file and fixed some url helper calls 838ffe2b4dd388515630408e362def0cd42f3281 Andy Kim andy@potionfactory.com