subj_models 0.1.12 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e27a57049e9594ae27579fbb3dbcbaf3b46087af
-  data.tar.gz: 0cb6efdc0bbf0134c8e27a6e9880c133c78076d6
+  metadata.gz: d3dc3ae61fa6989e63e77d47b2ee9be8410ba412
+  data.tar.gz: 36dd7f6176d232aac6affc3125e09b1c0f2ee89c
 SHA512:
-  metadata.gz: 902cad6c3ad44b8b18eae4a7e564e40f8fec607a6e8b6b60b281c01a4d2b6d40cb974dbd4fec5ef9aa2f230a44925861e4344e850bcb4e526e6b1bbf0de73a8e
-  data.tar.gz: 07e4d9df9435dd6f257b7fa0b14314a1c63b61407dca1fd6dc70d5119c48b95db17ad64b1e05ea4bd6ffe9bfbd323cb2ed5239bcd5ea0df95d3581999313e8be
+  metadata.gz: 3d4bfb5dedf8a56d86d993a6dedc4afdb19e846884117f64e92612b258aba009c003dfaeafef1a9fda1d2d645417d2b4f1dee24f826ef1ba7bbfe07fa8759117
+  data.tar.gz: 603a9d4ea2af75e93eed8f0278c65b1b50673f45c1327049b355420dfa7b064450a9c1ff4fc5d2b3cab531eda4a682b0b66319b03213481c29f0403542be1c88

data/lib/subj_models/document_file.rb

@@ -1,37 +1,37 @@
-module SubjModels
+# module SubjModels
 
-  module DocumentFile
+#   module DocumentFile
 
-    def self.included(including_class)
+#     def self.included(including_class)
 
-      including_class.class_eval do
+#       including_class.class_eval do
 
-        include ComprisingExternalId
+#         include ComprisingExternalId
 
-        has_one :nomenclature_photo
-        has_one :nomenclature_file
-        has_one :brand_line
-        has_one :user
-        has_one :manager
-        has_one :user_specialization_approval
-        has_one :event
+#         has_one :nomenclature_photo
+#         has_one :nomenclature_file
+#         has_one :brand_line
+#         has_one :user
+#         has_one :manager
+#         has_one :user_specialization_approval
+#         has_one :event
 
-        has_many :videos
-        has_many :brands
+#         has_many :videos
+#         has_many :brands
 
-        mount_uploader :file_data, PhotoUploader
-        mount_uploader :alternative_file_data, PhotoUploader
+#         mount_uploader :file_data, PhotoUploader
+#         mount_uploader :alternative_file_data, PhotoUploader
 
-        validates :file_data, presence: true
+#         validates :file_data, presence: true
 
-      end
+#       end
 
-    end
+#     end
 
-    def to_s
-      id.to_s
-    end
+#     def to_s
+#       id.to_s
+#     end
 
-  end
+#   end
 
-end
+# end

data/lib/subj_models/measure_unit.rb

@@ -7,9 +7,9 @@ module SubjModels
 
         include ComprisingExternalId
 
-        belongs_to :attribute_value
+        #belongs_to :attribute_value
 
-        has_many :nomenclature_prices
+        #has_many :nomenclature_prices
 
         validates :name, presence: true
 

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.1.12"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subj_models
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.2.1
 platform: ruby
 authors:
 - Denys Dvoriashyn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler