bpluser 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 372ac72e258bf4c58b6a5ebeeb9c69e692c907e5
-  data.tar.gz: 61e4ceeb7e81b08b8d48ef40f97c29e220d8a30e
+  metadata.gz: f4ab974f23262f36d86356fc2d1d05e2ee46abba
+  data.tar.gz: fda00536fcbafb091456ea510679609db31b3f27
 SHA512:
-  metadata.gz: 1daf8ccd6aee71dd38fe0b77793a850ea76d8a4cce52cf0a9040ec616aad201e134c319c5605a77b6db965e6dd45aa57e74415afc79df7f37a5bf291e59e3010
-  data.tar.gz: 9b6d13cd3b7c4f77ed324b318a88cefe1d6fd61e11c874110add33e9a7dc652437b37178d8e1421240b4e186ff149722c34babce7db8c53eaf35da3f04ff297e
+  metadata.gz: c0666213d531153a61e6bdde7d79921aec1cdf6001a0f669f1fc3e2c8ab00d90fa7e7d2925a0801a21ac538549b6e9b585f0833ebc4a152eca1901d2fb904d5c
+  data.tar.gz: b25788d108f7718c6aa0fdb79480452fe97b4f0a8f86ec5ba3ebbe195914f60c388ee131322c471e9423f7adb5d40e5600c82f0463f4cf8c2f42caa854e4b551

data/app/models/bpluser/user.rb

@@ -2,14 +2,17 @@ module Bpluser::User
 
 
   def self.included(base)
+    #, :validatable
     base.send :devise, :database_authenticatable, :registerable,
-              :recoverable, :rememberable, :trackable, :validatable, :omniauthable, :omniauth_providers => [:ldap, :polaris, :facebook]
+              :recoverable, :rememberable, :trackable, :omniauthable, :omniauth_providers => [:ldap, :polaris, :facebook]
     #base.send :attr_accessible, :provider, :username, :email, :password, :password_confirmation, :remember_me, :first_name, :last_name, :display_name, :uid
     base.send :has_many, :user_institutions, :class_name => "Bpluser::UserInstitution"
     base.send :has_many, :folders, :dependent => :destroy, :class_name => "Bpluser::Folder"
     base.extend(ClassMethods)
     base.send :include, InstanceMethods
 
+    base.send :include, Bpluser::Validatable
+
   end
 
   module ClassMethods

data/lib/bpluser/validatable.rb

@@ -0,0 +1,65 @@
+#By default, devise requires an email to be unique. I want the email checks but need to remove the uniqueness...
+module BplUser
+  # Validatable creates all needed validations for a user email and password.
+  # It's optional, given you may want to create the validations by yourself.
+  # Automatically validate if the email is present, unique and its format is
+  # valid. Also tests presence of password, confirmation and length.
+  #
+  # == Options
+  #
+  # Validatable adds the following options to devise_for:
+  #
+  #   * +email_regexp+: the regular expression used to validate e-mails;
+  #   * +password_length+: a range expressing password length. Defaults to 8..72.
+  #
+  module Validatable
+    # All validations used by this module.
+    VALIDATIONS = [:validates_presence_of, :validates_format_of,
+                   :validates_confirmation_of, :validates_length_of].freeze
+
+    def self.required_fields(klass)
+      []
+    end
+
+    def self.included(base)
+      base.extend ClassMethods
+      assert_validations_api!(base)
+
+      base.class_eval do
+        validates_presence_of   :email, if: :email_required?
+        #validates_uniqueness_of :email, allow_blank: true, if: :email_changed?
+        validates_format_of     :email, with: email_regexp, allow_blank: true, if: :email_changed?
+
+        validates_presence_of     :password, if: :password_required?
+        validates_confirmation_of :password, if: :password_required?
+        validates_length_of       :password, within: password_length, allow_blank: true
+      end
+    end
+
+    def self.assert_validations_api!(base) #:nodoc:
+      unavailable_validations = VALIDATIONS.select { |v| !base.respond_to?(v) }
+
+      unless unavailable_validations.empty?
+        raise "Could not use :validatable module since #{base} does not respond " <<
+                  "to the following methods: #{unavailable_validations.to_sentence}."
+      end
+    end
+
+    protected
+
+    # Checks whether a password is needed or not. For validations only.
+    # Passwords are always required if it's a new record, or if the password
+    # or confirmation are being set somewhere.
+    def password_required?
+      !persisted? || !password.nil? || !password_confirmation.nil?
+    end
+
+    def email_required?
+      true
+    end
+
+    module ClassMethods
+      Devise::Models.config(self, :email_regexp, :password_length)
+    end
+  end
+end

data/lib/bpluser/version.rb

@@ -1,3 +1,3 @@
 module Bpluser
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bpluser
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Boston Public Library Web Services
@@ -137,6 +137,7 @@ files:
 - lib/bpluser.rb
 - lib/bpluser/engine.rb
 - lib/bpluser/routes.rb
+- lib/bpluser/validatable.rb
 - lib/bpluser/version.rb
 - lib/generators/bpluser/bpluser_generator.rb
 - lib/generators/bpluser/templates/config/hydra-ldap.yml