spree_core 1.2.2 → 1.2.3

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

@@ -1,4 +1,4 @@
-<footer id="footer" class="alpha omega sixteen columns" data-hook>
+<footer id="footer" class="sixteen columns" data-hook>
   <div id="footer-left" class="columns alpha eight" data-hook>
     <p><%= t :powered_by  %> <%= link_to 'Spree', 'http://spreecommerce.com/' %></p>
   </div>

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

@@ -5,23 +5,23 @@
     _gaq.push(['_setAccount', '<%= tracker.analytics_id %>']);
     _gaq.push(['_trackPageview']);
 
-    <% if flash[:commerce_tracking] %>
+    <% if flash[:commerce_tracking] && @order.present? %>
       <%# more info: https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiEcommerce %>
       _gaq.push(['_addTrans',
-        "<%= @order.number %>",
+        "<%= j @order.number %>",
         "",
         "<%= @order.total %>",
         "<%= @order.adjustments.tax.sum(:amount) %>",
         "<%= @order.adjustments.shipping.sum(:amount) %>",
-        "<%= @order.bill_address.city %>",
-        "<%= @order.bill_address.state_text %>",
-        "<%= @order.bill_address.country.name %>"
+        "<%= j @order.bill_address.city %>",
+        "<%= j @order.bill_address.state_text %>",
+        "<%= j @order.bill_address.country.name %>"
       ]);
       <% @order.line_items.each do |line_item| %>
         _gaq.push(['_addItem',
-          "<%= @order.number %>",
-          "<%= line_item.variant.sku %>",
-          "<%= line_item.variant.product.name %>",
+          "<%= j @order.number %>",
+          "<%= j line_item.variant.sku %>",
+          "<%= j line_item.variant.product.name %>",
           "",
           "<%= line_item.price %>",
           "<%= line_item.quantity %>"

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

@@ -1,5 +1,5 @@
 <header id="header" class="row" data-hook>
-  <figure id="logo" class="columns alpha six" data-hook><%= logo %></figure>
+  <figure id="logo" class="columns six" data-hook><%= logo %></figure>
   <%= render :partial => 'spree/shared/nav_bar' %>
   <%= render :partial => 'spree/shared/main_nav_bar' if store_menu? %>
 </header>

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

@@ -1,4 +1,4 @@
-<nav class="columns alpha omega sixteen">
+<nav class="columns sixteen">
   <ul id="main-nav-bar" class="inline" data-hook>
     <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/spree/shared/_nav_bar.html.erb

@@ -1,4 +1,4 @@
-<nav id="top-nav-bar" class="columns omega ten">
+<nav id="top-nav-bar" class="columns ten">
   <ul id="nav-bar" class="inline" data-hook>
     <li id="search-bar" data-hook>
       <%= render :partial => 'spree/shared/search' %>

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

@@ -30,7 +30,9 @@
     <div class="payment-info">
       <% unless order.credit_cards.empty? %>
         <span class="cc-type">
-          <%= image_tag "credit_cards/icons/#{order.credit_cards.first.cc_type}.png" %>
+          <% unless (cc_type = order.credit_cards.first.cc_type).blank? %>
+            <%= image_tag "credit_cards/icons/#{order.credit_cards.first.cc_type}.png" %>
+          <% end %>
           <%= t(:ending_in)%> <%= order.credit_cards.first.last_digits %>
         </span>
         <br />

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

@@ -1,3 +1,3 @@
-<aside id="sidebar" class="columns alpha four" data-hook>
+<aside id="sidebar" class="columns four" data-hook>
   <%= yield :sidebar %>
 </aside>

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

@@ -11,7 +11,7 @@
   <%= render :partial => 'spree/shared/products', :locals => { :products => @products, :taxon => @taxon } %>
 </div>
 
-<% unless params[:keyword].present? %>
+<% unless params[:keywords].present? %>
   <div data-hook="taxon_children">
     <%= render :partial => 'taxon', :collection => @taxon.children %>
   </div>

data/config/locales/en.yml

@@ -257,9 +257,10 @@ en:
   assign_taxon: "Assign Taxon"
   assign_taxons: "Assign Taxons"
   attachment_default_style: "Attachments Style"
-  attachment_default_url: "Attachments URL"
+  attachment_default_url: "Attachments Default URL"
   attachment_path: "Attachments Path"
   attachment_styles: "Paperclip Styles"
+  attachment_url: "Attachments URL"
   authorization_failure: "Authorization Failure"
   authorized: Authorized
   availability: "Availability"
@@ -388,8 +389,6 @@ en:
   email_server_settings_description: "Set email server settings."
   empty: "Empty"
   empty_cart: "Empty Cart"
-  enable_login_via_login_password: "Use standard email/password"
-  enable_login_via_openid: "Use OpenID instead"
   enable_mail_delivery: Enable Mail Delivery
   ending_in: "Ending in"
   enter_exactly_as_shown_on_card: Please enter exactly as shown on the card
@@ -470,7 +469,7 @@ en:
   image_settings: "Image Settings"
   image_settings_description: "Image Settings Description"
   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."
+  image_settings_warning: "You will need to regenerate thumbnails if you update the paperclip styles. Use rake paperclip:refresh:thumbnails CLASS=Spree::Image to do this."
   in_progress: "In Progress"
   include_in_shipment: Include in Shipment
   included_in_other_shipment: Included in another Shipment
@@ -508,14 +507,6 @@ en:
   live: "Live"
   loading: Loading
   locale_changed: "Locale Changed"
-  logged_in_as: "Logged in as"
-  logged_in_succesfully: "Logged in successfully"
-  logged_out: "You have been logged out."
-  login: Login
-  login_as_existing: "Login as Existing Customer"
-  login_failed: "Login authentication failed."
-  login_name: Login
-  logout: Logout
   look_for_similar_items: Look for similar items
   maestro_or_solo_cards: Maestro/Solo cards
   mail_delivery_enabled: "Mail delivery is enabled"
@@ -974,7 +965,8 @@ en:
   spree:
     date: Date
     date_picker:
-      format: 'yy/mm/dd'
+      format: ! '%Y/%m/%d'
+      js_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."
@@ -1031,7 +1023,6 @@ en:
   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"
-  this_file_language: "English (US)"
   thumbnail: "Thumbnail"
   to_add_variants_you_must_first_define: "To add variants, you must first define"
   to_state: "To State"
@@ -1067,12 +1058,12 @@ en:
   users: Users
   validate_on_profile_create: Validate on profile create
   validation:
-    cannot_be_greater_than_available_stock: "cannot be greater than available stock."
     cannot_be_less_than_shipped_units: "cannot be less than the number of shipped units."
     cannot_destory_line_item_as_inventory_units_have_shipped: "Cannot destory line item as some inventory units have shipped."
     is_too_large: "is too large -- stock on hand cannot cover requested quantity!"
     must_be_int: "must be an integer"
     must_be_non_negative: "must be a non-negative value"
+    exceeds_available_stock: "exceeds available stock. Please ensure line items have a valid quantity."
   value: Value
   variant: Variant
   variants: Variants

data/config/routes.rb

@@ -88,12 +88,16 @@ Spree::Core::Engine.routes.draw do
       end
     end
 
+    delete '/option_values/:id', :to => "option_values#destroy", :as => :option_value
+
     resources :properties do
       collection do
         get :filtered
       end
     end
 
+    delete '/product_properties/:id', :to => "product_properties#destroy", :as => :product_property
+
     resources :prototypes do
       member do
         get :select
@@ -143,6 +147,9 @@ Spree::Core::Engine.routes.draw do
     end
 
     resources :taxonomies do
+    	collection do
+    		post :update_positions
+    	end
       member do
         get :get_children
       end

data/db/migrate/20121124203911_add_position_to_taxonomies.rb

@@ -0,0 +1,5 @@
+class AddPositionToTaxonomies < ActiveRecord::Migration
+  def change
+  	add_column :spree_taxonomies, :position, :integer, :default => 0
+  end
+end

data/lib/spree/core/controller_helpers.rb

@@ -49,6 +49,7 @@ module Spree
       end
 
       def associate_user
+        @order ||= current_order
         if try_spree_current_user && @order
           if @order.user.blank? || @order.email.blank?
             @order.associate_user!(try_spree_current_user)

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

@@ -6,23 +6,5 @@ FactoryGirl.define do
     order { FactoryGirl.create(:order) }
     state 'pending'
     response_code '12345'
-
-    # limit the payment amount to order's remaining balance, to avoid over-pay exceptions
-    after_create do |pmt|
-        #pmt.update_attribute(:amount, [pmt.amount, pmt.order.outstanding_balance].min)
-    end
   end
-
-  # factory :creditcard_txn do
-  #   payment
-  #   amount 45.75
-  #   response_code 12345
-  #   txn_type CreditcardTxn::TxnType::AUTHORIZE
-  #
-  #   # match the payment amount to the payment's value
-  #   after_create do |txn|
-  #     # txn.update_attribute(:amount, [txn.amount, txn.payment.payment].min)
-  #     txn.update_attribute(:amount, txn.payment.amount)
-  #   end
-  # end
 end

data/lib/spree/core/validators/email.rb

@@ -18,6 +18,6 @@ class EmailValidator < ActiveModel::EachValidator
     rescue Exception => e
       r = false
     end
-    record.errors[attribute] << (options[:message] || "is invalid") unless r
+    record.errors[attribute] << (options[:message] || I18n.t("errors.messages.invalid")) unless r
   end
 end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.2.2"
+    "1.2.3"
   end
 end

data/lib/tasks/taxon.rake

@@ -1,7 +1,7 @@
 namespace :spree do
   desc "Resets all taxon permalinks"
   task :reset_taxon_permalinks => :environment do
-    Taxon.where(:parent_id => nil).each {|taxon| redo_permalinks(taxon) }
+    Spree::Taxon.where(:parent_id => nil).each {|taxon| redo_permalinks(taxon) }
   end
 
   def redo_permalinks(taxon)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,43 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-19 00:00:00.000000000 Z
+date: 2013-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70281722132740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70281722132740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &70281721877200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70281721877200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.5
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70281721875700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70281721875700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: select2-rails
-  requirement: &70281721873140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,32 +69,47 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70281721873140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70281721870700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.6.11
   type: :runtime
   prerelease: false
-  version_requirements: *70281721870700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.11
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70281721930460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70281721930460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70281721928880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +117,15 @@ dependencies:
         version: 1.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70281721928880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70281721926040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +133,15 @@ dependencies:
         version: '2.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70281721926040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70281721939000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,54 +149,79 @@ dependencies:
         version: 1.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70281721939000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: ransack
-  requirement: &70281721937840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.2
   type: :runtime
   prerelease: false
-  version_requirements: *70281721937840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &70281721931200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.28.0
+        version: 1.29.3
   type: :runtime
   prerelease: false
-  version_requirements: *70281721931200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.29.3
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70281723068920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.2.10
   type: :runtime
   prerelease: false
-  version_requirements: *70281723068920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.10
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70281723088240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70281723088240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: deface
-  requirement: &70281723086560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +229,15 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70281723086560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &70281723085500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,40 +245,60 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70281723085500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70281723083600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70281723083600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.7
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &70281723082080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70281723082080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: rabl
-  requirement: &70281722094420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.7.2
   type: :runtime
   prerelease: false
-  version_requirements: *70281722094420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.2
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -377,6 +467,7 @@ files:
 - app/controllers/spree/admin/mail_methods_controller.rb
 - app/controllers/spree/admin/mail_settings_controller.rb
 - app/controllers/spree/admin/option_types_controller.rb
+- app/controllers/spree/admin/option_values_controller.rb
 - app/controllers/spree/admin/orders/customer_details_controller.rb
 - app/controllers/spree/admin/orders_controller.rb
 - app/controllers/spree/admin/overview_controller.rb
@@ -926,6 +1017,7 @@ files:
 - db/migrate/20120905151823_add_toggle_tax_rate_display.rb
 - db/migrate/20121009142519_add_lock_version_to_variant.rb
 - db/migrate/20121017010007_remove_not_null_constraint_from_products_on_hand.rb
+- db/migrate/20121124203911_add_position_to_taxonomies.rb
 - db/seeds.rb
 - vendor/assets/images/datepicker/cal.gif
 - vendor/assets/images/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png
@@ -1006,7 +1098,8 @@ files:
 - vendor/assets/stylesheets/jquery.formalize.css.erb
 - vendor/assets/stylesheets/skeleton.css
 homepage: http://spreecommerce.com
-licenses: []
+licenses:
+- BSD-3
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -1025,11 +1118,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3084741105755015925
+      hash: 3458993315221565622
 requirements:
 - none
 rubyforge_project: spree_core
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Core e-commerce functionality for the Spree project.