spree_core 0.60.6 → 0.70.RC1

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

@@ -7,31 +7,25 @@
 <% elsif params.key?(:keywords) %>
   <h3><%= t(:search_results, :keywords => h(params[:keywords])) %></h3>
 <% end %>
- 
+
 <% if products.any? %>
-<ul class="product-listing">
+<ul id="products" class="product-listing" data-hook>
   <% products.each do |product| %>
     <% if Spree::Config[:show_zero_stock_products] || product.has_stock? %>
-      <li id="product_<%= product.id %>">
-        <%= hook :products_list_item, {:product => product} do %>
-          <%= link_to small_image(product), product %>
-          <%= link_to raw(product.name + " <span class='price selling'>#{product_price(product)}</span>"), product, :class => 'info' %>
-        <% end %>
+      <li id="product_<%= product.id %>" data-hook="products_list_item">
+        <%= link_to product.name, product, :class => 'info' %>
+        <%= link_to small_image(product), product %>
+        <span class="price selling"><%= product_price(product) %></span>
       </li>
     <% end %>
   <% end %>
 </ul>
 <% end %>
- 
+
 <hr class="space" />
- 
-<% if paginated_products.respond_to?(:total_pages)
+
+<% if paginated_products.respond_to?(:num_pages)
       params.delete(:search)
       params.delete(:taxon)
-      
-%><%= will_paginate(paginated_products,
-                    :previous_label => "&#171; #{t('previous')}",
-                    :next_label => "#{t('next')} &#187;") %>
-<% end %>
- 
+%><%= paginate paginated_products %><% end %>
 <hr class="space" />

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

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

data/app/views/shared/_taxonomies.html.erb

@@ -1,17 +1,6 @@
-<div id="taxonomies" class="sidebar-item">
+<div id="taxonomies" class="sidebar-item" data-hook>
   <% get_taxonomies.each do |taxonomy| %>
-    <ul class="navigation-list">
-      <li<%== ' class="current"' if @taxon && @taxon == taxonomy.root %>>
-        <%= link_to t("shop_by_taxonomy", :taxonomy => taxonomy.name.singularize), seo_url(taxonomy.root),
-                                          :class => 'root' %>
-      </li>
-
-      <% taxonomy.root.children.each do |taxon| %>
-        <li<%== ' class="current"' if @taxon and ([@taxon] + @taxon.ancestors).include?(taxon) %>>
-          <%= link_to taxon.name, seo_url(taxon) %>
-        </li>
-	    <% end %>
-
-	  </ul>
+    <h3 class='taxonomy-root'><%= t("shop_by_taxonomy", :taxonomy => taxonomy.name.singularize) %></h3>
+    <%= taxons_tree(taxonomy.root, @taxon, Spree::Config[:max_level_in_taxons_menu] || 1) %>
   <% end %>
 </div>

data/app/views/taxons/_taxon.html.erb

@@ -1,4 +1,4 @@
-<div class="taxon">
+<div class="taxon" data-hook="taxon">
   <h2><%= link_to taxon.name, seo_url(taxon), :class => 'breadcrumbs' %></h2>
   <%= render :partial => "shared/products", :locals => {:products => taxon_preview(taxon), :taxon => taxon} %>
 </div>

data/app/views/taxons/show.html.erb

@@ -1,19 +1,19 @@
 <h1><%= accurate_title %></h1>
 
 <% content_for :sidebar do %>
-  <%= hook :taxon_sidebar_navigation do %>
+  <div data-hook="taxon_sidebar_navigation">
     <%= render :partial => "shared/taxonomies" %>
     <%= render(:partial => "shared/filters") if @taxon.children.empty? %>
-  <% end %>
+  </div>
 <% end %>
 
 <% if @taxon.children.empty? || !params[:keywords].blank? %>
-  <%= hook :taxon_products do %>
+  <div data-hook="taxon_products">
     <%= render :partial => "shared/products", :locals => {:products => @products, :taxon => @taxon } %>
-  <% end %>
+  </div>
 <% else %>
-  <%= hook :taxon_children do %>
+  <div data-hook="taxon_children">
     <%= render :partial => "taxon", :collection => @taxon.children %>
-  <% end %>
+  </div>
 <% end %>
 

data/app/views/test_mailer/test_email.text.erb

@@ -0,0 +1,4 @@
+<%= t('greeting', :scope => 'test_mailer.test_email') %>
+================
+
+<%= t('message', :scope => 'test_mailer.test_email') %>

data/config/initializers/deprecation_checker.rb

@@ -0,0 +1,7 @@
+
+
+# check for incorect product assets path in public directory
+if File.exist?(Rails.root.join("public/assets/products")) ||  File.exist?(Rails.root.join("public/assets/taxons"))
+  puts %q{[DEPRECATION] Your applications public directory contains an assets/products and/or assets/taxons subdirectory. 
+    Run `rake spree:assets:relocate_images` to relocate the images.}
+end

data/config/initializers/disable_paperclip_log.rb

@@ -0,0 +1,2 @@
+# Will be removed once the new version of paperclip is out
+Paperclip.options[:log] = false

data/config/initializers/form_builder.rb

@@ -9,10 +9,6 @@ class ActionView::Helpers::FormBuilder
   def error_message_on(method, options = {})
     @template.error_message_on(@object_name, method, objectify_options(options))
   end
-
-  def spree_date_picker(method, options = {}, html_options = {})
-    @template.spree_date_picker(@object_name, method, options, html_options)
-  end
 end
 
 ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "<span class=\"field_with_errors\">#{html_tag}</span>".html_safe }

data/config/initializers/sprockets_precompile_patch.rb

@@ -0,0 +1,16 @@
+require 'sprockets/asset_attributes'
+
+Sprockets::AssetAttributes.class_eval do
+  alias_method :sprockets_path_with_fingerprint, :path_with_fingerprint
+
+  # hack to allow precompiling assets for development mode
+  # stops sprockets adding the fingerprint to the file name
+  def path_with_fingerprint(digest)
+    if Rails.env.development?
+      pathname.to_s
+    else
+      sprockets_path_with_fingerprint(digest)
+    end
+  end
+
+end

data/config/initializers/workarounds_for_ruby19.rb

@@ -8,7 +8,7 @@ if RUBY_VERSION.to_f >= 1.9
 
     alias_method(:orig_concat, :concat)
     def concat(value)
-      orig_concat value.frozen? ? value : value.force_encoding(Encoding::UTF_8)
+      orig_concat value.frozen? || !value.respond_to?(:force_encoding) ? value : value.force_encoding(Encoding::UTF_8)
     end
   end
 

data/config/locales/en.yml

@@ -32,24 +32,7 @@ en:
         phone: Phone
         state: "State"
         zipcode: "Zip Code"
-      checkout:
-        bill_address:
-          address1: "Billing address street"
-          city: "Billing address city"
-          firstname: "Billing address first name"
-          lastname: "Billing address last name"
-          phone: "Billing address phone"
-          state: "Billing address state"
-          zipcode: "Billing address zipcode"
-        ship_address:
-          address1: "Shipping address street"
-          city: "Shipping address city"
-          firstname: "Shipping address first name"
-          lastname: "Shipping address last name"
-          phone: "Shipping address phone"
-          state: "Shipping address state"
-          zipcode: "Shipping address zipcode"
-      country:
+      country: 
         iso: ISO
         iso3: ISO3
         iso_name: "ISO Name"
@@ -67,6 +50,22 @@ en:
         price: Price
         quantity: Quantity
       order:
+        bill_address:
+          address1: "Billing address street"
+          city: "Billing address city"
+          firstname: "Billing address first name"
+          lastname: "Billing address last name"
+          phone: "Billing address phone"
+          state: "Billing address state"
+          zipcode: "Billing address zipcode"
+        ship_address:
+          address1: "Shipping address street"
+          city: "Shipping address city"
+          firstname: "Shipping address first name"
+          lastname: "Shipping address last name"
+          phone: "Shipping address phone"
+          state: "Shipping address state"
+          zipcode: "Shipping address zipcode"
         checkout_complete: "Checkout Complete"
         completed_at: "Completed At"
         coupon_code: "Coupon Code"
@@ -76,6 +75,11 @@ en:
         special_instructions: "Special Instructions"
         state: State
         total: Total
+      option_type:
+        name: Name
+        presentation: Presentation
+      payment_method:
+        name: Name
       product:
         available_on: "Available On"
         cost_price: "Cost Price"
@@ -119,6 +123,8 @@ en:
         name: Name
       user:
         email: Email
+        password: "Password"
+        password_confirmation: "Password Confirmation"
       variant:
         cost_price: "Cost Price"
         depth: Depth
@@ -228,11 +234,18 @@ en:
   adjustment_total: Adjustment Total
   adjustments: Adjustments
   administration: Administration
+  admin:
+    mail_methods:
+      send_testmail: 'Send Testmail'
+      testmail:
+        delivery_error: 'Testmail delivery error'
+        delivery_success: 'Testmail sent successfully'
+        error: 'Testmail error: %{e}'
   all: "All"
   all_departments: All departments
   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
+  allow_ssl_in_development_and_test: Allow SSL to be used when in development and test modes
+  allow_ssl_in_production: Allow SSL to be used in production mode
   allowed_ssl_in_production_mode: "SSL will %{not} be used in production"
   already_registered: Already Registered?
   alt_text: Alternative Text
@@ -334,6 +347,9 @@ en:
   date_range: "Date Range"
   debit: Debit
   default: Default
+  default_meta_description: Default Meta Description
+  default_meta_keywords: Default Meta Keywords
+  default_seo_title: Default Seo Title
   delete: Delete
   delivery: Delivery
   depth: Depth
@@ -371,7 +387,7 @@ en:
   enable_login_via_openid: "Use OpenID instead"
   enable_mail_delivery: Enable Mail Delivery
   enter_exactly_as_shown_on_card: Please enter exactly as shown on the card
-  enter_atleast_five_letters: Enter atleast five letters of customer name
+  enter_atleast_five_letters: Enter at least five letters of customer name
   enter_password_to_confirm: "(we need your current password to confirm your changes)"
   environment: "Environment"
   error: error
@@ -383,6 +399,17 @@ en:
     one: "1 error prohibited this record from being saved"
     other: "%{count} errors prohibited this record from being saved"
   event: Event
+  events:
+    spree:
+      cart:
+        add: 'Add to cart'
+      checkout:
+        coupon_code_added: "Coupon code added"
+      order:
+        contents_changed: "Order contents changed"
+      user:
+        signup: 'User signup'
+      page_view: "Static page viewed"
   existing_customer: "Existing Customer"
   expiration: "Expiration"
   expiration_month: "Expiration Month"
@@ -600,7 +627,7 @@ en:
   out_of_stock_products: "Out of Stock Products"
   over_paid: "Over Paid"
   overview: Overview
-  overview_welcome: "Welcome to your store overview, currently we do not have enough data to display the Overiew Dashboard.<br/><br/> The dashboard will display automatically once the system has sufficent orders to allow generation of the statistics."
+  overview_welcome: "Welcome to your store overview, currently we do not have enough data to display the Overview Dashboard.<br/><br/> The dashboard will display automatically once the system has sufficent orders to allow generation of the statistics."
   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
   paid: Paid
@@ -907,8 +934,6 @@ en:
   ssl_will_be_used_in_production_mode: "SSL will be used in production mode"
   ssl_will_not_be_used_in_development_and_test_modes: "SSL will not be used in development and test mode if necessary."
   ssl_will_not_be_used_in_production_mode: "SSL will not be used in production mode"
-  spree_alert_checking: "Check for Spree security and release alerts"
-  spree_alert_not_checking: "Not checking for Spree security and release alerts"
   start: Start
   start_date: Valid from
   state: State
@@ -938,6 +963,7 @@ en:
   tax_type: "Tax Type"
   taxon: Taxon
   taxon_edit: Edit Taxon
+  taxonomу: Taxonomу
   taxonomies: Taxonomies
   taxonomies_setting_description: "Create and manage taxonomies."
   taxonomy_edit: "Edit taxonomy"
@@ -945,6 +971,11 @@ en:
   taxonomy_tree_instruction: "* Right click a child in the tree to access the menu for adding, deleting or sorting a child."
   taxons: Taxons
   test: "Test"
+  test_mailer:
+    test_email:
+      greeting: 'Congratulations!'
+      message: 'If you have received this email, then your email settings are correct.'
+      subject: 'Testmail'
   test_mode: Test Mode
   thank_you_for_your_order: "Thank you for your business.  Please print out a copy of this confirmation page for your records."
   there_were_problems_with_the_following_fields: "There were problems with the following fields"

data/config/routes.rb

@@ -1,6 +1,6 @@
 Rails.application.routes.draw do
 
-  root :to => 'products#index'
+  root :to => 'home#index'
 
   resources :products
 
@@ -111,7 +111,7 @@ Rails.application.routes.draw do
         post :update_positions
       end
     end
-    
+
     resources :properties do
       collection do
         get :filtered
@@ -159,11 +159,7 @@ Rails.application.routes.draw do
       end
     end
 
-    resource :general_settings do
-      collection do
-        post :dismiss_alert
-      end
-    end
+    resource :general_settings
 
     resources :taxonomies do
       member do
@@ -192,7 +188,12 @@ Rails.application.routes.draw do
 
     resources :trackers
     resources :payment_methods
-    resources :mail_methods
+    resources :mail_methods do
+      member do
+        post :testmail
+      end
+    end
+    
   end
 
   match '/admin' => 'admin/orders#index', :as => :admin

data/db/default/roles.yml

@@ -1,7 +1,5 @@
 admin_role:
-  id: 1
   name: admin
 
 user_role:
-  id: 2
-  name: user
+  name: user

data/db/migrate/20100419194457_fix_existing_coupon_credits.rb

@@ -0,0 +1,9 @@
+class FixExistingCouponCredits < ActiveRecord::Migration
+  def self.up
+    execute("UPDATE adjustments SET type='PromotionCredit' WHERE type='CouponCredit'")
+    execute("UPDATE adjustments SET adjustment_source_type='Promotion' WHERE adjustment_source_type='Coupon'")
+  end
+
+  def self.down
+  end
+end

data/db/migrate/20110329141434_create_activators.rb

@@ -0,0 +1,21 @@
+class CreateActivators < ActiveRecord::Migration
+  def self.up
+    create_table "activators", :force => true do |t|
+      t.string   "description"
+      t.datetime "expires_at"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+      t.datetime "starts_at"
+      t.string   "name"
+      t.string   "event_name"
+      t.string   "type"
+    end
+  end
+
+  def self.down
+    drop_table :activators
+  end
+
+end
+
+

data/db/migrate/20110418151136_eligible_for_adjustments.rb

@@ -0,0 +1,9 @@
+class EligibleForAdjustments < ActiveRecord::Migration
+  def self.up
+    add_column :adjustments, :eligible, :boolean, :default => true
+  end
+
+  def self.down
+    remove_column :adjustments, :eligible
+  end
+end

data/db/seeds.rb

@@ -1,3 +1,5 @@
 # Loads seed data out of default dir
-Rake::Task["db:load_dir"].invoke( "default" )
-puts "Default data has been loaded"
+default_path = File.join(File.dirname(__FILE__), 'default')
+
+Rake::Task['db:load_dir'].reenable
+Rake::Task["db:load_dir"].invoke( default_path )

data/lib/custom_fixtures.rb

@@ -1,7 +1,68 @@
 require 'active_record/fixtures'
 
-class Fixtures < (RUBY_VERSION < '1.9' ? YAML::Omap : Hash)
-  def delete_existing_fixtures
-    # do nothing - we're intentionally not emptying the database since it has some structural data in it
+module Spree
+  class Fixtures < ActiveRecord::Fixtures
+    # Replace this method to prevent the table being emptied on each call. Needed
+    # when both core & auth have user fixtures, see below for code commented out.
+    #
+    def self.create_fixtures(fixtures_directory, table_names, class_names = {})
+      table_names = [table_names].flatten.map { |n| n.to_s }
+      table_names.each { |n|
+        class_names[n.tr('/', '_').to_sym] = n.classify if n.include?('/')
+      }
+
+      # FIXME: Apparently JK uses this.
+      connection = block_given? ? yield : ActiveRecord::Base.connection
+
+      files_to_read = table_names.reject { |table_name|
+        fixture_is_cached?(connection, table_name)
+      }
+
+      unless files_to_read.empty?
+        connection.disable_referential_integrity do
+          fixtures_map = {}
+
+          fixture_files = files_to_read.map do |path|
+            table_name = path.tr '/', '_'
+
+            fixtures_map[path] = ActiveRecord::Fixtures.new(
+              connection,
+              table_name,
+              class_names[table_name.to_sym] || table_name.classify,
+              File.join(fixtures_directory, path))
+          end
+
+          all_loaded_fixtures.update(fixtures_map)
+
+          connection.transaction(:requires_new => true) do
+            fixture_files.each do |ff|
+              conn = ff.model_class.respond_to?(:connection) ? ff.model_class.connection : connection
+              table_rows = ff.table_rows
+
+              # REMOVED BY SPREE
+              # table_rows.keys.each do |table|
+              #   conn.delete "DELETE FROM #{conn.quote_table_name(table)}", 'Fixture Delete'
+              # end
+
+              table_rows.each do |table_name,rows|
+                rows.each do |row|
+                  conn.insert_fixture(row, table_name)
+                end
+              end
+            end
+
+            # Cap primary key sequences to max(pk).
+            if connection.respond_to?(:reset_pk_sequence!)
+              table_names.each do |table_name|
+                connection.reset_pk_sequence!(table_name.tr('/', '_'))
+              end
+            end
+          end
+
+          cache_fixtures(connection, fixtures_map)
+        end
+      end
+      cached_fixtures(connection, table_names)
+    end
   end
 end