push_type_auth 0.1.0.beta3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4d0ac63e4364dc81c5ca5f43e91896a98029412
-  data.tar.gz: 1b22b6669ddbaed95349617e20daa535cd46d244
+  metadata.gz: dd94702289922c6faf9dbfb00b87173b17362142
+  data.tar.gz: 4f1229a7a6b70251af11675f5991651f49775502
 SHA512:
-  metadata.gz: d35519357662c302b2965d2aae596db51af64edc6147254435bb15cf8b9238f54ae990e29b9d202d832f572ba620f424b3f096aa554146dd3e9e8be1044d3098
-  data.tar.gz: 83426ec1e05d47a5911aa38cdda64c53f164aa1f9af219ad014263ea4507b0a787a8788e94108e86281d9e1d78282a87772e97c3007bc9b8dbf88c0c708e4351
+  metadata.gz: d7f4c5f59e517df9648ac03ff8d13a7e9c0d80a3fdb4b8ac2c20ba5ea18f077c91efa9fbd5b155a9712fa80812f338acf3086aae21836f4fd76654e1f2c4098d
+  data.tar.gz: 64d4908776dc990a7d76d6844f0ab9953992a926310b5dfe1dc3d8bce2ecdd9e89fc6c7c3463db1ab24f8e1e3c0556d507d14428879ff351eca50bb848a3440f

data/app/controllers/push_type/profiles_controller.rb

@@ -0,0 +1,50 @@
+require_dependency "push_type/admin_controller"
+
+module PushType
+  class ProfilesController < AdminController
+
+    before_filter :load_user
+
+    def edit
+    end
+
+    def update
+      if update_user profile_params
+        flash[:notice] = 'Profile successfully updated.'
+        sign_in @user, bypass: true
+        redirect_to push_type.edit_profile_path
+      else
+        render 'edit'
+      end
+    end
+
+    private
+
+    def initial_breadcrumb
+      breadcrumbs.add 'Profile', push_type.edit_profile_path
+    end
+
+    def load_user
+      @user = current_user
+    end
+
+    def update_user(user_params)
+      if password_required?
+        @user.update_with_password user_params
+      else
+        user_params.delete :current_password
+        @user.update_without_password user_params
+      end
+    end
+
+    def password_required?
+      profile_params[:password].present? || profile_params[:password_confirmation].present?
+    end
+
+    def profile_params
+      fields = [:name, :email, :current_password, :password, :password_confirmation] + @user.fields.keys
+      params.fetch(:user, {}).permit(*fields)
+    end
+
+  end
+end

data/app/views/push_type/profiles/edit.html.haml

@@ -0,0 +1,46 @@
+- title 'Profile'
+
+.medium-4.columns
+  .side-panel{ :'side-panel' => true }
+    %ul.side-nav
+      %li.heading Settings
+      %li= link_to 'Profile', push_type.edit_profile_path
+
+
+.medium-8.columns
+  = form_for @user, url: push_type.profile_path do |f|
+    .container
+      .head
+        .title= yield :title
+      .body.padded
+        .row.title
+          .columns
+            = f.label :name
+            = f.text_field :name
+        .row.email
+          .columns
+            = f.label :email
+            = f.email_field :email
+
+        %div{ ng: { init: "showPasswordFields=#{ !@user.errors.select { |a, e| !e.empty? }.empty? }" } }
+          .row{ ng: { hide: 'showPasswordFields' } }
+            .columns
+              %a.button.secondary.tiny.radius{ ng: { click: 'showPasswordFields=true' } }= ficon :lock, 'Change password'
+          .row.password{ ng: { show: 'showPasswordFields' } }
+            .small-4.columns
+              = f.label :current_password
+              = f.password_field :current_password
+            .small-4.columns
+              = f.label :password, 'New password'
+              = f.password_field :password
+            .small-4.columns
+              = f.label :password_confirmation, 'Confirm new password'
+              = f.password_field :password_confirmation
+
+        .row.custom-fields
+          - @user.fields.each do |key, field|
+            = render_custom_field field, f
+
+        .row.submit.text-center
+          %button.button.radius= ficon :check, 'Update profile'
+            

data/config/routes.rb

@@ -6,4 +6,6 @@ PushType::Core::Engine.routes.draw do
   resources :users, only: [] do
     patch :invite, on: :member
   end
+
+  resource :profile, only: [:edit, :update]
 end

data/lib/push_type/auth/engine.rb

@@ -15,7 +15,6 @@ module PushType
         PushType::AdminController.send :include, PushType::AuthenticationMethods
         PushType::UsersController.send :include, PushType::InvitationMethods
         DeviseController.helper PushType::AdminHelper
-        DeviseController.helper PushType::AuthHelper
       end
     end
   end

data/lib/tasks/push_type_tasks.rake

@@ -1,4 +1,26 @@
-# desc "Explaining what the task does"
-# task :push_type do
-#   # Task goes here
-# end
+require 'highline/import'
+
+namespace :push_type do
+  desc 'Create confirmed and authenticated user account'
+  task create_user: :environment do
+    say 'Creating user. Please answer questions...'
+
+    user = PushType::User.new({
+      name:         ask("Full name:\t"),
+      email:        ask("Email address:\t"),
+      password:     ask("Password:\t") { |q| q.echo = '*' },
+
+      confirmation_sent_at: Time.zone.now,
+      confirmed_at:         Time.zone.now,
+      confirmation_token:   'Generated account'
+    })
+
+    if user.save
+      say 'User successfully created'
+    else
+      say 'Error:'
+      user.errors.full_messages.each { |e| say "\t#{e}" }
+      say 'Please try again...'
+    end
+  end
+end

data/test/controllers/concerns/push_type/authentication_methods_test.rb

@@ -0,0 +1,15 @@
+require "test_helper"
+
+module PushType
+  describe AuthenticationMethods do
+
+    subject { PushType::AdminController.new }
+    let :before_filters do
+      subject._process_action_callbacks.find_all { |x| x.kind == :before }.map(&:filter)
+    end
+
+    it { subject.methods.include?(:authenticate_user!).must_equal true }
+    it { before_filters.include?(:authenticate_user!).must_equal true }
+
+  end
+end

data/test/controllers/concerns/push_type/invitation_methods_test.rb

@@ -0,0 +1,11 @@
+require "test_helper"
+
+module PushType
+  describe InvitationMethods do
+
+    subject { PushType::UsersController.new }
+
+    it { subject.methods.include?(:invite).must_equal true }
+
+  end
+end

data/test/controllers/push_type/profiles_controller_test.rb

@@ -0,0 +1,33 @@
+require "test_helper"
+
+module PushType
+  describe ProfilesController do
+    
+    let(:current_user) { FactoryGirl.create(:confirmed_user) }
+    before { sign_in current_user }
+
+    describe 'GET #edit' do
+      before { get :edit }
+      it { response.must_render_template 'edit' }
+      it { assigns[:user].must_equal current_user }
+    end
+
+    describe 'PUT #update' do
+      before { put :update, user: { name: new_name } }
+
+      describe 'with invalid user' do
+        let(:new_name) { '' }
+        it { assigns[:user].errors.wont_be_empty }
+        it { response.must_render_template :edit }
+      end
+
+      describe 'with valid user' do
+        let(:new_name) { 'Test user ABC' }
+        it { current_user.reload.name.must_equal new_name }
+        it { flash[:notice].must_be :present? }
+        it { response.must_redirect_to edit_profile_path }
+      end
+    end
+
+  end
+end

data/test/controllers/push_type/users_controller_test.rb

@@ -0,0 +1,24 @@
+require "test_helper"
+
+module PushType
+  describe UsersController do
+
+    let(:current_user) { FactoryGirl.create(:confirmed_user) }
+    let(:user) { FactoryGirl.create :user }
+    before { sign_in current_user }
+
+    let(:last_email) { ActionMailer::Base.deliveries.last }
+    
+    describe 'PUT #invite' do
+      let(:referer) { '/push_type/users' }
+      before do
+        @request.env["HTTP_REFERER"] = referer
+        put :invite, id: user.id
+      end
+      it { response.must_redirect_to referer }
+      it { last_email.to.must_include user.email }
+      it { last_email.subject.must_equal 'Confirmation instructions' }
+    end
+
+  end
+end

data/test/dummy/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: 6b92627318c6c9edc55e42e507174c46e422808fd9b20fef335577d6abe8f8900222d439c32e1e40faaf530996551e5d24458d149aefa98856b21c6c94308637
+  secret_key_base: b82ba266443adac53a52bc59a1903bcfe5b7cd2e69d38ae378bebc5cdb6ebdeddf692631ad071598f89bb06686a31e358c05bfc26a3c8bfa20826d018ddf1b05
 
 test:
-  secret_key_base: 804d476511c7e025b9273e4d6ba3924abc65760dd72f05bb9828f34831c8c1c55360f45c5e8bbf603c0dc1ffe4e50b450cab980f24674516cd847cf973d08a00
+  secret_key_base: 206d2a0a52ed90dab80e01d2a031c099e0fe5d12bc6ed6f3c2af435ff5e89349fa6f8615fc23b5ca953c2efe877254fae32b660b5b149823976caa01bda5d2ae
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20141205213537) do
+ActiveRecord::Schema.define(version: 20150102204447) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"