ish_models 0.0.33.59 → 0.0.33.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bef50c4f8ef407bd36558e04017952197f006d62
-  data.tar.gz: 944d11f7eb25042fdd72e055d8053a4d566703b2
+  metadata.gz: 8ab026ee82cfb953e027cac14561792a73a77af1
+  data.tar.gz: 00160f91bc7a972cc62ba1750ac689729c5ead6a
 SHA512:
-  metadata.gz: b3a72b4efe76e65ecb6e9dd71c855a3f037a9b4a7e92cbd457b0c25df28923a338751f8f9e724a3ca48f877337e9da2c788cae3c4ea35d9d528c73d7aeabdefa
-  data.tar.gz: 2313fd87be13bdd161d92203fdac4099406db61705a8b2dbd560c2a4f5a459955456b6818961cfc6ee9b4adc2d74df3cf447949d45ef9a5f6aeec38e1bf2f296
+  metadata.gz: d073777ea3d009e46a340845a40180a08cc57bbfdbf335b49ecfff4659700d8dc4521be2dc65ce0865af6aa5b7511786d61947454e846047266dac18e12607f7
+  data.tar.gz: 0a1e6af0221895b656ca943f28653b6f474339298635dbb422ae305d730170589b0c331b932d53372a3db210a5600d9360c25a673981b45245064d96155452b5

data/lib/city.rb

@@ -31,6 +31,7 @@ class City
   has_many :reports
   has_many :venues
   has_many :videos
+  has_many :tags
   has_many :current_users, :class_name => '::IshModels::UserProfile', :inverse_of => :current_city
 
   has_one :profile_photo, :class_name => 'Photo', :inverse_of => :profile_city

data/lib/event.rb

@@ -17,6 +17,12 @@ class Event
   
   belongs_to :city
   validates :city, :presence => true
-  
+
+  field :x, :type => Float
+  field :y, :type => Float
+
+  has_one :profile_photo, :class_name => 'Photo', :inverse_of => :profile_event
+  has_many :photos
+
 end
 

data/lib/ish_models/user_profile.rb

@@ -2,9 +2,11 @@ class IshModels::UserProfile
   include Mongoid::Document
   include Mongoid::Timestamps
   
-  field :name, :as => :username
+  field :name
   validates_presence_of :name
 
+  field :username
+  
   field :email
   # validates_format_of :email, :with => ::Devise::email_regexp
   validates_format_of :email,:with => /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/

data/lib/photo.rb

@@ -15,11 +15,13 @@ class Photo
   def user; user_profile; end
   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 :profile_event, :class_name => 'Event', :inverse_of => :profile_photo, :optional => true
   
   belongs_to :report,   :optional => true
   belongs_to :venue,    :optional => true
+  belongs_to :event,    :optional => true
   belongs_to :feature,  :optional => true
-  belongs_to :gallery,  :optional => true # , :class_name => 'Gallery2'
+  belongs_to :gallery,  :optional => true
   belongs_to :newsitem, :optional => true
   
   field :name,   :type => String

data/lib/tag.rb

@@ -3,7 +3,7 @@ class Tag
   include Mongoid::Timestamps
 
   field :name, :type => String
-  validates :name, :uniqueness => true, :allow_nil => false
+  # validates :name, :uniqueness => true, :allow_nil => false
   
   field :name_seo, :as => :tagname
   validates :name_seo, :uniqueness => true, :allow_nil => false
@@ -28,6 +28,7 @@ class Tag
   has_many :newsitems
 
   belongs_to :site, :optional => true
+  belongs_to :city, :optional => true
 
   default_scope ->{
     where({ :is_public => true, :is_trash => false }).order_by({ :name => :asc })

metadata

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