ish_models 0.0.33.135 → 0.0.33.136

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c5a6043e8144f6fae57963f58a0880eb171044ae3bbc62d36ae013c0db3be04
-  data.tar.gz: e3414aeaba21e5273054e14d8bf037ec798418c1a97a894e5861d8811ef2d224
+  metadata.gz: 172ea3b5881a62b2d1c4ef8bed4360782c6f9676eaa39c1be7e9febab7e8937b
+  data.tar.gz: ba242d1b5cc551a2257a0c2183413f1a9cebd5448cc570629761cb69e9e99863
 SHA512:
-  metadata.gz: b2154545c111a45447bfa2bd1421e65afe4b68b17368fedf0de098e4cace9ea03cc9db25e3c0e7cd9f8b380a270fe7ce75b0544d8fa66d233ca4800e19046ee2
-  data.tar.gz: 99a571b6c35ed885e7b204dc922f5289451d0d4dc3d01ce1dd6f03a970dddf9b1c297d815353853c85c319c0ca60f0c22bff36ca37d3ef60a20476a926c6c16a
+  metadata.gz: c849a3a2b774e4290e10e28b83561f11d85eb0ed316acc2118ad8ff6188d2d7c902b7bab1e0e192f4010a6ab9f1bafafec3ecaaecf47029084c9fcce43da2c34
+  data.tar.gz: 5c8641248d523733c55643e8fe3ee95c4aa75cd4b7257684b60d4d48735e1a68187015abd7dbbda3558964f6c97c090a12fba4de3deab8081e952501bcec3e1d

data/lib/city.rb

@@ -36,7 +36,7 @@ class City
   has_one :profile_photo, :class_name => 'Photo', :inverse_of => :profile_city
   has_one :guide, :class_name => '::IshModels::UserProfile', :inverse_of => :guide_city
 
-  embeds_many :features
+  has_many :features
 
   field :calendar_frame, :type => String
   field :is_active, type: Boolean, default: true

data/lib/feature.rb

@@ -1,31 +1,25 @@
 
-class Feature  
-
+class Feature
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  field :name,    :type => String
-  field :subhead, :type => String
+  field :name
+  field :subhead
 
-  field :image_path,   :type => String
-  field :link_path,    :type => String
-  field :partial_name, :type => String
-  field :inner_html,   :type => String
-  field :weight,       :type => Integer, :default => 10
-  
-  belongs_to :photo, :optional => true
-  belongs_to :report, :optional => true
-  belongs_to :gallery, :optional => true
-  belongs_to :video, :optional => true
-  # has_one :photo
-  # has_one :report
-  # has_one :gallery
-  # has_one :video
+  field :image_path
+  field :link_path
+  field :partial_name
+  field :inner_html
+  field :weight, type: Integer, default: 10
 
-  embedded_in :venue
-  embedded_in :site
-  embedded_in :city
-  embedded_in :tag
+  belongs_to :city, optional: true
+  belongs_to :gallery, optional: true
+  belongs_to :photo, optional: true
+  belongs_to :report, optional: true
+  belongs_to :site, optional: true
+  belongs_to :tag, optional: true
+  belongs_to :video, optional: true
+  belongs_to :venue, optional: true
 
   def self.all
     self.order_by( :created_at => :desc )
@@ -34,5 +28,5 @@ class Feature
   def self.n_features
     4
   end
-  
+
 end

data/lib/gameui/map.rb

@@ -4,7 +4,7 @@ class ::Gameui::Map
   include Mongoid::Timestamps
 
   has_many :markers, :class_name => '::Gameui::Marker', inverse_of: :map
-  has_many :newsitems, inverse_of: :map
+  has_many :newsitems, inverse_of: :map, order: :created_at.desc
 
   field :slug
   validates :slug, uniqueness: true, presence: true
@@ -24,6 +24,12 @@ class ::Gameui::Map
   field :name
   field :description
 
+  ## Possible keys: description, map, markers, newsitems,
+  field :labels, type: Object, default: {}
+  ## Possible keys:
+  ## config.description.collapsible
+  field :config, type: Object, default: {}
+
   # @deprecated, dont use!
   field :img_path
 

data/lib/ish/utils.rb

@@ -0,0 +1,25 @@
+
+module Ish::Utils
+
+  private
+
+  def set_slug
+    return if slug
+    new_slug = name.downcase.gsub(/[^a-z0-9\s]/i, '').gsub(' ', '-')
+    if self.class.where( slug: new_slug ).first
+      loop do
+        if new_slug[new_slug.length-1].to_i != 0
+          # inrement last digit
+          last_digit = new_slug[new_slug.length-1].to_i
+          new_slug = "#{new_slug[0...new_slug.length-1]}#{last_digit+1}"
+        else
+          # add '-1' to the end
+          new_slug = "#{new_slug}-1"
+        end
+        break if !self.class.where( slug: new_slug ).first
+      end
+    end
+    self.slug = new_slug
+  end
+
+end

data/lib/ish_models.rb

@@ -34,23 +34,24 @@ require 'gameui/map_bookmark.rb'
 require 'gameui/marker.rb'
 require 'gameui/premium_purchase.rb'
 
+# require 'ish/alphavantage_stockwatcher.rb'
 require 'ish/ameritrade'
+require 'ish/campaign.rb'
 require 'ish/covered_call'
 require 'ish/crawler.rb'
 require 'ish/gallery_name.rb'
 require 'ish/image_asset.rb'
 require 'ish/input_error.rb'
+require 'ish/invoice.rb'
 require 'ish/iron_condor.rb'
 require 'ish/iron_condor_watcher.rb'
+require 'ish/issue.rb'
+require 'ish/lead.rb'
 require 'ish/payment.rb'
 require 'ish/stock_action.rb'
 require 'ish/stock_option.rb'
 require 'ish/stock_watch.rb'
-# require 'ish/alphavantage_stockwatcher.rb'
-require 'ish/invoice.rb'
-require 'ish/lead.rb'
-require 'ish/campaign.rb'
-require 'ish/issue.rb'
+require 'ish/utils.rb'
 require 'ish/yahoo_stockwatcher.rb'
 
 # obsolete, use `ish` namespace now

data/lib/newsitem.rb

@@ -20,6 +20,10 @@ class Newsitem
 
   field :name
   field :descr
+  def description
+    descr
+  end
+
   field :image_path
   field :link_path
   field :username

data/lib/report.rb

@@ -1,20 +1,24 @@
 class Report
   include ::Mongoid::Document
   include ::Mongoid::Timestamps
+  include Ish::Utils
 
   field :name, :type => String
   validates :name, :presence => true
   # index({ :name => 1 }, { :unique => true })
   index({ :name => 1, :is_trash => 1 })
 
-  field :name_seo, :type => String
-  validates :name_seo, :uniqueness => true, :presence => true
-  index({ :name_seo => 1 }, { :unique => true })
+  field :slug
+  validates :slug, :uniqueness => true, :presence => true
+  index({ :slug => 1 }, { :unique => true })
 
-  field :descr, :type => String 
+  ## Can be one of: default (nil), longscroll
+  field :item_type, type: String
+
+  field :descr, :type => String
 
   field :is_trash, :type => Boolean, :default => false
-  index :is_trash => 1, :is_public => 1 
+  index :is_trash => 1, :is_public => 1
 
   field :is_public, :type => Boolean, :default => true
   index({ :is_public => 1 })
@@ -27,13 +31,13 @@ class Report
 
   field :is_done, :type => Boolean, :default => true
   index({ :is_done => 1 })
-  
+
   field :x, :type => Float
   field :y, :type => Float
 
   field :lang, :type => String, :default => 'en'
   index({ :lang => 1 })
-   
+
   belongs_to :user_profile, :optional => true, :class_name => 'IshModels::UserProfile'
 
   # validates :user, :presence => true, :allow_nil => false
@@ -43,14 +47,14 @@ class Report
 
   field :issue
   field :subhead
-  
+
   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
 
   field :n_upvotes, :default => 0
@@ -59,15 +63,15 @@ class Report
   default_scope ->{
     where({ is_public: true, is_trash: false }).order_by({ created_at: :desc })
   }
-  
+
   has_many :newsitems
 
   def self.list conditions = { :is_trash => false }
     out = self.where( conditions ).order_by( :name => :asc ).limit( 100 )
     [['', nil]] + out.map { |item| [ item.name, item.id ] }
   end
-  
-  PER_PAGE = 20  
+
+  PER_PAGE = 20
   def self.paginates_per
     self::PER_PAGE
   end
@@ -75,33 +79,30 @@ class Report
   def venue
     return self.venues[0] || nil
   end
-  
+
   def self.all
     self.where( :is_public => true, :is_trash => false ).order_by( :created_at => :desc )
   end
-  
+
   def self.not_tagged
     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_ids.in => tag_ids ).page args[:page]
     rescue
-      return Report.page args[:page]  
+      return Report.page args[:page]
     end
   end
 
-  before_validation :set_name_seo, :on => :create
-  def set_name_seo
-    self.name_seo ||= self.name.gsub(' ', '-').gsub('.', '')
-  end
+  before_validation :set_slug, :on => :create
 
   set_callback :update, :after do |doc|
     Site.update_all updated_at: Time.now
   end
-  
+
   set_callback :create, :after do |doc|
     if doc.is_public
 
@@ -115,7 +116,7 @@ class Report
           v.newsitems << n
           v.save
         end
-      end 
+      end
 
       unless doc.city.blank?
         city = City.find doc.city.id
@@ -131,7 +132,7 @@ class Report
       end
     end
   end
-  
+
   def self.clear
     if Rails.env.test?
       self.unscoped.each { |r| r.remove }
@@ -149,5 +150,5 @@ class Report
   end
   def premium?; is_premium; end
   has_many :premium_purchases, class_name: '::Gameui::PremiumPurchase', as: :item
-  
+
 end

data/lib/site.rb

@@ -30,7 +30,7 @@ class Site
   field :is_primary, :type => Boolean, :default => false
   field :is_private, :type => Boolean, :default => false
   field :private_user_emails, :type => Array, :default => []
-  
+
   field :homepage_layout, :type => String, :default => 'show'
   field :layout, :type => String, :default => 'application'
 
@@ -40,9 +40,8 @@ class Site
   has_many :videos
   has_many :newsitems, :order => :created_at.desc
   has_many :issues, :class_name => 'Ish::Issue'
+  has_many :features, :order => :created_at.desc
 
-  embeds_many :features, :order => :created_at.desc
-  
   default_scope ->{ where({ :is_trash => false }).order_by({ :domain => :asc, :lang => :asc }) }
 
   set_callback :create, :before do |doc|
@@ -61,7 +60,7 @@ class Site
   end
 
   LANGUAGES = [ 'en', 'ru', 'pt' ]
-  
+
   # manager uses it.
   def self.list
     out = self.all.order_by( :domain => :asc, :lang => :asc )
@@ -79,7 +78,7 @@ class Site
   def n_private_reports
     self.reports.unscoped.where( :is_public => false, :is_trash => false ).length
   end
-  
+
   def its_locales
     Site.where( :domain => self.domain ).map { |s| s.lang.to_sym }
   end

data/lib/tag.rb

@@ -1,12 +1,13 @@
 class Tag
   include Mongoid::Document
   include Mongoid::Timestamps
+  include Ish::Utils
 
   field :name, :type => String
   # validates :name, :uniqueness => true, :allow_nil => false
 
-  field :name_seo, :as => :tagname
-  validates :name_seo, :uniqueness => true, :allow_nil => false
+  field :slug
+  validates :slug, :uniqueness => true, presence: true, allow_nil: false
 
   field :descr, :type => String, :default => ''
 
@@ -19,8 +20,7 @@ class Tag
   has_many :children_tags, :class_name => 'Tag', :inverse_of => :parent_tag
   belongs_to :parent_tag, :class_name => 'Tag', :inverse_of => :children_tags, :optional => true
 
-  embeds_many :features
-  # embeds_many :newsitems
+  has_many :features
   has_many :newsitems
 
   belongs_to :site, :optional => true
@@ -36,11 +36,7 @@ class Tag
     where({ :is_public => true, :is_trash => false }).order_by({ :name => :asc })
   }
 
-  before_create do |d|
-    if d.name_seo.blank?
-      d.name_seo = d.name.gsub(' ', '-')
-    end
-  end
+  before_validation :set_slug
 
   def self.clear
     if Rails.env.test?
@@ -72,9 +68,9 @@ class Tag
     4
   end
 
-  # @deprecated I don't even know why I have this. Should be simplified into non-being.
   def self.n_features
     4
   end
+  field :n_features, type: Integer, default: 4
 
 end

data/lib/venue.rb

@@ -1,14 +1,16 @@
 class Venue
   include ::Mongoid::Document
   include ::Mongoid::Timestamps
+  include Ish::Utils
 
   field :address
 
   field :name, :type => String
   validates :name, :uniqueness => true, :allow_nil => false
 
-  field :name_seo, :type => String
-  validates :name_seo, :uniqueness => true, :allow_nil => false
+  field :slug
+  validates :slug, :uniqueness => true, :allow_nil => false
+  before_validation :set_slug
 
   field :subhead
   field :descr
@@ -41,9 +43,8 @@ class Venue
   has_many :reports
   has_many :galleries
   has_many :photos
-
-  embeds_many :newsitems
-  embeds_many :features
+  has_many :newsitems
+  has_many :features
 
   PER_PAGE = 6
 
@@ -52,9 +53,7 @@ class Venue
     [['', nil]] + out.map { |item| [ item.name, item.id ] }
   end
 
-  set_callback :create, :before do |doc|
-    doc.name_seo = doc.name.gsub(' ', '-')
-  end
+
 
   set_callback :save, :before do |doc|
     if doc.city

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.135
+  version: 0.0.33.136
 platform: ruby
 authors:
 - piousbox
@@ -137,6 +137,7 @@ files:
 - lib/ish/stock_action.rb
 - lib/ish/stock_option.rb
 - lib/ish/stock_watch.rb
+- lib/ish/utils.rb
 - lib/ish/yahoo_stockwatcher.rb
 - lib/ish_models.rb
 - lib/ish_models/cache_key.rb