basic-initial-rails4 1.1.2 → 1.1.3

data/app/controllers/sessions_controller.rb

@@ -8,16 +8,18 @@ class SessionsController < ApplicationController
   end
 
   def create
-    if params[:commit] === 'Sign up'
-      $user = User.create(user_params)
-      if $user.save
+    if params[:commit] === 'Sign in'
+      $user = User.find_by_email(params[:email])
+      if $user and $user.authenticate(params[:password])
         session[:user_id] = $user.id
-        redirect_to root_path, notice: 'Sign in sussesfull'
+        redirect_to root_path,
+          notice: 'Sign in successfully'
       else
-        redirect_to new_user_path, notice: 'Problems creeting a user'
+        redirect_to sessions_new_path,
+          notice: 'User or password error'
       end
     else
-      request.env['omniauth.auth'].nil? ? (redirect_to new_user_path) : set_omniauth_user
+       request.env['omniauth'].nil? ? (redirect_to sessions_new_path) : set_omniauth_user
     end
   end
 
@@ -29,7 +31,7 @@ class SessionsController < ApplicationController
 
   def failure
   end
-  
+
   private
 
   def set_omniauth_user
@@ -46,8 +48,4 @@ class SessionsController < ApplicationController
     end
     redirect_to root_path
   end
-
-  def user_params
-    params.permit(:name, :email, :password, :password_confirmation)
-  end
 end

data/app/controllers/users_controller.rb

@@ -5,18 +5,18 @@ class UsersController < ApplicationController
   end
 
   def create
-    if params[:commit] === 'Sign in'
-      $user = User.find_by_email(params[:email])
-      if $user and $user.authenticate(params[:password])
+    if params[:commit] === 'Sign up'
+      $user = User.create(user_params)
+      if $user.save
         session[:user_id] = $user.id
         redirect_to root_path,
-          notice: 'Sign in successfully'
+          notice: 'Sign in successfull'
       else
-        redirect_to sessions_new_path,
-          notice: 'User or password error'
+        redirect_to new_user_path,
+          notice: 'Problems creeting a user'
       end
     else
-      redirect_to sessions_new_path
+      redirect_to new_user_path
     end
   end
 
@@ -25,4 +25,8 @@ class UsersController < ApplicationController
     @user = $user unless $user.nil?
     $user = nil
   end
+
+  def user_params
+    params.permit(:name, :email, :password, :password_confirmation)
+  end
 end

data/app/views/sessions/new.html.haml

@@ -1,5 +1,7 @@
 .session-message
-  = flash[:notice] unless flash[:notice].nil?
+  - unless flash[:notice].nil?
+    %br
+    = flash[:notice]
 - if session[:user_id].nil?
   = link_to 'Twitter', '/auth/twitter'     unless @init_twitter.nil?
   = link_to 'Github', '/auth/github'       unless @init_github.nil?
@@ -7,7 +9,7 @@
   = link_to 'Linked_in', '/auth/linked_in' unless @init_linkedin.nil?
 %h1 Sign in
 %p Put you information to login
-= form_tag users_path, method: 'POST' do |f|
+= form_tag sessions_new_path, method: 'POST' do |f|
   %table{width: '25%'}
     %tr
       %td

data/app/views/users/new.html.haml

@@ -3,10 +3,12 @@
     - @user.errors.full_messages.each do |message|
       #{message}
     %br
-  = flash[:notice] unless flash[:notice].nil?
+  - unless flash[:notice].nil?
+    %br
+    = flash[:notice]
 %h1 Sign up
 %p put information to complete your register
-= form_tag sessions_new_path, method: "POST" do |f|
+= form_tag users_path, method: "POST" do |f|
   %table{width: "25%"}
     %tr
       %td

data/basic-initial-rails4.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "haml-rails", ">= 0.3"
   gem.add_development_dependency "omniauth-twitter", ">= 1.0.0"
   gem.add_development_dependency 'bcrypt-ruby', '~> 3.0.0'
-  gem.add_development_dependency "bootstrap-rails4"
+  gem.add_development_dependency "bootstrap-v3-rails"
   gem.add_development_dependency "rake"
 end

data/lib/basic/initial/rails4/version.rb

@@ -1,7 +1,7 @@
 module Basic
   module Initial
     module Rails4
-      VERSION = "1.1.2"
+      VERSION = "1.1.3"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: basic-initial-rails4
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2013-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -140,7 +140,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: bootstrap-rails4
+  name: bootstrap-v3-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements: