sunrise-cms 1.0.3 → 1.1.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (353) hide show
  1. checksums.yaml +5 -5
  2. data/.gitignore +25 -0
  3. data/.rubocop.yml +87 -0
  4. data/.ruby-version +1 -0
  5. data/CHANGELOG.rdoc +11 -3
  6. data/Gemfile +49 -0
  7. data/README.md +6 -0
  8. data/Rakefile +4 -2
  9. data/app/assets/images/sunrise/icons/export.svg +4 -0
  10. data/app/assets/images/sunrise/icons/import.svg +5 -0
  11. data/app/assets/javascripts/sunrise/application.js +2 -3
  12. data/app/assets/javascripts/sunrise/jquery-ui-timepicker-addon.js +2143 -831
  13. data/app/assets/javascripts/sunrise/jquery.dialog.js.coffee +113 -40
  14. data/app/assets/javascripts/sunrise/jquery.editable.js.coffee +21 -21
  15. data/app/assets/javascripts/sunrise/manage.js.coffee +29 -28
  16. data/app/assets/stylesheets/sunrise/application.css +4 -4
  17. data/app/assets/stylesheets/sunrise/customize.css +7 -16
  18. data/app/assets/stylesheets/sunrise/jquery-ui-timepicker-addon.css +11 -0
  19. data/app/assets/stylesheets/sunrise/main.css +883 -606
  20. data/app/controllers/sunrise/activities_controller.rb +7 -5
  21. data/app/controllers/sunrise/application_controller.rb +17 -17
  22. data/app/controllers/sunrise/dashboard_controller.rb +6 -5
  23. data/app/controllers/sunrise/manager_controller.rb +145 -104
  24. data/app/controllers/sunrise/settings_controller.rb +5 -3
  25. data/app/helpers/sunrise/activities_helper.rb +8 -7
  26. data/app/helpers/sunrise/application_helper.rb +11 -9
  27. data/app/helpers/sunrise/dashboard_helper.rb +3 -1
  28. data/app/helpers/sunrise/manager_helper.rb +28 -27
  29. data/app/helpers/sunrise/structure_helper.rb +11 -8
  30. data/app/views/layouts/sunrise/application.html.erb +7 -6
  31. data/app/views/sunrise/manager/buttons/_export.html.erb +9 -2
  32. data/app/views/sunrise/manager/buttons/_import.html.erb +25 -0
  33. data/app/views/sunrise/manager/buttons/_sort.html.erb +3 -3
  34. data/app/views/sunrise/manager/tree/index.html.erb +1 -1
  35. data/config/locales/defaults/datetime.rb +7 -7
  36. data/config/locales/defaults/pluralize.rb +5 -3
  37. data/config/routes.rb +23 -20
  38. data/db/migrate/20111216144515_create_assets.rb +9 -7
  39. data/db/migrate/20111216144915_create_structures.rb +14 -12
  40. data/db/migrate/20111216145015_create_users.rb +20 -18
  41. data/db/migrate/20120611095315_create_settings.rb +7 -5
  42. data/lib/generators/sunrise/install_generator.rb +51 -49
  43. data/lib/generators/sunrise/templates/config/active_record/sunrise.rb +12 -10
  44. data/lib/generators/sunrise/templates/config/mongoid/sunrise.rb +14 -12
  45. data/lib/generators/sunrise/templates/config/seeds.rb +7 -7
  46. data/lib/generators/sunrise/templates/models/active_record/ability.rb +4 -3
  47. data/lib/generators/sunrise/templates/models/active_record/asset.rb +5 -3
  48. data/lib/generators/sunrise/templates/models/active_record/attachment_file.rb +4 -2
  49. data/lib/generators/sunrise/templates/models/active_record/avatar.rb +7 -5
  50. data/lib/generators/sunrise/templates/models/active_record/picture.rb +6 -4
  51. data/lib/generators/sunrise/templates/models/active_record/position_type.rb +5 -3
  52. data/lib/generators/sunrise/templates/models/active_record/role_type.rb +6 -4
  53. data/lib/generators/sunrise/templates/models/active_record/settings.rb +5 -3
  54. data/lib/generators/sunrise/templates/models/active_record/structure.rb +3 -1
  55. data/lib/generators/sunrise/templates/models/active_record/structure_type.rb +7 -5
  56. data/lib/generators/sunrise/templates/models/active_record/user.rb +5 -3
  57. data/lib/generators/sunrise/templates/models/mongoid/ability.rb +4 -3
  58. data/lib/generators/sunrise/templates/models/mongoid/asset.rb +18 -16
  59. data/lib/generators/sunrise/templates/models/mongoid/attachment_file.rb +4 -2
  60. data/lib/generators/sunrise/templates/models/mongoid/avatar.rb +7 -5
  61. data/lib/generators/sunrise/templates/models/mongoid/picture.rb +4 -2
  62. data/lib/generators/sunrise/templates/models/mongoid/position_type.rb +5 -3
  63. data/lib/generators/sunrise/templates/models/mongoid/role_type.rb +6 -4
  64. data/lib/generators/sunrise/templates/models/mongoid/settings.rb +9 -7
  65. data/lib/generators/sunrise/templates/models/mongoid/structure.rb +12 -10
  66. data/lib/generators/sunrise/templates/models/mongoid/structure_type.rb +7 -5
  67. data/lib/generators/sunrise/templates/models/mongoid/user.rb +37 -35
  68. data/lib/generators/sunrise/templates/models/sunrise/sunrise_navigation.rb +9 -7
  69. data/lib/generators/sunrise/templates/models/sunrise/sunrise_page.rb +5 -3
  70. data/lib/generators/sunrise/templates/models/sunrise/sunrise_structure.rb +10 -9
  71. data/lib/generators/sunrise/templates/models/sunrise/sunrise_user.rb +15 -13
  72. data/lib/generators/sunrise/templates/spec/controllers/pages_controller_spec.rb +12 -10
  73. data/lib/generators/sunrise/templates/spec/controllers/welcome_controller_spec.rb +8 -6
  74. data/lib/generators/sunrise/templates/spec/factories/structure_factory.rb +6 -5
  75. data/lib/generators/sunrise/templates/spec/factories/user_factory.rb +19 -18
  76. data/lib/generators/sunrise/templates/spec/spec_helper.rb +9 -7
  77. data/lib/generators/sunrise/templates/spec/support/helpers/controller_macros.rb +10 -9
  78. data/lib/generators/sunrise/templates/uploaders/attachment_file_uploader.rb +4 -2
  79. data/lib/generators/sunrise/templates/uploaders/avatar_uploader.rb +10 -7
  80. data/lib/generators/sunrise/templates/uploaders/picture_uploader.rb +9 -6
  81. data/lib/sunrise-cms.rb +2 -0
  82. data/lib/sunrise.rb +20 -13
  83. data/lib/sunrise/abstract_model.rb +103 -106
  84. data/lib/sunrise/carrierwave/base_uploader.rb +43 -46
  85. data/lib/sunrise/carrierwave/file_size_validator.rb +16 -11
  86. data/lib/sunrise/carrierwave/glue.rb +9 -9
  87. data/lib/sunrise/config.rb +14 -12
  88. data/lib/sunrise/config/association.rb +4 -3
  89. data/lib/sunrise/config/base.rb +15 -13
  90. data/lib/sunrise/config/export.rb +5 -3
  91. data/lib/sunrise/config/field.rb +26 -24
  92. data/lib/sunrise/config/form.rb +2 -0
  93. data/lib/sunrise/config/group.rb +9 -6
  94. data/lib/sunrise/config/has_fields.rb +6 -5
  95. data/lib/sunrise/config/has_groups.rb +4 -2
  96. data/lib/sunrise/config/index.rb +9 -7
  97. data/lib/sunrise/config/model.rb +20 -14
  98. data/lib/sunrise/config/navigation.rb +21 -19
  99. data/lib/sunrise/config/navigation_item.rb +7 -5
  100. data/lib/sunrise/config/nested_field.rb +13 -12
  101. data/lib/sunrise/config/page_presenter.rb +5 -2
  102. data/lib/sunrise/config/show.rb +2 -0
  103. data/lib/sunrise/core_ext.rb +2 -0
  104. data/lib/sunrise/core_ext/i18n.rb +9 -9
  105. data/lib/sunrise/core_ext/string.rb +4 -2
  106. data/lib/sunrise/engine.rb +22 -16
  107. data/lib/sunrise/hooks/adapters/active_record.rb +3 -1
  108. data/lib/sunrise/hooks/adapters/mongoid.rb +4 -2
  109. data/lib/sunrise/models/ability.rb +12 -10
  110. data/lib/sunrise/models/asset.rb +43 -43
  111. data/lib/sunrise/models/position_type.rb +7 -6
  112. data/lib/sunrise/models/role_type.rb +8 -7
  113. data/lib/sunrise/models/structure.rb +27 -28
  114. data/lib/sunrise/models/structure_type.rb +7 -6
  115. data/lib/sunrise/models/user.rb +39 -37
  116. data/lib/sunrise/utils.rb +16 -17
  117. data/lib/sunrise/utils/csv_document.rb +23 -23
  118. data/lib/sunrise/utils/eval_helpers.rb +41 -39
  119. data/lib/sunrise/utils/search_wrapper.rb +8 -7
  120. data/lib/sunrise/utils/transliteration.rb +42 -41
  121. data/lib/sunrise/version.rb +3 -1
  122. data/lib/sunrise/views/date_time_input.rb +19 -17
  123. data/lib/sunrise/views/form_builder.rb +15 -13
  124. data/lib/sunrise/views/helper.rb +32 -32
  125. data/lib/sunrise/views/search_wrapper.rb +5 -3
  126. data/lib/tasks/assets.rake +11 -9
  127. data/sunrise-cms.gemspec +50 -0
  128. metadata +85 -596
  129. data/spec/controllers/sunrise/activities_controller_spec.rb +0 -33
  130. data/spec/controllers/sunrise/manager_controller_spec.rb +0 -64
  131. data/spec/controllers/sunrise/settings_controller_spec.rb +0 -45
  132. data/spec/dummy/Rakefile +0 -7
  133. data/spec/dummy/app/assets/javascripts/application.js +0 -9
  134. data/spec/dummy/app/assets/javascripts/sunrise/plugins.js +0 -0
  135. data/spec/dummy/app/assets/javascripts/welcome.js +0 -2
  136. data/spec/dummy/app/assets/stylesheets/application.css +0 -7
  137. data/spec/dummy/app/assets/stylesheets/sunrise/plugins.css +0 -0
  138. data/spec/dummy/app/assets/stylesheets/welcome.css +0 -4
  139. data/spec/dummy/app/controllers/application_controller.rb +0 -3
  140. data/spec/dummy/app/controllers/welcome_controller.rb +0 -5
  141. data/spec/dummy/app/helpers/application_helper.rb +0 -12
  142. data/spec/dummy/app/helpers/welcome_helper.rb +0 -2
  143. data/spec/dummy/app/models/active_record/post.rb +0 -18
  144. data/spec/dummy/app/models/mongoid/post.rb +0 -27
  145. data/spec/dummy/app/sunrise/sunrise_post.rb +0 -34
  146. data/spec/dummy/app/views/layouts/application.html.erb +0 -20
  147. data/spec/dummy/app/views/public_activity/post/_create.html.erb +0 -5
  148. data/spec/dummy/app/views/public_activity/post/_destroy.html.erb +0 -5
  149. data/spec/dummy/app/views/public_activity/post/_update.html.erb +0 -5
  150. data/spec/dummy/app/views/sunrise/manager/users/thumbs/_record.html.erb +0 -34
  151. data/spec/dummy/app/views/welcome/index.html.erb +0 -2
  152. data/spec/dummy/config.ru +0 -4
  153. data/spec/dummy/config/application.rb +0 -55
  154. data/spec/dummy/config/boot.rb +0 -10
  155. data/spec/dummy/config/database.yml +0 -42
  156. data/spec/dummy/config/database.yml.sample +0 -34
  157. data/spec/dummy/config/environment.rb +0 -5
  158. data/spec/dummy/config/environments/development.rb +0 -33
  159. data/spec/dummy/config/environments/production.rb +0 -66
  160. data/spec/dummy/config/environments/test.rb +0 -41
  161. data/spec/dummy/config/initializers/backtrace_silencers.rb +0 -7
  162. data/spec/dummy/config/initializers/devise.rb +0 -216
  163. data/spec/dummy/config/initializers/inflections.rb +0 -10
  164. data/spec/dummy/config/initializers/mime_types.rb +0 -5
  165. data/spec/dummy/config/initializers/secret_token.rb +0 -7
  166. data/spec/dummy/config/initializers/session_store.rb +0 -8
  167. data/spec/dummy/config/initializers/sunrise.rb +0 -51
  168. data/spec/dummy/config/initializers/wrap_parameters.rb +0 -14
  169. data/spec/dummy/config/locales/en.yml +0 -5
  170. data/spec/dummy/config/mongoid.yml +0 -80
  171. data/spec/dummy/config/routes.rb +0 -10
  172. data/spec/dummy/db/migrate/20111227111941_install_acts_as_audited.rb +0 -28
  173. data/spec/dummy/db/migrate/20111227143901_create_page_parts.rb +0 -20
  174. data/spec/dummy/db/migrate/20111228152051_create_posts.rb +0 -14
  175. data/spec/dummy/db/migrate/20120105114018_create_meta_tags.rb +0 -21
  176. data/spec/dummy/db/migrate/20130214090723_create_activities.rb +0 -23
  177. data/spec/dummy/db/schema.rb +0 -90
  178. data/spec/dummy/log/test.log +0 -235
  179. data/spec/dummy/public/404.html +0 -26
  180. data/spec/dummy/public/422.html +0 -26
  181. data/spec/dummy/public/500.html +0 -26
  182. data/spec/dummy/public/favicon.ico +0 -0
  183. data/spec/dummy/script/rails +0 -6
  184. data/spec/dummy/tmp/cache/696/1F0/settings%3Ato_key +0 -1
  185. data/spec/dummy/tmp/cache/87C/5D0/settings%3Apersisted%3F +0 -1
  186. data/spec/dummy/tmp/cache/91C/830/settings%3Asome_setting +0 -1
  187. data/spec/dummy/tmp/cache/94E/D10/settings%3Asome_setting2 +0 -1
  188. data/spec/dummy/tmp/cache/assets/test/sass/f4a02ee710d6db0936c29533f2166c1526a55a9e/select2.scssc +0 -0
  189. data/spec/dummy/tmp/cache/assets/test/sprockets/03bae0b322a9c8706915fdb4f8d50961 +0 -0
  190. data/spec/dummy/tmp/cache/assets/test/sprockets/0a4412d6feb107cf35e452cc82a01134 +0 -0
  191. data/spec/dummy/tmp/cache/assets/test/sprockets/0c538631f0f094ca39bdb1448da8a4bc +0 -0
  192. data/spec/dummy/tmp/cache/assets/test/sprockets/0c94e795dfbbbf3599fdf312aeb577b9 +0 -0
  193. data/spec/dummy/tmp/cache/assets/test/sprockets/0e7270936d642e566d747ab335c44ec2 +0 -0
  194. data/spec/dummy/tmp/cache/assets/test/sprockets/0f894abd40c0b6114a9dff3a0599af7e +0 -0
  195. data/spec/dummy/tmp/cache/assets/test/sprockets/0fdc292bf2b2ddb2d0bf079950c8e770 +0 -0
  196. data/spec/dummy/tmp/cache/assets/test/sprockets/10bb80e2753b3d1716765b02ad9a2db3 +0 -0
  197. data/spec/dummy/tmp/cache/assets/test/sprockets/1349c61c2b491567c1632fcae44110a0 +0 -0
  198. data/spec/dummy/tmp/cache/assets/test/sprockets/13e20c0d57b7b851a7f025f5606f833f +0 -0
  199. data/spec/dummy/tmp/cache/assets/test/sprockets/146ce2f3522fd98d4a8a1501f16c7092 +0 -0
  200. data/spec/dummy/tmp/cache/assets/test/sprockets/172c139e25cc08516d5a8c72c777dd4d +0 -0
  201. data/spec/dummy/tmp/cache/assets/test/sprockets/18b64b11b8b00cc21a396da25a5ff156 +0 -0
  202. data/spec/dummy/tmp/cache/assets/test/sprockets/197d8d604ec08a638b656e053944b734 +0 -0
  203. data/spec/dummy/tmp/cache/assets/test/sprockets/1b73ae25962d8ff98f9f008b73c64bf4 +0 -0
  204. data/spec/dummy/tmp/cache/assets/test/sprockets/1bdb903463fe67323dbadb0f78337c70 +0 -0
  205. data/spec/dummy/tmp/cache/assets/test/sprockets/1ea532f332f1ff667097010cda704c99 +0 -0
  206. data/spec/dummy/tmp/cache/assets/test/sprockets/20215d59350863282208d478ea94cf08 +0 -0
  207. data/spec/dummy/tmp/cache/assets/test/sprockets/212fc15df4fd708ebdef5bd3be2191c1 +0 -0
  208. data/spec/dummy/tmp/cache/assets/test/sprockets/256dcb01e7f35659d770584fd71a85d2 +0 -0
  209. data/spec/dummy/tmp/cache/assets/test/sprockets/27ec6453d976c5e273e6f2c25830492c +0 -0
  210. data/spec/dummy/tmp/cache/assets/test/sprockets/3006732de695a5dfe249dcbf6852b543 +0 -0
  211. data/spec/dummy/tmp/cache/assets/test/sprockets/3008328e1cba59ad00ac79ac20275f17 +0 -0
  212. data/spec/dummy/tmp/cache/assets/test/sprockets/31ffcb9d2aba762160a2f4341e5cfd50 +0 -0
  213. data/spec/dummy/tmp/cache/assets/test/sprockets/32ae3cda2e7c692fc9711ab76fcf1c62 +0 -0
  214. data/spec/dummy/tmp/cache/assets/test/sprockets/35948a84ebda6147e5e5b67191ae37d8 +0 -0
  215. data/spec/dummy/tmp/cache/assets/test/sprockets/37766ae8287a873cb196a187f3253e66 +0 -0
  216. data/spec/dummy/tmp/cache/assets/test/sprockets/37b44bd55598f75d532d9edbe8c98336 +0 -0
  217. data/spec/dummy/tmp/cache/assets/test/sprockets/383908afbabb6096b774ab7c1856a102 +0 -0
  218. data/spec/dummy/tmp/cache/assets/test/sprockets/38611f05ed0bf72a4755c136796ff5d4 +0 -0
  219. data/spec/dummy/tmp/cache/assets/test/sprockets/3b99bacd5915b4ff7fb2664bc2aa30d0 +0 -0
  220. data/spec/dummy/tmp/cache/assets/test/sprockets/443ca9dc693ccf91d6e1cecaffe0fa9a +0 -0
  221. data/spec/dummy/tmp/cache/assets/test/sprockets/45c759123f4f6b42cdcff44b446655a5 +0 -0
  222. data/spec/dummy/tmp/cache/assets/test/sprockets/4ca01587005a9b895bca383881bec87d +0 -0
  223. data/spec/dummy/tmp/cache/assets/test/sprockets/4cffdba2a7aac80c1765e060b152b382 +0 -0
  224. data/spec/dummy/tmp/cache/assets/test/sprockets/4d38783b41d7c000fed2419b5173f87a +0 -0
  225. data/spec/dummy/tmp/cache/assets/test/sprockets/51fe2df168cee49df9d4136f59c87872 +0 -0
  226. data/spec/dummy/tmp/cache/assets/test/sprockets/564db16c8d964c3505bfca526e3fccf2 +0 -0
  227. data/spec/dummy/tmp/cache/assets/test/sprockets/56e5bd2f3c94d7a9d0da7c4e05c7ad78 +0 -0
  228. data/spec/dummy/tmp/cache/assets/test/sprockets/5807e61754ed8b16702f6ad7ba34d439 +0 -0
  229. data/spec/dummy/tmp/cache/assets/test/sprockets/593d990734170367188181754939b317 +0 -0
  230. data/spec/dummy/tmp/cache/assets/test/sprockets/5a44970074ecbfeae2cc9798ed7da7aa +0 -0
  231. data/spec/dummy/tmp/cache/assets/test/sprockets/5e7901fbee32b66040fd6376a8c981d8 +0 -0
  232. data/spec/dummy/tmp/cache/assets/test/sprockets/5ecbfe03cab317594d2bc1c6866d26db +0 -0
  233. data/spec/dummy/tmp/cache/assets/test/sprockets/609ce9936a503352d73f954f68be7f81 +0 -0
  234. data/spec/dummy/tmp/cache/assets/test/sprockets/65224b6e799d399f4e6cf4bf98155de2 +0 -0
  235. data/spec/dummy/tmp/cache/assets/test/sprockets/6a1e72555b75237fffccb5de8937b4d4 +0 -0
  236. data/spec/dummy/tmp/cache/assets/test/sprockets/6a8187f5c6f2e115d1a1c21ca2ec81a0 +0 -0
  237. data/spec/dummy/tmp/cache/assets/test/sprockets/6c9a2f7ab6f8d1f8e3e4cf1d7d6cc68a +0 -0
  238. data/spec/dummy/tmp/cache/assets/test/sprockets/6f4f668f70fb14b2132289fed6718f0e +0 -0
  239. data/spec/dummy/tmp/cache/assets/test/sprockets/727e0f830601f307d4c8b9a76e464c1a +0 -0
  240. data/spec/dummy/tmp/cache/assets/test/sprockets/749bd767d6654c80265f5ca0959dc8e1 +0 -0
  241. data/spec/dummy/tmp/cache/assets/test/sprockets/7a92952d5fff10f09ce91b852d6a744f +0 -0
  242. data/spec/dummy/tmp/cache/assets/test/sprockets/7ad564910e515e335bb008989a97efb7 +0 -0
  243. data/spec/dummy/tmp/cache/assets/test/sprockets/7b55037b89f2debe558b43fe7542e409 +0 -0
  244. data/spec/dummy/tmp/cache/assets/test/sprockets/7bb04b7318793726b5414daaa4f049d4 +0 -0
  245. data/spec/dummy/tmp/cache/assets/test/sprockets/7c5f37d1af8a5557b67d6ffb8afcc2b5 +0 -0
  246. data/spec/dummy/tmp/cache/assets/test/sprockets/7f5092f53db371ea56be62557677a506 +0 -0
  247. data/spec/dummy/tmp/cache/assets/test/sprockets/7f9ced6d264f71631c80df15194abf4d +0 -0
  248. data/spec/dummy/tmp/cache/assets/test/sprockets/80870efa2a2ddb1de325c224daff5712 +0 -0
  249. data/spec/dummy/tmp/cache/assets/test/sprockets/831e225c0e792be993a1d1dc58f20e54 +0 -0
  250. data/spec/dummy/tmp/cache/assets/test/sprockets/83f98047f864c578534b34068cb015e0 +0 -0
  251. data/spec/dummy/tmp/cache/assets/test/sprockets/84361af51e20dcfad7fae0f32f284ab7 +0 -0
  252. data/spec/dummy/tmp/cache/assets/test/sprockets/894aeaae9cc8483fa9f7a5146ff6ff6f +0 -0
  253. data/spec/dummy/tmp/cache/assets/test/sprockets/89567cbb5e7770a065e88360dcd02833 +0 -0
  254. data/spec/dummy/tmp/cache/assets/test/sprockets/89a5be65dc0d00fa22be4375c029d69c +0 -0
  255. data/spec/dummy/tmp/cache/assets/test/sprockets/8bf0319a2b612416dfde2d3b939dbf99 +0 -0
  256. data/spec/dummy/tmp/cache/assets/test/sprockets/8cfeb6443a5f7398e67010a202ee2de2 +0 -0
  257. data/spec/dummy/tmp/cache/assets/test/sprockets/8e3769f6378278754105f0924e6dd1ff +0 -0
  258. data/spec/dummy/tmp/cache/assets/test/sprockets/96c321f84bd796096692021bc4a87eed +0 -0
  259. data/spec/dummy/tmp/cache/assets/test/sprockets/97e875e2282fba5939cf71198faab1f0 +0 -0
  260. data/spec/dummy/tmp/cache/assets/test/sprockets/9911ee0fc41f519a1c4faa7912547cce +0 -0
  261. data/spec/dummy/tmp/cache/assets/test/sprockets/9ac84ed11232b2f7fc9f80c18844abc8 +0 -0
  262. data/spec/dummy/tmp/cache/assets/test/sprockets/9ba0cab624f25b68f79447e62fbc6112 +0 -0
  263. data/spec/dummy/tmp/cache/assets/test/sprockets/9e9edfa954375fd0cc6498f70b883e8e +0 -0
  264. data/spec/dummy/tmp/cache/assets/test/sprockets/a3863764f2fbc185e0d2ea584c7e2174 +0 -0
  265. data/spec/dummy/tmp/cache/assets/test/sprockets/a4c4a00b0d2b8334de3ee3169064adad +0 -0
  266. data/spec/dummy/tmp/cache/assets/test/sprockets/a744e8f2a7ce02e7af9784f40c711ed5 +0 -0
  267. data/spec/dummy/tmp/cache/assets/test/sprockets/a78a33e8cea959257da93b3e67786300 +0 -0
  268. data/spec/dummy/tmp/cache/assets/test/sprockets/a9956bd25bbe4c811a1a758f71aec748 +0 -0
  269. data/spec/dummy/tmp/cache/assets/test/sprockets/aa4822def20c419f0e50e2a38e73a1df +0 -0
  270. data/spec/dummy/tmp/cache/assets/test/sprockets/aaa24da6bd0fcf694077519e189b7392 +0 -0
  271. data/spec/dummy/tmp/cache/assets/test/sprockets/b0493d9dbe3afb3268b7ffce2b87bf78 +0 -0
  272. data/spec/dummy/tmp/cache/assets/test/sprockets/b2c398b7a51a65be12ba944bdea13415 +0 -0
  273. data/spec/dummy/tmp/cache/assets/test/sprockets/b81381e4a978aa69cc2ab1f892a40e97 +0 -0
  274. data/spec/dummy/tmp/cache/assets/test/sprockets/b82707486d5133da748e4382c62de995 +0 -0
  275. data/spec/dummy/tmp/cache/assets/test/sprockets/bb83cb3c179681d65c77a41e98f1c70f +0 -0
  276. data/spec/dummy/tmp/cache/assets/test/sprockets/bbc50f2009705d8fd7b91330bc24dcb8 +0 -0
  277. data/spec/dummy/tmp/cache/assets/test/sprockets/bcb7548b203cc2c5a484ef7649911c2d +0 -0
  278. data/spec/dummy/tmp/cache/assets/test/sprockets/becade26fead85d486f136be49b45e23 +0 -0
  279. data/spec/dummy/tmp/cache/assets/test/sprockets/bfc0fef30976427a03ddccb1ce78d6e7 +0 -0
  280. data/spec/dummy/tmp/cache/assets/test/sprockets/c0dd93a468e038b3653ed4d28874e0cb +0 -0
  281. data/spec/dummy/tmp/cache/assets/test/sprockets/c1d2340cbfe5e80d388f95e7a08698d9 +0 -0
  282. data/spec/dummy/tmp/cache/assets/test/sprockets/c25afdb537c84a18bd62fc782164d298 +0 -0
  283. data/spec/dummy/tmp/cache/assets/test/sprockets/c3dc3ada4560805584739bfe7c2b24d9 +0 -0
  284. data/spec/dummy/tmp/cache/assets/test/sprockets/c4dc50a79ec929d33d9e2835d1926fd9 +0 -0
  285. data/spec/dummy/tmp/cache/assets/test/sprockets/c5f990ee58d3727faeb4cfd3f5667e8a +0 -0
  286. data/spec/dummy/tmp/cache/assets/test/sprockets/c622effcf1aa225bf2920d2b63ca525c +0 -0
  287. data/spec/dummy/tmp/cache/assets/test/sprockets/d09dc20f2dc66183aa23ce1fd8fc9f2c +0 -0
  288. data/spec/dummy/tmp/cache/assets/test/sprockets/d60bdefb444e91b75e4cc2f3fc49228b +0 -0
  289. data/spec/dummy/tmp/cache/assets/test/sprockets/d7c40ebee2fb9471bab352337570ba40 +0 -0
  290. data/spec/dummy/tmp/cache/assets/test/sprockets/d9bc94e1e0cc114986f8760bc4eb42ce +0 -0
  291. data/spec/dummy/tmp/cache/assets/test/sprockets/da4488b32bd6fb75c655a077956c9034 +0 -0
  292. data/spec/dummy/tmp/cache/assets/test/sprockets/daeb51b1ca3de2a1f2146dea431249d3 +0 -0
  293. data/spec/dummy/tmp/cache/assets/test/sprockets/dd0e13880601ea049b7c6d8c76ea535f +0 -0
  294. data/spec/dummy/tmp/cache/assets/test/sprockets/dd15d7b9860a8a187c4a6c167dc56547 +0 -0
  295. data/spec/dummy/tmp/cache/assets/test/sprockets/dd8ed9b0203321fd815ba48a5867620e +0 -0
  296. data/spec/dummy/tmp/cache/assets/test/sprockets/e1e036b04a3a20b2fb589420ad03b926 +0 -0
  297. data/spec/dummy/tmp/cache/assets/test/sprockets/e4f46080338c0c52e3933999a7f8106d +0 -0
  298. data/spec/dummy/tmp/cache/assets/test/sprockets/e59a3c2ff941e0fdc7987168580bf4cc +0 -0
  299. data/spec/dummy/tmp/cache/assets/test/sprockets/e6cfe2e09e34ec2b24494a74eed5243a +0 -0
  300. data/spec/dummy/tmp/cache/assets/test/sprockets/e8e088454cc6f38324bd168e299cf08f +0 -0
  301. data/spec/dummy/tmp/cache/assets/test/sprockets/e949207f9e9578cfd48ab90bb82ea384 +0 -0
  302. data/spec/dummy/tmp/cache/assets/test/sprockets/ee5a41236d43159aac87f9224a0bcfb8 +0 -0
  303. data/spec/dummy/tmp/cache/assets/test/sprockets/ef5f76363cd723089ce62b8c207415a4 +0 -0
  304. data/spec/dummy/tmp/cache/assets/test/sprockets/f2de4855fd4840abb2f6e80afee5f4ed +0 -0
  305. data/spec/dummy/tmp/cache/assets/test/sprockets/f5165c4d7cee0e7cb99bc069fd4c09b9 +0 -0
  306. data/spec/dummy/tmp/cache/assets/test/sprockets/f660938bc4a80358883ba6c576e1dd13 +0 -0
  307. data/spec/dummy/tmp/cache/assets/test/sprockets/f7379cc2d3a2fc4b87d64c68d2d8684f +0 -0
  308. data/spec/dummy/tmp/cache/assets/test/sprockets/f81b83e98592ff24dd8518985baa48cd +0 -0
  309. data/spec/dummy/tmp/cache/assets/test/sprockets/f94b13174ed1cc7f087a66c0094ef4cf +0 -0
  310. data/spec/dummy/tmp/cache/assets/test/sprockets/f975cba8c490022ddfc45bab0b512879 +0 -0
  311. data/spec/dummy/tmp/cache/assets/test/sprockets/face6eb5e3ee8802296bdc38e5704d72 +0 -0
  312. data/spec/dummy/tmp/cache/assets/test/sprockets/fc9155176668e1a56a5ca3843febe3c3 +0 -0
  313. data/spec/dummy/tmp/cache/assets/test/sprockets/fd7e46e0b42a510b40f17d1f1bacf80e +0 -0
  314. data/spec/factories/asset_factory.rb +0 -21
  315. data/spec/factories/files/rails.png +0 -0
  316. data/spec/factories/files/silicon_valley.jpg +0 -0
  317. data/spec/factories/page_factory.rb +0 -10
  318. data/spec/factories/post_factory.rb +0 -9
  319. data/spec/factories/structure_factory.rb +0 -22
  320. data/spec/factories/user_factory.rb +0 -49
  321. data/spec/generators/install_generator_spec.rb +0 -55
  322. data/spec/models/avatar_spec.rb +0 -138
  323. data/spec/models/i18n_backend.rb +0 -30
  324. data/spec/models/structure_spec.rb +0 -120
  325. data/spec/models/sunrise/abstract_model_spec.rb +0 -88
  326. data/spec/models/sunrise/carrierwave/picture_uploader_spec.rb +0 -49
  327. data/spec/models/sunrise/search_wrapper_spec.rb +0 -21
  328. data/spec/models/user_spec.rb +0 -63
  329. data/spec/orm/active_record.rb +0 -5
  330. data/spec/orm/kaminari/active_record.rb +0 -18
  331. data/spec/orm/kaminari/mongoid.rb +0 -20
  332. data/spec/orm/mongoid.rb +0 -15
  333. data/spec/requests/activities_spec.rb +0 -41
  334. data/spec/requests/dashboard_spec.rb +0 -35
  335. data/spec/requests/manager/default/create_spec.rb +0 -43
  336. data/spec/requests/manager/default/destroy_spec.rb +0 -36
  337. data/spec/requests/manager/default/edit_spec.rb +0 -72
  338. data/spec/requests/manager/default/export_spec.rb +0 -121
  339. data/spec/requests/manager/default/index_spec.rb +0 -67
  340. data/spec/requests/manager/default/new_spec.rb +0 -59
  341. data/spec/requests/manager/default/show_spec.rb +0 -41
  342. data/spec/requests/manager/default/update_spec.rb +0 -73
  343. data/spec/requests/manager/many/create_spec.rb +0 -52
  344. data/spec/requests/manager/many/destroy_spec.rb +0 -41
  345. data/spec/requests/manager/many/edit_spec.rb +0 -43
  346. data/spec/requests/manager/many/index_spec.rb +0 -54
  347. data/spec/requests/manager/many/new_spec.rb +0 -40
  348. data/spec/requests/manager/many/update_spec.rb +0 -55
  349. data/spec/spec_helper.rb +0 -90
  350. data/spec/sunrise_spec.rb +0 -29
  351. data/spec/support/helpers/controller_helper.rb +0 -27
  352. data/spec/support/helpers/controller_macros.rb +0 -40
  353. data/spec/support/hooks/structure.rb +0 -5
@@ -1,70 +1,69 @@
1
- # encoding: utf-8
1
+ # frozen_string_literal: true
2
+
2
3
  require 'enum_field'
3
4
 
4
5
  module Sunrise
5
6
  module Models
6
7
  module Structure
7
8
  extend ActiveSupport::Concern
8
-
9
+
9
10
  included do
10
11
  extend EnumField::EnumeratedAttribute
11
12
 
12
13
  enumerated_attribute :structure_type
13
14
  enumerated_attribute :position_type
14
-
15
+
15
16
  validates_presence_of :title
16
17
  validates_numericality_of :position_type_id, only_integer: true
17
18
  validates_numericality_of :structure_type_id, only_integer: true
18
-
19
+
19
20
  acts_as_nested_set
20
21
 
21
22
  before_validation :generate_slug, if: :should_generate_new_slug?
22
-
23
- scope :visible, lambda { where(is_visible: true) }
24
- scope :with_type, lambda {|structure_type| where(structure_type_id: structure_type.id) }
25
- scope :with_depth, lambda {|level| where(depth: level.to_i) }
26
- scope :with_position, lambda {|position_type| where(position_type_id: position_type.id) }
23
+
24
+ scope :visible, -> { where(is_visible: true) }
25
+ scope :with_type, ->(structure_type) { where(structure_type_id: structure_type.id) }
26
+ scope :with_depth, ->(level) { where(depth: level.to_i) }
27
+ scope :with_position, ->(position_type) { where(position_type_id: position_type.id) }
27
28
  end
28
-
29
+
29
30
  module ClassMethods
30
31
  def nested_set_options(mover = nil)
31
32
  result = []
32
-
33
+
33
34
  roots.each do |root|
34
35
  result += root.self_and_descendants.map do |i|
35
- if mover.nil? || mover.new_record? || mover.move_possible?(i)
36
- [yield(i), i.id]
37
- end
36
+ [yield(i), i.id] if mover.nil? || mover.new_record? || mover.move_possible?(i)
38
37
  end.compact
39
38
  end
40
39
  result
41
40
  end
42
41
  end
43
-
42
+
44
43
  def moveable?
45
44
  new_record? || !root?
46
45
  end
47
-
46
+
48
47
  def descendants_count
49
48
  (right - left - 1) / 2
50
49
  end
51
50
 
52
51
  protected
53
52
 
54
- def generate_slug
55
- self.slug = Sunrise::Utils.normalize_friendly_id(title)
56
- end
53
+ def generate_slug
54
+ self.slug = Sunrise::Utils.normalize_friendly_id(title)
55
+ end
57
56
 
58
- def should_generate_new_slug?
59
- base = self.title
60
- slug_value = self.slug
57
+ def should_generate_new_slug?
58
+ base = title
59
+ slug_value = slug
61
60
 
62
- # If the slug base is nil, and the slug field is nil, then we're going to leave the slug column NULL.
63
- return false if base.nil? && slug_value.nil?
64
-
65
- # Otherwise, if this is a new record, we're definitely going to try to create a new slug.
66
- slug_value.blank?
67
- end
61
+ # If the slug base is nil, and the slug field is nil, then we're going to leave the slug column NULL.
62
+ return false if base.nil? && slug_value.nil?
63
+
64
+ # Otherwise, if this is a new record, we're definitely going to try to create a new slug.
65
+ slug_value.blank?
66
+ end
68
67
  end
69
68
  end
70
69
  end
@@ -1,17 +1,18 @@
1
- # encoding: utf-8
1
+ # frozen_string_literal: true
2
+
2
3
  module Sunrise
3
- module Models
4
+ module Models
4
5
  class StructureType
5
6
  include EnumField::DefineEnum
6
-
7
+
7
8
  attr_reader :kind
8
-
9
+
9
10
  def initialize(value)
10
11
  @kind = value.to_sym
11
12
  end
12
-
13
+
13
14
  def title
14
- I18n.t(@kind, :scope => [:manage, :structure, :kind])
15
+ I18n.t(@kind, scope: [:manage, :structure, :kind])
15
16
  end
16
17
  end
17
18
  end
@@ -1,40 +1,41 @@
1
- # encoding: utf-8
2
- require "csv"
3
- require "enum_field"
1
+ # frozen_string_literal: true
2
+
3
+ require 'csv'
4
+ require 'enum_field'
4
5
 
5
6
  module Sunrise
6
7
  module Models
7
8
  module User
8
9
  extend ActiveSupport::Concern
9
-
10
+
10
11
  included do
11
12
  extend EnumField::EnumeratedAttribute
12
-
13
+
13
14
  enumerated_attribute :role_type
14
-
15
- has_one :avatar, :as => :assetable, :dependent => :destroy, :autosave => true
16
-
15
+
16
+ has_one :avatar, as: :assetable, dependent: :destroy, autosave: true
17
+
17
18
  after_initialize :set_default_role
18
-
19
- validates :name, :presence => true
19
+
20
+ validates :name, presence: true
20
21
  validate :check_role
21
-
22
- scope :with_email, lambda {|email| where(:email => email) }
23
- scope :with_name, lambda {|name| where(:name => name) }
24
- scope :with_role, lambda {|role_type| where(:role_type_id => role_type.id) }
25
- scope :defaults, lambda { with_role(::RoleType.default) }
26
- scope :moderators, lambda { with_role(::RoleType.moderator) }
27
- scope :admins, lambda { with_role(::RoleType.admin) }
22
+
23
+ scope :with_email, ->(email) { where(email: email) }
24
+ scope :with_name, ->(name) { where(name: name) }
25
+ scope :with_role, ->(role_type) { where(role_type_id: role_type.id) }
26
+ scope :defaults, -> { with_role(::RoleType.default) }
27
+ scope :moderators, -> { with_role(::RoleType.moderator) }
28
+ scope :admins, -> { with_role(::RoleType.admin) }
28
29
  end
29
-
30
- module ClassMethods
30
+
31
+ module ClassMethods
31
32
  def to_csv(options = {})
32
- options = { :columns => [:id, :email, :name, :current_sign_in_ip] }.merge(options)
33
+ options = { columns: [:id, :email, :name, :current_sign_in_ip] }.merge(options)
33
34
  query = unscoped.order([:id, :desc]).select(options[:columns])
34
35
 
35
36
  ::CSV.generate do |csv|
36
37
  csv << options[:columns]
37
-
38
+
38
39
  query.find_each do |user|
39
40
  csv << options[:columns].inject([]) do |items, attr_name|
40
41
  items << user.send(attr_name)
@@ -43,11 +44,11 @@ module Sunrise
43
44
  end
44
45
  end
45
46
  end
46
-
47
+
47
48
  def default?
48
49
  has_role?(:default)
49
50
  end
50
-
51
+
51
52
  def moderator?
52
53
  has_role?(:moderator)
53
54
  end
@@ -59,35 +60,36 @@ module Sunrise
59
60
  def has_role?(role_name)
60
61
  role_symbols.include?(role_name.to_sym)
61
62
  end
62
-
63
+
63
64
  def role_empty?
64
- self.role_type_id.nil?
65
+ role_type_id.nil?
65
66
  end
66
-
67
+
67
68
  def role_symbols
68
69
  [role_type.try(:code)]
69
70
  end
70
-
71
+
71
72
  def role_symbol
72
73
  role_symbols.first
73
74
  end
74
-
75
+
75
76
  def state
76
77
  return 'active' if active_for_authentication?
77
78
  return 'confirm' unless confirmed?
78
79
  return 'suspend' if access_locked?
79
- return 'pending'
80
+
81
+ 'pending'
80
82
  end
81
-
83
+
82
84
  protected
83
-
84
- def set_default_role
85
- self.role_type ||= ::RoleType.default
86
- end
87
85
 
88
- def check_role
89
- errors.add(:role_type_id, :invalid) unless ::RoleType.legal?(role_type_id)
90
- end
86
+ def set_default_role
87
+ self.role_type ||= ::RoleType.default
88
+ end
89
+
90
+ def check_role
91
+ errors.add(:role_type_id, :invalid) unless ::RoleType.legal?(role_type_id)
92
+ end
91
93
  end
92
94
  end
93
95
  end
data/lib/sunrise/utils.rb CHANGED
@@ -1,40 +1,39 @@
1
+ # frozen_string_literal: true
2
+
1
3
  module Sunrise
2
4
  module Utils
3
5
  autoload :Transliteration, 'sunrise/utils/transliteration'
4
6
  autoload :EvalHelpers, 'sunrise/utils/eval_helpers'
5
7
  autoload :CsvDocument, 'sunrise/utils/csv_document'
6
8
  autoload :SearchWrapper, 'sunrise/utils/search_wrapper'
7
-
8
- IMAGE_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/jpg', 'image/pjpeg', 'image/tiff', 'image/x-png']
9
-
9
+
10
+ IMAGE_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/jpg',
11
+ 'image/pjpeg', 'image/tiff', 'image/x-png'].freeze
12
+
10
13
  def self.get_model(model_name, *args)
11
- klass = lookup(["Sunrise", model_name.to_s.classify].join, Sunrise::AbstractModel)
14
+ klass = lookup(['Sunrise', model_name.to_s.classify].join, Sunrise::AbstractModel)
12
15
  klass ? klass.new(*args) : nil
13
16
  end
14
-
17
+
15
18
  # Given a string +model_name+, finds the corresponding model class
16
- def self.lookup(model_name, klass = nil)
19
+ def self.lookup(model_name, _klass = nil)
17
20
  model = model_name.constantize
18
21
 
19
- if model && model.is_a?(Class)
20
- model
21
- else
22
- nil
23
- end
22
+ model if model&.is_a?(Class)
24
23
  rescue LoadError, NameError
25
24
  Rails.logger.error "Error while loading '#{model_name}': #{$!}"
26
25
  nil
27
26
  end
28
-
27
+
29
28
  def self.superclasses(klass)
30
29
  superclasses = []
31
30
  while klass
32
- superclasses << klass.superclass if klass && klass.superclass
31
+ superclasses << klass.superclass if klass&.superclass
33
32
  klass = klass.superclass
34
33
  end
35
34
  superclasses
36
35
  end
37
-
36
+
38
37
  # Convert sort string to hash
39
38
  # "create_at_desc" to { :column => "created_at", :mode => "desc" }
40
39
  #
@@ -42,14 +41,14 @@ module Sunrise
42
41
  items = value.split('_')
43
42
  mode = items.pop
44
43
  column = items.join('_')
45
-
46
- {:column => column, :mode => mode}
44
+
45
+ { column: column, mode: mode }
47
46
  end
48
47
 
49
48
  # Convert input to friendly slug using babosa gem
50
49
  #
51
50
  def self.normalize_friendly_id(input)
52
- input.to_s.to_slug.normalize(:transliterations => Sunrise::Config.transliteration).to_s
51
+ input.to_s.to_slug.normalize(transliterations: Sunrise::Config.transliteration).to_s
53
52
  end
54
53
  end
55
54
  end
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  require 'csv'
2
4
 
3
5
  module Sunrise
@@ -8,37 +10,36 @@ module Sunrise
8
10
  @options = options
9
11
  @klass = (@options.delete(:klass) || extract_klass)
10
12
  end
11
-
13
+
12
14
  def columns_names
13
15
  @columns_names ||= (@options[:columns] || @klass.column_names)
14
16
  end
15
-
17
+
16
18
  def human_columns_names
17
19
  @human_columns_names ||= columns_names.map { |column| @klass.human_attribute_name(column.to_s) }
18
20
  end
19
-
21
+
20
22
  def filename
21
- @filename ||= [(@options[:filename] || @klass.model_name.plural || "document"), ".csv"].join
23
+ @filename ||= [(@options[:filename] || @klass.model_name.plural || 'document'), '.csv'].join
22
24
  end
23
-
25
+
24
26
  def render
25
27
  csv_string = ::CSV.generate do |csv|
26
28
  csv << human_columns_names
27
-
28
- each_with_index do |record, index|
29
- row = columns_names.inject([]) do |result, column|
29
+
30
+ each_with_index do |record, _index|
31
+ row = columns_names.each_with_object([]) do |column, result|
30
32
  result << record.send(column)
31
- result
32
33
  end
33
-
34
+
34
35
  csv << row
35
36
  end
36
37
  end
37
38
  end
38
-
39
+
39
40
  def each_with_index
40
41
  count = 0
41
-
42
+
42
43
  if @source.respond_to?(:find_each)
43
44
  @source.find_each do |item|
44
45
  yield item, count
@@ -51,19 +52,18 @@ module Sunrise
51
52
  end
52
53
  end
53
54
  end
54
-
55
+
55
56
  protected
56
-
57
- def extract_klass
58
- if @source.respond_to?(:klass)
59
- @source.klass
60
- elsif @source.is_a?(Array)
61
- @source.first.try(:class)
62
- else
63
- @source.class
64
- end
57
+
58
+ def extract_klass
59
+ if @source.respond_to?(:klass)
60
+ @source.klass
61
+ elsif @source.is_a?(Array)
62
+ @source.first.try(:class)
63
+ else
64
+ @source.class
65
65
  end
66
-
66
+ end
67
67
  end
68
68
  end
69
69
  end
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  module Sunrise
2
4
  module Utils
3
5
  # Provides a set of helper methods for evaluating methods within the context
@@ -8,79 +10,79 @@ module Sunrise
8
10
  # * Symbol
9
11
  # * Method / Proc
10
12
  # * String
11
- #
13
+ #
12
14
  # == Examples
13
- #
15
+ #
14
16
  # Below are examples of the various ways that a method can be evaluated
15
17
  # on an object:
16
- #
18
+ #
17
19
  # class Person
18
20
  # def initialize(name)
19
21
  # @name = name
20
22
  # end
21
- #
23
+ #
22
24
  # def name
23
25
  # @name
24
26
  # end
25
27
  # end
26
- #
28
+ #
27
29
  # class PersonCallback
28
30
  # def self.run(person)
29
31
  # person.name
30
32
  # end
31
33
  # end
32
- #
34
+ #
33
35
  # person = Person.new('John Smith')
34
- #
36
+ #
35
37
  # evaluate_method(person, :name) # => "John Smith"
36
38
  # evaluate_method(person, PersonCallback.method(:run)) # => "John Smith"
37
39
  # evaluate_method(person, Proc.new {|person| person.name}) # => "John Smith"
38
40
  # evaluate_method(person, lambda {|person| person.name}) # => "John Smith"
39
41
  # evaluate_method(person, '@name') # => "John Smith"
40
- #
42
+ #
41
43
  # == Additional arguments
42
- #
44
+ #
43
45
  # Additional arguments can be passed to the methods being evaluated. If
44
46
  # the method defines additional arguments other than the object context,
45
47
  # then all arguments are required.
46
- #
48
+ #
47
49
  # For example,
48
- #
50
+ #
49
51
  # person = Person.new('John Smith')
50
- #
52
+ #
51
53
  # evaluate_method(person, lambda {|person| person.name}, 21) # => "John Smith"
52
54
  # evaluate_method(person, lambda {|person, age| "#{person.name} is #{age}"}, 21) # => "John Smith is 21"
53
55
  # evaluate_method(person, lambda {|person, age| "#{person.name} is #{age}"}, 21, 'male') # => ArgumentError: wrong number of arguments (3 for 2)
54
56
  def evaluate_method(object, method, *args, &block)
55
57
  case method
56
- when Symbol
57
- object.method(method).arity == 0 ? object.send(method, &block) : object.send(method, *args, &block)
58
- when Proc, Method
59
- args.unshift(object)
60
- arity = method.arity
61
- limit = [0, 1].include?(arity) ? arity : args.length
62
-
63
- # Procs don't support blocks in < Ruby 1.8.6, so it's tacked on as an
64
- # argument for consistency across versions of Ruby (even though 1.9
65
- # supports yielding within blocks)
66
- if block_given? && Proc === method && arity != 0
67
- if [1, 2].include?(arity)
68
- # Force the block to be either the only argument or the 2nd one
69
- # after the object (may mean additional arguments get discarded)
70
- limit = arity
71
- args.insert(limit - 1, block)
72
- else
73
- # Tack the block to the end of the args
74
- limit += 1 unless limit < 0
75
- args.push(block)
76
- end
58
+ when Symbol
59
+ object.method(method).arity == 0 ? object.send(method, &block) : object.send(method, *args, &block)
60
+ when Proc, Method
61
+ args.unshift(object)
62
+ arity = method.arity
63
+ limit = [0, 1].include?(arity) ? arity : args.length
64
+
65
+ # Procs don't support blocks in < Ruby 1.8.6, so it's tacked on as an
66
+ # argument for consistency across versions of Ruby (even though 1.9
67
+ # supports yielding within blocks)
68
+ if block_given? && Proc === method && arity != 0
69
+ if [1, 2].include?(arity)
70
+ # Force the block to be either the only argument or the 2nd one
71
+ # after the object (may mean additional arguments get discarded)
72
+ limit = arity
73
+ args.insert(limit - 1, block)
74
+ else
75
+ # Tack the block to the end of the args
76
+ limit += 1 unless limit < 0
77
+ args.push(block)
77
78
  end
78
-
79
- method.call(*args[0, limit], &block)
80
- when String
81
- eval(method, object.instance_eval {binding}, &block)
82
- else
83
- raise ArgumentError, 'Methods must be a symbol denoting the method to call, a block to be invoked, or a string to be evaluated'
79
+ end
80
+
81
+ method.call(*args[0, limit], &block)
82
+ when String
83
+ eval(method, object.instance_eval { binding }, &block)
84
+ else
85
+ raise ArgumentError, 'Methods must be a symbol denoting the method to call, a block to be invoked, or a string to be evaluated'
84
86
  end
85
87
  end
86
88
  end