bpluser 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5167d7380a5a17ec2c522616b387c0d56321bc8
-  data.tar.gz: 7ad647948b54a9f126b546587d295ab569680f12
+  metadata.gz: 7d9eb4b0d7716bc672c931660dc4afad717b0a1f
+  data.tar.gz: 4335705a3f1e957e0160298b606fe9ab124c5c57
 SHA512:
-  metadata.gz: bcd7a8723eb698341927164ee157ce8354db8b909b493b1230f2a148052db2071d050465276425ec1a0eb813422604a184fe414ce40d2d019e66c0e51831ffe6
-  data.tar.gz: 922b50e86f9a6061a12b768a8cc69b95971a43b5c0462161bbfbd902a44cdeea6b2951b91650613e2fc929e44e874d46411e3b6c1e83da543794f977928c4855
+  metadata.gz: d27a3b6206ac9e438be9e42605280a4811d486fb4494b9d5b529886106c47ebc0554b022e2e43e46d392bfa9537f3ea9e130ae94ebabc21b4b2ac99415353397
+  data.tar.gz: dbc9ac06e1084ffa3f8fdd9629bac0d83a1b29043522eac78354a6e4c66e9ef0b20bdb89469ec41dba887b758709231f2964d41a5514118a6ad94f9be48f12e6

data/app/models/bpluser/user.rb

@@ -201,5 +201,9 @@ module Bpluser::User
       return self.provider != 'digital_stacks_temporary'
     end
 
+    def email_not_required?
+      return self.provider != 'digital_stacks_temporary' and self.provider != 'polaris'
+    end
+
   end
 end

data/app/models/bpluser/validatable.rb

@@ -25,9 +25,9 @@ module Bpluser::Validatable
       assert_validations_api!(base)
 
       base.class_eval do
-        validates_presence_of   :email, if: [:email_required?, :permanent_account?]
+        validates_presence_of   :email, if: [:email_required?, :email_not_required?]
         #validates_uniqueness_of :email, allow_blank: true, if: :email_changed?
-        validates_format_of     :email, with: email_regexp, allow_blank: true, if: [:email_changed?, :permanent_account?]
+        validates_format_of     :email, with: email_regexp, allow_blank: true, if: [:email_changed?, :email_not_required?]
 
         validates_presence_of     :password, if: :password_required?
         validates_confirmation_of :password, if: :password_required?

data/lib/bpluser/version.rb

@@ -1,3 +1,3 @@
 module Bpluser
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bpluser
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Boston Public Library Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails