subj_models 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53eaf6c138627290b0cd8bbf912c1fa781efa63e
-  data.tar.gz: 89ac7b07fff94d0ecbda5cdf2fff6df2f9aeb6db
+  metadata.gz: e2bebc316aa2d96252a15f50ade1baef20e519be
+  data.tar.gz: 5d2c6b0bc3926553a5043fa7861049856703d389
 SHA512:
-  metadata.gz: 40d142d1578accc7277bd56e6da5f8aa3e7a49a84700c610537e788a726ca248e8a06ceeb1ee9e774efd03f862f6d6205b98f022a35566188a73780bfec0d3b2
-  data.tar.gz: f75a602320e4400280fd995b66cd640defa3b40750f6ae0e78927a837f8d1c14ad32fd93db9e47e9bbc7abb3a7bcde8d1ca2218a8f37aab1d6c19ea4a2849f0a
+  metadata.gz: c5161bdeafa156f2b10050091bc1cd7cd0d8e6f8af5fd082cda8d1d73de56ccee641394cd03cc3d8a22e2094c50c89290843a554952e363982986250486a9049
+  data.tar.gz: af60dee9c8d1142bde0393a34f0f840d68916d9ca5311d8d35084181c7e6aa5dade700c27a7c6548acbd413f1b2e6909a889ea3f31b8bed320e43b2106de9500

data/lib/subj_models/concerns/comprising_external_id.rb

@@ -0,0 +1,37 @@
+module SubjModels
+
+  module ComprisingExternalId
+
+    extend ActiveSupport::Concern
+
+    included do
+      validates :external_id, uniqueness: true, allow_nil: true, allow_blank: true
+      scope :external_id, -> id { where(external_id: id) }
+    end
+
+    module ClassMethods
+      def find_by_external_or_internal_id(id)
+        if is_integer?(id)
+          self.find(id)
+        else
+          self.find_by!(external_id: id)
+        end
+      end
+
+      def is_integer?(value)
+        return true if value.is_a?(Integer)
+        value.to_i.to_s == value
+      end
+
+      def parent_id_scope(parent, id)
+        if id.is_a?(Array) || is_integer?(id)
+          joins(parent.to_sym).where("#{parent.pluralize}.id = ?", id)
+        else
+          joins(parent.to_sym).where("#{parent.pluralize}.external_id = ?", id)
+        end
+      end
+    end
+
+  end
+
+end

data/lib/subj_models/measure_unit.rb

@@ -1,11 +1,14 @@
+require 'subj_models/concerns/comprising_external_id'
+
 module SubjModels
+
   module MeasureUnit
 
     def self.included(including_class)
 
       including_class.class_eval do
 
-        include ComprisingExternalId
+        include SubjModels::ComprisingExternalId
 
         #belongs_to :attribute_value
 

data/lib/subj_models/user.rb

@@ -2,6 +2,7 @@ require 'digest/sha1'
 require 'subj_models/services/values_checker'
 require 'subj_models/services/types_support'
 require 'subj_models/concerns/shared_scopes'
+require 'subj_models/concerns/comprising_external_id'
 
 module SubjModels
 
@@ -21,8 +22,8 @@ module SubjModels
       including_class.extend ClassMethods
       including_class.class_eval do
 
-        include ComprisingExternalId
         include RademadeAdmin::UserModule
+        include SubjModels::ComprisingExternalId
         include SubjModels::SharedScopes
 
         enum user_type: USER_TYPES

data/lib/subj_models/version.rb

@@ -1,3 +1,3 @@
 module SubjModels
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subj_models
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Denys Dvoriashyn
@@ -57,6 +57,7 @@ files:
 - bin/console
 - bin/setup
 - lib/subj_models.rb
+- lib/subj_models/concerns/comprising_external_id.rb
 - lib/subj_models/concerns/shared_scopes.rb
 - lib/subj_models/document_file.rb
 - lib/subj_models/measure_unit.rb