Whitespace cleanup

.gitignore

@@ -12,4 +12,4 @@ nbproject
 pkg
 pkg/*
 tmp
-www/output
+www/output

CHANGELOG

@@ -1,2 +1 @@
 = Change Log
-

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.

Rakefile

@@ -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

TODO

@@ -1,2 +1 @@
 = To-Do
-

app/controllers/admin/files.rb

@@ -1,9 +1,9 @@
 module Admin
 class Files < Application
-  
+
   def index
     render
   end
-  
+
 end
 end # Admin

app/controllers/admin/orders.rb

@@ -1,9 +1,9 @@
 module Admin
 class Orders < Application
-  
+
   def index
     render
   end
-  
+
 end
 end # Admin

app/controllers/admin/preferences.rb

@@ -1,9 +1,9 @@
 module Admin
 class Preferences < Application
-  
+
   def index
     render
   end
-  
+
 end
 end # Admin

app/controllers/admin/products.rb

@@ -1,9 +1,9 @@
 module Admin
 class Products < Application
-  
+
   def index
     render
   end
-  
+
 end
 end # Admin

app/controllers/admin/promotions.rb

@@ -1,9 +1,9 @@
 module Admin
 class Promotions < Application
-  
+
   def index
     render
   end
-  
+
 end
 end # Admin

app/controllers/admin/tags.rb

@@ -1,9 +1,9 @@
 module Admin
 class Tags < Application
-  
+
   def index
     render
   end
-  
+
 end
 end # Admin

app/controllers/customers.rb

@@ -1,7 +1,7 @@
 class Customers < Application
-  
+
   def index
     render
   end
-  
+
 end

app/controllers/exceptions.rb

@@ -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

app/controllers/sessions.rb

@@ -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

app/controllers/store.rb

@@ -1,7 +1,7 @@
 class Store < Application
-  
+
   def index
     render
   end
-  
-end
+
+end

app/controllers/users.rb

@@ -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?

app/helpers/admin/files_helper.rb

@@ -4,4 +4,4 @@ module FilesHelper
 
 end
 end # Admin
-end
+end

app/helpers/admin/orders_helper.rb

@@ -4,4 +4,4 @@ module OrdersHelper
 
 end
 end # Admin
-end
+end

app/helpers/admin/products_helper.rb

@@ -4,4 +4,4 @@ module ProductsHelper
 
 end
 end # Admin
-end
+end

app/helpers/admin/promotions_helper.rb

@@ -4,4 +4,4 @@ module PromotionsHelper
 
 end
 end # Admin
-end
+end

app/helpers/admin/sections_helper.rb

@@ -4,4 +4,4 @@ module SectionsHelper
 
 end
 end # Admin
-end
+end

app/helpers/admin/tags_helper.rb

@@ -4,4 +4,4 @@ module TagsHelper
 
 end
 end # Admin
-end
+end

app/helpers/customers_helper.rb

@@ -2,4 +2,4 @@ module Merb
     module CustomersHelper
 
     end
-end
+end

app/helpers/global_helpers.rb

@@ -1,5 +1,5 @@
 module Merb
   module GlobalHelpers
-    # helpers defined here available to all views.  
+    # helpers defined here available to all views.
   end
 end

app/mailers/user_mailer.rb

@@ -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

app/mailers/views/layout/application.html.erb

@@ -1 +1 @@
-<%= catch_content :for_layout %>
+<%= catch_content :for_layout %>

app/mailers/views/layout/application.text.erb

@@ -1 +1 @@
-<%= catch_content :for_layout %>
+<%= catch_content :for_layout %>

app/mailers/views/user_mailer/activation_notification.html.erb

@@ -1 +1 @@
-Your email has been authenticated <%= @user.login %>
+Your email has been authenticated <%= @user.login %>

app/mailers/views/user_mailer/activation_notification.text.erb

@@ -1 +1 @@
-Your email has been authenticated <%= @user.login %>
+Your email has been authenticated <%= @user.login %>

app/mailers/views/user_mailer/signup_notification.html.erb

@@ -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) %>

app/mailers/views/user_mailer/signup_notification.text.erb

@@ -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) %>

app/models/address.rb

@@ -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

app/models/country.rb

@@ -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

app/models/mart/abstract_upload.rb

@@ -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

app/models/mart/accounts/abstract_account.rb

@@ -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