spree_core 1.0.7 → 1.1.0.rc1

data/app/views/spree/checkout/edit.html.erb

@@ -1,5 +1,5 @@
 <% content_for :head do %>
-  <%= javascript_include_tag states_path %>
+  <%= javascript_include_tag states_url %>
 <% end %>
 <div id="checkout" data-hook>  
   <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>

data/app/views/spree/checkout/registration.html.erb

@@ -1,7 +1,7 @@
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
 <h2><%= t(:registration) %></h2>
-<div id="registration" data-hook class="columns alpha eight">
-  <div id="account">
+<div id="registration" data-hook>
+  <div id="account" class="columns alpha eight">
     <!-- TODO: add partial with registration form -->
   </div>
   <% if Spree::Config[:allow_guest_checkout] %>

data/app/views/spree/order_mailer/confirm_email.text.erb

@@ -6,14 +6,14 @@ Please review and retain the following order information for your records.
 Order Summary
 ============================================================
 <% @order.line_items.each do |item| %>
-<%=item.variant.sku %> <%=item.variant.product.name%> <%= item.variant.options_text -%> (<%=item.quantity%>) @ <%= number_to_currency item.price %> = <%= number_to_currency(item.price * item.quantity) %>
+  <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= number_to_currency item.price %> = <%= number_to_currency(item.price * item.quantity) %>
 <% end %>
 ============================================================
 Subtotal: <%= number_to_currency @order.item_total %>
 <% @order.adjustments.each do |adjustment| %>
-<%= "#{adjustment.label}: #{number_to_currency adjustment.amount}"%>
+  <%= raw(adjustment.label) %> <%= number_to_currency(adjustment.amount) %>
 <% end %>
-Order Total: <%= number_to_currency @order.total %>
+Order Total: <%= number_to_currency(@order.total) %>
 
 
 Thank you for your business.

data/app/views/spree/orders/show.html.erb

@@ -13,10 +13,10 @@
   <p data-hook="links">
     <%= link_to t(:back_to_store), spree.root_path, :class => "button" %>
     <% unless params.has_key? :checkout_complete %>
-      <% if current_user %>
+      <% if respond_to?(:current_user) && current_user %>
         <%= link_to t(:my_account), spree.account_path, :class => "button" %>
       <% end %>
     <% end %>
   </p>
 </div>
-</fieldset>
+</fieldset>

data/app/views/spree/products/_cart_form.html.erb

@@ -1,5 +1,5 @@
 <%= form_for :order, :url => populate_orders_url do |f| %>
-  <div data-hook="inside_product_cart_form" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
+  <div id="inside-product-cart-form" data-hook="inside_product_cart_form" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
 
     <% if @product.has_variants? %>
       <div id="product-variants" class="columns five alpha">
@@ -38,7 +38,6 @@
           <% if @product.has_stock? || Spree::Config[:allow_backorders] %>      
             <%= number_field_tag (@product.has_variants? ? :quantity : "variants[#{@product.master.id}]"),
               1, :class => 'title', :in => 1..@product.on_hand %>
-            &nbsp;
             <%= button_tag :class => 'large primary', :id => 'add-to-cart-button' do %>
               <%= t(:add_to_cart) %>
             <% end %>

data/app/views/spree/products/_image.html.erb

@@ -1,5 +1,5 @@
 <% if image %> 
-  <%= image_tag image.attachment.url(:product), :itemprop => "description" %>
+  <%= image_tag image.attachment.url(:product), :itemprop => "image" %>
 <% else %>
   <%= product_image(@product, :itemprop => "image") %>
 <% end %>

data/app/views/spree/products/show.html.erb

@@ -27,7 +27,7 @@
 
         <h1 class="product-title" itemprop="name"><%= accurate_title %></h1>
 
-        <div itemprop="description" data-hook="product_description">
+        <div itemprop="description" data-hook="description">
           <%= product_description(@product) rescue t(:product_has_no_description) %>
         </div>
 
@@ -36,10 +36,10 @@
         </div>
 
       </div>
-    
+
       <%= render :partial => 'taxons' %>
 
     </div>
   </div>
 
-</div>
+</div>

data/app/views/spree/shared/_filters.html.erb

@@ -1,26 +1,28 @@
-<%= form_tag '', :method => :get, :id => 'sidebar_products_search' do %>
-  <% params[:search] ||= {} %>
-  <%= hidden_field_tag 'per_page', params[:per_page] %>
-  <% filters = @taxon ? @taxon.applicable_filters : [Spree::ProductFilters.all_taxons] %>
-  <% filters.each do |filter| %>
-    <% labels = filter[:labels] || filter[:conds].map {|m,c| [m,m]} %>
-    <% next if labels.empty? %>
-    <div class="navigation" data-hook="navigation">
-      <span class="category"> <%= filter[:name] %> </span>
-      <ul class="filter_choices">
-        <% labels.each do |nm,val| %>
-          <% label = "#{filter[:name]}_#{nm}".gsub(/\s+/,'_') %>
-          <li class="nowrap">
-            <input type="checkbox"
-                   id="<%= label %>"
-                   name="search[<%= filter[:scope].to_s %>][]"
-                   value="<%= val %>"
-                   <%= params[:search][filter[:scope]] && params[:search][filter[:scope]].include?(val.to_s) ? "checked" : "" %> />
-            <label class="nowrap" for="<%= label %>"> <%= nm %> </label>
-          </li>
-        <% end %>
-      </ul>
-    </div>
+<% filters = @taxon ? @taxon.applicable_filters : [Spree::ProductFilters.all_taxons] %>
+<% unless filters.empty? %>
+  <%= form_tag '', :method => :get, :id => 'sidebar_products_search' do %>
+    <% params[:search] ||= {} %>
+    <%= hidden_field_tag 'per_page', params[:per_page] %>
+    <% filters.each do |filter| %>
+      <% labels = filter[:labels] || filter[:conds].map {|m,c| [m,m]} %>
+      <% next if labels.empty? %>
+      <div class="navigation" data-hook="navigation">
+        <span class="category"> <%= filter[:name] %> </span>
+        <ul class="filter_choices">
+          <% labels.each do |nm,val| %>
+            <% label = "#{filter[:name]}_#{nm}".gsub(/\s+/,'_') %>
+            <li class="nowrap">
+              <input type="checkbox"
+                     id="<%= label %>"
+                     name="search[<%= filter[:scope].to_s %>][]"
+                     value="<%= val %>"
+                     <%= params[:search][filter[:scope]] && params[:search][filter[:scope]].include?(val.to_s) ? "checked" : "" %> />
+              <label class="nowrap" for="<%= label %>"> <%= nm %> </label>
+            </li>
+          <% end %>
+        </ul>
+      </div>
+    <% end %>
+    <%= submit_tag t(:search), :name => nil %>
   <% end %>
-  <%= submit_tag t(:search), :name => nil %>
 <% end %>

data/app/views/spree/shared/_google_analytics.html.erb

@@ -1,38 +1,38 @@
 <% if tracker = Spree::Tracker.current %>
 
-  <%= javascript_tag do %>
+  <%= javascript_tag do -%>
     var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', '<%= tracker.analytics_id %>']);
+    _gaq.push(['_setAccount', '<%= tracker.analytics_id -%>']);
     _gaq.push(['_trackPageview']);
 
-    <% if flash[:commerce_tracking] %>
-     <%# report e-commerce transaction information when applicable %>
-      _gaq.push(['_addTrans',
-        "<%= @order.number %>",                           <%# Order Number %>
-        "",                                               <%# Affiliation %>
-        "<%= @order.total %>",                            <%# Order total %>
-        "<%= @order.adjustments.tax.sum(:amount) %>",     <%# Tax Amount %>
-        "<%= @order.adjustments.shipping.sum(:amount) %>",<%# Ship Amount %>
-        "",                                               <%# City %>
-        "",                                               <%# State %>
-        ""                                                <%# Country %>
-      ]);
-      <% @order.line_items.each do |line_item| %>
-        _gaq.push(['_addItem',
-          "<%= @order.number %>",                 <%# order ID - required %>
-          "<%= line_item.variant.sku %>",         <%# SKU/code - required %>
-          "<%= line_item.variant.product.name %>",<%# product name %>
-          "",                                     <%# category or variation, Product Category %>
-          "<%= line_item.price %>",               <%# unit price - required %>
-          "<%= line_item.quantity %>"             <%# quantity - required %>
-        ]);
-      <% end %>
-    <% end %>
-
     (function() {
       var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
       ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
       var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
     })();
+    <% end -%>
+
+  <% if flash[:commerce_tracking] %>
+
+    <%= javascript_tag do -%>
+      // report e-commerce transaction information when applicable
+      pageTracker._addTrans(
+      "<%= @order.number %>",    //Order Number
+      "",    //Affiliation
+      "<%= @order.total %>",    //Order total
+      "<%= @order.adjustments.tax.sum(:amount).to_s %>",    //Tax Amount
+      "<%= @order.adjustments.shipping.sum(:amount).to_s %>",    //Ship Amount
+      "",    //City
+      "",    //State
+      ""    //Country
+      );
+      <% @order.line_items.each do |line_item| %>
+        pageTracker._addItem("<%= @order.number %>", "<%= line_item.variant.sku %>", "<%= line_item.variant.product.name %>",
+          "" /*Product Category*/, "<%= line_item.price %>", "<%= line_item.quantity %>");
+      <% end %>
+      pageTracker._trackTrans();
+    <% end -%>
+
   <% end %>
+
 <% end %>

data/app/views/spree/shared/_products.html.erb

@@ -1,5 +1,5 @@
 <%
-  paginated_products = @searcher.products if params.key?(:keywords)
+  paginated_products = @searcher.retrieve_products if params.key?(:keywords)
   paginated_products ||= products
 %>
 <% if products.empty? %>
@@ -14,7 +14,7 @@
     <% if Spree::Config[:show_zero_stock_products] || product.has_stock? %>
       <li id="product_<%= product.id %>" class="columns three <%= cycle("alpha", "secondary", "", "omega secondary") %>" data-hook="products_list_item" itemscope itemtype="http://schema.org/Product">
         <div class="product-image">
-          <%= link_to small_image(product, :itemprop => "name"), product %>
+          <%= link_to small_image(product, :itemprop => "image"), product, :itemprop => 'url' %>
         </div>
         <%= link_to truncate(product.name, :length => 50), product, :class => 'info', :itemprop => "name", :title => product.name %>
         <span class="price selling" itemprop="price"><%= number_to_currency product.price %></span>

data/app/views/spree/shared/_search.html.erb

@@ -1,5 +1,5 @@
 <% @taxons = @taxon && @taxon.parent ? @taxon.parent.children : Spree::Taxon.roots %>
-<%= form_tag products_url, :method => :get do %>
+<%= form_tag products_path, :method => :get do %>
   <%= select_tag :taxon,
         options_for_select([[t(:all_departments), '']] +
                               @taxons.map {|t| [t.name, t.id]},

data/app/views/spree/shared/_store_menu.html.erb

@@ -1,2 +1,2 @@
 <li id="home-link" data-hook><%= link_to t(:home), root_path %></li>
-<li id="link-to-cart" data-hook><%= link_to_cart %></li>
+<li id="link-to-cart" data-hook><%= link_to_cart %></li>

data/app/views/spree/states/index.js.erb

@@ -1 +1 @@
-state_mapper = <%== @state_info.to_json %>
+state_mapper = <%== @state_info %>

data/config/initializers/rails_3_1.rb

@@ -4,9 +4,9 @@ module ActiveRecord
     module ClassMethods
       protected
 
-      def valid_scope_name?(name)
-        respond_to?(name, true)
-      end
+        def valid_scope_name?(name)
+          respond_to?(name, true)
+        end
     end
   end
 end

data/config/locales/en.yml

@@ -9,7 +9,6 @@ en:
   account_updated: "Account updated!"
   action: Action
   actions:
-    cancel: Cancel
     create: Create
     destroy: Destroy
     list: List
@@ -49,7 +48,19 @@ en:
         price: Price
         quantity: Quantity
       spree/order:
-        bill_address:
+        checkout_complete: "Checkout Complete"
+        completed_at: "Completed At"
+        ip_address: "IP Address"
+        item_total: "Item Total"
+        number: Number
+        special_instructions: "Special Instructions"
+        state: State
+        total: Total
+        created_at: Order Date
+        payment_state: Payment State
+        shipment_state: Shipment State
+        email: Customer E-Mail
+      spree/order/bill_address:
           address1: "Billing address street"
           city: "Billing address city"
           firstname: "Billing address first name"
@@ -57,7 +68,7 @@ en:
           phone: "Billing address phone"
           state: "Billing address state"
           zipcode: "Billing address zipcode"
-        ship_address:
+      spree/order/ship_address:
           address1: "Shipping address street"
           city: "Shipping address city"
           firstname: "Shipping address first name"
@@ -65,14 +76,6 @@ en:
           phone: "Shipping address phone"
           state: "Shipping address state"
           zipcode: "Shipping address zipcode"
-        checkout_complete: "Checkout Complete"
-        completed_at: "Completed At"
-        ip_address: "IP Address"
-        item_total: "Item Total"
-        number: Number
-        special_instructions: "Special Instructions"
-        state: State
-        total: Total
       spree/option_type:
         name: Name
         presentation: Presentation
@@ -87,15 +90,6 @@ en:
         on_hand: "On Hand"
         shipping_category: "Shipping Category"
         tax_category: "Tax Category"
-      spree/product_group:
-        name: Name
-        product_count: "Product count"
-        product_scopes: "Product scopes"
-        products: "Products"
-        url: URL
-      spree/product_scope:
-        arguments: "Arguments"
-        description: "Description"
       spree/property:
         name: Name
         presentation: Presentation
@@ -169,9 +163,6 @@ en:
       spree/product:
         one: Product
         other: Products
-      spree/product_group:
-        one: "Product group"
-        other: "Product groups"
       spree/property:
         one: Property
         other: Properties
@@ -217,6 +208,8 @@ en:
   add: Add
   add_category: "Add Category"
   add_country: "Add Country"
+  add_new_header: "Add New Header"
+  add_new_style: "Add New Style"
   add_option_type: "Add Option Type"
   add_option_types: "Add Option Types"
   add_option_value: "Add Option Value"
@@ -262,6 +255,9 @@ en:
   are_you_sure_you_want_to_capture: "Are you sure you want to capture?"
   assign_taxon: "Assign Taxon"
   assign_taxons: "Assign Taxons"
+  attachment_default_url: "Attachments URL"
+  attachment_path: "Attachments Path"
+  attachment_styles: "Paperclip Styles"
   authorization_failure: "Authorization Failure"
   authorized: Authorized
   availability: "Availability"
@@ -325,7 +321,6 @@ en:
   country_based: "Country Based"
   create: Create
   create_a_new_account: "Create a new account"
-  create_product_group_from_products: Create a new product group from these products
   create_user_account: Create User Account
   created_successfully: "Created Successfully"
   credit: Credit
@@ -392,6 +387,7 @@ en:
   enter_exactly_as_shown_on_card: Please enter exactly as shown on the card
   enter_at_least_five_letters: Enter at least five letters of customer name
   enter_password_to_confirm: "(we need your current password to confirm your changes)"
+  enter_token: Enter Token
   environment: "Environment"
   error: error
   errors:
@@ -463,6 +459,9 @@ en:
   image: Image
   images: Images
   images_for: "Images for"
+  image_settings: "Image Settings"
+  image_settings_updated: "Image Settings successfully updated."
+  image_settings_warning: "You will need to regenerate thumbnails if you update the paperclip styles. Use rake paperclip:refresh:thumbnails to do this."
   in_progress: "In Progress"
   include_in_shipment: Include in Shipment
   included_in_other_shipment: Included in another Shipment
@@ -486,6 +485,7 @@ en:
   item_total: "Item Total"
   last_name: "Last Name"
   last_name_begins_with: "Last Name Begins With"
+  learn_more: Learn More
   leave_blank_to_not_change: "(leave blank if you don't want to change it)"
   list: List
   listing_categories: "Listing Categories"
@@ -573,7 +573,6 @@ en:
   none_available: "None Available"
   normal_amount: "Normal Amount"
   not: not
-  not_available: "N/A"
   not_found: "%{resource} is not found"
   not_shown: "Not Shown"
   note: Note
@@ -594,6 +593,7 @@ en:
   option_values: "Option Values"
   options: Options
   or: or
+  or_over_price: "%{price} or over"
   order: Order
   order_confirmation_note: ""
   order_date: "Order Date"
@@ -628,12 +628,17 @@ en:
   order_total: "Order Total"
   order_total_message: "The total amount charged to your card will be"
   order_updated: "Order Updated"
-  or_over_price: "Over %{price}"
+  orders: Orders
   other_payment_options: Other Payment Options
   out_of_stock: "Out of Stock"
   over_paid: "Over Paid"
+  overview: Overview
   page_only_viewable_when_logged_in: You attempted to visit a page which can only be viewed when you are logged in
   page_only_viewable_when_logged_out: You attempted to visit a page which can only be viewed when you are logged out
+  pagination:
+    previous_page: "« previous page"
+    next_page: "next page »"
+    truncate: "…"
   paid: Paid
   parent_category: "Parent Category"
   password: Password
@@ -706,18 +711,12 @@ en:
         description: "Scopes for selecting products based on option and property values"
         name: Values
     scopes:
-      ascend_by_master_price:
-        name: Ascend by product master price
       ascend_by_name:
         name: Ascend by product name
       ascend_by_updated_at:
         name: Ascend by actualization date
-      descend_by_master_price:
-        name: Descend by product master price
       descend_by_name:
         name: Descend by product name
-      descend_by_popularity:
-        name: Sort by popularity(most popular first)
       descend_by_updated_at:
         name: Descend by actualization date
       in_name:
@@ -854,6 +853,12 @@ en:
   rma_number: RMA Number
   rma_value: RMA Value
   roles: Roles
+  s3_access_key: "Access Key"
+  s3_bucket: "Bucket"
+  s3_headers: "S3 Headers"
+  s3_secret: "Secret Key"
+  s3_used_for_product_images: "S3 is being used for product images"
+  s3_not_used_for_product_images: "S3 is not being used for product images"
   sales_tax: "Sales Tax"
   sales_total: "Sales Total"
   sales_total_description: "Sales Total For All Orders"
@@ -911,6 +916,7 @@ en:
   shipping_total: "Shipping Total"
   shop_by_taxonomy: "Shop by %{taxonomy}"
   shopping_cart: "Shopping Cart"
+  short_description: "Short description"
   show: Show
   show_active: "Show Active"
   show_deleted: "Show Deleted"
@@ -936,8 +942,6 @@ en:
   special_instructions: "Special Instructions"
   spree:
     date: Date
-    date_picker:
-      format: 'yy/mm/dd'
     time: Time
   spree_gateway_error_flash_for_checkout: "There was a problem with your payment information. Please check your information and try again."
   spree_inventory_error_flash_for_insufficient_quantity: "An item in your cart has become unavailable."
@@ -1011,8 +1015,8 @@ en:
   unable_to_capture_credit_card: "Unable to Capture Credit Card"
   unable_to_connect_to_gateway: "Unable to connect to gateway."
   unable_to_save_order: "Unable to Save Order"
-  under_paid: "Under Paid"
   under_price: "Under %{price}"
+  under_paid: "Under Paid"
   unrecognized_card_type: Unrecognized card type
   update: Update
   update_password: "Update my password and log me in"
@@ -1023,6 +1027,7 @@ en:
   use_billing_address: Use Billing Address
   use_different_shipping_address: "Use Different Shipping Address"
   use_new_cc: "Use a new card"
+  use_s3: "Use Amazon S3 For Images"
   user: User
   user_account: User Account
   user_created_successfully: "User created successfully"

data/config/routes.rb

@@ -11,9 +11,9 @@ Spree::Core::Engine.routes.draw do
   resources :states, :only => :index
 
   # non-restful checkout stuff
-  match '/checkout/update/:state', :to => 'checkout#update', :as => :update_checkout, :via => :put
-  match '/checkout/:state', :to => 'checkout#edit', :as => :checkout_state, :via => :get
-  match '/checkout', :to => 'checkout#edit', :state => 'address', :as => :checkout, :via => :get
+  match '/checkout/update/:state', :to => 'checkout#update', :as => :update_checkout
+  match '/checkout/:state', :to => 'checkout#edit', :as => :checkout_state
+  match '/checkout', :to => 'checkout#edit', :state => 'address', :as => :checkout
 
   resources :orders do
     post :populate, :on => :collection
@@ -40,12 +40,6 @@ Spree::Core::Engine.routes.draw do
     end
   end
 
-  #   # Search routes
-  match 's/*product_group_query', :to => 'products#index', :as => :simple_search
-  match '/pg/:product_group_name', :to => 'products#index', :as => :pg_search
-  match '/t/*id/s/*product_group_query', :to => 'taxons#show', :as => :taxons_search
-  match 't/*id/pg/:product_group_name', :to => 'taxons#show', :as => :taxons_pg_search
-
   #   # route globbing for pretty nested taxon and product paths
   match '/t/*id', :to => 'taxons#show', :as => :nested_taxons
   #
@@ -130,6 +124,7 @@ Spree::Core::Engine.routes.draw do
     end
 
     resource :inventory_settings
+    resource :image_settings
     resources :google_analytics
 
     resources :orders do
@@ -178,6 +173,7 @@ Spree::Core::Engine.routes.draw do
     resources :reports, :only => [:index, :show] do
       collection do
         get :sales_total
+        post :sales_total
       end
     end
 
@@ -187,10 +183,6 @@ Spree::Core::Engine.routes.draw do
     resources :tax_rates
     resource  :tax_settings
     resources :calculators
-    resources :product_groups do
-      resources :product_scopes
-    end
-
 
     resources :trackers
     resources :payment_methods

data/db/migrate/20101026184714_migrate_transactions_to_payment_state.rb

@@ -38,7 +38,7 @@ class MigrateTransactionsToPaymentState < ActiveRecord::Migration
         :avs_response => tx.avs_response, :response_code => tx.response_code
       )
     end
-    credited.each { |rec| rec.destroy }
+    credited.each(&:destroy)
   end
 
   def migrate_voided_transactions
@@ -49,7 +49,7 @@ class MigrateTransactionsToPaymentState < ActiveRecord::Migration
     unless voided.empty?
       all_but_credited = [AUTHORIZED, COMPLETED, PURCHASED, VOIDED]
       voided_and_subsequent_transactions = Transaction.find_by_sql("SELECT * FROM transactions WHERE payment_id IN (#{voided.map(&:payment_id).join(',')}) AND txn_type IN (#{all_but_credited.join(',')})")
-      voided_and_subsequent_transactions.each { |rec| rec.destroy }
+      voided_and_subsequent_transactions.each(&:destroy)
     end
   end
 
@@ -66,7 +66,7 @@ class MigrateTransactionsToPaymentState < ActiveRecord::Migration
     txs.each do |tx|
       update_payment(tx, PAYMENT_COMPLETE)
     end
-    txs.each { |rec| rec.destroy }
+    txs.each(&:destroy)
   end
 
   def migrate_authorized_only_transactions
@@ -79,7 +79,7 @@ class MigrateTransactionsToPaymentState < ActiveRecord::Migration
     authorized_only.each do |tx|
       update_payment(tx, PAYMENT_PENDING)
     end
-    authorized_only.each { |rec| rec.destroy }
+    authorized_only.each(&:destroy)
   end
 
   def update_payment(tx, state)

data/db/migrate/20111007143030_namespace_top_level_models.rb

@@ -22,11 +22,8 @@ class NamespaceTopLevelModels < ActiveRecord::Migration
     rename_table :payment_methods,         :spree_payment_methods
     rename_table :preferences,             :spree_preferences
     rename_table :products,                :spree_products
-    rename_table :product_groups,          :spree_product_groups
-    rename_table :product_groups_products, :spree_product_groups_products
     rename_table :product_option_types,    :spree_product_option_types
     rename_table :product_properties,      :spree_product_properties
-    rename_table :product_scopes,          :spree_product_scopes
     rename_table :products_taxons,         :spree_products_taxons
     rename_table :properties,              :spree_properties
     rename_table :prototypes,              :spree_prototypes

data/db/migrate/20120203001428_rename_state_events_to_state_changes.rb

@@ -0,0 +1,9 @@
+class RenameStateEventsToStateChanges < ActiveRecord::Migration
+  def up
+    rename_table :spree_state_events, :spree_state_changes
+  end
+
+  def down
+    rename_table :spree_state_changes, :spree_state_events
+  end
+end

data/db/migrate/20120315064358_migrate_images_from_products_to_variants.rb

@@ -0,0 +1,35 @@
+class MigrateImagesFromProductsToVariants < ActiveRecord::Migration
+  def up
+    images = select_all("SELECT spree_assets.* FROM spree_assets
+                         WHERE spree_assets.type IN ('Spree::Image')
+                         AND spree_assets.viewable_type = 'Spree::Product'")
+
+    images.each do |image|
+      master_variant_id = select_value("SELECT id FROM spree_variants
+                                        WHERE product_id = #{image['viewable_id']}
+                                        AND is_master = #{quoted_true}")
+
+      execute("UPDATE spree_assets SET viewable_type = 'Spree::Variant', viewable_id = #{master_variant_id}
+               WHERE id = #{image['id']}") if master_variant_id
+    end
+  end
+
+  def down
+    images = select_all("SELECT spree_assets.* FROM spree_assets
+                         JOIN spree_variants
+                         ON spree_variants.id = spree_assets.viewable_id
+                         AND spree_variants.is_master = #{quote_true}
+                         WHERE spree_assets.type IN ('Spree::Image')
+                         AND spree_assets.viewable_type = 'Spree::Variant'")
+
+    images.each do |image|
+      product_id = select_value("SELECT spree_products.id FROM spree_products
+                                 JOIN spree_variants
+                                 ON spree_variants.id = #{image['viewable_id']}
+                                 AND spree_products.id = spree_variants.product_id")
+
+      execute("UPDATE spree_assets SET viewable_type = 'Spree::Product', viewable_id = #{product_id}
+               WHERE id = #{image['id']}") if product_id
+    end
+  end
+end