solidus_core 2.3.0.rc2 → 2.3.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5456072d5e99ceb7ebdcad4524f2bd7cf624a93
-  data.tar.gz: 4911261c10bb3cac314e99e82b1ad1aea6e72a94
+  metadata.gz: 89a3d4e527ba0ea59d1bdbc6b21f31cf44f28916
+  data.tar.gz: 44c4c11e6a69ea476145bb06910a50f1d9f3120a
 SHA512:
-  metadata.gz: ac01310b3a3f221526fa462d49f9925392e9fe1f2f569dbcbd4f2072a5913e3524ab1e2e04fb97cc94a8c4b643cd238e08167a00a4b6fa8e2277edbad5def43f
-  data.tar.gz: 7f19f829ec2a112eadc190ffe5727bfb16be9b73d5a22e208125fca6a2e5f424824e7653d6f62ffa963209917ca06f8c32cd2ba7bd83c324c62204ec2102ffc5
+  metadata.gz: 696c8894f807ec9d18cb4d979fa7094d001723c66f7f12c27635593902946c18190856b8fa0364a3c27df10dab776e0a0ac94196bc69ad4459032a3ee82c7c4c
+  data.tar.gz: 25de5c265c0bb56591b701d4dbf60f26ef22eb23d9d1f4bccf221f7a97dea0c7bfcb3cbc58dc98ac21e9dfa862676414d6af83f23dd10251576031129cfd9d74

data/app/models/spree/payment_method.rb

@@ -37,6 +37,21 @@ module Spree
 
     include Spree::Preferences::StaticallyConfigurable
 
+    # Custom ModelName#human implementation to ensure we don't refer to
+    # subclasses as just "PaymentMethod"
+    class ModelName < ActiveModel::Name
+      # Similar to ActiveModel::Name#human, but skips lookup_ancestors
+      def human(options = {})
+        defaults = [
+          i18n_key,
+          options[:default],
+          @human
+        ].compact
+        options = { scope: [:activerecord, :models], count: 1, default: defaults }.merge!(options.except(:default))
+        I18n.translate(defaults.shift, options)
+      end
+    end
+
     class << self
       def providers
         Spree::Deprecation.warn 'Spree::PaymentMethod.providers is deprecated and will be deleted in Solidus 3.0. ' \
@@ -66,6 +81,10 @@ module Spree
         end
       end
 
+      def model_name
+        ModelName.new(self, Spree)
+      end
+
       def active?
         where(type: to_s, active: true).count > 0
       end

data/lib/spree/core/version.rb

@@ -1,6 +1,6 @@
 module Spree
   def self.solidus_version
-    "2.3.0.rc2"
+    "2.3.0.rc3"
   end
 
   def self.solidus_gem_version

data/spec/models/spree/payment_method_spec.rb

@@ -354,4 +354,20 @@ describe Spree::PaymentMethod, type: :model do
       expect(payment_method.credit).to eq 'credit'
     end
   end
+
+  describe 'model_name.human' do
+    context 'PaymentMethod itself' do
+      it "returns i18n value" do
+        expect(Spree::PaymentMethod.model_name.human).to eq('Payment Method')
+      end
+    end
+
+    context 'A subclass with no i18n key' do
+      let!(:klass) { stub_const("MyGem::SomeClass", Class.new(described_class)) }
+
+      it "returns default humanized value" do
+        expect(klass.model_name.human).to eq('Some class')
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.3.0.rc2
+  version: 2.3.0.rc3
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-20 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant