honey-auth 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDNlNTg4ODU3OTMzNTEzOGExM2U2OGU0ZmFhM2Q0NzkxOGJlNjI2OQ==
+  data.tar.gz: !binary |-
+    YjQ0M2RlMWNhZDU4MjY4MWIxYzdhNmVkZjBhNTEyODY0NzQ0MzJmZA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MDFmYTBjY2QzZGJkZTg5NGM3ZjQ4MDliNWVlNGY5ZjRlMTNlODdhNWFmNWMy
+    NmUzMDJhOGMyYzc2ZDQ0YmM5NmZmOGE1ZjA4YTJiMmY4OTk4MTQwNDQ3MWVk
+    NjhjY2MyYzY1MjdiMjZlN2FkYWU3Mzk2NjJmZTU4NmNlY2UyYTE=
+  data.tar.gz: !binary |-
+    YWRjNmI4MmVmNjBjZGFjM2Y4YmY0MmM0NGM3ODYwYWUxODBjZmU4YTEwNGU5
+    ZmE0OTA2OTQxYTVkNjc1ZGYxMTQxMGZjNWZiM2Y5OTk1ZmY5YjFiNWFiMjkw
+    OGIzNzhjNjVhN2MzNmJkZWRlZjk5ZTZhYTYyNjZmYzJmNjVmNDM=

data/lib/generators/honey_auth/init_generator.rb

@@ -1,4 +1,4 @@
-require 'rails/generators/active_record/migration'
+require 'rails/generators/active_record'
 require 'generators/honey_auth/base'
 
 module HoneyAuth
@@ -6,12 +6,23 @@ module HoneyAuth
 
     class Init < Base
       include Rails::Generators::Migration
-      extend ActiveRecord::Generators::Migration
       source_root File.expand_path('../templates', __FILE__)
 
       def create_migration_file
-        template 'user_model.rb', 'app/models/user.rb'
         migration_template 'user_migration.rb', 'db/migrate/create_users'
+        template 'user_model.rb', 'app/models/user.rb'
+        template 'accounts_controller.rb', 'app/controllers/accounts_controller.rb'
+        template 'sessions_controller.rb', 'app/controllers/sessions_controller.rb'
+        directory 'views/sessions', 'app/views/sessions'
+        directory 'views/accounts', 'app/views/accounts'
+
+        inject_into_file 'app/controllers/application_controller.rb', before: 'end' do
+          '  include Authentication' << "\n"
+        end
+      end
+
+      def self.next_migration_number(dirname)
+        ActiveRecord::Generators::Base.next_migration_number(dirname)
       end
     end
 

data/{app/controllers → lib/generators/honey_auth/templates}/accounts_controller.rb

@@ -1,12 +1,12 @@
 class AccountsController < ApplicationController
-  before_filter :signed_in?, only: [:edit, :update]
+  before_filter :signed_in!, only: [:edit, :update]
 
   def new
     @user = User.new
   end
 
   def create
-    @user = User.new(params[:user])
+    @user = User.new(user_params)
 
     if @user.save
       sign_in @user
@@ -17,12 +17,12 @@ class AccountsController < ApplicationController
   end
 
   def update
-    params[:user].delete(:password) unless params[:user][:password].present?
+    user_params.delete(:password) unless user_params[:password].present?
     @user = current_user
-    @user.attributes = params[:user]
+    @user.attributes = user_params
 
     if @user.save
-      redirect_to updated_account_path
+      redirect_to root_path
     else
       render 'accounts/edit'
     end
@@ -31,4 +31,10 @@ class AccountsController < ApplicationController
   def edit
     @user = current_user
   end
+
+protected
+
+  def user_params
+    params.require(:user).permit(:classcode, :email, :name, :username, :password, :password_confirmation)
+  end
 end

data/{app/controllers → lib/generators/honey_auth/templates}/sessions_controller.rb

@@ -1,5 +1,5 @@
 class SessionsController < ApplicationController
-  before_filter :signed_in?, only: [:destroy]
+  before_filter :signed_in!, only: [:destroy]
 
   def create
     if @user = User.find_by_email(params[:user][:email]).try(:authenticate, params[:user][:password])
@@ -7,7 +7,7 @@ class SessionsController < ApplicationController
       redirect_to signed_in_path(:signed_in)
     else
       @user = User.new
-      flash[:error] = 'bad email/password combination'
+      flash[:error] = 'Incorrect email or password'
       render :new
     end
   end

data/lib/generators/honey_auth/templates/user_model.rb

@@ -1,8 +1,8 @@
 class User < ActiveRecord::Base
   has_secure_password
-  attr_accessible :email, :name, :password, :password_confirmation
   validates :email, presence: true
   validates_uniqueness_of :email, case_sensitive: false, allow_nil: true
-  ROLES = %w(user admin)
+  ROLES      = %w(user admin)
+  SAFE_ROLES = %w(user)
   include HoneyAuth::Roles
 end

data/{app/views/accounts/edit.html.haml → lib/generators/honey_auth/templates/views/accounts/edit.html.slim}

@@ -1,5 +1,5 @@
-%article.edit-account-page
-  %h4 Edit your account
+article.edit-account-page
+  h3 Edit your account
 
   = form_for @user, url: account_path do |f|
     = f.string :name

data/{app/views/accounts/new.html.haml → lib/generators/honey_auth/templates/views/accounts/new.html.slim}

@@ -1,9 +1,9 @@
-%article.new-account-page
-  %h4 Create your account
+article.new-account-page
+  h3 Sign up for an account
 
   = form_for @user, url: account_path do |f|
     = f.string :name
     = f.email :email
     = f.password :password
     = f.password :password_confirmation
-    = f.actions save: 'Save'
+    = f.actions save: 'Sign up'

data/{app/views/sessions/new.html.haml → lib/generators/honey_auth/templates/views/sessions/new.html.slim}

@@ -1,5 +1,5 @@
-%article.new-session-page
-  %h4 Sign in to your account
+article.new-session-page
+  h3 Sign in to your account
 
   = form_for @user, url: session_path do |f|
     = f.email :email, placeholder: 'Email'

data/lib/honey_auth/engine.rb

@@ -1,3 +1,5 @@
+require 'bcrypt'
+
 module HoneyAuth
   class Engine < ::Rails::Engine
     # stubbed for assets.. ?

data/lib/honey_auth/roles.rb

@@ -5,6 +5,18 @@ module HoneyAuth::Roles
 
   def role= role
     remove_instance_variable :@role_inquirer if defined?(@role_inquirer)
-    super
+    safe_role_assignment role
+  end
+
+  def safe_role_assignment role
+    self[:role] = if sanitized_role = SAFE_ROLES.find{ |r| r == role.strip }
+      sanitized_role
+    else
+      'user'
+    end
+  end
+
+  def assign_reserved_role role
+    self[:role] = role
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honey-auth
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Quinn Shanahan
@@ -13,26 +12,32 @@ date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70154157660380 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70154157660380
-- !ruby/object:Gem::Dependency
-  name: bcrypt-ruby
-  requirement: &70154157659900 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bcrypt-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70154157659900
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: Very basic auth generator
 email: q.shanahan@gmail.com
 executables: []
@@ -42,40 +47,40 @@ files:
 - lib/authentication.rb
 - lib/generators/honey_auth/base.rb
 - lib/generators/honey_auth/init_generator.rb
+- lib/generators/honey_auth/templates/accounts_controller.rb
+- lib/generators/honey_auth/templates/sessions_controller.rb
 - lib/generators/honey_auth/templates/user_migration.rb
 - lib/generators/honey_auth/templates/user_model.rb
+- lib/generators/honey_auth/templates/views/accounts/edit.html.slim
+- lib/generators/honey_auth/templates/views/accounts/new.html.slim
+- lib/generators/honey_auth/templates/views/sessions/new.html.slim
 - lib/honey-auth.rb
 - lib/honey_auth/engine.rb
 - lib/honey_auth/roles.rb
 - lib/honey_auth/routes.rb
 - lib/honey_auth.rb
-- app/controllers/accounts_controller.rb
-- app/controllers/sessions_controller.rb
-- app/views/accounts/edit.html.haml
-- app/views/accounts/new.html.haml
-- app/views/sessions/new.html.haml
 homepage: https://github.com/honeyco/honey-auth
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Auth
 test_files: []
+has_rdoc: