monban 0.0.3 → 0.0.4

data/CHANGELOG.rdoc

@@ -1,4 +1,8 @@
-== 0.3.0
+== 0.0.4
+* Cleaned up generated controllers
+* Use find_by_id instead of find so invalid sessions don't cause apps to crash
+* Hashes passed in are no longer mutated via delete
 
-* Fixed bug where password wasn't deleted from session params which would
-cause lookup to fail
+== 0.0.3
+
+* Fixed bug where password wasn't deleted from session params which would cause lookup to fail

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    monban (0.0.1)
+    monban (0.0.3)
       bcrypt-ruby
       rails
       warden
@@ -144,6 +144,7 @@ DEPENDENCIES
   capybara
   monban!
   pry
+  rake
   rspec
   rspec-rails
   sqlite3

data/README.md

@@ -1,5 +1,9 @@
 # Monban 門番
 
+[![Build Status](https://travis-ci.org/halogenandtoast/monban.png?branch=master)](https://travis-ci.org/halogenandtoast/monban)
+[![Code Climate](https://codeclimate.com/github/halogenandtoast/monban.png)](https://codeclimate.com/github/halogenandtoast/monban)
+
+
 Monban is designed to be very simple and extensible user authentication. It's goal is to give all the power to the developer instead of
 forcing them to make Monban work with their system
 

data/lib/generators/monban/templates/app/controllers/sessions_controller.rb

@@ -3,13 +3,9 @@ class SessionsController < ApplicationController
   end
 
   def create
-    if user = authenticate_session(session_params)
-      sign_in user
-      redirect_to root_path
-    else
-      flash.now.notice = "Invalid username or password"
-      render :new
-    end
+    user = authenticate_session(session_params)
+    sign_in(user) or set_flash_message
+    respond_with user, location: root_path
   end
 
   def destroy
@@ -19,6 +15,10 @@ class SessionsController < ApplicationController
 
   private
 
+  def set_flash_message
+    flash.now.notice = "Invalid username or password"
+  end
+
   def session_params
 <% if config[:use_strong_parameters] -%>
     params.require(:session).permit(:email, :password)

data/lib/generators/monban/templates/app/controllers/users_controller.rb

@@ -1,16 +1,14 @@
 class UsersController < ApplicationController
+  respond_to :html
+
   def new
     @user = User.new
   end
 
   def create
-    user = sign_up(user_params)
-    if sign_in(user)
-      redirect_to root_path
-    else
-      @user = user
-      render :new
-    end
+    @user = sign_up(user_params)
+    sign_in(@user)
+    respond_with @user, location: root_path
   end
 
   private

data/lib/monban/controller_helpers/sign_up.rb

@@ -1,9 +1,9 @@
 module Monban
   class SignUp
     def initialize user_params
-      unencrypted_token = user_params.delete(token_field)
+      unencrypted_token = user_params.slice(token_field)
       token_digest = Monban.encrypt_token(unencrypted_token)
-      @user_params = user_params.merge(token_store_field.to_sym => token_digest)
+      @user_params = user_params.except(token_field).merge(token_store_field.to_sym => token_digest)
     end
 
     def perform

data/lib/monban/controller_helpers.rb

@@ -25,8 +25,8 @@ module Monban
     end
 
     def authenticate_session session_params, field_map = nil
-      password = session_params.delete(Monban.config.user_token_field)
-      user = Monban.lookup(session_params, field_map)
+      password = session_params.fetch(Monban.config.user_token_field)
+      user = Monban.lookup(session_params.except(Monban.config.user_token_field), field_map)
       authenticate(user, password)
     end
 

data/lib/monban/version.rb

@@ -1,3 +1,3 @@
 module Monban
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/monban/warden_setup.rb

@@ -5,7 +5,7 @@ Warden::Manager.serialize_into_session do |user|
 end
 
 Warden::Manager.serialize_from_session do |id|
-  User.find(id)
+  User.find_by_id(id)
 end
 
 Warden::Strategies.add(:password_strategy, Monban::Strategies::PasswordStrategy)

data/monban.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'rails'
   gem.add_dependency 'bcrypt-ruby'
   gem.add_dependency 'warden'
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rspec-rails'
   gem.add_development_dependency 'capybara'

data/spec/monban/controller_helpers_spec.rb

@@ -68,14 +68,15 @@ module Monban
       user = double()
       authentication = double()
       authentication.should_receive(:perform).and_return(user)
-      Monban.should_receive(:lookup).with(session_params, field_map).and_return(user)
+      Monban.should_receive(:lookup).with(session_params.except('password'), field_map).and_return(user)
       Authentication.should_receive(:new).with(user, 'password').and_return(authentication)
       @dummy.authenticate_session(session_params, field_map).should == user
     end
 
     it 'returns false when it could not authenticate the user' do
       session_params = double()
-      session_params.should_receive(:delete).with('password').and_return('password')
+      session_params.should_receive(:fetch).with('password').and_return('password')
+      session_params.should_receive(:except).with('password').and_return(session_params)
       user = double()
       authentication = double()
       authentication.should_receive(:perform).and_return(false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monban
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -60,6 +60,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement