ish_models 0.0.33.163 → 0.0.33.167

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68d413825a0a694b0bdfd1a6fee4a85812bb2f3d34e0f431d2b0a30c27b29304
-  data.tar.gz: 3a5a7db6ce515ba7e9711839ab4c10b8f74387abd0e6d38c7bf0510d5e86094b
+  metadata.gz: 8fc57636dd6d156f9715cadb415fbf81801fb3f2be1200eb7314e05de8921643
+  data.tar.gz: 84702d8af0e9f36a2d5b2cd2e661d4bce3b812a6b5bd13b6d7c2989308264b7a
 SHA512:
-  metadata.gz: c6b20eb004d674c488b459c23c12ca284bacefb558e1dfcdf03ce2e9b9548fb92ee7ba0c7452dbefb785b05e908a00f4ebdbda6548db7ae9a59df327944032b1
-  data.tar.gz: 2de807a995e6523d7ff0251f26a24daa127b3b13c1a00279baa69f72b78f708ff0e4cf5317255b19b8cc1f4b98fc629b4aede0321342b2baa6ab4b6d454f0596
+  metadata.gz: c7f085d7f266dab23690e7d1ec73959b11a0f336ab0da53f58a99fc8b2dc7d9d561eddbe6919e410108c6a411f0e5c876e06c549951fe5d3cbdb28b342263b87
+  data.tar.gz: 86c44f77e1c70983802830ca62d517844137d1e7a0940033fd372457138cce994901decf15d73fa64b5082e5ad44bec0a87be8a7822b5b544f9bb11698c6d34f

data/lib/{co_tailors/address.rb → address.rb}

@@ -1,5 +1,5 @@
 
-class CoTailors::Address
+class Address
   include Mongoid::Document
   include Mongoid::Timestamps
 

data/lib/city.rb

@@ -1,7 +1,6 @@
 class City
   include ::Mongoid::Document
   include ::Mongoid::Timestamps
-  include AuxModel
 
   field :name, :type => String
   field :description, :type => String, :default => 'The description of this city'

data/lib/gameui/map.rb

@@ -87,7 +87,7 @@ class ::Gameui::Map
 
   def self.list conditions = { is_trash: false }
     out = self.order_by( created_at: :desc )
-    [[nil, nil]] + out.map { |item| [ item.name, item.id ] }
+    [[nil, nil]] + out.map { |item| [ item.name, item.id.to_s ] }
   end
 
   def breadcrumbs

data/lib/gameui/marker.rb

@@ -4,13 +4,16 @@ class ::Gameui::Marker
   include Mongoid::Timestamps
   include Ish::Utils
 
-  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
-
   field :name, type: String
-  validates :name, presence: true
+  validates_uniqueness_of :name, scope: :map_id
+  validates_presence_of :name
+
+  ## This is not a map, I don't need a slug.
+  ## @TODO: remove it. _vp_ 2022-06-17
+  field :slug
+  def slug
+    return self[:slug] || id.to_s
+  end
 
   field :ordering, type: String, default: 'jjj'
 
@@ -31,8 +34,8 @@ class ::Gameui::Marker
   field :deleted_at, type: Time, default: nil # @TODO: replace with paranoia
 
   ## @TODO: abstract this into a module
-  field :x, :type => Float
-  field :y, :type => Float
+  field :x, :type => Float, default: 0
+  field :y, :type => Float, default: 0
 
   field :is_public, type: Boolean, default: true
   def self.public
@@ -54,19 +57,7 @@ class ::Gameui::Marker
 
   belongs_to :map,             class_name: '::Gameui::Map',    inverse_of: :markers
 
-  belongs_to :destination,     class_name: '::Gameui::Map',    inverse_of: :from_markers
-  before_validation :set_destination
-  def set_destination
-    d = Map.where({ slug: slug }).first
-
-    puts! self, '#set_destination'
-
-    if !d
-      self.errors.add( "Cannot save marker, destination |#{slug}| not found." )
-      return
-    end
-    self.destination_id = d.id
-  end
+  belongs_to :destination, class_name: '::Gameui::Map', inverse_of: :from_markers
 
   belongs_to :creator_profile, class_name: 'Ish::UserProfile', inverse_of: :my_markers
 
@@ -98,11 +89,8 @@ class ::Gameui::Marker
     end
   end
 
-  field :centerOffsetX, type: Integer, default: 0
-  # validates :centerXOffset, presence: true
-
-  field :centerOffsetY, type: Integer, default: 0
-  # validates :centerYOffset, presence: true
+  field :centerOffsetX, type: Float, default: 0
+  field :centerOffsetY, type: Float, default: 0
 
 
 

data/lib/ish/lead.rb

@@ -7,7 +7,7 @@ class Ish::Lead
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  store_in :collection => 'ish_lead'
+  store_in :collection => 'ish_leads'
 
   belongs_to :profile, :class_name => '::Ish::UserProfile'
 
@@ -49,3 +49,6 @@ class Ish::Lead
   field :extra, :type => Array, :default => []
 
 end
+
+Lead = Ish::Lead
+

data/lib/ish/unsubscribe.rb

@@ -0,0 +1,11 @@
+
+class Ish::Unsubscribe
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :email
+  field :unsubscribed_at
+  field :reason
+
+end
+

data/lib/ish/user_profile.rb

@@ -31,6 +31,9 @@ class Ish::UserProfile
   field :lang, default: 'en'
 
   ROLES = [ :admin, :manager, :guy ]
+  ROLE_ADMIN   = :admin
+  ROLE_MANAGER = :manager
+  ROLE_GUY     = :guy
   field :role_name, :type => Symbol
 
   has_one :profile_photo, :class_name => 'Photo', :inverse_of => :profile_city

data/lib/ish_models.rb

@@ -42,10 +42,10 @@ require 'ish/issue'
 require 'ish/lead'
 require 'ish/payment'
 require 'ish/premium_item'
+require 'ish/unsubscribe'
 require 'ish/utils'
 require 'ish/user_profile'
 
-require 'aux_model'
 require 'city'
 require 'cities_user'
 require 'country'

data/lib/site.rb

@@ -2,7 +2,6 @@ class Site
 
   include Mongoid::Document
   include Mongoid::Timestamps
-  include AuxModel
 
   field :domain, :type => String
   validates_presence_of :domain

data/lib/tag.rb

@@ -4,10 +4,10 @@ class Tag
   include Ish::Utils
 
   field :name, :type => String
-  validates :name, :uniqueness => true, :allow_nil => false
+  validates :name, uniqueness: true, presence: true, allow_nil: false # @TODO: tags should only be unique globally, and per-user.
 
   field :slug
-  validates :slug, :uniqueness => true, presence: true, allow_nil: false
+  validates :slug, uniqueness: true, presence: true, allow_nil: false
 
   field :descr, :type => String, :default => ''
 

data/lib/video.rb

@@ -1,3 +1,5 @@
+require 'mongoid/paranoia'
+
 class Video
   include Mongoid::Document
   include Mongoid::Timestamps
@@ -10,8 +12,6 @@ class Video
   field :name, :type => String
   field :descr, :type => String, :as => :description
 
-  # default_scope ->{ where({ :is_public => true, :is_trash => false }).order_by({ :created_at => :desc }) }
-
   field :is_trash, :type => Boolean, :default => false
   def is_trash
     if deleted_at

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.163
+  version: 0.0.33.167
 platform: ruby
 authors:
 - piousbox
@@ -114,15 +114,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/aux_model.rb
+- lib/address.rb
 - lib/cities_user.rb
 - lib/city.rb
-- lib/co_tailors/README.txt
-- lib/co_tailors/address.rb
-- lib/co_tailors/order.rb
-- lib/co_tailors/order_item.rb
-- lib/co_tailors/product.rb
-- lib/co_tailors/profile_measurement.rb
 - lib/country.rb
 - lib/event.rb
 - lib/feature.rb
@@ -145,6 +139,7 @@ files:
 - lib/ish/payment.rb
 - lib/ish/premium_item.rb
 - lib/ish/railtie.rb
+- lib/ish/unsubscribe.rb
 - lib/ish/user_profile.rb
 - lib/ish/utils.rb
 - lib/ish_models.rb

data/lib/aux_model.rb

@@ -1,22 +0,0 @@
-
-module AuxModel
-
-  def add_newsitem item
-    n = Newsitem.new
-    case item.class.name
-    when 'Video'
-      n.video_id = item.id
-    when 'Photo'
-      raise 'Not Implemented'
-    when 'Report'
-      raise 'Not Implemented'
-    when 'Gallery'
-      raise 'Not Implmented'
-    else
-      raise 'Not Implemented'
-    end
-    self.newsitems << n
-    self.save
-  end
-
-end

data/lib/co_tailors/README.txt

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

data/lib/co_tailors/order.rb

@@ -1,26 +0,0 @@
-require_relative 'order_item'
-
-class CoTailors::Order
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  belongs_to :profile, :class_name => '::Ish::UserProfile'
-
-  has_many :items, :class_name => '::CoTailors::OrderItem'
-
-  field :submitted_at, :type => Time
-
-  MEASUREMENT_PARAMS = [ :neck_around, :chest_around, :waist_around, :sleeve_length, :shoulder_width, :shirt_length, :bicep_around ]
-
-  def grand_total
-    tax = 0.05
-    shipping = 0 # 1200
-
-    subtotal = items.all.map { |i| i.cost }.reduce( :+ )
-    subtotal = subtotal * (tax + 1)
-    subtotal += shipping
-    return subtotal.to_i
-  end
-
-end
-

data/lib/co_tailors/order_item.rb

@@ -1,29 +0,0 @@
-
-class CoTailors::OrderItem
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  belongs_to :order, :class_name => 'CoTailors::Order'
-
-  KIND_SHIRT = 'const-kind-shirt'
-  KIND_PANTS = 'const-kind-pants'
-  KIND_SUIT  = 'const-kind-suits'
-  KINDS      = %w{ const-kind-shirt const-kind-pants const-kind-suits }
-  field :kind, :type => String
-  validates :kind, :presence => true
-
-  FABRICS = [ :white, :black, :light_blue, :dark_blue, :dark_green, :pink, :gray ]
-  field :fabric, :type => String
-  validates :fabric, :presence => true
-
-  has_one :measurement, :class_name => 'CoTailors::ProfileMeasurement'
-  validates :measurement, :presence => true
-
-  field :quantity, :type => Integer
-  validates :quantity, :presence => true
-
-  field :cost, :type => Integer # pennies!
-  validates :cost, :presence => true
-
-end
-

data/lib/co_tailors/product.rb

@@ -1,16 +0,0 @@
-
-class CoTailors::Product
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  field :cost,        :type => Integer
-  field :title,       :type => String
-  field :description, :type => String
-
-  KINDS = %w( shirt pants suit )
-  field :kind,        :type => String
-  index({ :kind => -1 })
-  validates_uniqueness_of :kind
-
-end
-

data/lib/co_tailors/profile_measurement.rb

@@ -1,32 +0,0 @@
-
-class CoTailors::ProfileMeasurement
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  UNITS = [ :inches, :centimeters ]
-  UNITS_INCHES = :inches
-  UNITS_CENTIMETERS = :centimeters
-  field :units, :type => Symbol
-
-  belongs_to :profile,    :class_name => 'Ish::UserProfile', :optional => true
-  belongs_to :order_item, :class_name => 'CoTailors::OrderItem',   :optional => true
-
-  ## shirt
-  field :neck_around,    :type => Float, :default => 0
-  field :chest_around,   :type => Float, :default => 0
-  field :waist_around,   :type => Float, :default => 0
-  field :sleeve_length,  :type => Float, :default => 0
-  field :shoulder_width, :type => Float, :default => 0
-  field :shirt_length,   :type => Float, :default => 0
-  field :bicep_around,   :type => Float, :default => 0
-  field :wrist_around,   :type => Float, :default => 0 # Is this optional? I want less here
-  ## pants
-  # length
-  # waist
-  # hips
-  ## suit
-
-  field :nickname
-
-end
-