subj_models 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3dc3ae61fa6989e63e77d47b2ee9be8410ba412
-  data.tar.gz: 36dd7f6176d232aac6affc3125e09b1c0f2ee89c
+  metadata.gz: 58c9095022d762f67b179a80e32cc253a303abe8
+  data.tar.gz: 12143544b4fa26dc492a3c65e2e1d29d604a726c
 SHA512:
-  metadata.gz: 3d4bfb5dedf8a56d86d993a6dedc4afdb19e846884117f64e92612b258aba009c003dfaeafef1a9fda1d2d645417d2b4f1dee24f826ef1ba7bbfe07fa8759117
-  data.tar.gz: 603a9d4ea2af75e93eed8f0278c65b1b50673f45c1327049b355420dfa7b064450a9c1ff4fc5d2b3cab531eda4a682b0b66319b03213481c29f0403542be1c88
+  metadata.gz: 265b08e83fd48bc5a7f618702ae1f81c64a1ef2c9a2b1e01384ec37d611d1dad8423bc54c0fba62304fdeb2cf212788b8753c78a3e1bd066430788c5df6f6620
+  data.tar.gz: 209ddf0ea2913fb5eeaacc926ac4d0c86fff4591b91bb3397784c097e1d7a0952cafc7f3d62b2a731e2e41ee9c66e9e6e9ada18a9ee529e41a3abd634ab023bb

data/lib/subj_models/user.rb

@@ -1,117 +1,117 @@
-# require 'digest/sha1'
-# require 'subj_models/services/values_checker'
-# require 'subj_models/services/types_support'
+require 'digest/sha1'
+require 'subj_models/services/values_checker'
+require 'subj_models/services/types_support'
 
-# module SubjModels
+module SubjModels
 
-#   module User
+  module User
 
-#     include SubjModels::TypesSupport::UserTypes
-#     include SubjModels::TypesSupport::CardReceiveTypes
-#     include SubjModels::ValuesChecker
+    include SubjModels::TypesSupport::UserTypes
+    include SubjModels::TypesSupport::CardReceiveTypes
+    include SubjModels::ValuesChecker
 
-#     module ClassMethods
-#       def get_by_email(email)
-#         self.where(:email => email).first
-#       end
-#     end
+    module ClassMethods
+      def get_by_email(email)
+        self.where(:email => email).first
+      end
+    end
 
-#     def self.included(including_class)
-#       including_class.extend ClassMethods
-#       including_class.class_eval do
+    def self.included(including_class)
+      including_class.extend ClassMethods
+      including_class.class_eval do
 
-#         include ComprisingExternalId
-#         include RademadeAdmin::UserModule
-#         include SharedScopes
+        include ComprisingExternalId
+        include RademadeAdmin::UserModule
+        include SharedScopes
 
-#         enum user_type: USER_TYPES
-#         enum card_receive_type: CARD_RECEIVE_TYPES
+        enum user_type: USER_TYPES
+        enum card_receive_type: CARD_RECEIVE_TYPES
 
-#         has_many :orders
-#         has_many :user_specialization_approvals, dependent: :destroy
-#         has_many :user_cards, dependent: :destroy
-#         has_one  :user_work_place, dependent: :destroy
-#         has_many :user_delivery_addresses, dependent: :destroy
+        # has_many :orders
+        # has_many :user_specialization_approvals, dependent: :destroy
+        # has_many :user_cards, dependent: :destroy
+        # has_one  :user_work_place, dependent: :destroy
+        # has_many :user_delivery_addresses, dependent: :destroy
 
-#         has_and_belongs_to_many :user_specializations
+        # has_and_belongs_to_many :user_specializations
 
-#         belongs_to :document_file
-#         belongs_to :city
-#         belongs_to :avatar, class_name: "DocumentFile"
+        # belongs_to :document_file
+        # belongs_to :city
+        # belongs_to :avatar, class_name: "DocumentFile"
 
-#         validates :first_name, :last_name, presence: true,
-#                   on: :update,
-#                   unless: lambda { |user| user.legal_person? || user.skip_validations }
-#         validates :email, uniqueness: { case_sensitive: false }, presence: true,
-#                   on: :update,
-#                   unless: :skip_validations
-#         validates :phone, uniqueness: { case_sensitive: false }, presence: true,
-#                   on: :update,
-#                   unless: :skip_validations
-#         validates :user_type, inclusion: { in: user_types.keys },
-#                   on: :update,
-#                   unless: :skip_validations
+        validates :first_name, :last_name, presence: true,
+                  on: :update,
+                  unless: lambda { |user| user.legal_person? || user.skip_validations }
+        validates :email, uniqueness: { case_sensitive: false }, presence: true,
+                  on: :update,
+                  unless: :skip_validations
+        validates :phone, uniqueness: { case_sensitive: false }, presence: true,
+                  on: :update,
+                  unless: :skip_validations
+        validates :user_type, inclusion: { in: user_types.keys },
+                  on: :update,
+                  unless: :skip_validations
 
-#         attr_accessor :skip_validations
+        attr_accessor :skip_validations
 
-#         scope :external_id, -> external_id do
-#           external_id ? where(external_id: external_id) : User.none
-#         end 
+        scope :external_id, -> external_id do
+          external_id ? where(external_id: external_id) : User.none
+        end 
 
-#       end
+      end
 
-#     end
+    end
 
-#     def natural_person?
-#       user_type == USER_TYPES.key(NATURAL_PERSON)
-#     end
+    def natural_person?
+      user_type == USER_TYPES.key(NATURAL_PERSON)
+    end
 
-#     def legal_person?
-#       user_type == USER_TYPES.key(LEGAL_PERSON)
-#     end
+    def legal_person?
+      user_type == USER_TYPES.key(LEGAL_PERSON)
+    end
 
-#     def user_type=(value)
-#       super(check_string_for_int(value))
-#     end
+    def user_type=(value)
+      super(check_string_for_int(value))
+    end
 
-#     def self.get_by_email(email)
-#       self.where(:email => email).first
-#     end
+    def self.get_by_email(email)
+      self.where(:email => email).first
+    end
 
-#     def password=(password)
-#       self.encrypted_password = encrypt_password(password) unless password.blank?
-#     end
+    def password=(password)
+      self.encrypted_password = encrypt_password(password) unless password.blank?
+    end
 
-#     def password
-#       self.encrypted_password
-#     end
+    def password
+      self.encrypted_password
+    end
 
-#     def valid_password?(password)
-#       self.encrypted_password == encrypt_password(password)
-#     end
+    def valid_password?(password)
+      self.encrypted_password == encrypt_password(password)
+    end
 
-#     def to_s
-#       email
-#     end
+    def to_s
+      email
+    end
 
-#     def admin?
-#       self.user_type == 'админ'
-#     end
+    def admin?
+      self.user_type == 'админ'
+    end
 
-#     def available_nomenclature_ids
-#       Nomenclature.joins(access_groups: [user_specializations: :users]).where("users.id" => self.id).uniq.pluck(:id)
-#     end
+    def available_nomenclature_ids
+      Nomenclature.joins(access_groups: [user_specializations: :users]).where("users.id" => self.id).uniq.pluck(:id)
+    end
 
-#     def available_categories_ids
-#       Category.joins(:nomenclatures).where("nomenclatures.id IN (?) OR nomenclatures.is_professional=FALSE", available_nomenclature_ids).uniq.pluck(:id)
-#     end
+    def available_categories_ids
+      Category.joins(:nomenclatures).where("nomenclatures.id IN (?) OR nomenclatures.is_professional=FALSE", available_nomenclature_ids).uniq.pluck(:id)
+    end
 
-#     private
+    private
 
-#     def encrypt_password(password)
-#       Digest::SHA1.hexdigest(password)
-#     end
+    def encrypt_password(password)
+      Digest::SHA1.hexdigest(password)
+    end
 
-#   end
+  end
 
-# end
+end

data/lib/subj_models/version.rb

@@ -1,3 +1,3 @@
 module SubjModels
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subj_models
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Denys Dvoriashyn