ish_models 0.0.33.117 → 0.0.33.122
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/city.rb +3 -3
- data/lib/gallery.rb +10 -8
- data/lib/gameui/premium_purchase.rb +1 -4
- data/lib/ish/payment.rb +6 -1
- data/lib/ish_models/user_profile.rb +11 -7
- data/lib/newsitem.rb +2 -0
- data/lib/tag.rb +8 -8
- data/lib/venue.rb +2 -0
- data/lib/video.rb +5 -5
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6b4d660c8ce0a475ac217dff07cb2a71c5d9f6c69793a831e4ba20945fd0f948
|
4
|
+
data.tar.gz: acb5c4910ca16aaaacd7c346188892b2469e0570111077f63906972d06bcf324
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: cc7a8c601704bd3648d18782d443ee306f42e1964110bb3636674bc6daa04c12147317511547e4d56dc42c9607ddcf3f70f8ae96b4aff56b07d8deb2bd11a36f
|
7
|
+
data.tar.gz: 1b3337866b8130be30e58b03c8451a507c7807fd04f8a1f47a1576865ba5ad44c23f6cbb34ba9abd5673b7ef4aead067b49be6c9bfaf31585f7a9aaf373e19f3
|
data/lib/city.rb
CHANGED
@@ -2,7 +2,7 @@ class City
|
|
2
2
|
include ::Mongoid::Document
|
3
3
|
include ::Mongoid::Timestamps
|
4
4
|
include AuxModel
|
5
|
-
|
5
|
+
|
6
6
|
field :name, :type => String
|
7
7
|
field :description, :type => String, :default => 'The description of this city'
|
8
8
|
|
@@ -21,8 +21,8 @@ class City
|
|
21
21
|
|
22
22
|
belongs_to :country, :optional => true
|
23
23
|
|
24
|
-
has_many :events
|
25
|
-
has_many :galleries
|
24
|
+
has_many :events
|
25
|
+
has_many :galleries
|
26
26
|
has_many :photos
|
27
27
|
has_many :reports
|
28
28
|
has_many :venues
|
data/lib/gallery.rb
CHANGED
@@ -4,6 +4,8 @@ class Gallery
|
|
4
4
|
include ::Mongoid::Document
|
5
5
|
include ::Mongoid::Timestamps
|
6
6
|
|
7
|
+
PER_PAGE = 6
|
8
|
+
|
7
9
|
field :is_public, type: Boolean, default: false
|
8
10
|
field :is_trash, type: Boolean, default: false
|
9
11
|
|
@@ -15,7 +17,7 @@ class Gallery
|
|
15
17
|
has_many :premium_purchases, class_name: '::Gameui::PremiumPurchase', as: :item
|
16
18
|
|
17
19
|
default_scope ->{ where({ :is_public => true, :is_trash => false }).order_by({ :created_at => :desc }) }
|
18
|
-
|
20
|
+
|
19
21
|
field :x, :type => Float
|
20
22
|
field :y, :type => Float
|
21
23
|
|
@@ -30,11 +32,11 @@ class Gallery
|
|
30
32
|
belongs_to :user_profile, :optional => true, :class_name => 'IshModels::UserProfile', :inverse_of => :galleries
|
31
33
|
field :username, :type => String
|
32
34
|
has_and_belongs_to_many :shared_profiles, :class_name => 'IshModels::UserProfile', :inverse_of => :shared_galleries
|
33
|
-
|
34
|
-
field :name
|
35
|
+
|
36
|
+
field :name
|
35
37
|
validates :name, :uniqueness => true # , :allow_nil => false
|
36
38
|
|
37
|
-
field :galleryname
|
39
|
+
field :galleryname
|
38
40
|
index({ :galleryname => -1 }, { :unique => true })
|
39
41
|
embeds_many :gallery_names, :class_name => '::Ish::GalleryName'
|
40
42
|
def self.find_by_slug slug
|
@@ -62,7 +64,7 @@ class Gallery
|
|
62
64
|
#
|
63
65
|
# newsitems
|
64
66
|
#
|
65
|
-
if doc.is_public
|
67
|
+
if doc.is_public
|
66
68
|
# for the sites
|
67
69
|
if doc.site
|
68
70
|
sites = Site.where( :domain => doc.site.domain )
|
@@ -107,14 +109,14 @@ class Gallery
|
|
107
109
|
|
108
110
|
field :issue
|
109
111
|
|
110
|
-
RENDER_TITLES = '
|
111
|
-
RENDER_THUMBS = '
|
112
|
+
RENDER_TITLES = 'index_titles' # view name
|
113
|
+
RENDER_THUMBS = 'index_thumbs' # view name
|
112
114
|
|
113
115
|
belongs_to :newsparent, polymorphic: true, optional: true
|
114
116
|
|
115
117
|
set_callback :update, :after do |doc|
|
116
118
|
Site.update_all updated_at: Time.now
|
117
119
|
end
|
118
|
-
|
120
|
+
|
119
121
|
end
|
120
122
|
|
@@ -4,11 +4,8 @@ class ::Gameui::PremiumPurchase
|
|
4
4
|
include Mongoid::Timestamps
|
5
5
|
|
6
6
|
belongs_to :user_profile, :class_name => '::IshModels::UserProfile'
|
7
|
-
|
8
|
-
field :purchased_class
|
9
|
-
field :purchased_id
|
10
|
-
|
11
7
|
belongs_to :item, polymorphic: true
|
12
8
|
|
13
9
|
end
|
14
10
|
|
11
|
+
::Purchase = ::Gameui::PremiumPurchase
|
data/lib/ish/payment.rb
CHANGED
@@ -8,7 +8,12 @@ class Ish::Payment
|
|
8
8
|
field :amount, :type => Integer # in cents
|
9
9
|
field :charge, :type => Hash
|
10
10
|
field :email, :type => String
|
11
|
-
|
11
|
+
|
12
|
+
field :client_secret
|
13
|
+
field :payment_intent_id
|
14
|
+
|
15
|
+
field :status, type: Symbol
|
16
|
+
|
12
17
|
after_create :compute_paid_invoice_amount
|
13
18
|
|
14
19
|
protected
|
@@ -1,12 +1,12 @@
|
|
1
|
-
class IshModels::UserProfile
|
1
|
+
class IshModels::UserProfile
|
2
2
|
include Mongoid::Document
|
3
3
|
include Mongoid::Timestamps
|
4
|
-
|
4
|
+
|
5
5
|
field :name
|
6
6
|
validates_presence_of :name
|
7
7
|
|
8
8
|
field :username
|
9
|
-
|
9
|
+
|
10
10
|
field :email
|
11
11
|
# validates_format_of :email, :with => ::Devise::email_regexp
|
12
12
|
validates_format_of :email,:with => /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/
|
@@ -14,16 +14,16 @@ class IshModels::UserProfile
|
|
14
14
|
field :fb_access_token
|
15
15
|
field :fb_long_access_token
|
16
16
|
field :fb_expires_in
|
17
|
-
|
17
|
+
|
18
18
|
field :lang, :type => String, :default => :en
|
19
19
|
|
20
|
-
ROLES = [ :admin, :manager, :guy ]
|
20
|
+
ROLES = [ :admin, :manager, :guy ]
|
21
21
|
field :role_name, :type => Symbol
|
22
22
|
|
23
23
|
belongs_to :user
|
24
24
|
belongs_to :current_city, :class_name => 'City', :inverse_of => :current_users, :optional => true
|
25
25
|
belongs_to :guide_city, :class_name => 'City', :inverse_of => :guide, :optional => true
|
26
|
-
|
26
|
+
|
27
27
|
has_many :galleries, :inverse_of => :user_profile
|
28
28
|
has_and_belongs_to_many :shared_galleries, :class_name => 'Gallery', :inverse_of => :shared_profiles
|
29
29
|
|
@@ -38,6 +38,8 @@ class IshModels::UserProfile
|
|
38
38
|
has_and_belongs_to_many :friends, :class_name => 'IshModels::UserProfile', :inverse_of => :friendeds
|
39
39
|
has_and_belongs_to_many :friendeds, :class_name => 'IshModels::UserProfile', :inverse_of => :friends
|
40
40
|
|
41
|
+
field :n_unlocks, type: Integer, default: 0
|
42
|
+
|
41
43
|
#
|
42
44
|
# preferences
|
43
45
|
#
|
@@ -75,12 +77,14 @@ class IshModels::UserProfile
|
|
75
77
|
|
76
78
|
end
|
77
79
|
|
80
|
+
Profile = IshModels::UserProfile
|
81
|
+
|
78
82
|
=begin
|
79
83
|
field :about, :type => String
|
80
84
|
field :education, :type => String
|
81
85
|
field :objectives, :type => String
|
82
86
|
field :current_employment, :type => String
|
83
|
-
field :past_employment, :type => String
|
87
|
+
field :past_employment, :type => String
|
84
88
|
field :pdf_resume_path, :type => String
|
85
89
|
field :doc_resume_path, :type => String
|
86
90
|
|
data/lib/newsitem.rb
CHANGED
data/lib/tag.rb
CHANGED
@@ -1,19 +1,19 @@
|
|
1
|
-
class Tag
|
1
|
+
class Tag
|
2
2
|
include Mongoid::Document
|
3
3
|
include Mongoid::Timestamps
|
4
4
|
|
5
5
|
field :name, :type => String
|
6
6
|
# validates :name, :uniqueness => true, :allow_nil => false
|
7
|
-
|
7
|
+
|
8
8
|
field :name_seo, :as => :tagname
|
9
9
|
validates :name_seo, :uniqueness => true, :allow_nil => false
|
10
|
-
|
10
|
+
|
11
11
|
field :descr, :type => String, :default => ''
|
12
|
-
|
12
|
+
|
13
13
|
field :is_public, :type => Boolean, :default => true
|
14
14
|
field :is_trash, :type => Boolean, :default => false
|
15
15
|
field :is_feature, :type => Boolean, :default => false
|
16
|
-
|
16
|
+
|
17
17
|
field :weight, :type => Integer, :default => 10
|
18
18
|
|
19
19
|
has_many :children_tags, :class_name => 'Tag', :inverse_of => :parent_tag
|
@@ -47,7 +47,7 @@ class Tag
|
|
47
47
|
Tag.each { |r| r.remove }
|
48
48
|
end
|
49
49
|
end
|
50
|
-
|
50
|
+
|
51
51
|
def self.no_parent
|
52
52
|
Tag.where( :parent_tag_id => nil )
|
53
53
|
end
|
@@ -71,10 +71,10 @@ class Tag
|
|
71
71
|
def self.n_videos
|
72
72
|
4
|
73
73
|
end
|
74
|
-
|
74
|
+
|
75
75
|
# @deprecated I don't even know why I have this. Should be simplified into non-being.
|
76
76
|
def self.n_features
|
77
77
|
4
|
78
78
|
end
|
79
|
-
|
79
|
+
|
80
80
|
end
|
data/lib/venue.rb
CHANGED
data/lib/video.rb
CHANGED
@@ -22,14 +22,14 @@ class Video
|
|
22
22
|
field :youtube_id, :type => String
|
23
23
|
# validates :youtube_id, :uniqueness => true, :presence => true
|
24
24
|
|
25
|
-
|
25
|
+
has_and_belongs_to_many :tags
|
26
26
|
belongs_to :city, :optional => true
|
27
27
|
belongs_to :site, :optional => true
|
28
|
-
has_many :newsitems
|
28
|
+
# has_many :newsitems # unnecessary, right? _vp_ 20200412
|
29
29
|
|
30
30
|
belongs_to :user_profile, :optional => true, :class_name => 'IshModels::UserProfile', :inverse_of => :videos
|
31
31
|
|
32
|
-
accepts_nested_attributes_for :site, :
|
32
|
+
accepts_nested_attributes_for :site, :tags, :city
|
33
33
|
|
34
34
|
def self.list
|
35
35
|
[['', nil]] + Video.unscoped.order_by( :created_at => :desc ).map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }
|
@@ -56,7 +56,7 @@ class Video
|
|
56
56
|
:validate_media_type => false
|
57
57
|
validates_attachment_content_type :video, content_type: /\Avideo\/.*\Z/
|
58
58
|
|
59
|
-
has_mongoid_attached_file :thumb,
|
59
|
+
has_mongoid_attached_file :thumb,
|
60
60
|
:styles => {
|
61
61
|
:mini => '20x20#',
|
62
62
|
:thumb => "100x100#",
|
@@ -72,7 +72,7 @@ class Video
|
|
72
72
|
:s3_protocol => 'https',
|
73
73
|
:validate_media_type => false
|
74
74
|
validates_attachment_content_type :thumb, :content_type => ["image/jpg", "image/jpeg", "image/png", "image/gif", 'application/octet-stream' ]
|
75
|
-
|
75
|
+
|
76
76
|
set_callback :update, :after do |doc|
|
77
77
|
Site.update_all updated_at: Time.now
|
78
78
|
end
|
metadata
CHANGED
@@ -1,11 +1,11 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ish_models
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.33.
|
4
|
+
version: 0.0.33.122
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- piousbox
|
8
|
-
autorequire:
|
8
|
+
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
11
|
date: 2017-05-10 00:00:00.000000000 Z
|
@@ -154,7 +154,7 @@ homepage: http://wasya.co
|
|
154
154
|
licenses:
|
155
155
|
- MIT
|
156
156
|
metadata: {}
|
157
|
-
post_install_message:
|
157
|
+
post_install_message:
|
158
158
|
rdoc_options: []
|
159
159
|
require_paths:
|
160
160
|
- lib
|
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
170
170
|
version: '0'
|
171
171
|
requirements: []
|
172
172
|
rubygems_version: 3.0.6
|
173
|
-
signing_key:
|
173
|
+
signing_key:
|
174
174
|
specification_version: 4
|
175
175
|
summary: models of ish
|
176
176
|
test_files: []
|