spree 0.7.1 → 0.8.0

data/CHANGELOG

@@ -1,16 +1,49 @@
-== 0.7.1
+== 0.8.0
+
+* # 273 -	Improve usefulness of prototypes
+* # 292 -	Allow the ability to import roles based permission yaml files from extensions
+* # 299 -	Translation to dutch (belgium)
+* # 304 -	Password reset functionality
+* # 313 -	Line items association extension causes issues with AJAX version of cart
+* # 318 -	Rails 2.3.2 Support
+* # 321 -	Broken spec for admin/variants/edit, and form doesn't show option settings
+* # 322 -	Move searchlogic and all unreleased gems into vendor/gems
+* # 328 -	Bug when adding taxonomies
+* # 329 -	Move shipping out of extension and into main core
+* # 331 -	New Spree apps should be created with a default site extension
+* # 333 -	Switch to authlogic gem to handle authentication
+* # 334 -	Meta data keywords and description fields for products
+* # 337 -	Add user login field which is not restricted to be the user email address
+* # 338 -	Guest Checkout
+* # 339 -	Empty cart should not actually destroy the entire order
+* # 340 -	Token access to restrict viewing of incomplete orders
+* # 341 -	Add email address to order model
+* # 345 -	Refactor address model and relationships
+* # 346 -	Remove defunct viewable_id field from products table
+* # 347 -	Dump active_presenter in favor of nested_attributes
+* # 348 -	Upgrade task should automatically update permissions
+* # 349 -	Upgrade task should update routes.rb 
+* # 352 -	Make checkout process more extensible
+* # 357 -	multiple shipments being created for 1 item in checkout
+* # 362 -	Rake doesn't use UTC time
+* # 365 -	Ajax failing on product pages
+* # 366 -	Echoe gem dependency is not installed
+* # 367 -	pagination is missing when you browse products through the taxonomy
+* # 369 -	Upgrade task should automatically update boot.rb
+* # 386 -	Currency problem in order confirmation page
 
-* #298: rake spree:i18n:sync fails on yml files with empty lines
-* #303: "What's This?" CVV link broken
-* #308: Unable to change country for credit card payment (Admin form)
-* #309: Last name of shipping address is wrong field
-* #310: Fixed typo in Tennessee
-* #311: No shipping method can be selected in IE 7
-* #312: Remove assumption that order has shipment (when finalizing the order)
-* #315: state selector failing on IE7 due to "Object not supported" js error
-* #317: gem dependency command does not list all dependencies
-* #314: Refactor checkout steps as partials
+== 0.7.1
 
+* # 298 - rake spree:i18n:sync fails on yml files with empty lines
+* # 303 - "What's This?" CVV link broken
+* # 308 - Unable to change country for credit card payment (Admin form)
+* # 309 - Last name of shipping address is wrong field
+* # 310 - Fixed typo in Tennessee
+* # 311 - No shipping method can be selected in IE 7
+* # 312 - Remove assumption that order has shipment (when finalizing the order)
+* # 315 - state selector failing on IE7 due to "Object not supported" js error
+* # 317 - gem dependency command does not list all dependencies
+* # 314 - Refactor checkout steps as partials
 
 == 0.7.0
 

data/CONTRIBUTORS

@@ -40,7 +40,7 @@ Wynn Netherland
 Yves Dufour
 mjwall
 mwestover
-paulcc
+Paul Callaghan
 pierre
 ron
 spariev

data/INSTALL

@@ -11,12 +11,11 @@ install Spree:
 
 2. Edit config/database.yml to taste.
 
-3. Run the database bootstrap rake task:
+3. Run the database migrations and set up the admin user:
    
-     $ rake production db:bootstrap
+     $ rake db:migrate db:admin:create RAILS_ENV=production 
    
-   (If you would like bootstrap your development database just run `rake
-   development db:bootstrap` or simply `rake db:bootstrap`.)
+   (NOTE: In dev mode you can run `rake db:bootstrap` which is equivalent to above but also gives you some sample data.)
 
 4. Start it like a normal Rails application. To test execute:
    
@@ -24,4 +23,4 @@ install Spree:
    
    And open your Web browser on port 3000 (http://localhost:3000). The
    administrative interface is available at /admin/. By default the bootstrap
-   rake task creates a user called "admin" with a password of "spree".
+   rake task creates a user called "spree@example.com" with a password of "spree".

data/README.markdown

@@ -67,37 +67,4 @@ Browse Admin Interface
 
 http://localhost:xxxx/admin
 
-Deploying
-=========
-
-Deploy spree as a normal rails application. If you use apache+cgi/fastcgi take a look at the example .htaccess located in 
-
-    public/.htaccess.example
-
-i18n/l10n Support
-=================
-
-**Basic** localization and internationalization **support** is now
-added using the [Globalite Plugin][1] from Matt Aimonetti. 
-
-Working features:
-
-- Rails Localization
-- UI Localization
-
-In the near future:
-
-- Content Localization
-
-Please read [this][2], [this][3] and [this][4] to understand how the
-plugin works.
-
-Please, please, please ask Sean how you can help, lot of work is still
-to be done.
-
-[1]: http://www.railsontherun.com/globalite
-[2]: http://code.google.com/p/globalite/wiki/RailsLocalization
-[3]: http://code.google.com/p/globalite/wiki/UI_Localization
-[4]: http://code.google.com/p/globalite/wiki/PluralizationSupport
-
-**UPDATE:** Take a look at [i18n page on Spree wiki](http://support.spreehq.org/wiki/1/I18n)
+Refer to the [Spree ecommerce project page](http://spreecommerce.com) to learn more about spree.

data/app/controllers/admin/base_controller.rb

@@ -4,6 +4,12 @@ class Admin::BaseController < Spree::BaseController
   
   before_filter :initialize_product_admin_tabs
   before_filter :initialize_order_admin_tabs
+  before_filter :add_shipments_tab
+
+private
+  def add_shipments_tab
+    @order_admin_tabs << {:name => 'Shipments', :url => "admin_order_shipments_url"}
+  end
   
   #used to add tabs / partials to product admin interface
   def initialize_product_admin_tabs

data/app/controllers/admin/configurations_controller.rb

@@ -1,9 +1,15 @@
 class Admin::ConfigurationsController < Admin::BaseController
 
   before_filter :initialize_extension_links, :only => :index
-  
+  before_filter :add_shipping_links, :only => :index
+
   protected
 
+  def add_shipping_links
+    @extension_links << {:link => admin_shipping_methods_path, :link_text => t("shipping_methods"), :description => t("shipping_methods_description")}
+    @extension_links << {:link => admin_shipping_categories_path, :link_text => t("shipping_categories"), :description => t("shipping_categories_description")}
+  end
+
   def initialize_extension_links
     @extension_links = []
   end

data/app/controllers/admin/creditcard_payments_controller.rb

@@ -1,49 +1,15 @@
 class Admin::CreditcardPaymentsController < Admin::BaseController
   before_filter :load_data
   before_filter :load_amount, :except => :country_changed
-  before_filter :validate_payment, :only => :create
   resource_controller
   belongs_to :order
   ssl_required
 
-  # override the r_c defauult since he have the special presenter logic and we need to capture before storing cc info.
-  def create
-    creditcard = @payment_presenter.creditcard
-    creditcard.address = @payment_presenter.address
-    creditcard.order = @order
-    begin
-      creditcard.purchase(params[:amount])
-    rescue Spree::GatewayError => ge
-      flash.now[:error] = "Authorization Error: #{ge.message}"
-      render :action => "new" and return 
-    end
-    @order.creditcards << creditcard
-    # TODO - eventually the amount should be passed as a parameter
-    @order.save
-    redirect_to admin_order_payments_url(@order)
-  end
-  
-  # override r_c default with special presenter logic
-  def edit 
-    @payment_presenter = PaymentPresenter.new(:creditcard => object.creditcard, :address => object.creditcard.address)    
-  end
-  
-  # override r_c default with special presenter logic
-  def update
-    load_payment_presenter
-    creditcard = @creditcard_payment.creditcard
-    creditcard.address = @payment_presenter.address
-    creditcard.save
-    flash[:notice] = t("updated_successfully")
-    redirect_to edit_object_url 
+  update do
+    wants.html { redirect_to edit_object_url }
   end
 
-  def cvv
-    render :layout => false
-  end
-  
   def country_changed
-    render :partial => "shared/states", :locals => {:presenter_type => "payment"}
   end
          
   def capture       
@@ -72,32 +38,16 @@ class Admin::CreditcardPaymentsController < Admin::BaseController
  
     @states = State.find_all_by_country_id(@selected_country_id, :order => 'name')  
     @countries = Country.find(:all)
-
-    month = (params[:payment_presenter] && params[:payment_presenter][:creditcard_month]) ? params[:payment_presenter][:creditcard_month].to_i : Date.today.month
-    year = (params[:payment_presenter] && params[:payment_presenter][:creditcard_year]) ? params[:payment_presenter][:creditcard_year].to_i : Date.today.year
-    @date = Date.new(year, month, 1)
   end
 
   def load_amount
     @amount = params[:amount] || @order.total
   end
-
+           
   def build_object
-    address = parent_object.ship_address ? parent_object.ship_address : Address.new
-    @payment_presenter ||= PaymentPresenter.new(:address => address)
-  end
-  
-  def validate_payment
-    # load the object so that its available to the form in the event of a validation error
-    load_object
-    load_payment_presenter
-    render :action => "new" unless @payment_presenter.valid?
+    @object ||= end_of_association_chain.send parent? ? :build : :new, object_params
+    @object.creditcard = Creditcard.new(:address => @object.order.bill_address.clone) unless @object.creditcard
+    @object
   end
   
-  def load_payment_presenter
-    payment_presenter = PaymentPresenter.new(params[:payment_presenter]) 
-    payment_presenter.creditcard.first_name = payment_presenter.address.firstname
-    payment_presenter.creditcard.last_name = payment_presenter.address.lastname
-    @payment_presenter = payment_presenter
-  end  
 end

data/app/controllers/admin/products_controller.rb

@@ -9,6 +9,10 @@ class Admin::ProductsController < Admin::BaseController
     @product.tax_category = TaxCategory.find_by_name Spree::Config[:default_tax_category]
   end
   
+  new_action.response do |wants|
+    wants.html {render :action => :new, :layout => false}
+  end
+
   update.before do
     # note: we only reset the product properties if we're receiving a post from the form on that tab
     next unless params[:clear_product_properties] 
@@ -16,6 +20,11 @@ class Admin::ProductsController < Admin::BaseController
     params[:product][:product_property_attributes] ||= {} if params[:product][:product_property_attributes].nil?
   end
 
+  create.response do |wants| 
+    # go to edit form after creating as new product
+    wants.html {redirect_to edit_admin_product_url(Product.find(@product.id)) }
+  end
+
   update.response do |wants| 
     # override the default redirect behavior of r_c
     # need to reload Product in case name / permalink has changed

data/app/controllers/admin/prototypes_controller.rb

@@ -1,6 +1,6 @@
 class Admin::PrototypesController < Admin::BaseController
   resource_controller
-  after_filter :set_properties, :only => [:create, :update]
+  after_filter :set_habtm_associations, :only => [:create, :update]
   
   helper 'admin/product_properties'
   
@@ -28,13 +28,9 @@ class Admin::PrototypesController < Admin::BaseController
   end
   
   private
-  def set_properties
-    object.properties.clear
-    return unless params[:property]
-    params[:property][:id].each do |id|
-      object.properties << Property.find(id)
-    end
-    object.save
+  def set_habtm_associations
+    object.property_ids = params[:property][:id] if params[:property]
+    object.option_type_ids = params[:option_type][:id] if params[:option_type]
   end  
 
   def specified_rights(type)

data/app/controllers/admin/shipments_controller.rb

@@ -0,0 +1,37 @@
+class Admin::ShipmentsController < Admin::BaseController
+  before_filter :load_data, :except => :country_changed
+
+  resource_controller
+  belongs_to :order
+  
+  create do
+    wants.html { redirect_to edit_object_url }
+    failure.wants.html { redirect_to new_object_url }
+  end
+
+  update do
+    wants.html { redirect_to edit_object_url }
+  end 
+  
+#  def country_changed
+#  end
+  
+  private
+  def build_object
+    @object ||= end_of_association_chain.send parent? ? :build : :new, object_params
+    @object.address = Address.new(:country_id => Spree::Config[:default_country_id]) unless @object.address
+    @object
+  end
+  
+  def load_data 
+    load_object
+    @selected_country_id = params[:shipment_presenter][:address_country_id].to_i if params.has_key?('shipment_presenter')
+    @selected_country_id ||= @order.bill_address.country_id unless @order.nil? || @order.bill_address.nil?  
+    @selected_country_id ||= Spree::Config[:default_country_id]
+ 
+    @states = State.find_all_by_country_id(@selected_country_id, :order => 'name')  
+    @countries = @order.shipping_countries
+    @countries = [Country.find(Spree::Config[:default_country_id])] if @countries.empty?
+  end
+
+end

data/{vendor/extensions/shipping/app → app}/controllers/admin/shipping_categories_controller.rb

@@ -1,4 +1,4 @@
-class Admin::ShippingCategoriesController < ApplicationController
+class Admin::ShippingCategoriesController < Admin::BaseController    
   resource_controller
   
   layout 'admin'

data/{vendor/extensions/shipping/app → app}/controllers/admin/shipping_methods_controller.rb

@@ -1,4 +1,4 @@
-class Admin::ShippingMethodsController < ApplicationController
+class Admin::ShippingMethodsController < Admin::BaseController    
     resource_controller
     before_filter :load_data
     layout 'admin'

data/app/controllers/admin/users_controller.rb

@@ -32,8 +32,11 @@ class Admin::UsersController < Admin::BaseController
   def save_user_roles
     return unless params[:user]
     @user.roles.delete_all
-    Role.find(:all).each { |role|
-      @user.roles << role if !params[:user]['role_' + role.name].blank? || role.name.downcase == "user"
+    params[:user][:role] ||= {}
+    params[:user][:role][:user] = 1     # all new accounts have user role 
+    Role.all.each { |role|
+      @user.roles << role unless params[:user][:role][role.name].blank?
     }
+    params[:user].delete(:role)
   end
-end
+end

data/app/controllers/admin/zones_controller.rb

@@ -3,15 +3,6 @@ class Admin::ZonesController < Admin::BaseController
   
   before_filter :load_data
 
-  create.after do
-    set_members
-  end
-  
-  update.after do
-    object.members.clear
-    set_members
-  end
-  
   create.response do |wants|
     wants.html { redirect_to collection_url }
   end
@@ -20,33 +11,23 @@ class Admin::ZonesController < Admin::BaseController
     wants.html { redirect_to collection_url }
   end
   
-  index.response do |wants|
-    wants.html
-    wants.js do
-      @zones = Zone.find(:all, :conditions => ['lower(name) LIKE ?', "%#{params[:q].downcase}%"])
-      render :template => "admin/zones/index.js.erb", :layout => false
-    end
-  end  
-  
   private
-    def collection
-      @search = end_of_association_chain.new_search(params[:search])
-      @search.order_by ||= :name
-      @search.per_page = Spree::Config[:orders_per_page]
-      @collection, @collection_count = @search.all, @search.count
-    end  
+  def build_object
+    @object ||= end_of_association_chain.send parent? ? :build : :new, object_params
+    @object.zone_members.build() if @object.zone_members.empty?  
+    @object
+  end
 
-    def load_data
-      @countries = Country.all
-    end
-    
-    def set_members
-      return unless params[:member_names]
-      clazz = params[:type].classify.constantize
-      params[:member_names].each do |name|
-        member = clazz.find_by_name(name) unless name.blank?        
-        object.members << member unless member.nil?
-      end
-      object.save
-    end
+  def collection
+    @search = end_of_association_chain.new_search(params[:search])
+    @search.order_by ||= :name
+    @search.per_page = Spree::Config[:orders_per_page]
+    @collection, @collection_count = @search.all, @search.count
+  end  
+
+  def load_data
+    @countries = Country.all.sort
+    @states = State.all.sort
+    @zones = Zone.all.sort
+  end
 end

data/app/controllers/application.rb

@@ -3,26 +3,88 @@
 
 class ApplicationController < ActionController::Base
   before_filter :instantiate_controller_and_action_names
+  filter_parameter_logging :password, :password_confirmation
+  helper_method :current_user_session, :current_user
 
   # Pick a unique cookie name to distinguish our session data from others'
-  session :session_key => '_spree_session_id'
+  session_options['session_key'] = '_spree_session_id'
 
-  # See ActionController::RequestForgeryProtection for details
-  # Uncomment the :secret if you're not using the cookie session store 
-  # (SECURITY WARNING: Choose you own secret key, do not use the one below without changing it!)
-  protect_from_forgery #:secret => '55a66755bef2c41d411bd5486c001b16'
+  protect_from_forgery # See ActionController::RequestForgeryProtection for details
 
-  include AuthenticatedSystem
+  #include AuthenticatedSystem
   include RoleRequirementSystem
   include EasyRoleRequirementSystem
   include SslRequirement
   
-  private 
+  private
+    def current_user_session
+      return @current_user_session if defined?(@current_user_session)
+      @current_user_session = UserSession.find
+    end
+
+    def current_user
+      return @current_user if defined?(@current_user)
+      @current_user = current_user_session && current_user_session.user
+    end
+
+    def require_user
+      unless current_user
+        store_location
+        flash[:notice] = "You must be logged in to access this page"
+        redirect_to new_user_session_url
+        return false
+      end
+    end
+
+    def require_no_user
+      if current_user
+        store_location
+        flash[:notice] = "You must be logged out to access this page"
+        redirect_to account_url
+        return false
+      end
+    end
+
+    def store_location
+      session[:return_to] = request.request_uri
+    end
+
+    def redirect_back_or_default(default)
+      redirect_to(session[:return_to] || default)
+      session[:return_to] = nil
+    end
+
+    # Redirect as appropriate when an access request fails.
+    #
+    # The default action is to redirect to the login screen.
+    #
+    # Override this method in your controllers if you want to have special
+    # behavior in case the user is not authorized
+    # to access the requested action.  For example, a popup window might
+    # simply close itself.
+    def access_denied
+      respond_to do |format|
+        format.html do    
+          if current_user
+            flash[:error] = t("authorization_failure")
+            redirect_to '/user_sessions/authorization_failure'
+            next
+          else
+            store_location
+            redirect_to login_path   
+            next
+          end
+        end
+        format.xml do
+          request_http_basic_authentication 'Web Password'
+        end
+      end
+    end
   
-  def instantiate_controller_and_action_names
-    @current_action = action_name
-    @current_controller = controller_name
+    def instantiate_controller_and_action_names
+      @current_action = action_name
+      @current_controller = controller_name
     
-    @taxonomies = Taxonomy.find(:all, :include => {:root => :children})
-  end
+      @taxonomies = Taxonomy.find(:all, :include => {:root => :children})
+    end
 end