ish_models 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2969237ff16d6f14db37047fb60204f1d4c0ecc2
-  data.tar.gz: 8c4d6a25f815a676736d0e1c1d6572cec7640bd2
+  metadata.gz: b88f19a07f74c4ebd1304b99a73c27928d4607b2
+  data.tar.gz: 4d4c0b4cf6324a53aea82a224bd18b8ae4080463
 SHA512:
-  metadata.gz: 9f855acb9639155a8a0e1edd7eeece6f943449cefcabe496865754e93ce478ae4716b5fced45cdf0ed85ab73f5322c57d3b5822348d116a8946c8249b6030f0a
-  data.tar.gz: 5f8889ff575b4433f3d34e795253d191192110bb30277af1b0cb2a6bfe7fd8872da5d7231049dc649b29fd2f2249589ea0824cf9f6664d0927ba285279d68597
+  metadata.gz: 1e5d10953f7271af06325ee754e77bcf9e1a4bbdda20bf780ff8507a5b03d1217737a13b3b314aeba471bdbacb4db9e6965818edfdc34f23b81171935bdf2e37
+  data.tar.gz: 569f5060aef50776fdf18cabf9614dc061aecc6045aeffbcf4a3ffdc22b765b4312093fe0e4fb3d395a15a0e1c11b66669053d5705bd8c853efc3e9422bf9efd

data/lib/ish_models.rb

@@ -28,12 +28,13 @@ require 'country.rb'
 require 'event.rb'
 require 'feature.rb'
 require 'gallery.rb'
+require 'manager.rb'
 require 'newsitem.rb'
 require 'photo.rb'
 require 'public_item.rb'
 require 'report.rb'
 require 'site.rb'
 require 'tag.rb'
-# require 'user.rb'
+require 'user_profile.rb'
 require 'venue.rb'
 require 'video.rb'

data/lib/manager.rb

@@ -0,0 +1,7 @@
+
+#
+# I need this thing for permissions
+#
+class Manager
+end
+

data/lib/photo.rb

@@ -5,21 +5,20 @@ class Photo
   include Mongoid::Timestamps
   include Mongoid::Paperclip
 
-  belongs_to :user,     :inverse_of => :photos
-  validates  :user,     :presence => true
-  field      :username, :type => String
+  # belongs_to :user,     :inverse_of => :photos
+  # validates  :user,     :presence => true
+  # field      :username, :type => String
 
   has_and_belongs_to_many :viewers, :class_name => 'User', :inverse_of => :viewable_photos
   
-  belongs_to :profile_user, :class_name => 'User', :inverse_of => :profile_photo
-  belongs_to :profile_city, :class_name => 'City', :inverse_of => :profile_photo
-  belongs_to :profile_venue, :class_name => 'Venue', :inverse_of => :profile_photo
+  # belongs_to :profile_user, :class_name => 'User', :inverse_of => :profile_photo
+  belongs_to :profile_city,  :class_name => 'City',  :inverse_of => :profile_photo, :optional => true
+  belongs_to :profile_venue, :class_name => 'Venue', :inverse_of => :profile_photo, :optional => true
   
-  belongs_to :report
-  belongs_to :tag
-  belongs_to :venue
-  belongs_to :feature
-  belongs_to :gallery
+  belongs_to :report,  :optional => true
+  belongs_to :venue,   :optional => true
+  belongs_to :feature, :optional => true
+  belongs_to :gallery, :optional => true
   
   field :name,   :type => String
   field :descr,  :type => String
@@ -31,8 +30,6 @@ class Photo
   field :is_trash,  :type => Boolean, :default => false
   default_scope ->{ where({ :is_trash => false }) }
 
-  # File.open('/tmp/this', 'a') { |f| f.puts "#{Time.now} - inside photo.rb" }
-
   has_mongoid_attached_file :photo, 
                             :styles => {
                               :mini => '20x20#',

data/lib/user_profile.rb

@@ -0,0 +1,22 @@
+class UserProfile  
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  
+  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
+  
+  belongs_to :user
+  
+  def manager?
+    %w( piousbox@gmail.com manager@gmail.com ).include?( self.user.email ) ? true : false
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - piousbox
@@ -72,13 +72,14 @@ files:
 - lib/ish_models/railtie.rb~
 - lib/ish_models/user.rb
 - lib/ish_models/user.rb~
+- lib/manager.rb
 - lib/newsitem.rb
 - lib/photo.rb
 - lib/public_item.rb
 - lib/report.rb
 - lib/site.rb
 - lib/tag.rb
-- lib/user.rb
+- lib/user_profile.rb
 - lib/venue.rb
 - lib/video.rb
 homepage: http://wasya.co

data/lib/user.rb

@@ -1,122 +0,0 @@
-
-class User  
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  # Setup accessible (or protected) attributes for your model
-  # attr_accessible :email, :password, :password_confirmation, :remember_me
-
-  ## Database authenticatable
-  field :email, type: String, default: ""
-  validates :email, :presence => true, :uniqueness => true
-
-  field :encrypted_password, type: String, default: ""
-
-  ## Recoverable
-  field :reset_password_token,   type: String
-  field :reset_password_sent_at, type: Time
-
-  ## Rememberable
-  field :remember_created_at, type: Time
-
-  ## Trackable
-  field :sign_in_count,      type: Integer, default: 0
-  field :current_sign_in_at, type: Time
-  field :last_sign_in_at,    type: Time
-  field :current_sign_in_ip, type: String
-  field :last_sign_in_ip,    type: String
-
-  ## Confirmable
-  # field :confirmation_token,   type: String
-  # field :confirmed_at,         type: Time
-  # field :confirmation_sent_at, type: Time
-  # field :unconfirmed_email,    type: String # Only if using reconfirmable
-
-  ## Lockable
-  # field :failed_attempts, type: Integer, default: 0 # Only if lock strategy is :failed_attempts
-  # field :unlock_token,    type: String # Only if unlock strategy is :email or :both
-  # field :locked_at,       type: Time
-  
-  # :recoverable, :trackable :rememberable,
-  # :token_authenticatable, 
-  # :lockable, :timeoutable, :confirmable
-  devise :registerable, :validatable
-  devise :database_authenticatable, :authentication_keys => [ :email ]
-  # devise :omniauthable, :omniauth_providers => [ :facebook ]
-  # devise :encryptable, :encryptor => :sha1base64
-  #
-  #
-  # field :confirmed_at, :type => DateTime
-  # field :confirmation_token, :type => String
-  # field :confirmation_sent_at, :type => DateTime
-  
-  field :username, :type => String
-  validates :username, :presence => true, :uniqueness => true
-  
-  field :name, :type => String
-  validates :name, :presence => true
-  
-  field :group_id, :type => Integer, :default => 3
-
-  field :scratchpad, :type => String
-  field :github_path, :type => String
-  field :facebook_path, :type => String
-  field :stackoverflow_path, :type => String
-
-  field :is_feature, :type => Boolean, :default => false
-  field :is_trash, :type => Boolean, :default => false
-
-  field :display_ads, :type => Boolean, :default => true
-  field :display_help, :type => Boolean, :default => true
-  
-  has_many :reports
-  has_many :photos
-  has_many :user_profiles
-  has_many :galleries
-  has_many :videos
-
-  has_one :profile_photo, :class_name => 'Photo', :inverse_of => :profile_user
-
-  has_and_belongs_to_many :viewable_photos, :class_name => 'Photo', :inverse_of => :viewer
-
-  belongs_to :guide_city, :class_name => 'City', :inverse_of => :guide
-  belongs_to :current_city, :class_name => 'City', :inverse_of => :city_users
-
-  def self.list conditions = { :is_trash => false }
-    out = self.where( conditions ).order_by( :name => :asc )
-    [['', nil]] + out.map { |item| [ item.name, item.id ] }
-  end
-
-  embeds_many :newsitems
-
-  def self.all
-    self.where( :is_trash => false ).order_by( :created_at => :desc )
-  end
-
-  def create_newsitem args = {}
-    unless args[:photo].blank?
-      n = Newsitem.new
-      n.photo = args[:photo]
-      n.descr = 'uploaded new photo on'
-      n.username = self.username
-      self.newsitems << n
-      self.save
-    end
-  end
-  
-  def self.per_page
-    16
-  end
-
-  def self.clear
-    if Rails.env.test?
-      User.unscoped.each { |u| u.remove }
-    end
-  end
-  
-  def generate_auth_token
-    payload = { user_id: self.id }
-    AuthToken.encode(payload)
-  end
-  
-end