ecm_user_area2 1.2.6 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9635e24f9a824653acf3610b2f42cf217bdaa386
-  data.tar.gz: 76ae0d36bd4fa4910c2c7a5d5d36784665760009
+  metadata.gz: f680be0d329033f349f7baf5a8ee7964642113a6
+  data.tar.gz: 80970f703a0fe7d61c2603f3afd52d48be9f0204
 SHA512:
-  metadata.gz: dbec2012fa3c19cfc12c4e22fb7c60d9108fb2a9a17d628a1b3272a982c00a33d8906ee0d8a42bc7c9fca84ff701a2c2e5317d0e5900d1d4c985db5739d23b10
-  data.tar.gz: b3e61cc87beac95f27fcee2325e3019f6eef8bba69448c78917a6c0b6578978a34dab051e79db42316adec0c6bccd4b389d12d8b06c26b101fb0c40a110c3c9c
+  metadata.gz: 29f98b6c1da172a227e8d4571f51e76356439402de0a998424ec20f2c49af3ea832512a511b507da1a923875293fd015b6fc93ff2c50e73100c2d7c524b0edf6
+  data.tar.gz: 6e26326247001a0c22cff3dc50677450e481ce398a7c1838dc13a2c038977c39c8d5f6799545dcf7c4969073dcdf34fe25df2612fc96e01b4641bd635781d809

data/app/concerns/controller/current_user_concern.rb

@@ -23,7 +23,7 @@ module Controller
 
     def current_user_session
       return @current_user_session if defined?(@current_user_session)
-      @current_user_session = Ecm::UserArea::UserSession.find
+      @current_user_session = ::Ecm::UserArea::UserSession.find
     end
 
     def current_user

data/app/controllers/ecm/user_area/sessions/base_controller.rb

@@ -42,14 +42,14 @@ module Ecm::UserArea
     private
 
     def after_sign_in_url
-      defined?(super) ? super : "/#{I18n.locale}"
+      defined?(super) ? super : main_app.root_path
     end
 
     def permitted_params
       if Rails.version < '5'
         params.require(resource_class.name.demodulize.underscore.tr('/', '_')).permit(:email, :password)
       else
-        params.require(resource_class.name.demodulize.underscore.tr('/', '_')).permit(:email, :password).to_hash
+        params.require(resource_class.name.demodulize.underscore.tr('/', '_')).permit(:email, :password).to_h
       end
     end
   end

data/app/models/ecm/user_area/user.rb

@@ -4,8 +4,8 @@ module Ecm::UserArea
   class User < ActiveRecord::Base
     acts_as_authentic &Ecm::UserArea::Configuration.acts_as_authentic_options
 
-    scope :autocomplete, ->(matcher) { where("LOWER(email) LIKE ?", "%#{matcher.downcase}%") }
-
+    scope :autocomplete,  ->(matcher) { where("LOWER(email) LIKE ?", "%#{matcher.downcase}%") }
+    scope :authenticable, -> { where(active: true, confirmed: true, approved: true) }
     # def self.current_id=(id)
     #   Thread.current[:user_id] = id
     # end
@@ -27,6 +27,10 @@ module Ecm::UserArea
       end
     end
 
+    def authenticable?
+      [active, confirmed, approved].all?
+    end
+
     def human
       email
     end

data/lib/ecm/user_area/spec_helpers/feature.rb

@@ -0,0 +1,32 @@
+module Ecm::UserArea
+  module SpecHelpers
+    module Feature
+      def sign_up(user_attributes)
+        visit "/#{I18n.locale}/auth/user/new"
+
+        within('#new_user') do
+          fill_in 'user[email]',                 with: user_attributes[:email]
+          fill_in 'user[password]',              with: user_attributes[:password]
+          fill_in 'user[password_confirmation]', with: user_attributes[:password]
+
+          click_on I18n.t('helpers.submit.user.create')
+        end
+      end
+
+      def sign_in(user)
+        visit "/#{I18n.locale}/auth/user_session/new"
+
+        within('#new_user_session') do
+          fill_in 'user_session[email]',    with: user.email
+          fill_in 'user_session[password]', with: user.password
+
+          click_on I18n.t('helpers.submit.user_session.create')
+        end
+        # puts page.body
+        # expect(page.status_code).to eq(200)
+        # expect(current_path).to     eq("/#{I18n.locale}/backend")
+        # expect(page.body).to        have_text(I18n.t('messages.success.ecm_user_area.signed_in'))
+      end
+    end
+  end
+end

data/lib/ecm/user_area/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module UserArea
-    VERSION = '1.2.6'
+    VERSION = '1.2.8'
   end
 end

data/lib/generators/ecm/user_area/install/templates/initializer.rb

@@ -33,7 +33,7 @@ Ecm::UserArea.configure do |config|
   #            config.login_field = :email
   #          end
   #          
-  config.acts_as_authentic_options = ->(c) do
+  config.acts_as_authentic_options = lambda do |c|
     c.crypto_provider = Authlogic::CryptoProviders::BCrypt
     c.login_field     = :email
     # How paranoid are you?

data/spec/factories/ecm/user_area/users.rb

@@ -3,7 +3,13 @@
 FactoryGirl.define do
   factory :ecm_user_area_user, class: 'Ecm::UserArea::User' do
     sequence(:email) { |n| "user#{n}@example.com" }
-    password 'password'
+    password              'password'
     password_confirmation 'password'
+
+    trait :authenticable do
+      active    true
+      confirmed true
+      approved  true
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_user_area2
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.8
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -449,7 +449,7 @@ files:
 - db/migrate/20160115181043_create_ecm_user_area_users.rb
 - lib/ecm/user_area/configuration.rb
 - lib/ecm/user_area/engine.rb
-- lib/ecm/user_area/spec_helper.rb
+- lib/ecm/user_area/spec_helpers/feature.rb
 - lib/ecm/user_area/version.rb
 - lib/ecm_user_area2.rb
 - lib/generators/ecm/user_area/install/install_generator.rb

data/lib/ecm/user_area/spec_helper.rb

@@ -1,24 +0,0 @@
-module Ecm::UserArea
-  module SpecHelper
-    def sign_up(user_attributes)
-      visit '/de/auth/user/new'
-
-      within('#new_user') do
-        fill_in 'user[email]',                 with: user_attributes[:email]
-        fill_in 'user[password]',              with: user_attributes[:password]
-        fill_in 'user[password_confirmation]', with: user_attributes[:password]
-        click_on submit(:user, :create)
-      end
-    end
-
-    def sign_in(user)
-      visit '/de/auth/user_session/new'
-
-      within('#new_user_session') do
-        fill_in 'user_session[email]', with: user.email
-        fill_in 'user_session[password]', with: 'password'
-        click_on submit(:user_session, :create)
-      end
-    end
-  end
-end