cop-detective 0.0.5 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b798995e62622a81120bf2663a5255ed2dc3a2cc
-  data.tar.gz: 16b49827e5098b0387f814a104e1a4d96e306b67
+  metadata.gz: ca77cdd89eaac87cba49126671a8350a3c592949
+  data.tar.gz: ee1745a7548c93a6806eb167b02d765a323c907d
 SHA512:
-  metadata.gz: e24389e4ab559f8c7054256744b73940799b2d22bc64c6f338ddfbaa33f182d8fd4363503739cce12b49a352a6c46b7e2ade19c3d667ddbf130e0b86a18929c4
-  data.tar.gz: deb866aaa231b916f4e294be7dc1fa47d871c3fa207d652f9e73d1cb81d9514116c3a95869f36e687276b40c4ead25210f5e2ee3c19fc55b87dd106bf3fa5079
+  metadata.gz: 8fdbaa7ae0bd3025b590c5ec2c416fbdc1f4267c54de17a5f3ded0813f9e73a0d43c8ef4d8dda48905c01a009af55901e1bfa7a68e50afb7eb119d257542f83a
+  data.tar.gz: 0c7e59fe8e62e9c511c634e779bc5e5eb8922fabf5b06e7e59949df1692878da06af72938037bf92945263a5443b91097de4d2297a93707767c54552dcbfc471

data/lib/assigner.rb

@@ -0,0 +1,54 @@
+require 'active_support'
+require 'active_record'
+require_relative 'cop_detective'
+class CopDetectiveAssigner
+
+  @@keychain = []
+  @@params = Hash.new(nil)
+
+  class << self
+
+    def build_params(params)
+      @@keychain
+      params.each do |k, v|
+        if v.is_a?(Hash)
+          build_params(v)
+        end
+        @@params[k] = v if @@keychain.include?(k) 
+      end
+      @@params
+    end
+
+    def assign(params, keys)
+      set_keychain(keys)
+      build_params(params)
+      translate_keys
+      configure
+    end
+
+    def set_keychain(keys)
+      @@keys = keys
+      keys.each do |k, v|
+        @@keychain << v
+      end
+      @@keychain
+    end
+
+    def translate_keys
+      @@internal_keys = @@keys
+      @@internal_keys.each do |k, v|
+        @@internal_keys[k] = @@params[v]
+      end
+      @@internal_keys
+    end
+
+    def configure
+      old_password = @@internal_keys[:old_password] || nil
+      password = @@internal_keys[:password]
+      confirmation = @@internal_keys[:confirmation]
+      CopDetective.configure({old_password: old_password, 
+                              password: password, 
+                              confirmation: confirmation})
+    end
+  end
+end

data/lib/cop_detective.rb

@@ -3,18 +3,45 @@ require 'active_support'
 require 'active_record'
 require_relative 'errors'
 require_relative 'validator'
+require_relative 'assigner'
 
 class CopDetective
   cattr_reader :messages
-  class << self
     include ActiveModel::SecurePassword
     @@messages = CopDetectiveValidator.messages
 
+    class << self
+
     def configure(options)
-      if CopDetectiveValidator.options_valid?(options)
-        @@old_password = options[:old_password] ||= 'not set'
-        @@password = options[:password]
-        @@confirmation = options[:confirmation]
+      @@old_password = options[:old_password]
+      @@password = options[:password]
+      @@confirmation = options[:confirmation]
+    end
+
+    def set_keys(keys)
+      raise CopDetective::ErrorMessages.wrong_datatype if keys.class != Hash
+      inspect_keys(keys)
+      inspect_values(keys)
+      @@keys = keys
+    end
+
+    def investigate(user, params)
+      assign(params, @@keys)
+      return create_user(user) if @@old_password == nil
+      update_user(user)
+    end
+
+    private
+
+    def inspect_keys(keys)
+      keys.each do |k, v|
+        raise CopDetective::ErrorMessages.formatting if k != :confirmation && k != :password && k != :old_password
+      end
+    end
+
+    def inspect_values(keys)
+      keys.each do |k, v|
+        raise CopDetective::ErrorMessages.options_error(k) if v.class != Symbol
       end
     end
 
@@ -32,7 +59,9 @@ class CopDetective
       end
     end
 
-    private
+    def assign(params, keys)
+      CopDetectiveAssigner.assign(params, keys)
+    end
 
     def validate_new_passwords(user)
       CopDetectiveValidator.validate_new_passwords(user, @@password, @@confirmation)

data/lib/errors.rb

@@ -9,6 +9,27 @@ class CopDetective
         "You entered your original password incorrectly."
       end
 
+      def wrong_datatype
+        'You must pass a hash to the set_keys method'
+      end
+
+      def formatting
+        <<-MESSAGE 
+        The keys in the hash you pass to #set_keys must be as follows:
+          password:
+          confirmation:
+          old_password:
+
+        the values you pass should reflect keys in your params hash.
+        a correctly configured hash would look similar to this:
+        {
+          password: :new_password,
+          confirmation: :password_again,
+          old_password: :original_password
+        }
+        MESSAGE
+      end
+
       def non_matching
         "Your new passwords don't match."
       end
@@ -17,8 +38,8 @@ class CopDetective
         flash[:error] = model.errors.full_messages
       end
 
-      def options_error(key, error)
-        raise "Option passed to #{key} #{error}"
+      def options_error(key)
+        "Option passed to #{key} must be a symbol."
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cop-detective
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.1
 platform: ruby
 authors:
 - Jordan Kamin
@@ -53,12 +53,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.1'
 description: A simple gem to use in your controller to remove some of the work of
-  comparing passwords and confirmations.
+  comparing passwords and password confirmations.
 email: jordanakamin@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/assigner.rb
 - lib/cop_detective.rb
 - lib/errors.rb
 - lib/validator.rb