Permalink
Browse files

Whitespace cleanup

  • Loading branch information...
myabc committed May 16, 2008
1 parent 37f3b63 commit 1d63179ef1086e3d6ef6aeaa8b7456100beec2ce
Showing with 555 additions and 557 deletions.
  1. +1 −1 .gitignore
  2. +0 −1 CHANGELOG
  3. +1 −1 README
  4. +3 −3 Rakefile
  5. +0 −1 TODO
  6. +2 −2 app/controllers/admin/files.rb
  7. +2 −2 app/controllers/admin/orders.rb
  8. +2 −2 app/controllers/admin/preferences.rb
  9. +2 −2 app/controllers/admin/products.rb
  10. +2 −2 app/controllers/admin/promotions.rb
  11. +2 −2 app/controllers/admin/tags.rb
  12. +2 −2 app/controllers/customers.rb
  13. +2 −2 app/controllers/exceptions.rb
  14. +3 −3 app/controllers/sessions.rb
  15. +3 −3 app/controllers/store.rb
  16. +5 −5 app/controllers/users.rb
  17. +1 −1 app/helpers/admin/files_helper.rb
  18. +1 −1 app/helpers/admin/orders_helper.rb
  19. +1 −1 app/helpers/admin/products_helper.rb
  20. +1 −1 app/helpers/admin/promotions_helper.rb
  21. +1 −1 app/helpers/admin/sections_helper.rb
  22. +1 −1 app/helpers/admin/tags_helper.rb
  23. +1 −1 app/helpers/customers_helper.rb
  24. +1 −1 app/helpers/global_helpers.rb
  25. +4 −4 app/mailers/user_mailer.rb
  26. +1 −1 app/mailers/views/layout/application.html.erb
  27. +1 −1 app/mailers/views/layout/application.text.erb
  28. +1 −1 app/mailers/views/user_mailer/activation_notification.html.erb
  29. +1 −1 app/mailers/views/user_mailer/activation_notification.text.erb
  30. +1 −1 app/mailers/views/user_mailer/signup_notification.html.erb
  31. +1 −1 app/mailers/views/user_mailer/signup_notification.text.erb
  32. +2 −2 app/models/address.rb
  33. +3 −3 app/models/country.rb
  34. +2 −2 app/models/mart/abstract_upload.rb
  35. +4 −4 app/models/mart/accounts/abstract_account.rb
  36. +3 −3 app/models/mart/accounts/bank_account.rb
  37. +2 −2 app/models/mart/accounts/credit_card_account.rb
  38. +3 −3 app/models/mart/accounts/google_checkout_account.rb
  39. +1 −1 app/models/mart/accounts/paypal_account.rb
  40. +1 −1 app/models/mart/asset.rb
  41. +3 −3 app/models/mart/customer.rb
  42. +11 −11 app/models/mart/customers/cart.rb
  43. +5 −5 app/models/mart/customers/wishlist_item.rb
  44. +2 −2 app/models/mart/image.rb
  45. +7 −7 app/models/mart/order.rb
  46. +4 −4 app/models/mart/orders/line_item.rb
  47. +5 −5 app/models/mart/orders/status_code.rb
  48. +1 −1 app/models/mart/shipping/type.rb
  49. +2 −2 app/models/mart/shipping/weight.rb
  50. +4 −4 app/models/mart/store/abstract_item.rb
  51. +4 −4 app/models/mart/store/product.rb
  52. +3 −3 app/models/mart/store/product_image.rb
  53. +6 −6 app/models/mart/store/promotion.rb
  54. +3 −3 app/models/mart/store/variation.rb
  55. +3 −3 app/models/right.rb
  56. +2 −2 app/models/role.rb
  57. +3 −3 app/models/state.rb
  58. +6 −6 app/models/tag.rb
  59. +9 −9 app/models/user.rb
  60. +1 −1 app/parts/views/layout/application.html.haml
  61. +1 −1 app/views/customers/index.html.haml
  62. +2 −2 app/views/layout/application.html.haml
  63. +1 −1 app/views/store/index.html.haml
  64. +1 −1 app/views/users/new.html.haml
  65. +1 −1 autotest.bak/discover.rb
  66. +39 −39 autotest.bak/merb.rb
  67. +1 −1 config/environments/rake.rb
  68. +6 −6 config/init.rb
  69. +1 −1 config/rack.rb
  70. +4 −4 config/router.rb
  71. +9 −9 lib/authenticated_system/authenticated_system_controller.rb
  72. +12 −12 lib/authenticated_system/authenticated_system_model.rb
  73. +9 −9 lib/authenticated_system/authenticated_system_orm_map.rb
  74. +4 −4 lib/mart.rb
  75. +4 −4 public/merb.fcgi
  76. +3 −3 spec/authenticated_system_spec_helper.rb
  77. +1 −1 spec/controllers/admin/files_spec.rb
  78. +1 −1 spec/controllers/admin/orders_spec.rb
  79. +1 −1 spec/controllers/admin/preferences_spec.rb
  80. +1 −1 spec/controllers/admin/products_spec.rb
  81. +1 −1 spec/controllers/admin/promotions_spec.rb
  82. +1 −1 spec/controllers/admin/tags_spec.rb
  83. +1 −1 spec/controllers/customers_spec.rb
  84. +16 −16 spec/controllers/sessions_spec.rb
  85. +12 −12 spec/controllers/users_spec.rb
  86. +1 −1 spec/helpers/admin/files_helper_spec.rb
  87. +1 −1 spec/helpers/admin/orders_helper_spec.rb
  88. +1 −1 spec/helpers/admin/preferences_helper_spec.rb
  89. +1 −1 spec/helpers/admin/products_helper_spec.rb
  90. +1 −1 spec/helpers/admin/promotions_helper_spec.rb
  91. +1 −1 spec/helpers/admin/tags_helper_spec.rb
  92. +1 −1 spec/helpers/customers_helper_spec.rb
  93. +15 −15 spec/mailers/user_mailer_spec.rb
  94. +12 −12 spec/models/address_spec.rb
  95. +9 −9 spec/models/country_spec.rb
  96. +2 −2 spec/models/mart/abstract_upload_spec.rb
  97. +11 −11 spec/models/mart/accounts/abstract_account_spec.rb
  98. +1 −1 spec/models/mart/accounts/bank_account_spec.rb
  99. +1 −1 spec/models/mart/accounts/credit_card_account_spec.rb
  100. +1 −1 spec/models/mart/accounts/google_checkout_account_spec.rb
  101. +1 −1 spec/models/mart/accounts/paypal_account_spec.rb
  102. +4 −4 spec/models/mart/asset_spec.rb
  103. +14 −14 spec/models/mart/customer_spec.rb
  104. +6 −6 spec/models/mart/customers/cart_spec.rb
  105. +5 −5 spec/models/mart/customers/wishlist_item_spec.rb
  106. +6 −6 spec/models/mart/image_spec.rb
  107. +20 −20 spec/models/mart/order_spec.rb
  108. +3 −3 spec/models/mart/orders/line_item_spec.rb
  109. +3 −3 spec/models/mart/orders/status_code_spec.rb
  110. +4 −4 spec/models/mart/shipping/type_spec.rb
  111. +1 −1 spec/models/mart/shipping/weight_spec.rb
  112. +3 −3 spec/models/mart/store/abstract_item_spec.rb
  113. +2 −2 spec/models/mart/store/product_image_spec.rb
  114. +11 −11 spec/models/mart/store/product_spec.rb
  115. +3 −3 spec/models/mart/store/promotion_spec.rb
  116. +5 −5 spec/models/mart/store/variation_spec.rb
  117. +1 −1 spec/models/right_spec.rb
  118. +4 −4 spec/models/role_spec.rb
  119. +8 −8 spec/models/state_spec.rb
  120. +5 −5 spec/models/tag_spec.rb
  121. +78 −78 spec/models/user_spec.rb
  122. +1 −1 spec/user_spec_helper.rb
  123. +20 −20 spec/views/store/index_spec.rb
View
@@ -12,4 +12,4 @@ nbproject
pkg
pkg/*
tmp
-www/output
+www/output
View
@@ -1,2 +1 @@
= Change Log
-
View
2 README
@@ -1,4 +1,4 @@
= merb_mart
== Open-source e-commerce built on the Merb MVC Framework
-Please see README.markdown.
+Please see README.markdown.
View
@@ -11,13 +11,13 @@ require 'merb-core'
require 'rubigen'
include FileUtils
-# Load the basic runtime dependencies; this will include
+# Load the basic runtime dependencies; this will include
# any plugins and therefore plugin rake tasks.
init_env = ENV['MERB_ENV'] || 'rake'
Merb.load_dependencies(:environment => init_env)
-
+
# Get Merb plugins and dependencies
-Merb::Plugins.rakefiles.each { |r| require r }
+Merb::Plugins.rakefiles.each { |r| require r }
desc "start runner environment"
task :merb_env do
View
1 TODO
@@ -1,2 +1 @@
= To-Do
-
@@ -1,9 +1,9 @@
module Admin
class Files < Application
-
+
def index
render
end
-
+
end
end # Admin
@@ -1,9 +1,9 @@
module Admin
class Orders < Application
-
+
def index
render
end
-
+
end
end # Admin
@@ -1,9 +1,9 @@
module Admin
class Preferences < Application
-
+
def index
render
end
-
+
end
end # Admin
@@ -1,9 +1,9 @@
module Admin
class Products < Application
-
+
def index
render
end
-
+
end
end # Admin
@@ -1,9 +1,9 @@
module Admin
class Promotions < Application
-
+
def index
render
end
-
+
end
end # Admin
@@ -1,9 +1,9 @@
module Admin
class Tags < Application
-
+
def index
render
end
-
+
end
end # Admin
@@ -1,7 +1,7 @@
class Customers < Application
-
+
def index
render
end
-
+
end
@@ -1,5 +1,5 @@
class Exceptions < Application
-
+
# handle NotFound exceptions (404)
def not_found
render :format => :html
@@ -10,4 +10,4 @@ def not_acceptable
render :format => :html
end
-end
+end
@@ -1,9 +1,9 @@
# require 'lib/authenticated_system_controller'
require File.join(File.dirname(__FILE__), '..', '..', "lib", "authenticated_system", "authenticated_dependencies")
class Sessions < Application
-
+
skip_before :login_required
-
+
def new
render
end
@@ -27,5 +27,5 @@ def destroy
reset_session
redirect_back_or_default('/')
end
-
+
end
View
@@ -1,7 +1,7 @@
class Store < Application
-
+
def index
render
end
-
-end
+
+end
View
@@ -1,26 +1,26 @@
require File.join(File.dirname(__FILE__), '..', '..', "lib", "authenticated_system", "authenticated_dependencies")
class Users < Application
provides :xml
-
+
skip_before :login_required
-
+
def new
only_provides :html
@user = User.new(params[:user] || {})
display @user
end
-
+
def create
cookies.delete :auth_token
-
+
@user = User.new(params[:user])
if @user.save
redirect_back_or_default('/')
else
render :new
end
end
-
+
def activate
self.current_user = User.find_activated_authenticated_model(params[:activation_code])
if logged_in? && !current_user.active?
@@ -4,4 +4,4 @@ module FilesHelper
end
end # Admin
-end
+end
@@ -4,4 +4,4 @@ module OrdersHelper
end
end # Admin
-end
+end
@@ -4,4 +4,4 @@ module ProductsHelper
end
end # Admin
-end
+end
@@ -4,4 +4,4 @@ module PromotionsHelper
end
end # Admin
-end
+end
@@ -4,4 +4,4 @@ module SectionsHelper
end
end # Admin
-end
+end
@@ -4,4 +4,4 @@ module TagsHelper
end
end # Admin
-end
+end
@@ -2,4 +2,4 @@ module Merb
module CustomersHelper
end
-end
+end
@@ -1,5 +1,5 @@
module Merb
module GlobalHelpers
- # helpers defined here available to all views.
+ # helpers defined here available to all views.
end
end
@@ -1,13 +1,13 @@
class UserMailer < Merb::MailController
-
+
def signup_notification
@user = params[:user]
render_mail
end
-
+
def activation_notification
@user = params[:user]
render_mail
end
-
-end
+
+end
@@ -1 +1 @@
-<%= catch_content :for_layout %>
+<%= catch_content :for_layout %>
@@ -1 +1 @@
-<%= catch_content :for_layout %>
+<%= catch_content :for_layout %>
@@ -1 +1 @@
-Your email has been authenticated <%= @user.login %>
+Your email has been authenticated <%= @user.login %>
@@ -1 +1 @@
-Your email has been authenticated <%= @user.login %>
+Your email has been authenticated <%= @user.login %>
@@ -5,4 +5,4 @@ Your account has been created.
Visit this url to activate your account:
- <%= url(:user_activation, :activation_code => @user.activation_code) %>
+ <%= url(:user_activation, :activation_code => @user.activation_code) %>
@@ -5,4 +5,4 @@ Your account has been created.
Visit this url to activate your account:
- <%= url(:user_activation, :activation_code => @user.activation_code) %>
+ <%= url(:user_activation, :activation_code => @user.activation_code) %>
View
@@ -13,7 +13,7 @@ class Address
property :address1, String, :length => 200, :nullable => false
property :address2, String, :length => 200
property :city, String, :length => 50
- property :postal_code, String, :length => 10
+ property :postal_code, String, :length => 10
property :state_id, Fixnum # foreign-key
property :country_code, String # foreign-key
@@ -38,4 +38,4 @@ def name
"#{self.first_name} #{self.last_name}"
end
-end
+end
View
@@ -3,9 +3,9 @@
# ISO 3166-1 geographic code.
#
class Country
-
+
include DataMapper::Resource
-
+
property :code, String, :key => true, :length => 2 # ISO 3166-1 alpha-2
property :name, String, :length => 100, :nullable => false, :unique => true
@@ -16,4 +16,4 @@ class Country
alias :provinces :states
-end
+end
@@ -1,6 +1,6 @@
module Mart
class AbstractUpload
-
+
include DataMapper::Resource
property :id, Fixnum, :serial => true
@@ -18,7 +18,7 @@ def filename_base
def extension
filename.split('.').last
end
-
+
def relative_path
filename # TODO
end
@@ -3,7 +3,7 @@
module Mart
module Accounts
class AbstractAccount
-
+
include DataMapper::Resource
include DataMapper::Validate
require 'ezcrypto'
@@ -12,14 +12,14 @@ class AbstractAccount
property :type, Class # single-table inheritance
property :order_id, Fixnum # foreign-key
property :customer_id, Fixnum # foreign-key
-
+
has 1, :order
belongs_to :customer #, :accessor => :protected
def self.months
(1..12).to_a
end
-
+
def self.years
year = Date.today.year
years = Array.new
@@ -31,4 +31,4 @@ def self.years
end
end
-end
+end
Oops, something went wrong.

0 comments on commit 1d63179

Please sign in to comment.