cop-detective 0.1.2 → 0.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8db75e49616c8035bab21a2a759d883b50441cd3
4
- data.tar.gz: 384693b3ee2797511907c6fd53d7ff01f558ab47
3
+ metadata.gz: 39ccff86e369d198358ba825e6385cd3a7e913b9
4
+ data.tar.gz: e2144939c31ddb1256025c28219d46d43b00f1af
5
5
  SHA512:
6
- metadata.gz: f6d480423ad277c139cf96a86879add7338d8d2adfe3394616e37d513f69fcc34ee441a7ac2ac5cc1a8fdc0c259dd7a627cde75a75a74a77973d5cf223858f87
7
- data.tar.gz: d74319f7a227192274117707be3313c28954a1edf8bcadab8598a0ca0e6a44104ad16cd9adf28feeaf0fee3608cd9325a65c26fbbe0ffea4fecbe4cdae42b164
6
+ metadata.gz: a0a26824ab5f98853b22388e7c9a177c09b9e6a77df231aff5ffa54f3c4be1b906cc11e2214023d77d2ee09fb5ee614d61a649770f6ed245131eb5d0da72319c
7
+ data.tar.gz: 932893588b8378a03444207b8507ae9d106b1e92832e795eb47bdb30295fd767ec19f2c0333c88f68710fe502afb1b7dbe030d7f2fa025fa9975bfdbddd480b7
@@ -3,59 +3,52 @@ require 'active_record'
3
3
  require_relative 'cop_detective'
4
4
  class CopDetectiveAssigner
5
5
 
6
- @@keychain = []
7
- @@params = Hash.new(nil)
8
-
9
- class << self
10
-
11
- def reset_variables
12
- @@params = Hash.new(nil)
13
- @@keys = nil
14
- @@keychain = []
15
- @@internal_keys = nil
16
- end
6
+ def initialize
7
+ @params = Hash.new(nil)
8
+ @keys = nil
9
+ @keychain = []
10
+ @internal_keys = nil
11
+ end
17
12
 
18
- def build_params(params)
19
- params.each do |k, v|
20
- if v.is_a?(Hash)
21
- build_params(v)
22
- end
23
- @@params[k] = v if @@keychain.include?(k)
13
+ def build_params(params)
14
+ params.each do |k, v|
15
+ if v.is_a?(Hash)
16
+ build_params(v)
24
17
  end
25
- @@params
18
+ @params[k] = v if @keychain.include?(k)
26
19
  end
20
+ @params
21
+ end
27
22
 
28
- def assign(params, keys)
29
- reset_variables
30
- set_keychain(keys)
31
- build_params(params)
32
- translate_keys
33
- configure
34
- end
23
+ def assign(params, keys)
24
+ set_keychain(keys)
25
+ build_params(params)
26
+ translate_keys
27
+ configure
28
+ end
35
29
 
36
- def set_keychain(keys)
37
- @@keys = keys
38
- keys.each do |k, v|
39
- @@keychain << v
40
- end
41
- @@keychain
30
+ def set_keychain(keys)
31
+ @keys = keys
32
+ keys.each do |k, v|
33
+ @keychain << v
42
34
  end
35
+ @keychain
36
+ end
43
37
 
44
- def translate_keys
45
- @@internal_keys = @@keys
46
- @@internal_keys.each do |k, v|
47
- @@internal_keys[k] = @@params[v]
48
- end
49
- @@internal_keys
38
+ def translate_keys
39
+ @internal_keys = @keys
40
+ @internal_keys.each do |k, v|
41
+ @internal_keys[k] = @params[v]
50
42
  end
43
+ @internal_keys
44
+ end
51
45
 
52
- def configure
53
- old_password = @@internal_keys[:old_password] || nil
54
- password = @@internal_keys[:password]
55
- confirmation = @@internal_keys[:confirmation]
56
- CopDetective.configure({old_password: old_password,
57
- password: password,
58
- confirmation: confirmation})
59
- end
46
+ def configure
47
+ old_password = @internal_keys[:old_password] || nil
48
+ password = @internal_keys[:password]
49
+ confirmation = @internal_keys[:confirmation]
50
+ CopDetective.configure({old_password: old_password,
51
+ password: password,
52
+ confirmation: confirmation})
60
53
  end
61
54
  end
@@ -19,7 +19,7 @@ class CopDetective
19
19
  end
20
20
 
21
21
  def set_keys(keys)
22
- raise CopDetective::ErrorMessages.wrong_datatype if keys.class != Hash
22
+ raise CopDetective::ErrorMessages.wrong_datatype if keys.class != Hash && keys.class != String
23
23
  inspect_keys(keys)
24
24
  inspect_values(keys)
25
25
  @@keys = keys
@@ -48,7 +48,7 @@ class CopDetective
48
48
 
49
49
  def inspect_values(keys)
50
50
  keys.each do |k, v|
51
- raise CopDetective::ErrorMessages.options_error(k) if v.class != Symbol
51
+ raise CopDetective::ErrorMessages.options_error(k) if v.class != Symbol && v.class != String
52
52
  end
53
53
  end
54
54
 
@@ -67,7 +67,11 @@ class CopDetective
67
67
  end
68
68
 
69
69
  def assign(params, keys)
70
- CopDetectiveAssigner.assign(params, keys)
70
+ assigner.assign(params, keys)
71
+ end
72
+
73
+ def assigner
74
+ CopDetectiveAssigner.new
71
75
  end
72
76
 
73
77
  def validate_new_passwords(user)
@@ -35,7 +35,7 @@ class CopDetective
35
35
  end
36
36
 
37
37
  def options_error(key)
38
- "Option passed to #{key} must be a symbol."
38
+ "Option passed to #{key} must be a symbol or string."
39
39
  end
40
40
  end
41
41
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cop-detective
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.2
4
+ version: 0.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jordan Kamin
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-09-05 00:00:00.000000000 Z
11
+ date: 2015-09-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord