current_me 0.0.2 → 0.0.3

data/README.md

@@ -20,22 +20,19 @@ Or install it yourself as:
 
 ### Controllers
 
-* When signing, use the `me=`
+* When signing, use the `sign_in`
 
-        self.me = user
+        sign_in user
+(※`user` needs to be a user model)
 
 * To Transition to designated page if a user isn't signed in, use the `me!`
 
         me! signin_path
 
-* When redirect to the source before `me!`, use the `come_from`
-
-        redirect_to come_from
-
-* When signing out, use the `bye`
+* When signing out, use the `sign_out`
 
         def destroy
-          bye
+          sign_out
           redirect_to :root
         end
 

data/lib/current_me.rb

@@ -21,11 +21,11 @@ module CurrentMe
   end
 
   def me!(url)
-    unless me?
-      session[:come_from] = request.fullpath
+    redirect_to url unless me?
+  end
 
-      redirect_to url
-    end
+  def sign_in(user)
+    self.me = user
   end
 
   def me=(user)
@@ -35,11 +35,7 @@ module CurrentMe
     @me = user
   end
 
-  def bye
+  def sign_out
     self.me = nil
   end
-
-  def come_from
-    session[:come_from]
-  end
 end

data/lib/current_me/version.rb

@@ -1,3 +1,3 @@
 module CurrentMe
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,10 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
+
+  private
+
+  def authenticate!
+    session[:origin] = request.fullpath
+    me! root_url
+  end
 end

data/spec/dummy/app/controllers/rooms_controller.rb

@@ -1,7 +1,5 @@
 class RoomsController < ApplicationController
-  before_filter do |c|
-    c.me!(root_url)
-  end
+  before_filter :authenticate!
 
   def index
   end

data/spec/dummy/app/controllers/sessions_controller.rb

@@ -3,17 +3,18 @@ class SessionsController < ApplicationController
   end
 
   def create
+    origin = session[:origin]
     user = User.find_by_name(params[:name])
     if user
-      self.me =  user
-      redirect_to come_from || user
+      sign_in user
+      redirect_to origin || user
     else
       render 'new'
     end
   end
 
   def destroy
-    bye
+    sign_out
     redirect_to root_path
   end
 end

data/spec/dummy/spec/controllers/rooms_controller_spec.rb

@@ -9,7 +9,7 @@ describe RoomsController do
 
     context 'ログインしている場合' do
       before {
-        controller.me = user
+        controller.sign_in user
         get :index
       }
 

data/spec/dummy/spec/controllers/sessions_controller_spec.rb

@@ -6,7 +6,7 @@ describe SessionsController do
 
   describe 'destroy' do
     before {
-      controller.me = user
+      controller.sign_in user
       delete :destroy, {id: user.id}
     }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: current_me
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport