trusty-cms 3.5.1 → 3.5.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +12 -9
- data/app/assets/images/admin/single_form_shadow.png +0 -0
- data/app/assets/images/rad_social/email.png +0 -0
- data/app/models/site.rb +1 -1
- data/lib/trusty_cms.rb +1 -1
- data/trusty_cms.gemspec +2 -2
- metadata +18 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 60d2fbeb659c32f7e84840f73875fe52f8babbf5
|
4
|
+
data.tar.gz: d7f0af94bd84f4effc97e7cd7dea2e9082ca45a0
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d47dd1277e06561bc020aa026631b1fb205211fd23dac68c802ee94465392807d7869fec0cb5f401116fc0def077c09ba32b8e254ef48e623ffaebb61deb6a91
|
7
|
+
data.tar.gz: 15044ee9f5e3d46a55b6f412663d06095ca19c5fbe65bfde7ce114524d207fbad1b1a2f16fc5c736b41be6ce7abbd1e0b71199de18e1bbee59ed29c273cb27cb
|
data/Gemfile.lock
CHANGED
@@ -1,12 +1,12 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
trusty-cms (3.5.
|
4
|
+
trusty-cms (3.5.2)
|
5
5
|
RedCloth (= 4.3.2)
|
6
6
|
acts_as_list (~> 0.9.5)
|
7
7
|
acts_as_tree (>= 2.6.1, < 2.9.0)
|
8
8
|
bundler (~> 1.7)
|
9
|
-
ckeditor (>= 4.2.2, < 4.
|
9
|
+
ckeditor (>= 4.2.2, < 4.3.0)
|
10
10
|
delocalize (>= 0.2, < 2.0)
|
11
11
|
execjs (~> 2.7)
|
12
12
|
haml (~> 5.0)
|
@@ -22,6 +22,7 @@ PATH
|
|
22
22
|
rake (< 13.0)
|
23
23
|
rdoc (>= 5.1, < 7.0)
|
24
24
|
roadie-rails
|
25
|
+
sass-rails
|
25
26
|
stringex (>= 2.7.1, < 2.9.0)
|
26
27
|
therubyracer (~> 0.12.3)
|
27
28
|
tzinfo (~> 1.2.3)
|
@@ -90,17 +91,19 @@ GEM
|
|
90
91
|
rack (>= 1.6.0)
|
91
92
|
rack-test (>= 0.6.3)
|
92
93
|
xpath (~> 3.1)
|
93
|
-
ckeditor (4.
|
94
|
+
ckeditor (4.2.4)
|
95
|
+
cocaine
|
94
96
|
orm_adapter (~> 0.5.0)
|
95
|
-
terrapin
|
96
97
|
climate_control (0.2.0)
|
97
98
|
cliver (0.3.2)
|
99
|
+
cocaine (0.6.0)
|
100
|
+
terrapin (= 0.6.0)
|
98
101
|
codeclimate-test-reporter (1.0.9)
|
99
102
|
simplecov (<= 0.13)
|
100
103
|
coderay (1.1.2)
|
101
104
|
concurrent-ruby (1.1.4)
|
102
105
|
crass (1.0.4)
|
103
|
-
css_parser (1.
|
106
|
+
css_parser (1.7.0)
|
104
107
|
addressable
|
105
108
|
database_cleaner (1.7.0)
|
106
109
|
delocalize (1.2.0)
|
@@ -133,10 +136,10 @@ GEM
|
|
133
136
|
haml (>= 4.0, < 6)
|
134
137
|
nokogiri (>= 1.6.0)
|
135
138
|
ruby_parser (~> 3.5)
|
136
|
-
httparty (0.16.
|
139
|
+
httparty (0.16.4)
|
137
140
|
mime-types (~> 3.0)
|
138
141
|
multi_xml (>= 0.5.2)
|
139
|
-
i18n (1.
|
142
|
+
i18n (1.5.3)
|
140
143
|
concurrent-ruby (~> 1.0)
|
141
144
|
json (2.1.0)
|
142
145
|
kraken-io (0.1.3)
|
@@ -166,7 +169,7 @@ GEM
|
|
166
169
|
multipart-post (2.0.0)
|
167
170
|
mysql2 (0.5.2)
|
168
171
|
nio4r (2.3.1)
|
169
|
-
nokogiri (1.
|
172
|
+
nokogiri (1.10.1)
|
170
173
|
mini_portile2 (~> 2.4.0)
|
171
174
|
orm_adapter (0.5.0)
|
172
175
|
paperclip (6.1.0)
|
@@ -238,7 +241,7 @@ GEM
|
|
238
241
|
rspec-mocks (3.8.0)
|
239
242
|
diff-lcs (>= 1.2.0, < 2.0)
|
240
243
|
rspec-support (~> 3.8.0)
|
241
|
-
rspec-rails (3.8.
|
244
|
+
rspec-rails (3.8.2)
|
242
245
|
actionpack (>= 3.0)
|
243
246
|
activesupport (>= 3.0)
|
244
247
|
railties (>= 3.0)
|
Binary file
|
Binary file
|
data/app/models/site.rb
CHANGED
@@ -16,7 +16,7 @@ class Site < ActiveRecord::Base
|
|
16
16
|
|
17
17
|
def find_for_host(hostname = '')
|
18
18
|
return default if hostname.blank?
|
19
|
-
sites = where("domain IS NOT NULL")
|
19
|
+
sites = self.includes(:homepage).where("domain IS NOT NULL")
|
20
20
|
site = sites.find { |site| hostname == site.base_domain || hostname =~ Regexp.compile(site.domain) }
|
21
21
|
site || default
|
22
22
|
end
|
data/lib/trusty_cms.rb
CHANGED
data/trusty_cms.gemspec
CHANGED
@@ -7,7 +7,6 @@ Gem::Specification.new do |s|
|
|
7
7
|
|
8
8
|
s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
|
9
9
|
s.authors = ["TrustyCms CMS dev team"]
|
10
|
-
s.default_executable = %q{trusty_cms}
|
11
10
|
s.description = %q{TrustyCms is a simple and powerful publishing system designed for small teams.
|
12
11
|
It is built with Rails and is similar to Textpattern or MovableType, but is
|
13
12
|
a general purpose content managment system--not merely a blogging engine.}
|
@@ -26,7 +25,7 @@ a general purpose content managment system--not merely a blogging engine.}
|
|
26
25
|
s.add_dependency 'acts_as_list', '~> 0.9.5'
|
27
26
|
s.add_dependency 'acts_as_tree', '>= 2.6.1', '< 2.9.0'
|
28
27
|
s.add_dependency 'bundler', '~> 1.7'
|
29
|
-
s.add_dependency 'ckeditor', '>= 4.2.2', '< 4.
|
28
|
+
s.add_dependency 'ckeditor', '>= 4.2.2', '< 4.3.0'
|
30
29
|
s.add_dependency 'delocalize', '>= 0.2', '< 2.0'
|
31
30
|
s.add_dependency 'execjs', '~> 2.7'
|
32
31
|
s.add_dependency 'haml', '~> 5.0'
|
@@ -43,6 +42,7 @@ a general purpose content managment system--not merely a blogging engine.}
|
|
43
42
|
s.add_dependency 'RedCloth', '4.3.2'
|
44
43
|
s.add_dependency 'rake', '< 13.0'
|
45
44
|
s.add_dependency 'roadie-rails'
|
45
|
+
s.add_dependency 'sass-rails'
|
46
46
|
s.add_dependency 'stringex', '>= 2.7.1', '< 2.9.0'
|
47
47
|
s.add_dependency 'therubyracer', '~> 0.12.3'
|
48
48
|
s.add_dependency 'tzinfo', '~> 1.2.3'
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: trusty-cms
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.5.
|
4
|
+
version: 3.5.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- TrustyCms CMS dev team
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-
|
11
|
+
date: 2019-02-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: acts_as_list
|
@@ -67,7 +67,7 @@ dependencies:
|
|
67
67
|
version: 4.2.2
|
68
68
|
- - "<"
|
69
69
|
- !ruby/object:Gem::Version
|
70
|
-
version: 4.
|
70
|
+
version: 4.3.0
|
71
71
|
type: :runtime
|
72
72
|
prerelease: false
|
73
73
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -77,7 +77,7 @@ dependencies:
|
|
77
77
|
version: 4.2.2
|
78
78
|
- - "<"
|
79
79
|
- !ruby/object:Gem::Version
|
80
|
-
version: 4.
|
80
|
+
version: 4.3.0
|
81
81
|
- !ruby/object:Gem::Dependency
|
82
82
|
name: delocalize
|
83
83
|
requirement: !ruby/object:Gem::Requirement
|
@@ -320,6 +320,20 @@ dependencies:
|
|
320
320
|
- - ">="
|
321
321
|
- !ruby/object:Gem::Version
|
322
322
|
version: '0'
|
323
|
+
- !ruby/object:Gem::Dependency
|
324
|
+
name: sass-rails
|
325
|
+
requirement: !ruby/object:Gem::Requirement
|
326
|
+
requirements:
|
327
|
+
- - ">="
|
328
|
+
- !ruby/object:Gem::Version
|
329
|
+
version: '0'
|
330
|
+
type: :runtime
|
331
|
+
prerelease: false
|
332
|
+
version_requirements: !ruby/object:Gem::Requirement
|
333
|
+
requirements:
|
334
|
+
- - ">="
|
335
|
+
- !ruby/object:Gem::Version
|
336
|
+
version: '0'
|
323
337
|
- !ruby/object:Gem::Dependency
|
324
338
|
name: stringex
|
325
339
|
requirement: !ruby/object:Gem::Requirement
|