ish_models 0.0.33.20 → 0.0.33.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b32908f187bf28f4a80d8ab62bb63cbb881cb4a
-  data.tar.gz: 165a8e17d001a3d343d598a1be797ac9df09ccaf
+  metadata.gz: 4b67c62354e4af145a25fe1271036d30b2579985
+  data.tar.gz: 8cdfafa110c22361abb0de8f25f5028b7b7ec8be
 SHA512:
-  metadata.gz: 5655c346570d3bfe0cfaaccff910cbadc924951be99f47bacda78dd84ee63baa3d1531843fc3951efbe3d5eb40d460472723a4efcdf2a0f8e927468d7f545e1c
-  data.tar.gz: a1cc3ffe056615528c523b72ba650e784ccab20b4be48f8cf3e061bd1c2e30b80733dde1b1ae02c34cb436997c1febe087ec9578f74cfc856980a6e56317a26d
+  metadata.gz: 5d82d903c7c686c98167cdcc86dd825b4017d3783b2053ebff167414592366affbda084d437ad8d9427e2b5111d42a06fcca43aff068f35bb8d80ba1efb8851a
+  data.tar.gz: dc35be249c3f75b0d92422cd095872a5f2f1089e99440ccf8b90199e645fe56e0dd867f3fe212cb2bc93eaebc03f89555839a5141e1df485c1db84c228b4336c

data/lib/city.rb

@@ -31,10 +31,10 @@ class City
   has_many :reports
   has_many :venues
   has_many :videos
-  has_many :current_users, :class_name => '::IshModels::User', :inverse_of => :current_city
+  has_many :current_users, :class_name => '::IshModels::UserProfile', :inverse_of => :current_city
 
   has_one :profile_photo, :class_name => 'Photo', :inverse_of => :profile_city
-  has_one :guide, :class_name => '::IshModels::User', :inverse_of => :guide_city
+  has_one :guide, :class_name => '::IshModels::UserProfile', :inverse_of => :guide_city
 
   has_many :newsitems
 

data/lib/feature.rb

@@ -13,10 +13,10 @@ class Feature
   field :inner_html,   :type => String
   field :weight,       :type => Integer, :default => 10
   
-  belongs_to :photo
-  belongs_to :report
-  belongs_to :gallery
-  belongs_to :video
+  belongs_to :photo, :optional => true
+  belongs_to :report, :optional => true
+  belongs_to :gallery, :optional => true
+  belongs_to :video, :optional => true
   # has_one :photo
   # has_one :report
   # has_one :gallery

data/lib/ish_models/user_profile.rb

@@ -3,6 +3,10 @@ class IshModels::UserProfile
   include Mongoid::Timestamps
   
   field :username, :type => String
+  field :name
+  field :email
+
+  field :fb_access_token
 
   field :about, :type => String
   field :education, :type => String
@@ -16,9 +20,13 @@ class IshModels::UserProfile
   field :lang, :type => String
  
   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 :videos
+
   def manager?
     %w( piousbox@gmail.com manager@gmail.com ).include?( self.user.email ) ? true : false
   end

data/lib/ish_models.rb

@@ -18,7 +18,7 @@ module IshModels
 end
 
 require 'ish_models/cache_key.rb'
-require 'ish_models/user.rb'
+# require 'ish_models/user.rb'
 require 'ish_models/user_profile.rb'
 
 require 'app_model2.rb'
@@ -36,6 +36,6 @@ require 'public_item.rb'
 require 'report.rb'
 require 'site.rb'
 require 'tag.rb'
-require 'user_profile.rb'
+# require 'user_profile.rb'
 require 'venue.rb'
 require 'video.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.20
+  version: 0.0.33.21
 platform: ruby
 authors:
 - piousbox
@@ -70,7 +70,7 @@ files:
 - lib/ish_models/profile.rb~
 - lib/ish_models/railtie.rb
 - lib/ish_models/railtie.rb~
-- lib/ish_models/user.rb
+- lib/ish_models/trash/user.rb
 - lib/ish_models/user.rb~
 - lib/ish_models/user_profile.rb
 - lib/manager.rb
@@ -80,7 +80,7 @@ files:
 - lib/report.rb
 - lib/site.rb
 - lib/tag.rb
-- lib/user_profile.rb
+- lib/trash/user_profile.rb
 - lib/user_profile.rb~
 - lib/venue.rb
 - lib/video.rb