cleaned up dependencies between i18n hyper-model and errors class

Author: catmando

ruby/hyper-i18n/spec/hyper_i18n_spec.rb

@@ -26,8 +26,8 @@ class TestComponent
       mount 'Components::TestComponent', {}, render_on: flag
       expect(find('#tp1')).to have_content('I am a key')
       expect(find('#tp2')).to have_content('Hello world')
-      expect(find('#tp3')).to have_content('Mon, 01 Jan 2018 12:45:00')
-      expect(find('#tp4')).to have_content('January 01, 2018 at 12:45 pm')
+      expect(find('#tp3')).to have_content(::I18n.l(Time.parse('1/1/2018 12:45')))
+      expect(find('#tp4')).to have_content(::I18n.l(Time.parse('1/1/2018 12:45'), format: '%B %d, %Y at %l:%M %P'))
       expect(find('#tp5')).to have_content('My Model')
       expect(find('#tp6')).to have_content('The Attribute')
     end

ruby/hyper-model/lib/reactive_record/active_record/class_methods.rb

@@ -185,7 +185,10 @@ def alias_attribute(new_name, old_name)
     ]
 
     def method_missing(name, *args, &block)
-      if args.count == 1 && name.start_with?("find_by_") && !block
+      if name == 'human_attribute_name'
+        opts = args[1] || {}
+        opts[:default] || args[0]
+      elsif args.count == 1 && name.start_with?("find_by_") && !block
         find_by(name.sub(/^find_by_/, '') => args[0])
       elsif [].respond_to?(name)
         all.send(name, *args, &block)
@@ -336,10 +339,6 @@ def server_method(name, default: nil)
       end
     end
 
-    def human_attribute_name(attribute, opts = {})
-      opts[:default] || attribute
-    end
-
     def define_attribute_methods
       columns_hash.each do |name, column_hash|
         next if name == primary_key

ruby/hyper-model/lib/reactive_record/active_record/errors.rb

@@ -105,9 +105,9 @@ def full_message(attribute, message)
       attr_name =
         attribute.to_s.tr('.', '_').tr('_', ' ').gsub(/_id$/, '').capitalize
       # attr_name = @base.class.human_attribute_name(attribute, default: attr_name)
-      # if @base.class.respond_to?(:human_attribute_name)
+      if @base.class.respond_to?(:human_attribute_name)
         attr_name = @base.class.human_attribute_name(attribute, default: attr_name)
-      # end
+      end
       # I18n.t(:"errors.format",
       #   default:  "%{attribute} %{message}",
       #   attribute: attr_name,

ruby/hyper-model/spec/batch1/misc/errors_spec.rb

@@ -22,11 +22,11 @@ def validate!
         #   send(attr)
         # end
 
-        class << self
-          def human_attribute_name(attr, options = {})
-            attr
-          end
-        end
+        # class << self
+        #   def human_attribute_name(attr, options = {})
+        #     attr
+        #   end
+        # end
 
         # def self.lookup_ancestors
         #   [self]
@@ -174,7 +174,7 @@ def human_attribute_name(attr, options = {})
       person = Person.new
       person.validate!
       person.errors.full_messages
-    end.to eq ['name cannot be nil']
+    end.to eq ['Name cannot be nil']
 
     expect_evaluate_ruby do
       person = Person.new
@@ -312,7 +312,7 @@ def human_attribute_name(attr, options = {})
       person.errors.add(:name, 'cannot be blank')
       person.errors.add(:name, 'cannot be nil')
       person.errors.to_a
-    end.to eq ['name cannot be blank', 'name cannot be nil']
+    end.to eq ['Name cannot be blank', 'Name cannot be nil']
   end
 
   it 'to_hash returns the error messages hash' do
@@ -343,7 +343,7 @@ def human_attribute_name(attr, options = {})
       person.errors.add(:name, 'cannot be blank')
       person.errors.add(:name, 'cannot be nil')
       person.errors.full_messages
-    end.to eq ['name cannot be blank', 'name cannot be nil']
+    end.to eq ['Name cannot be blank', 'Name cannot be nil']
   end
 
   it 'full_messages_for contains all the error messages for the given attribute indifferent' do
@@ -352,7 +352,7 @@ def human_attribute_name(attr, options = {})
       person.errors.add(:name, 'cannot be blank')
       person.errors.add(:name, 'cannot be nil')
       person.errors.full_messages_for(:name)
-    end.to eq ['name cannot be blank', 'name cannot be nil']
+    end.to eq ['Name cannot be blank', 'Name cannot be nil']
   end
 
   it 'full_messages_for does not contain error messages from other attributes' do
@@ -361,7 +361,7 @@ def human_attribute_name(attr, options = {})
       person.errors.add(:name, 'cannot be blank')
       person.errors.add(:email, 'cannot be blank')
       person.errors.full_messages_for(:name)
-    end.to eq ['name cannot be blank']
+    end.to eq ['Name cannot be blank']
   end
 
   it 'full_messages_for returns an empty list in case there are no errors for the given attribute' do
@@ -383,7 +383,7 @@ def human_attribute_name(attr, options = {})
     expect_evaluate_ruby do
       person = Person.new
       person.errors.full_message(:name_test, 'cannot be blank')
-    end.to eq 'name_test cannot be blank'
+    end.to eq 'Name test cannot be blank'
   end
 
   it 'as_json creates a json formatted representation of the errors hash' do
@@ -399,7 +399,7 @@ def human_attribute_name(attr, options = {})
       person = Person.new
       person.validate!
       person.errors.as_json(full_messages: true)
-    end.to eq('name' => ['name cannot be nil'])
+    end.to eq('name' => ['Name cannot be nil'])
   end
 
   it 'generate_message works without i18n_scope', skip: true do