spree 0.4.1 → 0.5.0

data/config/environment.rb

@@ -5,8 +5,8 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-SPREE_GEM_VERSION = '0.4.1' unless defined? SPREE_GEM_VERSION
-RAILS_GEM_VERSION = "2.1.0" unless defined? RAILS_GEM_VERSION
+SPREE_GEM_VERSION = '0.5.0' unless defined? SPREE_GEM_VERSION
+RAILS_GEM_VERSION = "2.1.2" unless defined? RAILS_GEM_VERSION
           
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -75,6 +75,20 @@ Spree::Initializer.run do |config|
   # config.active_record.observers = :cacher, :garbage_collector  
 end
 
+
+# Load extension gems.
+config = Rails::Configuration.new
+Object.subclasses_of(Spree::Extension).each do |extension|
+  if extension.respond_to? :require_gems
+    extension.require_gems(config)
+  end
+end
+
+config.gems.each do |gem|
+  gem.add_load_paths
+  gem.load
+end
+
 # Add new inflection rules using the following format 
 # (all these examples are active by default):
 # Inflector.inflections do |inflect|

data/config/routes.rb

@@ -51,6 +51,7 @@ ActionController::Routing::Routes.draw do |map|
     admin.resources :properties, :collection => {:filtered => :get}
     admin.resources :prototypes, :member => {:select => :post}, :collection => {:available => :get}
     admin.resource :mail_settings
+    admin.resource :inventory_settings
     admin.resources :orders, :member => {:fire => :put, :resend => :post}
     admin.resources :taxonomies do |taxonomy|
       taxonomy.resources :taxons
@@ -61,4 +62,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect ':controller/:action/:id.:format'
   map.connect ':controller/:action/:id'
 
+  # a catchall route for "static" content
+  map.connect '*path', :controller => 'content', :action => 'show'
+
 end

data/db/migrate/20081016002224_remove_defunct_order_fields.rb

@@ -0,0 +1,10 @@
+class RemoveDefunctOrderFields < ActiveRecord::Migration
+  def self.up
+    change_table :orders do |t|
+      t.remove :ship_method
+    end
+  end
+
+  def self.down
+  end
+end

data/db/migrate/20081016162924_drop_category_id_from_products.rb

@@ -0,0 +1,9 @@
+class DropCategoryIdFromProducts < ActiveRecord::Migration
+  def self.up
+    remove_column :products, :category_id
+  end
+
+  def self.down
+    add_column :products, :category_id, :integer
+  end
+end

data/db/sample/addresses.yml

@@ -12,6 +12,20 @@ frank_address_<%= i %>:
   addressable: order_<%= i %>
   addressable_type: Order
 <% end %>
+<% 1.upto(30) do |i| %>
+frank_bill_address_<%= i %>:
+  firstname: Frank
+  lastname: Foo
+  address1: 123 Foo St.
+  address2: Apt. F
+  city: Fooville
+  state: new_york
+  zipcode: 16804
+  country_id: 214
+  phone: 614-555-1212
+  addressable: visa_<%= i %>
+  addressable_type: CreditcardPayment
+<% end %>
 foo_street:
   id: 101
   firstname: joe

data/db/sample/orders.yml

@@ -3,7 +3,6 @@ order_<%= i %>:
   user: frank
   number: <%= Array.new(9){rand(9)}.join %>
   state: authorized
-  ship_method: 1
   ship_amount: 5.00
   tax_amount: 2.78
   item_total: 37.97

data/lang/ui/de-DE.yml

@@ -70,6 +70,7 @@ image: Bild
 images: Bilder
 inventory_adjustment: Lager Anpassung
 inventory: Lager
+inventory_setting_description: Inventory Configuration, Backordering, Zero-Stock Display
 item_description: Artikelbeschreibung
 item: Artikel
 item_total: Artikel Gesamt
