spree_core 3.6.4 → 3.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed945b50f0486e1208240d9fd524c037b12685736a9a1d2863ec4c0d0e8e992a
-  data.tar.gz: b1c3007ef975798c1302289b22ee08d1110be88ae910bf1855895fdc3c30cfe8
+  metadata.gz: 7f129d2d6881d6fa1ef3a6992d2db0c1a28333b69322b19a25cd25d93c14f089
+  data.tar.gz: 327da3039ddc3d5f97388b4a3a5ed8dfcc20809be70ac4803924cee55a197b12
 SHA512:
-  metadata.gz: 66baebd11a78c5d7013817b63aada583f38cc03b519e8993ee662312f842dc04bfca08bddcf92b4b87d09960901426ee135fc80e70334f316b3fe93892e3c9f1
-  data.tar.gz: f0c1a4ecf0608f30a4427fe225018419073e3a617b29d351f56c7d365c071ad095ef5bddd82487a2dfcb9b1391c211550364e120c633f576b5c688ca85a9e671
+  metadata.gz: 744a4b31bf809fefd364890da0ff201fc9cbd90a0c6173fa0a2a93f163ad5eb9323b7e7d15d592de5ee986044409a56b580172e7cb80ac1d6460a937deb0de2a
+  data.tar.gz: 3b0558e6e90ddd99fc521eba0c7b7221e6532e2e1ae7f78f8a06128183dc596f60954437425f290cb3a31e3718b12c5db30b76d79d2362699dccf13203ba9216

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '3.6.4'
+    '3.6.5'
   end
 end

data/lib/spree/money.rb

@@ -2,6 +2,8 @@
 
 require 'money'
 
+Money.locale_backend = :i18n
+
 module Spree
   class Money
     class <<self
@@ -30,13 +32,19 @@ module Spree
       @money.format(@options)
     end
 
-    def to_html(options = { html: true })
-      output = @money.format(@options.merge(options))
-      if options[:html]
-        # 1) prevent blank, breaking spaces
-        # 2) prevent escaping of HTML character entities
+    # 1) prevent blank, breaking spaces
+    # 2) prevent escaping of HTML character entities
+    def to_html(opts = { html: true })
+      # html option is deprecated and we need to fallback to html_wrap
+      opts[:html_wrap] = opts[:html]
+      opts.delete(:html)
+
+      output = money.format(@options.merge(opts))
+      if opts[:html_wrap]
+        output.gsub!(/<\/?[^>]*>/, '') # we don't want wrap every element in span
         output = output.sub(' ', '&nbsp;').html_safe
       end
+
       output
     end
 

data/spree_core.gemspec

@@ -30,7 +30,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'friendly_id', '~> 5.2.1'
   s.add_dependency 'highline', '~> 1.6.18' # Necessary for the install generator
   s.add_dependency 'kaminari', '~> 1.0.1'
-  s.add_dependency 'monetize', '~> 1.1'
+  s.add_dependency 'money', '~> 6.13'
+  s.add_dependency 'monetize', '~> 1.9'
   s.add_dependency 'paperclip', '~> 6.0.0'
   s.add_dependency 'paranoia', '~> 2.4.1'
   s.add_dependency 'premailer-rails'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.6.4
+  version: 3.6.5
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-06 00:00:00.000000000 Z
+date: 2018-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -150,20 +150,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: money
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.13'
 - !ruby/object:Gem::Dependency
   name: monetize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement