hello-rails 0.5.0 → 0.5.1

data/lib/hello/rails_active_record/access.rb

@@ -1,17 +1,19 @@
 module Hello
   module RailsActiveRecord
-    class Access < ::ActiveRecord::Base
-      self.table_name = 'accesses'
+    module Access
+      extend ActiveSupport::Concern
 
-      # ASSOCIATIONS
-      belongs_to :user, counter_cache: true, class_name: '::User'
+      included do
+        # ASSOCIATIONS
+        belongs_to :user, counter_cache: true
 
-      # VALIDATIONS
-      validates_presence_of :user, :expires_at, :user_agent_string, :token
-      validates_uniqueness_of :token
+        # VALIDATIONS
+        validates_presence_of :user, :expires_at, :user_agent_string, :token
+        validates_uniqueness_of :token
 
-      before_validation on: :create do
-        self.token = "#{user_id}-#{Hello::Encryptors::Simple.instance.single(16)}"
+        before_validation on: :create do
+          self.token = "#{user_id}-#{Hello::Encryptors::Simple.instance.single(16)}"
+        end
       end
 
       # CUSTOM METHODS
@@ -50,7 +52,7 @@ module Hello
         update_attributes!(expires_at: 30.minutes.from_now)
       end
 
-      class << self
+      module ClassMethods
         def destroy_all_expired
           where('expires_at < ?', Time.now).destroy_all
           true

data/lib/hello/rails_active_record/credential.rb

@@ -1,20 +1,27 @@
 module Hello
   module RailsActiveRecord
-    class Credential < ::ActiveRecord::Base
-      self.table_name = 'credentials'
+    module Credential
+      extend ActiveSupport::Concern
 
-      # ASSOCIATIONS
-      belongs_to :user, counter_cache: true, class_name: '::User'
+      included do
 
-      # VALIDATIONS
-      validates_presence_of :user, :type
-      validates_inclusion_of :type, in: %w(EmailCredential PasswordCredential)
+        # ASSOCIATIONS
+        belongs_to :user, counter_cache: true
 
-      # CUSTOM METHODS
+        # VALIDATIONS
+        validates_presence_of :user, on: :update
+
+        after_destroy do
+          if destroyed_by_association.nil?
+            if user.invalid?
+              user.errors.each { |k, v| errors.add(k, v) if k.to_s.include?('credentials')}
+              fail ActiveRecord::Rollback
+            end
+          end
+        end
+      end
 
-      # def is_email?
-      #   is_a?(EmailCredential)
-      # end
+      # CUSTOM METHODS
 
       def first_error_message
         errors.messages.values.flatten.first if errors.any?
@@ -33,19 +40,16 @@ module Hello
         uuid
       end
 
-      def invalidate_verifying_token!
-        update(verifying_token_digest: nil, verifying_token_digested_at: nil)
-      end
-
-      private
+      protected
 
-      def hello_is_user_being_destroyed?
-        !!Thread.current['Hello.destroying_user']
+      def complex_encryptor
+        Hello::Encryptors::Complex.instance
       end
 
       def simple_encryptor
         Hello::Encryptors::Simple.instance
       end
+
     end
   end
 end

data/lib/hello/rails_active_record/email_credential.rb

@@ -1,12 +1,18 @@
 module Hello
   module RailsActiveRecord
-    class EmailCredential < ::Credential
+    module EmailCredential
 
-      # VALIDATIONS
-      before_destroy :cannot_destroy_last_email_credential
+      extend ActiveSupport::Concern
 
-      validate :hello_validations
-      validates_uniqueness_of :email
+      included do
+        include Credential
+
+        # VALIDATIONS
+        validates_uniqueness_of :email
+        validates_presence_of :email
+        validate :hello_validations, if: :email?
+
+      end
 
       # SETTERS
       def email=(v)
@@ -34,27 +40,13 @@ module Hello
       private
 
       def hello_validations
-        validates_presence_of :email
-        return false if errors[:email].any?
+        return if errors.has_key?(:email)
 
         c = Hello.configuration
         validates_length_of :email, in: c.email_length
-        return false if errors[:email].any?
-
         validates_format_of :email, with: c.email_regex
-        return false if errors[:email].any?
-      end
-
-      def cannot_destroy_last_email_credential
-        return if hello_is_user_being_destroyed?
-        return unless is_last_email_credential?
-        errors[:base] << 'must have at least one credential'
-        false
       end
 
-      def is_last_email_credential?
-        user.email_credentials.count == 1
-      end
     end
   end
 end

data/lib/hello/rails_active_record/password_credential.rb

@@ -1,13 +1,16 @@
 module Hello
   module RailsActiveRecord
-    class PasswordCredential < ::Credential
+    module PasswordCredential
+      extend ActiveSupport::Concern
 
-      # VALIDATIONS
-      validates_presence_of :password, on: :create
-      # validates_presence_of :digest
+      included do
+        include Credential
 
-      # before_destroy :cannot_destroy_last_password_credential
-      validate :hello_validations
+        # VALIDATIONS
+        validates_presence_of :password, on: :create
+        validate :hello_validations, if: :digest_changed?
+
+      end
 
       # SETTERS
 
@@ -34,37 +37,13 @@ module Hello
       private
 
       def hello_validations
-        return true unless digest_changed?
-
-        return false if errors[:password].any?
+        return if errors.has_key?(:password)
         c = Hello.configuration
-
         validates_length_of :password, in: c.password_length
-        return false if errors[:password].any?
-
+        return if errors.has_key?(:password)
         validates_format_of :password, with: c.password_regex
-        return false if errors[:password].any?
       end
 
-      def complex_encryptor
-        Hello::Encryptors::Complex.instance
-      end
-
-      def simple_encryptor
-        Hello::Encryptors::Simple.instance
-      end
-
-      # # TODO: code for multiple passwords
-      # def cannot_destroy_last_password_credential
-      #   return if hello_is_user_being_destroyed?
-      #   return if not is_last_password_credential?
-      #   errors[:base] << "must have at least one credential"
-      #   false
-      # end
-
-      # def is_last_password_credential?
-      #   user.password_credentials.count == 1
-      # end
     end
   end
 end

data/lib/hello/rails_active_record/user.rb

@@ -1,23 +1,26 @@
 module Hello
   module RailsActiveRecord
-    class User < ::ActiveRecord::Base
-      self.table_name = 'users'
+    module User
+      extend ActiveSupport::Concern
 
-      # ASSOCIATIONS
+      included do
+        # ASSOCIATIONS
 
-      has_many :credentials,          dependent: :destroy, class_name: '::Credential'
-      has_many :email_credentials,    dependent: :destroy, class_name: '::EmailCredential'
-      has_one  :password_credential,  dependent: :destroy, class_name: '::PasswordCredential'
-      has_many :password_credentials, dependent: :destroy, class_name: '::PasswordCredential'
-      has_many :accesses,             dependent: :destroy, class_name: '::Access'
+        has_many :credentials,          dependent: :destroy
+        has_many :email_credentials,    dependent: :destroy
+        has_many :password_credentials, dependent: :destroy
+        has_many :accesses,             dependent: :destroy
 
-      alias :main_password_credential :password_credential
+        # VALIDATIONS
 
-      # VALIDATIONS
+        validates_presence_of :role, :locale, :time_zone
+        validates_uniqueness_of :username, if: :username?
+        validate :hello_validations
 
-      validates_presence_of :username, :locale, :time_zone
-      validates_uniqueness_of :username
-      validate :hello_validations
+        # DELEGATIONS
+
+        delegate :password_is?, to: :password_credential
+      end
 
       # SETTERS
 
@@ -25,36 +28,46 @@ module Hello
         super(v.to_s.downcase.remove(' '))
       end
 
-      # OVERRIDES
-
-      def destroy
-        # In Rails 4.0
-        # 'this instance' and the 'user in the credential instance'
-        # are 2 separate instances, making it impossible for them to share state
-        # therefore, an instance variable used as a flag will not work for Rails 4.0
-        # It will however, work for Rails 4.1 and 4.2
-        # @hello_is_this_being_destroyed = true
-        Thread.current['Hello.destroying_user'] = true
-        super
+      def email=(v)
+        return if v.blank?
+        if email_credentials.any?
+          fail "use 'email_credentials.build(email: v)' instead"
+        else
+          email_credentials.build(user: self, email: v)
+        end
       end
 
-      # def hello_is_this_being_destroyed?
-      #   !!@hello_is_this_being_destroyed
-      # end
+      def password=(v)
+        return if v.blank?
+        if password_credentials.any?
+          fail "update your 'password_credential' instead"
+        else
+          password_credential.password=v
+        end
+      end
 
+      # GETTERS
 
-      # CUSTOM METHODS
+      def email
+        email_credentials.first.email
+      rescue
+        nil
+      end
 
-      def as_json_web_api
-        as_json
+      def password
+        password_credential.password # yes, it might come blank
+      rescue
+        nil
       end
 
-      def password_is?(plain_text_password)
-        password_credential.password_is?(plain_text_password)
+      def password_credential
+        @password_credential ||= password_credentials.first_or_initialize(user: self)
       end
 
