spree_core 2.0.11 → 2.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce81644f3167d18676644b782d34b38282cc43a4
-  data.tar.gz: 97ee622222799fab84efe8e61782361e569cf88e
+  metadata.gz: 2f6fc34716045492c73cd83a2a7f9e446a0f5a6b
+  data.tar.gz: 94a3ffee5660aa9d365687e48197c2caed09936e
 SHA512:
-  metadata.gz: 45a8a9e3e94291dae3b17df911b1253303765f11ee78758d1daa66db2b49201735942db84817782f50af9df92ed38580dd427b9b7bbd03b4af208dab8aab4d2d
-  data.tar.gz: 1cf648e2e2680bb4c055913ed9a856844abde7e59b635f27adadca4b2b4e7f1e110582fbe6e3bacf5a69297d8011b531f8ed83c7b1b40a50e0f6be1f376709fa
+  metadata.gz: 73ce47ef477bde8e1f32f37556a55e610b290ab8e69f29518e7f2911401b7b281731383498276f0d0ccf34dd621838d5209b06642b7897526e8c763fd2e51b54
+  data.tar.gz: 687cf5058572498f0ed8582a32766056fb1090e74cbf9c5fd7645ffa041b9d38ec82379010e55ec3e1b8ae2fc38afe91c1dd7bddd2edb1ee944a862a7e6198ef

data/app/helpers/spree/base_helper.rb

@@ -120,7 +120,7 @@ module Spree
       countries.collect do |country|
         country.name = Spree.t(country.iso, scope: 'country_names', default: country.name)
         country
-      end.sort { |a, b| a.name.parameterize <=> b.name.parameterize }
+      end.sort_by { |c| c.name.parameterize }
     end
 
     def seo_url(taxon)

data/app/models/spree/order.rb

@@ -78,6 +78,7 @@ module Spree
 
     validates :email, presence: true, if: :require_email
     validates :email, email: true, if: :require_email, allow_blank: true
+    validates :number, uniqueness: true
     validate :has_available_shipment
     validate :has_available_payment
 
@@ -286,15 +287,11 @@ module Spree
       end
     end
 
-    # FIXME refactor this method and implement validation using validates_* utilities
     def generate_order_number
-      record = true
-      while record
+      self.number ||= loop do
         random = "R#{Array.new(9){rand(9)}.join}"
-        record = self.class.where(number: random).first
+        break random unless self.class.exists?(number: random)
       end
-      self.number = random if self.number.blank?
-      self.number
     end
 
     def shipment

data/lib/spree/core/product_duplicator.rb

@@ -2,8 +2,12 @@ module Spree
   class ProductDuplicator
     attr_accessor :product
 
-    def initialize(product)
+    @@clone_images_default = true
+    mattr_accessor :clone_images_default
+
+    def initialize(product, include_images = @@clone_images_default)
       @product = product
+      @include_images = include_images
     end
 
     def duplicate
@@ -39,7 +43,7 @@ module Spree
       master.dup.tap do |new_master|
         new_master.sku = "COPY OF #{master.sku}"
         new_master.deleted_at = nil
-        new_master.images = master.images.map { |image| duplicate_image image }
+        new_master.images = master.images.map { |image| duplicate_image image } if @include_images
         new_master.price = master.price
         new_master.currency = master.currency
       end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.0.11"
+    '2.0.12'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.0.12
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.42.3
+        version: 1.43.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.42.3
+        version: 1.43.1
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 1.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 1.22.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.17
+        version: 3.2.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.17
+        version: 3.2.18
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -664,7 +664,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.