spree 0.11.0 → 0.11.1

data/app/models/payment_method.rb

@@ -23,8 +23,8 @@ class PaymentMethod < ActiveRecord::Base
     raise "You must implement payment_source_class method for this gateway."
   end
 
-  def self.available(display=nil)
-    PaymentMethod.all.select { |p| p.active && (p.display == display.to_s || p.display.blank?) &&  (p.environment == ENV['RAILS_ENV'] || p.environment.blank?) }
+  def self.available(display_on=nil)
+    PaymentMethod.all.select { |p| p.active && (p.display_on == display_on.to_s || p.display_on.blank?) &&  (p.environment == ENV['RAILS_ENV'] || p.environment.blank?) }
   end
 
   def self.active?

data/app/models/product.rb

@@ -20,7 +20,6 @@
 class Product < ActiveRecord::Base
   has_many :product_option_types, :dependent => :destroy
   has_many :option_types, :through => :product_option_types
-  has_many :variants, :dependent => :destroy
   has_many :product_properties, :dependent => :destroy, :attributes => true
   has_many :properties, :through => :product_properties
   has_many :images, :as => :viewable, :order => :position, :dependent => :destroy
@@ -193,7 +192,7 @@ class Product < ActiveRecord::Base
   # allows extensions to override deleted? if they want to provide
   # their own definition.
   def deleted?
-    deleted_at
+    !!deleted_at
   end
 
   # split variants list into hash which shows mapping of opt value onto matching variants

data/app/models/return_authorization.rb

@@ -1,7 +1,7 @@
 class ReturnAuthorization < ActiveRecord::Base
   belongs_to :order
   has_many :inventory_units
-  before_save :generate_number
+  before_create :generate_number
 
   validates_presence_of :order
   validates_numericality_of :amount
@@ -51,6 +51,8 @@ class ReturnAuthorization < ActiveRecord::Base
   end
 
   def generate_number
+    return if self.number
+
     record = true
     while record
       random = "RMA#{Array.new(9){rand(9)}.join}"

data/app/models/shipping_method.rb

@@ -1,4 +1,5 @@
 class ShippingMethod < ActiveRecord::Base
+  DISPLAY =  [:both, :front_end, :back_end]
   belongs_to :zone
   has_many :shipping_rates
   has_many :shipments
@@ -21,16 +22,25 @@ class ShippingMethod < ActiveRecord::Base
     return(calculated_costs)
   end
 
-  def available?(order)
-    calculator.available?(order)
+  def available?(order, display_on=nil)
+    (self.display_on == display_on.to_s || self.display_on.blank?) && calculator.available?(order)
   end
 
-  def available_to_order?(order)
-    available?(order) && zone && zone.include?(order.ship_address)
+  def available_to_order?(order, display_on=nil)
+    _zone = Zone.cached.detect {|zone| zone.id == self.zone_id }
+    available?(order, display_on) && _zone && _zone.include?(order.ship_address)
   end
 
-  def self.all_available(order)
-    all.select { |method| method.available_to_order?(order)}
+  def self.all_available(order, display_on=nil)
+    cached.select { |method| method.available_to_order?(order,display_on)}
+  end
+
+  def self.cached
+    if Rails.configuration.cache_classes
+      Rails.cache.fetch("ShippingMethod.all") { ShippingMethod.all(:include => :calculator) }
+    else
+      ShippingMethod.all(:include => :calculator)
+    end
   end
 
 end

data/app/models/zone.rb

@@ -35,9 +35,10 @@ class Zone < ActiveRecord::Base
 
   def include?(address)
     return false unless address
+    _zone_members = Zone.cached.detect {|zone| zone.id == self.id }.zone_members
 
     # NOTE: This is complicated by the fact that include? for HMP is broken in Rails 2.1 (so we use awkward index method)
-    members.any? do |zone_member|
+    _zone_members.any? do |zone_member|
       case zone_member.zoneable_type
       when "Zone"
         zone_member.zoneable.include?(address)
@@ -51,20 +52,50 @@ class Zone < ActiveRecord::Base
     end
   end
 
+  def self.cached
+    if Rails.configuration.cache_classes
+      Rails.cache.fetch("Zone.all") { Zone.all(:include => {:zone_members => :zoneable}) }
+    else
+      Zone.all()
+    end
+  end
+
   def self.match(address)
-    Zone.all.select {|zone| zone.include?(address)}
+    cached.select {|zone| zone.include?(address)}
+  end
+
+  # convenience method for returning the states contained within a zone (different then the states method which only
+  # returns the zones children and does not consider the grand children if the children themselves are zones)
+  def state_list
+    _zone_members = Zone.cached.detect {|zone| zone.id == self.id }.zone_members
+    _zone_members.map {|zone_member|
+      case zone_member.zoneable_type
+      when "Zone"
+        zone_member.zoneable.state_list
+      when "Country"
+        zone_member.zoneable.states
+      when "State"
+        zone_member.zoneable
+      else
+        nil
+      end
+    }.flatten.compact.uniq
   end
 
   # convenience method for returning the countries contained within a zone (different then the countries method which only
   # returns the zones children and does not consider the grand children if the children themselves are zones)
   def country_list
-    members.map {|zone_member|
+    _zone_members = Zone.cached.detect {|zone| zone.id == self.id }.zone_members
+    country_ids = []
+    _zone_members.map {|zone_member|
       case zone_member.zoneable_type
       when "Zone"
         zone_member.zoneable.country_list
       when "Country"
         zone_member.zoneable
       when "State"
+        next if country_ids.include?(zone_member.zoneable.country_id)
+        country_ids << zone_member.zoneable.country_id
         zone_member.zoneable.country
       else
         nil

data/config/database.yml

@@ -1,24 +1,7 @@
-# Default database configuration
-
 development:
   adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000  
-
-# development:
-#   adapter: mysql
-#   database: spree_dev
-#   username: root
-#   pool: 5
-#   timeout: 5000  
+  database: db/dev.sqlite3
 
-#   
-# test:
-#   adapter: mysql
-#   database: spree_test
-#   username: root  
-#   
-# cucumber:
-#   adapter: sqlite3
-#   database: db/test.sqlite3  
+test:
+  adapter: sqlite3
+  database: db/test.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.11.0' unless defined? SPREE_GEM_VERSION
+SPREE_GEM_VERSION = '0.11.1' unless defined? SPREE_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -27,9 +27,9 @@ 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.3'
+  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 "activemerchant", :lib => "active_merchant", :version => '1.7.0'
   config.gem 'activerecord-tableless', :lib => 'tableless', :version => '0.1.0'
   config.gem 'less', :version => '1.2.20'
   config.gem 'stringex', :lib => 'stringex', :version => '1.0.3'
@@ -37,7 +37,7 @@ Spree::Initializer.run do |config|
   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.14'
-  config.gem 'state_machine', :lib => 'state_machine', :version => '0.8.0'
+  config.gem 'state_machine', :lib => 'state_machine', :version => '0.9.2'
   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'
@@ -73,11 +73,11 @@ Spree::Initializer.run do |config|
 
   # Activate observers that should always be running
   # config.active_record.observers = :cacher, :garbage_collector
-  config.active_record.observers = :state_monitor
+  config.active_record.observers = :state_monitor, :model_cache_cleaner
 
   # 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.load_path << Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
   config.i18n.default_locale = :'en'
 
 end

data/config/environments/test.rb

@@ -24,3 +24,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.9' if RUBY_VERSION.to_f >= 1.9
+config.gem "rspec", :lib => 'spec'

data/config/locales/en_spree.yml

@@ -231,7 +231,7 @@ en:
   allow_backorders: "Allow Backorders"
   allow_ssl_to_be_used_when_in_developement_and_test_modes: Allow SSL to be used when in development and test modes
   allow_ssl_to_be_used_when_in_production_mode: Allow SSL to be used in production mode
-  allowed_ssl_in_production_mode: "SSL will {{not}} be used in production"
+  allowed_ssl_in_production_mode: "SSL will %{not} be used in production"
   already_registered: Already Registered?
   alternative_phone: Alternative Phone
   amount: Amount
@@ -253,7 +253,7 @@ en:
   back_end: Back End
   back_to_store: "Go Back To Store"
   backordered: Backordered
-  backordering_is_allowed: "Backordering {{not}} allowed"
+  backordering_is_allowed: "Backordering %{not} allowed"
   balance_due: "Balance Due"
   best_selling_products: "Best Selling Products"
   best_selling_taxons: "Best Selling Taxons"
@@ -309,7 +309,7 @@ en:
   copy_all_mails_to: Copy All Mails To
   cost_price: "Cost Price"
   count: Count
-  count_of_reduced_by: "count of '{{name}}' reduced by {{count}}"
+  count_of_reduced_by: "count of %{name}' reduced by %{count}"
   country: Country
   country_based: "Country Based"
   coupon: Coupon
@@ -526,6 +526,7 @@ en:
   none: None
   none_available: "None Available"
   not: not
+  not_shown: "Not Shown"
   note: Note
   notice_messages:
     option_type_removed: "Succesfully removed option type."
@@ -556,7 +557,7 @@ en:
   order_processed_but_following_items_are_out_of_stock: "Your order has been processed, but following items are out of stock:"
   order_processed_successfully: "Your order has been processed successfully"
   order_summary: Order Summary
-  order_sure_want_to: "Are you sure you want to {{event}} this order?"
+  order_sure_want_to: "Are you sure you want to %{event} this order?"
   order_total: "Order Total"
   order_total_message: "The total amount charged to your card will be"
   order_updated: "Order Updated"
@@ -596,7 +597,7 @@ en:
   preview: Preview
   previous: Previous
   price: Price
-  price_with_vat_included: "{{price}} (inc. VAT)"
+  price_with_vat_included: "%{price} (inc. VAT)"
   problem_authorizing_card: "Problem authorizing credit card"
   problem_capturing_card: "Problem capturing credit card"
   problems_processing_order: "We had problems processing your order"
@@ -720,7 +721,7 @@ en:
         name: "With property value"
         sentence: with property <em>%s</em> and value <em>%s</em>
   products: Products
-  products_with_zero_inventory_display: "Products with a zero inventory will {{not}} be displayed"
+  products_with_zero_inventory_display: "Products with a zero inventory will %{not} be displayed"
   properties: Properties
   property: Property
   prototype: Prototype
@@ -772,7 +773,7 @@ en:
   scope: Scope
   scopes: Scopes
   search: Search
-  search_results: "Search results for '{{keywords}}'"
+  search_results: "Search results for '%{keywords}'"
   secure_connection_type: Secure Connection Type
   secure_creditcard: Secure Creditcard
   select: Select
@@ -807,7 +808,7 @@ en:
   shipping_rates: "Shipping Rates"
   shipping_rates_description: "Manage shipping rates"
   shipping_total: "Shipping Total"
-  shop_by_taxonomy: "Shop by {{taxonomy}}"
+  shop_by_taxonomy: "Shop by %{taxonomy}"
   shopping_cart: "Shopping Cart"
   show: Show
   show_active: "Show Active"
@@ -816,7 +817,7 @@ en:
   show_only_complete_orders: "Only show complete orders"
   show_out_of_stock_products: "Show out-of-stock products"
   show_price_inc_vat: "Show price including VAT"
-  showing_first_n: "Showing first {{n}}"
+  showing_first_n: "Showing first %{n}"
   sign_up: "Sign up"
   site_name: "Site Name"
   site_url: "Site URL"

data/db/migrate/20100624110730_add_display_to_shipping_methods.rb

@@ -0,0 +1,9 @@
+class AddDisplayToShippingMethods < ActiveRecord::Migration
+  def self.up
+    add_column :shipping_methods, :display_on, :string, :default => nil
+  end
+
+  def self.down
+    remove_column :shipping_methods, :display_on
+  end
+end

data/db/migrate/20100624123336_rename_payment_method_display.rb

@@ -0,0 +1,9 @@
+class RenamePaymentMethodDisplay < ActiveRecord::Migration
+  def self.up
+    rename_column :payment_methods, :display, :display_on
+  end
+
+  def self.down
+    rename_column :payment_methods, :display_on, :display
+  end
+end

data/db/sample/orders.yml

@@ -1,6 +1,6 @@
-<% 
+<%
 order_date = Time.now
-1.upto(100) do |i| 
+1.upto(100) do |i|
   order_date -= rand(12).hours
   item_total =  "#{1 + rand(400)}.#{rand(100)}".to_f
   charges_total = "#{1 + rand(30)}.#{rand(100)}".to_f
@@ -8,7 +8,7 @@ order_date = Time.now
 order_<%= i %>:
   user: user_<%= rand(500) + 1%>
   number: <%= "R#{Array.new(9){rand(9)}.join}" %>
-  state: paid
+  state: in_progress
   item_total: <%= item_total %>
   created_at: <%=order_date.to_s(:db)%>
   completed_at: <%=order_date.to_s(:db)%>

data/db/sample/payments.rb

@@ -14,12 +14,13 @@ creditcard = Creditcard.create(:cc_type => "visa", :month => 12, :year => 2014,
 
 Order.all.each_with_index do |order,index|
   printf "\rProcessing order #{index}"
-  STDOUT.flush 
+  STDOUT.flush
   order.update_totals!
-  payment = order.checkout.payments.create(:amount => order.outstanding_balance, 
-                                           :source => creditcard.clone, 
+  payment = order.checkout.payments.create(:amount => order.outstanding_balance,
+                                           :source => creditcard.clone,
                                            :payment_method => method)
-  payment.process!
-  order.update_attribute("state", "new")
+
+  order.checkout.state = 'confirm'
+  order.checkout.next
 end
 puts

data/db/sample/products.rb

@@ -1,9 +1,9 @@
 require 'find'
 # make sure the product images directory exists
-FileUtils.mkdir_p "#{RAILS_ROOT}/public/assets/products/"
+FileUtils.mkdir_p "#{Rails.root}/public/assets/products/"
 
 # make product images available to the app
-target = "#{RAILS_ROOT}/public/assets/products/"
+target = "#{Rails.root}/public/assets/products/"
 source = "#{SPREE_ROOT}/lib/tasks/sample/products/"
 
 Find.find(source) do |f|

data/db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20100605152042) do
+ActiveRecord::Schema.define(:version => 20100624123336) do
 
   create_table "addresses", :force => true do |t|
     t.string   "firstname"
@@ -132,34 +132,14 @@ ActiveRecord::Schema.define(:version => 20100605152042) do
     t.string   "gateway_payment_profile_id"
   end
 
-  create_table "gateway_configurations", :force => true do |t|
-    t.integer  "gateway_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "gateway_option_values", :force => true do |t|
-    t.integer  "gateway_configuration_id"
-    t.integer  "gateway_option_id"
-    t.text     "value"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "gateway_options", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.integer  "gateway_id"
-    t.boolean  "textarea",    :default => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
   create_table "gateways", :force => true do |t|
-    t.string   "clazz"
+    t.string   "type"
     t.string   "name"
     t.text     "description"
-    t.boolean  "active"
+    t.boolean  "active",      :default => true
+    t.string   "environment", :default => "development"
+    t.string   "server",      :default => "test"
+    t.boolean  "test_mode",   :default => true
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -260,7 +240,7 @@ ActiveRecord::Schema.define(:version => 20100605152042) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.datetime "deleted_at"
-    t.string   "display"
+    t.string   "display_on"
   end
 
   create_table "payments", :force => true do |t|
@@ -425,6 +405,7 @@ ActiveRecord::Schema.define(:version => 20100605152042) do
     t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "display_on"
   end
 
   create_table "shipping_rates", :force => true do |t|
@@ -534,6 +515,7 @@ ActiveRecord::Schema.define(:version => 20100605152042) do
     t.integer  "ship_address_id"
     t.integer  "bill_address_id"
     t.string   "openid_identifier"
+    t.string   "api_key",                   :limit => 40
   end
 
   add_index "users", ["openid_identifier"], :name => "index_users_on_openid_identifier"