effective_learndash 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf3a76614af4d9fba4a5d9e483ecfc78ec821c042643b0d59508b42f80aead20
-  data.tar.gz: 3e383233f17438db0bc4c134e8fb767183b3697b0036100ddf89e80961b42332
+  metadata.gz: 47f234d26d444d3ba71d72409db15186e4b1db00e1bf3c6aa007853143307265
+  data.tar.gz: d97eea26d3a6cce1d8df2f154b06b8dbc558e8df8c731fdbff268185cb3d465c
 SHA512:
-  metadata.gz: 73041dc5fa8d6e130f865cd0ed5acf4c966ff1d7148168d6482f582f68c29d86fd8521c6d23aeb35227ca1f70810bd54b88408527767c3654b0998f8f6513d37
-  data.tar.gz: 58d39dc3138ff44d2be3152aba69734f7f83146714b1b79a44b084cdc05dcd865974e457b4f61c2c3dd2436e5a81b709db7ea3cde5b68b807a325bf28df7c58e
+  metadata.gz: 6aeaa81878fe93276c6bcdc366ec2f61f1fdc5ee952a6b9328890387619605ddb7883210765f203bef8ae053065c781eb59c109b084b06d164be079ebe7689b8
+  data.tar.gz: 2d53168beee83ee8766389eaec11b48f6208e97e202d63ba3155f85278357b673ff1fab06de53cf9e8570fb57397ed5cf4cbfb4a2500a870c42691512fe061b8

data/app/models/effective/learndash_api.rb

@@ -30,7 +30,7 @@ module Effective
     def find_user(value)
       # Find by email
       if value.kind_of?(String) && value.include?('@')
-        return find_by("/wp/v2/users", :email, value)
+        return find_by("/wp/v2/users", :email, email_for(value))
       end
 
       # Fetch by saved param value
@@ -39,7 +39,7 @@ module Effective
       return user if user.present?
 
       # Find by email
-      email = value.try(:email)
+      email = email_for(value)
       user = find_by("/wp/v2/users", :email, email) if email
       return user if user.present?
 
@@ -122,7 +122,6 @@ module Effective
 
     # private under this point
 
-
     def user_id(resource)
       if resource.class.respond_to?(:effective_learndash_owner?) # This is a user
         resource.learndash_user&.user_id
@@ -147,18 +146,9 @@ module Effective
 
     def username_for(resource)
       raise('expected a LearnDash owner') unless resource.class.respond_to?(:effective_learndash_owner?) # This is a user
-
       name = EffectiveLearndash.wp_username_for(resource)
-      name = "test#{name}" unless Rails.env.production?
-      name
-    end
-
-    def email_for(resource)
-      raise('expected a LearnDash owner') unless resource.class.respond_to?(:effective_learndash_owner?) # This is a user
 
-      email = resource.email
-      email = "test#{email}" unless Rails.env.production?
-      email
+      Rails.env.production? ? name : "test#{name}"
     end
 
     def password_for(resource)
@@ -166,6 +156,13 @@ module Effective
       EffectiveLearndash.wp_password_for(resource)
     end
 
+    def email_for(value)
+      email = value.try(:email) || value.to_s
+      return nil unless email.present? && email.include?('@')
+
+      Rails.env.production? ? email : "test#{email}"
+    end
+
     def find(endpoint, params = nil)
       response = get(endpoint, params)
 

data/lib/effective_learndash/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLearndash
-  VERSION = '0.1.6'.freeze
+  VERSION = '0.1.7'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_learndash
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Code and Effect