spree 0.10.0 → 0.10.1

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.10.1
+
+* # - 1209 Ruby Gems Warning (reverted this fix - RubyGems 1.3.6 is now required again)
+* # - 1245 payment_gateway extension fails to load in production when spree is gemified
+* # -  759 Error with creating admin user during bootstrap: unknown attribute: password_confirmation (Fixed in production mode)
  
 == 0.10.0
 

data/config/boot.rb

@@ -37,8 +37,8 @@ module Spree
     def load_rubygems
       require 'rubygems'
                
-      unless rubygems_version >= '1.3.5'
-        $stderr.puts %(Spree requires RubyGems >= 1.3.5 (you have #{rubygems_version}). Please `gem update --system` and try again.)
+      unless rubygems_version >= '1.3.6'
+        $stderr.puts %(Spree requires RubyGems >= 1.3.6 (you have #{rubygems_version}). Please `gem update --system` and try again.)
         exit 1
       end
 
@@ -47,7 +47,7 @@ module Spree
       Gem::Dependency.warned_version_requirement = true
 
     rescue LoadError
-      $stderr.puts %(Spree requires RubyGems >= 1.3.5. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+      $stderr.puts %(Spree requires RubyGems >= 1.3.6. Please install RubyGems and try again: http://rubygems.rubyforge.org)
       exit 1
     end
     

data/config/database.yml

@@ -50,5 +50,8 @@ test:
 #  database: db/test.sqlite3
 
 production:
-  adapter: sqlite3
-  database: db/production.sqlite3
+  adapter: mysql
+  database: spree
+  username: root
+  password: 
+  host: localhost

data/config/environment.rb

@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-SPREE_GEM_VERSION = '0.10.0' unless defined? SPREE_GEM_VERSION
+SPREE_GEM_VERSION = '0.10.1' unless defined? SPREE_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

data/db/sample/users.rb

@@ -43,7 +43,9 @@ def create_admin_user
     :email => email,
     :login => email
   }
-  require File.join(SPREE_ROOT, 'app/models/user.rb')
+
+  load 'user.rb'
+  
   if User.find_by_login(email)
     say "\nWARNING: There is already a user with the email: #{email}, so no account changes were made.  If you wish to create an additional admin user, please run rake db:admin:create again with a different email.\n\n"
   else

data/lib/spree.rb

@@ -9,7 +9,7 @@ unless defined? Spree::Version
     module Version
       Major = '0'
       Minor = '10'
-      Tiny  = '0'  
+      Tiny  = '1'  
       Pre   = nil
 
       class << self

data/public/javascripts/admin/orders/edit.js

@@ -50,7 +50,7 @@ jQuery(document).ready(function(){
 
       var product = row['product'];
 
-      if(product['variants'].length>0){
+      if(product['variants'].length>0 && expand_variants){
         //variants
         return $.map(product['variants'], function(variant){
 

data/vendor/extensions/payment_gateway/payment_gateway_extension.rb

@@ -4,6 +4,8 @@ class PaymentGatewayExtension < Spree::Extension
   to use in the aplication."
 
   def activate  
+    require 'active_merchant'
+
     # Set the global "gateway mode" for active merchant (depending on what environment we're in)
     ActiveMerchant::Billing::Base.gateway_mode = :test unless ENV['RAILS_ENV'] == "production"
     # Mixin the payment_gateway method into the base controller so it can be accessed by the checkout process, etc.

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 10
-  - 0
-  version: 0.10.0
+  - 1
+  version: 0.10.1
 platform: ruby
 authors: 
 - Sean Schofield
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-13 00:00:00 -05:00
+date: 2010-03-15 00:00:00 -04:00
 default_executable: spree
 dependencies: 
 - !ruby/object:Gem::Dependency