-      def role_is?(role)
-        send("#{role}?")
+      # CUSTOM METHODS
+
+      def as_json_web_api
+        as_json
       end
 
       def in_any_role?(roles)
@@ -62,38 +75,46 @@ module Hello
         false
       end
 
-      def set_generated_username
-        loop do
-          self.username = _make_up_new_username
-          break if _username_unique?
-        end
-      end
-
       private
 
       def hello_validations
         c = Hello.configuration
-
         validates_inclusion_of :locale,    in:   c.locales
         validates_inclusion_of :time_zone, in:   c.time_zones
-        validates_format_of    :username,  with: c.username_regex
-        validates_length_of    :username,  in:   c.username_length
+
+        hello_validations_username(c)
+        hello_validations_email(c)
+        hello_validations_password(c)
       end
 
-      def _make_up_new_username
-        Hello::Encryptors::Simple.instance.single(16) # 16 chars
+      def hello_validations_username(c)
+        if c.username_presence
+          validates_presence_of :username
+        end
+        if username.present?
+          validates_format_of :username,  with: c.username_regex
+          validates_length_of :username,  in:   c.username_length
+        end
+      end
+
+      def hello_validations_email(c)
+        if c.email_presence
+          validates_length_of :email_credentials, minimum: 1
+          validates_presence_of :email
+        end
       end
 
-      def _username_unique?
-        !self.class.unscoped.where(username: username).where.not(id: id).exists?
+      def hello_validations_password(c)
+        if new_record?
+          if c.password_presence
+            validates_presence_of :password
+          elsif password.blank?
+            password_credential.set_generated_password
+          end
+        end
+        validates_length_of :password_credentials, is: 1
       end
 
-      # def username_suggestions
-      #   email1 = email.to_s.split('@').first
-      #   name1  = name.to_s.split(' ')
-      #   ideas = [name1, email1].flatten
-      #   [ideas.sample, rand(999)].join.parameterize
-      # end
     end
   end
 end

data/lib/hello/rails_controller.rb

@@ -46,7 +46,7 @@ module Hello
     end
 
     def hello_manager
-      env['hello'] ||= Hello::RequestManager.create(request)
+      request.env['hello'] ||= Hello::RequestManager.create(request)
     end
 
 
@@ -106,9 +106,7 @@ module Hello
         logger.info "  #{'Hello Session'.bold.light_blue} expires in #{expires_in}"
         # end keep-alive
 
-        Thread.current['Hello.destroying_user'] = nil
         Time.use_zone(current_user.time_zone, &block)
-        Thread.current['Hello.destroying_user'] = nil
       else
         yield
       end

data/lib/hello/rails_controller/restrict_by_role.rb

@@ -21,9 +21,9 @@ module Hello
       end
 
       def to_home_page
-        if current_user.guest?
+        if current_user.role_is? 'guest'
           to_sign_in
-        elsif current_user.onboarding?
+        elsif current_user.role_is? 'onboarding'
           to_onboarding
         else
           to_root

data/lib/hello/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hello
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.5.1'.freeze
 end

data/spec/bdd/hello/authentication/classic_sign_in_spec.rb

@@ -5,7 +5,7 @@ RSpec.bdd.capability 'I can Sign In With Email' do
   role 'User' do
 
     before do
-      given_I_have_an_email_credential
+      given_I_have_a_user
       expect(Access.count).to eq(0)
     end
 
@@ -222,7 +222,7 @@ RSpec.bdd.capability 'I can Sign In With Email' do
 
         Then 'I should see the access object' do
           expect(json_response.keys).to match_array ['expires_at', 'token', 'user', 'user_id']
-          expect(json_response['user'].keys).to match_array ['id', 'accesses_count', 'city', 'created_at', 'credentials_count', 'locale', 'name', 'role', 'time_zone', 'updated_at', 'username']
+          expect(json_response['user'].keys).to match_array ['id', 'accesses_count', 'created_at', 'credentials_count', 'locale', 'name', 'role', 'time_zone', 'updated_at', 'username']
         end
 
         Then 'I should get a 201 response' do

data/spec/bdd/hello/internalionalization/anyone_can_change_their_locale/change_locale_on_the_sign_in_form_spec.rb

@@ -13,7 +13,7 @@ RSpec.bdd.uic "On The Sign In Form" do
       end
 
       When "I sign in to a 'pt-BR' user" do
-        user = given_I_have_an_email_credential.user
+        user = given_I_have_a_user
         user.update! locale: 'pt-BR'
         when_sign_in_with_standard_data(skip_expire: true)
       end