username 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a76b0ea615f4def3a94b66ca1a024202c36bf106c9261ff20cfee0a95e051cfa
-  data.tar.gz: 809f5283ee7f6b15a56e99802afa6767c1513c378072afa032dc21d171706882
+  metadata.gz: c8de930561c5caa99fd5429ef17fb6699a6090e07d27fdd190572d22bc2d4608
+  data.tar.gz: 4fab1cb6940a149fca8226ab472cd0a56ac4686d05a42d88bbdecf8d5141a7ae
 SHA512:
-  metadata.gz: 8bebd2607b4a0b2bf24dfb973524799ca074bce7424113a1d98b1bb78667da6c149f440968801b7fd0fd273242b30330883f87bd483b140cc6669049df63220f
-  data.tar.gz: 15456eb519fbe2062ebb7cab85f063774f9f9e4e6e3535a5fd01cf45744a621aea1048e4c6fa2926e0bb49e5cbd4a0deba17ee949e6ab052c9a4e56c1e4e8348
+  metadata.gz: 793a84c0d5d2d0ecd794700940576bbfd5de43fcba5f01d01c66985df217218c14328503d3cd94422056eb696a6064998c6598e8fe34d3cea05b3d5620ceca43
+  data.tar.gz: cf50fc8fca114cc98651806e8d9b2b28596c500a914a3bc8a78569b0d736a5f9ba43344c4cd017b1c5d40d970818df000537f1194b0d464f838a5303f87b4871

data/CHANGELOG.md

@@ -4,6 +4,11 @@
 
 * nothing yet
 
+### 2.0.0 - 2018/05/24
+
+* features
+    * add functionality directly by including concerns
+
 ### 1.1.0 - 2018/01/24
 
 * features

data/README.md

@@ -55,7 +55,7 @@ You can add usernames to an ActiveRecord model:
 
 ```ruby
 class User < ApplicationRecord
-    has_username
+    include Username::Model
 end
 ```
 
@@ -81,7 +81,8 @@ If you are using Devise and you want to allow your users to sign in using either
 
 ```ruby
 class User < ApplicationRecord
-    has_username devise: true
+    include Username::Model
+    include Username::Model::Devise
 end
 ```
 

data/app/models/concerns/username/model.rb

@@ -3,22 +3,12 @@ module Username
 
         extend ActiveSupport::Concern
 
-        module ClassMethods
-            def has_username options = {}
-                defaults = {
-                    devise: false
-                }
-                options = defaults.merge options
-
-                Username.configuration&.models << self.name
-                validate :username_validation
-
-                if options[:devise]
-                    attr_accessor :login
-                    extend Username::Model::DeviseMethods
-                end
-            end
+        included do
+            Username.configuration&.models << self.name
+            validate :username_validation
+        end
 
+        module ClassMethods
             def username_valid? username
                 unless username.nil?
                     valid = true
@@ -37,17 +27,6 @@ module Username
             end
         end
 
-        module DeviseMethods
-            def find_for_database_authentication warden_conditions
-                conditions = warden_conditions.dup
-                if login = conditions.delete(:login)
-                    where(conditions.to_h).where(['lower(username) = :value OR lower(email) = :value', { value: login.downcase }]).first
-                elsif conditions.has_key?(:username) || conditions.has_key?(:email)
-                    where(conditions.to_h).first
-                end
-            end
-        end
-
         def username_available? username
             unless username.nil?
                 valid = true

data/app/models/concerns/username/model/devise.rb

@@ -0,0 +1,24 @@
+module Username
+    module Model
+        module Devise
+
+            extend ActiveSupport::Concern
+
+            included do
+                attr_accessor :login
+            end
+
+            module ClassMethods
+                def find_for_database_authentication warden_conditions
+                    conditions = warden_conditions.dup
+                    if login = conditions.delete(:login)
+                        where(conditions.to_h).where(['lower(username) = :value OR lower(email) = :value', { value: login.downcase }]).first
+                    elsif conditions.has_key?(:username) || conditions.has_key?(:email)
+                        where(conditions.to_h).first
+                    end
+                end
+            end
+
+        end
+    end
+end

data/lib/username.rb

@@ -5,6 +5,5 @@ module Username
     require 'username/configuration'
 
     require 'username/engine'
-    require 'username/railtie'
 
 end

data/lib/username/version.rb

@@ -1,5 +1,5 @@
 module Username
 
-    VERSION = '1.1.0'
+    VERSION = '2.0.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: username
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jonas Hübotter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2018-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -76,12 +76,12 @@ files:
 - LICENSE
 - README.md
 - app/models/concerns/username/model.rb
+- app/models/concerns/username/model/devise.rb
 - lib/generators/templates/initializer.rb
 - lib/generators/username_generator.rb
 - lib/username.rb
 - lib/username/configuration.rb
 - lib/username/engine.rb
-- lib/username/railtie.rb
 - lib/username/version.rb
 homepage: https://github.com/jonhue/username
 licenses:

data/lib/username/railtie.rb

@@ -1,13 +0,0 @@
-require 'rails/railtie'
-
-module Username
-    class Railtie < Rails::Railtie
-
-        initializer 'username.initialize' do
-            ActiveSupport.on_load :active_record do
-                include Username::Model
-            end
-        end
-
-    end
-end