cop-detective 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca77cdd89eaac87cba49126671a8350a3c592949
-  data.tar.gz: ee1745a7548c93a6806eb167b02d765a323c907d
+  metadata.gz: 8db75e49616c8035bab21a2a759d883b50441cd3
+  data.tar.gz: 384693b3ee2797511907c6fd53d7ff01f558ab47
 SHA512:
-  metadata.gz: 8fdbaa7ae0bd3025b590c5ec2c416fbdc1f4267c54de17a5f3ded0813f9e73a0d43c8ef4d8dda48905c01a009af55901e1bfa7a68e50afb7eb119d257542f83a
-  data.tar.gz: 0c7e59fe8e62e9c511c634e779bc5e5eb8922fabf5b06e7e59949df1692878da06af72938037bf92945263a5443b91097de4d2297a93707767c54552dcbfc471
+  metadata.gz: f6d480423ad277c139cf96a86879add7338d8d2adfe3394616e37d513f69fcc34ee441a7ac2ac5cc1a8fdc0c259dd7a627cde75a75a74a77973d5cf223858f87
+  data.tar.gz: d74319f7a227192274117707be3313c28954a1edf8bcadab8598a0ca0e6a44104ad16cd9adf28feeaf0fee3608cd9325a65c26fbbe0ffea4fecbe4cdae42b164

data/lib/assigner.rb

@@ -8,8 +8,14 @@ class CopDetectiveAssigner
 
   class << self
 
+    def reset_variables
+      @@params = Hash.new(nil)
+      @@keys = nil
+      @@keychain = []
+      @@internal_keys = nil
+    end
+
     def build_params(params)
-      @@keychain
       params.each do |k, v|
         if v.is_a?(Hash)
           build_params(v)
@@ -20,6 +26,7 @@ class CopDetectiveAssigner
     end
 
     def assign(params, keys)
+      reset_variables
       set_keychain(keys)
       build_params(params)
       translate_keys

data/lib/cop_detective.rb

@@ -7,10 +7,10 @@ require_relative 'assigner'
 
 class CopDetective
   cattr_reader :messages
-    include ActiveModel::SecurePassword
-    @@messages = CopDetectiveValidator.messages
+  include ActiveModel::SecurePassword
+  @@messages = CopDetectiveValidator.messages
 
-    class << self
+  class << self
 
     def configure(options)
       @@old_password = options[:old_password]
@@ -26,6 +26,7 @@ class CopDetective
     end
 
     def investigate(user, params)
+      reset_variables
       assign(params, @@keys)
       return create_user(user) if @@old_password == nil
       update_user(user)
@@ -33,6 +34,12 @@ class CopDetective
 
     private
 
+    def reset_variables
+      @@old_password = nil
+      @@password = nil
+      @@confirmation = nil
+    end
+
     def inspect_keys(keys)
       keys.each do |k, v|
         raise CopDetective::ErrorMessages.formatting if k != :confirmation && k != :password && k != :old_password
@@ -47,7 +54,7 @@ class CopDetective
 
     def update_user(user)
       return validate_new_passwords(user) if valid_credentials?(user, @@old_password)
-      messages[:error] = ErrorMessages.unsaved_password(ErrorMessages.invalid_password)
+      user.errors.set(:password, [ErrorMessages.unsaved_password(ErrorMessages.invalid_password)])
     end
 
     def create_user(user)
@@ -55,7 +62,7 @@ class CopDetective
         user.save
         @@messages[:notice] = "Account created. You may now log in."
       else
-        user.errors.full_messages << "Passwords don't match or other params are not valid."
+        user.errors.set(:password, ["Passwords don't match or other params are not valid."])
       end
     end
 

data/lib/errors.rb

@@ -34,10 +34,6 @@ class CopDetective
         "Your new passwords don't match."
       end
 
-      def show_errors(model)
-        flash[:error] = model.errors.full_messages
-      end
-
       def options_error(key)
         "Option passed to #{key} must be a symbol."
       end

data/lib/validator.rb

@@ -20,14 +20,6 @@ class CopDetectiveValidator
       end
     end
 
-    def options_valid?(options)
-      options.each do |k, v|
-        return CopDetective::ErrorMessages.options_error(k, @@options_errors[:option_nil]) if v.nil?
-        return CopDetective::ErrorMessages.options_error(k, @@options_errors[:empty]) if v.empty?
-      end
-      true
-    end
-
     def valid_credentials?(user, old_password)
       user.authenticate(old_password) == user
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cop-detective
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jordan Kamin