spree_core 1.0.0 → 1.0.1

data/app/controllers/spree/admin/users_controller.rb

@@ -1,7 +1,6 @@
 module Spree
   module Admin
     class UsersController < ResourceController
-      rescue_from User::DestroyWithOrdersError, :with => :user_destroy_with_orders_error
 
       # http://spreecommerce.com/blog/2010/11/02/json-hijacking-vulnerability/
       before_filter :check_json_authenticity, :only => :index

data/app/helpers/spree/admin/navigation_helper.rb

@@ -57,7 +57,7 @@ module Spree
       end
 
       def link_to_delete(resource, options = {}, html_options={})
-        options.assert_valid_keys(:url, :caption, :title, :dataType, :success, :name)
+        options.assert_valid_keys(:url, :caption, :title, :dataType, :success, :error, :name)
 
         options.reverse_merge! :url => object_url(resource) unless options.key? :url
         options.reverse_merge! :caption => t(:are_you_sure)

data/app/models/spree/address.rb

@@ -59,7 +59,8 @@ module Spree
     end
 
     def self.default
-      new :country_id => Spree::Config[:default_country_id]
+      country = Spree::Country.find_by_id(Spree::Config[:default_country_id])
+      new :country_id => country.try(:id) || Country.first.id
     end
 
     # can modify an address if it's not been used in an order (but checkouts controller has finer control)

data/app/models/spree/app_configuration.rb

@@ -42,7 +42,7 @@ module Spree
     preference :company, :boolean, :default => false # Request company field for billing and shipping addr
     preference :create_inventory_units, :boolean, :default => true # should only be false when track_inventory_levels is false, also disables RMA's
     preference :default_country_id, :integer, :default => 214
-    preference :default_locale, :string, :default => 'en'
+    preference :default_locale, :string, :default => Rails.application.config.i18n.default_locale || :en
     preference :default_meta_description, :string, :default => 'Spree demo site'
     preference :default_meta_keywords, :string, :default => 'spree, demo'
     preference :default_seo_title, :string, :default => ''

data/app/models/spree/calculator/default_tax.rb

@@ -31,7 +31,7 @@ module Spree
 
       def compute_line_item(line_item)
         if line_item.product.tax_category == rate.tax_category
-          round_to_two_places(line_item.total * rate.amount)
+          deduced_total_by_rate(line_item.total, rate)
         else
           0
         end
@@ -40,6 +40,10 @@ module Spree
       def round_to_two_places(amount)
         BigDecimal.new(amount.to_s).round(2, BigDecimal::ROUND_HALF_UP)
       end
+      
+      def deduced_total_by_rate(total, rate)
+        round_to_two_places(total - ( total / (1 + rate.amount) ) )
+      end
 
   end
 end

data/app/models/spree/preference.rb

@@ -1,7 +1,6 @@
 class Spree::Preference < ActiveRecord::Base
 
   validates :key, :presence => true
-  validates :value, :presence => true
   validates :value_type, :presence => true
 
   scope :valid, where(Spree::Preference.arel_table[:key].not_eq(nil)).where(Spree::Preference.arel_table[:value_type].not_eq(nil))
@@ -11,7 +10,7 @@ class Spree::Preference < ActiveRecord::Base
   def value
     if self[:value_type].present?
       case self[:value_type].to_sym
-      when :string
+      when :string, :text
         self[:value].to_s
       when :password
         self[:value].to_s

data/app/models/spree/preferences/preferable.rb

@@ -106,7 +106,7 @@ module Spree::Preferences::Preferable
 
   def convert_preference_value(value, type)
     case type
-    when :string
+    when :string, :text
       value.to_s
     when :password
       value.to_s

data/app/models/spree/product/scopes.rb

@@ -199,7 +199,8 @@ module Spree
     end
 
     def self.on_hand
-      where("spree_products.id in (select product_id from spree_variants group by product_id having sum(count_on_hand) > 0)")
+      variants_table = Variant.table_name
+      where("#{table_name}.id in (select product_id from #{variants_table} where product_id = #{table_name}.id group by product_id having sum(count_on_hand) > 0)")
     end
 
     def self.taxons_name_eq(name)

data/app/models/spree/shipment.rb

@@ -41,6 +41,7 @@ module Spree
     def cost
       adjustment ? adjustment.amount : 0
     end
+    alias_method :amount, :cost
 
     # shipment state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
     state_machine :initial => 'pending', :use_transactions => false do

data/app/models/spree/variant.rb

@@ -50,6 +50,14 @@ module Spree
       end
     end
 
+    # strips all non-price-like characters from the price.
+    def price=(price)
+      if price.present?
+        self[:price] = price.to_s.gsub(/[^0-9\.-]/,'').to_f
+      end
+    end
+
+
     # returns number of units currently on backorder for this variant.
     def on_backorder
       inventory_units.with_state('backordered').size

data/app/views/spree/admin/banners/_gateway.html.erb

@@ -4,7 +4,7 @@
   <div class="banner payment_banner">
     <p class="message">
       <%= t(:payment_processor_choose_banner_text)%>
-      <%= link_to t(:payment_processor_choose_link), "http://spreecommerce.com/products/gateway", :target => '_blank' %>
+      <%= link_to t(:payment_processor_choose_link), "http://spreecommerce.com/products/payment_processing", :target => '_blank' %>
     </p>
 
     <%= link_to t(:dismiss_banner), dismiss_banner_admin_user_path(current_user, :banner_id => :gateway),

data/app/views/spree/admin/orders/_form.html.erb

@@ -50,7 +50,7 @@
 <% end %>
 
 <%= javascript_tag do -%>
-  <%= render 'spree/admin/shared/update_order_state.js' %>
+  <%= render :partial => 'spree/admin/shared/update_order_state.js' %>
 <% end -%>
 
 <%= javascript_include_tag 'admin/orders/edit_form' %>

data/app/views/spree/admin/shared/_calculator_fields.html.erb

@@ -3,7 +3,7 @@
   <div id="preference-settings" data-hook>
     <p>
       <%= f.label(:calc_type, t(:calculator), :for => 'calc-type') %>
-      <%= f.select(:calculator_type, @calculators.map { |c| [c.description, c.name] }, {:id => 'calc-type'}) %>
+      <%= f.select(:calculator_type, @calculators.map { |c| [c.description, c.name] }, {}, {:id => 'calc-type'}) %>
     </p>
     <% if !@object.new_record? %>
       <div class="calculator-settings">

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

@@ -1,4 +1,4 @@
-<div class="columns alpha six">
+<div class="columns alpha six" data-hook="billing_fieldset_wrapper">
 <fieldset id="billing" data-hook>
   <%= form.fields_for :bill_address do |bill_form| %>
     <legend><%= t(:billing_address) %></legend>
@@ -81,7 +81,7 @@
 </fieldset>
 </div>
 
-<div class="columns omega six">
+<div class="columns omega six" data-hook="shipping_fieldset_wrapper">
 <fieldset id="shipping" data-hook>
   <%= form.fields_for :ship_address do |ship_form| %>
     <legend><%= t(:shipping_address) %></legend>

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

@@ -4,25 +4,23 @@
 <div id="checkout" data-hook>  
   <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
   
-  <div class="row">
-    <h3 class="columns three alpha"><%= t(:checkout) %></h3>
-    <div class="columns thirteen omega"><%= checkout_progress %></div>
+  <div class="row" data-hook="checkout_header">
+    <h1 class="columns three alpha" data-hook="checkout_title"><%= t(:checkout) %></h1>
+    <div class="columns thirteen omega" data-hook="checkout_progress"><%= checkout_progress %></div>
   </div>
   
-  <div class="row">
-    <div class="columns <%= if @order.state != 'confirm' then 'alpha twelve' else 'alpha omega sixteen' end %>">
+  <div class="row" data-hook="checkout_content">
+    <div class="columns <%= if @order.state != 'confirm' then 'alpha twelve' else 'alpha omega sixteen' end %>" data-hook="checkout_form_wrapper">
       <%= form_for @order, :url => update_checkout_path(@order.state), :html => { :id => "checkout_form_#{@order.state}" } do |form| %>
         <%= render @order.state, :form => form %>
         <%= submit_tag nil, :id => 'post-final', :style => 'display:none;' %>
       <% end %>
-    </div>
-    <div class="columns omega four">
-      <% if @order.state != 'confirm' %>
-        <div id="checkout-summary" data-hook="checkout_summary_box" class="columns omega four">
-          <%= render :partial => 'summary', :locals => { :order => @order } %>
-        </div>
-      <% end %>
-    </div>
+    </div>    
+    <% if @order.state != 'confirm' %>
+      <div id="checkout-summary" data-hook="checkout_summary_box" class="columns omega four">
+        <%= render :partial => 'summary', :locals => { :order => @order } %>
+      </div>
+    <% end %>
   </div>
 
 </div>

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

@@ -1,4 +1,4 @@
-<tr class="<%= cycle('', 'alt') %>">
+<tr class="<%= cycle('', 'alt') %> line-item">
   <td data-hook="cart_item_image">
     <% if variant.images.length == 0 %>
       <%= link_to small_image(variant.product), variant.product %>

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

@@ -1,8 +1,8 @@
 <div data-hook="product_show" itemscope itemtype="http://schema.org/Product">
   <% @body_id = 'product-details' %>
 
-  <div class="columns six alpha">
-    <div class="row">
+  <div class="columns six alpha" data-hook="product_left_part">
+    <div class="row" data-hook="product_left_part_wrap">
 
       <div id="product-images" data-hook="product_images">
         <div id="main-image" data-hook>
@@ -20,14 +20,14 @@
     </div>
   </div>
 
-  <div class="columns ten omega">
-    <div class="row">
+  <div class="columns ten omega" data-hook="product_right_part">
+    <div class="row" data-hook="product_right_part_wrap">
 
       <div id="product-description" data-hook="product_description">
 
         <h1 class="product-title" itemprop="name"><%= accurate_title %></h1>
 
-        <div itemprop="description">
+        <div itemprop="description" data-hook="product_description">
           <%= product_description(@product) rescue t(:product_has_no_description) %>
         </div>
 
@@ -35,9 +35,7 @@
           <%= render :partial => 'cart_form' %>
         </div>
 
-      </div>  
-
-      
+      </div>
     
       <%= render :partial => 'taxons' %>
 

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

@@ -43,7 +43,12 @@
 <hr />
 
 <table class="index columns alpha omega sixteen" data-hook="order_details">
-  
+  <col width="15%" valign="middle" halign="center">
+  <col width="70%" valign="middle">
+  <col width="5%" valign="middle" halign="center">
+  <col width="5%" valign="middle" halign="center">
+  <col width="5%" valign="middle" halign="center">
+
   <thead id="line-items" data-hook>
     <tr data-hook="order_details_line_items_headers">
       <th colspan="2"><%= t(:item) %></th>
@@ -56,7 +61,7 @@
   <tbody id="line-items" data-hook>
     <% @order.line_items.each do |item| %>
       <tr data-hook="order_details_line_item_row">
-        <td data-hook="order_item_image" width="20%">
+        <td data-hook="order_item_image">
           <% if item.variant.images.length == 0 %>
             <%= link_to small_image(item.variant.product), item.variant.product %>
           <% else %>

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

@@ -12,11 +12,11 @@
 <ul id="products" class="inline product-listing" data-hook>
   <% products.each do |product| %>
     <% if Spree::Config[:show_zero_stock_products] || product.has_stock? %>
-      <li id="product_<%= product.id %>" class="columns three" data-hook="products_list_item" itemscope itemtype="http://schema.org/Product">
+      <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 %>
         </div>
-        <%= link_to product.name, product, :class => 'info', :itemprop => "name" %>
+        <%= 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>
       </li>
     <% end %>
@@ -24,8 +24,6 @@
 </ul>
 <% end %>
 
-
-
 <% if paginated_products.respond_to?(:num_pages)
       params.delete(:search)
       params.delete(:taxon)

data/lib/spree/core/controller_helpers.rb

@@ -6,8 +6,6 @@ module Spree
         receiver.send :layout, '/spree/layouts/spree_application'
         receiver.send :helper, 'spree/hook'
         receiver.send :before_filter, 'instantiate_controller_and_action_names'
-        #  #RAILS 3 TODO
-        #  #before_filter :touch_sti_subclasses
         receiver.send :before_filter, 'set_user_language'
 
         receiver.send :helper_method, 'title'
@@ -53,25 +51,6 @@ module Spree
           Spree::Config[:default_seo_title]
         end
 
-        # def reject_unknown_object
-        #   # workaround to catch problems with loading errors for permalink ids (reconsider RC permalink hack elsewhere?)
-        #   begin
-        #     load_object
-        #   rescue Exception => e
-        #     @object = nil
-        #   end
-        #   the_object = instance_variable_get "@#{object_name}"
-        #   the_object = nil if (the_object.respond_to?(:deleted?) && the_object.deleted?)
-        #   unless params[:id].blank? || the_object
-        #     if self.respond_to? :object_missing
-        #       self.object_missing(params[:id])
-        #     else
-        #       render_404(Exception.new("missing object in #{self.class.to_s}"))
-        #     end
-        #   end
-        #   true
-        # end
-
         def render_404(exception = nil)
           respond_to do |type|
             type.html { render :status => :not_found, :file    => "#{::Rails.root}/public/404.html", :layout => nil}
@@ -119,16 +98,8 @@ module Spree
           session[:guest_token] = nil
         end
 
-        #RAILS 3 TODO
-        # # Load all models using STI to fix associations such as @order.credits giving no results and resulting in incorrect order totals
-        # def touch_sti_subclasses
-        #   if Rails.env == 'development'
-        #     load(File.join(SPREE_ROOT,'config/initializers/touch.rb'))
-        #   end
-        # end
-
         def set_user_language
-          locale = session[:locale] || Spree::Config[:default_locale]
+          locale = session[:locale] || Spree::Config[:default_locale] || Rails.application.config.i18n.default_locale
           locale = I18n.default_locale unless locale && I18n.available_locales.include?(locale.to_sym)
           I18n.locale = locale.to_sym
         end

data/lib/spree/core/engine.rb

@@ -71,7 +71,7 @@ module Spree
 
       # sets the manifests / assets to be precompiled
       initializer "spree.assets.precompile" do |app|
-        app.config.assets.precompile += ['store/all.*', 'admin/all.*', 'admin/orders/edit_form.js', 'jqPlot/excanvas.min.js', 'admin/images/new.js', 'jquery.jstree/themes/apple/*']
+        app.config.assets.precompile += ['store/all.*', 'admin/all.*', 'admin/orders/edit_form.js', 'admin/orders/address_states.js', 'jqPlot/excanvas.min.js', 'admin/images/new.js', 'jquery.jstree/themes/apple/*']
       end
 
       initializer "spree.asset.pipeline" do |app|

data/lib/spree/core/testing_support/factories/country_factory.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :country, :class => Spree::Country do
     iso_name 'UNITED STATES'
-    name 'United States'
+    name 'United States of Foo'
     iso 'US'
     iso3 'USA'
     numcode 840

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.0.0"
+    "1.0.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000 Z
+date: 2012-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70236783733120 !ruby/object:Gem::Requirement
+  requirement: &70264868578960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70236783733120
+  version_requirements: *70264868578960
 - !ruby/object:Gem::Dependency
   name: nested_set
-  requirement: &70236783732040 !ruby/object:Gem::Requirement
+  requirement: &70264868605240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70236783732040
+  version_requirements: *70264868605240
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70236783765860 !ruby/object:Gem::Requirement
+  requirement: &70264868603300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: 1.0.19
   type: :runtime
   prerelease: false
-  version_requirements: *70236783765860
+  version_requirements: *70264868603300
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70236783764200 !ruby/object:Gem::Requirement
+  requirement: &70264868601820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -57,10 +57,10 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70236783764200
+  version_requirements: *70264868601820
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70236783763600 !ruby/object:Gem::Requirement
+  requirement: &70264868601240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -68,10 +68,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70236783763600
+  version_requirements: *70264868601240
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70236783762880 !ruby/object:Gem::Requirement
+  requirement: &70264868600580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,10 +79,10 @@ dependencies:
         version: 1.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70236783762880
+  version_requirements: *70264868600580
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70236783762380 !ruby/object:Gem::Requirement
+  requirement: &70264868599680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -90,10 +90,10 @@ dependencies:
         version: 2.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70236783762380
+  version_requirements: *70264868599680
 - !ruby/object:Gem::Dependency
   name: meta_search
-  requirement: &70236783761800 !ruby/object:Gem::Requirement
+  requirement: &70264868619680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -101,10 +101,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70236783761800
+  version_requirements: *70264868619680
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &70236783761200 !ruby/object:Gem::Requirement
+  requirement: &70264868618920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -112,10 +112,10 @@ dependencies:
         version: 1.20.1
   type: :runtime
   prerelease: false
-  version_requirements: *70236783761200
+  version_requirements: *70264868618920
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70236783760640 !ruby/object:Gem::Requirement
+  requirement: &70264868618320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,13 +123,13 @@ dependencies:
         version: 3.1.1
     - - <=
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70236783760640
+  version_requirements: *70264868618320
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70236783759600 !ruby/object:Gem::Requirement
+  requirement: &70264868617520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -137,10 +137,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70236783759600
+  version_requirements: *70264868617520
 - !ruby/object:Gem::Dependency
   name: deface
-  requirement: &70236783758860 !ruby/object:Gem::Requirement
+  requirement: &70264868617000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -148,10 +148,10 @@ dependencies:
         version: 0.7.2
   type: :runtime
   prerelease: false
-  version_requirements: *70236783758860
+  version_requirements: *70264868617000
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &70236783752940 !ruby/object:Gem::Requirement
+  requirement: &70264868616380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -159,7 +159,7 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70236783752940
+  version_requirements: *70264868616380
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -973,7 +973,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 360601115106515255
+      hash: 2163052679988616471
 requirements:
 - none
 rubyforge_project: spree_core