cop-detective 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8db75e49616c8035bab21a2a759d883b50441cd3
-  data.tar.gz: 384693b3ee2797511907c6fd53d7ff01f558ab47
+  metadata.gz: 39ccff86e369d198358ba825e6385cd3a7e913b9
+  data.tar.gz: e2144939c31ddb1256025c28219d46d43b00f1af
 SHA512:
-  metadata.gz: f6d480423ad277c139cf96a86879add7338d8d2adfe3394616e37d513f69fcc34ee441a7ac2ac5cc1a8fdc0c259dd7a627cde75a75a74a77973d5cf223858f87
-  data.tar.gz: d74319f7a227192274117707be3313c28954a1edf8bcadab8598a0ca0e6a44104ad16cd9adf28feeaf0fee3608cd9325a65c26fbbe0ffea4fecbe4cdae42b164
+  metadata.gz: a0a26824ab5f98853b22388e7c9a177c09b9e6a77df231aff5ffa54f3c4be1b906cc11e2214023d77d2ee09fb5ee614d61a649770f6ed245131eb5d0da72319c
+  data.tar.gz: 932893588b8378a03444207b8507ae9d106b1e92832e795eb47bdb30295fd767ec19f2c0333c88f68710fe502afb1b7dbe030d7f2fa025fa9975bfdbddd480b7

data/lib/assigner.rb

@@ -3,59 +3,52 @@ require 'active_record'
 require_relative 'cop_detective'
 class CopDetectiveAssigner
 
-  @@keychain = []
-  @@params = Hash.new(nil)
-
-  class << self
-
-    def reset_variables
-      @@params = Hash.new(nil)
-      @@keys = nil
-      @@keychain = []
-      @@internal_keys = nil
-    end
+  def initialize
+    @params = Hash.new(nil)
+    @keys = nil
+    @keychain = []
+    @internal_keys = nil
+  end
 
-    def build_params(params)
-      params.each do |k, v|
-        if v.is_a?(Hash)
-          build_params(v)
-        end
-        @@params[k] = v if @@keychain.include?(k) 
+  def build_params(params)
+    params.each do |k, v|
+      if v.is_a?(Hash)
+        build_params(v)
       end
-      @@params
+      @params[k] = v if @keychain.include?(k) 
     end
+    @params
+  end
 
-    def assign(params, keys)
-      reset_variables
-      set_keychain(keys)
-      build_params(params)
-      translate_keys
-      configure
-    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
+  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
+  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
+  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

data/lib/cop_detective.rb

@@ -19,7 +19,7 @@ class CopDetective
     end
 
     def set_keys(keys)
-      raise CopDetective::ErrorMessages.wrong_datatype if keys.class != Hash
+      raise CopDetective::ErrorMessages.wrong_datatype if keys.class != Hash && keys.class != String
       inspect_keys(keys)
       inspect_values(keys)
       @@keys = keys
@@ -48,7 +48,7 @@ class CopDetective
 
     def inspect_values(keys)
       keys.each do |k, v|
-        raise CopDetective::ErrorMessages.options_error(k) if v.class != Symbol
+        raise CopDetective::ErrorMessages.options_error(k) if v.class != Symbol && v.class != String
       end
     end
 
@@ -67,7 +67,11 @@ class CopDetective
     end
 
     def assign(params, keys)
-      CopDetectiveAssigner.assign(params, keys)
+      assigner.assign(params, keys)
+    end
+
+    def assigner
+      CopDetectiveAssigner.new
     end
 
     def validate_new_passwords(user)

data/lib/errors.rb

@@ -35,7 +35,7 @@ class CopDetective
       end
 
       def options_error(key)
-        "Option passed to #{key} must be a symbol."
+        "Option passed to #{key} must be a symbol or string."
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cop-detective
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jordan Kamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-05 00:00:00.000000000 Z
+date: 2015-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord