subj_sub_models 0.0.3.20 → 0.0.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a39dd55189d841a115d88e0e5d87e7e5210c845
-  data.tar.gz: 6eb4f40d8118a559dc97d2bf9c532995f7752d0d
+  metadata.gz: 41740d28007d00615a15a3cd8bfbcb968edbea07
+  data.tar.gz: b557a08e432d992068565ad0beea547a0566a88a
 SHA512:
-  metadata.gz: a043816bc16a580268de8d5e00bc83d3ca125775ffa330fb0dd6c567a17d452b822411ae5b1253003169cad545d9e9954cac3f324c4d1b4287c8bab354e0553c
-  data.tar.gz: 7406902f0cf3805c619e05dea2e1a477387714002691ceae620f8e6606ba065e3a50f53de30c3d6ccff511a62df236a4732b54b03d289141ae61afacd44f9f3c
+  metadata.gz: ce5d7e8c6c5559ba39267a0f2ab27ed1d9a924c8fb0fd5813b070ffed13d2fee760c84881aef5613dff1b409bedff3e3e4a7c9a75eadfcb4e42cc09f3fb2d47f
+  data.tar.gz: 9d833493905a4bde600c1b78eb1725d72f470651b2532b3e72e272da751aacffe47454d78097fee11329ec395c1a9c1f89ea46cc295ae8bade824a3c0546bd5d

data/lib/subj_models/brand.rb

@@ -15,6 +15,7 @@ module SubjModels
         has_many :user_videos, dependent: :destroy
         has_many :brand_lines, dependent: :destroy
         has_many :nomenclatures
+        has_many :categories, through: :nomenclatures
         has_many :videos
         has_many :events
 
@@ -38,6 +39,8 @@ module SubjModels
           joins(brand_lines: [{ nomenclatures: :category}]).where('categories.id' => category_id)
         end
 
+        scope :with_categories, -> condition { includes(categories: [:image, :image_big, :nomenclatures]) }
+
         scope :by_first_letters, -> (by_first_letters) do
           unless by_first_letters.blank?
             where(first_letter: by_first_letters)
@@ -72,4 +75,4 @@ module SubjModels
 
   end
 
-end
+end

data/lib/subj_models/category.rb

@@ -11,6 +11,7 @@ module SubjModels
         include SubjModels::ComprisingExternalId
 
         has_many :nomenclatures
+        has_many :brands, through: :nomenclatures
 
         belongs_to :image, class_name: "DocumentFile"
         belongs_to :image_big, class_name: "DocumentFile"  
@@ -33,4 +34,4 @@ module SubjModels
 
   end
 
-end
+end

data/lib/subj_models/version.rb

@@ -1,3 +1,3 @@
 module SubjModels
-  VERSION = '0.0.3.20'
+  VERSION = '0.0.3.21'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subj_sub_models
 version: !ruby/object:Gem::Version
-  version: 0.0.3.20
+  version: 0.0.3.21
 platform: ruby
 authors:
 - A.Nasa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2017-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler