ish_models 0.0.33.230 → 0.0.33.231

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b6e8cdb5d6318f3571949e0b6bd148bf3bfba895c0f7c53f2744caf060876e0
-  data.tar.gz: 4c8ff28513a7c4deb978a39ac728729b6b5a10a43ea2e7e13553905655bdf423
+  metadata.gz: f7a90237b3ffeec198b9d6732898d879fbc4b1958f66caa722bdb4902222f408
+  data.tar.gz: 72ee5abe32d9966fb5a82d5bfc3c147a0ca20e5892a8c412eee838c1e8aefaf1
 SHA512:
-  metadata.gz: 2f6c720885cd4e0b322ee54862fefba63a9d7af7e993c455dd942ec0b1f8aabfcbd9599362e5887bb0e325fd18cfad0c47f193ee7db8f31f7a5f1dae98ba6afd
-  data.tar.gz: 3e906a2d06e5b4ba91f7cf194cec788c8161d36930bab21fc516a6a47a100e142011ab6609f2fefbd1d17ffdfaa388845793e28ebee3b88e67af8131dd096e1b
+  metadata.gz: 6ecc759ec798a3e34e7d422b601059012cf9291418fe049925fb86c9bd23cf2e1362f4278853173361608aacc54f201c41270ae4516988e81f0791de35a7b140
+  data.tar.gz: f0b6519444a7eca6208dd5d31bdb266737a3223a7f57ba3643318d3285e02b074bd1334c08e076469df03f13c821ae9b40c1885602be51819650c15a79422b71

data/lib/photo.rb

@@ -15,7 +15,6 @@ class Photo
   belongs_to :user_profile,  :class_name => 'Ish::UserProfile',  :inverse_of => :profile_photo, :optional => true
 
   belongs_to :report,   :optional => true
-  belongs_to :feature,  :optional => true
   belongs_to :gallery,  :optional => true
   belongs_to :newsitem, :optional => true
 
@@ -36,7 +35,7 @@ class Photo
 
   field :is_public, :type => Boolean, :default => true
   field :is_trash,  :type => Boolean, :default => false # @TODO: nuke this boolean _vp_ 20170515
-  default_scope ->{ where({ :is_trash => false }) } # @TODO: nuke default scopes
+  default_scope ->{ where({ :is_trash => false }) }
 
   has_mongoid_attached_file :photo,
                             :styles => {

data/lib/report.rb

@@ -6,7 +6,6 @@ class Report
 
   field :name, :type => String
   validates :name, :presence => true
-  # index({ :name => 1 }, { :unique => true })
   index({ :name => 1, :is_trash => 1 })
 
   field :slug
@@ -14,6 +13,8 @@ class Report
   index({ :slug => 1 }, { :unique => true })
   before_validation :set_slug, :on => :create
 
+  field :subhead
+
   ## 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 |
@@ -23,41 +24,23 @@ class Report
   field :raw_json
 
   field :is_trash, :type => Boolean, :default => false
-  index({ :is_trash => 1, :is_public => 1 }, { name: 'default_index' })
+  index({ :is_trash => 1, :is_public => 1 })
 
   field :is_public, :type => Boolean, :default => true
   index({ :is_public => 1 })
   scope :public, ->{ where({ is_public: true }) }
 
-  field :is_feature, :type => Boolean, :default => false
-  index({ :is_feature => 1 })
-
-  field :is_done, :type => Boolean, :default => true
-  index({ :is_done => 1 })
-
   field :x, :type => Float
   field :y, :type => Float
-
-  field :lang, :type => String, :default => 'en'
-  index({ :lang => 1 })
+  field :z, :type => Float
 
   belongs_to :user_profile, :optional => true, :class_name => 'Ish::UserProfile'
 
-  # validates :user, :presence => true, :allow_nil => false
-  field :username, :type => String, :default => 'anonymous'
-  validates :username, :presence => true, :allow_nil => false
-  index({ :username => 1 })
-
-  field :issue
-  field :subhead
-
   has_one :photo
 
-  field :n_upvotes, :default => 0
-  field :n_spamvotes, :default => 0
-
   has_many :newsitems
 
+  ## @TODO: trash, remove
   def self.list conditions = { :is_trash => false }
     out = self.where( conditions ).order_by( :name => :asc ).limit( 100 )
     [['', nil]] + out.map { |item| [ item.name, item.id ] }

metadata

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