spree 0.7.1 → 0.8.0

data/config/boot.rb

@@ -55,7 +55,7 @@ module Spree
   class Boot 
     include Spree::RubyGemsLoader
     def run
-      load_rails("~>2.2.2")  # note: spree requires rails 2.2.2 (change at your own risk)
+      load_rails("2.3.2")  # note: spree requires this specific version of rails (change at your own risk)
       load_initializer
       Spree::Initializer.run(:set_load_path)
     end

data/config/database.yml

@@ -8,11 +8,11 @@ development:
   host: localhost
 
 #development:
-  #adapter: postgresql
-  #database: spree_dev
-  #username: spree
-  #password: spree_dev
-  #host: localhost
+#  adapter: postgresql
+#  database: spree_dev
+#  username: spree
+#  password: spree_dev
+#  host: localhost
   
 #development:
 #  adapter: sqlite3

data/config/database.yml.example

@@ -12,7 +12,7 @@ production:
   adapter: sqlite3
   database: db/production.sqlite3
                                     
-# special mode for demo.spreehq.org (you probably don't need this)                                    
+# special mode for demo.spreecommerce.com (you probably don't need this)                                    
 demo:
   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.7.1' unless defined? SPREE_GEM_VERSION
+SPREE_GEM_VERSION = '0.8.0' unless defined? SPREE_GEM_VERSION
           
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -26,14 +26,15 @@ Spree::Initializer.run do |config|
   # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
   # config.gem "aws-s3", :lib => "aws/s3"
 
-  config.gem "highline", :version => '1.4.0'
-  config.gem "activemerchant", :lib => "active_merchant", :version => '1.4.1'
-  config.gem "tlsmail"
-  config.gem 'active_presenter', :version => '0.0.6'
-  config.gem 'activerecord-tableless', :lib => 'tableless', :version => '0.1.0'
-  #config.gem 'searchlogic', :version => '1.6.3'                           
-  # HACKED version of search logic - we'll move back when our fix is accepted into core
-  config.gem 'schof-searchlogic', :lib => 'searchlogic', :version => '0.0.2'  
+  config.gem "highline", :version => '>=1.4.0'
+  config.gem 'authlogic', :version => '>=2.0.11'
+  config.gem "activemerchant", :lib => "active_merchant", :version => '>=1.4.1'
+  config.gem "tlsmail", :version => '0.0.1'
+  config.gem 'activerecord-tableless', :lib => 'tableless', :version => '>=0.1.0'
+  config.gem 'haml', :version => "2.1.0"
+  config.gem 'chriseppstein-compass', :lib => 'compass', :source => "http://gems.github.com", :version => '0.6.1'
+  config.gem 'calendar_date_select', :version => '1.15'    
+  config.gem 'searchlogic', :version => '1.6.6'                           
 
   # Only load the plugins named here, in the order given. By default, all plugins 
   # in vendor/plugins are loaded in alphabetical order.
@@ -53,20 +54,6 @@ Spree::Initializer.run do |config|
   # Run "rake -D time" for a list of tasks for finding time zone names. 
   config.time_zone = "Eastern Time (US & Canada)"
 
-  # Your secret key for verifying cookie session data integrity.
-  # If you change this key, all old sessions 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.
-  config.action_controller.session = {
-    :session_key => '_<%= app_name %>_session',
-    :secret      => '<%= app_secret_key_to_be_replaced_in_real_app_by_generator %>' 
-  }
-
-  # Use the database for sessions instead of the cookie-based default,
-  # which shouldn't be used to store highly confidential information
-  # (create the session table with "rake db:sessions:create")
-  # config.action_controller.session_store = :active_record_store
-
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,
   # like if you have constraints or database-specific column types
@@ -97,4 +84,4 @@ Time::DATE_FORMATS[:date_time24] = "%Y-%m-%d %H:%M"
 # Mime::Type.register "text/richtext", :rtf
 # Mime::Type.register "application/x-mobile", :mobile
 
-# Include your application configuration below
+# Include your application configuration below

data/config/initializers/backtrace_silencers.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying do debug a problem that might steem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!

data/config/initializers/compass.rb

@@ -0,0 +1,8 @@
+require 'compass'
+# If you have any compass plugins, require them here.
+Compass.configuration do |config|
+  config.project_path = RAILS_ROOT
+  config.sass_dir = "public/stylesheets/sass"
+  config.css_dir = "public/stylesheets/compiled"
+end
+Compass.configure_sass_plugin!

data/config/initializers/inflections.rb

@@ -0,0 +1,10 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format 
+# (all these examples are active by default):
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end

data/config/initializers/mime_types.rb

@@ -3,6 +3,3 @@
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
 # Mime::Type.register_alias "text/html", :iphone
-
-#Mime::Type.register "text/html", :selected
-#Mime::Type.register "text/html", :available

data/config/initializers/new_rails_defaults.rb

@@ -0,0 +1,19 @@
+# Be sure to restart your server when you modify this file.
+
+# These settings change the behavior of Rails 2 apps and will be defaults
+# for Rails 3. You can remove this initializer when Rails 3 is released.
+
+if defined?(ActiveRecord)
+  # Include Active Record class name as root for JSON serialized output.
+  ActiveRecord::Base.include_root_in_json = true
+
+  # Store the full class name (including module namespace) in STI type column.
+  ActiveRecord::Base.store_full_sti_class = true
+end
+
+# Use ISO 8601 format for JSON serialized times and dates.
+ActiveSupport.use_standard_json_time_format = true
+
+# Don't escape HTML entities in JSON, leave that for the #json_escape helper.
+# if you're including raw json in an HTML page.
+ActiveSupport.escape_html_entities_in_json = false

data/config/initializers/session_store.rb

@@ -0,0 +1,15 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying cookie session data integrity.
+# If you change this key, all old sessions 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.session = {
+  :key         => '_test_session',
+  :secret      => '61db6a666db4a1a08420f7a194f606293378e9c077e76ae797c99e7acc39b9cff4c511ad871eb782a3dc53801bd03645fbf13701ace275986190f6f4f7dacabe'
+}
+
+# Use the database for sessions instead of the cookie-based default,
+# which shouldn't be used to store highly confidential information
+# (create the session table with "rake db:sessions:create")
+# ActionController::Base.session_store = :active_record_store

data/config/locales/de.yml

@@ -4,6 +4,7 @@ de:
   abbreviation: Abkürzung
   access_denied: "Zugriff verweigert"        
   account: Konto
+  account_updated: "Account updated!"        
   action: Aktion
   actions: 
     cancel: Abbrechen
@@ -56,6 +57,7 @@ de:
         master_price: Grundpreis
         name: Name
         on_hand: verfügbar
+        shipping_category: "Shipping Category"
       property: 
         name: Name
         presentation: Darstellung
@@ -124,6 +126,9 @@ de:
       role: 
         one: Rolle
         other: Rollen
+      shipping_category: 
+        one: "Shipping Category"
+        other: "Shipping Categories"
       state: 
         one: Bundesland
         other: Bundesländer
@@ -159,6 +164,7 @@ de:
   allow_backorders: "Lieferrückstand erlauben"
   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         
+  already_registered: Already Registered?
   amount: Summe
   are_you_sure: "Sind sie sicher"
   are_you_sure_category: "Sind sie sicher dass sie diese Kategorie löschen möchten?"
@@ -191,6 +197,7 @@ de:
   city: Stadt
   comp_order: "Bestellung abbrechen"
   comp_order_confirmation: ""
+  complete_list: "Complete List"
   configuration: Konfiguration
   configuration_options: "Konfigurations-Optionen"
   configurations: Konfigurationen
@@ -203,6 +210,7 @@ de:
   country_based: "Country Based"
   create: Erstellen
   create_a_new_account: "Neues Konto erstellen"
+  create_user_account: Create User Account
   created_successfully: "Erfolgreich erstellt"
   credit_card: Kreditkarte
   credit_card_capture_complete: "Credit Card Was Captured"
@@ -223,6 +231,8 @@ de:
   editing_product: "Produkt bearbeiten"
   editing_property: "Eigenschaft bearbeiten"
   editing_prototype: "Prototyp bearbeiten"
+  editing_shipping_category: "Editing Shipping Category"
+  editing_shipping_method: "Editing Shipping Method"
   editing_state: "Bundesland bearbeiten"
   editing_tax_category: "Steuer-Kategorie bearbeiten"
   editing_user: "Benutzer bearbeiten"
@@ -235,7 +245,7 @@ de:
   error: Fehler
   event: Ereignis
   existing_customer: "Vorhandener Kunde"
-  expiration: Expiration
+  expiration: "Expiration"
   expiration_month: "Gültig bis (Monat)"
   expiration_year: "Gültig bis (Jahr)"
   extension: Erweiterung
@@ -243,9 +253,11 @@ de:
   filename: Dateiname
   final_confirmation: "End Bestätigung"
   first_name: Vorname
+  forgot_password: "Forgot Password"
   gateway: Gateway
   gateway_error: "Gateway Fehler"
   gateway_setting_description: "Gateway-Einstellungen ändern"
+  general: "General"
   general_settings: "Allgemeine Einstellungen"
   general_settings_description: "Allgemeine Einstellungen ändern"
   google_analytics: "Google Analytics"
@@ -254,8 +266,11 @@ de:
   google_analytics_id: "Analytics ID"
   google_analytics_new: "New Google Analytics Account"
   google_analytics_setting_description: "Manage Google Analytics ID" 
+  guest_user_account: Checkout as a Guest
   height: Höhe
   hello_user: "Hallo Benutzer"
+  history: History
+  home: "Home"
   image: Bild
   images: Bilder
   in_progress: "In Bearbeitung"
@@ -278,13 +293,22 @@ de:
   locale_changed: "Sprache geändert"
   log_in: Anmelden
   logged_in_as: "Angemldet unter"
+  logged_in_succesfully: "Logged in successfully"
+  logged_out: "You have been logged out." 
+  login_as_existing: "Log In as Existing Customer" 
+  login_failed: "Login authentication failed."      
   login_name: Benutzer
   logout: Abmelden
   mail_delivery_enabled: "Mailversand aktiviert"
   mail_delivery_not_enabled: "Mailversand deaktiviert"
   mail_server_preferences: Mail Server Preferences
   mail_server_settings: "Mailserver-Einstellungen"
+  mark_shipped: "Mark Shipped"
   master_price: Grundpreis
+  meta_description: "Meta Description"
+  meta_keywords: "Meta Keywords"
+  metadata: "Metadata"
+  month: "Month"
   my_account: "Mein Konto"
   my_orders: "Meine Bestellungen"
   name: Name
@@ -299,6 +323,8 @@ de:
   new_property: "Neue Eigenschaft"
   new_prototype: "Neuer Prototyp"
   new_shipment: "Neue Lieferung"
+  new_shipping_category: "New Shipping Category"
+  new_shipping_method: "New Shipping Method"
   new_state: "Neues Bundesland"
   new_tax_category: "Neue Steuer-Kategorie"
   new_tax_rate: "Neuer Steuersatz"
@@ -309,6 +335,7 @@ de:
   next: weiter
   no_items_in_cart: "Keine Artikel im  Warenkorb"
   no_match_found: "Kein Treffer"
+  no_user_found: "No user was found with that email address"
   none: kein
   none_available: "keine verfügbar"
   on_hand: "Auf Lager"
@@ -335,6 +362,10 @@ de:
   paid: Bezahlt
   parent_category: "Unterkategorie von"
   password: Passwort
+  password_reset_instructions: "Password Reset Instructions"
+  password_reset_instructions_are_mailed: "Instructions to reset your password have been emailed to you. Please check your email."
+  password_reset_token_not_found: "We're sorry, but we could not locate your account. If you are having issues try copying and pasting the URL from your email into your browser or restarting the reset password process."    
+  password_updated: "Password successfully updated"  
   path: Pfad
   pay: zahlen
   payment: Zahlung
@@ -349,6 +380,7 @@ de:
   problem_authorizing_card: "Es gab ein Problem ihre Kreditkarte zu identifizieren"
   problem_capturing_card: "Es gab ein Problem beim belasten ihrer Kreditkarte"
   problems_processing_order: "Ihre Bestellung konnte nicht bearbetet werden"
+  proceed_as_guest: "No Thanks, Proceed as Guest"
   process: Abschicken
   product: Produkt
   product_details: "Produkt Details"
@@ -356,13 +388,18 @@ de:
   products: Produkte
   properties: "Eigenschaften"
   property: "Eigenschaft"
+  prototype: Prototype
   prototypes: "Prototyp"
   qty: Anz
   rate: Rate
+  register: Register as a New User
+  register_or_guest: Checkout as Guest or Register
+  registration: Registration           
   remember_me: "Details auf diesem Computer speichern"
   remove: Entfernen
   reports: Berichte
   resend: "Neu versenden"
+  reset_password: "Reset my password"
   response_code: Rückgabewert
   resume: Fortsetzen
   resumed: Fortgesetzt
