gennaro 0.3.6.4 → 0.3.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d040d9d23b2899fba9a0f7f531bc0476abc6097
-  data.tar.gz: 728616f2bde742e1c15a8e03877b203c2d97b3d0
+  metadata.gz: df6c2de0cfd07118b5da6d25a0dc5aa88552c394
+  data.tar.gz: 12cad4c59feefce50e5a719ebefd25b972efaacf
 SHA512:
-  metadata.gz: d0f814721f48f4ce4f18dc8d4d1d4a28d0f606fa4e862a21384937255b3cfa8e254c6c3690522f88f0d5bfbb5e4aafd66d876d2cbeb98b678dc01fc2062cadac
-  data.tar.gz: cf4eb565538f575c301a9aa37913378beecc59b9df1b8c3665717174a82ad7e1686cb82df0db53c745814e987856e12e3cf5723d4b5b2c813220a2b39996bc9e
+  metadata.gz: aa6c3a8e98c754e7efb708e823f3e3a3ff2fbd8da8780e2b41c305f3edc6d90c5643d57f6c9fa4995c21237acc65ffe8e55fc0ff5199ddf9987ec48e6b9646ab
+  data.tar.gz: 6c09045e7fbe48e73038526e464cf28b11ecd59c053b6b996b06b95c4f5e4d2539e5171b08452d8de34a7eeb73bbeb241d89732b1b896c3fa4dded9113592109

data/lib/gennaro/version.rb

@@ -10,6 +10,6 @@
 
 class Gennaro
   def self.version
-    '0.3.6.4'
+    '0.3.6.5'
   end
 end

data/templates/authentication/app/controllers/users.rb

@@ -57,13 +57,14 @@ class ${ClassName}
     elsif logged_in?
       @error   = 'You are already logged in.'
     else
-      session  = User.login params[:username], params[:password]
-      if session
-        set_login! session
-        @success = 'Login successful.'
-      else
-        @error   = 'Login failed.'
-      end
+      User.login(params[:username], params[:password]) { |session|
+        if session
+          set_login! session
+          @success = 'Login successful.'
+        else
+          @error   = 'Login failed.'
+        end
+      }
     end
     erb :'user/login'
   end
@@ -77,12 +78,13 @@ class ${ClassName}
       @error = 'The username you have chosen is already taken.'
     else
       level = User.empty? ? User.founder : User.user
-      user  = User.signup params[:username], params[:email], params[:password], level
-      if user.errors.any?
-        @error   = user.errors.first.first
-      else
-        @success = 'Sign up successful.'
-      end
+      User.signup(params[:username], params[:email], params[:password], level) { |errors|
+        if errors.any?
+          @error   = errors.first.first
+        else
+          @success = 'Sign up successful.'
+        end
+      }
     end
     erb :'user/signup'
   end
@@ -144,8 +146,7 @@ class ${ClassName}
       elsif level == User.founder || user.founder?
         @error = 'Foundership is untouchable.'
       else
-        user = User.change_level params[:username], level
-        if user
+        if User.change_level params[:username], level
           @success = 'User level set successful.'
         else
           @error   = 'Error setting the user level.'

data/templates/authentication/app/models/user.rb

@@ -139,24 +139,38 @@ class User
       User.count(username: username) == 1
     end
     
-    def registration(username, email, password, permission_level, stuff = {})
-      User.create({
+    def signup(username, email, password, permission_level, stuff = {})
+      res = User.create({
         :username         => username,
         :email            => email,
         :password         => password,
         :permission_level => permission_level
       }.merge(stuff))
-    end
-      alias_method :signup, :registration
 
-    def authentication(username, password)
-      user = User.first username: username
-      return false unless user
-      if user.salted_password == BCrypt::Engine.hash_secret(password, user.salt)
-        return user.update(session: BCrypt::Engine.generate_salt) ? user.session : false
+      if block_given?
+        yield  res.errors
       else
-        false
+        return res
       end
+    end
+      alias_method :registration, :signup
+
+    def authentication(username, password)
+      User.first(username: username).tap { |user|
+        res = if not user
+          false
+        elsif user.salted_password == BCrypt::Engine.hash_secret(password, user.salt)
+          user.update(session: BCrypt::Engine.generate_salt) ? user.session : false
+        else
+          false
+        end
+
+        if block_given?
+          yield  res
+        else
+          return res
+        end
+      }
     end
       alias_method :login,        :authentication
       alias_method :signin,       :authentication

data/templates/authentication/spec/user_spec.rb

@@ -25,8 +25,9 @@ describe '${ClassName}' do
     user.founder?.should           be_true
     User.exists?(@username).should be_true
 
-    user = User.signup @username, @email, @password, @level
-    user.errors.should_not be_empty
+    User.signup(@username, @email, @password, @level) { |errors|
+      errors.should_not be_empty
+    }
   end
 
   it 'logs in a user' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gennaro
 version: !ruby/object:Gem::Version
-  version: 0.3.6.4
+  version: 0.3.6.5
 platform: ruby
 authors:
 - Giovanni Capuano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2014-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec