subj_models 0.2.1 → 0.2.2

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: d3dc3ae61fa6989e63e77d47b2ee9be8410ba412
4
- data.tar.gz: 36dd7f6176d232aac6affc3125e09b1c0f2ee89c
3
+ metadata.gz: 58c9095022d762f67b179a80e32cc253a303abe8
4
+ data.tar.gz: 12143544b4fa26dc492a3c65e2e1d29d604a726c
5
5
  SHA512:
6
- metadata.gz: 3d4bfb5dedf8a56d86d993a6dedc4afdb19e846884117f64e92612b258aba009c003dfaeafef1a9fda1d2d645417d2b4f1dee24f826ef1ba7bbfe07fa8759117
7
- data.tar.gz: 603a9d4ea2af75e93eed8f0278c65b1b50673f45c1327049b355420dfa7b064450a9c1ff4fc5d2b3cab531eda4a682b0b66319b03213481c29f0403542be1c88
6
+ metadata.gz: 265b08e83fd48bc5a7f618702ae1f81c64a1ef2c9a2b1e01384ec37d611d1dad8423bc54c0fba62304fdeb2cf212788b8753c78a3e1bd066430788c5df6f6620
7
+ data.tar.gz: 209ddf0ea2913fb5eeaacc926ac4d0c86fff4591b91bb3397784c097e1d7a0952cafc7f3d62b2a731e2e41ee9c66e9e6e9ada18a9ee529e41a3abd634ab023bb
@@ -1,117 +1,117 @@
1
- # require 'digest/sha1'
2
- # require 'subj_models/services/values_checker'
3
- # require 'subj_models/services/types_support'
1
+ require 'digest/sha1'
2
+ require 'subj_models/services/values_checker'
3
+ require 'subj_models/services/types_support'
4
4
 
5
- # module SubjModels
5
+ module SubjModels
6
6
 
7
- # module User
7
+ module User
8
8
 
9
- # include SubjModels::TypesSupport::UserTypes
10
- # include SubjModels::TypesSupport::CardReceiveTypes
11
- # include SubjModels::ValuesChecker
9
+ include SubjModels::TypesSupport::UserTypes
10
+ include SubjModels::TypesSupport::CardReceiveTypes
11
+ include SubjModels::ValuesChecker
12
12
 
13
- # module ClassMethods
14
- # def get_by_email(email)
15
- # self.where(:email => email).first
16
- # end
17
- # end
13
+ module ClassMethods
14
+ def get_by_email(email)
15
+ self.where(:email => email).first
16
+ end
17
+ end
18
18
 
19
- # def self.included(including_class)
20
- # including_class.extend ClassMethods
21
- # including_class.class_eval do
19
+ def self.included(including_class)
20
+ including_class.extend ClassMethods
21
+ including_class.class_eval do
22
22
 
23
- # include ComprisingExternalId
24
- # include RademadeAdmin::UserModule
25
- # include SharedScopes
23
+ include ComprisingExternalId
24
+ include RademadeAdmin::UserModule
25
+ include SharedScopes
26
26
 
27
- # enum user_type: USER_TYPES
28
- # enum card_receive_type: CARD_RECEIVE_TYPES
27
+ enum user_type: USER_TYPES
28
+ enum card_receive_type: CARD_RECEIVE_TYPES
29
29
 
30
- # has_many :orders
31
- # has_many :user_specialization_approvals, dependent: :destroy
32
- # has_many :user_cards, dependent: :destroy
33
- # has_one :user_work_place, dependent: :destroy
34
- # has_many :user_delivery_addresses, dependent: :destroy
30
+ # has_many :orders
31
+ # has_many :user_specialization_approvals, dependent: :destroy
32
+ # has_many :user_cards, dependent: :destroy
33
+ # has_one :user_work_place, dependent: :destroy
34
+ # has_many :user_delivery_addresses, dependent: :destroy
35
35
 
36
- # has_and_belongs_to_many :user_specializations
36
+ # has_and_belongs_to_many :user_specializations
37
37
 
38
- # belongs_to :document_file
39
- # belongs_to :city
40
- # belongs_to :avatar, class_name: "DocumentFile"
38
+ # belongs_to :document_file
39
+ # belongs_to :city
40
+ # belongs_to :avatar, class_name: "DocumentFile"
41
41
 
42
- # validates :first_name, :last_name, presence: true,
43
- # on: :update,
44
- # unless: lambda { |user| user.legal_person? || user.skip_validations }
45
- # validates :email, uniqueness: { case_sensitive: false }, presence: true,
46
- # on: :update,
47
- # unless: :skip_validations
48
- # validates :phone, uniqueness: { case_sensitive: false }, presence: true,
49
- # on: :update,
50
- # unless: :skip_validations
51
- # validates :user_type, inclusion: { in: user_types.keys },
52
- # on: :update,
53
- # unless: :skip_validations
42
+ validates :first_name, :last_name, presence: true,
43
+ on: :update,
44
+ unless: lambda { |user| user.legal_person? || user.skip_validations }
45
+ validates :email, uniqueness: { case_sensitive: false }, presence: true,
46
+ on: :update,
47
+ unless: :skip_validations
48
+ validates :phone, uniqueness: { case_sensitive: false }, presence: true,
49
+ on: :update,
50
+ unless: :skip_validations
51
+ validates :user_type, inclusion: { in: user_types.keys },
52
+ on: :update,
53
+ unless: :skip_validations
54
54
 
55
- # attr_accessor :skip_validations
55
+ attr_accessor :skip_validations
56
56
 
57
- # scope :external_id, -> external_id do
58
- # external_id ? where(external_id: external_id) : User.none
59
- # end
57
+ scope :external_id, -> external_id do
58
+ external_id ? where(external_id: external_id) : User.none
59
+ end
60
60
 
61
- # end
61
+ end
62
62
 
63
- # end
63
+ end
64
64
 
65
- # def natural_person?
66
- # user_type == USER_TYPES.key(NATURAL_PERSON)
67
- # end
65
+ def natural_person?
66
+ user_type == USER_TYPES.key(NATURAL_PERSON)
67
+ end
68
68
 
69
- # def legal_person?
70
- # user_type == USER_TYPES.key(LEGAL_PERSON)
71
- # end
69
+ def legal_person?
70
+ user_type == USER_TYPES.key(LEGAL_PERSON)
71
+ end
72
72
 
73
- # def user_type=(value)
74
- # super(check_string_for_int(value))
75
- # end
73
+ def user_type=(value)
74
+ super(check_string_for_int(value))
75
+ end
76
76
 
77
- # def self.get_by_email(email)
78
- # self.where(:email => email).first
79
- # end
77
+ def self.get_by_email(email)
78
+ self.where(:email => email).first
79
+ end
80
80
 
81
- # def password=(password)
82
- # self.encrypted_password = encrypt_password(password) unless password.blank?
83
- # end
81
+ def password=(password)
82
+ self.encrypted_password = encrypt_password(password) unless password.blank?
83
+ end
84
84
 
85
- # def password
86
- # self.encrypted_password
87
- # end
85
+ def password
86
+ self.encrypted_password
87
+ end
88
88
 
89
- # def valid_password?(password)
90
- # self.encrypted_password == encrypt_password(password)
91
- # end
89
+ def valid_password?(password)
90
+ self.encrypted_password == encrypt_password(password)
91
+ end
92
92
 
93
- # def to_s
94
- # email
95
- # end
93
+ def to_s
94
+ email
95
+ end
96
96
 
97
- # def admin?
98
- # self.user_type == 'админ'
99
- # end
97
+ def admin?
98
+ self.user_type == 'админ'
99
+ end
100
100
 
101
- # def available_nomenclature_ids
102
- # Nomenclature.joins(access_groups: [user_specializations: :users]).where("users.id" => self.id).uniq.pluck(:id)
103
- # end
101
+ def available_nomenclature_ids
102
+ Nomenclature.joins(access_groups: [user_specializations: :users]).where("users.id" => self.id).uniq.pluck(:id)
103
+ end
104
104
 
105
- # def available_categories_ids
106
- # Category.joins(:nomenclatures).where("nomenclatures.id IN (?) OR nomenclatures.is_professional=FALSE", available_nomenclature_ids).uniq.pluck(:id)
107
- # end
105
+ def available_categories_ids
106
+ Category.joins(:nomenclatures).where("nomenclatures.id IN (?) OR nomenclatures.is_professional=FALSE", available_nomenclature_ids).uniq.pluck(:id)
107
+ end
108
108
 
109
- # private
109
+ private
110
110
 
111
- # def encrypt_password(password)
112
- # Digest::SHA1.hexdigest(password)
113
- # end
111
+ def encrypt_password(password)
112
+ Digest::SHA1.hexdigest(password)
113
+ end
114
114
 
115
- # end
115
+ end
116
116
 
117
- # end
117
+ end
@@ -1,3 +1,3 @@
1
1
  module SubjModels
2
- VERSION = "0.2.1"
2
+ VERSION = "0.2.2"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: subj_models
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.1
4
+ version: 0.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Denys Dvoriashyn