authem 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ab055d04dcac03a2274070a9d943c0b620ef7e6
-  data.tar.gz: 16d4f50e769a947afaac241902d96dfb05df21bd
+  metadata.gz: dfadf2e98145044611efbc8cf9c464bf61ff5a4a
+  data.tar.gz: 7711f61516b8011719f3bef3227db9a6c2d69a07
 SHA512:
-  metadata.gz: 80ad4b4c249a683e09b44989725526e800c888462c381b8b5368e0da5b5d9c1a6006bae73995adf60c2dbbb3cefb1d1011da0f1314e170e8f0043f4ea8cce6a5
-  data.tar.gz: 449edac32576e9daca22f3597798f94a534c6ee6a7db792814564d03d3fbab6254971f6d31feaa32080ac8e9a61dc8416f6849e44cf4b1d0d4af34a16243bb45
+  metadata.gz: c1645715ffabda3d2ccc4a246e2e1bfd8b7e84fee7fada613bf2960718a1948d3b69e42f6507b8a48a16c482a5f9ff6f3d99c7276197638325c5505a29786cf1
+  data.tar.gz: 4525dcad2f1a248e498e62447b6bc622a022ec30cfe428bd1d20a41cd35c79337f0cf249e184405caa03e2a33faa6bbb0b8aae5d9130d10607ef219bf0757a8f

data/lib/authem.rb

@@ -1,11 +1,10 @@
 module Authem
-  autoload :BaseUser,    'authem/base_user'
-  autoload :User,        'authem/user'
-  autoload :SorceryUser, 'authem/sorcery_user'
-
-  autoload :Config, 'authem/config'
+  autoload :BaseUser,          'authem/base_user'
+  autoload :User,              'authem/user'
+  autoload :SorceryUser,       'authem/sorcery_user'
+  autoload :Config,            'authem/config'
   autoload :ControllerSupport, 'authem/controller_support'
-  autoload :Token, 'authem/token'
+  autoload :Token,             'authem/token'
 
   def self.configure(&block)
     Config.configure(&block)

data/lib/authem/base_user.rb

@@ -22,7 +22,7 @@ module Authem::BaseUser
 
   def reset_password(password, confirmation)
     if password.blank?
-      self.errors.add(:password, :blank)
+      self.errors.add :password, :blank
       return false
     end
 
@@ -32,20 +32,18 @@ module Authem::BaseUser
     self.password_confirmation = confirmation
     self.reset_password_token = nil
 
-    if save
-      true
-    else
-      self.reset_password_token = reset_password_token
-      false
-    end
+    return true if save
+
+    self.reset_password_token = reset_password_token
+    false
   end
 
   def reset_password_token!
-    generate_token(:reset_password)
+    generate_token :reset_password
   end
 
   def reset_session_token!
-    generate_token(:session)
+    generate_token :session
   end
 
   private

data/lib/authem/controller_support.rb

@@ -40,7 +40,7 @@ module Authem::ControllerSupport
   def redirect_back_or_to(url, flash_hash = {})
     url = session[:return_to_url] || url
     session[:return_to_url] = nil
-    redirect_to(url, :flash => flash_hash)
+    redirect_to url, flash: flash_hash
   end
 
   included do

data/lib/authem/sorcery_user.rb

@@ -5,8 +5,8 @@ module Authem::SorceryUser
   included do
     attr_accessor :password, :password_confirmation
     validates_presence_of :password, on: :create
-    validates_presence_of :password_confirmation, if: ->(user) { user.password.present? }
-    validates_confirmation_of :password, if: ->(user) { user.password.present? }
+    validates_presence_of :password_confirmation, if: ->{ password.present? }
+    validates_confirmation_of :password, if: ->{ password.present? }
 
     before_save :encrypt_password
   end

data/lib/authem/token.rb

@@ -1,7 +1,7 @@
-class Authem::Token
+require 'securerandom'
 
+class Authem::Token
   def self.generate
-    Digest::SHA1.hexdigest(Time.now.to_s.split(//).sort_by {rand}.join)
+    SecureRandom.hex(20)
   end
-
 end

data/lib/authem/version.rb

@@ -1,3 +1,3 @@
 module Authem
-  VERSION = '1.3.3'
+  VERSION = '1.4.0'.freeze
 end

data/lib/generators/authem/model/model_generator.rb

@@ -6,7 +6,7 @@ module Authem
     argument :model_name, type: :string, default: "user"
 
     def generate_model
-      generate("model #{model_name} email:string password_digest:string reset_password_token:string session_token:string remember_token:string")
+      generate "model #{model_name} email:string password_digest:string reset_password_token:string session_token:string remember_token:string"
     end
 
     def update_model_to_include_authem
@@ -15,7 +15,7 @@ module Authem
 
     def add_initializer
       create_file 'config/initializers/authem.rb' do
-        %Q(Authem.configure do |config|\n  config.user_class = #{model_name.camelize}\nend)
+        "Authem.configure do |config|\n  config.user_class = #{model_name.camelize}\nend"
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authem
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Paul Elliott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -167,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='