ish_models 0.0.33.172 → 0.0.33.174

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5769b6b8a2b8a37d133dc1f7b189ae2c57dfaa027ac75eeb1504fdf43ea625e
-  data.tar.gz: 93bb7323be666fe6c16be74bf092459d371f9b35c393d846e1028a9efcc22dd9
+  metadata.gz: e193de4eeef224f54fcf57c898a9bc3b6a6442a3fdb92ebc39bbe631e884c760
+  data.tar.gz: be392236fdc22f242252992c4f473623798b1d837fb036be850f54dd6a26a32d
 SHA512:
-  metadata.gz: 757dc8e96ba6f354039339b66f85a4e5a6bd7ff34405fd41621216330848bcccbbdf0c3093adea3d9434e06b70aeee1ba452fef5214bebf4483d3a06baba3ef7
-  data.tar.gz: 4e9bfc050504f1b79fc19c0ec977bf96ed2ffcd28067457dc1828c3b52d45fe779a0bf2358c258ff81cd954719f31e01c782525c90a672cd8c31f0d74ae99872
+  metadata.gz: c9e4729d7c569a6fe830403583e95552f2bf96b16d0d73601059e9680eb67ec8f526b9a5c655ebdc7f23312cd9608aafd44de088cb435f8b579ddfc2da514b7d
+  data.tar.gz: e74ca05bc40aa65fdf65b31b228e5410bd9be2299664261404eb4e1e98b4f6af3632cd08445d9c6e23c33b89638b15a7540270cef023972c04c8d2e0c282d229

data/lib/gameui/map.rb

@@ -1,3 +1,4 @@
+
 require 'ish/premium_item'
 require 'ish/utils'
 
@@ -7,15 +8,20 @@ class ::Gameui::Map
   include Ish::PremiumItem
   include Ish::Utils
 
-  has_many :markers,      :class_name => '::Gameui::Marker', inverse_of: :map
-  has_many :from_markers, :class_name => '::Gameui::Marker', inverse_of: :destination
+  field :name
 
-  has_many :newsitems, inverse_of: :map, order: :created_at.desc
+  field :slug
+  validates :slug, uniqueness: true, presence: true
 
+  field :description
+
+  ## @TODO: probably, abstract this. _vp_ 2022-09-20
   field :deleted_at, type: Time, default: nil
 
-  field :slug
-  validates :slug, uniqueness: true, presence: true
+  has_many :markers,      :class_name => '::Gameui::Marker', inverse_of: :map
+  has_many :from_markers, :class_name => '::Gameui::Marker', inverse_of: :destination
+
+  has_many :newsitems, inverse_of: :map, order: :created_at.desc
 
   # @TODO: remove field, replace with relation. _vp_ 2022-09-13
   field :parent_slug
@@ -40,9 +46,6 @@ class ::Gameui::Map
     ::Gameui::Map.where( slug: map_slug ).first
   end
 
-  field :name
-  field :description
-
   RATED_OPTIONS = [ 'pg-13', 'r', 'nc-17' ]
   field :rated, default: 'pg-13' # 'r', 'nc-17'
 
@@ -55,18 +58,21 @@ class ::Gameui::Map
   # @deprecated, dont use!
   field :img_path
 
+  ## Not used! See config.map_panel_type instead.
+  # MAP_TYPES = [ :map_2d, :map_3d, :map_geospatial, :map_gallery, :map_toc ] ## Mostly not implemented. _vp_ 2022-09-06
+  # field :map_type, default: :map_2d
+
+  ## Make sure to use x,y,z and w,h as appropriate.
+  ## @TODO: abstract this into a module
+  field :x, type: Float
+  field :y, type: Float
+  field :z, type: Float
+
+  ## Make sure to use x,y,z and w,h as appropriate.
   field :w, type: Integer
   validates :w, presence: true
   field :h, type: Integer
   validates :h, presence: true
-
-  MAP_TYPES = [ :map_2d, :map_3d, :map_geospatial, :map_gallery, :map_toc ] ## Mostly not implemented. _vp_ 2022-09-06
-  field :map_type, default: :map_2d
-
-  ## @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
@@ -104,6 +110,10 @@ class ::Gameui::Map
     out.reverse
   end
 
+  ##
+  ## @TODO: move the export func, below, to a module. _vp_ 2022-09-20
+  ##
+
   def empty_export
     return {
       galleries: {},
@@ -128,9 +138,7 @@ class ::Gameui::Map
       videos: [],
     }
   end
-  def self.export_key_to_class
-    Map.new.export_key_to_class
-  end
+
   def export_key_to_class
     return {
       galleries: 'Gallery',
@@ -153,6 +161,9 @@ class ::Gameui::Map
       # 'videos' => 'Video',
     }.with_indifferent_access
   end
+  def self.export_key_to_class
+    Map.new.export_key_to_class
+  end
 
   def export_fields
     %w|
@@ -231,6 +242,10 @@ class ::Gameui::Map
     export_object
   end
 
+  ## endExport
+
+  field :newsitems_page_size, default: 25
+
 end
 
 Location = ::Gameui::Map

data/lib/gameui/marker.rb

@@ -8,13 +8,6 @@ class ::Gameui::Marker
   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'
 
   ITEM_TYPE_LOCATION = '::Gameui::Map' # @TODO: this used to be gameui-location . How is this different from gameui-map ?
@@ -58,7 +51,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
+  belongs_to :destination, class_name: '::Gameui::Map', inverse_of: :from_markers, optional: true
 
   belongs_to :creator_profile, class_name: 'Ish::UserProfile', inverse_of: :my_markers
 

data/lib/mongoid/votable.rb

@@ -190,7 +190,8 @@ module Mongoid
     #
     # @param [Mongoid Object, BSON::ObjectId] voter is Mongoid object the id of the voter who made the vote
     def vote_value(voter)
-      voter_id = voter.is_a?(BSON::ObjectId) ? voter.to_s : voter.is_a?(String) ? voter : voter.id.to_s
+      ## The last last one, voter.id not voter.id.to_s _vp_ 2022-09-19
+      voter_id = voter.is_a?(BSON::ObjectId) ? voter : voter.is_a?(String) ? voter : voter.id
 
       return :up if up_voter_ids.try(:include?, voter_id)
       return :down if down_voter_ids.try(:include?, voter_id)

data/lib/newsitem.rb

@@ -1,5 +1,6 @@
 
 require 'ish/utils'
+
 # require_relative './mongoid/votable.rb'
 
 class Newsitem

data/lib/report.rb

@@ -13,11 +13,13 @@ class Report
   index({ :slug => 1 }, { :unique => true })
   before_validation :set_slug, :on => :create
 
-  ## @TODO: then constantize this.
-  ## Can be one of: default (nil), longscroll
+  ## Can be one of: default (nil), longscroll,
+  ##   wordpress e.g. https://piousbox.com/wp-json/wp/v2/posts?slug=intro
+  # ITEM_TYPES = %w| longscroll wordpress |
   field :item_type, type: String
 
   field :descr, :type => String
+  field :raw_json
 
   field :is_trash, :type => Boolean, :default => false
   index({ :is_trash => 1, :is_public => 1 }, { name: 'default_index' })

metadata

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