spree 0.10.2 → 0.11.0

data/app/models/role.rb

@@ -1,3 +1,3 @@
 class Role < ActiveRecord::Base
-  
-end
+  has_and_belongs_to_many :users
+end

data/app/models/shipment.rb

@@ -8,13 +8,22 @@ class Shipment < ActiveRecord::Base
   has_many :state_events, :as => :stateful
   has_many :inventory_units
   before_create :generate_shipment_number
+  after_create :set_correct_state
   after_save :create_shipping_charge
+  after_destroy :release_inventory_units
 
   attr_accessor :special_instructions
   accepts_nested_attributes_for :address
   accepts_nested_attributes_for :inventory_units
 
-  validates_presence_of :inventory_units, :if => Proc.new { |unit| !unit.order.in_progress? }
+  validates_presence_of :inventory_units, :if => Proc.new { |unit| !%w(in_progress canceled).include?(unit.order.state) }
+  make_permalink :field => :number
+
+  def to_param
+    self.number if self.number
+    generate_shipment_number unless self.number
+    self.number.parameterize.to_s.upcase
+  end
 
   def shipped=(value)
     return unless value == "1" && shipped_at.nil?
@@ -87,11 +96,17 @@ class Shipment < ActiveRecord::Base
     return self.number unless self.number.blank?
     record = true
     while record
-      random = Array.new(11){rand(9)}.join
+      random = "H" + Array.new(11){rand(9)}.join
       record = Shipment.find(:first, :conditions => ["number = ?", random])
     end
     self.number = random
   end
+  
+  def set_correct_state
+    if pending? and order.checkout_complete and !order.outstanding_balance?
+      ready
+    end
+  end
 
   def description_for_shipping_charge
     "#{I18n.t(:shipping)} (#{shipping_method.name})"
@@ -109,4 +124,8 @@ class Shipment < ActiveRecord::Base
     end
   end
 
+  def release_inventory_units
+    inventory_units.each {|unit| unit.update_attribute(:shipment_id, nil)}
+  end
+
 end

data/app/models/tax_category.rb

@@ -3,4 +3,12 @@ class TaxCategory < ActiveRecord::Base
   validates_uniqueness_of :name
 
   has_many :tax_rates
+
+  def before_save
+    #set existing default tax category to false if this one has been marked as default
+
+    if is_default && tax_category = TaxCategory.find(:first, :conditions => {:is_default => true})
+      tax_category.update_attribute(:is_default, false)
+    end
+  end
 end

data/app/models/taxon.rb

@@ -6,6 +6,14 @@ class Taxon < ActiveRecord::Base
   before_create :set_permalink
   before_save :ensure_trailing_slash
 
+  validates_presence_of :name
+  has_attached_file :icon,
+                :styles => { :mini => '32x32>', :normal => '128x128>' },
+                :default_style => :mini,
+                :url => "/assets/taxons/:id/:style/:basename.:extension",
+                :path => ":rails_root/public/assets/taxons/:id/:style/:basename.:extension",
+                :default_url => "/images/default_taxon.png"
+
   # indicate which filters should be used for a taxon
   # this method should be customized to your own site
   include ::ProductFilters  # for detailed defs of filters

data/app/models/user.rb

@@ -36,9 +36,8 @@ class User < ActiveRecord::Base
 
   # has_role? simply needs to return true or false whether a user has a role or not.  
   def has_role?(role_in_question)
-    @_list ||= self.roles.collect(&:name)
-    (@_list.include?(role_in_question.to_s) )
-  end 
+    roles.any? { |role| role.name == role_in_question.to_s }
+  end
   
   private
   def password_required?

data/app/models/variant.rb

@@ -13,6 +13,7 @@ class Variant < ActiveRecord::Base
 
   before_save :touch_product
 
+  include ::Scopes::Variant
   # default variant scope only lists non-deleted variants
   named_scope :active, :conditions => "variants.deleted_at is null"
   named_scope :deleted, :conditions => "not variants.deleted_at is null"
@@ -25,23 +26,27 @@ class Variant < ActiveRecord::Base
 
   # Returns number of inventory units for this variant (new records haven't been saved to database, yet)
   def on_hand
-    self.count_on_hand
+    Spree::Config[:track_inventory_levels] ? self.count_on_hand : nil
   end
 
   # Adjusts the inventory units to match the given new level.
   def on_hand=(new_level)
-    delta_units = new_level.to_i - on_hand
-
-    # increase Inventory when positive delta
-    if delta_units > 0
-      # fill backordered orders before creating new units
-      inventory_units.with_state("backordered").slice(0, delta_units).each do |iu|
-        iu.fill_backorder
-        delta_units -= 1
+    if Spree::Config[:track_inventory_levels]
+      delta_units = new_level.to_i - on_hand
+
+      # increase Inventory when positive delta
+      if delta_units > 0
+        # fill backordered orders before creating new units
+        inventory_units.with_state("backordered").slice(0, delta_units).each do |iu|
+          iu.fill_backorder
+          delta_units -= 1
+        end
       end
-    end
 
-    self.count_on_hand += delta_units
+      self.count_on_hand += delta_units
+    else
+      raise "Cannot set on_hand value when Spree::Config[:track_inventory_levels] is false"
+    end
   end
 
   # returns number of units currently on backorder for this variant.
@@ -51,7 +56,7 @@ class Variant < ActiveRecord::Base
 
   # returns true if at least one inventory unit of this variant is "on_hand"
   def in_stock?
-    on_hand > 0
+    Spree::Config[:track_inventory_levels] ? on_hand > 0 : true
   end
   alias in_stock in_stock?
 
@@ -65,7 +70,7 @@ class Variant < ActiveRecord::Base
 
   # returns true if this variant is allowed to be placed on a new order
   def available?
-    Spree::Config[:allow_backorders] || self.in_stock?
+    Spree::Config[:track_inventory_levels] ? (Spree::Config[:allow_backorders] || self.in_stock?) : true
   end
 
   def options_text

data/config/boot.rb

@@ -42,10 +42,6 @@ module Spree
         exit 1
       end
 
-      # Temporary workaround for annoying RubyGems warning.  This can be removed once Rails 2.3.6 is released.  
-      # See http://railsdog.lighthouseapp.com/projects/31096-spree/tickets/1209
-      Gem::Dependency.warned_version_requirement = true
-
     rescue LoadError
       $stderr.puts %(Spree requires RubyGems >= 1.3.6. Please install RubyGems and try again: http://rubygems.rubyforge.org)
       exit 1
@@ -59,7 +55,7 @@ module Spree
   class Boot 
     include Spree::RubyGemsLoader
     def run
-      load_rails("2.3.5")  # note: spree requires this specific version of rails (change at your own risk)
+      load_rails("2.3.8")  # note: spree requires this specific version of rails (change at your own risk)
       load_initializer
       Spree::Initializer.run(:set_load_path)
     end

data/config/cucumber.yml

@@ -0,0 +1,7 @@
+<%
+rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
+rerun_opts = rerun.to_s.strip.empty? ? "--format progress features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
+std_opts = "#{rerun_opts} --format rerun --out rerun.txt --strict --tags ~@wip"
+%>
+default: --drb <%= std_opts %>
+wip: --drb --tags @wip:3 --wip features

data/config/database.yml

@@ -1,41 +1,24 @@
-#   gem install mysql -- --include=/usr/local/lib
-# On Windows:
-#   There is no gem for Windows.  Install mysql.so from RubyForApache.
-#   http://rubyforge.org/projects/rubyforapache
-#
-# And be sure to use new-style password hashing:
-#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
+# Default database configuration
+
 development:
-  adapter: mysql
-  database: spree_development
-  username: root
-  password:
-  host: localhost
-  
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000  
+
 # development:
-#   adapter: postgresql
+#   adapter: mysql
 #   database: spree_dev
-#   username: postgres
-#   password:
-#   host: localhost
-      
-# development:
-#   adapter: sqlite3
-#   database: db/development.sqlite3.db
-
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
-# Do not set this db to the same as development or production.
-test:
-  adapter: mysql
-  database: spree_test
-  username: root
-  password:
-  host: localhost
+#   username: root
+#   pool: 5
+#   timeout: 5000  
 
-production:
-  adapter: mysql
-  database: spree_development
-  username: root
-  password: 
-  host: localhost
+#   
+# test:
+#   adapter: mysql
+#   database: spree_test
+#   username: root  
+#   
+# cucumber:
+#   adapter: sqlite3
+#   database: db/test.sqlite3  

data/config/database.yml.example

@@ -8,11 +8,10 @@ test:
   adapter: sqlite3
   database: db/test.sqlite3
 
-production:
+cucumber:
   adapter: sqlite3
-  database: db/production.sqlite3
-                                    
-# special mode for demo.spreecommerce.com (you probably don't need this)                                    
-demo:
+  database: db/cucumber.sqlite3
+
+production:
   adapter: sqlite3
-  database: db/production.sqlite3
+  database: db/production.sqlite3

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.2' unless defined? SPREE_GEM_VERSION
+SPREE_GEM_VERSION = '0.11.0' unless defined? SPREE_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -27,7 +27,7 @@ Spree::Initializer.run do |config|
   # config.gem "aws-s3", :lib => "aws/s3"
 
   config.gem "highline", :version => '1.5.1'
-  config.gem 'authlogic', :version => '>=2.1.2'
+  config.gem 'authlogic', :version => '2.1.3'
   config.gem 'authlogic-oid', :lib => "authlogic_openid", :version => '1.0.4'
   config.gem "activemerchant", :lib => "active_merchant", :version => '1.5.1'
   config.gem 'activerecord-tableless', :lib => 'tableless', :version => '0.1.0'
@@ -36,10 +36,11 @@ Spree::Initializer.run do |config|
   config.gem 'chronic', :version => '0.2.3'
   config.gem 'whenever', :lib => false, :version => '0.3.7'
   config.gem 'searchlogic', :version => '2.3.5'
-  config.gem 'will_paginate', :lib => 'will_paginate', :version => '2.3.11'
+  config.gem 'will_paginate', :lib => 'will_paginate', :version => '2.3.14'
   config.gem 'state_machine', :lib => 'state_machine', :version => '0.8.0'
   config.gem "faker", :version => '0.3.1'
   config.gem 'paperclip', :version => '>=2.3.1.1'
+  config.gem 'ruby-openid', :lib => "openid", :version => '>=2.0.4'
 
   # Only load the plugins named here, in the order given. By default, all plugins
   # in vendor/plugins are loaded in alphabetical order.
@@ -52,7 +53,7 @@ Spree::Initializer.run do |config|
   # yourself, this is an optional Spree file. For example:
   # SPREE_EXTENSIONS_LOAD_ORDER = [:theme_default, :all, :site]
   # For more details see http://railsdog.lighthouseapp.com/projects/31096/tickets/595
-  
+
   # Add additional load paths for your own custom dirs
   # config.load_paths += %W( #{RAILS_ROOT}/extras )
 
@@ -77,7 +78,7 @@ Spree::Initializer.run do |config|
   # The internationalization framework can be changed to have another default locale (standard is :en) or more load paths.
   # All files from config/locales/*.rb,yml are added automatically.
   #config.i18n.load_path << Dir[File.join(RAILS_ROOT, 'my', 'locales', '*.{rb,yml}')]
-  config.i18n.default_locale = :'en-US'
+  config.i18n.default_locale = :'en'
 
 end
 

data/config/environments/cucumber.rb

@@ -0,0 +1,30 @@
+# Edit at your own peril - it's recommended to regenerate this file
+# in the future when you upgrade to a newer version of Cucumber.
+
+# IMPORTANT: Setting config.cache_classes to false is known to
+# break Cucumber's use_transactional_fixtures method.
+# For more information see https://rspec.lighthouseapp.com/projects/16211/tickets/165
+config.cache_classes = true
+
+# Log error messages when you accidentally call methods on nil.
+config.whiny_nils = true
+
+# Show full error reports and disable caching
+config.action_controller.consider_all_requests_local = true
+config.action_controller.perform_caching             = false
+
+# Disable request forgery protection in test environment
+config.action_controller.allow_forgery_protection    = false
+
+# Tell Action Mailer not to deliver emails to the real world.
+# The :test delivery method accumulates sent emails in the
+# ActionMailer::Base.deliveries array.
+config.action_mailer.delivery_method = :test
+
+config.gem 'cucumber-rails',   :lib => false, :version => '>=0.2.4'
+config.gem 'database_cleaner', :lib => false, :version => '>=0.4.3'
+config.gem 'capybara',         :lib => false, :version => '>=0.3.0'
+config.gem 'spork',            :lib => false, :version => '>=0.7.5'
+config.gem "factory_girl",     :lib => "factory_girl", :version => "1.2.3"
+config.gem "pickle",           :lib => false, :version => "0.2.1"
+config.gem "rack-test",        :lib => false, :version => ">=0.5.4"

data/config/environments/production.rb

@@ -15,7 +15,4 @@ config.action_controller.perform_caching             = true
 # config.action_controller.asset_host                  = "http://assets.example.com"
 
 # Disable delivery errors, bad email addresses will be ignored
-# config.action_mailer.raise_delivery_errors = false
-
-# Uncomment the line below if you want to use the gateway in test mode while deployed in production
-#ActiveMerchant::Billing::Base.gateway_mode = :test
+# config.action_mailer.raise_delivery_errors = false 

data/config/environments/staging.rb

@@ -16,3 +16,6 @@ config.action_controller.perform_caching             = true
 
 # Disable delivery errors, bad email addresses will be ignored
 # config.action_mailer.raise_delivery_errors = false
+
+# Don't send emails in staging mode
+config.action_mailer.delivery_method = :test

data/config/environments/test.rb

@@ -23,4 +23,4 @@ config.action_controller.allow_forgery_protection = false
 
 config.gem "shoulda", :lib => "shoulda", :version => "2.10.2"
 config.gem "factory_girl", :lib => "factory_girl", :version => "1.2.3"
-config.gem 'test-unit', :lib => 'test/unit', :version => '~>2.0.5' if RUBY_VERSION.to_f >= 1.9
+config.gem 'test-unit', :lib => 'test/unit', :version => '~>2.0.9' if RUBY_VERSION.to_f >= 1.9

data/config/initializers/cookie_verification_secret.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+# Make sure the secret is at least 30 characters and all random, 
+# no regular words or you'll be exposed to dictionary attacks.
+ActionController::Base.cookie_verifier_secret = '8fda71d70002a456b9578745c9b16535d20adb5b6fe26d3418d6881811d6d08fe76102f94d634b7174674391d400ed42cea20a2e495a449a98b08cf3dffd3ac9';

data/config/initializers/locales.rb

@@ -10,11 +10,13 @@ all_locale_paths.each do |path|
 	if File.exists? path
 		locales = Dir.new(path).entries.collect do |x|
 		  x =~ /^[^\.].+\.yml$/ ? x.sub(/\.yml/,"") : nil
-		end.compact.each_with_object({}) do |str, hsh|
+		end.compact.each_with_object({}) do |str, hsh|      
 		  locale_file = YAML.load_file(path + "/" + str + ".yml")
+		  str = str.gsub("_spree", "")
 		  hsh[str] = locale_file[str]["this_file_language"] if locale_file.has_key? str
 		end.freeze
-	
 		AVAILABLE_LOCALES.merge! locales
 	end
+	
+	
 end

data/config/initializers/new_rails_defaults.rb

@@ -11,6 +11,8 @@ if defined?(ActiveRecord)
   ActiveRecord::Base.store_full_sti_class = true
 end
 
+ActionController::Routing.generate_best_match = false
+
 # Use ISO 8601 format for JSON serialized times and dates.
 ActiveSupport.use_standard_json_time_format = true
 

data/config/initializers/spree.rb

@@ -54,3 +54,4 @@ require 'spree/theme_support'
 require 'state_machine'
 require 'stringex'
 require 'will_paginate'
+require 'openid'

data/config/initializers/workarounds_for_ruby19.rb

@@ -98,30 +98,5 @@ if RUBY_VERSION.to_f >= 1.9
       alias each_hash each_hash_utf8
     end
   end
-
-  module I18n
-    module Backend
-      class Simple
-        protected
-        
-        def lookup(locale, key, scope = [])
-          return unless key
-          init_translations unless initialized?
-          keys = I18n.send(:normalize_translation_keys, locale, key, scope)
-          begin
-            keys.inject(translations) do |result, k|
-              if (x = result[k.to_sym]).nil?
-                return nil
-              else
-                x
-              end
-            end
-          rescue
-            return nil
-          end
-        end
-      end
-    end
-  end
   
 end