spree_core 1.2.0.rc1 → 1.2.0.rc2

data/app/helpers/spree/base_helper.rb

@@ -95,7 +95,11 @@ module Spree
       link_to image_tag(image_path), root_path
     end
 
-    def flash_messages
+    def flash_messages(opts = {})
+      flash.reject do |msg_type, text|
+        opts[:ignore_types] && opts[:ignore_types].include?(msg_type)
+      end
+
       flash.each do |msg_type, text|
         concat(content_tag :div, text, :class => "flash #{msg_type}") unless msg_type == :commerce_tracking
       end

data/lib/generators/spree/install/install_generator.rb

@@ -9,6 +9,7 @@ module Spree
     class_option :seed, :type => :boolean, :default => true, :banner => 'load seed data (migrations must be run)'
     class_option :sample, :type => :boolean, :default => true, :banner => 'load sample data (migrations must be run)'
     class_option :auto_accept, :type => :boolean
+    class_option :user_class, :type => :string
     class_option :admin_email, :type => :string
     class_option :admin_password, :type => :string
     class_option :lib_name, :type => :string, :default => 'spree'

data/lib/generators/spree/install/templates/config/initializers/spree.rb

@@ -11,4 +11,4 @@ Spree.config do |config|
   # config.site_name = "Spree Demo Site"
 end
 
-Spree.user_class = "Spree::LegacyUser"
+Spree.user_class = <%= (options[:user_class] || "Spree::LegacyUser").inspect %>

data/lib/spree/core/testing_support/common_rake.rb

@@ -4,11 +4,12 @@ end
 
 desc "Generates a dummy app for testing"
 namespace :common do
-  task :test_app do
+  task :test_app, :user_class do |t, args|
+    args.with_defaults(:user_class => "Spree::LegacyUser")
     require "#{ENV['LIB_NAME']}"
 
     Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--database=#{ENV['DB_NAME']}", "--quiet"]
-    Spree::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--auto-accept", "--migrate=false", "--seed=false", "--sample=false", "--quiet"]
+    Spree::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--auto-accept", "--migrate=false", "--seed=false", "--sample=false", "--quiet", "--user_class=#{args[:user_class]}"]
 
     puts "Setting up dummy database..."
     cmd = "bundle exec rake db:drop db:create db:migrate db:test:prepare"

data/lib/spree/core/testing_support/factories/user_factory.rb

@@ -3,12 +3,12 @@ FactoryGirl.define do
     "xxxx#{Time.now.to_i}#{rand(1000)}#{n}xxxxxxxxxxxxx"
   end
 
-  factory :user, :class => Spree::LegacyUser do
+  factory :user, :class => Spree.user_class do
     email { Faker::Internet.email }
     login { email }
     password 'secret'
     password_confirmation 'secret'
-    authentication_token { FactoryGirl.generate(:user_authentication_token) } if Spree::LegacyUser.attribute_method? :authentication_token
+    authentication_token { FactoryGirl.generate(:user_authentication_token) } if Spree.user_class.attribute_method? :authentication_token
   end
 
   factory :admin_user, :parent => :user do

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.2.0.rc1"
+    "1.2.0.rc2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc1
+  version: 1.2.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-09 00:00:00.000000000 Z
+date: 2012-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -194,7 +194,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.7
+        version: 3.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.7
+        version: 3.2.8
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement