[ap4r-devel] [263] tags: Refactoring: method name etc.
kato-k at rubyforge.org
kato-k at rubyforge.org
Mon Aug 27 04:11:53 EDT 2007
Revision: 263
Author: kato-k
Date: 2007-08-27 04:11:50 -0400 (Mon, 27 Aug 2007)
Log Message:
-----------
Refactoring: method name etc.
Modified Paths:
--------------
tags/200709_gihyo_async_shop/as_rails/app/controllers/async_shop_controller.rb
tags/200709_gihyo_async_shop/as_rails/app/models/order.rb
tags/200709_gihyo_async_shop/as_rails/app/models/payment.rb
tags/200709_gihyo_sync_shop/as_rails/app/views/async_shop/order_form.rhtml
Added Paths:
-----------
tags/200709_gihyo_async_shop/as_rails/app/views/async_shop/index.rhtml
tags/200709_gihyo_async_shop/as_rails/app/views/async_shop/order_form.rhtml
Removed Paths:
-------------
tags/200709_gihyo_async_shop/as_rails/app/views/async_shop/list.rhtml
tags/200709_gihyo_async_shop/as_rails/app/views/async_shop/new.rhtml
Modified: tags/200709_gihyo_async_shop/as_rails/app/controllers/async_shop_controller.rb
===================================================================
--- tags/200709_gihyo_async_shop/as_rails/app/controllers/async_shop_controller.rb 2007-08-27 05:52:16 UTC (rev 262)
+++ tags/200709_gihyo_async_shop/as_rails/app/controllers/async_shop_controller.rb 2007-08-27 08:11:50 UTC (rev 263)
@@ -1,21 +1,16 @@
class AsyncShopController < ApplicationController
def index
- list
- render :action => 'list'
- end
-
- def list
@order_pages, @orders = paginate :orders, :per_page => 10
end
- def new
+ def order_form
@order = Order.new
end
def order
begin
- ActiveRecord::Base.transaction do
+ Order.transaction do
@order = Order.new(params[:order])
@order.save
@@ -23,14 +18,19 @@
{:order_id => @order.id})
flash[:notice] = 'Order was successfully created.'
- redirect_to :action => 'list'
+ redirect_to :action => 'index'
end
rescue Exception
flash[:notice] = 'Order was failed.'
- render :action => 'new'
+ render :action => 'order_form'
end
end
+ def destroy_order
+ Order.find(params[:id]).destroy
+ redirect_to :action => 'index'
+ end
+
def payment
sleep 5
@@ -40,9 +40,4 @@
render :text => "true"
end
- def destroy
- Order.find(params[:id]).destroy
- redirect_to :action => 'list'
- end
-
end
Modified: tags/200709_gihyo_async_shop/as_rails/app/models/order.rb
===================================================================
--- tags/200709_gihyo_async_shop/as_rails/app/models/order.rb 2007-08-27 05:52:16 UTC (rev 262)
+++ tags/200709_gihyo_async_shop/as_rails/app/models/order.rb 2007-08-27 08:11:50 UTC (rev 263)
@@ -1,2 +1,3 @@
class Order < ActiveRecord::Base
+ has_one :payment
end
Modified: tags/200709_gihyo_async_shop/as_rails/app/models/payment.rb
===================================================================
--- tags/200709_gihyo_async_shop/as_rails/app/models/payment.rb 2007-08-27 05:52:16 UTC (rev 262)
+++ tags/200709_gihyo_async_shop/as_rails/app/models/payment.rb 2007-08-27 08:11:50 UTC (rev 263)
@@ -1,2 +1,3 @@
class Payment < ActiveRecord::Base
+ belongs_to :order
end
Copied: tags/200709_gihyo_async_shop/as_rails/app/views/async_shop/index.rhtml (from rev 261, tags/200709_gihyo_async_shop/as_rails/app/views/async_shop/list.rhtml)
===================================================================
--- tags/200709_gihyo_async_shop/as_rails/app/views/async_shop/index.rhtml (rev 0)
+++ tags/200709_gihyo_async_shop/as_rails/app/views/async_shop/index.rhtml 2007-08-27 08:11:50 UTC (rev 263)
@@ -0,0 +1,25 @@
+<h1>Listing orders</h1>
+
+<table>
+ <tr>
+ <th>Item</th>
+ <th>Ordered at</th>
+ <th>Payed at</th>
+ </tr>
+
+<% for order in @orders %>
+ <tr>
+ <td><%=h order.item %></td>
+ <td><%=h order.created_at %></td>
+ <td><%=h begin order.payment.created_at rescue "not yet." end %></td>
+ <td><%= link_to 'Destroy', { :action => 'destroy_order', :id => order }, :confirm => 'Are you sure?', :method => :post %></td>
+ </tr>
+<% end %>
+</table>
+
+<%= link_to 'Previous page', { :page => @order_pages.current.previous } if @order_pages.current.previous %>
+<%= link_to 'Next page', { :page => @order_pages.current.next } if @order_pages.current.next %>
+
+<br />
+
+<%= link_to 'New order', :action => 'order_form' %>
Deleted: tags/200709_gihyo_async_shop/as_rails/app/views/async_shop/list.rhtml
===================================================================
--- tags/200709_gihyo_async_shop/as_rails/app/views/async_shop/list.rhtml 2007-08-27 05:52:16 UTC (rev 262)
+++ tags/200709_gihyo_async_shop/as_rails/app/views/async_shop/list.rhtml 2007-08-27 08:11:50 UTC (rev 263)
@@ -1,25 +0,0 @@
-<h1>Listing orders</h1>
-
-<table>
- <tr>
- <th>Item</th>
- <th>Ordered at</th>
- <th>Payed at<th>
- </tr>
-
-<% for order in @orders %>
- <tr>
- <td><%=h order.item %></td>
- <td><%=h order.created_at %></td>
- <td><%=h begin Payment.find_by_order_id(order.id).created_at rescue "not yet." end %></td>
- <td><%= link_to 'Destroy', { :action => 'destroy', :id => order }, :confirm => 'Are you sure?', :method => :post %></td>
- </tr>
-<% end %>
-</table>
-
-<%= link_to 'Previous page', { :page => @order_pages.current.previous } if @order_pages.current.previous %>
-<%= link_to 'Next page', { :page => @order_pages.current.next } if @order_pages.current.next %>
-
-<br />
-
-<%= link_to 'New order', :action => 'new' %>
Deleted: tags/200709_gihyo_async_shop/as_rails/app/views/async_shop/new.rhtml
===================================================================
--- tags/200709_gihyo_async_shop/as_rails/app/views/async_shop/new.rhtml 2007-08-27 05:52:16 UTC (rev 262)
+++ tags/200709_gihyo_async_shop/as_rails/app/views/async_shop/new.rhtml 2007-08-27 08:11:50 UTC (rev 263)
@@ -1,10 +0,0 @@
-<h1>New order</h1>
-
-<% form_tag :action => 'order' do %>
- <%= error_messages_for 'order' %>
- <P><label for="order_item">Item</label><br/>
- <%= text_field 'order', 'item' %></p>
- <%= submit_tag "Order" %>
-<% end %>
-
-<%= link_to 'ordered list', :action => 'list' %>
Copied: tags/200709_gihyo_async_shop/as_rails/app/views/async_shop/order_form.rhtml (from rev 261, tags/200709_gihyo_async_shop/as_rails/app/views/async_shop/new.rhtml)
===================================================================
--- tags/200709_gihyo_async_shop/as_rails/app/views/async_shop/order_form.rhtml (rev 0)
+++ tags/200709_gihyo_async_shop/as_rails/app/views/async_shop/order_form.rhtml 2007-08-27 08:11:50 UTC (rev 263)
@@ -0,0 +1,10 @@
+<h1>New order</h1>
+
+<% form_tag :action => 'order' do %>
+ <%= error_messages_for 'order' %>
+ <p><label for="order_item">Item</label><br/>
+ <%= text_field 'order', 'item' %></p>
+ <%= submit_tag "Order" %>
+<% end %>
+
+<%= link_to 'ordered list', :action => 'index' %>
Modified: tags/200709_gihyo_sync_shop/as_rails/app/views/async_shop/order_form.rhtml
===================================================================
--- tags/200709_gihyo_sync_shop/as_rails/app/views/async_shop/order_form.rhtml 2007-08-27 05:52:16 UTC (rev 262)
+++ tags/200709_gihyo_sync_shop/as_rails/app/views/async_shop/order_form.rhtml 2007-08-27 08:11:50 UTC (rev 263)
@@ -2,7 +2,7 @@
<% form_tag :action => 'order' do %>
<%= error_messages_for 'order' %>
- <P><label for="order_item">Item</label><br/>
+ <p><label for="order_item">Item</label><br/>
<%= text_field 'order', 'item' %></p>
<%= submit_tag "Order" %>
<% end %>
More information about the ap4r-devel
mailing list