@@ -378,6 +415,7 @@ de:
   secure_connection_type: Secure Connection Type
   select: Auswählen
   select_from_prototype: ""
+  select_preferred_shipping_option: "Select preferred shipping option"
   send_copy_of_all_mails_to: Send Copy of All Mails To
   send_copy_of_orders_mails_to: Send Copy of Order Mails To         
   send_mails_as: Send Mails As                    
@@ -385,19 +423,30 @@ de:
   ship: ship
   ship_address: Lieferadresse
   shipment: Shipment
+  shipment_number: "Shipment #"
   shipped: Ausgeliefert
   shipping: Lieferung
   shipping_address: Lieferadresse
+  shipping_calculator: Calculator
+  shipping_categories: "Shipping Categories"
+  shipping_categories_description: "Manage shipping categories to identify which products can be shipped via which method"
+  shipping_cost: Cost
   shipping_error: "Shipping Error"
-  shipping_method: Liefermethode
+  shipping_method: Method
+  shipping_methods: "Shipping Methods"
+  shipping_methods_description: "Manage shipping methods"
   shipping_total: "Lieferkosten Gesamt"
+  shop_by_taxonomy: "Shop by {{taxonomy}}"
   shopping_cart: Warenkorb
   show_deleted: "Zeige gelöschte"
   show_incomplete_orders: "Zeige unvollständige Bestellungen"
   show_only_complete_orders: "Only show complete orders"
   show_out_of_stock_products: "Zeige ausverkaufte Produkte"
   sign_up: "Anmelden"
+  site_name: "Site Name"
+  site_url: "Site URL"
   sku: Lagerhaltungsnummer
+  smtp: SMTP
   smtp_authentication_type: SMTP Authentication Type         
   smtp_domain: SMTP Domain
   smtp_mail_host: SMTP Mail Host                       
@@ -432,15 +481,19 @@ de:
   taxons: Taxons
   thank_you_for_your_order: "Vielen Dank für ihre Bestellung"
   this_file_language: Deutsch
+  to_add_variants_you_must_first_define: "To add variants, you must first define"
   total: Gesamt
+  tracking: Tracking
   transaction: Transaktion
   tree: Baum
   try_again: "Erneut versuchen"
   type: Typ
+  unable_ship_method: "Unable to generate shipping methods due to a server error."
   unable_to_authorize_credit_card: "Unable to Authorize Credit Card"
   unable_to_capture_credit_card: "Unable to Capture Credit Card"
   unable_to_save_order: "Unable to Save Order"
   update: Speichern
+  update_password: "Update my password and log me in"                    
   updated_successfully: "Erfolgreich aktualisiert"
   use_as_shipping_address: Use as Shipping Address
   use_billing_address: Use Billing Address
@@ -459,6 +512,8 @@ de:
   what_is_this: "Was ist das?"
   whats_this: "What's this"
   width: Breite
+  year: "Year"
+  you_have_been_logged_out: "You have been logged out."
   your_cart_is_empty: "Ihr Warenkorb ist leer"
   zip: PLZ
   zone: Zone

data/config/locales/de_rails.yml

@@ -17,9 +17,9 @@ de:
   
   time:
     formats:
-      default: "%A, %e. %B %Y, %H:%M Uhr"
-      short: "%e. %B, %H:%M Uhr"
-      long: "%A, %e. %B %Y, %H:%M Uhr"
+      default: "%A, %d. %B %Y, %H:%M Uhr"
+      short: "%d. %B, %H:%M Uhr"
+      long: "%A, %d. %B %Y, %H:%M Uhr"
       time: "%H:%M"
 
     am: "vormittags"
@@ -60,7 +60,14 @@ de:
       over_x_years:
         one: 'mehr als 1 Jahr'
         other: 'mehr als {{count}} Jahre'
-      
+    prompts:
+      second: "Sekunden"
+      minute: "Minuten"
+      hour: "Stunden"
+      day: "Tag"
+      month: "Monat"
+      year: "Jahr"
+
   number:
     format:
       precision: 2
@@ -83,12 +90,25 @@ de:
       format:
         delimiter: ""
         precision: 1
+      storage_units:
+        # Storage units output formatting.
+        # %u is the storage unit, %n is the number (default: 2 MB)
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
 
   support:
     array:
-      sentence_connector: "und"
-      skip_last_comma: true
-        
+      words_connector: ", "
+      two_words_connector: " und "
+      last_word_connector: " und "
+
   activerecord:
     errors:
       template: