ish_models 0.0.33.112 → 0.0.33.117

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8791c1ba42049bc4324ac244a09147a5ad5bc728f1026658eebf965f8785367d
-  data.tar.gz: 1f5ab1cab47b1bdfc28b88634a4d487bc2cc2b4389e30986fde6d2a539d8d93a
+  metadata.gz: ef4f46d4145fd56550698161657af3b3cf77e907536157eddccd58133c6d12d1
+  data.tar.gz: 2fcc853c11188b83ccd9af5a0895cb50d3c16672616b12eee7ef280c00c77d2b
 SHA512:
-  metadata.gz: d3040db3672aaad21fd227da6c8a750c9db5a96ef9dac0b31fd117d64348b9b82949d4df50b5c88330970da27b7c73c6a337a48634a0d94591914622a9072cbe
-  data.tar.gz: b7aff88f1921508842ffe3143809dc2e3f6c7140dd62e6d05446fe3377f98ac1dd0a28eb87d9c6ba4e738d2b31f362972803fd1be45dc687e3e2575079629a55
+  metadata.gz: f141fe8dccd35cc165fac199bff8516cb26660fb2c811dc1f69c3b98d2e81235d435e5827d519b936bc8ae1dd891bdc96296219c63e9b61ffa3055bea3c12eaf
+  data.tar.gz: 8aa13dde8022284a104458002cd404cec31ea5181656256bdb08cf186892dc09b48ee985239e32b66ce668c313951d32dd574577cf40c07f466544f6abce01c0

data/lib/city.rb

@@ -16,7 +16,7 @@ class City
 
   field :deleted_at, type: Time
   def self.all
-    self.where( deleted_at: nil ).order_by( name: :desc )
+    self.where( deleted_at: nil, is_active: true ).order_by( name: :desc )
   end
 
   belongs_to :country, :optional => true
@@ -27,7 +27,7 @@ class City
   has_many :reports
   has_many :venues
   has_many :videos
-  has_many :tags
+  has_and_belongs_to_many :tags
 
   has_many :current_users, :class_name => '::IshModels::UserProfile', :inverse_of => :current_city
   has_many :newsitems
@@ -39,6 +39,7 @@ class City
   embeds_many :features
 
   field :calendar_frame, :type => String
+  field :is_active, type: Boolean, default: true
 
   default_scope ->{ order_by({ :name => :asc }) }
 

data/lib/gallery.rb

@@ -47,7 +47,7 @@ class Gallery
 
   has_many :photos
 
-  belongs_to :tag,   :optional => true
+  has_and_belongs_to_many :tags
   belongs_to :city,  :optional => true
   belongs_to :venue, :optional => true
 

data/lib/report.rb

@@ -1,4 +1,4 @@
-class Report   
+class Report
   include ::Mongoid::Document
   include ::Mongoid::Timestamps
 
@@ -44,11 +44,11 @@ class Report
   field :issue
   field :subhead
   
-  belongs_to :tag,         :optional => true
   belongs_to :city,        :optional => true
   belongs_to :site,        :optional => true
   belongs_to :cities_user, :optional => true
 
+  has_and_belongs_to_many :tags
   has_and_belongs_to_many :venues
   
   has_one :photo
@@ -81,13 +81,13 @@ class Report
   end
   
   def self.not_tagged
-    Report.where( :tag_id => nil, :city => nil )
+    Report.where( :tag_ids => nil, :city => nil )
   end
   
   def self.for_homepage args
     begin
       tag_ids = args[:main_tag].children_tags.map { |tag| tag._id } + [ args[:main_tag]._id ]
-      return Report.where( :tag_id.in => tag_ids ).page args[:page]
+      return Report.where( :tag_ids.in => tag_ids ).page args[:page]
     rescue
       return Report.page args[:page]  
     end
@@ -138,10 +138,6 @@ class Report
     end
   end
 
-  def self.not_tagged
-    Report.where( :tag_id => nil, :city => nil )
-  end
-
   def venue
     self.venues[0] || nil
   end

data/lib/tag.rb

@@ -16,10 +16,6 @@ class Tag
   
   field :weight, :type => Integer, :default => 10
 
-  has_many :reports
-  has_many :galleries
-  has_many :videos
-
   has_many :children_tags, :class_name => 'Tag', :inverse_of => :parent_tag
   belongs_to :parent_tag, :class_name => 'Tag', :inverse_of => :children_tags, :optional => true
 
@@ -31,6 +27,10 @@ class Tag
   belongs_to :city, :optional => true
 
   has_and_belongs_to_many :venues
+  has_and_belongs_to_many :cities
+  has_and_belongs_to_many :galleries
+  has_and_belongs_to_many :reports
+  has_and_belongs_to_many :videos
 
   default_scope ->{
     where({ :is_public => true, :is_trash => false }).order_by({ :name => :asc })

data/lib/video.rb

@@ -60,7 +60,11 @@ class Video
     :styles => {
       :mini   => '20x20#',
       :thumb  => "100x100#",
+      :thumb2  => "200x200#",
+      :s169 => "640x360#",
+      # :s43 => "640x480#",
       :small  => "400x400>",
+      :large  => '950x650>',
     },
     :storage => :s3,
     :s3_credentials => ::S3_CREDENTIALS,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.112
+  version: 0.0.33.117
 platform: ruby
 authors:
 - piousbox