locomotivecms_wagon 2.4.1 → 3.0.0.beta2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (359) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +3 -3
  3. data/generators/blank/app/assets/.babelrc +3 -0
  4. data/generators/blank/app/assets/fonts/.empty_directory +1 -0
  5. data/generators/blank/app/assets/javascripts/app.js +19 -0
  6. data/generators/blank/app/assets/javascripts/sections/_manager.js +94 -0
  7. data/generators/blank/app/assets/javascripts/sections/index.js +5 -0
  8. data/generators/blank/app/assets/package.json.tt +35 -0
  9. data/generators/blank/app/assets/postcss.config.js +6 -0
  10. data/generators/blank/app/assets/stylesheets/app.scss +1 -0
  11. data/generators/blank/app/assets/webpack.common.js +47 -0
  12. data/generators/blank/app/assets/webpack.dev.js +7 -0
  13. data/generators/blank/app/assets/webpack.prod.js +12 -0
  14. data/generators/blank/app/views/pages/404.liquid +1 -1
  15. data/generators/blank/app/views/pages/index.liquid +7 -15
  16. data/generators/blank/app/views/pages/layouts/default.liquid +22 -0
  17. data/generators/blank/app/views/sections/.empty_directory +1 -0
  18. data/generators/page/template.liquid.tt +11 -0
  19. data/generators/section/%type%.js.tt +26 -0
  20. data/generators/section/template.liquid.tt +183 -0
  21. data/lib/locomotive/wagon.rb +3 -2
  22. data/lib/locomotive/wagon/cli.rb +38 -10
  23. data/lib/locomotive/wagon/commands/clone_command.rb +3 -0
  24. data/lib/locomotive/wagon/commands/concerns/deploy_file_concern.rb +1 -1
  25. data/lib/locomotive/wagon/commands/concerns/steam_concern.rb +1 -1
  26. data/lib/locomotive/wagon/commands/loggers/sync_logger.rb +7 -0
  27. data/lib/locomotive/wagon/commands/pull_command.rb +1 -1
  28. data/lib/locomotive/wagon/commands/pull_sub_commands/concerns/assets_concern.rb +19 -10
  29. data/lib/locomotive/wagon/commands/pull_sub_commands/pull_base_command.rb +7 -3
  30. data/lib/locomotive/wagon/commands/pull_sub_commands/pull_content_entries_command.rb +11 -2
  31. data/lib/locomotive/wagon/commands/pull_sub_commands/pull_content_types_command.rb +1 -1
  32. data/lib/locomotive/wagon/commands/pull_sub_commands/pull_site_command.rb +24 -5
  33. data/lib/locomotive/wagon/commands/pull_sub_commands/pull_translations_command.rb +6 -1
  34. data/lib/locomotive/wagon/commands/push_command.rb +6 -4
  35. data/lib/locomotive/wagon/commands/push_sub_commands/push_pages_command.rb +6 -1
  36. data/lib/locomotive/wagon/commands/push_sub_commands/push_sections_command.rb +23 -0
  37. data/lib/locomotive/wagon/commands/push_sub_commands/push_site_command.rb +2 -0
  38. data/lib/locomotive/wagon/commands/serve_command.rb +1 -1
  39. data/lib/locomotive/wagon/commands/sync_command.rb +1 -1
  40. data/lib/locomotive/wagon/commands/sync_sub_commands/concerns/base_concern.rb +2 -2
  41. data/lib/locomotive/wagon/commands/sync_sub_commands/sync_pages_command.rb +48 -37
  42. data/lib/locomotive/wagon/commands/sync_sub_commands/sync_site_command.rb +15 -12
  43. data/lib/locomotive/wagon/commands/sync_sub_commands/sync_translations_command.rb +12 -0
  44. data/lib/locomotive/wagon/decorators/concerns/persist_assets_concern.rb +1 -1
  45. data/lib/locomotive/wagon/decorators/content_entry_decorator.rb +1 -1
  46. data/lib/locomotive/wagon/decorators/content_type_decorator.rb +5 -1
  47. data/lib/locomotive/wagon/decorators/content_type_field_decorator.rb +5 -1
  48. data/lib/locomotive/wagon/decorators/page_decorator.rb +11 -1
  49. data/lib/locomotive/wagon/decorators/section_decorator.rb +35 -0
  50. data/lib/locomotive/wagon/decorators/site_decorator.rb +12 -4
  51. data/lib/locomotive/wagon/decorators/theme_asset_decorator.rb +2 -2
  52. data/lib/locomotive/wagon/generators/page.rb +2 -12
  53. data/lib/locomotive/wagon/generators/section.rb +82 -0
  54. data/lib/locomotive/wagon/generators/site.rb +0 -3
  55. data/lib/locomotive/wagon/generators/site/base.rb +11 -28
  56. data/lib/locomotive/wagon/generators/site/blank.rb +1 -17
  57. data/lib/locomotive/wagon/generators/site/cloned.rb +1 -4
  58. data/lib/locomotive/wagon/generators/snippet.rb +3 -11
  59. data/lib/locomotive/wagon/middlewares/error_page.rb +26 -6
  60. data/lib/locomotive/wagon/tools/listen.rb +3 -3
  61. data/lib/locomotive/wagon/version.rb +1 -1
  62. data/locomotivecms_wagon.gemspec +7 -6
  63. data/spec/fixtures/cassettes/authenticate.yml +47 -47
  64. data/spec/fixtures/cassettes/delete.yml +261 -261
  65. data/spec/fixtures/cassettes/push.yml +4571 -1783
  66. data/spec/fixtures/cassettes/sync.yml +11483 -0
  67. data/spec/integration/cli_spec.rb +1 -1
  68. data/spec/integration/commands/delete_command_spec.rb +1 -2
  69. data/spec/integration/commands/push_command_spec.rb +4 -4
  70. data/spec/integration/commands/sync_command_spec.rb +54 -0
  71. data/spec/integration/generators/page_spec.rb +1 -1
  72. data/spec/unit/commands/pull_sub_commands/concerns/assets_concern_spec.rb +3 -3
  73. metadata +55 -306
  74. data/generators/blank/app/views/pages/404.liquid.haml +0 -11
  75. data/generators/blank/app/views/pages/index.liquid.haml +0 -16
  76. data/generators/bootstrap/Gemfile.tt +0 -24
  77. data/generators/bootstrap/Guardfile +0 -22
  78. data/generators/bootstrap/app/content_types/.empty_directory +0 -1
  79. data/generators/bootstrap/app/views/pages/404.liquid +0 -18
  80. data/generators/bootstrap/app/views/pages/404.liquid.haml +0 -14
  81. data/generators/bootstrap/app/views/pages/index.liquid +0 -31
  82. data/generators/bootstrap/app/views/pages/index.liquid.haml +0 -25
  83. data/generators/bootstrap/app/views/pages/layouts/default.liquid +0 -31
  84. data/generators/bootstrap/app/views/pages/layouts/default.liquid.haml +0 -30
  85. data/generators/bootstrap/app/views/pages/layouts/simple.liquid +0 -36
  86. data/generators/bootstrap/app/views/pages/layouts/simple.liquid.haml +0 -29
  87. data/generators/bootstrap/app/views/snippets/footer.liquid +0 -5
  88. data/generators/bootstrap/app/views/snippets/footer.liquid.haml +0 -3
  89. data/generators/bootstrap/app/views/snippets/nav.liquid +0 -26
  90. data/generators/bootstrap/app/views/snippets/nav.liquid.haml +0 -19
  91. data/generators/bootstrap/config/deploy.yml +0 -16
  92. data/generators/bootstrap/config/metafields_schema.yml +0 -56
  93. data/generators/bootstrap/config/site.yml.tt +0 -48
  94. data/generators/bootstrap/config/translations.yml +0 -8
  95. data/generators/bootstrap/data/.empty_directory +0 -1
  96. data/generators/bootstrap/icon.png +0 -0
  97. data/generators/bootstrap/public/fonts/bootstrap/glyphicons-halflings-regular.eot +0 -0
  98. data/generators/bootstrap/public/fonts/bootstrap/glyphicons-halflings-regular.svg +0 -288
  99. data/generators/bootstrap/public/fonts/bootstrap/glyphicons-halflings-regular.ttf +0 -0
  100. data/generators/bootstrap/public/fonts/bootstrap/glyphicons-halflings-regular.woff +0 -0
  101. data/generators/bootstrap/public/fonts/bootstrap/glyphicons-halflings-regular.woff2 +0 -0
  102. data/generators/bootstrap/public/images/favicon.png +0 -0
  103. data/generators/bootstrap/public/javascripts/application.js +0 -2
  104. data/generators/bootstrap/public/javascripts/bootstrap.min.js +0 -7
  105. data/generators/bootstrap/public/javascripts/bootstrap/affix.js +0 -162
  106. data/generators/bootstrap/public/javascripts/bootstrap/alert.js +0 -94
  107. data/generators/bootstrap/public/javascripts/bootstrap/button.js +0 -120
  108. data/generators/bootstrap/public/javascripts/bootstrap/carousel.js +0 -237
  109. data/generators/bootstrap/public/javascripts/bootstrap/collapse.js +0 -211
  110. data/generators/bootstrap/public/javascripts/bootstrap/dropdown.js +0 -165
  111. data/generators/bootstrap/public/javascripts/bootstrap/modal.js +0 -337
  112. data/generators/bootstrap/public/javascripts/bootstrap/popover.js +0 -108
  113. data/generators/bootstrap/public/javascripts/bootstrap/scrollspy.js +0 -172
  114. data/generators/bootstrap/public/javascripts/bootstrap/tab.js +0 -155
  115. data/generators/bootstrap/public/javascripts/bootstrap/tooltip.js +0 -514
  116. data/generators/bootstrap/public/javascripts/bootstrap/transition.js +0 -59
  117. data/generators/bootstrap/public/javascripts/jquery.min.js +0 -5
  118. data/generators/bootstrap/public/stylesheets/application.css +0 -7
  119. data/generators/bootstrap/public/stylesheets/application.scss +0 -7
  120. data/generators/bootstrap/public/stylesheets/bootstrap.css +0 -5
  121. data/generators/bootstrap/public/stylesheets/bootstrap.scss +0 -63
  122. data/generators/bootstrap/public/stylesheets/bootstrap/_alerts.scss +0 -73
  123. data/generators/bootstrap/public/stylesheets/bootstrap/_badges.scss +0 -68
  124. data/generators/bootstrap/public/stylesheets/bootstrap/_breadcrumbs.scss +0 -28
  125. data/generators/bootstrap/public/stylesheets/bootstrap/_button-groups.scss +0 -244
  126. data/generators/bootstrap/public/stylesheets/bootstrap/_buttons.scss +0 -168
  127. data/generators/bootstrap/public/stylesheets/bootstrap/_carousel.scss +0 -269
  128. data/generators/bootstrap/public/stylesheets/bootstrap/_close.scss +0 -36
  129. data/generators/bootstrap/public/stylesheets/bootstrap/_code.scss +0 -69
  130. data/generators/bootstrap/public/stylesheets/bootstrap/_component-animations.scss +0 -37
  131. data/generators/bootstrap/public/stylesheets/bootstrap/_dropdowns.scss +0 -216
  132. data/generators/bootstrap/public/stylesheets/bootstrap/_forms.scss +0 -611
  133. data/generators/bootstrap/public/stylesheets/bootstrap/_glyphicons.scss +0 -307
  134. data/generators/bootstrap/public/stylesheets/bootstrap/_grid.scss +0 -84
  135. data/generators/bootstrap/public/stylesheets/bootstrap/_input-groups.scss +0 -167
  136. data/generators/bootstrap/public/stylesheets/bootstrap/_jumbotron.scss +0 -52
  137. data/generators/bootstrap/public/stylesheets/bootstrap/_labels.scss +0 -66
  138. data/generators/bootstrap/public/stylesheets/bootstrap/_list-group.scss +0 -130
  139. data/generators/bootstrap/public/stylesheets/bootstrap/_media.scss +0 -66
  140. data/generators/bootstrap/public/stylesheets/bootstrap/_mixins.scss +0 -40
  141. data/generators/bootstrap/public/stylesheets/bootstrap/_modals.scss +0 -150
  142. data/generators/bootstrap/public/stylesheets/bootstrap/_navbar.scss +0 -662
  143. data/generators/bootstrap/public/stylesheets/bootstrap/_navs.scss +0 -242
  144. data/generators/bootstrap/public/stylesheets/bootstrap/_normalize.scss +0 -424
  145. data/generators/bootstrap/public/stylesheets/bootstrap/_pager.scss +0 -54
  146. data/generators/bootstrap/public/stylesheets/bootstrap/_pagination.scss +0 -89
  147. data/generators/bootstrap/public/stylesheets/bootstrap/_panels.scss +0 -271
  148. data/generators/bootstrap/public/stylesheets/bootstrap/_popovers.scss +0 -131
  149. data/generators/bootstrap/public/stylesheets/bootstrap/_print.scss +0 -101
  150. data/generators/bootstrap/public/stylesheets/bootstrap/_progress-bars.scss +0 -87
  151. data/generators/bootstrap/public/stylesheets/bootstrap/_responsive-embed.scss +0 -35
  152. data/generators/bootstrap/public/stylesheets/bootstrap/_responsive-utilities.scss +0 -179
  153. data/generators/bootstrap/public/stylesheets/bootstrap/_scaffolding.scss +0 -161
  154. data/generators/bootstrap/public/stylesheets/bootstrap/_tables.scss +0 -234
  155. data/generators/bootstrap/public/stylesheets/bootstrap/_theme.scss +0 -291
  156. data/generators/bootstrap/public/stylesheets/bootstrap/_thumbnails.scss +0 -38
  157. data/generators/bootstrap/public/stylesheets/bootstrap/_tooltip.scss +0 -101
  158. data/generators/bootstrap/public/stylesheets/bootstrap/_type.scss +0 -298
  159. data/generators/bootstrap/public/stylesheets/bootstrap/_utilities.scss +0 -55
  160. data/generators/bootstrap/public/stylesheets/bootstrap/_variables.scss +0 -872
  161. data/generators/bootstrap/public/stylesheets/bootstrap/_wells.scss +0 -29
  162. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_alerts.scss +0 -14
  163. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_background-variant.scss +0 -12
  164. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_border-radius.scss +0 -18
  165. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_buttons.scss +0 -68
  166. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_center-block.scss +0 -7
  167. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_clearfix.scss +0 -22
  168. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_forms.scss +0 -88
  169. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_gradients.scss +0 -58
  170. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_grid-framework.scss +0 -81
  171. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_grid.scss +0 -122
  172. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_hide-text.scss +0 -21
  173. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_image.scss +0 -33
  174. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_labels.scss +0 -12
  175. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_list-group.scss +0 -32
  176. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_nav-divider.scss +0 -10
  177. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_nav-vertical-align.scss +0 -9
  178. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_opacity.scss +0 -8
  179. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_pagination.scss +0 -24
  180. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_panels.scss +0 -24
  181. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_progress-bar.scss +0 -10
  182. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_reset-filter.scss +0 -8
  183. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_reset-text.scss +0 -18
  184. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_resize.scss +0 -6
  185. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_responsive-visibility.scss +0 -21
  186. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_size.scss +0 -10
  187. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_tab-focus.scss +0 -9
  188. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_table-row.scss +0 -28
  189. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_text-emphasis.scss +0 -12
  190. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_text-overflow.scss +0 -8
  191. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_vendor-prefixes.scss +0 -222
  192. data/generators/foundation/Gemfile.tt +0 -24
  193. data/generators/foundation/Guardfile +0 -22
  194. data/generators/foundation/app/content_types/.gitkeep +0 -0
  195. data/generators/foundation/app/views/pages/404.liquid +0 -11
  196. data/generators/foundation/app/views/pages/404.liquid.haml +0 -11
  197. data/generators/foundation/app/views/pages/index.liquid +0 -172
  198. data/generators/foundation/app/views/pages/index.liquid.haml +0 -144
  199. data/generators/foundation/app/views/snippets/.gitkeep +0 -0
  200. data/generators/foundation/config/deploy.yml +0 -16
  201. data/generators/foundation/config/metafields_schema.yml +0 -56
  202. data/generators/foundation/config/site.yml +0 -48
  203. data/generators/foundation/config/translations.yml +0 -8
  204. data/generators/foundation/data/.gitkeep +0 -0
  205. data/generators/foundation/log/.gitkeep +0 -0
  206. data/generators/foundation/public/images/.gitkeep +0 -0
  207. data/generators/foundation/public/javascripts/app.js +0 -1
  208. data/generators/foundation/public/javascripts/vendor/foundation.js +0 -11788
  209. data/generators/foundation/public/javascripts/vendor/foundation.min.js +0 -5
  210. data/generators/foundation/public/javascripts/vendor/what-input.js +0 -212
  211. data/generators/foundation/public/javascripts/vendor/what-input.min.js +0 -1
  212. data/generators/foundation/public/stylesheets/_settings.scss +0 -869
  213. data/generators/foundation/public/stylesheets/app.css +0 -0
  214. data/generators/foundation/public/stylesheets/app.scss +0 -52
  215. data/generators/foundation/public/stylesheets/foundation.css +0 -5805
  216. data/generators/foundation/public/stylesheets/foundation6/_global.scss +0 -249
  217. data/generators/foundation/public/stylesheets/foundation6/components/_accordion-menu.scss +0 -171
  218. data/generators/foundation/public/stylesheets/foundation6/components/_accordion.scss +0 -155
  219. data/generators/foundation/public/stylesheets/foundation6/components/_badge.scss +0 -63
  220. data/generators/foundation/public/stylesheets/foundation6/components/_breadcrumbs.scss +0 -117
  221. data/generators/foundation/public/stylesheets/foundation6/components/_button-group.scss +0 -253
  222. data/generators/foundation/public/stylesheets/foundation6/components/_button.scss +0 -385
  223. data/generators/foundation/public/stylesheets/foundation6/components/_callout.scss +0 -106
  224. data/generators/foundation/public/stylesheets/foundation6/components/_card.scss +0 -129
  225. data/generators/foundation/public/stylesheets/foundation6/components/_close-button.scss +0 -102
  226. data/generators/foundation/public/stylesheets/foundation6/components/_drilldown.scss +0 -142
  227. data/generators/foundation/public/stylesheets/foundation6/components/_dropdown-menu.scss +0 -274
  228. data/generators/foundation/public/stylesheets/foundation6/components/_dropdown.scss +0 -79
  229. data/generators/foundation/public/stylesheets/foundation6/components/_flex-video.scss +0 -1
  230. data/generators/foundation/public/stylesheets/foundation6/components/_flex.scss +0 -117
  231. data/generators/foundation/public/stylesheets/foundation6/components/_float.scss +0 -27
  232. data/generators/foundation/public/stylesheets/foundation6/components/_label.scss +0 -64
  233. data/generators/foundation/public/stylesheets/foundation6/components/_media-object.scss +0 -114
  234. data/generators/foundation/public/stylesheets/foundation6/components/_menu-icon.scss +0 -9
  235. data/generators/foundation/public/stylesheets/foundation6/components/_menu.scss +0 -495
  236. data/generators/foundation/public/stylesheets/foundation6/components/_off-canvas.scss +0 -505
  237. data/generators/foundation/public/stylesheets/foundation6/components/_orbit.scss +0 -196
  238. data/generators/foundation/public/stylesheets/foundation6/components/_pagination.scss +0 -193
  239. data/generators/foundation/public/stylesheets/foundation6/components/_progress-bar.scss +0 -64
  240. data/generators/foundation/public/stylesheets/foundation6/components/_responsive-embed.scss +0 -70
  241. data/generators/foundation/public/stylesheets/foundation6/components/_reveal.scss +0 -180
  242. data/generators/foundation/public/stylesheets/foundation6/components/_slider.scss +0 -137
  243. data/generators/foundation/public/stylesheets/foundation6/components/_sticky.scss +0 -39
  244. data/generators/foundation/public/stylesheets/foundation6/components/_switch.scss +0 -247
  245. data/generators/foundation/public/stylesheets/foundation6/components/_table.scss +0 -330
  246. data/generators/foundation/public/stylesheets/foundation6/components/_tabs.scss +0 -196
  247. data/generators/foundation/public/stylesheets/foundation6/components/_thumbnail.scss +0 -67
  248. data/generators/foundation/public/stylesheets/foundation6/components/_title-bar.scss +0 -84
  249. data/generators/foundation/public/stylesheets/foundation6/components/_tooltip.scss +0 -160
  250. data/generators/foundation/public/stylesheets/foundation6/components/_top-bar.scss +0 -175
  251. data/generators/foundation/public/stylesheets/foundation6/components/_visibility.scss +0 -132
  252. data/generators/foundation/public/stylesheets/foundation6/forms/_checkbox.scss +0 -41
  253. data/generators/foundation/public/stylesheets/foundation6/forms/_error.scss +0 -88
  254. data/generators/foundation/public/stylesheets/foundation6/forms/_fieldset.scss +0 -53
  255. data/generators/foundation/public/stylesheets/foundation6/forms/_forms.scss +0 -34
  256. data/generators/foundation/public/stylesheets/foundation6/forms/_help-text.scss +0 -30
  257. data/generators/foundation/public/stylesheets/foundation6/forms/_input-group.scss +0 -142
  258. data/generators/foundation/public/stylesheets/foundation6/forms/_label.scss +0 -50
  259. data/generators/foundation/public/stylesheets/foundation6/forms/_meter.scss +0 -116
  260. data/generators/foundation/public/stylesheets/foundation6/forms/_progress.scss +0 -94
  261. data/generators/foundation/public/stylesheets/foundation6/forms/_range.scss +0 -149
  262. data/generators/foundation/public/stylesheets/foundation6/forms/_select.scss +0 -86
  263. data/generators/foundation/public/stylesheets/foundation6/forms/_text.scss +0 -179
  264. data/generators/foundation/public/stylesheets/foundation6/foundation.scss +0 -133
  265. data/generators/foundation/public/stylesheets/foundation6/grid/_classes.scss +0 -176
  266. data/generators/foundation/public/stylesheets/foundation6/grid/_column.scss +0 -112
  267. data/generators/foundation/public/stylesheets/foundation6/grid/_flex-grid.scss +0 -259
  268. data/generators/foundation/public/stylesheets/foundation6/grid/_grid.scss +0 -48
  269. data/generators/foundation/public/stylesheets/foundation6/grid/_gutter.scss +0 -82
  270. data/generators/foundation/public/stylesheets/foundation6/grid/_layout.scss +0 -76
  271. data/generators/foundation/public/stylesheets/foundation6/grid/_position.scss +0 -76
  272. data/generators/foundation/public/stylesheets/foundation6/grid/_row.scss +0 -99
  273. data/generators/foundation/public/stylesheets/foundation6/grid/_size.scss +0 -24
  274. data/generators/foundation/public/stylesheets/foundation6/motion-ui/_classes.scss +0 -109
  275. data/generators/foundation/public/stylesheets/foundation6/motion-ui/_settings.scss +0 -61
  276. data/generators/foundation/public/stylesheets/foundation6/motion-ui/effects/_fade.scss +0 -32
  277. data/generators/foundation/public/stylesheets/foundation6/motion-ui/effects/_hinge.scss +0 -65
  278. data/generators/foundation/public/stylesheets/foundation6/motion-ui/effects/_shake.scss +0 -15
  279. data/generators/foundation/public/stylesheets/foundation6/motion-ui/effects/_slide.scss +0 -41
  280. data/generators/foundation/public/stylesheets/foundation6/motion-ui/effects/_spin.scss +0 -28
  281. data/generators/foundation/public/stylesheets/foundation6/motion-ui/effects/_wiggle.scss +0 -13
  282. data/generators/foundation/public/stylesheets/foundation6/motion-ui/effects/_zoom.scss +0 -15
  283. data/generators/foundation/public/stylesheets/foundation6/motion-ui/motion-ui.scss +0 -29
  284. data/generators/foundation/public/stylesheets/foundation6/motion-ui/transitions/_fade.scss +0 -28
  285. data/generators/foundation/public/stylesheets/foundation6/motion-ui/transitions/_hinge.scss +0 -43
  286. data/generators/foundation/public/stylesheets/foundation6/motion-ui/transitions/_slide.scss +0 -42
  287. data/generators/foundation/public/stylesheets/foundation6/motion-ui/transitions/_spin.scss +0 -39
  288. data/generators/foundation/public/stylesheets/foundation6/motion-ui/transitions/_zoom.scss +0 -39
  289. data/generators/foundation/public/stylesheets/foundation6/motion-ui/util/_animation.scss +0 -7
  290. data/generators/foundation/public/stylesheets/foundation6/motion-ui/util/_args.scss +0 -15
  291. data/generators/foundation/public/stylesheets/foundation6/motion-ui/util/_keyframe.scss +0 -136
  292. data/generators/foundation/public/stylesheets/foundation6/motion-ui/util/_selector.scss +0 -23
  293. data/generators/foundation/public/stylesheets/foundation6/motion-ui/util/_series.scss +0 -54
  294. data/generators/foundation/public/stylesheets/foundation6/motion-ui/util/_transition.scss +0 -45
  295. data/generators/foundation/public/stylesheets/foundation6/motion-ui/util/_unit.scss +0 -7
  296. data/generators/foundation/public/stylesheets/foundation6/prototype/_arrow.scss +0 -36
  297. data/generators/foundation/public/stylesheets/foundation6/prototype/_border-box.scss +0 -35
  298. data/generators/foundation/public/stylesheets/foundation6/prototype/_border-none.scss +0 -35
  299. data/generators/foundation/public/stylesheets/foundation6/prototype/_bordered.scss +0 -54
  300. data/generators/foundation/public/stylesheets/foundation6/prototype/_box.scss +0 -23
  301. data/generators/foundation/public/stylesheets/foundation6/prototype/_display.scss +0 -50
  302. data/generators/foundation/public/stylesheets/foundation6/prototype/_font-styling.scss +0 -95
  303. data/generators/foundation/public/stylesheets/foundation6/prototype/_list-style-type.scss +0 -95
  304. data/generators/foundation/public/stylesheets/foundation6/prototype/_overflow.scss +0 -72
  305. data/generators/foundation/public/stylesheets/foundation6/prototype/_position.scss +0 -114
  306. data/generators/foundation/public/stylesheets/foundation6/prototype/_prototype.scss +0 -87
  307. data/generators/foundation/public/stylesheets/foundation6/prototype/_relation.scss +0 -157
  308. data/generators/foundation/public/stylesheets/foundation6/prototype/_rotate.scss +0 -31
  309. data/generators/foundation/public/stylesheets/foundation6/prototype/_rounded.scss +0 -54
  310. data/generators/foundation/public/stylesheets/foundation6/prototype/_separator.scss +0 -96
  311. data/generators/foundation/public/stylesheets/foundation6/prototype/_shadow.scss +0 -43
  312. data/generators/foundation/public/stylesheets/foundation6/prototype/_sizing.scss +0 -73
  313. data/generators/foundation/public/stylesheets/foundation6/prototype/_spacing.scss +0 -204
  314. data/generators/foundation/public/stylesheets/foundation6/prototype/_text-decoration.scss +0 -48
  315. data/generators/foundation/public/stylesheets/foundation6/prototype/_text-transformation.scss +0 -48
  316. data/generators/foundation/public/stylesheets/foundation6/prototype/_text-utilities.scss +0 -88
  317. data/generators/foundation/public/stylesheets/foundation6/settings/_settings.scss +0 -869
  318. data/generators/foundation/public/stylesheets/foundation6/typography/_alignment.scss +0 -22
  319. data/generators/foundation/public/stylesheets/foundation6/typography/_base.scss +0 -509
  320. data/generators/foundation/public/stylesheets/foundation6/typography/_helpers.scss +0 -80
  321. data/generators/foundation/public/stylesheets/foundation6/typography/_print.scss +0 -86
  322. data/generators/foundation/public/stylesheets/foundation6/typography/_typography.scss +0 -26
  323. data/generators/foundation/public/stylesheets/foundation6/util/_breakpoint.scss +0 -348
  324. data/generators/foundation/public/stylesheets/foundation6/util/_color.scss +0 -129
  325. data/generators/foundation/public/stylesheets/foundation6/util/_direction.scss +0 -31
  326. data/generators/foundation/public/stylesheets/foundation6/util/_flex.scss +0 -85
  327. data/generators/foundation/public/stylesheets/foundation6/util/_math.scss +0 -72
  328. data/generators/foundation/public/stylesheets/foundation6/util/_mixins.scss +0 -313
  329. data/generators/foundation/public/stylesheets/foundation6/util/_selector.scss +0 -41
  330. data/generators/foundation/public/stylesheets/foundation6/util/_typography.scss +0 -26
  331. data/generators/foundation/public/stylesheets/foundation6/util/_unit.scss +0 -152
  332. data/generators/foundation/public/stylesheets/foundation6/util/_util.scss +0 -14
  333. data/generators/foundation/public/stylesheets/foundation6/util/_value.scss +0 -160
  334. data/generators/foundation/public/stylesheets/foundation6/vendor/normalize-scss/sass/_normalize.scss +0 -3
  335. data/generators/foundation/public/stylesheets/foundation6/vendor/normalize-scss/sass/normalize/_import-now.scss +0 -11
  336. data/generators/foundation/public/stylesheets/foundation6/vendor/normalize-scss/sass/normalize/_normalize-mixin.scss +0 -676
  337. data/generators/foundation/public/stylesheets/foundation6/vendor/normalize-scss/sass/normalize/_variables.scss +0 -36
  338. data/generators/foundation/public/stylesheets/foundation6/vendor/normalize-scss/sass/normalize/_vertical-rhythm.scss +0 -61
  339. data/generators/foundation/public/stylesheets/foundation6/vendor/sassy-lists/stylesheets/functions/_contain.scss +0 -31
  340. data/generators/foundation/public/stylesheets/foundation6/vendor/sassy-lists/stylesheets/functions/_purge.scss +0 -38
  341. data/generators/foundation/public/stylesheets/foundation6/vendor/sassy-lists/stylesheets/functions/_remove.scss +0 -31
  342. data/generators/foundation/public/stylesheets/foundation6/vendor/sassy-lists/stylesheets/functions/_replace.scss +0 -46
  343. data/generators/foundation/public/stylesheets/foundation6/vendor/sassy-lists/stylesheets/functions/_to-list.scss +0 -27
  344. data/generators/foundation/public/stylesheets/foundation6/vendor/sassy-lists/stylesheets/helpers/_missing-dependencies.scss +0 -25
  345. data/generators/foundation/public/stylesheets/foundation6/vendor/sassy-lists/stylesheets/helpers/_true.scss +0 -13
  346. data/generators/foundation/public/stylesheets/foundation6/xy-grid/_cell.scss +0 -169
  347. data/generators/foundation/public/stylesheets/foundation6/xy-grid/_classes.scss +0 -476
  348. data/generators/foundation/public/stylesheets/foundation6/xy-grid/_collapse.scss +0 -74
  349. data/generators/foundation/public/stylesheets/foundation6/xy-grid/_frame.scss +0 -85
  350. data/generators/foundation/public/stylesheets/foundation6/xy-grid/_grid.scss +0 -35
  351. data/generators/foundation/public/stylesheets/foundation6/xy-grid/_gutters.scss +0 -45
  352. data/generators/foundation/public/stylesheets/foundation6/xy-grid/_layout.scss +0 -33
  353. data/generators/foundation/public/stylesheets/foundation6/xy-grid/_position.scss +0 -28
  354. data/generators/foundation/public/stylesheets/foundation6/xy-grid/_xy-grid.scss +0 -51
  355. data/generators/page/template.liquid.haml.tt +0 -47
  356. data/generators/snippet/template.liquid.haml.tt +0 -4
  357. data/lib/locomotive/wagon/generators/site/bootstrap.rb +0 -52
  358. data/lib/locomotive/wagon/generators/site/foundation.rb +0 -44
  359. data/lib/locomotive/wagon/generators/site/line_case.rb +0 -20
@@ -0,0 +1,23 @@
1
+ module Locomotive::Wagon
2
+
3
+ class PushSectionsCommand < PushBaseCommand
4
+
5
+ def entities
6
+ repositories.section.all
7
+ end
8
+
9
+ def decorate(entity)
10
+ SectionDecorator.new(entity, content_assets_pusher)
11
+ end
12
+
13
+ def persist(decorated_entity)
14
+ api_client.sections.update(decorated_entity.slug, decorated_entity.to_hash)
15
+ end
16
+
17
+ def label_for(decorated_entity)
18
+ decorated_entity.name
19
+ end
20
+
21
+ end
22
+
23
+ end
@@ -23,6 +23,8 @@ module Locomotive::Wagon
23
23
 
24
24
  _attributes.delete(:metafields) unless with_data?
25
25
 
26
+ _attributes.delete(:sections_content) unless with_data?
27
+
26
28
  if _attributes.present?
27
29
  api_client.current_site.update(_attributes)
28
30
  else
@@ -75,7 +75,7 @@ module Locomotive::Wagon
75
75
 
76
76
  Locomotive::Steam.configure do |config|
77
77
  config.mode = :test
78
- config.adapter = { name: :filesystem, path: File.expand_path(path) }
78
+ config.adapter = { name: :filesystem, path: File.expand_path(path), env: options[:env].to_sym }
79
79
  config.asset_path = File.expand_path(File.join(path, 'public'))
80
80
  config.minify_assets = false
81
81
 
@@ -43,7 +43,7 @@ module Locomotive::Wagon
43
43
  site = api_client.current_site.get
44
44
 
45
45
  each_resource do |klass|
46
- klass.sync(api_client, site, path)
46
+ klass.sync(api_client, site, path, env)
47
47
  end
48
48
 
49
49
  print_result_message
@@ -14,8 +14,8 @@ module Locomotive::Wagon
14
14
 
15
15
  module ClassMethods
16
16
 
17
- def sync(api_client, current_site, path)
18
- new(api_client, current_site, path).sync
17
+ def sync(api_client, current_site, path, env)
18
+ new(api_client, current_site, path, env).sync
19
19
  end
20
20
 
21
21
  end
@@ -1,3 +1,5 @@
1
+ require 'neatjson'
2
+
1
3
  module Locomotive::Wagon
2
4
 
3
5
  class SyncPagesCommand < PullPagesCommand
@@ -5,59 +7,68 @@ module Locomotive::Wagon
5
7
  include Locomotive::Wagon::BaseConcern
6
8
 
7
9
  def write_page(page, locale = nil)
8
- filepath = page_filepath(page, locale)
10
+ instrument :writing, label: "#{page.fullpath} (#{locale})"
9
11
 
10
- if File.exists?(filepath)
11
- # only copy the content of the editable elements
12
- if attributes = editable_elements_attributes(page, locale)
13
- new_content = replace_editable_elements(filepath, dump(attributes))
12
+ filepath = data_path(page, locale)
14
13
 
15
- write_to_file(filepath, new_content)
16
- end
17
- else
18
- # pull the whole page
19
- super
20
- end
21
- end
14
+ return if page.fullpath =~ /^layouts(\/.*)?$/
22
15
 
23
- private
16
+ attributes = {
17
+ id: page._id,
18
+ title: page.title,
19
+ slug: page.slug,
20
+ handle: page.handle,
21
+ listed: page.listed,
22
+ published: page.published,
23
+ position: page.position,
24
+ fullpath: @fullpaths[page._id]
25
+ }
24
26
 
25
- def editable_elements_attributes(page, locale)
26
- list = page.editable_elements.inject({}) do |hash, el|
27
- hash["#{el['block']}/#{el['slug']}"] = replace_asset_urls(el['content']) if el['content']
28
- hash
27
+ if page.redirect_url.present?
28
+ attributes.merge!({ redirect_url: page.redirect_url })
29
+ else
30
+ attributes.merge!({
31
+ sections_content: sections_content(page),
32
+ sections_dropzone_content: sections_dropzone_content(page),
33
+ editable_elements: editable_elements_attributes(page),
34
+ seo_title: page.seo_title,
35
+ meta_description: page.meta_description,
36
+ meta_keywords: page.meta_keywords
37
+ })
38
+
39
+ attributes[:raw_template] = page.template if page.handle.blank?
29
40
  end
30
41
 
31
- list.empty? ? nil : { 'editable_elements' => list }
42
+ write_to_file(filepath, replace_asset_urls(JSON.neat_generate(attributes)))
43
+
44
+ instrument :write_with_success
32
45
  end
33
46
 
34
- def replace_editable_elements(filepath, replacement)
35
- content = File.read(File.join(path, filepath), encoding: 'utf-8')
36
- existing = content =~ /\A.*?editable_elements:.*?\n---/m
47
+ private
37
48
 
38
- content.gsub /\A---(.*?)\n---/m do |s|
39
- if existing
40
- s.gsub(/editable_elements:\n(.*?)\n(\S)/m) { |_s| "#{replacement}#{$2}" }
41
- else
42
- s.gsub(/---\Z/) { |_s| "#{replacement}\n---" }
43
- end
44
- end
49
+ def sections_content(page)
50
+ JSON.parse(page.sections_content)
45
51
  end
46
52
 
47
- def page_filepath(page, locale)
48
- fullpath = locale == default_locale ? page.fullpath : "#{fullpaths[page._id]}.#{locale}"
53
+ def sections_dropzone_content(page)
54
+ JSON.parse(page.sections_dropzone_content)
55
+ end
49
56
 
50
- # HAML template?
51
- if File.exists?(filepath = _page_filepath(fullpath, '.haml'))
52
- return filepath
57
+ def editable_elements_attributes(page)
58
+ page.editable_elements.inject({}) do |hash, el|
59
+ hash["#{el['block']}/#{el['slug']}"] = el['content'] if el['content']
60
+ hash
53
61
  end
62
+ end
54
63
 
55
- # simple Liquid template OR the page does not exist in the local site
56
- _page_filepath(fullpath)
64
+ def page_handle(page)
65
+ page.handle || (%w(index 404).include?(page.fullpath) ? page.fullpath : nil)
57
66
  end
58
67
 
59
- def _page_filepath(fullpath, additional_extension = '')
60
- File.join('app', 'views', 'pages', fullpath + ".liquid#{additional_extension}")
68
+ def data_path(page, locale)
69
+ filepath = @fullpaths[page._id]
70
+ filepath = 'index' if filepath.blank? || filepath == '/' || filepath == "/#{default_locale}"
71
+ File.join('data', env.to_s, 'pages', locale, filepath + '.json')
61
72
  end
62
73
 
63
74
  end
@@ -5,25 +5,28 @@ module Locomotive::Wagon
5
5
  include Locomotive::Wagon::BaseConcern
6
6
 
7
7
  def _sync
8
- attributes = current_site.attributes.slice('metafields')
8
+ attributes = current_site.attributes.slice('name', 'timezone', 'seo_title', 'meta_keywords', 'meta_description', 'robots_txt', 'metafields', 'sections_content')
9
+
10
+ locales.each_with_index do |locale, index|
11
+ if index == 0
12
+ transform_in_default_locale(attributes, locale)
13
+ else
14
+ add_other_locale(attributes, locale)
15
+ end
16
+ end if locales.size > 1
9
17
 
10
- # convert to hash + download assets and use the asset local version
11
18
  decode_metafields(attributes)
19
+ decode_sections_content(attributes)
12
20
 
13
- # modify the config/site.yml file accordingly
14
- replace_metafields_in_file(attributes['metafields'])
21
+ write_to_file(site_filepath, replace_asset_urls(JSON.neat_generate(attributes, {
22
+ sort: true, short: false, padding: 1, object_padding: 1, after_colon: 1, after_comma: 1, wrap: 20, aligned: false
23
+ })))
15
24
  end
16
25
 
17
26
  protected
18
27
 
19
- def replace_metafields_in_file(metafields)
20
- return if metafields.blank?
21
-
22
- content = File.read(File.join(path, 'config', 'site.yml'))
23
-
24
- content.gsub!(/^metafields:\n.+\n\s+.*?\n/m, { 'metafields' => metafields }.to_yaml.to_s.gsub(/\A---\n/, ''))
25
-
26
- File.write(File.join(path, 'config', 'site.yml'), content)
28
+ def site_filepath
29
+ File.join('data', env.to_s, 'site.json')
27
30
  end
28
31
 
29
32
  end
@@ -4,6 +4,18 @@ module Locomotive::Wagon
4
4
 
5
5
  include Locomotive::Wagon::BaseConcern
6
6
 
7
+ private
8
+
9
+ def write_translations(translations)
10
+ write_to_file(translations_filepath, JSON.neat_generate(translations, {
11
+ sort: true, short: false, padding: 1, object_padding: 1, after_colon: 1, after_comma: 1, wrap: 20, aligned: false
12
+ }))
13
+ end
14
+
15
+ def translations_filepath
16
+ File.join('data', env.to_s, 'translations.json')
17
+ end
18
+
7
19
  end
8
20
 
9
21
  end
@@ -7,7 +7,7 @@ module Locomotive::Wagon
7
7
  def replace_with_content_assets!(text)
8
8
  return text if text.blank?
9
9
 
10
- text.to_s.gsub(/([^a-zA-Z0-9])(\/samples\/\S*\.[a-zA-Z0-9]+)/) do
10
+ text.to_s.gsub(/([^a-zA-Z0-9])(\/samples\/[\/a-zA-Z0-9_-]+\.[a-zA-Z0-9]+)/) do
11
11
  url = __content_assets_pusher__.persist($2) || $2
12
12
  $1 + url
13
13
  end
@@ -78,7 +78,7 @@ module Locomotive
78
78
  class ContentEntryWithLocalizedAttributesDecorator < ContentEntryDecorator
79
79
 
80
80
  def __attributes__
81
- %i(_slug) + fields.localized_names
81
+ %i(_slug) + fields.localized_names(include_select_field_id: false)
82
82
  end
83
83
 
84
84
  end
@@ -11,7 +11,7 @@ module Locomotive
11
11
  end
12
12
 
13
13
  def __attributes__
14
- %i(name slug description label_field_name fields
14
+ %i(name slug description label_field_name tree_parent_field_name fields
15
15
  order_by order_direction group_by
16
16
  public_submission_enabled
17
17
  public_submission_accounts
@@ -70,6 +70,10 @@ module Locomotive
70
70
  self[:filter_fields]
71
71
  end
72
72
 
73
+ def tree_parent_field_name
74
+ self[:tree_parent_field_name]
75
+ end
76
+
73
77
  def with_relationships?
74
78
  __getobj__.fields.associations.count > 0
75
79
  end
@@ -13,7 +13,11 @@ module Locomotive
13
13
  def __attributes__
14
14
  %i(name type label hint required localized unique position
15
15
  text_formatting select_options
16
- target inverse_of order_by ui_enabled default)
16
+ target inverse_of order_by ui_enabled default group)
17
+ end
18
+
19
+ def group
20
+ self[:group] || 'main'
17
21
  end
18
22
 
19
23
  def type
@@ -22,13 +22,15 @@ module Locomotive
22
22
  redirect_url redirect_type
23
23
  seo_title meta_keywords meta_description
24
24
  editable_elements
25
+ sections_dropzone_content
26
+ sections_content
25
27
  content_type
26
28
  template
27
29
  display_settings)
28
30
 
29
31
  # remove the attributes that end-users might have modified in the back-office
30
32
  if persisted? && !__persist_content__
31
- _attributes -= %i(title published listed position seo_title meta_keywords meta_description editable_elements)
33
+ _attributes -= %i(title published listed position seo_title meta_keywords meta_description editable_elements sections_dropzone_content sections_content)
32
34
  end
33
35
 
34
36
  # no need to update the slug if this is for an update
@@ -83,6 +85,14 @@ module Locomotive
83
85
  end
84
86
  end
85
87
 
88
+ def sections_dropzone_content
89
+ replace_with_content_assets!(super&.to_json)
90
+ end
91
+
92
+ def sections_content
93
+ replace_with_content_assets!(super&.to_json)
94
+ end
95
+
86
96
  def template
87
97
  replace_with_content_assets!(self.liquid_source)
88
98
  end
@@ -0,0 +1,35 @@
1
+ module Locomotive
2
+ module Wagon
3
+
4
+ class SectionDecorator < Locomotive::Steam::Decorators::TemplateDecorator
5
+
6
+ include ToHashConcern
7
+ include PersistAssetsConcern
8
+
9
+ attr_accessor :__content_assets_pusher__
10
+
11
+ def initialize(object, content_assets_pusher)
12
+ self.__content_assets_pusher__ = content_assets_pusher
13
+ super(object, nil, nil)
14
+ end
15
+
16
+ def __attributes__
17
+ %i(name slug template definition)
18
+ end
19
+
20
+ def id
21
+ slug
22
+ end
23
+
24
+ def template
25
+ replace_with_content_assets!(self.liquid_source)
26
+ end
27
+
28
+ def definition
29
+ replace_with_content_assets!(__getobj__.definition.to_json)
30
+ end
31
+
32
+ end
33
+
34
+ end
35
+ end
@@ -22,7 +22,15 @@ module Locomotive
22
22
 
23
23
  def metafields
24
24
  replace_with_content_assets_in_hash!(self[:metafields])
25
- self[:metafields].try(:to_json)
25
+ self[:metafields]&.to_json
26
+ end
27
+
28
+ def sections_content
29
+ replace_with_content_assets!(super&.to_json)
30
+ end
31
+
32
+ def routes
33
+ self[:routes]&.to_json
26
34
  end
27
35
 
28
36
  def picture
@@ -34,14 +42,14 @@ module Locomotive
34
42
  end
35
43
  end
36
44
 
37
- %i(robots_txt timezone seo_title meta_keywords meta_description asset_host).each do |name|
45
+ %i(robots_txt timezone seo_title meta_keywords meta_description asset_host sections_content routes).each do |name|
38
46
  define_method(name) do
39
47
  self[name]
40
48
  end
41
49
  end
42
50
 
43
51
  def __attributes__
44
- %i(name handle robots_txt locales timezone seo_title meta_keywords meta_description picture metafields_schema metafields metafields_ui asset_host)
52
+ %i(name handle robots_txt locales timezone seo_title meta_keywords meta_description picture metafields_schema metafields metafields_ui asset_host sections_content routes)
45
53
  end
46
54
 
47
55
  def edited?
@@ -53,7 +61,7 @@ module Locomotive
53
61
  class UpdateSiteDecorator < SiteDecorator
54
62
 
55
63
  def __attributes__
56
- %i(picture locales metafields_schema metafields metafields_ui asset_host)
64
+ %i(picture locales metafields_schema metafields metafields_ui asset_host sections_content routes)
57
65
  end
58
66
 
59
67
  end
@@ -29,7 +29,7 @@ module Locomotive
29
29
  end
30
30
 
31
31
  def stylesheet_or_javascript?
32
- File.extname(realname) =~ /^\.(css|scss|less|js|coffee)/
32
+ File.extname(realname) =~ /^\.(css|scss|less|js|coffee)$/
33
33
  end
34
34
 
35
35
  def checksum
@@ -71,7 +71,7 @@ module Locomotive
71
71
  File.basename(filename, extension) + new_extension
72
72
  end
73
73
  end
74
-
74
+
75
75
  def _readfile(path, &block)
76
76
  File.open(path, 'rb', &block)
77
77
  end
@@ -14,8 +14,6 @@ module Locomotive
14
14
  argument :target_path # path to the site
15
15
 
16
16
  def create_page
17
- extension = haml? ? 'liquid.haml' : 'liquid'
18
-
19
17
  segments = self.slug.split('/').find_all { |segment| segment != '' }
20
18
  max_segments = segments.size
21
19
 
@@ -26,11 +24,11 @@ module Locomotive
26
24
  # the content type option is never deleted for the first segment (the requested template)
27
25
  _options.delete(:content_type) unless segments.size == (max_segments - 1)
28
26
 
29
- template "template.#{extension}.tt", "#{file_path}.#{extension}", _options
27
+ template 'template.liquid.tt', "#{file_path}.liquid", _options
30
28
 
31
29
  self.other_locales.each do |locale|
32
30
  _options[:translated] = true
33
- template "template.#{extension}.tt", "#{file_path}.#{locale}.#{extension}", _options
31
+ template 'template.liquid.tt', "#{file_path}.#{locale}.liquid", _options
34
32
  end
35
33
  end
36
34
  end
@@ -41,14 +39,6 @@ module Locomotive
41
39
 
42
40
  protected
43
41
 
44
- def haml?
45
- if options[:haml].nil?
46
- yes?('Do you prefer a HAML template ?')
47
- else
48
- options[:haml]
49
- end
50
- end
51
-
52
42
  def pages_path
53
43
  File.join(target_path, 'app', 'views', 'pages')
54
44
  end