spree_core 3.0.0.rc1 → 3.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 599174c8bcc4c415e7a65af40048eeff77e07147
-  data.tar.gz: f0b4346703e8ff979bc55c7ba86204e5878d163c
+  metadata.gz: 8039d6ead846bc4fa735aa26d8388a62d5c86a3c
+  data.tar.gz: 5ee17fff4d41214804b660bbf57f528d8f65855a
 SHA512:
-  metadata.gz: a20e56fe585721fd0daea6ae733b0cadcd53273e9f44aaf0e783e62b11bf1bf8d2dc1c00e06e5cc6d2de55099e54b1ed62f6162e402039946f00c547a75e8334
-  data.tar.gz: 0547cb6578f56c46bbbe61fdb6a920e74cca7e79b5fbcca9d8dfab376b5ae97a827571a3ba9a4737ac99dd6765797f69f4538604af0c9009b33493a7a371e7ce
+  metadata.gz: 8ed7452b11a0af1096c325d9f63eaf74bc928e82acce258d3fa5e46d5a9cc3b0d3a5a5251bb84ebb1e7732f1ea4038ed06dee1c0f83476e0055df4f69bec9f7d
+  data.tar.gz: 6d904ef3437a05af9bbe5355a566f9659c5828ccf19d57e0a1ef0be9829085d47e4129ab8b908fa688fcc2258049168fe021dd253e2f0313b9907b04e55dade8

data/app/models/concerns/spree/user_reporting.rb

@@ -4,11 +4,11 @@ module Spree
     money_methods :lifetime_value, :average_order_value
 
     def lifetime_value
-      spree_orders.complete.pluck(:total).sum
+      orders.complete.pluck(:total).sum
     end
 
     def order_count
-      BigDecimal(spree_orders.complete.count)
+      BigDecimal(orders.complete.count)
     end
 
     def average_order_value

data/app/models/spree/ability.rb

@@ -32,7 +32,7 @@ module Spree
       alias_action :new_action, to: :create
       alias_action :show, to: :read
       alias_action :index, :read, to: :display
-
+      alias_action :create, :update, :destroy, to: :modify
 
       user ||= Spree.user_class.new
 
@@ -64,6 +64,9 @@ module Spree
         ability = clazz.send(:new, user)
         @rules = rules + ability.send(:rules)
       end
+
+      # Protect admin and user roles
+      cannot [:update, :destroy], Role, name: ['admin']
     end
   end
 end

data/app/models/spree/adjustable/promotion_accumulator.rb

@@ -30,7 +30,7 @@ module Spree
         add(promotions, promotion, source.promotion_id)
       end
 
-      def promotions_adjustments(promotion_id, adjustments = adjustments)
+      def promotions_adjustments(promotion_id, adjustments = adjustments())
         where(sources, promotion_id: promotion_id).map do |source|
           where(adjustments, source_id: source.id)
         end.flatten

data/app/models/spree/return_authorization.rb

@@ -29,7 +29,7 @@ module Spree
       before_transition to: :canceled, do: :cancel_return_items
 
       event :cancel do
-        transition to: :canceled, from: :authorized
+        transition to: :canceled, from: :authorized, if: lambda { |return_authorization| return_authorization.can_cancel_return_items? }
       end
 
     end
@@ -53,6 +53,10 @@ module Spree
       customer_returns.exists?
     end
 
+    def can_cancel_return_items?
+      return_items.any?(&:can_cancel?) || return_items.blank?
+    end
+
     private
 
       def must_have_shipped_units
@@ -69,7 +73,7 @@ module Spree
       end
 
       def cancel_return_items
-        return_items.each(&:cancel!)
+        return_items.each { |item| item.cancel! if item.can_cancel? }
       end
 
       def generate_expedited_exchange_reimbursements

data/app/models/spree/return_item.rb

@@ -121,7 +121,7 @@ module Spree
     end
 
     def total
-      pre_tax_amount + additional_tax_total
+      pre_tax_amount + included_tax_total + additional_tax_total
     end
 
     def eligible_exchange_variants

data/app/models/spree/role.rb

@@ -1,5 +1,7 @@
 module Spree
   class Role < Spree::Base
     has_and_belongs_to_many :users, join_table: 'spree_roles_users', class_name: Spree.user_class.to_s
+
+    validates :name, presence: true
   end
 end

data/app/models/spree/stock_location.rb

@@ -41,21 +41,15 @@ module Spree
     end
 
     # Attempts to look up StockItem for the variant, and creates one if not found.
-    # This method accepts an id or instance of the variant since it is used in
-    # multiple ways. Other methods in this model attempt to pass a variant,
+    # This method accepts an instance of the variant.
+    # Other methods in this model attempt to pass a variant,
     # but controller actions can pass just the variant id as a parameter.
     #
-    # @param variant_or_id [Variant|String] Variant instance or string id of a variant.
+    # @param variant [Variant] Variant instance.
     #
     # @return [StockItem] Corresponding StockItem for the StockLocation's variant.
-    def stock_item_or_create(variant_or_id)
-      vid = if variant_or_id.is_a?(Variant)
-        variant_or_id.id
-      else
-        ActiveSupport::Deprecation.warn "Passing a Variant ID is deprecated, and will be removed in Spree 3. Please pass a variant instance instead.", caller
-        variant_or_id
-      end
-      stock_item(vid) || stock_items.create(variant_id: vid)
+    def stock_item_or_create(variant)
+      stock_item(variant) || stock_items.create(variant_id: variant.id)
     end
 
     def count_on_hand(variant)

data/app/models/spree/store.rb

@@ -1,11 +1,13 @@
 module Spree
   class Store < Spree::Base
+    has_many :orders, class_name: "Spree::Order"
+
     validates :code, presence: true, uniqueness: { allow_blank: true }
     validates :name, presence: true
     validates :url, presence: true
     validates :mail_from_address, presence: true
 
-    before_create :ensure_default_exists_and_is_unique
+    before_save :ensure_default_exists_and_is_unique
     before_destroy :validate_not_default
 
     scope :by_url, lambda { |url| where("url like ?", "%#{url}%") }
@@ -23,7 +25,7 @@ module Spree
 
     def ensure_default_exists_and_is_unique
       if default
-        Store.update_all(default: false)
+        Store.where.not(id: id).update_all(default: false)
       elsif Store.where(default: true).count == 0
         self.default = true
       end

data/app/models/spree/taxonomy.rb

@@ -1,5 +1,7 @@
 module Spree
   class Taxonomy < Spree::Base
+    acts_as_list
+
     validates :name, presence: true
 
     has_many :taxons, inverse_of: :taxonomy

data/app/models/spree/variant.rb

@@ -89,6 +89,10 @@ module Spree
       is_master? ? name : options_text
     end
 
+    def descriptive_name
+      is_master? ? name + ' - Master' : name + ' - ' + options_text
+    end
+
     # use deleted? rather than checking the attribute directly. this
     # allows extensions to override deleted? if they want to provide
     # their own definition.

data/config/initializers/user_class_extensions.rb

@@ -10,7 +10,7 @@ Spree::Core::Engine.config.to_prepare do
                               foreign_key: "user_id",
                               class_name: "Spree::Role"
 
-      has_many :spree_orders, foreign_key: "user_id", class_name: "Spree::Order"
+      has_many :orders, foreign_key: :user_id, class_name: "Spree::Order"
 
       belongs_to :ship_address, class_name: 'Spree::Address'
       belongs_to :bill_address, class_name: 'Spree::Address'
@@ -21,7 +21,7 @@ Spree::Core::Engine.config.to_prepare do
       end
 
       def last_incomplete_spree_order
-        spree_orders.incomplete.order('created_at DESC').first
+        orders.incomplete.order('created_at DESC').first
       end
     end
   end

data/config/locales/en.yml

@@ -404,6 +404,7 @@ en:
     add_to_cart: Add To Cart
     add_variant: Add Variant
     additional_item: Additional Item
+    address: Address
     address1: Address
     address2: Address (contd.)
     adjustable: Adjustable
@@ -605,6 +606,7 @@ en:
     default_tax: Default Tax
     default_tax_zone: Default Tax Zone
     delete: Delete
+    delete_from_taxon: Delete From Taxon
     deleted_variants_present: Some line items in this order have products that are no longer available.
     delivery: Delivery
     depth: Depth
@@ -825,6 +827,7 @@ en:
     new_refund_reason: New Refund Reason
     new_rma_reason: New RMA Reason
     new_return_authorization: New Return Authorization
+    new_role: New Role
     new_shipping_category: New Shipping Category
     new_shipping_method: New Shipping Method
     new_shipment_at_location: New shipment at location
@@ -1013,6 +1016,7 @@ en:
         description: Makes all shipments for the order free
         name: Free shipping
     promotion_actions: Actions
+    promotion_category: Promotion Category
     promotion_form:
       match_policies:
         all: Match all of these rules
@@ -1130,6 +1134,7 @@ en:
     rma_credit: RMA Credit
     rma_number: RMA Number
     rma_value: RMA Value
+    role_id: Role ID
     roles: Roles
     rules: Rules
     safe: Safe

data/db/migrate/20150216173445_add_index_to_spree_stock_items_variant_id.rb

@@ -0,0 +1,13 @@
+class AddIndexToSpreeStockItemsVariantId < ActiveRecord::Migration
+  def up
+    unless index_exists? :spree_stock_items, :variant_id
+      add_index :spree_stock_items, :variant_id
+    end
+  end
+
+  def down
+    if index_exists? :spree_stock_items, :variant_id
+      remove_index :spree_stock_items, :variant_id
+    end
+  end
+end

data/lib/generators/spree/dummy/templates/rails/database.yml

@@ -27,7 +27,7 @@ production:
   database: <%= database_prefix %><%= options[:lib_name] %>_spree_production
   encoding: utf8
 <% when 'postgres' %>
-<% db_host = ENV['DB_HOST'] -%>
+<% db_host = ENV['DB_HOST'] %>
 development:
   adapter: postgresql
   database: <%= database_prefix %><%= options[:lib_name] %>_spree_development

data/lib/spree/core/importer/order.rb

@@ -97,21 +97,71 @@ module Spree
           end
         end
 
-        def self.create_line_items_from_params(line_items_hash, order)
-          return {} unless line_items_hash
-          line_items_hash.each_key do |k|
-            begin
-              extra_params = line_items_hash[k].except(:variant_id, :quantity, :sku)
-              line_item = ensure_variant_id_from_params(line_items_hash[k])
-              line_item = order.contents.add(Spree::Variant.find(line_item[:variant_id]), line_item[:quantity])
-              # Raise any errors with saving to prevent import succeeding with line items failing silently.
-              if extra_params.present?
-                line_item.update_attributes!(extra_params)
-              else
-                line_item.save!
+        def self.create_line_items_from_params(line_items, order)
+          return {} unless line_items
+          case line_items
+          when Hash
+            ActiveSupport::Deprecation.warn(<<-EOS, caller)
+              Passing a hash is now deprecated and will be removed in Spree 3.1.
+              It is recommended that you pass it as an array instead.
+
+              New Syntax:
+
+              {
+                "order": {
+                  "line_items": [
+                    { "variant_id": 123, "quantity": 1 },
+                    { "variant_id": 456, "quantity": 1 }
+                  ]
+                }
+              }
+
+              Old Syntax:
+
+              {
+                "order": {
+                  "line_items": {
+                    "1": { "variant_id": 123, "quantity": 1 },
+                    "2": { "variant_id": 123, "quantity": 1 }
+                  }
+                }
+              }
+            EOS
+
+            line_items.each_key do |k|
+              begin
+                extra_params = line_items[k].except(:variant_id, :quantity, :sku)
+                line_item = ensure_variant_id_from_params(line_items[k])
+                variant = Spree::Variant.find(line_item[:variant_id])
+                line_item = order.contents.add(variant, line_item[:quantity])
+                # Raise any errors with saving to prevent import succeeding with line items
+                # failing silently.
+                if extra_params.present?
+                  line_item.update_attributes!(extra_params)
+                else
+                  line_item.save!
+                end
+              rescue Exception => e
+                raise "Order import line items: #{e.message} #{line_item}"
+              end
+            end
+          when Array
+            line_items.each do |line_item|
+              begin
+                extra_params = line_item.except(:variant_id, :quantity, :sku)
+                line_item = ensure_variant_id_from_params(line_item)
+                variant = Spree::Variant.find(line_item[:variant_id])
+                line_item = order.contents.add(variant, line_item[:quantity])
+                # Raise any errors with saving to prevent import succeeding with line items
+                # failing silently.
+                if extra_params.present?
+                  line_item.update_attributes!(extra_params)
+                else
+                  line_item.save!
+                end
+              rescue Exception => e
+                raise "Order import line items: #{e.message} #{line_item}"
               end
-            rescue Exception => e
-              raise "Order import line items: #{e.message} #{line_item}"
             end
           end
         end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.0.0.rc1"
+    "3.0.0.rc3"
   end
 end

data/lib/spree/testing_support/controller_requests.rb

@@ -26,6 +26,12 @@
 module Spree
   module TestingSupport
     module ControllerRequests
+      extend ActiveSupport::Concern
+
+      included do
+        routes { Spree::Core::Engine.routes }
+      end
+
       def spree_get(action, parameters = nil, session = nil, flash = nil)
         process_spree_action(action, parameters, session, flash, "GET")
       end
@@ -65,13 +71,12 @@ module Spree
 
       def process_spree_action(action, parameters = nil, session = nil, flash = nil, method = "GET")
         parameters ||= {}
-        process(action, method, parameters.merge!(:use_route => :spree), session, flash)
+        process(action, method, parameters, session, flash)
       end
 
       def process_spree_xhr_action(action, parameters = nil, session = nil, flash = nil, method = :get)
         parameters ||= {}
         parameters.reverse_merge!(:format => :json)
-        parameters.merge!(:use_route => :spree)
         xml_http_request(method, action, parameters, session, flash)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 3.0.0.rc3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.44.1
+        version: 1.46.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.44.1
+        version: 1.46.0
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.10.1
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -774,6 +774,7 @@ files:
 - db/migrate/20150122202432_add_code_to_spree_promotion_categories.rb
 - db/migrate/20150128032538_remove_environment_from_tracker.rb
 - db/migrate/20150128060325_remove_spree_configurations.rb
+- db/migrate/20150216173445_add_index_to_spree_stock_items_variant_id.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt