subj_models 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 958eb3c88e4357f059d9a8927db46350878a4f17
-  data.tar.gz: 582937b4853a504f34e6a33f21ec3232dfa19094
+  metadata.gz: 6582d499a1655d61b1817f445f144415b70bfaff
+  data.tar.gz: 14572b5ce0dbad50f1e0fa1906cfa0de99efa002
 SHA512:
-  metadata.gz: e693532fbe0e4c003034b410e54b5032fdaae5c18da50d38e42ecee6e5a71f42d1330dd1845c372ef91c5637980547077ddf5616fa25e55badc99054128906f6
-  data.tar.gz: 7c44584ddde51d6ddaf9f4fd782138ab4d919406a4697d01c414f25277184f8d9f4bb93c6dd1f31898a7f2f808d8f6395c7c5497d0a3f63bbe61a56777b970f9
+  metadata.gz: 718f54ad42d977202c058ab280bfddce429401e2c06127cffd071d555d769a92229bf84253799bfe59d53f1d0309e83650323804809cadc6736b702645b9f341
+  data.tar.gz: d17abfbaf6b9650d35ca258ba04fc05f8d1883866e78f28c44c22edc4b3840e16ea6b53c92432b4b0ef22f8bad7a3631df9bc72f2f37aaedb284b801ffbe4dd2

data/lib/subj_models/brand.rb

@@ -43,6 +43,10 @@ module SubjModels
           end
         end
 
+        scope :has_events, -> do
+          joins(events: :event_schedule).where('event_schedules.event_date >= ?',  DateTime.now.beginning_of_day).uniq
+        end
+
       end
 
     end

data/lib/subj_models/event.rb

@@ -28,8 +28,8 @@ module SubjModels
         validates :document_file, :title, presence: true
 
         scope :from_today, -> {
-          joins(:event_schedule).where('event_schedules.event_date >= ?',  DateTime.now.beginning_of_day )
-          .order( 'event_schedules.event_date ASC' )
+          Event.joins(:event_schedule).where('event_schedules.event_date >= ?',  DateTime.now.beginning_of_day )
+          .includes(:event_schedule).order( 'event_schedules.event_date ASC' ).uniq
         }
 
         scope :where_nomenclature_ids, -> (ids) do

data/lib/subj_models/version.rb

@@ -1,3 +1,3 @@
 module SubjModels
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subj_models
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Denys Dvoriashyn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-01 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler