ish_models 0.0.33.158 → 0.0.33.159

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 816be3e6b1853627b099bf336f71c7e659ecf6c11212f3b6621e37a383cd5a93
-  data.tar.gz: d2647b19c20457cc1b0acb4b65e0ac2d34882971ebea4d79c0c80e2964f453c8
+  metadata.gz: 4818a5c5ecf9cc130dc740dbfb83814696043157259c9230003c797fcf655097
+  data.tar.gz: 4ef6186e998a49f0700fe6e1b277943b2ada98d20d9b4cc93ad6dbc3bb668c92
 SHA512:
-  metadata.gz: f2b2321a05df9b2dba8e93b4263d6021cba2e30fc9342c6abb3590e057f6f21b66dd47bc077757d09cb65593991e2e89617c66c7f6b6c57e5785b4195b724284
-  data.tar.gz: 66de3bffbe36f1516c3a006a06c7bb382fd09a8bc27b16a96bdcff7d48ea5627b64e96ae7d4796d87027aeb579d2c23bbe45f965301bdceca3d354a625ab44bc
+  metadata.gz: e99049e74cbf10218f4640fbe9fa47430a87433561ddce5aa6e3ada55a563d1aa7e0b5378bb1f3a1ba05fd63f13b892b956aaa920932378fab11467089697c3a
+  data.tar.gz: c33bd4286fb568296e618c3882db078f0dc4f2239fcf2307368c4431640c15d74733cd66c6d93a5c1f4b5da9663aecb32a05a2dd1345af35ad3b19083f1d742c

data/lib/gallery.rb

@@ -114,5 +114,9 @@ class Gallery
     Site.update_all updated_at: Time.now
   end
 
+  def export_fields
+    %w| name descr |
+  end
+
 end
 

data/lib/gameui/map.rb

@@ -1,11 +1,14 @@
 require 'ish/premium_item'
+require 'ish/utils'
 
 class ::Gameui::Map
   include Mongoid::Document
   include Mongoid::Timestamps
   include Ish::PremiumItem
+  include Ish::Utils
 
-  has_many :markers, :class_name => '::Gameui::Marker', inverse_of: :map
+  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
 
@@ -15,9 +18,11 @@ class ::Gameui::Map
   validates :slug, uniqueness: true, presence: true
 
   field :parent_slug
+
   belongs_to :parent, class_name: '::Gameui::Map', inverse_of: :childs, optional: true
   has_many :childs, class_name: '::Gameui::Map', inverse_of: :parent
   has_one :image, class_name: '::Ish::ImageAsset', inverse_of: :location
+  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
 
@@ -25,7 +30,9 @@ class ::Gameui::Map
   field :is_public, type: Boolean, default: true
   has_and_belongs_to_many :shared_profiles, :class_name => 'Ish::UserProfile', :inverse_of => :shared_locations
 
+  field :version, type: String, default: '0.0.0'
 
+  ## @TODO: what is this?
   field :map_slug
   def map
     ::Gameui::Map.where( slug: map_slug ).first
@@ -54,9 +61,16 @@ class ::Gameui::Map
   # @TODO: this is shared between map and marker, move to a concern.
   before_validation :compute_w_h
   def compute_w_h
-    geo = Paperclip::Geometry.from_file(Paperclip.io_adapters.for(image.image))
-    self.w = geo.width
-    self.h = geo.height
+    return if !image ## @TODO: test this
+
+    begin
+      geo = Paperclip::Geometry.from_file(Paperclip.io_adapters.for(image.image))
+      self.w = geo.width
+      self.h = geo.height
+    rescue Paperclip::Errors::NotIdentifiedByImageMagickError => e
+      puts! e, 'Could not #compute_w_h'
+      # @TODO: do something with this
+    end
   end
 
   ORDERING_TYPE_ALPHABETIC = 'alphabetic'
@@ -81,6 +95,134 @@ class ::Gameui::Map
     out.reverse
   end
 
+  def empty_export
+    return {
+      galleries: {},
+      image_assets: {},
+      maps: {}, markers: {},
+      newsitems: {},
+      photos: {}, profiles: {},
+      reports: {},
+      videos: {},
+    }
+  end
+  def self.empty_export; Gameui::Map.new.empty_export; end
+
+  def empty_export_arr
+    return {
+      galleries: [],
+      image_assets: [],
+      maps: [], markers: [],
+      newsitems: [],
+      photos: [], profiles: [],
+      reports: [],
+      videos: [],
+    }
+  end
+  def self.export_key_to_class
+    Map.new.export_key_to_class
+  end
+  def export_key_to_class
+    return {
+      galleries: 'Gallery',
+      image_assets: 'Ish::ImageAsset',
+      maps: 'Gameui::Map',
+      markers: 'Gameui::Marker',
+      newsitems: 'Newsitem',
+      photos: 'Photo',
+      profiles: 'Ish::UserProfile',
+      reports: 'Report',
+      videos: 'Video',
+      # 'galleries' => 'Gallery',
+      # 'image_assets' => 'Ish::ImageAsset',
+      # 'maps' => 'Gameui::Map',
+      # 'markers' => 'Gameui::Marker',
+      # 'newsitems' => 'Newsitem',
+      # 'photos' => 'Photo',
+      # 'profiles' => 'Ish::UserProfile',
+      # 'reports' => 'Report',
+      # 'videos' => 'Video',
+    }.with_indifferent_access
+  end
+
+  def export_fields
+    %w|
+      creator_profile_id config
+      deleted_at description
+      h
+      is_public
+      labels
+      map_slug
+      name
+      ordering_type
+      parent_slug
+      rated
+      slug
+      version
+      w
+    |
+  end
+
+  ## This is the starting point _vp_ 2022-03-12
+  ##
+  def export_subtree
+    collected = collect(empty_export)
+    exportable = empty_export_arr
+    collected.map do |k, v|
+      if v.present?
+        v.map do |id|
+          id = id[0]
+          item = export_key_to_class[k].constantize.unscoped.find id
+          export = item.export
+          exportable[k].push( export )
+        end
+      end
+    end
+    JSON.pretty_generate exportable
+  end
+
+  def collect export_object
+    map = self
+    export_object[:maps][map.id.to_s] = map.id.to_s
+
+    if map.markers.present?
+      map.markers.map do |marker|
+        id = marker.id.to_s
+        if !export_object[:markers][id]
+          marker.collect( export_object )
+        end
+        export_object[:markers][id] = id
+      end
+    end
+
+    if map.newsitems.present?
+      map.newsitems.map do |newsitem|
+        id = newsitem.id.to_s
+        export_object[:newsitems][id] = id
+        newsitem.collect export_object
+      end
+    end
+
+    ## @TODO: maybe implement this later, maybe not. _vp_ 2022-03-12
+    # if map.childs.present?
+    #   export_object[:maps].push( map.childs.map &:id )
+    #   map.childs.map do |child|
+    #     child.collect export_object
+    #   end
+    # end
+
+    if map.creator_profile.present?
+      export_object[:profiles][map.creator_profile.id.to_s] = map.creator_profile.id.to_s
+    end
+
+    if map.image.present?
+      export_object[:image_assets][map.image.id.to_s] = map.image.id.to_s
+    end
+
+    export_object
+  end
+
 end
 
 Location = ::Gameui::Map
+Map = Gameui::Map

data/lib/gameui/marker.rb

@@ -2,70 +2,131 @@
 class ::Gameui::Marker
   include Mongoid::Document
   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
+
+  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 ?
+  ITEM_TYPE_MAP = 'gameui-map'
+  ITEM_TYPE_OBJ = 'gameui-obj'
+  ITEM_TYPES = [ ITEM_TYPE_LOCATION, ITEM_TYPE_MAP, ITEM_TYPE_OBJ ]
+  field :item_type, type: String
+  validates :item_type, presence: true
+
+  field :url
+  field :version, type: String, default: '0.0.0'
   field :description
 
-  has_one :image,       class_name: '::Ish::ImageAsset', inverse_of: :marker_image
-  has_one :title_image, class_name: '::Ish::ImageAsset', inverse_of: :marker_title_image
+  has_one :image,       class_name: '::Ish::ImageAsset', inverse_of: :marker
+  has_one :title_image, class_name: '::Ish::ImageAsset', inverse_of: :marker_title
 
-  field :deleted_at, type: Time, default: nil
+  field :deleted_at, type: Time, default: nil # @TODO: replace with paranoia
 
-  # shareable, nonpublic
   field :is_public, type: Boolean, default: true
+  def self.public
+    where( is_public: true )
+  end
+  ## Active AND [ mine, shared, or public ]
+  def self.permitted_to profile
+    active.any_of( {is_public: true},
+      {:shared_profile_ids => profile.id},
+      {creator_profile_id: profile.id} )
+  end
+
+  field :is_active, type: Boolean, default: true
+  def self.active
+    where( is_active: true )
+  end
+
   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'
+  belongs_to :map,             class_name: '::Gameui::Map',    inverse_of: :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!
+  # # _vp_ 2021-09-23
+  # field :img_path
+  # # validates :img_path, presence: true
+  # field :title_img_path
+  # # validates :title_img_path, presence: true
 
-  # @deprecated, don't use!
-  # _vp_ 2021-09-23
-  field :img_path
-  # validates :img_path, presence: true
-  field :title_img_path
-  # validates :title_img_path, presence: true
   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
-    geo = Paperclip::Geometry.from_file(Paperclip.io_adapters.for(image.image))
-    self.w = geo.width
-    self.h = geo.height
+    if !image # @TODO: think about this
+      self.h = self.w = 0
+      return
+    end
+
+    begin
+      geo = Paperclip::Geometry.from_file(Paperclip.io_adapters.for(image.image))
+      self.w = geo.width
+      self.h = geo.height
+    rescue Paperclip::Errors::NotIdentifiedByImageMagickError => e
+      puts! e, 'Could not #compute_w_h'
+      # @TODO: do something with this
+    end
   end
 
-  field :is_active, type: Boolean, default: true
-
-  field :name, type: String
-  validates :name, presence: true
-
-  field :ordering, type: String, default: 'jjj'
-
-  ITEM_TYPE_LOCATION = 'gameui-location'
-  ITEM_TYPE_MAP = 'gameui-map'
-  ITEM_TYPE_OBJ = 'gameui-obj'
-  ITEM_TYPES = [ ITEM_TYPE_LOCATION, ITEM_TYPE_MAP, ITEM_TYPE_OBJ ]
-  field :item_type, type: String
-  validates :item_type, presence: true
+  def export_fields
+    %w|
+      centerOffsetX centerOffsetY creator_profile_id
+      deleted_at description destination_id
+      h
+      is_active is_public item_type
+      map_id
+      name
+      ordering
+      slug
+      url
+      version
+      w
+      x
+      y
+    |
+  end
 
-  field :url
+  def collect export_object
+    puts! export_object, "collecting in marker: |#{slug}|."
+
+    if image
+      export_object[:image_assets][image.id.to_s] = image.id.to_s
+    end
+    if title_image
+      export_object[:image_assets][title_image.id.to_s] = title_image.id.to_s
+    end
+    if !export_object[:maps][destination.id.to_s]
+      destination.collect export_object
+    end
+  end
 
 end
 
+Marker = Gameui::Marker

data/lib/ish/image_asset.rb

@@ -1,14 +1,15 @@
 
-class Ish::ImageAsset
-  require 'aws-sdk'
+require 'aws-sdk'
 
+class Ish::ImageAsset
   include Mongoid::Document
   include Mongoid::Timestamps
   include Mongoid::Paperclip
+  include Ish::Utils
 
-  belongs_to :location,           class_name: 'Gameui::Map', inverse_of: :image,       optional: true
-  belongs_to :marker_image,       class_name: 'Gameui::Map', inverse_of: :image,       optional: true
-  belongs_to :marker_title_image, class_name: 'Gameui::Map', inverse_of: :title_image, optional: true
+  belongs_to :location,     class_name: 'Gameui::Map',    inverse_of: :image,       optional: true
+  belongs_to :marker,       class_name: 'Gameui::Marker', inverse_of: :image,       optional: true
+  belongs_to :marker_title, class_name: 'Gameui::Marker', inverse_of: :title_image, optional: true
 
   has_mongoid_attached_file :image,
                             :styles => {
@@ -23,6 +24,14 @@ class Ish::ImageAsset
 
   validates_attachment_content_type :image, :content_type => ["image/jpg", "image/jpeg", "image/png", "image/gif", 'application/octet-stream' ]
 
-end
+  def export_fields
+    %w|
+      location_id
+      marker_id marker_title_id
+      image_file_name image_content_type image_file_size image_updated_at image_fingerprint
+    |
+  end
 
+end
 
+Asset = Ish::ImageAsset

data/lib/ish/payment.rb

@@ -1,3 +1,5 @@
+
+
 class Ish::Payment
   include Mongoid::Document
   include Mongoid::Timestamps

data/lib/ish/user_profile.rb

@@ -1,18 +1,32 @@
+
+require 'ish/utils'
+
+## @TODO: rename to Ish::Profile
 class Ish::UserProfile
   include Mongoid::Document
   include Mongoid::Timestamps
+  include Ish::Utils
 
-  field :name
-  validates_presence_of :name
-
-  field :username
-  field :scratchpad
+  store_in collection: 'ish_user_profiles'
 
   field :email
-  # validates_format_of :email, :with => ::Devise::email_regexp
   validates_format_of :email,:with => /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/
   validates_uniqueness_of :email
 
+  ## @TODO: remove this alias
+  def name
+    email
+  end
+
+  def export_fields
+    %w|
+      email
+      role_name
+    |
+  end
+
+  field :scratchpad
+
   field :fb_access_token
   field :fb_long_access_token
   field :fb_expires_in
@@ -31,18 +45,21 @@ class Ish::UserProfile
   has_many :galleries, :inverse_of => :user_profile
   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_many :my_markers,   :inverse_of => :creator_profile, class_name: 'Gameui::Marker'
   has_and_belongs_to_many :shared_locations, :inverse_of => :shared_profiles, class_name: 'Gameui::Map'
+  has_many :my_maps, :inverse_of => :creator_profile, class_name: 'Gameui::Map'
 
   has_many :invoices,                             :class_name => '::Ish::Invoice'
   has_many :leads,                                :class_name => '::Ish::Lead'
   has_many :photos
   has_many :reports,   inverse_of: :user_profile
 
+  ## @TODO: do something about this.
   # has_many :stock_watches,  class_name: 'IronWarbler::StockWatch'
   # has_many :option_watches, class_name: 'IronWarbler::OptionWatch'
 
   has_many :videos,    inverse_of: :user_profile
-  has_many :newsitems, inverse_of: :user_profile
+  has_many :newsitems, inverse_of: :user_profile ## @TODO: remove?!
 
   has_and_belongs_to_many :bookmarked_locations, class_name: '::Gameui::Map', inverse_of: :bookmarked_profile
   def bookmarks
@@ -53,7 +70,7 @@ class Ish::UserProfile
   has_and_belongs_to_many :friendeds, :class_name => '::Ish::UserProfile', :inverse_of => :friends
 
   field :n_unlocks, type: Integer, default: 0
-  def n_coins
+  def n_coins # @deprecated, do not use
     n_unlocks
   end
 
@@ -83,6 +100,7 @@ class Ish::UserProfile
   def premium_purchases
     ::Gameui::PremiumPurchase.where( user_profile_id: self.id )
   end
+  field :is_purchasing, type: Boolean, default: false
 
   # used in rake tasks
   def self.generate delta
@@ -100,7 +118,11 @@ class Ish::UserProfile
     if !user
       user = User.new({ email: email, password: password })
     end
-    profile = Ish::UserProfile.new({ email: email, name: email, role_name: role_name, user: user })
+    profile = Ish::UserProfile.new({
+      email: email,
+      role_name: role_name,
+      user: user,
+    })
     profile.save
 
     if profile.persisted?
@@ -111,3 +133,5 @@ class Ish::UserProfile
   end
 
 end
+
+Profile = Ish::UserProfile

data/lib/ish/utils.rb

@@ -1,6 +1,22 @@
 
 module Ish::Utils
 
+  def export
+    out = {}
+    %w| created_at updated_at |.map do |f|
+      out[f] = send(f)
+    end
+    export_fields.map do |field|
+      if field[-3..-1] == '_id'
+        out[field] = send(field).to_s
+      else
+        out[field] = send(field)
+      end
+    end
+    out[:_id] = id.to_s
+    out.with_indifferent_access
+  end
+
   private
 
   def set_slug

data/lib/ish_models.rb

@@ -40,7 +40,6 @@ 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'

data/lib/newsitem.rb

@@ -1,20 +1,24 @@
+
+require 'ish/utils'
+
 class Newsitem
   include Mongoid::Document
   include Mongoid::Timestamps
+  include Ish::Utils
 
-  belongs_to :site,    :optional => true
-  belongs_to :tag,     :optional => true
-  belongs_to :city,    :optional => true
-  belongs_to :report,  :optional => true
+  belongs_to :site,    optional: true
+  belongs_to :tag,     optional: true
+  belongs_to :city,    optional: true
+  belongs_to :report,  optional: true
   belongs_to :user_profile, class_name: 'Ish::UserProfile', optional: true
-  belongs_to :map, class_name: '::Gameui::Map', optional: true
+  belongs_to :map,          class_name: '::Gameui::Map',    optional: true
 
-  belongs_to :gallery, :optional => true
+  belongs_to :gallery, optional: true
   def gallery
     self.gallery_id ? Gallery.unscoped.find( self.gallery_id ) : nil
   end
 
-  belongs_to :video,   :optional => true
+  belongs_to :video,   optional: true
 
   has_one :photo
 
@@ -58,4 +62,25 @@ class Newsitem
     return n
   end
 
+  def export_fields
+    %w|
+      descr
+      gallery_id
+      image_path
+      link_path
+      map_id
+      name
+      photo_id
+      report_id
+      video_id
+    |
+  end
+
+  def collect export_object
+    export_object[:galleries][gallery.id.to_s] = gallery.id.to_s if gallery
+    export_object[:photos][photo.id.to_s] = photo.id.to_s if photo
+    export_object[:reports][report.id.to_s] = report.id.to_s if report
+    export_object[:videos][video.id.to_s] = video.id.to_s if video
+  end
+
 end

data/lib/photo.rb

@@ -1,9 +1,11 @@
-class Photo
-  require 'aws-sdk'
 
+require 'aws-sdk'
+
+class Photo
   include Mongoid::Document
   include Mongoid::Timestamps
   include Mongoid::Paperclip
+  include Ish::Utils
 
   has_and_belongs_to_many :viewers, :class_name => 'User', :inverse_of => :viewable_photos
 
@@ -28,10 +30,8 @@ class Photo
   field :weight, :type => Integer, :default => 10
 
   field :is_public, :type => Boolean, :default => true
-
-  # @TODO: nuke this boolean _vp_ 20170515
-  field :is_trash,  :type => Boolean, :default => false
-  default_scope ->{ where({ :is_trash => false }) }
+  field :is_trash,  :type => Boolean, :default => false # @TODO: nuke this boolean _vp_ 20170515
+  default_scope ->{ where({ :is_trash => false }) } # @TODO: nuke default scopes
 
   has_mongoid_attached_file :photo,
                             :styles => {
@@ -53,6 +53,15 @@ class Photo
     25
   end
 
+  def export_fields
+    %w|
+      gallery_id
+      name descr weight is_public is_trash
+
+      photo_file_name photo_content_type photo_file_size photo_updated_at photo_fingerprint
+    |
+  end
+
   validates_attachment_content_type :photo, :content_type => ["image/jpg", "image/jpeg", "image/png", "image/gif", 'application/octet-stream' ]
 
 end

data/lib/report.rb

@@ -13,6 +13,7 @@ class Report
   index({ :slug => 1 }, { :unique => true })
   before_validation :set_slug, :on => :create
 
+  ## @TODO: then constantize this.
   ## Can be one of: default (nil), longscroll
   field :item_type, type: String
 
@@ -152,4 +153,8 @@ class Report
   def premium?; is_premium; end
   has_many :premium_purchases, class_name: '::Gameui::PremiumPurchase', as: :item
 
+  def export_fields
+    %w| name descr |
+  end
+
 end

data/lib/site.rb

@@ -5,6 +5,7 @@ class Site
   include AuxModel
 
   field :domain, :type => String
+  validates_presence_of :domain
 
   field :lang, :type => String, :default => 'en'
   # validates :lang, { :uniqueness => :true, :scope => :domain }

data/lib/video.rb

@@ -3,6 +3,7 @@ class Video
   include Mongoid::Timestamps
   include Mongoid::Paperclip
   include Mongoid::Paranoia
+  include Ish::Utils
 
   PER_PAGE = 6
 
@@ -96,5 +97,8 @@ class Video
   def premium?; is_premium; end
   has_many :premium_purchases, class_name: '::Gameui::PremiumPurchase', as: :item
 
+  def export_fields
+    %w| name descr |
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.158
+  version: 0.0.33.159
 platform: ruby
 authors:
 - piousbox
@@ -142,7 +142,6 @@ files:
 - lib/ish/invoice.rb
 - lib/ish/issue.rb
 - lib/ish/lead.rb
-- lib/ish/nonpublic.rb
 - lib/ish/payment.rb
 - lib/ish/premium_item.rb
 - lib/ish/railtie.rb

data/lib/ish/nonpublic.rb

@@ -1,13 +0,0 @@
-
-## 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