ish_models 0.0.33.103 → 0.0.33.104

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6265d6ad8a5d5e85aad412b57b2f7751ff8816ea14e1743ab34891532f6f4cf4
-  data.tar.gz: '08a2fa3206ca39253963aaac1ded20924328e798a5beb0e6034a80cf1b47ee4a'
+  metadata.gz: c54bda7472ded08d0e07e851a7479ffe905be79a5e3b408d4c461cba9731a0b3
+  data.tar.gz: 2a29fc4105594f11a10ef13b62244f28bf231a4756a0cbf2ba1b562aac9bdc5c
 SHA512:
-  metadata.gz: 92e56359fae99ccb144e90eee2e0c8d8bc19d7403528fe9f58ff90a2fe2ba4270861f33e95524597ef9e938de4c569dc8ab74feeccb1030013f81a33e733c297
-  data.tar.gz: f3128b3ef46bdfd56b696220a0f95a1c88c2fd012afbf80f15d1a3f0a26a9afb22b737f3efd68bd7bab8957df8c9650d3256b1bbd8fc8b2e7a860e8a6cb0898d
+  metadata.gz: 3873702c519b09a26929ebad21922dfa1d431663a7a56b7b7912edb889652ca97e0850a680943555312291dce405aa69b09f6855f808aea98c540424890eaa9e
+  data.tar.gz: c9ece62b2a99f31681cf9830cc1b2ac28caa8a88ae79ee59744134c852bfbdff76ee1d6cc65e25d0539ed37dc8c04e94248f663f5cf32783d103c9f685de96b8

data/lib/gallery.rb

@@ -4,8 +4,15 @@ class Gallery
   include ::Mongoid::Document
   include ::Mongoid::Timestamps
 
-  field :is_public,    :type => Boolean, :default => false
-  field :is_trash,     :type => Boolean, :default => false
+  field :is_public,  type: Boolean, default: false
+  field :is_trash,   type: Boolean, default: false
+
+  field :premium_tier, type: Integer, default: 0 # how many stars need to spend, to get access? 0 = free
+  def is_premium
+    premium_tier > 0
+  end
+  def premium?; is_premium; end
+  has_many :premium_purchases, class_name: '::Gameui::PremiumPurchase', as: :item
 
   default_scope ->{ where({ :is_public => true, :is_trash => false }).order_by({ :created_at => :desc }) }
   
@@ -21,7 +28,7 @@ class Gallery
   # validates :site, :presence => true
 
   belongs_to :user_profile, :optional => true, :class_name => 'IshModels::UserProfile', :inverse_of => :galleries
-  field :username, :type => String # denormalization, not used _vp_ 20171203
+  field :username, :type => String
   has_and_belongs_to_many :shared_profiles, :class_name => 'IshModels::UserProfile', :inverse_of => :shared_galleries
   
   field :name, :type => String
@@ -29,7 +36,7 @@ class Gallery
 
   field :galleryname, :type => String
   index({ :galleryname => -1 }, { :unique => true })
-  embeds_many :gallery_names, :class_name => 'Ish::GalleryName'
+  embeds_many :gallery_names, :class_name => '::Ish::GalleryName'
 
   field :subhead, :type => String
   field :descr,   :type => String, :as => :description
@@ -43,10 +50,9 @@ class Gallery
 
   has_many :newsitems
 
-
   set_callback(:create, :before) do |doc|
-    if doc.user_profile && doc.user_profile.username
-      doc.username = doc.user_profile.username
+    if doc.user_profile && doc.user_profile.name
+      doc.username = doc.user_profile.name
     end
     doc.galleryname ||= doc.id.to_s
 
@@ -101,5 +107,9 @@ class Gallery
   RENDER_TITLES = 'gallery_render_titles_const' # string b/c transmited over http
   RENDER_THUMBS = 'gallery_render_thumbs_const' # string b/c transmited over http
 
+  def self.find_by_slug slug
+    ::Gallery.where( galleryname: slug ).first
+  end
+
 end
 

data/lib/gameui/map.rb

@@ -0,0 +1,30 @@
+
+class ::Gameui::Map
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  has_many :markers, :class_name => '::Gameui::Marker', inverse_of: :map
+
+  field :slug
+  validates :slug, uniqueness: true, presence: true
+  field :parent_slug
+
+  field :w, type: Integer
+  validates :w, presence: true
+
+  field :h, type: Integer
+  validates :h, presence: true
+
+  field :description
+
+  field :img_path
+
+  ORDERING_TYPE_ALPHABETIC = 'alphabetic'
+  ORDERING_TYPE_CUSTOM     = 'custom'
+  ORDERING_TYPE_TIMESTAMP  = 'timestamp'
+  ORDERING_TYPES = [ ORDERING_TYPE_ALPHABETIC, ORDERING_TYPE_CUSTOM, ORDERING_TYPE_TIMESTAMP ]
+  field :ordering_type, type: String, default: 'custom' # timestamp, alphabetic, custom
+  validates :ordering_type, presence: true
+
+  
+end

data/lib/gameui/marker.rb

@@ -0,0 +1,43 @@
+
+class ::Gameui::Marker
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  belongs_to :map, :class_name => '::Gameui::Map'
+
+  field :slug
+  validates :slug, uniqueness: true, presence: true
+
+  field :w, type: Integer
+  validates :w, presence: true
+  field :h, type: Integer
+  validates :h, presence: true
+  field :x, type: Integer
+  validates :x, presence: true
+  field :y, type: Integer
+  validates :y, presence: true
+
+  field :img_path
+  validates :img_path, presence: true
+  field :title_img_path
+  validates :title_img_path, presence: true
+
+  field :description
+
+  field :is_active, type: Boolean, default: true
+  field :deleted_at, type: Time, default: nil
+
+  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_TYPES = [ ITEM_TYPE_LOCATION, ITEM_TYPE_MAP ]
+  field :item_type, type: String
+  validates :item_type, presence: true
+
+
+end
+

data/lib/gameui/premium_purchase.rb

@@ -0,0 +1,14 @@
+
+class ::Gameui::PremiumPurchase
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  belongs_to :user_profile, :class_name => '::IshModels::UserProfile'
+
+  field :purchased_class
+  field :purchased_id
+
+  belongs_to :item, polymorphic: true
+
+end
+

data/lib/gameui.rb

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

data/lib/ish/campaign.rb

@@ -1,8 +1,3 @@
-
-#
-# Campaign
-# _vp_ 20180128
-#
 class Ish::Campaign
   include Mongoid::Document
   include Mongoid::Timestamps
@@ -17,8 +12,6 @@ class Ish::Campaign
   field :subject
   field :body
 
-  
-
   field :is_done,  :type => Boolean, :default => false
   field :is_trash, :type => Boolean, :default => false
 

data/lib/ish/crawler.rb

@@ -1,9 +1,3 @@
-
-def puts! a, b=''
-    puts "+++ #{b}"
-    puts a.inspect
-end
-
 module Ish
   class Crawler
 
@@ -13,12 +7,9 @@ module Ish
       website = r.css('cite')[0].text
       website = "https://#{website}" unless website[0..3] == 'http'
 
-      puts! website, 'website'
-
       begin
         r = HTTParty.get( website, :verify => false )
       rescue OpenSSL::SSL::SSLError => e
-        puts! e, 'e'
         return { :url => website }
       end
 

data/lib/ish/gallery_name.rb

@@ -7,4 +7,3 @@ module Ish
     embedded_in :gallery
   end
 end
-

data/lib/ish_models/user_profile.rb

@@ -14,24 +14,12 @@ class IshModels::UserProfile
   field :fb_access_token
   field :fb_long_access_token
   field :fb_expires_in
-
-  field :about, :type => String
-  field :education, :type => String
-  field :objectives, :type => String
-  field :current_employment, :type => String
-  field :past_employment, :type => String
-  
-  field :pdf_resume_path, :type => String
-  field :doc_resume_path, :type => String
   
   field :lang, :type => String, :default => :en
 
   ROLES = [ :admin, :manager, :guy ] 
   field :role_name, :type => Symbol
 
-  TAGS = [ :social, :professional ]
-  field :tag, :type => Symbol
-
   belongs_to :user
   belongs_to :current_city, :class_name => 'City', :inverse_of => :current_users, :optional => true
   belongs_to :guide_city,   :class_name => 'City', :inverse_of => :guide,         :optional => true
@@ -66,11 +54,12 @@ class IshModels::UserProfile
     [['', nil]] + out.map { |item| [ item.name, item.id ] }
   end
 
-  # colombia tailors
+  #
+  # 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
@@ -79,5 +68,22 @@ class IshModels::UserProfile
   # GameUI
   #
   field :n_stars, type: Integer, default: 0
+  has_many :premium_purchases, :class_name => '::Gameui::PremiumPurchase'
+  def has_premium_purchase item
+    item.premium_purchases.where( user_profile: self ).exists?
+  end
 
 end
+
+=begin
+  field :about, :type => String
+  field :education, :type => String
+  field :objectives, :type => String
+  field :current_employment, :type => String
+  field :past_employment, :type => String  
+  field :pdf_resume_path, :type => String
+  field :doc_resume_path, :type => String
+
+  TAGS = [ :social, :professional ]
+  field :tag, :type => Symbol
+=end

data/lib/ish_models.rb

@@ -26,6 +26,11 @@ 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/marker.rb'
+require 'gameui/premium_purchase.rb'
+
 require 'ish/crawler.rb'
 require 'ish/gallery_name.rb'
 require 'ish/payment.rb'

data/lib/report.rb

@@ -114,7 +114,7 @@ class Report
 
       unless doc.city.blank?
         city = City.find doc.city.id
-        if doc.profile
+        if defined?( doc.profile ) && doc.profile
           username = doc.profile.username || 'anon'
         else
           username = '<username>'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.103
+  version: 0.0.33.104
 platform: ruby
 authors:
 - piousbox
@@ -115,6 +115,10 @@ files:
 - lib/feature.rb
 - lib/gallery.rb
 - lib/gallery2.rb
+- lib/gameui.rb
+- lib/gameui/map.rb
+- lib/gameui/marker.rb
+- lib/gameui/premium_purchase.rb
 - lib/ish/campaign.rb
 - lib/ish/crawler.rb
 - lib/ish/gallery_name.rb