subj_models 0.1.04 → 0.1.05

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6765247548ac23e7be393451439a03b56a857825
-  data.tar.gz: bddc812ec6f1b1811c367a535f87cf38256dd36d
+  metadata.gz: 82d89cdbd2b65439c84b982cb18691fbce5695c5
+  data.tar.gz: c472c01f696b0ca810e2a050bb98dfd17337a510
 SHA512:
-  metadata.gz: ad866aa40debc766de5c9b025af568c25c98d07f23c62d17e630eb576e0562c8ce00c323a5f46d53560ef6aca3f97b644888f87abf5c00d52fef57584b90f941
-  data.tar.gz: d598b3ac3496b583a221c6412f8bce5fa5b2c03a43491e3d1ad60fddeda4eb2fa9c7301d511df5f6c7afb628c5c2ec8f0a44f64ccd01f832cf4f3cd6fc190a0c
+  metadata.gz: f07d137c04074a9eea278c5c204f4833f66e53fc2f490de16c47d96199affa66faaf02f6afdf53ac65f9caf7edaf49b5ed75bb3b26c500b4da176dbf03a19a19
+  data.tar.gz: f2edcda45a78ba37c40fd6b94265086c1af2ca0fd60352571ffb78b37927453aa298dfd06fabadf307b9ed82055c56a2863082c5795519b4c6ce52f4f0957baa

data/lib/subj_models/user.rb

@@ -2,47 +2,54 @@ module SubjModels
 
   module User
 
-    include ComprisingExternalId
-    include TypesSupport::UserTypes
-    include TypesSupport::CardReceiveTypes
-    include RademadeAdmin::UserModule
-    include SharedScopes
-    include ValuesChecker
-
-    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_and_belongs_to_many :user_specializations
-
-    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
-
-
-    attr_accessor :skip_validations
-
-    scope :external_id, -> external_id do
-      external_id ? where(external_id: external_id) : User.none
-    end 
+    def self.included(including_class)
+
+      including_class.class_eval do
+
+        include ComprisingExternalId
+        include TypesSupport::UserTypes
+        include TypesSupport::CardReceiveTypes
+        include RademadeAdmin::UserModule
+        include SharedScopes
+        include ValuesChecker
+
+        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_and_belongs_to_many :user_specializations
+
+        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
+
+        attr_accessor :skip_validations
+
+        scope :external_id, -> external_id do
+          external_id ? where(external_id: external_id) : User.none
+        end 
+
+      end
+
+    end
 
     def natural_person?
       user_type == USER_TYPES.key(NATURAL_PERSON)

data/lib/subj_models/version.rb

@@ -1,3 +1,3 @@
 module SubjModels
-  VERSION = "0.1.04"
+  VERSION = "0.1.05"
 end

metadata

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