lib/hashid/rails.rb in hashid-rails-1.3.0 vs lib/hashid/rails.rb in hashid-rails-1.4.0

@@ -31,12 +31,15 @@
     end
 
     def hashid
       self.class.encode_id(id)
     end
-    alias to_param hashid
 
+    def to_param
+      self.class.hashid_configuration.override_to_param ? hashid : super
+    end
+
     module ClassMethods
       def hashid_config(options = {})
         config = Hashid::Rails.configuration.dup
         config.pepper = table_name
         options.each do |attr, value|
@@ -108,9 +111,11 @@
       def hashids
         Hashids.new(*hashid_configuration.to_args)
       end
 
       def hashid_encode(id)
+        return nil if id.nil?
+
         if hashid_configuration.sign_hashids
           hashids.encode(HASHID_TOKEN, id)
         else
           hashids.encode(id)
         end