trusty-cms 2.0.2.pre.beta → 2.0.2

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.
Files changed (109) hide show
  1. checksums.yaml +5 -13
  2. data/.gitignore +2 -0
  3. data/CONTRIBUTORS.md +3 -1
  4. data/Gemfile +6 -1
  5. data/Gemfile.lock +100 -80
  6. data/INSTALL.md +7 -6
  7. data/README.md +3 -1
  8. data/Rakefile +24 -4
  9. data/app/assets/javascripts/admin/jquery-ui.js +3787 -2339
  10. data/app/assets/javascripts/admin/page-edit.js +3 -3
  11. data/app/assets/javascripts/admin/tabcontrol.js.erb +16 -16
  12. data/app/assets/javascripts/admin/treetable.js +4 -2
  13. data/app/assets/stylesheets/admin/_base.scss +4 -4
  14. data/app/assets/stylesheets/admin/modules/_links.scss +1 -1
  15. data/app/assets/stylesheets/admin/partials/_content.scss +9 -2
  16. data/app/assets/stylesheets/admin/partials/_forms.scss +97 -29
  17. data/app/assets/stylesheets/admin/partials/_header.scss +2 -3
  18. data/app/assets/stylesheets/admin/partials/_index.scss +9 -6
  19. data/app/assets/stylesheets/admin/partials/_layout.scss +1 -2
  20. data/app/assets/stylesheets/admin/partials/_popup.scss +0 -11
  21. data/app/assets/stylesheets/admin/partials/_tabcontrol.scss +4 -4
  22. data/app/assets/stylesheets/admin/partials/_typography.scss +4 -0
  23. data/app/controllers/admin/pages_controller.rb +9 -1
  24. data/app/controllers/admin/references_controller.rb +8 -1
  25. data/app/controllers/admin/users_controller.rb +1 -1
  26. data/app/controllers/admin/welcome_controller.rb +3 -3
  27. data/app/controllers/site_controller.rb +1 -1
  28. data/app/helpers/admin/node_helper.rb +4 -4
  29. data/app/models/trusty_cms/config.rb +2 -1
  30. data/app/views/admin/configuration/edit.html.haml +2 -2
  31. data/app/views/admin/configuration/show.html.haml +1 -1
  32. data/app/views/admin/layouts/_form.html.haml +1 -1
  33. data/app/views/admin/layouts/remove.html.haml +1 -1
  34. data/app/views/admin/pages/_fields.html.haml +1 -1
  35. data/app/views/admin/pages/_node.html.haml +2 -2
  36. data/app/views/admin/pages/edit.html.haml +1 -1
  37. data/app/views/admin/pages/remove.html.haml +2 -2
  38. data/app/views/admin/preferences/edit.html.haml +36 -36
  39. data/app/views/admin/users/_form.html.haml +1 -1
  40. data/app/views/admin/users/_password_fields.html.haml +1 -1
  41. data/app/views/admin/users/remove.html.haml +1 -1
  42. data/app/views/admin/welcome/login.html.haml +1 -1
  43. data/app/views/layouts/application.html.haml +18 -16
  44. data/config/application.rb +2 -1
  45. data/config/boot.rb +0 -1
  46. data/config/database.mysql.yml +3 -3
  47. data/config/environments/development.rb +1 -0
  48. data/config/environments/test.rb +2 -4
  49. data/config/initializers/trusty_cms_config.rb +1 -0
  50. data/config/routes.rb +1 -0
  51. data/db/migrate/001_create_radiant_tables.rb +2 -1
  52. data/db/migrate/20100805155020_convert_page_metas.rb +0 -13
  53. data/db/migrate/20110902203823_add_allowed_children_cache_to_pages.rb +0 -4
  54. data/db/migrate/20120209231801_change_pages_allowed_children_cache_to_text.rb +0 -1
  55. data/lib/generators/instance/templates/databases/mysql.yml +3 -3
  56. data/lib/generators/instance/templates/instance_gemfile +2 -2
  57. data/lib/generators/trusty_cms/templates/database.yml.erb +4 -4
  58. data/lib/generators/trusty_cms/templates/routes.rb.erb +0 -1
  59. data/lib/login_system.rb +1 -1
  60. data/lib/tasks/database.rake +1 -3
  61. data/lib/tasks/framework.rake +1 -1
  62. data/lib/trusty_cms.rb +1 -1
  63. data/lib/trusty_cms/admin_ui.rb +2 -0
  64. data/lib/trusty_cms/extension_migrator.rb +1 -2
  65. data/lib/trusty_cms/initializer.rb +1 -1
  66. data/lib/trusty_cms/setup.rb +1 -1
  67. data/spec/ci/database.mysql.yml +1 -1
  68. data/spec/dummy/README.rdoc +28 -0
  69. data/spec/dummy/Rakefile +5 -0
  70. data/spec/dummy/bin/bundle +3 -0
  71. data/spec/dummy/bin/rails +4 -0
  72. data/spec/dummy/bin/rake +4 -0
  73. data/spec/dummy/bin/setup +29 -0
  74. data/spec/dummy/config.ru +4 -0
  75. data/spec/dummy/config/application.rb +152 -0
  76. data/spec/dummy/config/boot.rb +6 -0
  77. data/spec/dummy/config/database.yml +28 -0
  78. data/spec/dummy/config/environment.rb +5 -0
  79. data/spec/dummy/config/environments/development.rb +49 -0
  80. data/spec/dummy/config/environments/production.rb +79 -0
  81. data/spec/dummy/config/environments/test.rb +42 -0
  82. data/spec/dummy/config/initializers/assets.rb +11 -0
  83. data/spec/dummy/config/initializers/backtrace_silencers.rb +7 -0
  84. data/spec/dummy/config/initializers/cookies_serializer.rb +3 -0
  85. data/spec/dummy/config/initializers/filter_parameter_logging.rb +4 -0
  86. data/spec/dummy/config/initializers/inflections.rb +16 -0
  87. data/spec/dummy/config/initializers/mime_types.rb +4 -0
  88. data/spec/dummy/config/initializers/session_store.rb +3 -0
  89. data/spec/dummy/config/initializers/trusty_cms_config.rb +20 -0
  90. data/spec/dummy/config/initializers/wrap_parameters.rb +14 -0
  91. data/spec/dummy/config/locales/en.yml +23 -0
  92. data/spec/dummy/config/routes.rb +0 -0
  93. data/spec/dummy/config/secrets.yml +22 -0
  94. data/spec/dummy/db/schema.rb +122 -0
  95. data/spec/dummy/public/404.html +67 -0
  96. data/spec/dummy/public/422.html +67 -0
  97. data/spec/dummy/public/500.html +66 -0
  98. data/spec/dummy/public/favicon.ico +0 -0
  99. data/spec/features/pages_spec.rb +2 -2
  100. data/spec/rails_helper.rb +3 -4
  101. data/spec/spec_helper.rb +13 -77
  102. data/spec/support/custom_actions.rb +1 -0
  103. data/trusty_cms.gemspec +4 -2
  104. metadata +171 -182
  105. data/db/migrate/003_rename_behavior_column.rb +0 -9
  106. data/db/migrate/010_merge_behaviors_and_pages.rb +0 -57
  107. data/db/migrate/011_rename_type_column_on_page_to_class_name.rb +0 -9
  108. data/db/migrate/019_add_salt_to_users.rb +0 -11
  109. data/spec/helpers/regions_helper_spec.rb +0 -16
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- M2MxYjg3NGJhY2YyNWViNDBkMjY2ZmQ5MDYxZTdiY2MzODg2MWFmNQ==
5
- data.tar.gz: !binary |-
6
- NTQwM2E4YzI0NzNjYTgwOGI5NDAwNzQyNTUyOGM0YzU1MjZmNmQyMA==
2
+ SHA1:
3
+ metadata.gz: 8427060014375fabdbda66b56eb3f248beb5c32f
4
+ data.tar.gz: 18fd687db10248bf9d75728355c19274061d0324
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- ZjU3OTM0OTE0NzBjMGQ1OWVhY2RiOGMzMTJlNDBlY2IwNzVjNTM0MmIwYzk5
10
- ODc5MDRjYjY4MWFkNWE1ZTgyMjg5OTlmNzI3ZjNjYjhlNjI2NTgyNWIwMGNk
11
- YjU2YjM5MTY1YWQyZGU3YTRkNTgxYWQ1YWI3YzE3YTQ3NzkwMjg=
12
- data.tar.gz: !binary |-
13
- ZmZiOGQ0NzQ1OGFhYjY5ZTI3ZWM3YjJlYTg4Mjc0MmUxMWU1YmMxN2Q4OTNk
14
- OTQwYzA2NjI2NDc4MGE1NDBiZmRiZjdkZTg0MzE5OTc2NTY0OGYzMjRmMDIz
15
- MGNhZmM2NjIxMmQxZWRiNzg1NGRlNjY3MzI3M2ZlNjIyYzAwNjY=
6
+ metadata.gz: 45d0779609bea91f9033fdbcb41cdcf953f786549c9e9a3bbdc701202b1e44d337215631559eb2f22f3aef4b8e67524f38379f2af868d755039334e8d8e403d2
7
+ data.tar.gz: 1f5d133f2449c9f520ece5e8be24c3741f224f60f19558544129adb4b813390287985af76a91394dc0f7fdd9ebeda2b521987b69d8c345df85af4c1723dbdb55
data/.gitignore CHANGED
@@ -3,6 +3,8 @@ db/*.db
3
3
  log/*.log
4
4
  pkg
5
5
  tmp/*
6
+ spec/dummy/log/*.log
7
+ spec/dummy/tmp/*
6
8
  .DS_Store
7
9
  .svn
8
10
  TAGS
data/CONTRIBUTORS.md CHANGED
@@ -11,9 +11,11 @@ core:
11
11
  * Aly Fulton
12
12
  * Andrew Miller
13
13
  * Justin Reese
14
- * Patrick Fitzgerald
14
+ * Patrick FitzGerald
15
15
  * Kurtis Rainbolt-Greene
16
16
  * Colin Dean
17
+ * Brittant Martin
18
+ * Danielle Greaves
17
19
 
18
20
  ## Radiant CMS
19
21
 
data/Gemfile CHANGED
@@ -7,7 +7,7 @@ source 'https://rubygems.org'
7
7
  # requires radiant and therefore pulls in every
8
8
  # dependency mentioned in radiant.gemspec.
9
9
 
10
- gem 'trustygems', '~> 0.1.0'
10
+ gem 'trustygems', '~> 0.2.0'
11
11
 
12
12
  gemspec
13
13
 
@@ -42,4 +42,9 @@ group :development, :test do
42
42
  gem 'database_cleaner', '~> 1.3.0'
43
43
  gem 'poltergeist', '~> 1.5.1'
44
44
  gem "ckeditor", "~> 4.1.0"
45
+ gem 'factory_girl_rails', '~> 4.5.0'
46
+ gem 'rails-observers'
47
+ gem "protected_attributes"
48
+ gem "pry-byebug"
49
+ gem 'mysql2', '~> 0.4.2'
45
50
  end
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-cms (2.0.2.pre.beta)
4
+ trusty-cms (2.0.2)
5
5
  RedCloth (~> 4.2)
6
6
  acts_as_tree (~> 2.1)
7
7
  bundler (~> 1.7)
@@ -13,12 +13,13 @@ PATH
13
13
  haml-rails (~> 0.5)
14
14
  highline (~> 1.6)
15
15
  jquery-rails (~> 3.1)
16
- mysql (~> 2.9)
16
+ mysql2 (~> 0.4.2)
17
17
  protected_attributes (~> 1.0.9)
18
18
  rack (~> 1.4)
19
19
  rack-cache (~> 1.2)
20
20
  radius (~> 0.7)
21
21
  rails (~> 4.2)
22
+ rake (< 11.0)
22
23
  rdoc (~> 3.9)
23
24
  stringex (~> 1.3)
24
25
  therubyracer (~> 0.12)
@@ -30,62 +31,63 @@ GEM
30
31
  remote: https://rubygems.org/
31
32
  specs:
32
33
  RedCloth (4.2.9)
33
- actionmailer (4.2.3)
34
- actionpack (= 4.2.3)
35
- actionview (= 4.2.3)
36
- activejob (= 4.2.3)
34
+ actionmailer (4.2.6)
35
+ actionpack (= 4.2.6)
36
+ actionview (= 4.2.6)
37
+ activejob (= 4.2.6)
37
38
  mail (~> 2.5, >= 2.5.4)
38
39
  rails-dom-testing (~> 1.0, >= 1.0.5)
39
- actionpack (4.2.3)
40
- actionview (= 4.2.3)
41
- activesupport (= 4.2.3)
40
+ actionpack (4.2.6)
41
+ actionview (= 4.2.6)
42
+ activesupport (= 4.2.6)
42
43
  rack (~> 1.6)
43
44
  rack-test (~> 0.6.2)
44
45
  rails-dom-testing (~> 1.0, >= 1.0.5)
45
46
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
46
- actionview (4.2.3)
47
- activesupport (= 4.2.3)
47
+ actionview (4.2.6)
48
+ activesupport (= 4.2.6)
48
49
  builder (~> 3.1)
49
50
  erubis (~> 2.7.0)
50
51
  rails-dom-testing (~> 1.0, >= 1.0.5)
51
52
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
52
- activejob (4.2.3)
53
- activesupport (= 4.2.3)
53
+ activejob (4.2.6)
54
+ activesupport (= 4.2.6)
54
55
  globalid (>= 0.3.0)
55
- activemodel (4.2.3)
56
- activesupport (= 4.2.3)
56
+ activemodel (4.2.6)
57
+ activesupport (= 4.2.6)
57
58
  builder (~> 3.1)
58
- activerecord (4.2.3)
59
- activemodel (= 4.2.3)
60
- activesupport (= 4.2.3)
59
+ activerecord (4.2.6)
60
+ activemodel (= 4.2.6)
61
+ activesupport (= 4.2.6)
61
62
  arel (~> 6.0)
62
- activesupport (4.2.3)
63
+ activesupport (4.2.6)
63
64
  i18n (~> 0.7)
64
65
  json (~> 1.7, >= 1.7.7)
65
66
  minitest (~> 5.1)
66
67
  thread_safe (~> 0.3, >= 0.3.4)
67
68
  tzinfo (~> 1.1)
68
- acts_as_tree (2.2.0)
69
+ acts_as_tree (2.4.0)
69
70
  activerecord (>= 3.0.0)
70
- addressable (2.3.8)
71
- arel (6.0.2)
71
+ addressable (2.4.0)
72
+ arel (6.0.3)
72
73
  builder (3.2.2)
74
+ byebug (8.2.2)
73
75
  capybara (2.3.0)
74
76
  mime-types (>= 1.16)
75
77
  nokogiri (>= 1.3.3)
76
78
  rack (>= 1.0.0)
77
79
  rack-test (>= 0.5.4)
78
80
  xpath (~> 2.0)
79
- chunky_png (1.3.4)
80
- ckeditor (4.1.2)
81
+ chunky_png (1.3.5)
82
+ ckeditor (4.1.6)
81
83
  cocaine
82
84
  orm_adapter (~> 0.5.0)
83
85
  climate_control (0.0.3)
84
86
  activesupport (>= 3.0)
85
87
  cliver (0.3.2)
86
- cocaine (0.5.7)
88
+ cocaine (0.5.8)
87
89
  climate_control (>= 0.0.3, < 1.0)
88
- coderay (1.1.0)
90
+ coderay (1.1.1)
89
91
  compass (1.0.3)
90
92
  chunky_png (~> 1.2)
91
93
  compass-core (~> 1.0.2)
@@ -98,9 +100,9 @@ GEM
98
100
  sass (>= 3.3.0, < 3.5)
99
101
  compass-import-once (1.0.5)
100
102
  sass (>= 3.2, < 3.5)
101
- compass-rails (2.0.4)
103
+ compass-rails (2.0.5)
102
104
  compass (~> 1.0.0)
103
- sass-rails (<= 5.0.1)
105
+ sass-rails (< 5.1)
104
106
  sprockets (< 2.13)
105
107
  daemons (1.2.3)
106
108
  database_cleaner (1.3.0)
@@ -108,14 +110,19 @@ GEM
108
110
  rails (>= 3.0)
109
111
  diff-lcs (1.2.5)
110
112
  erubis (2.7.0)
111
- eventmachine (1.0.7)
112
- eventmachine (1.0.7-java)
113
- execjs (2.5.2)
113
+ eventmachine (1.0.9.1)
114
+ eventmachine (1.0.9.1-java)
115
+ execjs (2.6.0)
116
+ factory_girl (4.5.0)
117
+ activesupport (>= 3.0.0)
118
+ factory_girl_rails (4.5.0)
119
+ factory_girl (~> 4.5.0)
120
+ railties (>= 3.0.0)
114
121
  ffi (1.9.10)
115
122
  ffi (1.9.10-java)
116
- globalid (0.3.5)
123
+ globalid (0.3.6)
117
124
  activesupport (>= 4.1.0)
118
- haml (4.0.6)
125
+ haml (4.0.7)
119
126
  tilt
120
127
  haml-rails (0.9.0)
121
128
  actionpack (>= 4.0.1)
@@ -123,7 +130,7 @@ GEM
123
130
  haml (>= 4.0.6, < 5.0)
124
131
  html2haml (>= 1.0.1)
125
132
  railties (>= 4.0.1)
126
- highline (1.7.2)
133
+ highline (1.7.8)
127
134
  hike (1.2.3)
128
135
  html2haml (2.0.0)
129
136
  erubis (~> 2.7.0)
@@ -131,7 +138,7 @@ GEM
131
138
  nokogiri (~> 1.6.0)
132
139
  ruby_parser (~> 3.5)
133
140
  i18n (0.7.0)
134
- jquery-rails (3.1.3)
141
+ jquery-rails (3.1.4)
135
142
  railties (>= 3.0, < 5.0)
136
143
  thor (>= 0.14, < 2.0)
137
144
  json (1.8.3)
@@ -141,20 +148,20 @@ GEM
141
148
  launchy (2.4.3-java)
142
149
  addressable (~> 2.3)
143
150
  spoon (~> 0.0.1)
144
- libv8 (3.16.14.11)
145
- loofah (2.0.2)
151
+ libv8 (3.16.14.13)
152
+ loofah (2.0.3)
146
153
  nokogiri (>= 1.5.9)
147
- mail (2.6.3)
148
- mime-types (>= 1.16, < 3)
154
+ mail (2.6.4)
155
+ mime-types (>= 1.16, < 4)
149
156
  method_source (0.8.2)
150
- mime-types (2.6.1)
151
- mini_portile (0.6.2)
152
- minitest (5.7.0)
157
+ mime-types (2.99.1)
158
+ mini_portile2 (2.0.0)
159
+ minitest (5.8.4)
153
160
  multi_json (1.11.2)
154
- mysql (2.9.1)
155
- nokogiri (1.6.6.2)
156
- mini_portile (~> 0.6.0)
157
- nokogiri (1.6.6.2-java)
161
+ mysql2 (0.4.3)
162
+ nokogiri (1.6.7.2)
163
+ mini_portile2 (~> 2.0.0.rc2)
164
+ nokogiri (1.6.7.2-java)
158
165
  orm_adapter (0.5.0)
159
166
  poltergeist (1.5.1)
160
167
  capybara (~> 2.1)
@@ -163,48 +170,53 @@ GEM
163
170
  websocket-driver (>= 0.2.0)
164
171
  protected_attributes (1.0.9)
165
172
  activemodel (>= 4.0.1, < 5.0)
166
- pry (0.10.1)
173
+ pry (0.10.3)
167
174
  coderay (~> 1.1.0)
168
175
  method_source (~> 0.8.1)
169
176
  slop (~> 3.4)
170
- pry (0.10.1-java)
177
+ pry (0.10.3-java)
171
178
  coderay (~> 1.1.0)
172
179
  method_source (~> 0.8.1)
173
180
  slop (~> 3.4)
174
181
  spoon (~> 0.0)
182
+ pry-byebug (3.3.0)
183
+ byebug (~> 8.0)
184
+ pry (~> 0.10)
175
185
  rack (1.6.4)
176
- rack-cache (1.2)
186
+ rack-cache (1.6.1)
177
187
  rack (>= 0.4)
178
188
  rack-test (0.6.3)
179
189
  rack (>= 1.0)
180
190
  radius (0.7.4)
181
- rails (4.2.3)
182
- actionmailer (= 4.2.3)
183
- actionpack (= 4.2.3)
184
- actionview (= 4.2.3)
185
- activejob (= 4.2.3)
186
- activemodel (= 4.2.3)
187
- activerecord (= 4.2.3)
188
- activesupport (= 4.2.3)
191
+ rails (4.2.6)
192
+ actionmailer (= 4.2.6)
193
+ actionpack (= 4.2.6)
194
+ actionview (= 4.2.6)
195
+ activejob (= 4.2.6)
196
+ activemodel (= 4.2.6)
197
+ activerecord (= 4.2.6)
198
+ activesupport (= 4.2.6)
189
199
  bundler (>= 1.3.0, < 2.0)
190
- railties (= 4.2.3)
200
+ railties (= 4.2.6)
191
201
  sprockets-rails
192
202
  rails-deprecated_sanitizer (1.0.3)
193
203
  activesupport (>= 4.2.0.alpha)
194
- rails-dom-testing (1.0.6)
204
+ rails-dom-testing (1.0.7)
195
205
  activesupport (>= 4.2.0.beta, < 5.0)
196
206
  nokogiri (~> 1.6.0)
197
207
  rails-deprecated_sanitizer (>= 1.0.1)
198
- rails-html-sanitizer (1.0.2)
208
+ rails-html-sanitizer (1.0.3)
199
209
  loofah (~> 2.0)
200
- railties (4.2.3)
201
- actionpack (= 4.2.3)
202
- activesupport (= 4.2.3)
210
+ rails-observers (0.1.2)
211
+ activemodel (~> 4.0)
212
+ railties (4.2.6)
213
+ actionpack (= 4.2.6)
214
+ activesupport (= 4.2.6)
203
215
  rake (>= 0.8.7)
204
216
  thor (>= 0.18.1, < 2.0)
205
- rake (10.4.2)
206
- rb-fsevent (0.9.5)
207
- rb-inotify (0.9.5)
217
+ rake (10.5.0)
218
+ rb-fsevent (0.9.7)
219
+ rb-inotify (0.9.7)
208
220
  ffi (>= 0.5.0)
209
221
  rdoc (3.12.2)
210
222
  json (~> 1.4)
@@ -225,16 +237,16 @@ GEM
225
237
  rspec-mocks (~> 3.0.0)
226
238
  rspec-support (~> 3.0.0)
227
239
  rspec-support (3.0.4)
228
- ruby_parser (3.7.0)
240
+ ruby_parser (3.8.1)
229
241
  sexp_processor (~> 4.1)
230
- sass (3.4.16)
231
- sass-rails (5.0.1)
242
+ sass (3.4.21)
243
+ sass-rails (5.0.4)
232
244
  railties (>= 4.0.0, < 5.0)
233
245
  sass (~> 3.1)
234
246
  sprockets (>= 2.8, < 4.0)
235
247
  sprockets-rails (>= 2.0, < 4.0)
236
- tilt (~> 1.1)
237
- sexp_processor (4.6.0)
248
+ tilt (>= 1.1, < 3)
249
+ sexp_processor (4.7.0)
238
250
  slop (3.6.0)
239
251
  spoon (0.0.4)
240
252
  ffi
@@ -243,7 +255,7 @@ GEM
243
255
  multi_json (~> 1.0)
244
256
  rack (~> 1.0)
245
257
  tilt (~> 1.1, != 1.3.0)
246
- sprockets-rails (2.3.2)
258
+ sprockets-rails (2.3.3)
247
259
  actionpack (>= 3.0)
248
260
  activesupport (>= 3.0)
249
261
  sprockets (>= 2.8, < 4.0)
@@ -251,27 +263,27 @@ GEM
251
263
  therubyracer (0.12.2)
252
264
  libv8 (~> 3.16.14.0)
253
265
  ref
254
- thin (1.6.3)
266
+ thin (1.6.4)
255
267
  daemons (~> 1.0, >= 1.0.9)
256
- eventmachine (~> 1.0)
268
+ eventmachine (~> 1.0, >= 1.0.4)
257
269
  rack (~> 1.0)
258
270
  thor (0.19.1)
259
271
  thread_safe (0.3.5)
260
272
  thread_safe (0.3.5-java)
261
273
  tilt (1.4.1)
262
- trustygems (0.1.0)
274
+ trustygems (0.2.1)
263
275
  rake
264
276
  tzinfo (1.2.2)
265
277
  thread_safe (~> 0.1)
266
- uglifier (2.7.1)
278
+ uglifier (2.7.2)
267
279
  execjs (>= 0.3.0)
268
280
  json (>= 1.8.0)
269
- websocket-driver (0.6.2)
281
+ websocket-driver (0.6.3)
270
282
  websocket-extensions (>= 0.1.0)
271
- websocket-driver (0.6.2-java)
283
+ websocket-driver (0.6.3-java)
272
284
  websocket-extensions (>= 0.1.0)
273
285
  websocket-extensions (0.1.2)
274
- will_paginate (3.0.7)
286
+ will_paginate (3.1.0)
275
287
  xpath (2.0.0)
276
288
  nokogiri (~> 1.3)
277
289
 
@@ -284,10 +296,18 @@ DEPENDENCIES
284
296
  ckeditor (~> 4.1.0)
285
297
  compass-rails (~> 2.0.1)
286
298
  database_cleaner (~> 1.3.0)
299
+ factory_girl_rails (~> 4.5.0)
287
300
  launchy (~> 2.4.2)
301
+ mysql2 (~> 0.4.2)
288
302
  poltergeist (~> 1.5.1)
303
+ protected_attributes
289
304
  pry (~> 0.10.0)
305
+ pry-byebug
306
+ rails-observers
290
307
  rspec-rails (~> 3.0.0)
291
308
  thin (~> 1.6.2)
292
309
  trusty-cms!
293
- trustygems (~> 0.1.0)
310
+ trustygems (~> 0.2.0)
311
+
312
+ BUNDLED WITH
313
+ 1.11.2
data/INSTALL.md CHANGED
@@ -1,12 +1,14 @@
1
1
  # Installation and Setup
2
2
 
3
- From within the directory containing your TrustyCms instance:
3
+ From within the directory containing your TrustyCMS instance:
4
4
 
5
- 1. Create a new Rails 3 application (i.e. `rails new [project_name]`)
5
+ 1. Create a new Rails 4 application (i.e. `rails new [project_name]`)
6
6
 
7
- 2. Replace most of your gemfile with these gems:
8
- - `gem "trusty-cms", "~>1.1.0`
9
- - `gem "mysql", "~> 2.9.1"`
7
+ 2. Replace most of your Gemfile with these gems:
8
+ - gem "trusty-cms", "~>2.0.0-beta"
9
+ - gem "mysql2"
10
+ - gem 'rails-observers'
11
+ - gem 'protected_attributes'
10
12
 
11
13
  3. Run `bundle install`
12
14
 
@@ -14,4 +16,3 @@ From within the directory containing your TrustyCms instance:
14
16
  - This will ask you if you want to replace a number of existing files (like application.rb); reply Y to all.
15
17
 
16
18
  5. Run `bundle exec rake db:create`, then `bundle exec rake db:bootstrap`.
17
-
data/README.md CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  [![Gem Version](https://badge.fury.io/rb/trusty-cms.svg)](http://badge.fury.io/rb/trusty-cms)
4
4
 
5
- Trusty is a branch of the venerable Radiant CMS. Its goal is to pull the Radiant framework into Rails 3 with minimal changes to its infrastructure. Most of what is below is derived from the original Radiant CMS readme.
5
+ Trusty is a branch of the venerable Radiant CMS. Its goal is to pull the Radiant framework into Rails 4 with minimal changes to its infrastructure. Most of what is below is derived from the original Radiant CMS readme.
6
6
 
7
7
  TrustyCms is a no-fluff, open source content management system designed for
8
8
  small teams. It is similar to Textpattern or MovableType, but is a general
@@ -124,6 +124,8 @@ Most of the development for TrustyCms happens on Github:
124
124
 
125
125
  https://github.com/pgharts/trusty-cms
126
126
 
127
+ TrustyCMS is supported in part by https://www.browserstack.com/
128
+
127
129
  Enjoy!
128
130
 
129
131
  --