@@ -12,4 +12,4 @@ nbproject pkg pkg/* tmp -www/output \ No newline at end of file +www/output .gitignore @@ -1,2 +1 @@ = Change Log - \ No newline at end of file CHANGELOG @@ -1,4 +1,4 @@ = merb_mart == Open-source e-commerce built on the Merb MVC Framework -Please see README.markdown. \ No newline at end of file +Please see README.markdown. README @@ -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 Rakefile @@ -1,2 +1 @@ = To-Do - TODO @@ -1,9 +1,9 @@ module Admin class Files < Application - + def index render end - + end end # Admin app/controllers/admin/files.rb @@ -1,9 +1,9 @@ module Admin class Orders < Application - + def index render end - + end end # Admin app/controllers/admin/orders.rb @@ -1,9 +1,9 @@ module Admin class Preferences < Application - + def index render end - + end end # Admin app/controllers/admin/preferences.rb @@ -1,9 +1,9 @@ module Admin class Products < Application - + def index render end - + end end # Admin app/controllers/admin/products.rb @@ -1,9 +1,9 @@ module Admin class Promotions < Application - + def index render end - + end end # Admin app/controllers/admin/promotions.rb @@ -1,9 +1,9 @@ module Admin class Tags < Application - + def index render end - + end end # Admin app/controllers/admin/tags.rb @@ -1,7 +1,7 @@ class Customers < Application - + def index render end - + end app/controllers/customers.rb @@ -1,5 +1,5 @@ class Exceptions < Application - + # handle NotFound exceptions (404) def not_found render :format => :html @@ -10,4 +10,4 @@ class Exceptions < Application render :format => :html end -end \ No newline at end of file +end app/controllers/exceptions.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 @@ class Sessions < Application reset_session redirect_back_or_default('/') end - + end app/controllers/sessions.rb @@ -1,7 +1,7 @@ class Store < Application - + def index render end - -end \ No newline at end of file + +end app/controllers/store.rb @@ -1,18 +1,18 @@ 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('/') @@ -20,7 +20,7 @@ class Users < Application render :new end end - + def activate self.current_user = User.find_activated_authenticated_model(params[:activation_code]) if logged_in? && !current_user.active? app/controllers/users.rb @@ -4,4 +4,4 @@ module FilesHelper end end # Admin -end \ No newline at end of file +end app/helpers/admin/files_helper.rb @@ -4,4 +4,4 @@ module OrdersHelper end end # Admin -end \ No newline at end of file +end app/helpers/admin/orders_helper.rb @@ -4,4 +4,4 @@ module ProductsHelper end end # Admin -end \ No newline at end of file +end app/helpers/admin/products_helper.rb @@ -4,4 +4,4 @@ module PromotionsHelper end end # Admin -end \ No newline at end of file +end app/helpers/admin/promotions_helper.rb @@ -4,4 +4,4 @@ module SectionsHelper end end # Admin -end \ No newline at end of file +end app/helpers/admin/sections_helper.rb @@ -4,4 +4,4 @@ module TagsHelper end end # Admin -end \ No newline at end of file +end app/helpers/admin/tags_helper.rb @@ -2,4 +2,4 @@ module Merb module CustomersHelper end -end \ No newline at end of file +end app/helpers/customers_helper.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/helpers/global_helpers.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 \ No newline at end of file + +end app/mailers/user_mailer.rb @@ -1 +1 @@ -<%= catch_content :for_layout %> \ No newline at end of file +<%= catch_content :for_layout %> app/mailers/views/layout/application.html.erb @@ -1 +1 @@ -<%= catch_content :for_layout %> \ No newline at end of file +<%= catch_content :for_layout %> app/mailers/views/layout/application.text.erb @@ -1 +1 @@ -Your email has been authenticated <%= @user.login %> \ No newline at end of file +Your email has been authenticated <%= @user.login %> app/mailers/views/user_mailer/activation_notification.html.erb @@ -1 +1 @@ -Your email has been authenticated <%= @user.login %> \ No newline at end of file +Your email has been authenticated <%= @user.login %> app/mailers/views/user_mailer/activation_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) %> \ No newline at end of file + <%= url(:user_activation, :activation_code => @user.activation_code) %> 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) %> \ No newline at end of file + <%= url(:user_activation, :activation_code => @user.activation_code) %> app/mailers/views/user_mailer/signup_notification.text.erb @@ -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 @@ class Address "#{self.first_name} #{self.last_name}" end -end \ No newline at end of file +end app/models/address.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 \ No newline at end of file +end app/models/country.rb @@ -1,6 +1,6 @@ module Mart class AbstractUpload - + include DataMapper::Resource property :id, Fixnum, :serial => true @@ -18,7 +18,7 @@ module Mart def extension filename.split('.').last end - + def relative_path filename # TODO end app/models/mart/abstract_upload.rb @@ -3,7 +3,7 @@ require 'dm-validations' module Mart module Accounts class AbstractAccount - + include DataMapper::Resource include DataMapper::Validate require 'ezcrypto' @@ -12,14 +12,14 @@ module Mart 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 @@ module Mart end end -end \ No newline at end of file +end app/models/mart/accounts/abstract_account.rb @@ -2,11 +2,11 @@ module Mart module Accounts class BankAccount < AbstractAccount - #property :account_subtype, DataMapper::Types::Enum + #property :account_subtype, DataMapper::Types::Enum property :account_number, String property :routing_number, String, :length => 20 property :bank_name, String, :length => 50 - + end end -end \ No newline at end of file +end app/models/mart/accounts/bank_account.rb @@ -1,7 +1,7 @@ module Mart module Accounts class CreditCardAccount < Accounts::AbstractAccount - + property :cc_number, String property :expiration_month, Fixnum, :length => 2 property :expiration_year, Fixnum, :length => 4 @@ -9,4 +9,4 @@ module Mart end end -end \ No newline at end of file +end app/models/mart/accounts/credit_card_account.rb @@ -1,9 +1,9 @@ module Mart module Accounts class GoogleCheckoutAccount < AbstractAccount - + # TODO: Implement Me - + end end -end \ No newline at end of file +end app/models/mart/accounts/google_checkout_account.rb @@ -6,4 +6,4 @@ module Mart end end -end \ No newline at end of file +end app/models/mart/accounts/paypal_account.rb @@ -2,4 +2,4 @@ module Mart class Asset < AbstractUpload end -end \ No newline at end of file +end app/models/mart/asset.rb @@ -2,9 +2,9 @@ require 'dm-validations' module Mart class Customer - + include DataMapper::Resource - + property :id, Fixnum, :serial => true property :username, String, :length => 50 property :email_address, String, :length => 50, :nullable => false, :index => :unique @@ -27,4 +27,4 @@ module Mart end end -end \ No newline at end of file +end app/models/mart/customer.rb @@ -3,14 +3,14 @@ require "bigdecimal" module Mart module Customers class Cart - + attr_reader :items, :shipping_cost, :tax, :total - + # Initializes the shopping cart def initialize empty! end - + # Empties or initializes the cart def empty! @items = [] @@ -18,15 +18,15 @@ module Mart @total = 0.0 @shipping_cost = 0.0 end - + def tax_cost @tax * @total end - + def empty? @items.length == 0 end - + # Returns the total price of our cart def total @total = 0.0 @@ -41,7 +41,7 @@ module Mart def line_items_total total end - + # Adds a product to our shopping cart def add_product(product, quantity=1) item = @items.find { |i| i.product_id == product.id } @@ -55,7 +55,7 @@ module Mart @items << item end end - + # Removes all quantities of product from our cart def remove_product(product, quantity=nil) item = @items.find { |i| i.product_id == product.id } @@ -70,7 +70,7 @@ module Mart end end end - + # Checks inventory of products, and removes them if # they're out of stock. # @@ -90,7 +90,7 @@ module Mart end return removed_items end - + end end -end \ No newline at end of file +end app/models/mart/customers/cart.rb @@ -1,18 +1,18 @@ module Mart module Customers class WishlistItem - + include DataMapper::Resource include DataMapper::Validate - + property :id, Fixnum, :serial => true property :created_on, DateTime property :customer_id, Fixnum # foreign-key property :store_item_id, Fixnum # foreign-key - + belongs_to :customer belongs_to :store_item - + end end -end \ No newline at end of file +end app/models/mart/customers/wishlist_item.rb @@ -2,7 +2,7 @@ module Mart class Image < AbstractUpload IMAGE_EXTENSIONS = ['gif', 'jpg', 'jpeg', 'png', 'bmp'] - + property :width, Fixnum, :default => 0, :nullable => false property :height, Fixnum, :default => 0, :nullable => false @@ -10,4 +10,4 @@ module Mart #has n, :products, :through => :product_images ## FIXME end -end \ No newline at end of file +end app/models/mart/image.rb @@ -3,7 +3,7 @@ require 'dm-validations' module Mart class Order - + include DataMapper::Resource property :id, Fixnum, :serial => true @@ -22,20 +22,20 @@ module Mart property :order_shipping_type_id, Fixnum # foreign-key property :status_code_id,Fixnum # foreign-key property :promotion_id, Fixnum # foreign-key - + has 1..n, :line_items, :class_name => 'Orders::LineItem' #, :dependent => :destroy has 1, :billing_address, :class_name => 'Address' #, :foreign_key => 'billing_address_id' has 1, :shipping_address, :class_name => 'Address' #, :foreign_key => 'shipping_address_id' - + belongs_to :account belongs_to :customer belongs_to :order_shipping_type belongs_to :status_code, :class_name => 'Orders::StatusCode' belongs_to :promotion - + attr_accessor :promotion_code - + validates_present :order_number - + end -end \ No newline at end of file +end app/models/mart/order.rb @@ -3,7 +3,7 @@ require "bigdecimal" module Mart module Orders class LineItem - + include DataMapper::Resource property :id, Fixnum, :serial => true @@ -12,10 +12,10 @@ module Mart property :name, String property :product_id, Fixnum ## FIXME: should not be both product_id + store_item_id property :store_item_id, Fixnum # foreign-key - + belongs_to :product ## FIXME: should not be both product_id + store_item_id belongs_to :store_item - + end end -end \ No newline at end of file +end app/models/mart/orders/line_item.rb @@ -1,14 +1,14 @@ module Mart module Orders class StatusCode - + include DataMapper::Resource - + property :id, Fixnum, :serial => true property :name, String, :length => 30, :nullable => false - + has n, :orders - + end end -end \ No newline at end of file +end app/models/mart/orders/status_code.rb @@ -27,4 +27,4 @@ module Mart end end -end \ No newline at end of file +end app/models/mart/shipping/type.rb @@ -13,7 +13,7 @@ module Mart property :order_shipping_type_id, Fixnum # foreign-key belongs_to :type - + end end -end \ No newline at end of file +end app/models/mart/shipping/weight.rb @@ -21,12 +21,12 @@ module Mart property :weight, Float, :default => 0.0, :nullable => false property :is_discontinued, TrueClass, :default => false property :type, Class # single-table inheritance - + has n, :line_items, :class_name => "Mart::Orders::LineItem" has n, :wishlist_items, :class_name => "Mart::Customers::WishlistItem" #, :dependent => :destroy - + validates_present :name, :code - + end end -end \ No newline at end of file +end app/models/mart/store/abstract_item.rb @@ -8,15 +8,15 @@ module Mart #:through => :product_images, #:order => "-product_images.rank DESC", #:dependent => :destroy - + many_to_many :related_products, :class_name => 'Product' #, #:join_table => 'related_products', #:association_foreign_key => 'related_id', #:foreign_key => 'product_id' - + many_to_many :tags - + end end -end \ No newline at end of file +end app/models/mart/store/product.rb @@ -1,9 +1,9 @@ module Mart module Store class ProductImage - + include DataMapper::Resource - + property :product_id, Fixnum # foreign-key property :image_id, Fixnum # foreign-key property :rank, Fixnum @@ -13,4 +13,4 @@ module Mart end end -end \ No newline at end of file +end app/models/mart/store/product_image.rb @@ -4,15 +4,15 @@ require 'dm-validations' module Mart module Store class Promotion - + include DataMapper::Resource ## TODO: add support for subtypes: # - dollars off # - percetnage off # - buy n, get n free - # - - + # - + property :id, Fixnum, :serial => true property :code, String, :length => 15, :nullable => false property :discount_type, Fixnum, :default => 0, :nullable => false @@ -25,10 +25,10 @@ module Mart has n, :orders belongs_to :item, :class_name => "Mart::Store::AbstractItem" - + validates_present :code, :discount_amount, :discount_type, :description - validates_is_number :discount_amount + validates_is_number :discount_amount end end -end \ No newline at end of file +end app/models/mart/store/promotion.rb @@ -1,11 +1,11 @@ module Mart module Store class Variation < AbstractItem - + property :product_id, Fixnum # foreign-key - + belongs_to :product end end -end \ No newline at end of file +end app/models/mart/store/variation.rb @@ -1,7 +1,7 @@ class Right - + include DataMapper::Resource - + property :id, Fixnum, :serial => true property :name, String property :controller, String @@ -22,4 +22,4 @@ class RightRoles include DataMapper::Resource property :right_id, Fixnum, :key => true property :role_id, Fixnum, :key => true -end \ No newline at end of file +end app/models/right.rb @@ -1,5 +1,5 @@ class Role - + include DataMapper::Resource property :id, Fixnum, :serial => true @@ -9,4 +9,4 @@ class Role many_to_many :users many_to_many :rights #, :order => 'name ASC' -end \ No newline at end of file +end app/models/role.rb @@ -17,7 +17,7 @@ class State property :country_code, String, :key => true # foreign-key, ISO 3166-1 alpha-2 property :abbr, String, :key => true, :length => 10 property :name, String, :length => 50, :nullable => false - + belongs_to :country - -end \ No newline at end of file + +end app/models/state.rb @@ -3,18 +3,18 @@ require 'dm-validations' # A free-form, flat taxonomoy. # class Tag - + include DataMapper::Resource - + property :id, Fixnum, :serial => true property :name, String, :length => 100, :nullable => false, :key => :unique property :rank, Fixnum - + validates_present :name validates_is_unique :rank - + def self.all_ordered all(:order => [ :name.asc ]) end - -end \ No newline at end of file + +end app/models/tag.rb @@ -4,16 +4,16 @@ require "dm-aggregates" require "dm-validations" begin require File.join(File.dirname(__FILE__), '..', '..', "lib", "authenticated_system", "authenticated_dependencies") -rescue +rescue nil end class User - + include DataMapper::Resource include AuthenticatedSystem::Model - + attr_accessor :password, :password_confirmation - + property :id, Fixnum, :serial => true property :login, String, :unique => true property :email, String @@ -44,11 +44,11 @@ class User def login=(value) @login = value.downcase unless value.nil? end - + EMAIL_FROM = "info@mysite.com" SIGNUP_MAIL_SUBJECT = "Welcome to MYSITE. Please activate your account." ACTIVATE_MAIL_SUBJECT = "Welcome to MYSITE" - + # Activates the user in the database def activate @activated = true @@ -65,15 +65,15 @@ class User :user => self ) end - + #def send_signup_notification # UserMailer.dispatch_and_deliver( # :signup_notification, # { :from => User::EMAIL_FROM, # :to => self.email, # :subject => User::SIGNUP_MAIL_SUBJECT }, - # :user => self + # :user => self # ) #end - + end app/models/user.rb @@ -1 +1 @@ -<%= catch_content :layout %> \ No newline at end of file +<%= catch_content :layout %> app/parts/views/layout/application.html.haml @@ -1 +1 @@ -You're in index of the Customers \ No newline at end of file +You're in index of the Customers app/views/customers/index.html.haml @@ -13,10 +13,10 @@ %h1 MerbMart #navigation %ul - %li + %li =link_to 'Store', '' #content = catch_content :for_layout #footer %p Powered by MerbMart, Merb and DataMapper. - %p Copyright &copy; 2008, Alex Coles. \ No newline at end of file + %p Copyright &copy; 2008, Alex Coles. app/views/layout/application.html.haml @@ -1 +1 @@ -This is the frontpage of the MerbMart store. \ No newline at end of file +This is the frontpage of the MerbMart store. app/views/store/index.html.haml @@ -4,4 +4,4 @@ %p= text_control :email, :label => "Email" %p= password_control :password, :label => "Password" %p= password_control :password_confirmation, :label => "Password Confirmation" - %p= submit_button "Sign up" \ No newline at end of file + %p= submit_button "Sign up" app/views/users/new.html.haml @@ -1 +1 @@ -Autotest.add_discovery { "merb" } \ No newline at end of file +Autotest.add_discovery { "merb" } autotest.bak/discover.rb @@ -2,81 +2,81 @@ require 'autotest' class Autotest::Merb < Autotest - + # +model_tests_dir+:: the directory to find model-centric tests # +controller_tests_dir+:: the directory to find controller-centric tests # +view_tests_dir+:: the directory to find view-centric tests # +fixtures_dir+:: the directory to find fixtures in attr_accessor :model_tests_dir, :controller_tests_dir, :view_tests_dir, :fixtures_dir - + def initialize # :nodoc: super - + initialize_test_layout - + # Ignore any happenings in these directories add_exception %r%^\./(?:doc|log|public|tmp)% - + # Ignore any mappings that Autotest may have already set up clear_mappings - - # Any changes to a file in the root of the 'lib' directory will run any + + # Any changes to a file in the root of the 'lib' directory will run any # model test with a corresponding name. add_mapping %r%^lib\/.*\.rb% do |filename, _| files_matching Regexp.new(["^#{model_test_for(filename)}$"]) end - - # Any changes to a fixture will run corresponding view, controller and + + # Any changes to a fixture will run corresponding view, controller and # model tests add_mapping %r%^#{fixtures_dir}/(.*)s.yml% do |_, m| [ - model_test_for(m[1]), - controller_test_for(m[1]), + model_test_for(m[1]), + controller_test_for(m[1]), view_test_for(m[1]) ] end - + # Any change to a test or test will cause it to be run add_mapping %r%^test/(unit|models|integration|controllers|views|functional)/.*rb$% do |filename, _| filename end - + # Any change to a model will cause it's corresponding test to be run add_mapping %r%^app/models/(.*)\.rb$% do |_, m| model_test_for(m[1]) end - - # Any change to the global helper will result in all view and controller + + # Any change to the global helper will result in all view and controller # tests being run add_mapping %r%^app/helpers/global_helpers.rb% do files_matching %r%^test/(views|functional|controllers)/.*_test\.rb$% end - - # Any change to a helper will run it's corresponding view and controller - # tests, unless the helper is the global helper. Changes to the global + + # Any change to a helper will run it's corresponding view and controller + # tests, unless the helper is the global helper. Changes to the global # helper run all view and controller tests. add_mapping %r%^app/helpers/(.*)_helper(s)?.rb% do |_, m| if m[1] == "global" then files_matching %r%^test/(views|functional|controllers)/.*_test\.rb$% else [ - view_test_for(m[1]), + view_test_for(m[1]), controller_test_for(m[1]) ] end end - - # Changes to views result in their corresponding view and controller test + + # Changes to views result in their corresponding view and controller test # being run add_mapping %r%^app/views/(.*)/% do |_, m| [ - view_test_for(m[1]), + view_test_for(m[1]), controller_test_for(m[1]) ] end - - # Changes to a controller result in its corresponding test being run. If - # the controller is the exception or application controller, all + + # Changes to a controller result in its corresponding test being run. If + # the controller is the exception or application controller, all # controller tests are run. add_mapping %r%^app/controllers/(.*)\.rb$% do |_, m| if ["application", "exception"].include?(m[1]) @@ -91,16 +91,16 @@ class Autotest::Merb < Autotest files_matching %r%^test/(controllers|views|functional)/.*_test\.rb$% end - # If any of the major files governing the environment are altered, run + # If any of the major files governing the environment are altered, run # everything add_mapping %r%^test/test_helper.rb|config/(init|rack|environments/test.rb|database.yml)% do # FIX files_matching %r%^test/(unit|models|controllers|views|functional)/.*_test\.rb$% end end - + private - # Determines the paths we can expect tests or specs to reside, as well as + # Determines the paths we can expect tests or specs to reside, as well as # corresponding fixtures. def initialize_test_layout self.model_tests_dir = "test/unit" @@ -108,19 +108,19 @@ private self.view_tests_dir = "test/views" self.fixtures_dir = "test/fixtures" end - - # Given a filename and the test type, this method will return the + + # Given a filename and the test type, this method will return the # corresponding test's or spec's name. - # + # # ==== Arguments # +filename+<String>:: the file name of the model, view, or controller # +kind_of_test+<Symbol>:: the type of test we that we should run - # + # # ==== Returns # String:: the name of the corresponding test or spec - # + # # ==== Example - # + # # > test_for("user", :model) # => "user_test.rb" # > test_for("login", :controller) @@ -133,17 +133,17 @@ private name << "test" return name.join("_") + ".rb" end - + def model_test_for(filename) [model_tests_dir, test_for(filename, :model)].join("/") end - + def controller_test_for(filename) [controller_tests_dir, test_for(filename, :controller)].join("/") end - + def view_test_for(filename) [view_tests_dir, test_for(filename, :view)].join("/") end - -end \ No newline at end of file + +end autotest.bak/merb.rb @@ -4,4 +4,4 @@ Merb::Config.use { |c| c[:reload_classes] = false c[:log_auto_flush ] = true c[:log_file] = Merb.log_path / 'merb_rake.log' -} \ No newline at end of file +} config/environments/rake.rb @@ -1,10 +1,10 @@ -# __ __ _ __ __ _ -# | \/ |___ _ _| |__| \/ |__ _ _ _| |_ +# __ __ _ __ __ _ +# | \/ |___ _ _| |__| \/ |__ _ _ _| |_ # | |\/| / -_) '_| '_ \ |\/| / _` | '_| _| # |_| |_\___|_| |_.__/_| |_\__,_|_| \__| # # Copyright (C) 2008 Alex Coles -# +# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 2 of the License, or @@ -20,7 +20,7 @@ # # ==== Load paths - + # Make the app's "gems" directory a place where gems are loaded from Gem.clear_paths Gem.path.unshift(Merb.root / "gems") @@ -73,8 +73,8 @@ Merb::Config.use do |c| c[:session_store] = 'cookie' # c[:session_store] = 'datamapper' ## FIXME: temporarily disabled # c[:use_mutex] = false ## FIXME: disable Mutex - -end + +end # ==== Inflector Customization config/init.rb @@ -1 +1 @@ -run Merb::Rack::Application.new \ No newline at end of file +run Merb::Rack::Application.new config/rack.rb @@ -16,11 +16,11 @@ Merb::Router.prepare do |r| # RESTful routes r.resources :users - + r.match("/login").to(:controller => "Sessions", :action => "create").name(:login) r.match("/logout").to(:controller => "Sessions", :action => "destroy").name(:logout) r.match("/users/activate/:activation_code").to(:controller => "Users", :action => "activate").name(:user_activation) - + r.match('/').to(:controller => 'Store', :action => 'index') # Default administration mapping @@ -31,12 +31,12 @@ Merb::Router.prepare do |r| #r.match('/blog').to(:controller => 'ContentNodes', :action => 'index') #r.match('/blog/section/:section_name').to(:controller => 'ContentNodes', :action => 'list_by_section') #r.match('/blog/:name').to(:controller => 'ContentNodes', :action => 'show_by_name') - + # map.connect '/store/show_by_tags/*tags', # :controller => 'store', # :action => 'show_by_tags' # For things like /about_us, etc #r.match('/:name').to(:controller => 'ContentNodes', :action => 'show_by_name') - + end config/router.rb @@ -6,19 +6,19 @@ module AuthenticatedSystem def logged_in? current_user != :false end - + # Accesses the current user from the session. Set it to :false if login fails # so that future calls do not hit the database. def current_user @current_user ||= (login_from_session || login_from_basic_auth || login_from_cookie || :false) end - + # Store the given user in the session. def current_user=(new_user) session[:user] = (new_user.nil? || new_user.is_a?(Symbol)) ? nil : new_user.id @current_user = new_user end - + # Check if the user is authorized # # Override this method in your controllers if you want to restrict access @@ -77,14 +77,14 @@ module AuthenticatedSystem render "Couldn't authenticate you" end end - + # Store the URI of the current request in the session. # # We can return to this location by calling #redirect_back_or_default. def store_location session[:return_to] = request.uri end - + # Redirect to the URI stored by the most recent store_location call or # to the passed default. def redirect_back_or_default(default) @@ -92,7 +92,7 @@ module AuthenticatedSystem session[:return_to] = nil redirect loc end - + # Inclusion hook to make #current_user and #logged_in? # available as ActionView helper methods. # def self.included(base) @@ -111,7 +111,7 @@ module AuthenticatedSystem end # Called from #current_user. Finaly, attempt to login by an expiring token in the cookie. - def login_from_cookie + def login_from_cookie user = cookies[:auth_token] && User.find_authenticated_model_with_remember_token(cookies[:auth_token]) if user && user.remember_token? user.remember_me @@ -119,7 +119,7 @@ module AuthenticatedSystem self.current_user = user end end - + def reset_session session.data.each{|k,v| session.data.delete(k)} end @@ -131,7 +131,7 @@ module AuthenticatedSystem def get_auth_data auth_key = @@http_auth_headers.detect { |h| request.env.has_key?(h) } auth_data = request.env[auth_key].to_s.split unless auth_key.blank? - return auth_data && auth_data[0] == 'Basic' ? Base64.decode64(auth_data[1]).split(':')[0..1] : [nil, nil] + return auth_data && auth_data[0] == 'Basic' ? Base64.decode64(auth_data[1]).split(':')[0..1] : [nil, nil] end end end lib/authenticated_system/authenticated_system_controller.rb @@ -1,30 +1,30 @@ module AuthenticatedSystem module Model - + def self.included(base) base.send(:include, InstanceMethods) base.send(:extend, ClassMethods) base.send(:extend, AuthenticatedSystem::OrmMap ) end - + module InstanceMethods def authenticated?(password) crypted_password == encrypt(password) - end + end - # before filter + # before filter def encrypt_password return if password.blank? self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{login}--") if new_record? self.crypted_password = encrypt(password) end - + # Encrypts the password with the user salt def encrypt(password) self.class.encrypt(password, salt) end - + def remember_token? remember_token_expires_at && DateTime.now < DateTime.parse(remember_token_expires_at.to_s) end @@ -40,7 +40,7 @@ module AuthenticatedSystem end # These create and unset the fields required for remembering users between browser closes - # Default of 2 weeks + # Default of 2 weeks def remember_me remember_me_for (Merb::Const::WEEK * 2) end @@ -50,7 +50,7 @@ module AuthenticatedSystem self.remember_token = nil self.save end - + # Returns true if the <%= singular_name %> has just been activated. def recently_activated? @activated @@ -64,7 +64,7 @@ module AuthenticatedSystem def active? # the existence of an activation code means they have not activated yet activation_code.nil? - end + end def password_required? crypted_password.blank? || !password.blank? @@ -76,13 +76,13 @@ module AuthenticatedSystem end end - + module ClassMethods # Encrypts some data with the salt. def encrypt(password, salt) Digest::SHA1.hexdigest("--#{salt}--#{password}--") end - + # Authenticates a user by their login name and unencrypted password. Returns the user or nil. def authenticate(login, password) u = find_activated_authenticated_model_with_login(login) # need to get the salt @@ -90,6 +90,6 @@ module AuthenticatedSystem end end - + end end lib/authenticated_system/authenticated_system_model.rb @@ -1,14 +1,14 @@ module AuthenticatedSystem module OrmMap - + def find_authenticated_model_with_id(id) User.first(:id => id) end - + def find_authenticated_model_with_remember_token(rt) User.first(:remember_token => rt) end - + def find_activated_authenticated_model_with_login(login) if User.instance_methods.include?("activated_at") User.first(:login => login, :activated_at.not => nil) @@ -16,19 +16,19 @@ module AuthenticatedSystem User.first(:login => login) end end - + def find_activated_authenticated_model(activation_code) User.first(:activation_code => activation_code) - end - + end + def find_with_conditions(conditions) User.first(conditions) end - + # A method to assist with specs def clear_database_table User.auto_migrate! end end - -end \ No newline at end of file + +end lib/authenticated_system/authenticated_system_orm_map.rb @@ -1,6 +1,6 @@ module Mart - - - -end \ No newline at end of file + + + +end lib/mart.rb @@ -1,21 +1,21 @@ #!/usr/bin/env ruby - + require 'rubygems' require 'merb-core' # this is Merb.root, change this if you have some funky setup. merb_root = File.expand_path(File.dirname(__FILE__) / '../') - + # If the fcgi process runs as apache, make sure # we have an inlinedir set for Rubyinline action-args to work unless ENV["INLINEDIR"] || ENV["HOME"] tmpdir = merb_root / "tmp" unless File.directory?(tmpdir) Dir.mkdir(tmpdir) - end + end ENV["INLINEDIR"] = tmpdir end - + # start merb with the fcgi adapter, add options or change the log dir here Merb.start(:adapter => 'fcgi', :merb_root => merb_root, public/merb.fcgi @@ -7,13 +7,13 @@ class Merb::Mailer end class Hash - + def with( opts ) self.merge(opts) end - + def without(*args) self.dup.delete_if{ |k,v| args.include?(k)} end - + end spec/authenticated_system_spec_helper.rb @@ -5,4 +5,4 @@ describe Admin::Files, "index action" do @controller = Admin::Files.build(fake_request) @controller.dispatch('index') end -end \ No newline at end of file +end spec/controllers/admin/files_spec.rb @@ -5,4 +5,4 @@ describe Admin::Orders, "index action" do @controller = Admin::Orders.build(fake_request) @controller.dispatch('index') end -end \ No newline at end of file +end spec/controllers/admin/orders_spec.rb @@ -5,4 +5,4 @@ describe Admin::Preferences, "index action" do @controller = Admin::Preferences.build(fake_request) @controller.dispatch('index') end -end \ No newline at end of file +end spec/controllers/admin/preferences_spec.rb @@ -5,4 +5,4 @@ describe Admin::Products, "index action" do @controller = Admin::Products.build(fake_request) @controller.dispatch('index') end -end \ No newline at end of file +end spec/controllers/admin/products_spec.rb @@ -5,4 +5,4 @@ describe Admin::Promotions, "index action" do @controller = Admin::Promotions.build(fake_request) @controller.dispatch('index') end -end \ No newline at end of file +end spec/controllers/admin/promotions_spec.rb @@ -5,4 +5,4 @@ describe Admin::Tags, "index action" do @controller = Admin::Tags.build(fake_request) @controller.dispatch('index') end -end \ No newline at end of file +end spec/controllers/admin/tags_spec.rb @@ -4,4 +4,4 @@ describe Customers, "index action" do before(:each) do dispatch_to(Customers, :index) end -end \ No newline at end of file +end spec/controllers/customers_spec.rb @@ -5,42 +5,42 @@ require 'cgi' describe "Sessions Controller", "index action" do include UserSpecHelper - + before(:each) do User.clear_database_table @quentin = User.create(valid_user_hash.with(:login => "quentin", :password => "test", :password_confirmation => "test")) @controller = Sessions.new(fake_request) @quentin.activate end - + it "should have a route to Sessions#new from '/login'" do request_to("/login") do |params| params[:controller].should == "Sessions" params[:action].should == "create" - end + end end - + it "should route to Sessions#create from '/login' via post" do request_to("/login", :post) do |params| params[:controller].should == "Sessions" params[:action].should == "create" - end + end end - + it "should have a named route :login" do @controller.url(:login).should == "/login" end - + it "should have route to Sessions#destroy from '/logout' via delete" do request_to("/logout", :delete) do |params| params[:controller].should == "Sessions" params[:action].should == "destroy" - end + end end - + it "should route to Sessions#destroy from '/logout' via get" do request_to("/logout") do |params| - params[:controller].should == "Sessions" + params[:controller].should == "Sessions" params[:action].should == "destroy" end end @@ -51,7 +51,7 @@ describe "Sessions Controller", "index action" do controller.session[:user].should == @quentin.id controller.should redirect_to("/") end - + it 'fails login and does not redirect' do controller = post "/login", :login => 'quentin', :password => 'bad password' controller.session[:user].should be_nil @@ -68,18 +68,18 @@ describe "Sessions Controller", "index action" do controller = post "/login", :login => 'quentin', :password => 'test', :remember_me => "1" controller.cookies["auth_token"].should_not be_nil end - + it 'does not remember me' do controller = post "/login", :login => 'quentin', :password => 'test', :remember_me => "0" controller.cookies["auth_token"].should be_nil end - + it 'deletes token on logout' do controller = get("/logout") {|request| request.stub!(:current_user).and_return(@quentin) } controller.cookies["auth_token"].should == nil end - - + + it 'logs in with cookie' do @quentin.remember_me controller = get "/login" do |c| @@ -91,7 +91,7 @@ describe "Sessions Controller", "index action" do def auth_token(token) CGI::Cookie.new('name' => 'auth_token', 'value' => token) end - + def cookie_for(user) auth_token user.remember_token end spec/controllers/sessions_spec.rb @@ -3,17 +3,17 @@ require File.join( File.dirname(__FILE__), "..", "user_spec_helper") require File.join( File.dirname(__FILE__), "..", "authenticated_system_spec_helper") describe Users do - + include UserSpecHelper - + before(:each) do User.clear_database_table end - + it 'allows signup' do lambda do controller = create_user - controller.should redirect + controller.should redirect end.should change(User, :count).by(1) end @@ -24,7 +24,7 @@ describe Users do controller.should respond_successfully end.should_not change(User, :count) end - + it 'requires password on signup' do lambda do controller = create_user(:password => nil) @@ -32,7 +32,7 @@ describe Users do controller.should respond_successfully end.should_not change(User, :count) end - + it 'requires password confirmation on signup' do lambda do controller = create_user(:password_confirmation => nil) @@ -40,7 +40,7 @@ describe Users do controller.should respond_successfully end.should_not change(User, :count) end - + it 'requires email on signup' do lambda do controller = create_user(:email => nil) @@ -48,12 +48,12 @@ describe Users do controller.should respond_successfully end.should_not change(User, :count) end - + it "should have a route for user activation" do request_to("/users/activate/1234") do |params| params[:controller].should == "Users" - params[:action].should == "activate" - params[:activation_code].should == "1234" + params[:action].should == "activate" + params[:activation_code].should == "1234" end end @@ -61,10 +61,10 @@ describe Users do controller = create_user(:login => "aaron", :password => "test", :password_confirmation => "test") @user = controller.assigns(:user) User.authenticate('aaron', 'test').should be_nil - controller = get "/users/activate/1234" + controller = get "/users/activate/1234" controller.should redirect_to("/") end - + def create_user(options = {}) post "/users", :user => valid_user_hash.merge(options) end spec/controllers/users_spec.rb @@ -2,4 +2,4 @@ require File.join(File.dirname(__FILE__), "../..", 'spec_helper.rb') describe Merb::Admin::FilesHelper do -end \ No newline at end of file +end spec/helpers/admin/files_helper_spec.rb @@ -2,4 +2,4 @@ require File.join(File.dirname(__FILE__), "../..", 'spec_helper.rb') describe Merb::Admin::OrdersHelper do -end \ No newline at end of file +end spec/helpers/admin/orders_helper_spec.rb @@ -2,4 +2,4 @@ require File.join(File.dirname(__FILE__), "../..", 'spec_helper.rb') describe Merb::Admin::PreferencesHelper do -end \ No newline at end of file +end spec/helpers/admin/preferences_helper_spec.rb @@ -2,4 +2,4 @@ require File.join(File.dirname(__FILE__), "../..", 'spec_helper.rb') describe Merb::Admin::ProductsHelper do -end \ No newline at end of file +end spec/helpers/admin/products_helper_spec.rb @@ -2,4 +2,4 @@ require File.join(File.dirname(__FILE__), "../..", 'spec_helper.rb') describe Merb::Admin::PromotionsHelper do -end \ No newline at end of file +end spec/helpers/admin/promotions_helper_spec.rb @@ -2,4 +2,4 @@ require File.join(File.dirname(__FILE__), "../..", 'spec_helper.rb') describe Merb::Admin::TagsHelper do -end \ No newline at end of file +end spec/helpers/admin/tags_helper_spec.rb @@ -2,4 +2,4 @@ require File.join(File.dirname(__FILE__), "..", 'spec_helper.rb') describe Merb::CustomersHelper do -end \ No newline at end of file +end spec/helpers/customers_helper_spec.rb @@ -3,61 +3,61 @@ require File.join( File.dirname(__FILE__), "..", "user_spec_helper") require File.join( File.dirname(__FILE__), "..", "authenticated_system_spec_helper") describe UserMailer do - + def deliver(action, mail_opts= {}, opts = {}) UserMailer.dispatch_and_deliver(action, mail_opts, opts) @delivery = Merb::Mailer.deliveries.last end - + before(:each) do @u = User.new(:email => "homer@simpsons.com", :login => "homer", :activation_code => "12345") @mailer_params = { :from => "info@mysite.com", :to => @u.email, :subject => "Welcome to MySite.com" } end - + after(:each) do Merb::Mailer.deliveries.clear end - + it "should send mail to homer@simpsons.com for the signup email" do deliver(:signup_notification, @mailer_params, :user => @u) @delivery.assigns(:headers).should include("to: homer@simpsons.com") end - + it "should send the mail from 'info@mysite.com' for the signup email" do deliver(:signup_notification, @mailer_params, :user => @u) @delivery.assigns(:headers).should include("from: info@mysite.com") end - + it "should mention the users login in the text signup mail" do deliver(:signup_notification, @mailer_params, :user => @u) @delivery.text.should include(@u.login) end - + it "should mention the users login in the HTML signup mail" do deliver(:signup_notification, @mailer_params, :user => @u) @delivery.html.should include(@u.login) end - + it "should mention the activation link in the signup emails" do deliver(:signup_notification, @mailer_params, :user => @u) the_url = UserMailer.new.url(:user_activation, :activation_code => @u.activation_code) the_url.should_not be_nil - @delivery.text.should include( the_url ) + @delivery.text.should include( the_url ) @delivery.html.should include( the_url ) end - + it "should send mail to homer@simpson.com for the activation email" do deliver(:activation_notification, @mailer_params, :user => @u) @delivery.assigns(:headers).should include("to: homer@simpsons.com") end - + it "should send the mail from 'info@mysite.com' for the activation email" do deliver(:activation_notification, @mailer_params, :user => @u) - @delivery.assigns(:headers).should include("from: info@mysite.com") + @delivery.assigns(:headers).should include("from: info@mysite.com") end - + it "should mention ther users login in the text activation mail" do deliver(:activation_notification, @mailer_params, :user => @u) @delivery.text.should include(@u.login) @@ -65,6 +65,6 @@ describe UserMailer do it "should mention the users login in the html activation mail" do deliver(:activation_notification, @mailer_params, :user => @u) - @delivery.html.should include(@u.login) + @delivery.html.should include(@u.login) end -end \ No newline at end of file +end spec/mailers/user_mailer_spec.rb @@ -8,13 +8,13 @@ describe Address do address.should respond_to(:country) address.should respond_to(:country=) end - + it "should belong to a state" do address = Address.new address.should respond_to(:state) address.should respond_to(:state=) end - + it "should belong to a province (alias for state)" do #state = mock("state") address = Address.new @@ -23,7 +23,7 @@ describe Address do #address.province = state end end - + it "should require a zip, telephone, last name, first name and address" do address = Address.new address.valid? @@ -37,7 +37,7 @@ describe Address do address.postal_code = "10021" address.should be_valid end - + it "should provide the zipcode alias for postal code" do address1 = Address.new address1.postal_code = "91210" @@ -46,7 +46,7 @@ describe Address do address2.zipcode = "10004" address2.postal_code.should == "10004" end - + it "should limit the first name to be a maximum of 50 characters" do address = Address.new [3,50].each do |num| @@ -54,12 +54,12 @@ describe Address do address.valid? address.errors.on(:first_name).should be_nil end - + address.first_name = "a" * 51 address.valid? address.errors.on(:first_name).should_not be_nil end - + it "should limit the last name to be a maximum of 50 characters" do address = Address.new [3,50].each do |num| @@ -67,16 +67,16 @@ describe Address do address.valid? address.errors.on(:last_name).should be_nil end - + address.last_name = "z" * 51 address.valid? address.errors.on(:last_name).should_not be_nil end - + it "should limit the address to a maximum of 255 characters" - + #it "should not allow PO Box or variants to be entered as an address" - + it "should provide a name" do address = Address.new address.first_name = "John" @@ -84,4 +84,4 @@ describe Address do address.name.should == "John Doe" end -end \ No newline at end of file +end spec/models/address_spec.rb @@ -7,7 +7,7 @@ describe Country do country = Country.new country.should respond_to(:states) end - + it "should have many (0..*) provinces (alias for states)" do country = Country.new country.should respond_to(:provinces) @@ -23,12 +23,12 @@ describe Country do @country.name = "Andorra" @country.should be_valid end - + it "should have a name field" do @country.valid? @country.errors.on(:name).should_not be_nil end - + it "should have a unique name field" do country1 = Country.new(:code => "FR", :name => "France") country2 = Country.new(:code => "ZZ", :name => "France") @@ -36,17 +36,17 @@ describe Country do country1.name = "France" country2.valid? country2.save.should be_false - country2.errors.on(:name).should_not be_nil + country2.errors.on(:name).should_not be_nil end - + it "should have a code field" do @country.name = "Lithuania" @country.code = "LT" @country.should be_valid end - + describe "finders" do - + end - -end \ No newline at end of file + +end spec/models/country_spec.rb @@ -1,8 +1,8 @@ require File.join( File.dirname(__FILE__), "..", "..", "spec_helper" ) describe Mart::AbstractUpload do - + # UserUpload acts as an abstract class # see Asset and Image specs -end \ No newline at end of file +end spec/models/mart/abstract_upload_spec.rb @@ -7,49 +7,49 @@ describe Mart::Accounts::AbstractAccount do it "should have an order" it "should belong to a customer (OrderUser)" end - + it "should have a list of months" do months = Mart::Accounts::AbstractAccount.months months.should_not == nil months.empty?.should == false months.length.should == 12 - + months.first.should == 1 months.at(6).should == 7 months.last.should == 12 end - + it "should have a list of the next 10 years" do years = Mart::Accounts::AbstractAccount.years years.should_not == nil years.empty?.should == false years.length.should == 10 - + years.first.should == Date.today.year years.at(5).should == Date.today.year + 5 years.last.should == Date.today.year + 9 end - + #it "should clear personal information" do # order_account = Accounts::BaseAccount.new # order_account.cc_number = '02301033012102010102' - + #end - + #it "should crypt cc_number" do # order_account = Accounts::BaseAccount.new #end - + #it "should crypt account_number" do # order_account = Accounts::BaseAccount.new #end - + #it "should get_unencrypted_number" do # order_account = Accounts::BaseAccount.new #end - + #it "should set unencrypted number" do # order_account = Accounts::BaseAccount.new #end -end \ No newline at end of file +end spec/models/mart/accounts/abstract_account_spec.rb @@ -6,4 +6,4 @@ describe Mart::Accounts::BankAccount do it "should have an account number if the account type is a checking account" -end \ No newline at end of file +end spec/models/mart/accounts/bank_account_spec.rb @@ -13,4 +13,4 @@ describe Mart::Accounts::CreditCardAccount do it "should have a numeric expiration year" it "should have a valid expiration month" -end \ No newline at end of file +end spec/models/mart/accounts/credit_card_account_spec.rb @@ -8,4 +8,4 @@ describe Mart::Accounts::GoogleCheckoutAccount do pending end -end \ No newline at end of file +end spec/models/mart/accounts/google_checkout_account_spec.rb @@ -8,4 +8,4 @@ describe Mart::Accounts::PaypalAccount do pending end -end \ No newline at end of file +end spec/models/mart/accounts/paypal_account_spec.rb @@ -1,12 +1,12 @@ require File.join( File.dirname(__FILE__), "..", "..", "spec_helper" ) describe Mart::Asset do - + it "should provide an extension" do @asset = Mart::Asset.new @asset.filename = "fish.pdf" @asset.extension.should == "pdf" - + @asset.filename = "document.html.erb" @asset.extension.should == "erb" @asset.extension.should_not == "html" @@ -17,11 +17,11 @@ describe Mart::Asset do @asset.filename = "fish.pdf" @asset.filename_base.should == "fish" end - + it "should provide a relative path" do @asset = Mart::Asset.new @asset.filename = "a_dogs_life.html" @asset.relative_path.should == "a_dogs_life.html" end -end \ No newline at end of file +end spec/models/mart/asset_spec.rb @@ -7,25 +7,25 @@ describe Mart::Customer do before(:each) do @customer = Mart::Customer.new end - + it "should have many (0..*) orders" do @customer.should respond_to(:orders) end - + it "should have many (0..*) addresses" do @customer.should respond_to(:addresses) end - + it "should have many (0..*) accounts" do @customer.should respond_to(:accounts) end - + it "should have many (0..*) wishlist items" do @customer.should respond_to(:wishlist_items) end - + it "should have items" # ?? - + end describe "email address" do @@ -35,32 +35,32 @@ describe Mart::Customer do customer.valid? customer.errors.on(:email_address).should_not be_nil end - + it "should require an email address to be less than least 255" it "should require an email address to be unique" it "should require a valid email address" - + end - + it "should have an authenticate method" - + #it "should generate a random password" do # password = Customer.generate_password # password.should_not be_nil # password.length.should == 8 #end - + #it "should generate a random password of 15 characters" do # password = Customer.generate_password(15) # password.should_not be_nil # password.length.should == 15 #end - + it "should provide the last billing address" it "should provide the last shipping address" it "should provide the last order account" - + #it "should have a reset_password method" #it "should have an add_item_to_wishlist method" #it "should have a remove_item_from_wishlist method" @@ -69,4 +69,4 @@ describe Mart::Customer do it "should have one last order" end -end \ No newline at end of file +end spec/models/mart/customer_spec.rb @@ -15,7 +15,7 @@ describe Mart::Customers::Cart, "tax calculation" do @cart = Mart::Customers::Cart.new @cart.tax.should == 0.0 end - + it "should return a valid tax_cost" do @cart = Mart::Customers::Cart.new # need to use a mock for this @@ -27,19 +27,19 @@ describe Mart::Customers::Cart, "tax calculation" do end describe Mart::Customers::Cart, "total calculation" do - + it "should have a zero total on initialize" do @cart = Mart::Customers::Cart.new @cart.total.should == 0.0 end - + end describe Mart::Customers::Cart, "shipping_cost calculation" do - + it "should have a zero shipping_cost on initialize" do @cart = Mart::Customers::Cart.new @cart.shipping_cost.should == 0.0 end - -end \ No newline at end of file + +end spec/models/mart/customers/cart_spec.rb @@ -7,19 +7,19 @@ describe Mart::Customers::WishlistItem do end describe "associations" do - + it "should belong to a customer" do @wishlist_item.should respond_to(:customer) end - + it "should belong to an item" do @wishlist_item.should respond_to(:store_item) end - + end - + describe "properties" do it "should have a created on date" end -end \ No newline at end of file +end spec/models/mart/customers/wishlist_item_spec.rb @@ -11,18 +11,18 @@ describe Mart::Image do @image = Mart::Image.new end - it "should have a size" do + it "should have a size" do @image.should_not be_valid @image.width = 20 @image.height = 40 @image.should be_valid end - + it "should provide an extension" do @image.should be_nil @image.filename = "fish.jpg" @image.extension.should == "jpg" - + @image.filename = "document.html.erb" @image.extension.should == "erb" @image.extension.should_not == "html" @@ -32,10 +32,10 @@ describe Mart::Image do @image.filename = "fish.jpg" @image.filename_without_ext.should == "fish" end - + it "should provide a relative path" do @image.filename = "a_dogs_life.gif" @image.relative_path.should == "a_dogs_life.gif" end - -end \ No newline at end of file + +end spec/models/mart/image_spec.rb @@ -16,29 +16,29 @@ describe Mart::Order do @order.should respond_to(:customer) @order.should respond_to(:customer=) end - + it "should have many (1..*) line items" do @order.should respond_to(:line_items) #@order.should respond_to(:line_items=) end - + it "should have at least one line item" - + it "should have a billing address" do @order.should respond_to(:billing_address) @order.should respond_to(:billing_address=) end - + it "should have a shipping address" do @order.should respond_to(:shipping_address) @order.should respond_to(:shipping_address=) end - + it "may belong to a promotion" do @order.should respond_to(:promotion) @order.should respond_to(:promotion=) end - + end it "should be valid" do @@ -47,19 +47,19 @@ describe Mart::Order do end it "should have a total" - + describe "class methods" do - + it "should return a search result" do pending end - + it "should generate an order number" do #Mart::Order.generate_order_number Mart::Order.should respond_to(:generate_order_number) pending end - + it "should get totals" it "should get CSV for orders" do @@ -73,7 +73,7 @@ describe Mart::Order do #@csv = Mart::Order.get_csv_for_orders(order_list) pending end - + it "should get XML for orders" do order1 = Mart::Order.new order2 = Mart::Order.new @@ -84,13 +84,13 @@ describe Mart::Order do #@xml = Mart::Order.get_xml_for_orders(order_list) pending end - - it "should get order status" - + + it "should get order status" + end - + it "should assign line items from a hash" - + it "should get the total amount of all line items associated with this order" it "should test weight" @@ -100,16 +100,16 @@ describe Mart::Order do it "should work for a valid transaction" it "should not work for an invalid transaction" - #it "should clean up" + #it "should clean up" #it "should not cleanup" it "should have a shipping type" - + it "should have a order status code" - + it "should belong to a promotion" it "should have a unique order number" -end \ No newline at end of file +end spec/models/mart/order_spec.rb @@ -2,13 +2,13 @@ require File.join( File.dirname(__FILE__), "..", "..", "..", "spec_helper" ) describe Mart::Orders::LineItem do - describe "associations" do + describe "associations" do it "should belong to a product" do line_item = Mart::Orders::LineItem.new line_item.should respond_to(:product) line_item.should respond_to(:product=) end - + it "should belong to an order item" do line_item = Mart::Orders::LineItem.new pending ## FIXME: should not be both product_id + store_item_id @@ -23,4 +23,4 @@ describe Mart::Orders::LineItem do it "should provide a code" it "should provide a name" -end \ No newline at end of file +end spec/models/mart/orders/line_item_spec.rb @@ -8,8 +8,8 @@ describe Mart::Orders::StatusCode do status_code.should respond_to(:orders) end end - - it "should know if it the order can be edited or not, based on + + it "should know if it the order can be edited or not, based on status code" do osc = Mart::Orders::StatusCode.new(:id => 1) #osc.is_editable?.should == false @@ -17,4 +17,4 @@ describe Mart::Orders::StatusCode do #osc2.is_editable?.should == true end -end \ No newline at end of file +end spec/models/mart/orders/status_code_spec.rb @@ -17,9 +17,9 @@ describe Mart::Shipping::Type do # shipping_types.should_not be_nil # test the result set #end - + it "should get price" - + #it "should calculate a price for a weight" do # shipping_type = Mart::Shipping::Type.new # shipping_type.price = 86.23 @@ -27,7 +27,7 @@ describe Mart::Shipping::Type do # if no weights are set, then it should return the same price # shipping_type.calculated_price.should == 86.23 #end - + #it "should allow weight variations to be set from a list" do # shipping_type = Mart::Shipping::Type.new # weights = [20.1, 56.32, 123.2, 93.12, 1022.0] @@ -37,4 +37,4 @@ describe Mart::Shipping::Type do # what is it returning? A OrderShippingWeight class. #end -end \ No newline at end of file +end spec/models/mart/shipping/type_spec.rb @@ -13,4 +13,4 @@ describe Mart::Shipping::Weight do it "should have a max weight" it "should have a price" -end \ No newline at end of file +end spec/models/mart/shipping/weight_spec.rb @@ -1,12 +1,12 @@ require File.join( File.dirname(__FILE__), "..", "..", "..", "spec_helper" ) describe Mart::Store::AbstractItem do - + it "should require a name" it "should require a code" - + it "should have a unique code" it "should provide a suggestion_name" -end \ No newline at end of file +end spec/models/mart/store/abstract_item_spec.rb @@ -7,11 +7,11 @@ describe Mart::Store::ProductImage do product_image = Mart::Store::ProductImage.new product_image.should respond_to(:product) end - + it "should belong to an image" do product_image = Mart::Store::ProductImage.new product_image.should respond_to(:image) end end -end \ No newline at end of file +end spec/models/mart/store/product_image_spec.rb @@ -12,21 +12,21 @@ describe Mart::Store::Product do @product.date_available = DateTime.now @product.should be_valid end - + it "should have a date available automatically assigned to it" do pending end describe "associations" do - + it "should have 0..n order line items" do @product.should respond_to(:line_items) end - + it "should have 0..n wishlist items" do @product.should respond_to(:wishlist_items) end - + it "should have 0..n variations" do @product.should respond_to(:variations) end @@ -34,28 +34,28 @@ describe Mart::Store::Product do it "should have many product images" do @product.should respond_to(:product_images) end - + it "should have images" do pending end - + it "should have related products" - + it "should have and belong to many tags" do pending end end - + it "should have a search method" it "should have a find_by_tags method" - + it "should provide a list of tags" it "should provide a display price" it "should provide a quantity" it "should provide a is_published" it "should provide a is_on_sale" - + it "should allow related_product_ids to be set from a list" -end \ No newline at end of file +end spec/models/mart/store/product_spec.rb @@ -7,13 +7,13 @@ describe Mart::Store::Promotion do promotion = Mart::Store::Promotion.new promotion.should respond_to(:item) end - + it "should have 0..* orders" do promotion = Mart::Store::Promotion.new promotion.should respond_to(:orders) end end - + it "should require a code" it "should require a discount amount" it "should require a discount type" @@ -28,4 +28,4 @@ describe Mart::Store::Promotion do it "should provide whether it is active or not" it "should provide a product_name setter" -end \ No newline at end of file +end spec/models/mart/store/promotion_spec.rb @@ -7,7 +7,7 @@ describe Mart::Store::Variation do end describe "associations" do - + it "should belong to a product" do @variation.should respond_to(:product) end @@ -15,14 +15,14 @@ describe Mart::Store::Variation do it "should have 0..* order line items" do @variation.should respond_to(:line_items) end - + it "should have 0..* wishlist items" do @variation.should respond_to(:wishlist_items) end - + end - + it "should provide images" it "should provide a name" -end \ No newline at end of file +end spec/models/mart/store/variation_spec.rb @@ -10,4 +10,4 @@ describe Right do end end -end \ No newline at end of file +end spec/models/right_spec.rb @@ -9,16 +9,16 @@ describe Role do #role.should respond_to(:users) #role.should respond_to(:users=) end - + it "should have and belong to many rights" do role = Role.new #role.should respond_to(:rights) - #role.should respond_to(:rights=) + #role.should respond_to(:rights=) end end - + it "should allow rights to be set by a list of right ids" do pending end -end \ No newline at end of file +end spec/models/role_spec.rb @@ -1,7 +1,7 @@ require File.join( File.dirname(__FILE__), "..", "spec_helper" ) describe State do - + describe "associations" do it "should belong to a country" do state = State.new @@ -10,33 +10,33 @@ describe State do state.should respond_to(:country_code) end end - + before(:each) do State.auto_migrate! # clear db table end - + it "should have a composite key, made up of ISO 3166-1 alpha-2 country code and state abbreviation" do maine = State.new(:country_code => "US", :abbr => "ME", :name => "Maine") alaska = State.new(:country_code => "US", :abbr => "AK", :name => "Alaska") bremen = State.new(:country_code => "DE", :abbr => "HB", :name => "Bremen") - + maine.save alaska.save bremen.save - + #State["US", "AK"] ## FIXME alaska = State.get("US", "AK") alaska.should_not be_nil alaska.key.first.should == "US" alaska.key.last.should == "AK" alaska.name.should == "Alaska" - + #bremen = State["DE", "HB"] ## FIXME bremen = State.get("DE", "HB") bremen.should_not be_nil bremen.key.should == ["DE", "HB"] bremen.name.should == "Bremen" end - -end \ No newline at end of file + +end spec/models/state_spec.rb @@ -3,7 +3,7 @@ require File.join( File.dirname(__FILE__), "..", "spec_helper" ) describe Tag do describe "finders" do - + before(:each) do tag1 = Tag.new(:name => 'umbrellas') tag2 = Tag.new(:name => 'sunscreen') @@ -18,15 +18,15 @@ describe Tag do it "should find all tags ordered by name" do Tag.all_ordered.should_not be_nil end - + #it "should find ordered parents" do # Tag.all_parents.should_not be_nil #end - + it "should find related tags" do #Tag.find_related_tags(id_list) end - + #it "should provide a product count" do # tag = Tag.all # tag.product_count.should_not be_nil @@ -34,4 +34,4 @@ describe Tag do end -end \ No newline at end of file +end spec/models/tag_spec.rb @@ -4,7 +4,7 @@ require File.join( File.dirname(__FILE__), "..", "authenticated_system_spec_help describe User do include UserSpecHelper - + before(:each) do User.clear_database_table UserMailer.stub!(:activation_notification).and_return(true) @@ -16,14 +16,14 @@ describe User do user.valid? user.errors.on(:login).should_not be_nil end - + it "should fail login if there are less than 3 chars" do user = User.new user.login = "AB" user.valid? user.errors.on(:login).should_not be_nil end - + it "should not fail login with between 3 and 40 chars" do user = User.new [3,40].each do |num| @@ -32,21 +32,21 @@ describe User do user.errors.on(:login).should be_nil end end - + it "should fail login with over 90 chars" do user = User.new user.login = "A" * 41 user.valid? - user.errors.on(:login).should_not be_nil + user.errors.on(:login).should_not be_nil end - + it "should make a valid user" do user = User.new(valid_user_hash) user.save user.errors.should be_empty - + end - + it "should make sure login is unique" do user = User.new( valid_user_hash.with(:login => "Daniel") ) user2 = User.new( valid_user_hash.with(:login => "Daniel")) @@ -55,7 +55,7 @@ describe User do user2.save.should be_false user2.errors.on(:login).should_not be_nil end - + it "should make sure login is unique regardless of case" do User.first(:login => "Daniel").should be_nil user = User.new( valid_user_hash.with(:login => "Daniel") ) @@ -65,39 +65,39 @@ describe User do user2.save.should be_false user2.errors.on(:login).should_not be_nil end - + it "should downcase logins" do user = User.new( valid_user_hash.with(:login => "DaNieL")) - user.login.should == "daniel" - end - + user.login.should == "daniel" + end + it "should authenticate a user using a class method" do user = User.new(valid_user_hash) user.save user.activate User.authenticate(valid_user_hash[:login], valid_user_hash[:password]).should_not be_nil end - + it "should not authenticate a user using the wrong password" do - user = User.new(valid_user_hash) + user = User.new(valid_user_hash) user.save - + user.activate User.authenticate(valid_user_hash[:login], "not_the_password").should be_nil end - + it "should not authenticate a user using the wrong login" do - user = User.create(valid_user_hash) - + user = User.create(valid_user_hash) + user.activate User.authenticate("not_the_login", valid_user_hash[:password]).should be_nil end - + it "should not authenticate a user that does not exist" do User.authenticate("i_dont_exist", "password").should be_nil end - - + + it "should send a please activate email" do user = User.new(valid_user_hash) UserMailer.should_receive(:dispatch_and_deliver) do |action, mail_args, mailer_params| @@ -108,42 +108,42 @@ describe User do end user.save end - + it "should not send a please activate email when updating" do user = User.new(valid_user_hash) user.save UserMailer.should_not_receive(:signup_notification) user.login = "not in the valid hash for login" - user.save + user.save end - + end describe User, "the password fields for User" do include UserSpecHelper - + before(:each) do User.clear_database_table @user = User.new( valid_user_hash ) UserMailer.stub!(:activation_notification).and_return(true) end - + it "should respond to password" do - @user.should respond_to(:password) + @user.should respond_to(:password) end - + it "should respond to password_confirmation" do @user.should respond_to(:password_confirmation) end - + #it "should have a protected password_required method" do # @user.protected_methods.should include("password_required?") #end - + it "should respond to crypted_password" do - @user.should respond_to(:crypted_password) + @user.should respond_to(:crypted_password) end - + it "should require password if password is required" do user = User.new( valid_user_hash.without(:password)) user.stub!(:password_required?).and_return(true) @@ -151,27 +151,27 @@ describe User, "the password fields for User" do user.errors.on(:password).should_not be_nil user.errors.on(:password).should_not be_empty end - + it "should set the salt" do user = User.new(valid_user_hash) user.salt.should be_nil user.send(:encrypt_password) - user.salt.should_not be_nil + user.salt.should_not be_nil end - + it "should require the password on create" do user = User.new(valid_user_hash.without(:password)) user.save user.errors.on(:password).should_not be_nil user.errors.on(:password).should_not be_empty - end - + end + it "should require password_confirmation if the password_required?" do user = User.new(valid_user_hash.without(:password_confirmation)) user.save (user.errors.on(:password) || user.errors.on(:password_confirmation)).should_not be_nil end - + it "should fail when password is outside 4 and 40 chars" do [3,41].each do |num| user = User.new(valid_user_hash.with(:password => ("a" * num))) @@ -179,21 +179,21 @@ describe User, "the password fields for User" do user.errors.on(:password).should_not be_nil end end - + it "should pass when password is within 4 and 40 chars" do [4,30,40].each do |num| user = User.new(valid_user_hash.with(:password => ("a" * num), :password_confirmation => ("a" * num))) user.valid? user.errors.on(:password).should be_nil - end + end end - + it "should authenticate against a password" do user = User.new(valid_user_hash) - user.save + user.save user.should be_authenticated(valid_user_hash[:password]) end - + it "should not require a password when saving an existing user" do user = User.create(valid_user_hash) user = User.first(:login => valid_user_hash[:login]) @@ -202,38 +202,38 @@ describe User, "the password fields for User" do user.login = "some_different_login_to_allow_saving" (user.save).should be_true end - + end describe User, "activation" do include UserSpecHelper - - + + before(:each) do User.clear_database_table @user = User.new(valid_user_hash) end - + it "should have an activation_code as an attribute" do @user.attributes.keys.any?{|a| a.to_s == "activation_code"}.should_not be_nil end - + it "should create an activation code on create" do - @user.activation_code.should be_nil + @user.activation_code.should be_nil @user.save @user.activation_code.should_not be_nil end - + it "should not be active when created" do @user.should_not be_activated @user.save - @user.should_not be_activated + @user.should_not be_activated end - + it "should respond to activate" do - @user.should respond_to(:activate) + @user.should respond_to(:activate) end - + it "should activate a user when activate is called" do @user.should_not be_activated @user.save @@ -242,20 +242,20 @@ describe User, "activation" do ## FIXME #User.first(:login => valid_user_hash[:login]).should be_activated end - + it "should should show recently activated when the instance is activated" do @user.should_not be_recently_activated @user.activate @user.should be_recently_activated end - + it "should not show recently activated when the instance is fresh" do @user.activate @user = nil ## FIXME #User.first(:login => valid_user_hash[:login]).should_not be_recently_activated end - + it "should send out a welcome email to confirm that the account is activated" do @user.save UserMailer.should_receive(:dispatch_and_deliver) do |action, mail_args, mailer_params| @@ -268,38 +268,38 @@ describe User, "activation" do end @user.activate end - + end describe User, "remember_me" do include UserSpecHelper - + predicate_matchers[:remember_token] = :remember_token? - + before do User.clear_database_table @user = User.new(valid_user_hash) end - + it "should have a remember_token_expires_at attribute" do @user.attributes.keys.any?{|a| a.to_s == "remember_token_expires_at"}.should_not be_nil - end - + end + it "should respond to remember_token?" do @user.should respond_to(:remember_token?) end - + it "should return true if remember_token_expires_at is set and is in the future" do @user.remember_token_expires_at = DateTime.now + 3600 - @user.should remember_token + @user.should remember_token end - + it "should set remember_token_expires_at to a specific date" do time = DateTime.new(2009, 12, 25) @user.remember_me_until(time) - @user.remember_token_expires_at.should == time + @user.remember_token_expires_at.should == time end - + it "should set the remember_me token when remembering" do time = Time.mktime(2009,12,25) @user.remember_me_until(time) @@ -307,7 +307,7 @@ describe User, "remember_me" do @user.save.should User.first(:login => valid_user_hash[:login]).remember_token.should_not be_nil end - + it "should remember me for" do t = DateTime.now DateTime.stub!(:now).and_return(t) @@ -316,34 +316,34 @@ describe User, "remember_me" do @user.remember_me_for( Merb::Const::WEEK * 2) @user.remember_token_expires_at.should == (remember_until) end - + it "should remember_me for two weeks" do t = DateTime.now DateTime.stub!(:now).and_return(t) @user.remember_me @user.remember_token_expires_at.should == (DateTime.now + (2 * Merb::Const::WEEK )) end - + it "should forget me" do @user.remember_me @user.save @user.forget_me @user.remember_token.should be_nil - @user.remember_token_expires_at.should be_nil + @user.remember_token_expires_at.should be_nil end - + it "should persist the forget me to the database" do @user.remember_me @user.save - + @user = User.first(:login => valid_user_hash[:login]) @user.remember_token.should_not be_nil - + @user.forget_me @user = User.first(:login => valid_user_hash[:login]) @user.remember_token.should be_nil @user.remember_token_expires_at.should be_nil end - -end \ No newline at end of file + +end spec/models/user_spec.rb @@ -5,4 +5,4 @@ module UserSpecHelper :password => "sekret", :password_confirmation => "sekret"} end -end \ No newline at end of file +end spec/user_spec_helper.rb @@ -1,22 +1,22 @@ require File.join(File.dirname(__FILE__), "..", "..", 'spec_helper.rb') -describe "controller/index" do - - before( :each ) do - @store = Store.new(fake_request) - #@controller.instance_variable_set(:@posts, [Post.new(:id => 1, :body => "Merb!")]) - @body = @store.render(:index) - end - - it "should have something" do - #@body.should have_tag(:div, :class => :posts).with_tag(:div, :class => :post) - end - - it "should wrap the body paragraph in a div with class 'post' and the post's id" do - #@body.should have_tag(:div, :class => :post, :id => @post.id).with_tag(:p, :class => :body) - end - - it "should render the body body within a post div" do - #@body.should have_tag(:div,:id => @post.id).with_tag(:p) {|p| p.should contain(@post.body)} - end -end \ No newline at end of file +describe "controller/index" do + + before( :each ) do + @store = Store.new(fake_request) + #@controller.instance_variable_set(:@posts, [Post.new(:id => 1, :body => "Merb!")]) + @body = @store.render(:index) + end + + it "should have something" do + #@body.should have_tag(:div, :class => :posts).with_tag(:div, :class => :post) + end + + it "should wrap the body paragraph in a div with class 'post' and the post's id" do + #@body.should have_tag(:div, :class => :post, :id => @post.id).with_tag(:p, :class => :body) + end + + it "should render the body body within a post div" do + #@body.should have_tag(:div,:id => @post.id).with_tag(:p) {|p| p.should contain(@post.body)} + end +end spec/views/store/index_spec.rb 37f3b639f05213d2459ee54a826481d415ac5e00 Alex Coles alexbcoles@mac.com http://github.com/myabc/merb_mart/commit/1d63179ef1086e3d6ef6aeaa8b7456100beec2ce 1d63179ef1086e3d6ef6aeaa8b7456100beec2ce 2008-05-16T01:57:01-07:00 2008-05-16T01:57:01-07:00 Whitespace cleanup 1b4dc274477c6a691399122f0391da1522948f74 Alex Coles alexbcoles@mac.com