spree 0.2.0 → 0.4.0

data/CHANGELOG

@@ -1,3 +1,25 @@
+== 0.4.0
+
+* Initial support for initialization
+* Rails 2.1 support
+* #38 - Credit card numbers are being logged
+* #39 - Rails 2.1 Support
+* #43 - Increase application width
+* #48 - Support fo Pay Pal Website Payments Pro
+* #51 - SEO Permalinks for Products
+* #57 - Optionally store cc numbers in the database
+* #59 - Convert line breaks to <p> elements in prodcut description
+* #60 - Fix image clipping in product details
+* #61 - Price change is not always reflected in the actual order
+* #62 - Ability to override mailer templates in extensions
+* #63 - New spree applications should use a random secret key for sessions
+* #64 - Extension support of "public" assets
+* #69 - New spree project is missing script/plugin
+* #79 - Frozen gems inside of the Spree source are not copied into new applications 
+* #80 - Named routes don't work when defined inside its own extension using define_routes.
+* #84 - Generating Thumbnails for products: wrong aspect ratio
+* #82 - Unable to start server when both rails and spree are frozen
+
 == 0.2.0 2008-06-05
 
 * Extension support.

data/CONTRIBUTORS

@@ -9,7 +9,24 @@ in March 2008 in order to avoid any confusion about it being endorsed by the Rub
 The following people have submitted changes which have been applied to the
 core:
 
-* Sean Schofield
+* Sean Schofield 
+* Jorge Calás Lozano
+* Sonny Cook
+* Brian Quinn
+* Paul Saieg
+* Gregg Pollack
+* Jon Jensen
+* Fabio Akita
+* Jason Seifer
+* Tomasz Mazur
+* mjwall
+* Manuel Stuefer
+* Eric Budd
+* Chris Gaskett
+* Will Emerson
+* Ricardo Shiota Yasuda
+* Edmundo Valle Neto
+* tom
 
 == Legacy Contributors
 

data/README.markdown

@@ -8,28 +8,52 @@ Cart before changing its name to Spree.
 QUICK START
 ===========
 
+Running from sources (latest and greatest features)
+---------------------------------------------------
+
+1. Clone the git repo
+
+        git clone git://github.com/schof/spree.git spree
+        
+2. Install the gem dependencies
+
+        rake gems:install
+        
+3. Bootstrap the database (run the migrations, create admin account, optionally load sample data.)
+
+        rake db:bootstrap
+
+4. Start the server
+
+        script/server
+
+Running the Gem
+---------------
+
 1. Install spree Gem
 
-        $ sudo gem install spree
+        sudo gem install spree
 
-    **NOTE:** This may take a while. The gem currently includes a
-      frozen version of Rails 2.0.2
+    **NOTE:** This may take a while. The gem currently includes a frozen version of Rails 2.0.2
 
 2. Create Spree Application
 
-        $ spree <app_name>
+        spree <app_name>
+
+3. Create your database and edit the _config/database.yml_ to taste.
 
-3. Create your database and edit the _config/database.yml_ to taste. You
-can skip this step if using sqlite3 as your database.
+        rake db:create
+
+    You can skip this step if using sqlite3 as your database.
 
 4. Bootstrap
 
-        $ cd <app-name>
-        $ rake db:bootstrap
+        cd <app-name>
+        rake db:bootstrap
 
 5. Launch Application
 
-        $ script/server
+        script/server
 
 Browse Store
 ------------
@@ -41,6 +65,41 @@ 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)
+
 Is Spree Ready for Production?
 ==============================
 

data/app/controllers/account_controller.rb

@@ -1,38 +1,24 @@
 class AccountController < Spree::BaseController
   before_filter :login_from_cookie
-  
-  layout 'admin'
 
   def index
-    redirect_to(:action => 'signup') unless logged_in? || User.count > 0
+    redirect_to(signup_path) unless logged_in? || User.count > 0
   end
 
   def login
     return unless request.post?
-    self.current_user = User.authenticate(params[:login], params[:password])
+    self.current_user = User.authenticate(params[:email], params[:password])
     if logged_in?
       if params[:remember_me] == "1"
         self.current_user.remember_me
         cookies[:auth_token] = { :value => self.current_user.remember_token , :expires => self.current_user.remember_token_expires_at }
       end
-      redirect_back_or_default(:controller => 'store', :action => 'index')
+      redirect_back_or_default(products_path)
       flash.now[:notice] = "Logged in successfully"
     else
       flash.now[:error] = "Login authentication failed."
     end
-  end
-
-  def signup
-    @user = User.new(params[:user])
-    return unless request.post?
-    @user.save!
-    self.current_user = @user
-    redirect_back_or_default(:controller => '/account', :action => 'index')
-    flash[:notice] = "Thanks for signing up!"
-  rescue ActiveRecord::RecordInvalid
-    flash[:error] = "Problem creating user account."
-    render :action => 'signup'
-  end
+  end 
   
   def logout
     self.current_user.forget_me if logged_in?

data/app/controllers/addresses_controller.rb

@@ -0,0 +1,53 @@
+class AddressesController < Admin::BaseController
+  before_filter :check_existing, :only => :new
+  before_filter :load_data
+  layout 'application'
+  resource_controller :singleton
+  
+  belongs_to :order, :polymorphic => true
+  
+  create.before do 
+    # TODO - do not reset the state if the checkout is complete
+    # TODO - consider make this state check DRY for use in other controller
+    # set the state to address (in case user has hit back button from some other state)
+    @order.state = "address"
+  end
+
+  create.response do |wants|
+    wants.html do 
+      next_step
+    end
+  end
+  
+  update.response do |wants|
+    wants.html do 
+      next_step
+    end
+  end
+  
+  def country_changed
+    render :partial => "states"
+  end
+  
+  private
+  def load_data
+    load_object
+ 
+    @selected_country_id = params[:address][:country_id].to_i if params.has_key?('address')
+    @selected_country_id ||= @order.address.country_id unless @order.nil? || @order.address.nil?  
+    @selected_country_id ||= Spree::Config[:default_country_id]
+
+    @states = State.find_all_by_country_id(@selected_country_id, :order => 'name')  
+    @countries = Country.find(:all)
+  end
+  
+  def next_step
+    @order.next!
+    redirect_to checkout_order_url(@order)
+  end
+  
+  def check_existing
+    redirect_to edit_order_address_url if parent_object.address 
+  end
+  
+end

data/app/controllers/admin/base_controller.rb

@@ -1,5 +1,3 @@
-# this class was inspired (heavily) from the mephisto admin architecture
-
 class Admin::BaseController < Spree::BaseController
   helper :search
   layout 'admin'

data/app/controllers/admin/configurations_controller.rb

@@ -0,0 +1,10 @@
+class Admin::ConfigurationsController < Admin::BaseController
+
+  before_filter :initialize_extension_links, :only => :index
+  
+  protected
+
+  def initialize_extension_links
+    @extension_links = []
+  end
+end

data/app/controllers/admin/images_controller.rb

@@ -1,14 +1,15 @@
 class Admin::ImagesController < Admin::BaseController
+  resource_controller
+  actions :destroy
 
-  def new
-    @image = Image.new
-    render :layout => false
+  destroy.before do 
+    @viewable = object.viewable
   end
-
-  def delete
-    image = Image.find(params[:id])
-    viewable = image.viewable
-    image.destroy
-    render :partial => 'shared/images', :locals => {:viewable => viewable}
+  
+  destroy.response do |wants| 
+    wants.html do
+      flash[:notice] = nil
+      render :partial => '/admin/products/images', :locals => {:viewable => @viewable}
+    end
   end
 end

data/app/controllers/admin/inventory_units_controller.rb

@@ -1,26 +1,2 @@
 class Admin::InventoryUnitsController < Admin::BaseController
-    
-  def adjust
-    @variant = Variant.find(params[:id])
-    if request.post?
-      @level = InventoryLevel.new(params[:level])
-      @level.on_hand = @variant.inventory(InventoryUnit::Status::ON_HAND)
-
-      begin
-        #throw "Invalid Adjustment Quantity" unless @level.valid?
-        InventoryUnit.create_on_hand(@variant, @level.adjustment) if @level.adjustment > 0
-        InventoryUnit.destroy_on_hand(@variant, @level.adjustment.abs) if @level.adjustment < 0
-        flash.now[:notice] = "Inventory level has been adjusted."
-        @variant.reload
-        @level = InventoryLevel.new(:adjustment => 0)
-      rescue 
-        flash.now[:error] = "Error occurred while updating inventory."
-        flash.now[:error] = "Invalid adjustment quantity" unless @level.errors.empty?
-      end
-    else
-      @level = InventoryLevel.new(:adjustment => 0)
-    end
-  end
-  
-end
-
+end

data/app/controllers/admin/mail_settings_controller.rb

@@ -0,0 +1,14 @@
+class Admin::MailSettingsController < Admin::BaseController
+
+  def update
+    Spree::Config.set(params[:preferences])
+    Spree::Preferences::MailSettings.init
+    
+    respond_to do |format|
+      format.html {
+        redirect_to admin_mail_settings_path
+      }
+    end
+  end
+
+end

data/app/controllers/admin/option_types_controller.rb

@@ -1,70 +1,62 @@
 class Admin::OptionTypesController < Admin::BaseController
-  def select
-    @product = Product.find(params[:id])
-    @option_types = OptionType.find(:all)
-    selected_option_types = []
-    @product.selected_options.each do |so| 
-      selected_option_types << so.option_type
-    end
-    @option_types.delete_if {|ot| selected_option_types.include? ot}
-    
+  resource_controller
+  
+  before_filter :load_object, :only => [:selected, :available, :remove]
+  belongs_to :product
+  
+  def available
+    set_available_option_types
     render :layout => false
-  end  
+  end
   
-  def index
-    @option_types = OptionType.find(:all)
+  def selected 
+    @option_types = @product.option_types
   end
   
-  def new
-    if request.post?
-      @option_type = OptionType.new(params['option_type']) 
-      if @option_type.save
-        flash[:notice] = 'Option type was successfully created.'
-        redirect_to :action => 'index'    
-      else  
-        logger.error("unable to create new option type: #{@option_type.inspect}")
-        flash[:error] = 'Problem saving new option type.'
-        render :action => 'new'
-      end
-    else
-      @option_type = OptionType.new 
-    end
+  def remove
+    @product.option_types.delete(@option_type)
+    @product.save
+    flash[:notice] = "Succesfully removed option type."
+    redirect_to selected_admin_product_option_types_url(@product)
+  end
+
+  new_action.response do |wants|
+    wants.html {render :action => :new, :layout => false}
+  end
+    
+  # redirect to index (instead of r_c default of show view)
+  create.response do |wants| 
+    wants.html {redirect_to collection_url}
   end
+
+  update.before do 
+    params[:option_type][:option_values] ||= {}
+  end
+
+  # redirect to index (instead of r_c default of show view)
+  update.response do |wants| 
+    wants.html {redirect_to collection_url}
+  end
+
+  # AJAX method for selecting an existing option type and associating with the current product
+  def select
+    @product = Product.find_by_param!(params[:product_id])
+    product_option_type = ProductOptionType.new(:product => @product, :option_type => OptionType.find(params[:id]))
+    product_option_type.save
+    @product.reload
+    @option_types = @product.option_types
+    set_available_option_types
+    render :template => "admin/option_types/selected.html.erb", :layout => false
+  end 
+
+  private 
   
-  def edit
-    @option_type = OptionType.find(params[:id])
-    if request.post?
-      success = @option_type.update_attributes(params[:option_type])
-      if success and params[:option_value]
-        option_value = OptionValue.new(params[:option_value])
-        @option_type.option_values << option_value
-        success = @option_type.save
+    def set_available_option_types
+      @available_option_types = OptionType.all
+      selected_option_types = []
+      @product.options.each do |option| 
+        selected_option_types << option.option_type
       end
-      flash[:notice] = 'Option type was successfully updated.' if success
-      flash[:error] = "Problem updating option type." if not success
-      redirect_to :action => 'edit', :id => @option_type
+      @available_option_types.delete_if {|ot| selected_option_types.include? ot}
     end
-  end
-  
-  def delete
-    Option.delete(params[:id])
-    redirect_to :action => 'index'
-  end  
-  
-  #AJAX support method
-  def new_option_value
-    @option_type = OptionType.find(params[:id])
-    render  :partial => 'new_option_value', 
-            :locals => {:option_type => @option_type},
-            :layout => false
-  end  
-
-  #AJAX support method
-  def delete_option_value
-    OptionValue.delete(params[:option_value_id])
-    @option_type = OptionType.find(params[:id])
-    render  :partial => 'option_values', 
-            :locals => {:option_type => @option_type},
-            :layout => false
-  end    
-end
+end