link2 0.1.8 → 0.1.9

data/lib/link2/brain.rb

@@ -292,9 +292,9 @@ module Link2
 
         if ::Link2::Support.record_object?(resource)
           # Skip any ugly default to_s-value:
-          custom_name = resource.to_s =~ CLASS_INSTANCE_STRING ? (resource_class.model_name.human rescue resource_class.human_name).downcase : resource.to_s
+          custom_name = resource.to_s =~ CLASS_INSTANCE_STRING ? ::Link2::Support.human_name_for(resource_class).downcase : resource.to_s
         end
-        custom_name = (resource_class.model_name.human rescue resource_class.human_name).downcase if custom_name.blank?
+        custom_name = ::Link2::Support.human_name_for(resource_class).downcase if custom_name.blank?
         custom_name
       end
 

data/lib/link2/i18n.rb

@@ -96,7 +96,7 @@ module Link2
         #
         def localized_resource_class_name(resource)
           resource_class = ::Link2::Support.find_resource_class(resource)
-          resource_name = resource_class.human_name rescue resource_class.to_s.humanize
+          resource_name = ::Link2::Support.human_name_for(resource_class) rescue resource_class.to_s.humanize
           resource_name.underscore
         end
 

data/lib/link2/support.rb

@@ -132,6 +132,20 @@ module Link2
       def record_object?(object)
         object.respond_to?(:new_record?)
       end
+
+      # Get the human name for an object/class - in both Rails 2.3 and Rails 3.
+      #
+      # == Usage/Examples:
+      #
+      #   human_name_for(CoolStuff)
+      #
+      #     # => "Cool stuff"
+      #
+      #   ...or something like that.
+      #
+      def human_name_for(object)
+        object.model_name.human rescue object.human_name
+      end
     end
 
   end

data/lib/link2/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Link2
-  VERSION = "0.1.8".freeze
+  VERSION = "0.1.9".freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: link2
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Jonas Grimfelt