subj_models 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83658738a7ab8465ad59311cc0045293dcd9dafd
-  data.tar.gz: 454ba909f7b04f33c533e5d3dc8379b7ca6fb407
+  metadata.gz: ffa0c2a11913afea11257be5d268b5b4efb9bcf8
+  data.tar.gz: 7d314c1212c40c3d8edd8551791403c0028e92c9
 SHA512:
-  metadata.gz: b8aa9974e7dd80d9409e26c6ed2ff2cf0ce3dc2a81d34870e94dd2c4d14357c0f16e011f759e47b22dba605d9e82a2714cbc46fa73045fc05ff6d7634db5a7ea
-  data.tar.gz: beea5614269b216341631d6f8e40ae1372d7db27c3f4c49ce59c854cf9b77c545d598dc053a093b36bf34319fc3e3462a14aa08e9b9b30ee992a384f0fcff358
+  metadata.gz: 6b5af94dcf10b00680b5262e55f9ba7afec7a8cc3aa20ff42a11d250944a21d4decbbc35a4d6a5c5f1b5541631c58f5341c60133838f558f9e3c46ea84d4b197
+  data.tar.gz: d8c6803edd8361cb13aeeb417c684107c06186b6cea9bc5170356d17f25f56d99f0c9a80ac8f4ef5a122216b39f962a6cd3a8eb615937a5c046b54772f993fa1

data/lib/subj_models/action.rb

@@ -12,10 +12,15 @@ module SubjModels
 
         has_and_belongs_to_many :cities
         has_and_belongs_to_many :nomenclatures
+        has_and_belongs_to_many :brands
         belongs_to :image, class_name: "DocumentFile"
         belongs_to :categories_list_image, class_name: "DocumentFile"
 
-        validates :name, :discount_percent, presence: true
+        validates :nomenclatures, :brands, :image, presence: true
+        validates :name, presence: true
+        validates :discount_percent,
+          presence: true,
+          numericality: {only_integer: true, greater_than_or_equal_to: 0, less_than_or_equal_to: 100}
 
         scope :to_show, -> condition { where(to_show: condition) }
 

data/lib/subj_models/brand.rb

@@ -18,6 +18,7 @@ module SubjModels
         has_many :events
 
         has_and_belongs_to_many :users
+        has_and_belongs_to_many :actions
 
         belongs_to :content_block1, class_name: "ContentBlock"
         belongs_to :content_block2, class_name: "ContentBlock"

data/lib/subj_models/content_block.rb

@@ -11,6 +11,7 @@ module SubjModels
         include SubjModels::ComprisingExternalId
 
         belongs_to :document_file
+        has_one :brand
 
       end
 
@@ -18,8 +19,8 @@ module SubjModels
 
     def to_s
       brands = Brand.where('content_block1_id=? OR (content_block2_id=? OR content_block3_id=?)', id, id, id)
-
-      "#{title} - #{brands.any? ? 'С брендом' : 'Без бренда'}"
+      addition_text = brands.any? ? "#{brands.first.try(:name)}" : 'Без бренда'
+      "#{title} - " + addition_text
     end
 
   end

data/lib/subj_models/event.rb

@@ -30,7 +30,6 @@ module SubjModels
         scope :from_today, -> {
           joins(:event_schedule).where('event_schedules.event_date >= ?',  DateTime.now.beginning_of_day )
           .order( 'event_schedules.event_date ASC' )
-          # .unscope(:event_schedule)
         }
 
         scope :where_nomenclature_ids, -> (ids) do

data/lib/subj_models/version.rb

@@ -1,3 +1,3 @@
 module SubjModels
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

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