trusty-cms 2.0.2 → 2.0.3.pre.beta

Sign up to get free protection for your applications and to get access to all the features.
Files changed (207) hide show
  1. checksums.yaml +13 -5
  2. data/.gitignore +0 -2
  3. data/CONTRIBUTORS.md +1 -3
  4. data/Gemfile +1 -6
  5. data/Gemfile.lock +80 -100
  6. data/INSTALL.md +6 -7
  7. data/README.md +1 -3
  8. data/Rakefile +4 -24
  9. data/app/assets/javascripts/admin/jquery-ui.js +2339 -3787
  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 +2 -4
  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 +2 -9
  16. data/app/assets/stylesheets/admin/partials/_forms.scss +29 -97
  17. data/app/assets/stylesheets/admin/partials/_header.scss +3 -2
  18. data/app/assets/stylesheets/admin/partials/_index.scss +6 -9
  19. data/app/assets/stylesheets/admin/partials/_layout.scss +2 -1
  20. data/app/assets/stylesheets/admin/partials/_popup.scss +11 -0
  21. data/app/assets/stylesheets/admin/partials/_tabcontrol.scss +4 -4
  22. data/app/assets/stylesheets/admin/partials/_typography.scss +0 -4
  23. data/app/controllers/admin/pages_controller.rb +1 -9
  24. data/app/controllers/admin/references_controller.rb +1 -8
  25. data/app/controllers/admin/users_controller.rb +1 -1
  26. data/app/controllers/admin/welcome_controller.rb +3 -3
  27. data/app/controllers/application_controller.rb.rails2 +113 -0
  28. data/app/controllers/site_controller.rb +1 -1
  29. data/app/helpers/admin/node_helper.rb +4 -4
  30. data/app/helpers/application_helper.rb.rails2 +242 -0
  31. data/app/models/trusty_cms/config.rb +1 -2
  32. data/app/views/admin/configuration/edit.html.haml +2 -2
  33. data/app/views/admin/configuration/show.html.haml +1 -1
  34. data/app/views/admin/layouts/_form.html.haml +1 -1
  35. data/app/views/admin/layouts/remove.html.haml +1 -1
  36. data/app/views/admin/pages/_fields.html.haml +1 -1
  37. data/app/views/admin/pages/_node.html.haml +2 -2
  38. data/app/views/admin/pages/edit.html.haml +1 -1
  39. data/app/views/admin/pages/remove.html.haml +2 -2
  40. data/app/views/admin/preferences/edit.html.haml +36 -36
  41. data/app/views/admin/users/_form.html.haml +1 -1
  42. data/app/views/admin/users/_password_fields.html.haml +1 -1
  43. data/app/views/admin/users/remove.html.haml +1 -1
  44. data/app/views/admin/welcome/login.html.haml +1 -1
  45. data/app/views/layouts/application.html.haml +16 -18
  46. data/config/application.rb +1 -2
  47. data/config/boot.rb +1 -0
  48. data/config/database.mysql.yml +3 -3
  49. data/{spec/dummy/config/database.yml → config/database.yml.rails2} +4 -4
  50. data/config/environment.rb.rails2 +89 -0
  51. data/config/environments/development.rb +0 -1
  52. data/config/environments/development.rb.rails2 +17 -0
  53. data/config/environments/production.rb.rails2 +24 -0
  54. data/config/environments/test.rb +4 -2
  55. data/config/initializers/trusty_cms_config.rb +0 -1
  56. data/config/routes.rb +0 -1
  57. data/config/routes.rb.rails2 +41 -0
  58. data/db/migrate/001_create_radiant_tables.rb +0 -1
  59. data/db/migrate/003_rename_behavior_column.rb +9 -0
  60. data/db/migrate/019_add_salt_to_users.rb +11 -0
  61. data/db/migrate/20100805155020_convert_page_metas.rb +13 -0
  62. data/db/migrate/20110902203823_add_allowed_children_cache_to_pages.rb +4 -0
  63. data/db/migrate/20120209231801_change_pages_allowed_children_cache_to_text.rb +1 -0
  64. data/lib/generators/instance/templates/databases/mysql.yml +3 -3
  65. data/lib/generators/instance/templates/instance_gemfile +2 -2
  66. data/lib/generators/trusty_cms/templates/database.yml.erb +4 -4
  67. data/lib/generators/trusty_cms/templates/routes.rb.erb +1 -0
  68. data/lib/login_system.rb +1 -1
  69. data/lib/tasks/database.rake +3 -1
  70. data/lib/tasks/framework.rake +1 -1
  71. data/lib/trusty_cms/admin_ui.rb +0 -2
  72. data/lib/trusty_cms/extension_migrator.rb +2 -1
  73. data/lib/trusty_cms/initializer.rb +1 -1
  74. data/lib/trusty_cms/setup.rb +1 -1
  75. data/lib/trusty_cms.rb +1 -1
  76. data/public/stylesheets/admin/main.css +1 -0
  77. data/{spec/dummy/config/routes.rb → public/stylesheets/admin/overrides.css} +0 -0
  78. data/spec/ci/database.mysql.yml +1 -1
  79. data/spec/features/pages_spec.rb +2 -2
  80. data/spec/helpers/regions_helper_spec.rb +16 -0
  81. data/spec/rails_helper.rb +4 -3
  82. data/spec/spec_helper.rb +77 -13
  83. data/spec/support/custom_actions.rb +0 -1
  84. data/test/test_helper.rb.rails2 +64 -0
  85. data/tmp/cache/747/A70/TrustyCms%3A%3AConfig +0 -0
  86. data/tmp/cache/85C/FA0/TrustyCms.cache_mtime +0 -0
  87. data/tmp/cache_files_test/a.txt +1 -0
  88. data/tmp/cache_files_test/all.txt +3 -0
  89. data/tmp/cache_files_test/b.txt +1 -0
  90. data/tmp/config/radiant_config.yml +27 -0
  91. data/tmp/sass-cache/1a137f46a4706893cc07b2aa949a92cf851d936f/_boxes.sassc +0 -0
  92. data/tmp/sass-cache/1a137f46a4706893cc07b2aa949a92cf851d936f/_gradients.sassc +0 -0
  93. data/tmp/sass-cache/1a137f46a4706893cc07b2aa949a92cf851d936f/_links.sassc +0 -0
  94. data/tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_appearance.scssc +0 -0
  95. data/tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_background-clip.scssc +0 -0
  96. data/tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_background-origin.scssc +0 -0
  97. data/tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_background-size.scssc +0 -0
  98. data/tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_border-radius.scssc +0 -0
  99. data/tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_box-shadow.scssc +0 -0
  100. data/tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_box-sizing.scssc +0 -0
  101. data/tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_box.scssc +0 -0
  102. data/tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_columns.scssc +0 -0
  103. data/tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_filter.scssc +0 -0
  104. data/tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_font-face.scssc +0 -0
  105. data/tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_hyphenation.scssc +0 -0
  106. data/tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_images.scssc +0 -0
  107. data/tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_inline-block.scssc +0 -0
  108. data/tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_opacity.scssc +0 -0
  109. data/tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_regions.scssc +0 -0
  110. data/tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_shared.scssc +0 -0
  111. data/tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_text-shadow.scssc +0 -0
  112. data/tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_transform.scssc +0 -0
  113. data/tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_transition.scssc +0 -0
  114. data/tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_user-interface.scssc +0 -0
  115. data/tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_actions.sassc +0 -0
  116. data/tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_avatars.sassc +0 -0
  117. data/tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_content.sassc +0 -0
  118. data/tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_dateinput.sassc +0 -0
  119. data/tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_deprecated.sassc +0 -0
  120. data/tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_dropdown.sassc +0 -0
  121. data/tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_footer.sassc +0 -0
  122. data/tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_forms.sassc +0 -0
  123. data/tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_header.sassc +0 -0
  124. data/tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_index.sassc +0 -0
  125. data/tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_layout.sassc +0 -0
  126. data/tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_messages.sassc +0 -0
  127. data/tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_popup.sassc +0 -0
  128. data/tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_tabcontrol.sassc +0 -0
  129. data/tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_toolbar.sassc +0 -0
  130. data/tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_typography.sassc +0 -0
  131. data/tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_validations.sassc +0 -0
  132. data/tmp/sass-cache/33c9f77b54ab77293741bf5159eedff124a39fc1/_color.scssc +0 -0
  133. data/tmp/sass-cache/33c9f77b54ab77293741bf5159eedff124a39fc1/_general.scssc +0 -0
  134. data/tmp/sass-cache/33c9f77b54ab77293741bf5159eedff124a39fc1/_sprites.scssc +0 -0
  135. data/tmp/sass-cache/33c9f77b54ab77293741bf5159eedff124a39fc1/_tables.scssc +0 -0
  136. data/tmp/sass-cache/5683573556a6b271b3ffade55f4ff32a60e7c0f0/_base.scssc +0 -0
  137. data/tmp/sass-cache/5683573556a6b271b3ffade55f4ff32a60e7c0f0/_sprite-img.scssc +0 -0
  138. data/tmp/sass-cache/6159fdf943b5ffc54b901a34cdfcfc7e6f736834/_alternating-rows-and-columns.scssc +0 -0
  139. data/tmp/sass-cache/6159fdf943b5ffc54b901a34cdfcfc7e6f736834/_borders.scssc +0 -0
  140. data/tmp/sass-cache/6159fdf943b5ffc54b901a34cdfcfc7e6f736834/_scaffolding.scssc +0 -0
  141. data/tmp/sass-cache/81fb0626d3f9dbbcc1f43df416db1c97b6ad512a/_links.scssc +0 -0
  142. data/tmp/sass-cache/81fb0626d3f9dbbcc1f43df416db1c97b6ad512a/_lists.scssc +0 -0
  143. data/tmp/sass-cache/81fb0626d3f9dbbcc1f43df416db1c97b6ad512a/_text.scssc +0 -0
  144. data/tmp/sass-cache/81fb0626d3f9dbbcc1f43df416db1c97b6ad512a/_vertical_rhythm.scssc +0 -0
  145. data/tmp/sass-cache/87c1de4edf14dc5f527f65e2080e0faa325354aa/_hover-link.scssc +0 -0
  146. data/tmp/sass-cache/87c1de4edf14dc5f527f65e2080e0faa325354aa/_link-colors.scssc +0 -0
  147. data/tmp/sass-cache/87c1de4edf14dc5f527f65e2080e0faa325354aa/_unstyled-link.scssc +0 -0
  148. data/tmp/sass-cache/8b412a89f899813981285eadb5f08e52b94dfb65/_css3.scssc +0 -0
  149. data/tmp/sass-cache/8b412a89f899813981285eadb5f08e52b94dfb65/_support.scssc +0 -0
  150. data/tmp/sass-cache/8b412a89f899813981285eadb5f08e52b94dfb65/_typography.scssc +0 -0
  151. data/tmp/sass-cache/8b412a89f899813981285eadb5f08e52b94dfb65/_utilities.scssc +0 -0
  152. data/tmp/sass-cache/92844cd19a320f87ef960171cea4f33d1a07339c/_contrast.scssc +0 -0
  153. data/tmp/sass-cache/a97de1041408f914478b9e7943c5c6c2d221d4c0/_ellipsis.scssc +0 -0
  154. data/tmp/sass-cache/a97de1041408f914478b9e7943c5c6c2d221d4c0/_force-wrap.scssc +0 -0
  155. data/tmp/sass-cache/a97de1041408f914478b9e7943c5c6c2d221d4c0/_nowrap.scssc +0 -0
  156. data/tmp/sass-cache/a97de1041408f914478b9e7943c5c6c2d221d4c0/_replacement.scssc +0 -0
  157. data/tmp/sass-cache/b3d80baefd48593d8c08815ba2d83e209f5dad6f/_grid-background.scssc +0 -0
  158. data/tmp/sass-cache/b92bfc773efa04d930ffa0b3331244a1f378caa7/_compass.scssc +0 -0
  159. data/tmp/sass-cache/c055a2360b102aff9247707235d9dce9214f6c4f/_clearfix.scssc +0 -0
  160. data/tmp/sass-cache/c055a2360b102aff9247707235d9dce9214f6c4f/_float.scssc +0 -0
  161. data/tmp/sass-cache/c055a2360b102aff9247707235d9dce9214f6c4f/_hacks.scssc +0 -0
  162. data/tmp/sass-cache/c055a2360b102aff9247707235d9dce9214f6c4f/_min.scssc +0 -0
  163. data/tmp/sass-cache/c055a2360b102aff9247707235d9dce9214f6c4f/_reset.scssc +0 -0
  164. data/tmp/sass-cache/c055a2360b102aff9247707235d9dce9214f6c4f/_tag-cloud.scssc +0 -0
  165. data/tmp/sass-cache/c3fa060b99d9ed1d9740af472ecc747182e2ea93/_base.sassc +0 -0
  166. data/tmp/sass-cache/c3fa060b99d9ed1d9740af472ecc747182e2ea93/main.sassc +0 -0
  167. data/tmp/sass-cache/c3fa060b99d9ed1d9740af472ecc747182e2ea93/overrides.sassc +0 -0
  168. data/tmp/sass-cache/d2bf234de18cb20fe8238c9224b9863ed5d268c6/_bullets.scssc +0 -0
  169. data/tmp/sass-cache/d2bf234de18cb20fe8238c9224b9863ed5d268c6/_horizontal-list.scssc +0 -0
  170. data/tmp/sass-cache/d2bf234de18cb20fe8238c9224b9863ed5d268c6/_inline-block-list.scssc +0 -0
  171. data/tmp/sass-cache/d2bf234de18cb20fe8238c9224b9863ed5d268c6/_inline-list.scssc +0 -0
  172. data/tmp/sass-cache/dc9647e96d50c02214aff50e88308a74bf56d1d7/_utilities.scssc +0 -0
  173. data/trusty_cms.gemspec +2 -4
  174. metadata +180 -171
  175. data/spec/dummy/README.rdoc +0 -28
  176. data/spec/dummy/Rakefile +0 -5
  177. data/spec/dummy/bin/bundle +0 -3
  178. data/spec/dummy/bin/rails +0 -4
  179. data/spec/dummy/bin/rake +0 -4
  180. data/spec/dummy/bin/setup +0 -29
  181. data/spec/dummy/config/application.rb +0 -152
  182. data/spec/dummy/config/boot.rb +0 -6
  183. data/spec/dummy/config/environment.rb +0 -5
  184. data/spec/dummy/config/environments/development.rb +0 -49
  185. data/spec/dummy/config/environments/production.rb +0 -79
  186. data/spec/dummy/config/environments/test.rb +0 -42
  187. data/spec/dummy/config/initializers/assets.rb +0 -11
  188. data/spec/dummy/config/initializers/backtrace_silencers.rb +0 -7
  189. data/spec/dummy/config/initializers/cookies_serializer.rb +0 -3
  190. data/spec/dummy/config/initializers/filter_parameter_logging.rb +0 -4
  191. data/spec/dummy/config/initializers/inflections.rb +0 -16
  192. data/spec/dummy/config/initializers/mime_types.rb +0 -4
  193. data/spec/dummy/config/initializers/session_store.rb +0 -3
  194. data/spec/dummy/config/initializers/trusty_cms_config.rb +0 -20
  195. data/spec/dummy/config/initializers/wrap_parameters.rb +0 -14
  196. data/spec/dummy/config/locales/en.yml +0 -23
  197. data/spec/dummy/config/secrets.yml +0 -22
  198. data/spec/dummy/config.ru +0 -4
  199. data/spec/dummy/db/schema.rb +0 -122
  200. data/spec/dummy/log/test.log +0 -25081
  201. data/spec/dummy/public/404.html +0 -67
  202. data/spec/dummy/public/422.html +0 -67
  203. data/spec/dummy/public/500.html +0 -66
  204. data/spec/dummy/public/favicon.ico +0 -0
  205. data/spec/dummy/tmp/cache/747/A70/TrustyCms%3A%3AConfig +0 -0
  206. data/spec/dummy/tmp/cache/85C/FA0/TrustyCms.cache_mtime +0 -0
  207. data/spec/dummy/tmp/radiant_config_cache.txt +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,15 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 8427060014375fabdbda66b56eb3f248beb5c32f
4
- data.tar.gz: 18fd687db10248bf9d75728355c19274061d0324
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ ZmIxZDM4YWMyODhjYWViOTM4MTUzMDU4NDdjYTcyYzJlM2RmMTg1ZA==
5
+ data.tar.gz: !binary |-
6
+ MGU5NzEyMTExYWIxYTNiZGU4NTFiNzAzNzViNGU3MzFmNTkwYmVmZA==
5
7
  SHA512:
6
- metadata.gz: 45d0779609bea91f9033fdbcb41cdcf953f786549c9e9a3bbdc701202b1e44d337215631559eb2f22f3aef4b8e67524f38379f2af868d755039334e8d8e403d2
7
- data.tar.gz: 1f5d133f2449c9f520ece5e8be24c3741f224f60f19558544129adb4b813390287985af76a91394dc0f7fdd9ebeda2b521987b69d8c345df85af4c1723dbdb55
8
+ metadata.gz: !binary |-
9
+ OTU2MjdhODA4ZDMxZGUwNzI2NGYyM2U2NjY4ZWQwNWIzZWU4MjhjMTgwMmJi
10
+ MGU4YzdkMWE2YjI5NTZlYjA2ODc3ZDQzMWJkMWRhNDQwNjJkMGNlYzZiNzFi
11
+ Y2JlNmJkN2Y4ZjQ5ZjVmNDE3NDZiZjMxOTJkMTc2ZmI1MzliMTA=
12
+ data.tar.gz: !binary |-
13
+ ZGRhZmM4NDE5ZGE3ZTM3MWRkN2NkMjBhNWI1MzY4MDYxOWQyZGFiZWE5OWQ2
14
+ NzU2ZGUxZGI4ODFkMDdiYzUwNTk3MzBiZmEzNzA4NmM3NjhkZWM3OGI4NjUy
15
+ MmNiNzM3MDRiNWZmZTk4MDI0MTU1NmE0MWYwZjUzZDdiMDNjYWM=
data/.gitignore CHANGED
@@ -3,8 +3,6 @@ db/*.db
3
3
  log/*.log
4
4
  pkg
5
5
  tmp/*
6
- spec/dummy/log/*.log
7
- spec/dummy/tmp/*
8
6
  .DS_Store
9
7
  .svn
10
8
  TAGS
data/CONTRIBUTORS.md CHANGED
@@ -11,11 +11,9 @@ 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
19
17
 
20
18
  ## Radiant CMS
21
19
 
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.2.0'
10
+ gem 'trustygems', '~> 0.1.0'
11
11
 
12
12
  gemspec
13
13
 
@@ -42,9 +42,4 @@ 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'
50
45
  end
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-cms (2.0.2)
4
+ trusty-cms (2.0.3.pre.beta)
5
5
  RedCloth (~> 4.2)
6
6
  acts_as_tree (~> 2.1)
7
7
  bundler (~> 1.7)
@@ -13,13 +13,12 @@ PATH
13
13
  haml-rails (~> 0.5)
14
14
  highline (~> 1.6)
15
15
  jquery-rails (~> 3.1)
16
- mysql2 (~> 0.4.2)
16
+ mysql (~> 2.9)
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)
23
22
  rdoc (~> 3.9)
24
23
  stringex (~> 1.3)
25
24
  therubyracer (~> 0.12)
@@ -31,63 +30,62 @@ GEM
31
30
  remote: https://rubygems.org/
32
31
  specs:
33
32
  RedCloth (4.2.9)
34
- actionmailer (4.2.6)
35
- actionpack (= 4.2.6)
36
- actionview (= 4.2.6)
37
- activejob (= 4.2.6)
33
+ actionmailer (4.2.3)
34
+ actionpack (= 4.2.3)
35
+ actionview (= 4.2.3)
36
+ activejob (= 4.2.3)
38
37
  mail (~> 2.5, >= 2.5.4)
39
38
  rails-dom-testing (~> 1.0, >= 1.0.5)
40
- actionpack (4.2.6)
41
- actionview (= 4.2.6)
42
- activesupport (= 4.2.6)
39
+ actionpack (4.2.3)
40
+ actionview (= 4.2.3)
41
+ activesupport (= 4.2.3)
43
42
  rack (~> 1.6)
44
43
  rack-test (~> 0.6.2)
45
44
  rails-dom-testing (~> 1.0, >= 1.0.5)
46
45
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
47
- actionview (4.2.6)
48
- activesupport (= 4.2.6)
46
+ actionview (4.2.3)
47
+ activesupport (= 4.2.3)
49
48
  builder (~> 3.1)
50
49
  erubis (~> 2.7.0)
51
50
  rails-dom-testing (~> 1.0, >= 1.0.5)
52
51
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
53
- activejob (4.2.6)
54
- activesupport (= 4.2.6)
52
+ activejob (4.2.3)
53
+ activesupport (= 4.2.3)
55
54
  globalid (>= 0.3.0)
56
- activemodel (4.2.6)
57
- activesupport (= 4.2.6)
55
+ activemodel (4.2.3)
56
+ activesupport (= 4.2.3)
58
57
  builder (~> 3.1)
59
- activerecord (4.2.6)
60
- activemodel (= 4.2.6)
61
- activesupport (= 4.2.6)
58
+ activerecord (4.2.3)
59
+ activemodel (= 4.2.3)
60
+ activesupport (= 4.2.3)
62
61
  arel (~> 6.0)
63
- activesupport (4.2.6)
62
+ activesupport (4.2.3)
64
63
  i18n (~> 0.7)
65
64
  json (~> 1.7, >= 1.7.7)
66
65
  minitest (~> 5.1)
67
66
  thread_safe (~> 0.3, >= 0.3.4)
68
67
  tzinfo (~> 1.1)
69
- acts_as_tree (2.4.0)
68
+ acts_as_tree (2.2.0)
70
69
  activerecord (>= 3.0.0)
71
- addressable (2.4.0)
72
- arel (6.0.3)
70
+ addressable (2.3.8)
71
+ arel (6.0.2)
73
72
  builder (3.2.2)
74
- byebug (8.2.2)
75
73
  capybara (2.3.0)
76
74
  mime-types (>= 1.16)
77
75
  nokogiri (>= 1.3.3)
78
76
  rack (>= 1.0.0)
79
77
  rack-test (>= 0.5.4)
80
78
  xpath (~> 2.0)
81
- chunky_png (1.3.5)
82
- ckeditor (4.1.6)
79
+ chunky_png (1.3.4)
80
+ ckeditor (4.1.2)
83
81
  cocaine
84
82
  orm_adapter (~> 0.5.0)
85
83
  climate_control (0.0.3)
86
84
  activesupport (>= 3.0)
87
85
  cliver (0.3.2)
88
- cocaine (0.5.8)
86
+ cocaine (0.5.7)
89
87
  climate_control (>= 0.0.3, < 1.0)
90
- coderay (1.1.1)
88
+ coderay (1.1.0)
91
89
  compass (1.0.3)
92
90
  chunky_png (~> 1.2)
93
91
  compass-core (~> 1.0.2)
@@ -100,9 +98,9 @@ GEM
100
98
  sass (>= 3.3.0, < 3.5)
101
99
  compass-import-once (1.0.5)
102
100
  sass (>= 3.2, < 3.5)
103
- compass-rails (2.0.5)
101
+ compass-rails (2.0.4)
104
102
  compass (~> 1.0.0)
105
- sass-rails (< 5.1)
103
+ sass-rails (<= 5.0.1)
106
104
  sprockets (< 2.13)
107
105
  daemons (1.2.3)
108
106
  database_cleaner (1.3.0)
@@ -110,19 +108,14 @@ GEM
110
108
  rails (>= 3.0)
111
109
  diff-lcs (1.2.5)
112
110
  erubis (2.7.0)
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)
111
+ eventmachine (1.0.7)
112
+ eventmachine (1.0.7-java)
113
+ execjs (2.5.2)
121
114
  ffi (1.9.10)
122
115
  ffi (1.9.10-java)
123
- globalid (0.3.6)
116
+ globalid (0.3.5)
124
117
  activesupport (>= 4.1.0)
125
- haml (4.0.7)
118
+ haml (4.0.6)
126
119
  tilt
127
120
  haml-rails (0.9.0)
128
121
  actionpack (>= 4.0.1)
@@ -130,7 +123,7 @@ GEM
130
123
  haml (>= 4.0.6, < 5.0)
131
124
  html2haml (>= 1.0.1)
132
125
  railties (>= 4.0.1)
133
- highline (1.7.8)
126
+ highline (1.7.2)
134
127
  hike (1.2.3)
135
128
  html2haml (2.0.0)
136
129
  erubis (~> 2.7.0)
@@ -138,7 +131,7 @@ GEM
138
131
  nokogiri (~> 1.6.0)
139
132
  ruby_parser (~> 3.5)
140
133
  i18n (0.7.0)
141
- jquery-rails (3.1.4)
134
+ jquery-rails (3.1.3)
142
135
  railties (>= 3.0, < 5.0)
143
136
  thor (>= 0.14, < 2.0)
144
137
  json (1.8.3)
@@ -148,20 +141,20 @@ GEM
148
141
  launchy (2.4.3-java)
149
142
  addressable (~> 2.3)
150
143
  spoon (~> 0.0.1)
151
- libv8 (3.16.14.13)
152
- loofah (2.0.3)
144
+ libv8 (3.16.14.11)
145
+ loofah (2.0.2)
153
146
  nokogiri (>= 1.5.9)
154
- mail (2.6.4)
155
- mime-types (>= 1.16, < 4)
147
+ mail (2.6.3)
148
+ mime-types (>= 1.16, < 3)
156
149
  method_source (0.8.2)
157
- mime-types (2.99.1)
158
- mini_portile2 (2.0.0)
159
- minitest (5.8.4)
150
+ mime-types (2.6.1)
151
+ mini_portile (0.6.2)
152
+ minitest (5.7.0)
160
153
  multi_json (1.11.2)
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)
154
+ mysql (2.9.1)
155
+ nokogiri (1.6.6.2)
156
+ mini_portile (~> 0.6.0)
157
+ nokogiri (1.6.6.2-java)
165
158
  orm_adapter (0.5.0)
166
159
  poltergeist (1.5.1)
167
160
  capybara (~> 2.1)
@@ -170,53 +163,48 @@ GEM
170
163
  websocket-driver (>= 0.2.0)
171
164
  protected_attributes (1.0.9)
172
165
  activemodel (>= 4.0.1, < 5.0)
173
- pry (0.10.3)
166
+ pry (0.10.1)
174
167
  coderay (~> 1.1.0)
175
168
  method_source (~> 0.8.1)
176
169
  slop (~> 3.4)
177
- pry (0.10.3-java)
170
+ pry (0.10.1-java)
178
171
  coderay (~> 1.1.0)
179
172
  method_source (~> 0.8.1)
180
173
  slop (~> 3.4)
181
174
  spoon (~> 0.0)
182
- pry-byebug (3.3.0)
183
- byebug (~> 8.0)
184
- pry (~> 0.10)
185
175
  rack (1.6.4)
186
- rack-cache (1.6.1)
176
+ rack-cache (1.2)
187
177
  rack (>= 0.4)
188
178
  rack-test (0.6.3)
189
179
  rack (>= 1.0)
190
180
  radius (0.7.4)
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)
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)
199
189
  bundler (>= 1.3.0, < 2.0)
200
- railties (= 4.2.6)
190
+ railties (= 4.2.3)
201
191
  sprockets-rails
202
192
  rails-deprecated_sanitizer (1.0.3)
203
193
  activesupport (>= 4.2.0.alpha)
204
- rails-dom-testing (1.0.7)
194
+ rails-dom-testing (1.0.6)
205
195
  activesupport (>= 4.2.0.beta, < 5.0)
206
196
  nokogiri (~> 1.6.0)
207
197
  rails-deprecated_sanitizer (>= 1.0.1)
208
- rails-html-sanitizer (1.0.3)
198
+ rails-html-sanitizer (1.0.2)
209
199
  loofah (~> 2.0)
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)
200
+ railties (4.2.3)
201
+ actionpack (= 4.2.3)
202
+ activesupport (= 4.2.3)
215
203
  rake (>= 0.8.7)
216
204
  thor (>= 0.18.1, < 2.0)
217
- rake (10.5.0)
218
- rb-fsevent (0.9.7)
219
- rb-inotify (0.9.7)
205
+ rake (10.4.2)
206
+ rb-fsevent (0.9.5)
207
+ rb-inotify (0.9.5)
220
208
  ffi (>= 0.5.0)
221
209
  rdoc (3.12.2)
222
210
  json (~> 1.4)
@@ -237,16 +225,16 @@ GEM
237
225
  rspec-mocks (~> 3.0.0)
238
226
  rspec-support (~> 3.0.0)
239
227
  rspec-support (3.0.4)
240
- ruby_parser (3.8.1)
228
+ ruby_parser (3.7.0)
241
229
  sexp_processor (~> 4.1)
242
- sass (3.4.21)
243
- sass-rails (5.0.4)
230
+ sass (3.4.16)
231
+ sass-rails (5.0.1)
244
232
  railties (>= 4.0.0, < 5.0)
245
233
  sass (~> 3.1)
246
234
  sprockets (>= 2.8, < 4.0)
247
235
  sprockets-rails (>= 2.0, < 4.0)
248
- tilt (>= 1.1, < 3)
249
- sexp_processor (4.7.0)
236
+ tilt (~> 1.1)
237
+ sexp_processor (4.6.0)
250
238
  slop (3.6.0)
251
239
  spoon (0.0.4)
252
240
  ffi
@@ -255,7 +243,7 @@ GEM
255
243
  multi_json (~> 1.0)
256
244
  rack (~> 1.0)
257
245
  tilt (~> 1.1, != 1.3.0)
258
- sprockets-rails (2.3.3)
246
+ sprockets-rails (2.3.2)
259
247
  actionpack (>= 3.0)
260
248
  activesupport (>= 3.0)
261
249
  sprockets (>= 2.8, < 4.0)
@@ -263,27 +251,27 @@ GEM
263
251
  therubyracer (0.12.2)
264
252
  libv8 (~> 3.16.14.0)
265
253
  ref
266
- thin (1.6.4)
254
+ thin (1.6.3)
267
255
  daemons (~> 1.0, >= 1.0.9)
268
- eventmachine (~> 1.0, >= 1.0.4)
256
+ eventmachine (~> 1.0)
269
257
  rack (~> 1.0)
270
258
  thor (0.19.1)
271
259
  thread_safe (0.3.5)
272
260
  thread_safe (0.3.5-java)
273
261
  tilt (1.4.1)
274
- trustygems (0.2.1)
262
+ trustygems (0.1.0)
275
263
  rake
276
264
  tzinfo (1.2.2)
277
265
  thread_safe (~> 0.1)
278
- uglifier (2.7.2)
266
+ uglifier (2.7.1)
279
267
  execjs (>= 0.3.0)
280
268
  json (>= 1.8.0)
281
- websocket-driver (0.6.3)
269
+ websocket-driver (0.6.2)
282
270
  websocket-extensions (>= 0.1.0)
283
- websocket-driver (0.6.3-java)
271
+ websocket-driver (0.6.2-java)
284
272
  websocket-extensions (>= 0.1.0)
285
273
  websocket-extensions (0.1.2)
286
- will_paginate (3.1.0)
274
+ will_paginate (3.0.7)
287
275
  xpath (2.0.0)
288
276
  nokogiri (~> 1.3)
289
277
 
@@ -296,18 +284,10 @@ DEPENDENCIES
296
284
  ckeditor (~> 4.1.0)
297
285
  compass-rails (~> 2.0.1)
298
286
  database_cleaner (~> 1.3.0)
299
- factory_girl_rails (~> 4.5.0)
300
287
  launchy (~> 2.4.2)
301
- mysql2 (~> 0.4.2)
302
288
  poltergeist (~> 1.5.1)
303
- protected_attributes
304
289
  pry (~> 0.10.0)
305
- pry-byebug
306
- rails-observers
307
290
  rspec-rails (~> 3.0.0)
308
291
  thin (~> 1.6.2)
309
292
  trusty-cms!
310
- trustygems (~> 0.2.0)
311
-
312
- BUNDLED WITH
313
- 1.11.2
293
+ trustygems (~> 0.1.0)
data/INSTALL.md CHANGED
@@ -1,14 +1,12 @@
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 4 application (i.e. `rails new [project_name]`)
5
+ 1. Create a new Rails 3 application (i.e. `rails new [project_name]`)
6
6
 
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'
7
+ 2. Replace most of your gemfile with these gems:
8
+ - `gem "trusty-cms", "~>1.1.0`
9
+ - `gem "mysql", "~> 2.9.1"`
12
10
 
13
11
  3. Run `bundle install`
14
12
 
@@ -16,3 +14,4 @@ From within the directory containing your TrustyCMS instance:
16
14
  - This will ask you if you want to replace a number of existing files (like application.rb); reply Y to all.
17
15
 
18
16
  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 4 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 3 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,8 +124,6 @@ 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
-
129
127
  Enjoy!
130
128
 
131
129
  --
data/Rakefile CHANGED
@@ -2,27 +2,7 @@
2
2
  # Add your own tasks in files placed in lib/tasks ending in .rake,
3
3
  # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
4
4
 
5
- # require File.expand_path('../config/application', __FILE__)
6
- # STDOUT.sync = true
7
- # TrustyCms::Application.load_tasks
8
-
9
- require 'pry'
10
- require 'byebug'
11
- require 'trustygems'
12
-
13
- #!/usr/bin/env rake
14
- begin
15
- require 'bundler/setup'
16
- rescue LoadError
17
- puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
18
- end
19
- APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
20
- load 'rails/tasks/engine.rake'
21
- Bundler::GemHelper.install_tasks
22
- Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
23
- require 'rspec/core'
24
- require 'rspec/core/rake_task'
25
- desc "Run all specs in spec directory (excluding plugin specs)"
26
- RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
27
- task :default => :spec
28
- #TrustyCms::Application.load_tasks
5
+ require File.expand_path('../config/application', __FILE__)
6
+ STDOUT.sync = true
7
+ TrustyCms::Application.load_tasks
8
+ require 'trustygems'