@@ -204,4 +205,4 @@ order_operation_cancel:
 order_operation_return: 
 order_operation_ship: 
 order_operation_comp: 
-order_operation_delete: 
+order_operation_delete: 

data/lang/ui/en-US.yml

@@ -1,25 +1,30 @@
 abbreviation: Abbreviation
 account: Account
 action: Action
+add: Add
 add_category: Add Category
 add_option_type: Add Option Type
 add_option_types: Add Option Types
 add_product_properties: Add Product Properties
-address_information: Address Information
 add_to_cart: Add To Cart
+address: Address
+address_information: Address Information
 adjustment: Adjustment
 administration: Administration
 amount: Amount
 are_you_sure_category: Are you sure you want to delete this category?
+are_you_sure_delete: Are you sure you want to delete this record?
 are_you_sure_delete_image: Are you sure you want to delete this image?
 are_you_sure_option_type: Are you sure you want to delete this option type?
-are_you_sure_delete: Are you sure you want to delete this record?
+authorized: Authorized
 available_on: Available On
 back: Back
 back_to_store: Go Back To Store
 bill_address: Bill Address
 billing_address: Billing Address
 cancel: Cancel
+cancel: cancel
+capture: capture
 card_code: Card Code
 card_number: Card Number
 cart: Cart
@@ -36,12 +41,13 @@ configuration_options: Configuration Options
 configurations: Configurations
 confirm: Confirm
 confirm_password: Password Confirmation
-continue_shopping: Continue shopping
 continue_shopping: Continue Shopping
+continue_shopping: Continue shopping
 country: Country
 create: Create
 create_a_new_account: Create a new account
 credit_card: Credit Card
+creditcard_payment: Creditcard Payment
 current: Current
 customer: Customer
 date: Date
@@ -56,8 +62,8 @@ editing_option_types: Editing Option Types
 editing_state: Editing State
 editing_tax_category: Editing Tax Category
 editing_user: Editing User
-email_address: Email Address
 email: Email
+email_address: Email Address
 email_server_settings_description: Set email server settings.
 empty_cart: Empty Cart
 error: error
@@ -69,24 +75,27 @@ filename: Filename
 final_confirmation: Final Confirmation
 first_name: First Name
 gateway: Gateway
+gateway_error: Gateway Error
 gateway_setting_description: Select a payment gateway and configure its settings.
 hello_user: Hello User
 image: Image
 images: Images
-inventory_adjustment: Inventory Adjustment
+in_progress: In Progress
 inventory: Inventory
-item_description: Item Description
+inventory_adjustment: Inventory Adjustment
+inventory_setting_description: Inventory Configuration, Backordering, Zero-Stock Display
 item: Item
+item_description: Item Description
 item_total: Item Total
 last_name: Last Name
 listing_categories: Listing Categories
 listing_option_types: Listing Option Types
 listing_orders: Listing Orders
 listing_reports: Listing Reports
-listing_tax_categories: Listing Tax Categories
+listing_tax_cateThe total amount charged to your card will be gories: Listing Tax Categories
 listing_users: Listing Users
-logged_in_as: Logged in as
 log_in: Log In
+logged_in_as: Logged in as
 login_name: Login
 logout: Logout
 mail_server_settings: Mail Server Settings
@@ -112,22 +121,27 @@ none_available: None Available
 number: Number
 on_hand: On Hand
 operation: Operation
-options: Options
-option_types: Option Types
 option_Values: Option Values
-order_number: Order #
+option_types: Option Types
+options: Options
+or: or
+order: Order
 order_confirmation_note: 
 order_date: Order Date
 order_details: Order Details
+order_email_resent: Order Email Resent
 order_number: "Order #"
-order: Order
+order_number: Order #
+order_operation_authorize: Authorize
 order_processed_successfully: Your order has been processed successfully
-orders: Orders
 order_total: Order Total
-or: or
+order_updated: Order Updated
+order_total_message: The total amount charged to your card will be 
+orders: Orders
 overview: Overview
 parent_category: Parent Category
 password: Password
+pay: pay
 payment: Payment
 payment_gateway: Payment Gateway
 phone: Phone
@@ -135,49 +149,52 @@ presentation: Presentation
 previous: previous
 price: Price
 problem_authorizing_card: Problem authorizing credit card
-problems_processing_order: We had problems processing your order
 problem_capturing_card: Problem capturing credit card
+problems_processing_order: We had problems processing your order
 process: Process
 product: Product
-products: Products
 product_properties: Product Properties
-property: Property
+products: Products
 properties: Properties
+property: Property
 prototypes: Prototypes
 qty: Qty
 remember_me: Remember me
 reports: Reports
 resend: Resend
 response_code: Response Code
-sales_totals_description: Sales Total For All Orders
+return: return
 sales_total: Sales Total
 sales_totals: Sales Totals
+sales_totals_description: Sales Total For All Orders
 search: Search
 select: Select
 select_from_prototype: Select From Prototype
+ship: ship
 ship_address: Ship Address
+shipping: Shipping
 shipping_address: Shipping Address
 shipping_method: Shipping Method
-shipping: Shipping
 shipping_total: Shipping Total
 shopping_cart: Shopping Cart
 sign_up: Sign up
 sku: SKU
 start: Start
 state: State
-states: States
 state_setting_description: Administer the list of states/provinces associated with each country.
+states: States
 status: Status
 stop: Stop
 store: Store
-street_address_2: Street Address (cont'd)
 street_address: Street Address
+street_address_2: Street Address (cont'd)
 subtotal: Subtotal
+subtract: Subtract
 system: System
 tax: Tax
-tax_category: Tax Category
 tax_categories: Tax Categories
 tax_categories_setting_description: Set up tax categories to identify which products should be taxable.
+tax_category: Tax Category
 tax_total: Tax Total
 thank_you_for_your_order: Thank you for your business.  Please print out a copy of this confirmation page for your records.
 time: Time
@@ -187,8 +204,8 @@ try_again: Try Again
 type: Type
 update: Update
 use_different_shipping_address: Use Different Shipping Address
-users: Users
 user: User
+users: Users
 value: Value
 variants: Variants
 version: Version
@@ -198,7 +215,6 @@ what_is_a_cvv: What is a (CVV) Credit Card Code?
 what_is_this: What's This?
 zip: Zip
 zone: Zone
-zones: Zones
 zone_setting_description: Collections of countries, states or other zones to be used in various calculations.
 order_operation_authorize: Authorize
 capture: capture
@@ -222,4 +238,13 @@ assign_taxons: Assign Taxons
 remove: Remove
 no_match_found: No Match Found
 taxonomies: Taxonomies
-taxonomies_setting_description: Create and manage taxonomies
+taxonomies_setting_description: Create and manage taxonomies
+zones: Zones
+shipment: Shipment
+weight: Weight
+height: Height
+depth: Depth
+width: Width
+shipping_error: Shipping Error
+new_customer: New Customer
+existing_customer: Existing Customer

data/lang/ui/es-ES.yml

@@ -67,6 +67,7 @@ image: Imágen
 images: Imagenes
 inventory_adjustment: Ajuste de inventario
 inventory: Inventario
+inventory_setting_description: Inventory Configuration, Backordering, Zero-Stock Display
 item_description: Descripción del artículo
 item: artículo
 item_total: Total de artículos
@@ -199,4 +200,4 @@ order_operation_cancel:
 order_operation_return: 
 order_operation_ship: 
 order_operation_comp: 
-order_operation_delete: 
+order_operation_delete: 

data/lang/ui/it-IT.yml

@@ -64,6 +64,7 @@ image: Imagine
 images: Imagini
 inventory_adjustment: Edita magazzino
 inventory: Magazzino
+inventory_setting_description: Inventory Configuration, Backordering, Zero-Stock Display
 item_description: Descrizione articolo
 item: Articolo
 item_total: Articolo totale
@@ -191,4 +192,4 @@ order_operation_cancel:
 order_operation_return: 
 order_operation_ship: 
 order_operation_comp: 
-order_operation_delete: 
+order_operation_delete: 

data/lang/ui/pl-PL.yml

@@ -74,6 +74,7 @@ image: Obrazek
 images: Obrazki
 inventory_adjustment: Dostosowanie zapasów
 inventory: Zapasy
+inventory_setting_description: Inventory Configuration, Backordering, Zero-Stock Display
 item_description: Opis pozycji
 item: Pozycja
 item_total: Liczba pozycji

data/lang/ui/pt-BR.yml

@@ -1,6 +1,7 @@
 abbreviation: Abreviação
 account: Conta
-action: Ação 
+action: Ação
+add: Adicionar
 add_category: Adicionar Categoria
 add_option_type: Adicionar Tipo de Opção
 add_option_types: Adicionar Tipo de Opção
@@ -75,6 +76,7 @@ image: Imagem
 images: Imagens
 inventory_adjustment: Ajuste de Inventário
 inventory: Inventário
+inventory_setting_description: Inventory Configuration, Backordering, Zero-Stock Display
 item_description: Descrição de Item
 item: Item
 item_total: Total de Item
@@ -174,6 +176,7 @@ store: Loja
 street_address_2: Endereço (compl.)
 street_address: Endereço
 subtotal: Sub-total
+subtract: Subtrair
 system: Sistema
 tax: Taxa
 tax_category: Categoria de Taxa
@@ -216,4 +219,4 @@ order_operation_cancel: Cancelar
 order_operation_return: Devolver
 order_operation_ship: Entregar
 order_operation_comp: Computar
-order_operation_delete: Apagar
+order_operation_delete: Apagar

data/lib/authenticated_system.rb

@@ -64,7 +64,7 @@ module AuthenticatedSystem
       respond_to do |format|
         format.html do
           store_location
-          redirect_to signup_path
+          redirect_to login_path
         end
         format.xml do
           request_http_basic_authentication 'Web Password'

data/lib/generators/extension/extension_generator.rb

@@ -16,6 +16,7 @@ class ExtensionGenerator < Rails::Generator::NamedBase
       m.directory "#{extension_path}/app/models"
       m.directory "#{extension_path}/app/views"
       m.directory "#{extension_path}/db/migrate"
+      m.directory "#{extension_path}/db/sample"
       m.directory "#{extension_path}/lib/tasks"
       m.directory "#{extension_path}/public"
 

data/lib/generators/extension/templates/extension.rb

@@ -11,13 +11,12 @@ class <%= class_name %> < Spree::Extension
   #     admin.resources :whatever
   #   end  
   # end
+
+  # def self.require_gems(config)
+  #   config.gem "gemname-goes-here", :version => '1.2.3'
+  # end
   
   def activate
     # admin.tabs.add "<%= extension_name %>", "/admin/<%= file_name %>", :after => "Layouts", :visibility => [:all]
   end
-  
-  def deactivate
-    # admin.tabs.remove "<%= extension_name %>"
-  end
-  
 end

data/lib/generators/extension/templates/tasks.rake

@@ -1,3 +1,15 @@
+namespace :db do
+  desc "Bootstrap your database for Spree."
+  task :bootstrap  => :environment do
+    # load initial database fixtures (in db/sample/*.yml) into the current environment's database
+    ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
+    Dir.glob(File.join(<%= class_name %>.root, "db", 'sample', '*.{yml,csv}')).each do |fixture_file|
+      Fixtures.create_fixtures("#{<%= class_name %>.root}/db/sample", File.basename(fixture_file, '.*'))
+    end
+
+  end
+end
+
 namespace :spree do
   namespace :extensions do
     namespace :<%= file_name %> do