basic-initial-rails4 1.1.1 → 1.1.2

data/app/controllers/sessions_controller.rb

@@ -3,7 +3,7 @@ class SessionsController < ApplicationController
 
   def new
     redirect_to root_path unless session[:user_id].nil?
-    $user.nil? ? @user = User.new : @user = $user
+    @user = $user unless $user.nil?
     $user = nil
   end
 

data/app/controllers/users_controller.rb

@@ -6,12 +6,14 @@ class UsersController < ApplicationController
 
   def create
     if params[:commit] === 'Sign in'
-      $user = User.find_by_email(params[:user][:email])
-      if $user and user.authenticate(params[:user][:password])
+      $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 successfully'
+        redirect_to root_path,
+          notice: 'Sign in successfully'
       else
-        redirect_to sessions_new_path, notice: 'User or password error'
+        redirect_to sessions_new_path,
+          notice: 'User or password error'
       end
     else
       redirect_to sessions_new_path
@@ -20,7 +22,7 @@ class UsersController < ApplicationController
 
   def new
     redirect_to root_path unless session[:user_id].nil?
-    $user.nil? ? @user = User.new : @user = $user
+    @user = $user unless $user.nil?
     $user = nil
   end
 end

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

@@ -7,25 +7,25 @@
   = link_to 'Linked_in', '/auth/linked_in' unless @init_linkedin.nil?
 %h1 Sign in
 %p Put you information to login
-= form_for @user do |f|
+= form_tag users_path, method: 'POST' do |f|
   %table{width: '25%'}
     %tr
       %td
-        = f.label :email, 'You user email'
+        = label_tag :email, 'You user email'
       %td
-        = f.text_field :email
+        = text_field_tag :email
     %tr
       %td
-        = f.label :password
+        = label_tag :password, 'Password'
       %td
-        = f.password_field :password
+        = password_field_tag :password
     %tr
       %td
-        = f.label :password_confirmation
+        = label_tag :password_confirmation, 'Password Confirmation'
       %td
-        = f.password_field :password_confirmation
+        = password_field_tag :password_confirmation
     %tr
       %td
-        = f.submit 'Sign in'
+        = submit_tag 'Sign in'
       %td
-        = f.submit 'Cancel'
+        = submit_tag 'Cancel'

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

@@ -1,6 +1,7 @@
 .session-message
-  - @user.errors.full_messages.each do |message|
-    #{message}
+  - unless @user.nil?
+    - @user.errors.full_messages.each do |message|
+      #{message}
     %br
   = flash[:notice] unless flash[:notice].nil?
 %h1 Sign up

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

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

data/lib/generators/binstall/binstall_generator.rb

@@ -25,19 +25,7 @@ class BinstallGenerator < Rails::Generators::Base
     create_file 'app/notifier/mail_method.html.rb'
   end
 
-  def load_login_method
-    inject_into_file 'app/helpers/application_helper.rb', after: 'module ApplicationHelper' do
-      "\n def is_login!
-    if session[:user_id].nil?
-      redirect_to sessions_new_path, notice: 'You need login to load this section'
-    elsif $current_user.nil?
-        $current_user = User.find_by_id(session[:user_id])
-    end
-  end"
-    end
-  end
-
-  def load_initial_link_ban
+  def load_initial_necessary
     inject_into_file 'app/controllers/application_controller.rb', after: 'protect_from_forgery with: :exception' do
       "\n  before_filter :load_initial\n
   def load_initial
@@ -45,6 +33,13 @@ class BinstallGenerator < Rails::Generators::Base
     @init_github   = nil
     @init_facebook = nil
     @init_linkedin = nil
+  end\n
+  def is_login!
+    if session[:user_id].nil?
+      redirect_to sessions_new_path, notice: 'You need login to load this section'
+    elsif $current_user.nil?
+        $current_user = User.find_by_id(session[:user_id])
+    end
   end"
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: basic-initial-rails4
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails