ish_models 0.0.33.161 → 0.0.33.164

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 442096ab6ef54689b9a4ca3a16107d1f49f7dd2e0af2eb7b2d79d4bd9706f950
-  data.tar.gz: 20d4ed02e4eecdcbf558d7cb9dfa5e91cab277e066ecb1bf787287c9829bbd75
+  metadata.gz: a783500814f32b8c34ef3feade0aef48169ea390eb033422518593edef4cf67b
+  data.tar.gz: ae18235c6b0862be5e0d09b53c86002d1bf76824d17391b2a4507749f358d911
 SHA512:
-  metadata.gz: 02af3b69874afdfaf9b78b6c95a3d38319fbbc96513454bbd24e69b5da8b24e6a0dbdd8177291b09ce1927e6dacdf0f6c907f5b776b41f92edf829ed5f50bc59
-  data.tar.gz: 06d0c1cde0995eb9490a1182cbce13bbc7abe59dc49606d6a213200335e7da6992dab1c557e31fe310225b280c06ff2f345d709c2947d5def30b4af93e8e8534
+  metadata.gz: 4522756a1cedf0b0a570e13ad1a35dda926930aadbb7dbe5112de03923b3c5f133ee1e0c569639bf01fccb4be7926a82d406523c8ef1fe2c18705c9bc93e70be
+  data.tar.gz: 45b1305bdb9395f37325d78183d746ff7c9c2f6a9bb01ca533dc56b11ac176816cf9ad01b612d58514ff43e7ea0395b126b7fe682ae4a81fcd4091420493d591

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

@@ -25,6 +25,7 @@ class ::Gameui::Map
   belongs_to :creator_profile, class_name: '::Ish::UserProfile', inverse_of: :my_maps
 
   has_and_belongs_to_many :bookmarked_profiles, class_name: '::Ish::UserProfile', inverse_of: :bookmarked_location
+  has_and_belongs_to_many :tags, class_name: 'Tag', inverse_of: :map
 
   # shareable, nonpublic
   field :is_public, type: Boolean, default: true
@@ -58,6 +59,10 @@ class ::Gameui::Map
   field :h, type: Integer
   validates :h, presence: true
 
+  ## @TODO: abstract this into a module
+  field :x, :type => Float
+  field :y, :type => Float
+
   # @TODO: this is shared between map and marker, move to a concern.
   before_validation :compute_w_h
   def compute_w_h
@@ -82,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,12 @@ 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
+  def slug
+    id.to_s
+  end
 
   field :ordering, type: String, default: 'jjj'
 
@@ -30,6 +29,10 @@ class ::Gameui::Marker
 
   field :deleted_at, type: Time, default: nil # @TODO: replace with paranoia
 
+  ## @TODO: abstract this into a module
+  field :x, :type => Float, default: 0
+  field :y, :type => Float, default: 0
+
   field :is_public, type: Boolean, default: true
   def self.public
     where( is_public: true )
@@ -49,7 +52,9 @@ class ::Gameui::Marker
   has_and_belongs_to_many :shared_profiles, :class_name => 'Ish::UserProfile', :inverse_of => :shared_markers
 
   belongs_to :map,             class_name: '::Gameui::Map',    inverse_of: :markers
-  belongs_to :destination,     class_name: '::Gameui::Map',    inverse_of: :from_markers
+
+  belongs_to :destination, class_name: '::Gameui::Map', inverse_of: :from_markers
+
   belongs_to :creator_profile, class_name: 'Ish::UserProfile', inverse_of: :my_markers
 
   # # @deprecated, don't use!
@@ -61,22 +66,8 @@ class ::Gameui::Marker
 
   field :w, type: Integer
   validates :w, presence: true
-
   field :h, type: Integer
   validates :h, presence: true
-
-  field :x, type: Integer, default: 0
-  # validates :x, presence: true
-
-  field :y, type: Integer, default: 0
-  # validates :y, presence: true
-
-  field :centerOffsetX, type: Integer, default: 0
-  # validates :centerXOffset, presence: true
-
-  field :centerOffsetY, type: Integer, default: 0
-  # validates :centerYOffset, presence: true
-
   # @TODO: this is shared between map and marker, move to a concern.
   before_validation :compute_w_h
   def compute_w_h
@@ -84,7 +75,6 @@ class ::Gameui::Marker
       self.h = self.w = 0
       return
     end
-
     begin
       geo = Paperclip::Geometry.from_file(Paperclip.io_adapters.for(image.image))
       self.w = geo.width
@@ -95,6 +85,11 @@ class ::Gameui::Marker
     end
   end
 
+  field :centerOffsetX, type: Float, default: 0
+  field :centerOffsetY, type: Float, default: 0
+
+
+
   def export_fields
     %w|
       centerOffsetX centerOffsetY creator_profile_id

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_models.rb

@@ -45,7 +45,6 @@ require 'ish/premium_item'
 require 'ish/utils'
 require 'ish/user_profile'
 
-require 'aux_model'
 require 'city'
 require 'cities_user'
 require 'country'

data/lib/newsitem.rb

@@ -11,7 +11,7 @@ class Newsitem
   def gallery
     self.gallery_id ? Gallery.unscoped.find( self.gallery_id ) : nil
   end
-  belongs_to :map,     optional: true,     class_name: '::Gameui::Map'
+  belongs_to :map,     optional: true, class_name: '::Gameui::Map'
   belongs_to :profile, optional: true, class_name: 'Ish::UserProfile'
   belongs_to :photo,   optional: true
   belongs_to :report,  optional: true
@@ -37,6 +37,18 @@ class Newsitem
   field :downvoting_users, :type => Array, :default => []
   field :is_feature,       :type => Boolean, :default => false
 
+  TYPE_GALLERY = :type_gallery
+  TYPE_PHOTO   = :type_photo
+  TYPE_REPORT  = :type_report
+  TYPE_VIDEO   = :type_video
+  def item_type
+    return TYPE_GALLERY if gallery_id
+    return TYPE_PHOTO   if photo_id
+    return TYPE_REPORT  if report_id
+    return TYPE_VIDEO   if video_id
+  end
+
+
   PER_PAGE = 6
 
   default_scope ->{ order_by({ :created_at => :desc }) }

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,15 +4,15 @@ class Tag
   include Ish::Utils
 
   field :name, :type => String
-  # validates :name, :uniqueness => true, :allow_nil => false
+  validates :name, :uniqueness => true, :allow_nil => false
 
   field :slug
   validates :slug, :uniqueness => true, presence: true, allow_nil: false
 
   field :descr, :type => String, :default => ''
 
-  field :is_public, :type => Boolean, :default => true
-  field :is_trash, :type => Boolean, :default => false
+  field :is_public,  :type => Boolean, :default => true
+  field :is_trash,   :type => Boolean, :default => false
   field :is_feature, :type => Boolean, :default => false
 
   field :weight, :type => Integer, :default => 10
@@ -31,10 +31,7 @@ class Tag
   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 })
-  }
+  has_and_belongs_to_many :maps, class_name: 'Gameui::Map'
 
   before_validation :set_slug
 

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.161
+  version: 0.0.33.164
 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

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
-