basic-initial-rails4 1.0.0 → 1.1.0

data/app/controllers/session_user.rb

@@ -1,3 +1,3 @@
-class Sessionuser
+class SessionUser
   attr_accessor :provider, :name, :screen_name, :followers, :friends
 end

data/app/controllers/sessions_controller.rb

@@ -1,41 +1,23 @@
 class SessionsController < ApplicationController
   require 'session_user'
-  skip_before_action :is_login!, only: [:create, :new]
 
   def new
-    if $user.nil?
-      @user = User.new
-    else
-      @user = $user
-    end
+    redirect_to root_path unless session[:user_id].nil?
+    $user.nil? ? @user = User.new : @user = $user
     $user = nil
   end
 
   def create
     if params[:commit] === 'Sign up'
-      user = User.create(user_params)
-      if user.save
-        session[:user_id] = user.id
+      $user = User.create(user_params)
+      if $user.save
+        session[:user_id] = $user.id
         redirect_to root_path
       else
-        $user = user
         redirect_to new_user_path
       end
-    elsif request.env['omniauth.auth'].nil?
-      redirect_to new_user_path
     else
-      $current_user = Sessionuser.new
-      $current_user.provider = params['provider']
-      session[:user_id] = request.env['omniauth.auth']['extra']['raw_info']['id']
-      $current_user.name = request.env['omniauth.auth']['extra']['raw_info']['name']
-      if $current_user.provider === 'twitter'
-        $current_user.screen_name = request.env['omniauth.auth']['extra']['raw_info']['screen_name']
-        $current_user.followers = request.env['omniauth.auth']['extra']['raw_info']['followers_count']
-        $current_user.friends = request.env['omniauth.auth']['extra']['raw_info']['friends_count']
-      elsif $current_user.provider === 'github'
-        $current_user.screen_name = request.env['omniauth.auth']['extra']['raw_info']['login']
-      end
-      redirect_to root_path
+      request.env['omniauth.auth'].nil? ? (redirect_to new_user_path) : set_omniauth_user
     end
   end
 
@@ -47,6 +29,23 @@ class SessionsController < ApplicationController
 
   def failure
   end
+  
+  private
+
+  def set_omniauth_user
+    $current_user = SessionUser.new
+    $current_user.provider = params['provider']
+    session[:user_id] = request.env['omniauth.auth']['extra']['raw_info']['id']
+    $current_user.name = request.env['omniauth.auth']['extra']['raw_info']['name']
+    if $current_user.provider === 'twitter'
+      $current_user.screen_name = request.env['omniauth.auth']['extra']['raw_info']['screen_name']
+      $current_user.followers = request.env['omniauth.auth']['extra']['raw_info']['followers_count']
+      $current_user.friends = request.env['omniauth.auth']['extra']['raw_info']['friends_count']
+    elsif $current_user.provider === 'github'
+      $current_user.screen_name = request.env['omniauth.auth']['extra']['raw_info']['login']
+    end
+    redirect_to root_path
+  end
 
   def user_params
     params.permit(:name, :email, :password, :password_confirmation)

data/app/controllers/users_controller.rb

@@ -22,11 +22,8 @@ class UsersController < ApplicationController
   end
 
   def new
-    if $user.nil?
-      @user = User.new
-    else
-      @user = $user
-    end
+    redirect_to root_path unless session[:user_id].nil?
+    $user.nil? ? @user = User.new : @user = $user
     $user = nil
   end
 end

data/app/models/user.rb

@@ -1,11 +1,11 @@
 class User < ActiveRecord::Base
   has_secure_password
-  validates_presence_of :name
-  validates_presence_of :email
+  validates_presence_of   :name
+  validates_presence_of   :email
   validates_uniqueness_of :name
   validates_uniqueness_of :email
-  validates_length_of :name, minimum: 5, maximum: 18
-  validates_length_of :password, minimum: 8, maximum: 24
-  validates_format_of :email, with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i,on: :create
-  validates_format_of :name, with: /[a-zA-Z]/
+  validates_length_of     :name,     minimum: 5, maximum: 18
+  validates_length_of     :password, minimum: 8, maximum: 24
+  validates_format_of     :email,    with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i,on: :create
+  validates_format_of     :name,     with: /[a-zA-Z]/
 end

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

@@ -1,10 +1,12 @@
 - if session[:user_id].nil?
-  = link_to 'Twitter', '/auth/twitter'
-  = link_to 'Github', '/auth/github'
+  = link_to 'Twitter', '/auth/twitter'     unless @init_twitter.nil?
+  = link_to 'Github', '/auth/github'       unless @init_github.nil?
+  = link_to 'Facebook', '/auth/facebook'   unless @init_facebook.nil?
+  = 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|
-  %table{width: '100%'}
+  %table{width: '25%'}
     %tr
       %td
         = f.label :email, 'You user email'

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

@@ -1,3 +1 @@
-%h1
-  - unless $current_user.nil?
-    = "Welcome #{$current_user.name}"
+%h1 jols

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

@@ -1,29 +1,29 @@
 %h1 Sign up
-  %p put information to complete your register
-  = form_tag sessions_new_path, method: "POST" do |f|
-    %table{width: "100%"}
-      %tr
-        %td
-          = label_tag :name, "You user name"
-        %td
-          = text_field_tag :name
-      %tr
-        %td
-          = label_tag :email, "You user email"
-        %td
-          = text_field_tag :email
-      %tr
-        %td
-          = label_tag :password
-        %td
-          = password_field_tag :password
-      %tr
-        %td
-          = label_tag :password_confirmation
-        %td
-          = password_field_tag :password_confirmation
-      %tr
-        %td
-          = submit_tag "Sign up"
-        %td
-          = submit_tag "Cancel"
+%p put information to complete your register
+= form_tag sessions_new_path, method: "POST" do |f|
+  %table{width: "25%"}
+    %tr
+      %td
+        = label_tag :name, "You user name"
+      %td
+        = text_field_tag :name
+    %tr
+      %td
+        = label_tag :email, "You user email"
+      %td
+        = text_field_tag :email
+    %tr
+      %td
+        = label_tag :password
+      %td
+        = password_field_tag :password
+    %tr
+      %td
+        = label_tag :password_confirmation
+      %td
+        = password_field_tag :password_confirmation
+    %tr
+      %td
+        = submit_tag "Sign up"
+      %td
+        = submit_tag "Cancel"

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

@@ -1,7 +1,7 @@
 module Basic
   module Initial
     module Rails4
-      VERSION = "1.0.0"
+      VERSION = "1.1.0"
     end
   end
 end

data/lib/generators/binstall/binstall_generator.rb

@@ -29,19 +29,28 @@ class BinstallGenerator < Rails::Generators::Base
     inject_into_file 'app/helpers/application_helper.rb', after: 'module ApplicationHelper' do
       "\n def is_login!\n
     if session[:user_id].nil?
-      flash[:notice] = 'You need login to load this section'
-      redirect_to sessions_new_path
-    else
-      if $current_user.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
   end
 
+  def load_initial_link_ban
+    inject_into_file 'app/controllers/application_controller.rb', after: 'protect_from_forgery with: :exception' do
+      "\n  before_filter :load_initial
+  def load_initial
+    @init_twitter  = nil
+    @init_github   = nil
+    @init_facebook = nil
+    @init_linkedin = nil
+  end"
+    end
+  end
+
   def load_routes
-    inject_into_file 'config/routes.rb', after: 'do' do
+    inject_into_file 'config/routes.rb', after: 'Application.routes.draw do' do
       "\n  get 'sessions/new'
   post 'sessions/new', to: 'sessions#create'
   get 'sessions/destroy', to: 'sessions#logout'
@@ -51,8 +60,4 @@ class BinstallGenerator < Rails::Generators::Base
   get '/auth/failure', to: 'sessions#failure'"
     end
   end
-
-  def copy_application_layout
-    copy_file 'layouts/application.html.haml', 'app/views/layouts/application.html.haml'
-  end
 end

metadata

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