ish_models 0.0.33.137 → 0.0.33.141

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b90fe8d9b148631d369ef4f8d6ef435b983784a0fb520654544f2b51bf52cdb2
-  data.tar.gz: b3f626ccae620eebf147f8edeff38ee84074fd672c37bd030a9712cca5aea437
+  metadata.gz: 9a63c954511cab021c7cef772ae4ad322b1bb61c790aa7c7ebe14f7efcf793f5
+  data.tar.gz: 8da5fe1bec8a68cc7ddddc95723a9b024233ab234257dd3a5af697978eff8bdb
 SHA512:
-  metadata.gz: d2163cae83c7270a83106f36730e52518a4cf7fa384f67f5fde60b1fd5f90b4c781a506cac1050fcbec1cd399ccb9e909dac700d2235bd3b0714dd3016543456
-  data.tar.gz: 1584fb6192513d6531f479b6eafbc1c4695d213ca66f9d8c1de0e4ea10e3c050e6e4ecc74667157e61564c0b346e31d264d38ee5eb9a8b9e192a72d28ba7e6ca
+  metadata.gz: 1c3960a977b88f7920f2ee65c95c04656f61e0c640bca650912f72dbdc3f00062a0ca37ff92fe2c576d1b3a5715d40bc561ce6d1c822165e356fa5219e2b2866
+  data.tar.gz: 5c44ffd813468049999ae2791ad1c2b30f413c1ff6539dce722add499f6275041bf38bc2cb402d630d20d93f39b0e82474444c45bf5aaed60d971e0e061b441a

data/lib/city.rb

@@ -29,12 +29,12 @@ class City
   has_many :videos
   has_and_belongs_to_many :tags
 
-  has_many :current_users, :class_name => '::IshModels::UserProfile', :inverse_of => :current_city
+  has_many :current_users, :class_name => '::Ish::UserProfile', :inverse_of => :current_city
   has_many :newsitems
 
-  has_many :current_users, :class_name => '::IshModels::UserProfile', :inverse_of => :current_city
+  has_many :current_users, :class_name => '::Ish::UserProfile', :inverse_of => :current_city
   has_one :profile_photo, :class_name => 'Photo', :inverse_of => :profile_city
-  has_one :guide, :class_name => '::IshModels::UserProfile', :inverse_of => :guide_city
+  has_one :guide, :class_name => '::Ish::UserProfile', :inverse_of => :guide_city
 
   has_many :features
 

data/lib/co_tailors/README.txt

@@ -0,0 +1,2 @@
+
+namespace co_tailors is trash. It'd take me too much eddors, and I'd rather use SpreeCommerce.

data/lib/co_tailors/address.rb

@@ -3,7 +3,7 @@ class CoTailors::Address
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  belongs_to :profile, :class_name => '::IshModels::UserProfile'
+  belongs_to :profile, :class_name => '::Ish::UserProfile'
   validates :profile, :presence => true
 
   field :name

data/lib/co_tailors/order.rb

@@ -4,7 +4,7 @@ class CoTailors::Order
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  belongs_to :profile, :class_name => '::IshModels::UserProfile'
+  belongs_to :profile, :class_name => '::Ish::UserProfile'
 
   has_many :items, :class_name => '::CoTailors::OrderItem'
 

data/lib/co_tailors/profile_measurement.rb

@@ -8,7 +8,7 @@ class CoTailors::ProfileMeasurement
   UNITS_CENTIMETERS = :centimeters
   field :units, :type => Symbol
 
-  belongs_to :profile,    :class_name => 'IshModels::UserProfile', :optional => true
+  belongs_to :profile,    :class_name => 'Ish::UserProfile', :optional => true
   belongs_to :order_item, :class_name => 'CoTailors::OrderItem',   :optional => true
 
   ## shirt

data/lib/country.rb

@@ -10,4 +10,4 @@ class Country
   
   has_many :cities
   
-end
+end

data/lib/gallery.rb

@@ -11,6 +11,8 @@ class Gallery
   validates :name, :uniqueness => true # , :allow_nil => false
 
   field :is_public,  type: Boolean, default: false
+  has_and_belongs_to_many :shared_profiles, :class_name => 'Ish::UserProfile', :inverse_of => :shared_galleries
+
   field :is_trash,   type: Boolean, default: false
   field :is_done,    type: Boolean, default: false
 
@@ -25,20 +27,16 @@ class Gallery
 
   field :x,       :type => Float
   field :y,       :type => Float
-  field :subhead, :type => String
-  field :descr,   :type => String, :as => :description
-  field :lang,    :type => String, :default => 'en'
+  field :subhead
+  field :descr,   :as => :description
+  field :lang,    :default => 'en'
   field :issue
   field :username
 
-  ## @TODO: this is still not autogenerated
   field :slug
   index({ :slug => -1 }, { :unique => true })
   validates :slug, presence: true, uniqueness: true
-
-  ## @TODO: I should have a redirect service, instead of this specific thing. But only after making $50.
-  # embeds_many :gallery_names, :class_name => '::Ish::GalleryName'
-
+  before_validation :set_slug, :on => :create
 
   def self.list conditions = { :is_trash => false }
     out = self.unscoped.where( conditions ).order_by( :created_at => :desc )
@@ -46,9 +44,8 @@ class Gallery
   end
 
   belongs_to :site,         :optional => true
-  belongs_to :user_profile, :optional => true, :class_name => 'IshModels::UserProfile', :inverse_of => :galleries
+  belongs_to :user_profile, :optional => true, :class_name => 'Ish::UserProfile', :inverse_of => :galleries
 
-  has_and_belongs_to_many :shared_profiles, :class_name => 'IshModels::UserProfile', :inverse_of => :shared_galleries
   has_and_belongs_to_many :tags
 
   has_many :newsitems
@@ -56,7 +53,6 @@ class Gallery
 
   belongs_to :city,  :optional => true
   belongs_to :venue, :optional => true
-  belongs_to :newsparent, polymorphic: true, optional: true
 
 
   set_callback(:create, :before) do |doc|

data/lib/gameui/map.rb

@@ -1,11 +1,16 @@
+require 'ish/premium_item'
 
 class ::Gameui::Map
   include Mongoid::Document
   include Mongoid::Timestamps
+  include Ish::PremiumItem
 
   has_many :markers, :class_name => '::Gameui::Marker', inverse_of: :map
+
   has_many :newsitems, inverse_of: :map, order: :created_at.desc
 
+  field :deleted_at, type: Time, default: nil
+
   field :slug
   validates :slug, uniqueness: true, presence: true
 
@@ -14,7 +19,14 @@ class ::Gameui::Map
   has_many :childs, class_name: '::Gameui::Map', inverse_of: :parent
   has_one :image, class_name: '::Ish::ImageAsset', inverse_of: :location
 
-  has_and_belongs_to_many :bookmarked_profiles, class_name: '::IshModels::UserProfile', inverse_of: :bookmarked_location
+  has_and_belongs_to_many :bookmarked_profiles, class_name: '::Ish::UserProfile', inverse_of: :bookmarked_location
+
+  # shareable, nonpublic
+  field :is_public, type: Boolean, default: true
+  has_and_belongs_to_many :shared_profiles, :class_name => 'Ish::UserProfile', :inverse_of => :shared_locations
+  default_scope ->{ where({ is_public: true, deleted_at: nil }).order_by({ slug: :desc }) }
+  ## @TODO: index default scope, maybe instead of HABTM, use :thru for shared profiles. Make is poly anyway?
+
 
   field :map_slug
   def map
@@ -24,6 +36,9 @@ class ::Gameui::Map
   field :name
   field :description
 
+  RATED_OPTIONS = [ 'pg-13', 'r', 'nc-17' ]
+  field :rated, default: 'pg-13' # 'r', 'nc-17'
+
   ## Possible keys: description, map, markers, newsitems,
   field :labels, type: Object, default: {}
   ## Possible keys:
@@ -69,3 +84,5 @@ class ::Gameui::Map
   end
 
 end
+
+Location = ::Gameui::Map

data/lib/gameui/map_bookmark.rb

@@ -3,7 +3,7 @@ class ::Gameui::MapBookmark
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  belongs_to :profile, class_name: 'IshModels::UserProfile'
+  belongs_to :profile, class_name: 'Ish::UserProfile'
   belongs_to :location, class_name: '::Gameui::Map'
 
 end

data/lib/gameui/marker.rb

@@ -3,9 +3,9 @@ class ::Gameui::Marker
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  belongs_to :map, :class_name => '::Gameui::Map'
 
   field :slug
+  ## @TODO: probably remove this, no reason not to have two markers to the same slug (destination)
   validates_uniqueness_of :slug, scope: :map_id
   validates_presence_of :slug
 
@@ -14,6 +14,16 @@ class ::Gameui::Marker
   has_one :image,       class_name: '::Ish::ImageAsset', inverse_of: :marker_image
   has_one :title_image, class_name: '::Ish::ImageAsset', inverse_of: :marker_title_image
 
+  field :deleted_at, type: Time, default: nil
+
+  # shareable, nonpublic
+  field :is_public, type: Boolean, default: true
+  has_and_belongs_to_many :shared_profiles, :class_name => 'Ish::UserProfile', :inverse_of => :shared_markers
+  default_scope ->{ where({ is_public: true, deleted_at: nil }).order_by({ slug: :desc }) }
+  ## @TODO: index default scope, maybe instead of HABTM, use :thru for shared profiles. Make is poly anyway?
+
+  belongs_to :map, :class_name => '::Gameui::Map'
+
 
   # @deprecated, don't use!
   # _vp_ 2021-09-23
@@ -42,7 +52,6 @@ class ::Gameui::Marker
   end
 
   field :is_active, type: Boolean, default: true
-  field :deleted_at, type: Time, default: nil
 
   field :name, type: String
   validates :name, presence: true

data/lib/gameui/premium_purchase.rb

@@ -3,7 +3,7 @@ class ::Gameui::PremiumPurchase
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  belongs_to :user_profile, :class_name => '::IshModels::UserProfile'
+  belongs_to :user_profile, :class_name => '::Ish::UserProfile'
   belongs_to :item, polymorphic: true
 
 end

data/lib/{app_model2.rb → ish/app_model2.rb}

@@ -1,5 +1,6 @@
 
-class AppModel2
+# @deprecated, remove
+class Ish::AppModel2
   include ::Mongoid::Document
   include ::Mongoid::Timestamps
 
@@ -7,7 +8,7 @@ class AppModel2
   field :is_trash,     :type => Boolean, :default => false
 
   default_scope ->{ where({ :is_public => true, :is_trash => false }).order_by({ :created_at => :desc }) }
-  
+
   field :x, :type => Float
   field :y, :type => Float
 
@@ -16,11 +17,5 @@ class AppModel2
     [['', nil]] + out.map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }
   end
 
-  private
 
-  def puts! arg, label=""
-    puts "+++ +++ #{label}"
-    puts arg.inspect
-  end
-  
 end

data/lib/ish/cache_key.rb

@@ -0,0 +1,14 @@
+
+
+class Ish::CacheKey
+  include ::Mongoid::Document
+  include ::Mongoid::Timestamps
+
+  field :cities,         :type => Time # /api/cities.json
+  field :feature_cities, :type => Time # /api/cities/features.json
+
+  def self.one
+    Ish::CacheKey.first || Ish::CacheKey.new
+  end
+end
+

data/lib/ish/campaign.rb

@@ -4,7 +4,7 @@ class Ish::Campaign
 
   store_in :collection => 'ish_campaign'
 
-  belongs_to :profile, :class_name => 'IshModels::UserProfile'
+  belongs_to :profile, :class_name => 'Ish::UserProfile'
 
   has_and_belongs_to_many :leads,             :class_name => 'Ish::Lead'
   has_and_belongs_to_many :unsubscribe_leads, :class_name => 'Ish::Lead'

data/lib/{ish_models → ish}/configuration.rb

@@ -1,5 +1,5 @@
 
-module IshModels
+module Ish
   class Configuration
     attr_accessor :s3_credentials
 

data/lib/ish/gallery_name.rb

@@ -1,4 +1,5 @@
 
+# @TODO: completely rework this
 module Ish
   class GalleryName
     include Mongoid::Document

data/lib/ish/lead.rb

@@ -9,10 +9,10 @@ class Ish::Lead
 
   store_in :collection => 'ish_lead'
 
-  belongs_to :profile, :class_name => 'IshModels::UserProfile'
+  belongs_to :profile, :class_name => '::Ish::UserProfile'
 
-  has_and_belongs_to_many :campaigns,             :class_name => 'Ish::Campaign', :inverse_of => :leads
-  has_and_belongs_to_many :unsubscribe_campaigns, :class_name => 'Ish::Campaign', :inverse_of => :unsubscribe_leads
+  has_and_belongs_to_many :campaigns,             :class_name => '::Ish::Campaign', :inverse_of => :leads
+  has_and_belongs_to_many :unsubscribe_campaigns, :class_name => '::Ish::Campaign', :inverse_of => :unsubscribe_leads
 
   field :email
   field :job_url

data/lib/ish/nonpublic.rb

@@ -0,0 +1,13 @@
+
+## THIS IS TRASH. I copy-paste repetitively instead!
+
+## aka: Ish::Shareable
+## adds is_public (default true) and #shared_profiles, inverse :shared_items ???
+module Ish::Nonpublic
+
+  def self.included base
+    base.send :field, :is_public, type: Boolean, default: true
+    base.send :has_and_belongs_to_many, :shared_profiles, :class_name => 'Ish::UserProfile', :inverse_of => :shared_markers
+  end
+
+end

data/lib/ish/payment.rb

@@ -3,7 +3,7 @@ class Ish::Payment
   include Mongoid::Timestamps
 
   belongs_to :invoice, :class_name => 'Ish::Invoice', optional: true
-  belongs_to :profile, :class_name => 'IshModels::UserProfile' # , :optional => true
+  belongs_to :profile, :class_name => 'Ish::UserProfile' # , :optional => true
 
   field :amount, :type => Integer # in cents
   field :charge, :type => Hash

data/lib/ish/premium_item.rb

@@ -0,0 +1,14 @@
+
+module Ish::PremiumItem
+
+  def self.included base
+    base.send :field, :premium_tier, type: Integer, default: 0 # how many stars need to spend, to get access? 0 = free
+    base.send :has_many, :premium_purchases, class_name: '::Gameui::PremiumPurchase', as: :item
+  end
+
+  def is_premium
+    premium_tier > 0
+  end
+  def premium?; is_premium; end
+
+end

data/lib/ish/railtie.rb

@@ -0,0 +1,8 @@
+require 'rails'
+
+module Ish
+  class Railtie < Rails::Railtie
+    initializer "ish_models.configure" do |app|
+    end
+  end
+end

data/lib/{ish_models → ish}/user_profile.rb

@@ -1,4 +1,4 @@
-class IshModels::UserProfile
+class Ish::UserProfile
   include Mongoid::Document
   include Mongoid::Timestamps
 
@@ -28,14 +28,16 @@ class IshModels::UserProfile
   belongs_to :guide_city,   :class_name => 'City', :inverse_of => :guide,         :optional => true
 
   has_many :galleries, :inverse_of => :user_profile
-  has_and_belongs_to_many :shared_galleries, :class_name => 'Gallery', :inverse_of => :shared_profiles
+  has_and_belongs_to_many :shared_galleries, :inverse_of => :shared_profiles, class_name: 'Gallery'
+  has_and_belongs_to_many :shared_markers,   :inverse_of => :shared_profiles, class_name: 'Gameui::Marker'
+  has_and_belongs_to_many :shared_locations, :inverse_of => :shared_profiles, class_name: 'Gameui::Map'
 
-  has_many :invoices, :class_name => 'Ish::Invoice'
-  has_many :leads,    :class_name => 'Ish::Lead'
+  has_many :invoices,                             :class_name => '::Ish::Invoice'
+  has_many :leads,                                :class_name => '::Ish::Lead'
   has_many :photos
-  has_many :reports, :inverse_of => :user_profile
-  has_many :stocks,   :class_name => 'Ish::StockWatch'
-  has_many :videos, :inverse_of => :user_profile
+  has_many :reports,   inverse_of: :user_profile
+  has_many :stocks,                               :class_name => '::Warbler::StockWatch'
+  has_many :videos,    inverse_of: :user_profile
   has_many :newsitems, inverse_of: :user_profile
 
   has_and_belongs_to_many :bookmarked_locations, class_name: '::Gameui::Map', inverse_of: :bookmarked_profile
@@ -43,43 +45,32 @@ class IshModels::UserProfile
     bookmarked_locations
   end
 
-  has_and_belongs_to_many :friends,   :class_name => 'IshModels::UserProfile', :inverse_of => :friendeds
-  has_and_belongs_to_many :friendeds, :class_name => 'IshModels::UserProfile', :inverse_of => :friends
+  has_and_belongs_to_many :friends,   :class_name => '::Ish::UserProfile', :inverse_of => :friendeds
+  has_and_belongs_to_many :friendeds, :class_name => '::Ish::UserProfile', :inverse_of => :friends
 
   field :n_unlocks, type: Integer, default: 0
   def n_coins
     n_unlocks
   end
 
-  #
-  # preferences
-  #
+  ## preferences
+  ## @TODO: better naming convention, or remove this
   field :videos_embed, :type => Boolean, :default => false
 
   def sudoer?
     %w( piousbox@gmail.com victor@wasya.co ).include?( self.user.email ) ? true : false
   end
 
-  # manager uses it.
-  # @TODO: check this, this is shit. _vp_ 20170527
+  ## manager uses it.
+  ## @TODO: check this, this is shit. _vp_ 20170527
   def self.list
     out = self.all.order_by( :domain => :asc, :lang => :asc )
     [['', nil]] + out.map { |item| [ item.name, item.id ] }
   end
 
-  #
-  # CoT - colombia tailors
-  #
-  has_one  :measurement,  :class_name => '::CoTailors::ProfileMeasurement'
-  has_many :addresses,    :class_name => '::CoTailors::Address'
-  has_many :orders,       :class_name => '::CoTailors::Order'
-  def current_order
-    self.orders.where( :submitted_at => nil ).first || CoTailors::Order.create( :profile => self )
-  end
-
-  #
-  # GameUI
-  #
+  ##
+  ## GameUI
+  ##
   field :n_stars, type: Integer, default: 0
   has_many :premium_purchases, :class_name => '::Gameui::PremiumPurchase'
   def has_premium_purchase item
@@ -90,5 +81,3 @@ class IshModels::UserProfile
   end
 
 end
-
-Profile = IshModels::UserProfile

data/lib/ish/utils.rb

@@ -5,7 +5,11 @@ module Ish::Utils
 
   def set_slug
     return if slug
-    new_slug = name.downcase.gsub(/[^a-z0-9\s]/i, '').gsub(' ', '-')
+    if name
+      new_slug = name.downcase.gsub(/[^a-z0-9\s]/i, '').gsub(' ', '-')
+    else
+      new_slug = '1'
+    end
     if self.class.where( slug: new_slug ).first
       loop do
         if new_slug[new_slug.length-1].to_i != 0

data/lib/ish_models.rb

@@ -1,10 +1,15 @@
 
-require 'ish_models/railtie' if defined?(Rails)
-require 'ish_models/configuration'
+require 'ish/railtie' if defined?(Rails)
+require 'ish/configuration'
 
 ::S3_CREDENTIALS ||= {}
 
+module CoTailors; end
+class Gameui; end
 module Ish; end
+# I need this thing for permissions#
+class Manager; end
+module Warbler; end
 
 module IshModels
 
@@ -21,65 +26,53 @@ module IshModels
   end
 end
 
-require 'co_tailors'
-require 'co_tailors/product.rb'
-require 'co_tailors/profile_measurement.rb'
-require 'co_tailors/order.rb'
-# require 'co_tailors/order_item.rb' # this is required from within order.rb
-require 'co_tailors/address.rb'
-
-require 'gameui'
-require 'gameui/map.rb'
-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/utils.rb'
-require 'ish/yahoo_stockwatcher.rb'
-
-# obsolete, use `ish` namespace now
-require 'ish_models/cache_key.rb' # this is really obsolete? _vp_ 20180123
-require 'ish_models/user_profile.rb'
-
-require 'app_model2.rb'
-require 'aux_model.rb'
-require 'city.rb'
-require 'cities_user.rb'
-require 'country.rb'
-require 'event.rb'
-require 'feature.rb'
-require 'gallery.rb'
-# require 'gallery2.rb'
-require 'manager.rb'
-require 'newsitem.rb'
-require 'photo.rb'
-require 'public_item.rb'
-require 'report.rb'
-require 'site.rb'
-require 'tag.rb'
-require 'venue.rb'
-require 'video.rb'
-
-
-
-
+require 'gameui/map'
+require 'gameui/map_bookmark'
+require 'gameui/marker'
+require 'gameui/premium_purchase'
+
+require 'ish/cache_key'
+require 'ish/campaign'
+require 'ish/crawler'
+require 'ish/gallery_name'
+require 'ish/image_asset'
+require 'ish/input_error'
+require 'ish/invoice'
+require 'ish/issue'
+require 'ish/lead'
+require 'ish/nonpublic'
+require 'ish/payment'
+require 'ish/premium_item'
+require 'ish/utils'
+require 'ish/user_profile'
+
+require 'aux_model'
+require 'city'
+require 'cities_user'
+require 'country'
+require 'event'
+require 'feature'
+require 'gallery'
+require 'newsitem'
+require 'photo'
+require 'report'
+require 'site'
+require 'tag'
+require 'venue'
+require 'video'
+
+require 'warbler/stock_watch'
+require 'warbler/ameritrade'
+
+## warbler
+# require 'warbler/alphavantage_stockwatcher'
+# require 'warbler/ameritrade'
+# require 'warbler/covered_call'
+# require 'warbler/iron_condor'
+# require 'warbler/iron_condor_watcher'
+# require 'warbler/stock_action'
+# require 'warbler/stock_option'
+# require 'warbler/yahoo_stockwatcher'
 
 
 

data/lib/newsitem.rb

@@ -6,7 +6,7 @@ class Newsitem
   belongs_to :tag,     :optional => true
   belongs_to :city,    :optional => true
   belongs_to :report,  :optional => true
-  belongs_to :user_profile, class_name: 'IshModels::UserProfile', optional: true
+  belongs_to :user_profile, class_name: 'Ish::UserProfile', optional: true
   belongs_to :map, class_name: '::Gameui::Map', optional: true
 
   belongs_to :gallery, :optional => true

data/lib/photo.rb

@@ -7,12 +7,12 @@ class Photo
 
   has_and_belongs_to_many :viewers, :class_name => 'User', :inverse_of => :viewable_photos
 
-  belongs_to :user_profile,  :class_name => 'IshModels::UserProfile',               :optional => true
+  belongs_to :user_profile,  :class_name => 'Ish::UserProfile',               :optional => true
   def user
     user_profile
   end
   belongs_to :profile_city,  :class_name => 'City',                    :inverse_of => :profile_photo, :optional => true
-  belongs_to :user_profile,  :class_name => 'IshModels::UserProfile',  :inverse_of => :profile_photo, :optional => true
+  belongs_to :user_profile,  :class_name => 'Ish::UserProfile',  :inverse_of => :profile_photo, :optional => true
   belongs_to :profile_venue, :class_name => 'Venue',                   :inverse_of => :profile_photo, :optional => true
   belongs_to :profile_event, :class_name => 'Event',                   :inverse_of => :profile_photo, :optional => true
 

data/lib/report.rb

@@ -11,6 +11,7 @@ class Report
   field :slug
   validates :slug, :uniqueness => true, :presence => true
   index({ :slug => 1 }, { :unique => true })
+  before_validation :set_slug, :on => :create
 
   ## Can be one of: default (nil), longscroll
   field :item_type, type: String
@@ -18,7 +19,7 @@ class Report
   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 }, { name: 'default_index' })
 
   field :is_public, :type => Boolean, :default => true
   index({ :is_public => 1 })
@@ -38,7 +39,7 @@ class Report
   field :lang, :type => String, :default => 'en'
   index({ :lang => 1 })
 
-  belongs_to :user_profile, :optional => true, :class_name => 'IshModels::UserProfile'
+  belongs_to :user_profile, :optional => true, :class_name => 'Ish::UserProfile'
 
   # validates :user, :presence => true, :allow_nil => false
   field :username, :type => String, :default => 'anonymous'
@@ -97,7 +98,7 @@ class Report
     end
   end
 
-  before_validation :set_slug, :on => :create
+
 
   set_callback :update, :after do |doc|
     Site.update_all updated_at: Time.now

data/lib/video.rb

@@ -27,7 +27,7 @@ class Video
   belongs_to :site, :optional => true
   # has_many :newsitems # unnecessary, right? _vp_ 20200412
 
-  belongs_to :user_profile, :optional => true, :class_name => 'IshModels::UserProfile', :inverse_of => :videos
+  belongs_to :user_profile, :optional => true, :class_name => 'Ish::UserProfile', :inverse_of => :videos
 
   accepts_nested_attributes_for :site, :tags, :city
 

data/lib/{ish → warbler}/ameritrade.rb

@@ -1,4 +1,6 @@
 
+require 'httparty'
+
 #
 # * make calls every once in a while
 # * If the option price dips below a threshold, close the position (create the order to buy back the option)
@@ -9,36 +11,21 @@
 # https://developer.tdameritrade.com/option-chains/apis/get/marketdata/chains
 # FVRR_082021P200
 
-require 'httparty'
 
-module Ish::Ameritrade
+module Warbler::Ameritrade
 
   CONFIG = {
     underlying_downprice_tolerance: 0.14,
   }
 
-  # def self.main_fvrr_1
-  #   query_hash = {
-  #     apikey: ::TD_AME[:apiKey],
-  #     symbol: 'FVRR',
-  #     contractType: 'PUT',
-  #     strike: 200,
-  #     fromDate: '2021-08-20',
-  #     toDate: '2021-08-20',
-  #   }
-  #   response = ::Ish::Ameritrade::Api.get_option_chain(query_hash)
-  #   puts! response, 'ze repsonse'
-  # end
-
   ## AKA stop loss
   def self.main_fvrr_2
-    # response = ::Ish::Ameritrade::Api.get_quote({ symbol: 'FVRR_082021P200' })
 
     # @TODO: pass the info on the position in here.
     strike_price = 200
 
     # What is my risk tolerance here? 14% down movement of the underlying
-    response = ::Ish::Ameritrade::Api.get_quote({ symbol: 'FVRR' })
+    response = ::Warbler::Ameritrade::Api.get_quote({ symbol: 'FVRR' })
     last_price = response[:lastPrice]
     tolerable_price = ( strike_price * (1-CONFIG[:underlying_downprice_tolerance]) )
 
@@ -49,7 +36,7 @@ module Ish::Ameritrade
 
 end
 
-class Ish::Ameritrade::Api
+class ::Warbler::Ameritrade::Api
   include ::HTTParty
   base_uri 'https://api.tdameritrade.com'
 

data/lib/{ish → warbler}/stock_action.rb

@@ -9,7 +9,7 @@ class Ish::StockAction
 
   store_in :collection => 'ish_stock_action'
 
-  belongs_to :profile, :class_name => 'IshModels::UserProfile'
+  belongs_to :profile, :class_name => 'Ish::UserProfile'
   belongs_to :stock_watch, :class_name => 'Ish::StockWatch'
   has_many :stock_options, :class_name => 'Ish::StockOption'
 

data/lib/{ish → warbler}/stock_option.rb

@@ -19,7 +19,7 @@ class Ish::StockOption
   field :quantity, :type => Integer
   field :is_active, :type => Integer, :default => true # whether this position is current or in the past
 
-  belongs_to :profile,      :class_name => 'IshModels::UserProfile'
+  belongs_to :profile,      :class_name => 'Ish::UserProfile'
   belongs_to :stock_action, :class_name => 'Ish::StockAction', :optional => true
 
   def to_s

data/lib/{ish_models → warbler}/stock_watch.rb

@@ -1,9 +1,5 @@
 
-#
-# See also ish_manager / lib / stockwatcher.rb
-#
-
-class IshModels::StockWatch
+class Warbler::StockWatch
   include Mongoid::Document
   include Mongoid::Timestamps
 
@@ -16,15 +12,6 @@ class IshModels::StockWatch
   ACTIONS = NOTIFICATION_TYPES
   field :notification_type, :type => Symbol, :as => :action
 
-=begin
-  def action
-    return notification_type
-  end
-  def action= which
-    notification_type = which
-  end
-=end
-
   field :price, :type => Float
 
   DIRECTIONS      = [ :ABOVE, :BELOW ]
@@ -32,6 +19,6 @@ class IshModels::StockWatch
   DIRECTION_BELOW = :BELOW
   field :direction, :type => Symbol
 
-  belongs_to :profile, :class_name => 'IshModels::UserProfile'
+  belongs_to :profile, :class_name => 'Ish::UserProfile'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.137
+  version: 0.0.33.141
 platform: ruby
 authors:
 - piousbox
@@ -100,11 +100,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/app_model2.rb
 - lib/aux_model.rb
 - lib/cities_user.rb
 - lib/city.rb
-- lib/co_tailors.rb
+- lib/co_tailors/README.txt
 - lib/co_tailors/address.rb
 - lib/co_tailors/order.rb
 - lib/co_tailors/order_item.rb
@@ -114,46 +113,45 @@ files:
 - lib/event.rb
 - lib/feature.rb
 - lib/gallery.rb
-- lib/gameui.rb
 - lib/gameui/map.rb
 - lib/gameui/map_bookmark.rb
 - lib/gameui/marker.rb
 - lib/gameui/premium_purchase.rb
-- lib/ish/alphavantage_stockwatcher.rb
-- lib/ish/ameritrade.rb
+- lib/ish/app_model2.rb
+- lib/ish/cache_key.rb
 - lib/ish/campaign.rb
-- lib/ish/covered_call.rb
-- lib/ish/covered_call_watcher.rb
+- lib/ish/configuration.rb
 - lib/ish/crawler.rb
 - lib/ish/gallery_name.rb
 - lib/ish/image_asset.rb
 - lib/ish/input_error.rb
 - lib/ish/invoice.rb
-- lib/ish/iron_condor.rb
-- lib/ish/iron_condor_watcher.rb
 - lib/ish/issue.rb
 - lib/ish/lead.rb
+- lib/ish/nonpublic.rb
 - lib/ish/payment.rb
-- lib/ish/stock_action.rb
-- lib/ish/stock_option.rb
-- lib/ish/stock_watch.rb
+- lib/ish/premium_item.rb
+- lib/ish/railtie.rb
+- lib/ish/user_profile.rb
 - lib/ish/utils.rb
-- lib/ish/yahoo_stockwatcher.rb
 - lib/ish_models.rb
-- lib/ish_models/cache_key.rb
-- lib/ish_models/configuration.rb
-- lib/ish_models/railtie.rb
-- lib/ish_models/stock_watch.rb
-- lib/ish_models/user_profile.rb
-- lib/manager.rb
 - lib/newsitem.rb
 - lib/photo.rb
-- lib/public_item.rb
 - lib/report.rb
 - lib/site.rb
 - lib/tag.rb
 - lib/venue.rb
 - lib/video.rb
+- lib/warbler/alphavantage_stockwatcher.rb
+- lib/warbler/ameritrade.rb
+- lib/warbler/covered_call.rb
+- lib/warbler/covered_call_watcher.rb
+- lib/warbler/iron_condor.rb
+- lib/warbler/iron_condor_watcher.rb
+- lib/warbler/stock_action.rb
+- lib/warbler/stock_option.rb
+- lib/warbler/stock_watch.rb
+- lib/warbler/yahoo_stockwatcher.rb
 homepage: http://wasya.co
 licenses:
 - MIT

data/lib/co_tailors.rb

@@ -1,3 +0,0 @@
-
-module CoTailors
-end

data/lib/gameui.rb

@@ -1,2 +0,0 @@
-class Gameui
-end

data/lib/ish/stock_watch.rb

@@ -1,33 +0,0 @@
-
-#
-# This is not used... not worth the time to change. Use IshModels::StockWatch instead
-# _vp_ 20171026
-#
-class Ish::StockWatch
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  store_in :collection => 'ish_stock_watch'
-
-  field :ticker
-
-  NOTIFICATION_TYPES = [ :NONE, :EMAIL, :SMS ]
-  NOTIFICATION_NONE  = :NONE
-  NOTIFICATION_EMAIL = :EMAIL
-  NOTIFICATION_SMS   = :SMS
-  ACTIONS = NOTIFICATION_TYPES
-  field :notification_type, :type => Symbol, :as => :action
-  field :price, :type => Float
-
-  DIRECTIONS      = [ :ABOVE, :BELOW ]
-  DIRECTION_ABOVE = :ABOVE
-  DIRECTION_BELOW = :BELOW
-  field :direction, :type => Symbol
-
-  belongs_to :profile, :class_name => 'IshModels::UserProfile'
-
-  def to_s
-    "#{self.ticker} #{self.direction} #{self.price}"
-  end
-
-end

data/lib/ish_models/cache_key.rb

@@ -1,14 +0,0 @@
-
-module IshModels
-  class CacheKey
-    include ::Mongoid::Document
-    include ::Mongoid::Timestamps
-
-    field :cities,         :type => Time # /api/cities.json
-    field :feature_cities, :type => Time # /api/cities/features.json
-
-    def self.one
-      IshModels::CacheKey.first || IshModels::CacheKey.new
-    end
-  end
-end

data/lib/ish_models/railtie.rb

@@ -1,18 +0,0 @@
-require 'rails'
-# require 'byebug'
-
-# File.open( '/tmp/this', 'a' ) { |f| f.puts "ish_models/railtie root: #{Rails.root}" }
-# require Rails.root.join("config/initializers/00_s3.rb")        
-
-module IshModels
-  class Railtie < Rails::Railtie
-
-    # File.open( '/tmp/this', 'a' ) { |f| f.puts "ish_models/railtie config: #{config.inspect}" }
-    # File.open( '/tmp/this', 'a' ) { |f| f.puts "ish_models/railtie callback root: #{Rails.root}" }
-
-    initializer "ish_models.configure" do |app|
-      # File.open( '/tmp/this', 'a' ) { |f| f.puts "ish_models/railtie callback initializer root: #{Rails.root}" }
-      # require Rails.root.join("config/initializers/00_s3.rb")
-    end
-  end
-end

data/lib/manager.rb

@@ -1,7 +0,0 @@
-
-#
-# I need this thing for permissions
-#
-class Manager
-end
-

data/lib/public_item.rb

@@ -1,60 +0,0 @@
-class PublicItem
-
-=begin
-  ## let's try to make it work with newsitems, without publicitems yet.
-
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  belongs_to :site
-  belongs_to :city
-  belongs_to :tag
-  
-  field :username
-
-  # acts as a report
-  # acts as a gallery
-  # acts as a video  
-  has_many :photos
-
-  belongs_to :photo
-  belongs_to :report
-  belongs_to :gallery
-  belongs_to :video
-
-  field :name, :type => String
-  field :descr, :type => String
-  field :image_path, :type => String
-  field :link_path, :type => String
-  field :username, :type => String # @TODO do I use this???
-  field :partial_name, :type => String, :default => nil  # @deprecated, but let's not remove it.
-
-  field :weight, :type => Integer, :default => 10
-  field :n_upvotes, :type => Integer, :default => 0
-  field :n_downvotes, :type => Integer, :default => 0
-  field :upvoting_users, :type => Array, :default => []
-  field :downvoting_users, :type => Array, :default => []
-  field :is_feature, :type => Boolean, :default => false
-
-  default_scope ->{ order_by({ :created_at => :desc }) }
-
-  def self.from_params item
-    n = Newsitem.new
-    n.descr = item[:descr]
-    n.username = item[:username]
-
-    unless item[:report_id].blank?
-      n.report = Report.find item[:report_id]
-    end
-    
-    unless item[:gallery_id].blank?
-      n.gallery = Gallery.find item[:gallery_id]
-    end
-
-    n.partial_name = item.partial_name unless item.partial_name.blank?
-
-    return n
-  end
-=end
-
-end