spree 0.10.2 → 0.11.0

data/features/support/create_admin_user.rb

@@ -0,0 +1,6 @@
+# Always create the admin user, in the case when we want to test the
+# middleware explicity remove the admin user.
+#
+Before do
+  User.first(:include => :roles, :conditions => ["roles.name = 'admin'"]) || Factory(:admin_user)
+end

data/features/support/env.rb

@@ -0,0 +1,89 @@
+# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
+# It is recommended to regenerate this file in the future when you upgrade to a
+# newer version of cucumber-rails. Consider adding your own code to a new file
+# instead of editing this one. Cucumber will automatically load all features/**/*.rb
+# files.
+
+require 'rubygems'
+require 'spork'
+
+Spork.prefork do
+  ENV["RAILS_ENV"] ||= "cucumber"
+  require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
+
+  require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
+  require 'cucumber/rails/world'
+  require 'cucumber/rails/active_record'
+  require 'cucumber/web/tableish'
+
+
+  require 'capybara/rails'
+  require 'capybara/cucumber'
+  require 'capybara/session'
+  require 'cucumber/rails/capybara_javascript_emulation' # Lets you click links with onclick javascript handlers without using @culerity or @javascript
+  # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
+  # order to ease the transition to Capybara we set the default here. If you'd
+  # prefer to use XPath just remove this line and adjust any selectors in your
+  # steps to use the XPath syntax.
+  Capybara.default_selector = :css
+
+
+  Dir.glob(SPREE_ROOT + '/db/default/*.{yml,csv,rb}').each do |file|
+    Fixtures.create_fixtures('db/default', File.basename(file, '.*'))
+  end
+  Dir.glob(SPREE_ROOT + '/test/fixtures/*.{yml,csv,rb}').each do |file|
+    Fixtures.create_fixtures('test/fixtures', File.basename(file, '.*'))
+  end
+  
+  Zone.class_eval do
+    def self.global
+      find_by_name("GlobalZone") || Factory(:global_zone)
+    end
+  end
+  
+  Product.class_eval do
+    def taxon=(taxon_name)
+      taxonomy = Taxonomy.find_or_create_by_name("Category")
+      taxon = Taxon.find_or_create_by_name_and_taxonomy_id(taxon_name, taxonomy)
+      self.taxons << taxon
+    end
+  end
+
+  ShippingMethod.create(:name => "UPS Ground", :zone => Zone.global, :calculator => Calculator::FlatRate.new)
+  
+  coupon = Coupon.create(:code => "SPREE", :description => "$5 off any order", :combine => false, :calculator => Calculator::FlatRate.new)
+  coupon.calculator.update_attribute(:preferred_amount, 5)
+
+end
+
+Spork.each_run do
+  # If you set this to false, any error raised from within your app will bubble
+  # up to your step definition and out to cucumber unless you catch it somewhere
+  # on the way. You can make Rails rescue errors and render error pages on a
+  # per-scenario basis by tagging a scenario or feature with the @allow-rescue tag.
+  #
+  # If you set this to true, Rails will rescue all errors and render error
+  # pages, more or less in the same way your application would behave in the
+  # default production environment. It's not recommended to do this for all
+  # of your scenarios, as this makes it hard to discover errors in your application.
+  ActionController::Base.allow_rescue = false
+
+  # If you set this to true, each scenario will run in a database transaction.
+  # You can still turn off transactions on a per-scenario basis, simply tagging
+  # a feature or scenario with the @no-txn tag. If you are using Capybara,
+  # tagging with @culerity or @javascript will also turn transactions off.
+  #
+  # If you set this to false, transactions will be off for all scenarios,
+  # regardless of whether you use @no-txn or not.
+  #
+  # Beware that turning transactions off will leave data in your database
+  # after each scenario, which can lead to hard-to-debug failures in
+  # subsequent scenarios. If you do this, we recommend you create a Before
+  # block that will explicitly put your database in a known state.
+  Cucumber::Rails::World.use_transactional_fixtures = true
+
+  # How to clean your database when transactions are turned off. See
+  # http://github.com/bmabey/database_cleaner for more info.
+  require 'database_cleaner'
+  DatabaseCleaner.strategy = :truncation
+end

data/features/support/paths.rb

@@ -0,0 +1,32 @@
+module NavigationHelpers
+  # Maps a name to a path. Used by the
+  #
+  #   When /^I go to (.+)$/ do |page_name|
+  #
+  # step definition in web_steps.rb
+  #
+  def path_to(page_name)
+    case page_name
+
+    when /the home\s?page/
+      '/'
+    when /the sign up page/
+      signup_path
+    when /the sign in page/
+      login_path
+    when /the products page/
+      products_path
+    # Add more mappings here.
+    # Here is an example that pulls values out of the Regexp:
+    #
+    #   when /^(.*)'s profile page$/i
+    #     user_profile_path(User.find_by_login($1))
+
+    else
+      raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
+        "Now, go and add a mapping in #{__FILE__}"
+    end
+  end
+end
+
+World(NavigationHelpers)

data/features/support/pickle.rb

@@ -0,0 +1,24 @@
+# this file generated by script/generate pickle [paths] [email]
+#
+# Make sure that you are loading your factory of choice in your cucumber environment
+#
+# For machinist add: features/support/machinist.rb
+#
+#    require 'machinist/active_record' # or your chosen adaptor
+#    require File.dirname(__FILE__) + '/../../spec/blueprints' # or wherever your blueprints are
+#    Before { Sham.reset } # to reset Sham's seed between scenarios so each run has same random sequences
+#
+# For FactoryGirl add: features/support/factory_girl.rb
+#
+#    require 'factory_girl'
+#    require File.dirname(__FILE__) + '/../../spec/factories' # or wherever your factories are
+#
+# You may also need to add gem dependencies on your factory of choice in <tt>config/environments/cucumber.rb</tt>
+
+require 'pickle/world'
+# Example of configuring pickle:
+#
+# Pickle.configure do |config|
+#   config.adapters = [:machinist]
+#   config.map 'I', 'myself', 'me', 'my', :to => 'user: "me"'
+# end

data/features/work_with_cart.feature

@@ -0,0 +1,41 @@
+Feature: Work with cart
+
+  Scenario: Visitor can work with cart
+    When I add a product with name: "RoR Mug", price: "15" to cart
+    Then I should see "Shopping Cart" within "h1"
+    And I should see "RoR Mug" within "#line_items h4 a"
+    And I should see "$15" within "#line_items td"
+    And I should see "$15" within "#subtotal"
+    
+    When I add a product with name: "RoR Mug", price: "15" to cart
+    Then I should see "Shopping Cart" within "h1"
+    And I should see "RoR Mug" within "#line_items h4 a"
+    And I should see "$15" within "#line_items td"
+    And I should see "$30" within "#line_items td"
+    And I should see "$30" within "#subtotal"
+    
+    When I add a product with name: "RoR Bag", price: "17" to cart
+    Then I should see "Shopping Cart" within "h1"
+    And I should see "RoR Bag" within "#line_items h4 a"
+    And I should see "$15" within "#line_items td"
+    And I should see "$17" within "#line_items td"
+    And I should see "$47" within "#subtotal"
+    
+    When I fill in "order_line_items_attributes_0_quantity" with "3"
+    Then the "order_line_items_attributes_0_quantity" field should contain "3"
+    # When I press "order_line_items_attributes_0_quantity"
+    # Then I should see "Shopping Cart" within "h1"
+    # And I should see "$45" within "#line_items td"
+    # And I should see "$62" within "#subtotal"
+    
+    # When I fill in "order_line_items_attributes_0_quantity" with "0"
+    # And follow "Update"
+    # Then I should see "Shopping Cart" within "h1"
+    # And I should see "$17" within "#subtotal"
+    
+    
+  Scenario: Following by cart link should not create order
+    When I go to the homepage
+    And follow "Cart"
+    When 0 orders should exist
+    

data/lib/generators/extension_model/extension_model_generator.rb

@@ -5,7 +5,7 @@ require 'rails_generator/generators/components/model/model_generator'
 class Rails::Generator::Commands::Base
   protected
     def migration_directory(relative_path)
-      directory(@migration_directory = "#{extension_path}/db/migrate")
+      directory(@migration_directory = relative_path)
     end
 end
 
@@ -24,15 +24,15 @@ class Rails::Generator::Commands::Destroy
 end
 
 class ExtensionModelGenerator < ModelGenerator
-  
+
   attr_accessor :extension_name
-  
+
   def initialize(runtime_args, runtime_options = {})
     runtime_args = runtime_args.dup
     @extension_name = runtime_args.shift
     super(runtime_args, runtime_options)
   end
-  
+
   def manifest
     if extension_uses_rspec?
       rspec_manifest
@@ -40,7 +40,7 @@ class ExtensionModelGenerator < ModelGenerator
       super
     end
   end
-  
+
   def rspec_manifest
     record do |m|
       # Check for class naming collisions.
@@ -63,21 +63,21 @@ class ExtensionModelGenerator < ModelGenerator
       end
     end
   end
-  
+
   def banner
     "Usage: #{$0} extension_model ExtensionName ModelName [field:type, field:type]"
   end
-  
+
   def extension_path
     File.join('vendor', 'extensions', @extension_name.underscore)
   end
-  
+
   def destination_root
     File.join(RAILS_ROOT, extension_path)
   end
-  
+
   def extension_uses_rspec?
     File.exists?(File.join(destination_root, 'spec'))
   end
 
-end
+end

data/lib/generators/instance/templates/databases/mysql.yml

@@ -35,6 +35,17 @@ test:
   host: localhost
 <% end -%>
 
+staging:
+  adapter: mysql
+  database: <%= app_name %>_staging
+  username: root
+  password: 
+<% if socket -%>
+  socket: <%= socket %>
+<% else -%>
+  host: localhost
+<% end -%>
+
 production:
   adapter: mysql
   database: <%= app_name %>

data/lib/scopes/variant.rb

@@ -5,5 +5,15 @@ module Scopes::Variant
       :order => 'COALESCE((SELECT COUNT(*) FROM  line_items GROUP BY line_items.variant_id HAVING line_items.variant_id = variants.id), 0) DESC'
     }
   }
+
+  # for selecting variants with an option value 
+  # no option type given since the value implies an option type
+  # this scope can be chained repeatedly, since the join name is unique
+  Variant.named_scope :has_option, lambda {|opt|
+    tbl = 'o' + Time.now.to_i.to_s + Time.now.usec.to_s
+    { :joins => "inner join option_values_variants as #{tbl} on variants.id = #{tbl}.variant_id",
+      :conditions => ["#{tbl}.option_value_id = (?)", opt]
+    }
+  }
   
 end

data/lib/spree.rb

@@ -8,9 +8,9 @@ unless defined? Spree::Version
   module Spree
     module Version
       Major = '0'
-      Minor = '10'
-      Tiny  = '2'  
-      Pre   = nil
+      Minor = '11'
+      Tiny  = '0'  
+      Pre   = nil # 'beta'
 
       class << self
         def to_s

data/lib/spree/extensions.rb

@@ -18,7 +18,7 @@ module Spree
         ext_order = YAML.load_file(File.join(SPREE_ROOT, 'config', 'extensions.yml'))['order'] 
         ext_order.split(/,\s*/).map { |ext| ext.to_sym }
       rescue
-        [:localization, :theme_default, :all]
+        [:theme_default, :all]
       end
     end
   end

data/lib/tasks/cucumber.rake

@@ -0,0 +1,47 @@
+# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
+# It is recommended to regenerate this file in the future when you upgrade to a 
+# newer version of cucumber-rails. Consider adding your own code to a new file 
+# instead of editing this one. Cucumber will automatically load all features/**/*.rb
+# files.
+
+
+unless ARGV.any? {|a| a =~ /^gems/} # Don't load anything when running the gems:* tasks
+
+vendored_cucumber_bin = Dir["#{RAILS_ROOT}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+$LOAD_PATH.unshift(File.dirname(vendored_cucumber_bin) + '/../lib') unless vendored_cucumber_bin.nil?
+
+begin
+  require 'cucumber/rake/task'
+
+  namespace :cucumber do
+    Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|
+      t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
+      t.fork = true # You may get faster startup if you set this to false
+      t.profile = 'default'
+    end
+
+    Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|
+      t.binary = vendored_cucumber_bin
+      t.fork = true # You may get faster startup if you set this to false
+      t.profile = 'wip'
+    end
+
+    desc 'Run all features'
+    task :all => [:ok, :wip]
+  end
+  desc 'Alias for cucumber:ok'
+  task :cucumber => 'cucumber:ok'
+
+  task :default => :cucumber
+
+  task :features => :cucumber do
+    STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
+  end
+rescue LoadError
+  desc 'cucumber rake task not available (cucumber not installed)'
+  task :cucumber do
+    abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
+  end
+end
+
+end

data/lib/tasks/database.rake

@@ -1,19 +1,19 @@
-require 'active_record'              
+require 'active_record'
 require 'custom_fixtures'
 
 namespace :db do
   desc "Migrate schema to version 0 and back up again. WARNING: Destroys all data in tables!!"
   task :remigrate => :environment do
-    require 'highline/import'       
-    
-    if ENV['SKIP_NAG'] or ENV['OVERWRITE'].to_s.downcase == 'true' or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
+    require 'highline/import'
+
+    if ENV['SKIP_NAG'] or ENV['OVERWRITE'].to_s.downcase == 'true' or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [y/n] ")
 
       # Drop all tables
       ActiveRecord::Base.connection.tables.each { |t| ActiveRecord::Base.connection.drop_table t }
 
-      # Migrate upward 
+      # Migrate upward
       Rake::Task["db:migrate"].invoke
-      
+
       # Dump the schema
       Rake::Task["db:schema:dump"].invoke
     else
@@ -21,18 +21,18 @@ namespace :db do
       exit
     end
   end
-        
-  namespace :admin do                       
+
+  namespace :admin do
     desc "Create admin username and password"
     task :create => :environment do
-      require 'authlogic'     
-      require "#{SPREE_ROOT}/db/sample/users.rb" 
+      require 'authlogic'
+      require "#{SPREE_ROOT}/db/sample/users.rb"
     end
   end
 
   desc "Loading db/sample for spree and each extension"
   task :sample => :environment do   # an invoke will not execute the task after defaults has already executed it
-    Rake::Task["db:load_dir"].execute( Rake::TaskArguments.new([:dir],  ["sample" ]) ) 
+    Rake::Task["db:load_dir"].execute( Rake::TaskArguments.new([:dir],  ["sample" ]) )
     puts "Sample data has been loaded"
   end
 
@@ -45,7 +45,7 @@ namespace :db do
       Fixtures.create_fixtures(File.dirname(file) , File.basename(file, '.*') )
     else
       if File.exists? file
-        puts "loading ruby    " + file 
+        puts "loading ruby    " + file
         require file
       end
     end
@@ -57,11 +57,11 @@ namespace :db do
     objects = {}
     clazz.find( :all ).each do |obj|
       attributes = obj.attributes
-      attributes.delete("created_at")   
-      attributes.delete("updated_at")   
-      name = attributes["name"] 
+      attributes.delete("created_at")
+      attributes.delete("updated_at")
+      name = attributes["name"]
       unless name
-        name = args.clazz 
+        name = args.clazz
         name = name +   "_" + attributes["id"].to_s if attributes["id"]
       end
       name = name.gsub( " " , "_")
@@ -70,17 +70,17 @@ namespace :db do
     puts objects.to_yaml
   end
 
-  desc 'Create the database, load the schema, and initialize with the seed data'  
-  task :setup => [ 'db:create', 'db:schema:load', 'db:seed' ]         
-    
+  desc 'Create the database, load the schema, and initialize with the seed data'
+  task :setup => [ 'db:create', 'db:schema:load', 'db:seed' ]
+
   desc "Bootstrap is: migrating, loading defaults, sample data and seeding (for all extensions) invoking create_admin and load_products tasks"
   task :bootstrap  => :environment do
-    require 'highline/import' 
+    require 'highline/import'
     require 'authlogic'
 
     # remigrate unless production mode (as saftey check)
-    if %w[demo development test].include? RAILS_ENV 
-      if ENV['AUTO_ACCEPT'] or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
+    if %w[demo development test].include? RAILS_ENV
+      if ENV['AUTO_ACCEPT'] or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [y/n] ")
         ENV['SKIP_NAG'] = 'yes'
         Rake::Task["db:remigrate"].invoke
         puts "remigrate"
@@ -88,22 +88,22 @@ namespace :db do
         say "Task cancelled, exiting."
         exit
       end
-    else 
+    else
       say "NOTE: Bootstrap in production mode will not drop database before migration"
       Rake::Task["db:migrate"].invoke
     end
-    
+
     load_defaults  = Country.count == 0
     unless load_defaults    # ask if there are already Countries => default data hass been loaded
-      load_defaults = agree('Countries present, load sample data anyways? [y]: ')
+      load_defaults = agree('Countries present, load sample data anyways? [y/n]: ')
     end
     Rake::Task["db:seed"].invoke if load_defaults
-    
+
     if RAILS_ENV == 'production' and Product.count > 0
-      load_sample = agree("WARNING: In Production and products exist in database, load sample data anyways? [y]:" )
+      load_sample = agree("WARNING: In Production and products exist in database, load sample data anyways? [y/n]:" )
     else
-      load_sample = true if ENV['AUTO_ACCEPT'] 
-      load_sample = agree('Load Sample Data? [y]: ') unless load_sample    
+      load_sample = true if ENV['AUTO_ACCEPT']
+      load_sample = agree('Load Sample Data? [y/n]: ') unless load_sample
     end
     Rake::Task["db:sample"].invoke if load_sample