2 files changed, 9 insertions, 8 deletions
diff --git a/activemodel/lib/active_model/secure_password.rb b/activemodel/lib/active_model/secure_password.rb
index abbf96650e..474cb0aea0 100644
--- a/activemodel/lib/active_model/secure_password.rb
+++ b/activemodel/lib/active_model/secure_password.rb
@@ -46,9 +46,9 @@ module ActiveModel
         begin
           gem 'bcrypt-ruby', '~> 3.0.0'
           require 'bcrypt'
-        rescue LoadError => e
+        rescue LoadError
           $stderr.puts "You don't have bcrypt-ruby installed in your application. Please add it to your Gemfile and run bundle install"
-          raise e
+          raise
         end
 
         attr_reader :password
diff --git a/activemodel/lib/active_model/version.rb b/activemodel/lib/active_model/version.rb
index 7586b02037..35c4b30999 100644
--- a/activemodel/lib/active_model/version.rb
+++ b/activemodel/lib/active_model/version.rb
@@ -1,10 +1,11 @@
 module ActiveModel
-  module VERSION #:nodoc:
-    MAJOR = 4
-    MINOR = 0
-    TINY  = 0
-    PRE   = "beta1"
+  # Returns the version of the currently loaded ActiveModel as a Gem::Version
+  def self.version
+    Gem::Version.new "4.0.0.beta1"
+  end
 
-    STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
+  module VERSION #:nodoc:
+    MAJOR, MINOR, TINY, PRE = ActiveModel.version.segments
+    STRING = ActiveModel.version.to_s
   end
 end