ish_models 0.0.33.145 → 0.0.33.149

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59d512837bf94f2172832f0c5ae57d157b5dd0d9af9657f384f0cfee91efc430
-  data.tar.gz: 704019952ecc2c73b41b82de6ca8b43bb77a12220620a13b11070a65fe7d8f31
+  metadata.gz: af77cb84fd5fe123e232d66b36e090ed15f5a98c4ce97cfa49d8d1a0717f83d9
+  data.tar.gz: fd202da5dfb24c5850781b49a8965d4c266f02529917721a20864dea5491c4b9
 SHA512:
-  metadata.gz: e48cacf28a8f441b30a9ef7f27f2c00184fa6891e1658cddb04d6614bbe23d1ea7f8c227581719f4f3b3b08eb6914ba41039b5c7d3c4a9bdfc406f9cc61515f3
-  data.tar.gz: ff6b2778ef8d29d4e6184ac44100de00d64647874b3d02a5829eacb330aab2f574f185c8525bc8307c70ce16b94842ba475bf85940e9da8a2b3aea6a88268eaf
+  metadata.gz: '098f8e1013de0d59e3ebec5478b98147e5bdc166fc9ad03989c4af64cc4680f26fbda13f408f3dc919ce936654f875a469d91194ae94fef8e9b670feca1d7ec0'
+  data.tar.gz: b58f6e2a99d512afd89dcf0626cb69b0746a02c087fd7a7f179d7386974b9ee4a0d61be58c985c1df92c1ba0719e4ee1bc5b8beedf4e44d2f8e135199920c070

data/lib/gameui/map.rb

@@ -24,8 +24,6 @@ class ::Gameui::Map
   # shareable, nonpublic
   field :is_public, type: Boolean, default: true
   has_and_belongs_to_many :shared_profiles, :class_name => 'Ish::UserProfile', :inverse_of => :shared_locations
-  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?
 
 
   field :map_slug

data/lib/gameui/marker.rb

@@ -60,7 +60,8 @@ class ::Gameui::Marker
 
   ITEM_TYPE_LOCATION = 'gameui-location'
   ITEM_TYPE_MAP = 'gameui-map'
-  ITEM_TYPES = [ ITEM_TYPE_LOCATION, ITEM_TYPE_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
 

data/lib/ish/user_profile.rb

@@ -6,6 +6,7 @@ class Ish::UserProfile
   validates_presence_of :name
 
   field :username
+  field :scratchpad
 
   field :email
   # validates_format_of :email, :with => ::Devise::email_regexp
@@ -80,4 +81,30 @@ class Ish::UserProfile
     ::Gameui::PremiumPurchase.where( user_profile_id: self.id )
   end
 
+  # used in rake tasks
+  def self.generate delta
+    email = delta[:email]
+    password = delta[:password]
+    role_name = delta[:role_name]
+
+    profile = Ish::UserProfile.where( email: email ).first
+    if profile
+      puts! profile, "UserProfile#generate, already exists"
+      return
+    end
+
+    user = User.where( email: email ).first
+    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.save
+
+    if profile.persisted?
+      ;
+    else
+      puts! profile.errors.full_messages, "Cannot save profile"
+    end
+  end
+
 end

data/lib/video.rb

@@ -2,16 +2,25 @@ class Video
   include Mongoid::Document
   include Mongoid::Timestamps
   include Mongoid::Paperclip
+  include Mongoid::Paranoia
 
   PER_PAGE = 6
 
   field :name, :type => String
   field :descr, :type => String, :as => :description
 
-  default_scope ->{ where({ :is_public => true, :is_trash => false }).order_by({ :created_at => :desc }) }
+  # default_scope ->{ where({ :is_public => true, :is_trash => false }).order_by({ :created_at => :desc }) }
 
   field :is_trash, :type => Boolean, :default => false
-  field :is_public, :type => Boolean, :default => true
+  def is_trash
+    if deleted_at
+      true
+    else
+      self[:is_trash]
+    end
+  end
+
+  field :is_public, :type => Boolean, :default => false
   field :is_feature, :type => Boolean, :default => false
 
   field :x, :type => Float

data/lib/warbler/stock_watch.rb

@@ -2,6 +2,7 @@
 class Warbler::StockWatch
   include Mongoid::Document
   include Mongoid::Timestamps
+  store_in collection: 'ish_stock_watches'
 
   field :ticker
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.145
+  version: 0.0.33.149
 platform: ruby
 authors:
 - piousbox
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 7.0.5
+- !ruby/object:Gem::Dependency
+  name: mongoid_paranoia
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mongoid-autoinc
   requirement: !ruby/object:Gem::Requirement
@@ -152,9 +166,9 @@ files:
 - lib/warbler/stock_option.rb
 - lib/warbler/stock_watch.rb
 - lib/warbler/yahoo_stockwatcher.rb
-homepage: http://wasya.co
+homepage: https://wasya.co
 licenses:
-- MIT
+- Proprietary
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -171,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: models of ish