ish_models 0.0.33.21 → 0.0.33.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b67c62354e4af145a25fe1271036d30b2579985
-  data.tar.gz: 8cdfafa110c22361abb0de8f25f5028b7b7ec8be
+  metadata.gz: 0db35e1d9972acc020cca3745c1be3e9b1723248
+  data.tar.gz: c4a382376aa8339603c40a3757df05cb7dd6f1c7
 SHA512:
-  metadata.gz: 5d82d903c7c686c98167cdcc86dd825b4017d3783b2053ebff167414592366affbda084d437ad8d9427e2b5111d42a06fcca43aff068f35bb8d80ba1efb8851a
-  data.tar.gz: dc35be249c3f75b0d92422cd095872a5f2f1089e99440ccf8b90199e645fe56e0dd867f3fe212cb2bc93eaebc03f89555839a5141e1df485c1db84c228b4336c
+  metadata.gz: 8ae3bf45d6115fc4e144ec04feb0213db54297cdd26720ba304639741f685b024c3101b0bd23d67ae209ffebfe2cd10cbf4b0361d974da4a0da2a66c464485c0
+  data.tar.gz: b5426e543e0cc2711430f94d1da0a919f0a580f2cf0d532be6ccc069e35f510475b38fb9aad105e66f52207f36be042f065dffd65c5aa63f21dbb030e23efcdb

data/lib/ish_models/user_profile.rb

@@ -7,6 +7,7 @@ class IshModels::UserProfile
   field :email
 
   field :fb_access_token
+  field :fb_long_access_token
 
   field :about, :type => String
   field :education, :type => String
@@ -18,16 +19,19 @@ class IshModels::UserProfile
   field :doc_resume_path, :type => String
   
   field :lang, :type => String
- 
+
+  ROLES = [ :admin, :manager, :guy ] 
+  field :role_name, :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
  
   has_many :galleries
-  has_many :reports
+  has_many :reports, :inverse_of => :profile
   has_many :videos
 
-  def manager?
+  def sudoer?
     %w( piousbox@gmail.com manager@gmail.com ).include?( self.user.email ) ? true : false
   end
 

data/lib/report.rb

@@ -34,7 +34,8 @@ class Report
   field :lang, :type => String, :default => 'en'
   index({ :lang => 1 })
    
-  belongs_to :user, :optional => true, :class_name => 'IshModels::User'
+  belongs_to :profile, :optional => true, :class_name => 'IshModels::UserProfile'
+
   # validates :user, :presence => true, :allow_nil => false
   field :username, :type => String, :default => 'anonymous'
   validates :username, :presence => true, :allow_nil => false
@@ -108,8 +109,8 @@ class Report
 
       unless doc.city.blank?
         city = City.find doc.city.id
-        if doc.user
-          username = doc.user.username || 'anon'
+        if doc.profile
+          username = doc.profile.username || 'anon'
         else
           username = '<username>'
         end

metadata

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