From 00685cda77580d2abb240808ab2e7e60ed86b82a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20Norl=C3=A9n?= Date: Sun, 5 Jul 2020 10:58:11 +0200 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 8432864ffb2d2e5d25a28add59ae01d22113c4e9 Author: Thomas von Deyen Date: Thu Jun 25 13:40:41 2020 +0200 Bump version to 5.0.0.beta2 commit afd7319c7a78991e5596f5f6cb81183a173ac5d4 Merge: 5bdf08ac2 9565b37c3 Author: Thomas von Deyen Date: Tue Jun 23 14:06:21 2020 +0200 Merge pull request #1884 from mamhoff/allow-page-factory-with-host-app-locale Language Factory: Create default language in host app's locale commit 9565b37c309f0bba1b26694041f78436c4a30eeb Author: Martin Meyerhoff Date: Tue Jun 23 11:53:00 2020 +0200 Reload before checking for related EssenceNodes The most recent version of AwesomeNestedSet stops reloading `self` when saving. This leads to `self` having inaccurate values for `lft` and `rgt` in our spec, making `node.self_and_descendants` sometimes not find all children. Luckily our specs found this. commit 36ee4974ef447570731f593c3363ddd3f380b8d4 Author: Martin Meyerhoff Date: Tue Jun 23 10:46:07 2020 +0200 Create default language in host app's locale Our default language factory will create a page in German. That's not great for apps that do not have German as an `available_locale`, as Alchemy now validates the language_code of the language. This change adds a new trait "german" to satisfy our existing test suite, but creates by default a language in the host apps first available locale. commit 5bdf08ac277ea9e6b78222b6436c25e03832832c Merge: f637e0272 bb645dbd2 Author: Thomas von Deyen Date: Tue Jun 23 12:59:38 2020 +0200 Merge pull request #1883 from AlchemyCMS/depfu/update/factory_bot_rails-6.0.0 [ruby] Upgrade factory_bot_rails to version 6.0.0 commit bb645dbd2d95419264c4aa829b83f60faccac0ba Author: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> Date: Sat Jun 20 03:50:52 2020 +0000 Update factory_bot_rails to version 6.0.0 commit f637e0272b4057738d5229529e83462aa70adb13 Merge: 2dd2929d6 ee69d49c9 Author: Thomas von Deyen Date: Tue Jun 16 13:50:43 2020 +0200 Merge pull request #1879 from tvdeyen/picture-thumbnail-sizes-constant Extract picture thumbnail sizes in a constant commit 2dd2929d644a8e436fb4933185e56741ef3f7b22 Merge: 3072ac95d 0ea5aa33b Author: Thomas von Deyen Date: Tue Jun 16 12:30:13 2020 +0200 Merge pull request #1880 from tvdeyen/fix-picture-library-size-filters Respect filter and tagging params in picture archive size buttons commit ee69d49c9d2245fcfc032d428a6e856706000024 Author: Thomas von Deyen Date: Tue Jun 16 12:25:05 2020 +0200 Disable Style/TrailingCommaInArguments check This is conflicting with Rufo commit 0ea5aa33b90df12be09412271636d196f3b21e6d Author: Thomas von Deyen Date: Tue Jun 16 12:17:34 2020 +0200 Respect filter and tagging params in picture archive size buttons commit 42642151c55017c8b7850aef16c649c56d5a059c Author: Thomas von Deyen Date: Mon Jun 15 15:25:04 2020 +0200 Extract picture thumbnail sizes in a constant We want to read those value from other classes and it makes sense to have them formalized in a constant anyway. commit 3072ac95d292dda76e3844b5ebcae6f22a5277d0 Merge: 1e7c025fe a7479daec Author: Thomas von Deyen Date: Mon Jun 15 12:21:28 2020 +0200 Merge pull request #1878 from tvdeyen/preprocess-images Configurable Image Preprocessor commit a7479daecc7a19b99d6a6ec29eca4f21474f281c Author: Thomas von Deyen Date: Mon Jun 15 10:19:15 2020 +0200 Make image preprocessor configurable You can define your own preprocessor class # config/initializers/alchemy.rb Alchemy::Picture.preprocessor_class = My::ImagePreprocessor commit e251ae529e186e7f12f737f14f5ad86d727b056b Author: Thomas von Deyen Date: Mon Jun 15 09:43:14 2020 +0200 Extract picture preprocessing into service class commit 1e7c025fe13ab753959837f74e1f1948cde7a022 Merge: 5cbe1554a 102d9c12c Author: Thomas von Deyen Date: Thu Jun 11 16:41:06 2020 +0200 Merge pull request #1877 from tvdeyen/preview-per-site Configure edit page preview per site commit 102d9c12c36d316b4a326206b7dfdc988097a9b9 Author: Thomas von Deyen Date: Thu Jun 11 14:26:26 2020 +0200 Use pages url path in page preview for external sites If the page preview renders an external site instead of the internal one we pass the url-path instead of the urlname so we make sure that root page urls are ` /` and the language code is prefixed. commit 5795da26f98cf231cd5f07c1ac588c3163deced6 Author: Thomas von Deyen Date: Thu Jun 11 14:24:25 2020 +0200 Allow previe url to be configured per site You can now configure the preview url per site. preview: My site name: host: https://www.my-static-site.com auth: username: <%= ENV["BASIC_AUTH_USERNAME"] %> password: <%= ENV["BASIC_AUTH_PASSWORD"] %> commit 5cbe1554abb2d572ca3ddbbcef8cc945e50e0b55 Author: Thomas von Deyen Date: Thu Jun 11 11:03:51 2020 +0200 v5.0.0.beta1 commit 87f8018c3532c454088c10db75d8fc41f9b3e0ff Merge: e3f94b4b5 751a3dfef Author: Thomas von Deyen Date: Thu Jun 11 10:23:13 2020 +0200 Merge pull request #1780 from alebacca89/fix_remove_picture_in_element fix remove correct image in edit element content picture commit 751a3dfefd3c0a50e921d91f5cd540799ce56f36 Author: Alessandro Baccanelli Date: Tue Apr 7 13:35:33 2020 +0200 fix remove correct image in edit element content picture commit e3f94b4b5ff43d268e1aeec772f72aaf13d20adb Merge: 69fefff28 87b264835 Author: Thomas von Deyen Date: Wed Jun 10 12:25:43 2020 +0200 Merge pull request #1876 from tvdeyen/page-tree-fix-sorting Fix Page tree sorting after root page removal commit 87b264835136852a5aa0832d1ea75a04a0172817 Author: Thomas von Deyen Date: Wed Jun 10 11:23:45 2020 +0200 Fix page sorting after root page removal Since we removed the root page we need to adjust the sortable items class. commit 59bc15274ed37a65be9f21a268c4fb06946a218e Author: Thomas von Deyen Date: Wed Jun 10 11:23:22 2020 +0200 Format page sorter with Prettier commit 69fefff28bfeb517c946aa98d8ca63acd122b58b Author: Thomas von Deyen Date: Fri Jun 5 13:50:35 2020 +0200 Update 5.0 changelog commit b3c794e8ca7c723d4e74f054747107708dc3f87c Author: Thomas von Deyen Date: Fri Jun 5 13:45:47 2020 +0200 Update CHANGELOG for 4.6 release commit 71bf393817262b72c78d3c384e72c9b773d268c7 Merge: 9a1990623 e81587836 Author: Thomas von Deyen Date: Fri Jun 5 13:35:01 2020 +0200 Merge pull request #1868 from tvdeyen/remove-attach-to-menu Remove Page#visible commit e8158783681626acf466d180142aa64706365333 Author: Thomas von Deyen Date: Thu Jun 4 00:40:20 2020 +0200 Simplify urlname generating There is no need to rebuild every ancestors slug since we already have the parents urlname we can append the slug to. commit cb7de340e8bf3906012a2df2ba4b2afd0be046cf Author: Thomas von Deyen Date: Thu May 21 08:57:20 2020 +0200 Remove visible from existing pages commit e5eabe1003a81910c5e36cd1384c6276e178bfc3 Author: Thomas von Deyen Date: Thu May 21 08:47:48 2020 +0200 Remove usages of visible attribute from Page This is a legacy attribute that was used to show the page in the navigation. Since the render_navigation helper has been removed and the feature has been replaced with a much better feature (Menus) we do not need this attribute anymore. Also this attribute was used to generate the url of a page only taking visible parents into account. This also has been removed. commit 3730ddd0cc9aa77dd67dbe70104c45a15bc817a9 Author: Thomas von Deyen Date: Thu Jun 4 00:04:28 2020 +0200 Fix page status in page info dialog commit 44c4a3f59c7df0fb834602ac7a644bd2b054cef3 Author: Thomas von Deyen Date: Wed Jun 3 00:48:21 2020 +0200 Remove attach_to_menu feature The attach-page-to-menu button in the page form was meant as a transitional feature for introducing menus. Now that they have been established and managing menus has been refined we can remove this rather complex feature. commit 9a19906237670a0d9550279fda6849fa42d9f8f7 Merge: b60c75fa5 daa78e32f Author: Thomas von Deyen Date: Fri Jun 5 11:41:17 2020 +0200 Merge pull request #1874 from tvdeyen/upgrader-fixes 5.0 Upgrader fixes commit daa78e32f9d83d1594cdf924e741aff614e6cba0 Author: Thomas von Deyen Date: Thu Jun 4 23:37:40 2020 +0200 Fix the add menu_type migration This migration fails being rolled back because change_column is not reversible. Using `change_column_null` resolves that issue. Also it does not make sense to write into a column we delete any way. commit 9f18b952c03f61ea29a84ef2191146ab710e423a Author: Thomas von Deyen Date: Thu Jun 4 23:32:12 2020 +0200 Fix the order of upgrade tasks If we run the dedecated 5.0 upgrade tasks before installing the migrations it will skip installing them. Since it is not harmfil to run the migrations before hand and this was the case for the upgrader all the time this fix should be considered fine. commit a67c6325199dd130503622a7e0f0e29ee2eb8c4c Author: Thomas von Deyen Date: Thu Jun 4 23:30:33 2020 +0200 Do not seed while upgrading The Alchemy seeder does not need to run. commit b60c75fa5e1e6ca630849d68e6fcf5176c245164 Merge: dc242d9d2 a43c8ded6 Author: Thomas von Deyen Date: Thu Jun 4 09:14:55 2020 +0200 Merge pull request #1863 from AlchemyCMS/depfu/update/rubocop-0.85.0 [ruby] Upgrade rubocop to version 0.85.0 commit dc242d9d2d754b1eab154723f474340d0f792948 Merge: c4b6d5916 52387882b Author: Thomas von Deyen Date: Thu Jun 4 09:12:55 2020 +0200 Merge pull request #1872 from tvdeyen/remove-url_nesting-config Remove url_nesting config commit 52387882b82b888d6cfd6fe1a8823b138e2a23a3 Author: Thomas von Deyen Date: Wed Jun 3 23:54:32 2020 +0200 Remove url_nesting config commit c4b6d591675f86c34f6c67699089c6c70f3257a3 Merge: bf9ecd0dd c8fcfbab7 Author: Thomas von Deyen Date: Wed Jun 3 21:43:00 2020 +0200 Merge pull request #1871 from AlchemyCMS/depfu/update/sassc-2.4.0 [ruby] Upgrade sassc to version 2.4.0 commit c8fcfbab716a7c2e771dbd28178b804c62b6da6c Author: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> Date: Wed Jun 3 14:46:19 2020 +0000 Update sassc to version 2.4.0 commit bf9ecd0ddb69d78cbdde765cebdfe10e868b9885 Merge: 5d630bc5c 51a7d8277 Author: Thomas von Deyen Date: Wed Jun 3 10:44:06 2020 +0200 Merge pull request #1867 from tvdeyen/4.6-backports Cherry picks changes from 4.6-stable that needs to be ported over to master Fix the sitemap wrapper height (#1861) Update Urlname translation (#1857) Introduce Page#url_path (#1859) Show url_path in page tree (#1856) Use depth for page tree serializer root_or_leaf (#1864) commit 5d630bc5c43a80fb0348458fc63d5a82b982565a Author: Alexander ADAM Date: Wed Jun 3 09:18:24 2020 +0200 fix GitHub Actions spelling (#1869) commit 51a7d82779206158f9a44d7e87760fd12305b816 Author: Thomas von Deyen Date: Tue May 19 00:16:44 2020 +0200 Reduce horizontal padding of small button commit bb0c50d9ba8e20d00398b4ab8dbe9f2e666d9ade Author: Thomas von Deyen Date: Tue May 19 00:12:21 2020 +0200 Add active button style commit 86e59ccf530b0c2b621488d72e321e898b8cd79d Author: Thomas von Deyen Date: Tue Jun 2 23:45:26 2020 +0200 Use depth for page tree serializer root_or_leaf (#1864) Depth is a cached attribute on the page that does not need calculation and will always be correct even if the root page has been removed. This commit helps to migrate to Alchemy 5 without making further changes to the page tree serializer. Without that change page trees that already have been migrated to "root-page-less" Alchemy 5 will have page toggle switches disappear in the first level. commit 961fdc732d9e4f9767c4ce5b5f8ff7b74a8295ea Author: Thomas von Deyen Date: Tue Jun 2 22:34:33 2020 +0200 Show url name in Page tree (#1856) * Show url_path of page in admin page tree The url_path of a page is useful information. We should always display it not only if the page redirects to external. * Format sitemap.scss with Prettier * Change the sitemap urlname background color The old color was too prominent for that information. * Show a legend on top of admin page trees * Use a left aligned column layout for page tree * Slighty more space for node page name and url * Eager load associated records in page tree serializer Now that we need the language and its site we should eager load them in the page tree serializer. Also the locker of a page should be eager loaded. On a site with ~300 pages loading the page tree went from 722ms to 221ms on my machine. commit c801a36837260bc8e24d822816b722795bd483cc Author: Thomas von Deyen Date: Tue Jun 2 00:49:51 2020 +0200 Introduce page.url_path and use it for alchemyPageSelect (#1859) * Introduce page url_path service class Use this class to generate the url_path to a page. It takes several circumstances into account 1. It returns just a slash for language root pages of the default langauge 2. It returns a url path with a leading slash for regular pages 3. It returns a url path with a leading slash and language code prefix for pages not having the default language 4. It returns a url path with a leading slash and the language code for language root pages of a non-default language * Return the page url_path with API responses We want to use the newly introduced url_path attribute on the page selector in the admin. It in general makes sense to have the correct url to a page from the API anyway. * Remove @url_prefix This variable is not used anymore. since we generate the url in page links via the API response. * Use Page#url_path in alchemyPageSelect We do not need to care about adding leading slashes in the template anymore and it fixes a lot of missing features for multi language pages. * Use page.url_path in node.url Instead of having (buggy) page url generating code in the node model, we use the newly introduced page.url_path attribute that takes all necessities into account. * Appease Rubocop * Use page.url_path in page link dialog And with that fix bugs for wrongly generated urls in multi language environments. commit 68c7e0256c7cfe62ec5f33cda539c0574cd861d0 Author: Thomas von Deyen Date: Thu May 28 00:44:06 2020 +0200 Update urlname translation to URL-Path That's what this part of the URL is called according to RFC 1738 commit 40ce6aeb72d46630b54f0c7cb53aa67995c4df60 Author: Thomas von Deyen Date: Thu May 28 00:43:02 2020 +0200 Use Slug as urlname field label The value entered in this field is the slug. commit e75927fd6f2fefd0e04726d8bc27e1ed80830a78 Author: Thomas von Deyen Date: Sat May 30 00:03:47 2020 +0200 Fix the sitemap wrapper height We want the loading spinner centered. commit 9105536eea6ee8bbab573b8f6e38d6933ef77f35 Merge: 2767a66b3 21a102843 Author: Thomas von Deyen Date: Wed Jun 3 00:01:15 2020 +0200 Merge pull request #1844 from tvdeyen/remove-url_nesting Remove url_nesting configuration and always create nested urls commit 2767a66b32a720770f2568a9d3e882723c608d7f Author: Thomas von Deyen Date: Tue Jun 2 23:30:52 2020 +0200 Use apt update instead of apt-get in GH action (#1866) We have some weird connection error on GH actions while installing the database headers. Let's try to use a more modern tool... commit a43c8ded663e1a90df43bebbc94e656e0024c3d4 Author: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> Date: Tue Jun 2 17:22:53 2020 +0000 Update rubocop to version 0.85.0 commit 21a102843bc10944fb98afd0ffef6939d342748f Author: Thomas von Deyen Date: Thu May 21 10:10:49 2020 +0200 Remove the url_nesting config option And always created nested urls. commit 2f15aba37b41b53b001cc36a41109e2636301133 Author: Thomas von Deyen Date: Thu May 21 09:16:57 2020 +0200 Deprecate url_nesting configuration commit de453c5d453373c522d6f0d0553bd85f9f5fd752 Author: Thomas von Deyen Date: Wed May 27 11:14:10 2020 +0200 Set proper nested set scope on page (#1837) * Set proper nested set scope on page * Ensure layoutpages factory never creates a parent With the awesome nested set scope set to language and layoutpage there is no parent with the same scope to move the newly created page to. * Ensure page factory sets language from parent If the page has a parent set we use that as the language. We must avoid to call the parent method in the factory, that's why we use the @cached_attributes here. * Fix page language_root factory for when language is nil We might set language to nil in tests explicitly. * Refactor page specs after factory changes Now that the page factory sets the language to the parent if necessary we can rewrite some specs. commit c7dad35cc326b873944be5a7d23d3e4db2c647d4 Author: Thomas von Deyen Date: Wed May 27 10:43:59 2020 +0200 Remove active_record_5_1? (#1854) This check is not neessary anymore since we dropped support for Rails 5.0 and 5.1 commit 50f19ea5776c656b686c03c81ff4ae11a08e30d0 Author: Thomas von Deyen Date: Tue May 26 20:26:29 2020 +0200 Use Alchemy npm package instead of hacking webpacker (#1853) * Move npm package code into dedicated folder We want to get rid of webpacker * Remove rails/webpacker With that we can dramatically simplify the jest setup * Raise npm package version * Install alchemy npm package into host app Instead of compiling the pack in a hacky way we install the alchemy/admin npm package as dependency of the host apps package.json and copy the admin entry point into the host apps packs folder. This reduces the amount of hacks we need in Alchemy in order to make webpack work. * Remove webpacker hacks Now that we publish a npm package and install alchemy/admin as host app dependency we can remove our webpacker hacks. * Remove and ignore webpacker files from dummy app We want to run the install generator during test setup. * Run Alchemy installer during test setup That way we ensure that everything is setup correctly and the generator is actually tested in a sort. * Cache node_modules of dummy app on CI This gem has two node_modules folder now, on in the dummy app and one for the jest specs. commit 913d3dde369ef7b3db4c3bba4f15858af1c1b1cb Author: Thomas von Deyen Date: Tue May 26 15:20:22 2020 +0200 Fix node select ES5 syntax (#1851) * Do not use object destructering in node select This is not supported in ES5 * Format node select with Prettier commit 14625b7749f0207db1535b72505aa1bb3f9ca604 Author: Martin Meyerhoff Date: Tue May 26 10:29:34 2020 +0200 Remove male sign after emoji (#1849) The wizard can be gender neutral. commit 5397826824c36f796c13dead3c90c92e387058b2 Author: Martin Meyerhoff Date: Tue May 26 10:29:17 2020 +0200 Run yarn:install after installing webpacker in install generator (#1850) Without doing this, the app will not find Alchemy's webpack packs. commit 84ac809011420bd3715c9d06f3f5fbd30d68ea10 Author: Mikael NorlĂ©n Date: Mon May 25 23:22:54 2020 +0200 Add indifferent access to default options in encoded_image (#1840) commit fe36e20658e12702d04bba5b316ebc7bc2d491d7 Author: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> Date: Mon May 25 23:19:48 2020 +0200 Update rubocop to version 0.84.0 (#1845) Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> commit f7ffece2bbf92b85fa01410f6b09979ec41e51a0 Author: Martin Meyerhoff Date: Mon May 25 13:21:59 2020 +0200 Do not use ES6 Syntax in Node Selector (#1846) The previous version of this code fails in host apps that do not have Uglifier in Harmony mode. Let's stick with ES5 instead. commit 73963dd6c8171bc9a0c784768fd51e5c22933c23 Author: Martin Meyerhoff Date: Tue May 19 09:12:11 2020 +0200 Translated root menus (#1825) * Add menu_type column to nodes This column holds information about what type this menu is - a footer or a main menu, for example. * Make menu_type available in the admin This adds the following functionality: - Choose a menu type when creating a new root node - Change the menu name for a root node if that's necessary or desired via `edit` - Restrict the options for menu type depending on which nodes on a language are already present * Render child nodes directly in nodes partial The "options" local is often not given, and the `node_partial_name` key is never set any longer, as it is always `node.to_partial_path`.` * Render footer in Dummy App This can be used to test Alchemy::EssenceNodes from the Dummy app. commit 6a08040e7fd55b01e29671f27ae879d34788f641 Author: Martin Meyerhoff Date: Mon May 18 20:55:37 2020 +0200 Fix deleting an EssenceNode from a content (#1834) We can leverage Rails' functionality here. commit 3e4d476d712d10adcadfebe5858c4a8e85fdb8f2 Author: Martin Meyerhoff Date: Mon May 18 20:54:58 2020 +0200 Use Rails standards for deleting pages from EssencePage (#1833) Rails offers ways for setting relations, let's use them. commit 2cb3228ddbe4e19ae92257e56074df92d449afb6 Author: Martin Meyerhoff Date: Mon May 18 20:53:27 2020 +0200 Install Webpacker in install generator (#1835) We use this generator in the Alchemy ecosystem, and the dummy apps of gems like alchemy-devise or alchemy-solidus need webpacker installed to function. commit 02983a039b6cf63118847607a476a86481a5fa30 Author: Martin Meyerhoff Date: Thu May 14 14:52:15 2020 +0200 Scope has one site (#1832) * Make alchemy_pages.layoutpage null: false We want to have an actual Boolean and no nil values. * Scope Language Root Page to Non-Layoutpages Layoutpages can not be root pages. commit 8ff8ca28854ceefe8f56825c22124fc08bfe3ce0 Author: Martin Meyerhoff Date: Thu May 14 14:23:52 2020 +0200 Add error flash to resource controller (#1827) This adds an error flash to the resource controller if some action does not succeed. commit f25b8e542e8cc24f354e077f50ea546fc97c1c1e Author: Martin Meyerhoff Date: Thu May 14 10:37:23 2020 +0200 Render nodes (#1831) * Allow directly rendering nodes We can use Rails' model rendering mechanism to render nodes by changing `to_partial_path` to not point to the wrapper, but to the node itself. This yields a few simplifications. * Adapt generator partials to not use node_partial_path This is now `node.to_partial_path`. * Actually render node when rendering an EssenceNode commit f58f4f98bb496a647be060c9ecc75387861f04a9 Author: Martin Meyerhoff Date: Wed May 13 23:43:33 2020 +0200 Add errors when node cant be deleted (#1828) * Add error before destroying node with attached essence Nodes that are used on e.g. content pages can not be simply destroyed. This commit adds an error message so the user knows what's going on. * Do not destroy nodes with dependent nodes that are in use on a page This moves the validation up in the file so that awesome_nested_set does not run its `delete_all` callback before we validate that it can do that. It also extends the validation such that we collect all the pages that are referenced in the subtree below this node. commit 729cd21fba8e23e04edd0b7a3fdac05607ab816f Author: Martin Meyerhoff Date: Wed May 13 16:53:11 2020 +0200 Fix Association between Nodes and EssenceNodes (#1826) There was a typo here resulting in Nodes being associated to themselves in an impossible way. commit 0eec65a43daf01b4d699f48b3bd93011ff9a0792 Author: Martin Meyerhoff Date: Mon May 11 09:36:14 2020 +0200 Add a quick Node select (#1821) * Add a quick Node select This faster select also shows the ancestors of each node, such that one is not confused between nodes that have similar names. * Fix Copy-Paste error that tries assigning Pages to EssenceNodes Prior to this commit, saving an EssenceNode by ID would never work... * Serialize Node with Ancestors for initial selection * Center initial selection in Alchemy::EssenceNode select Maybe we should look at using Flexbox for this so we can center things more easily. * Add specs for NodesController Index Action It's always good to have specs. commit 30c2aa88ca0452a23c8e473f0761da1937960d23 Author: Martin Meyerhoff Date: Fri May 8 23:13:51 2020 +0200 Add has_one association for root page (#1820) This should allow us to preload better, and I believe Rails will also cache the association if necessary. commit 81ae05fe123fa6fd740dbe0024e2f7fde2a55d7b Author: Thomas von Deyen Date: Fri May 8 22:53:12 2020 +0200 Use rails root in install generator (#1822) * Move generators out of rails folder * Use Rails app root to join paths Without that it is not always ensured that the path is the hosts apps root path. * Refactor elements generator naming validation commit 5a86ae51723dbdd69d8eddc22b9a5a7959f08b1f Author: Thomas von Deyen Date: Wed May 6 23:30:07 2020 +0200 Make page.language mandatory (#1818) Now that we removed all hidden "systempages" we can ensure that a language is always present on a page. commit 6fccc3b9905d448ec924244814e032061a63b2ca Author: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> Date: Wed May 6 17:54:46 2020 +0200 Update babel-jest to version 26.0.1 (#1819) Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> commit 4b43ce8ac7422203c85343500357a632b3cfe9e4 Author: Thomas von Deyen Date: Wed May 6 14:38:15 2020 +0200 Remove root page (#1817) * Remove Page#systempage? * Remove Page.root We do not need a single root page. All pages that share the same language are a nested set. * Format page_scopes.rb * Format pages controller spec file * Add upgrader task to remove root page * Rubocop -a commit dc7b25d3228e4e9a5c8054abe8103bc43c53ff24 Merge: 19aa55f5c 2196e8002 Author: Martin Meyerhoff Date: Wed May 6 13:13:52 2020 +0200 Merge pull request #1807 from mamhoff/remove-site-id-from-nodes Remove Site ID from nodes commit 19aa55f5cc9b6aabbb73ef016f8501bf57911249 Author: Thomas von Deyen Date: Wed May 6 13:02:56 2020 +0200 Remove Page.ancestors_for (#1813) Its only used by the render_breadcrumb helper and that could just use the self_and_ancestors scope. commit 2196e8002e9f522e17c85782d02a2f1d92e9690f Author: Martin Meyerhoff Date: Wed May 6 10:22:17 2020 +0200 Add Down Migration commit 8b7cd55cb347fcb733704f2e4c6a944937139555 Author: Thomas von Deyen Date: Wed May 6 00:57:37 2020 +0200 Fix page unlock page icon replacement (#1816) Without this strong selector it happens that more icons get appended than necessary. Also rewritten in VanillaJS commit c7261e8d640d374d9760cbf9d482c25c64473932 Author: Thomas von Deyen Date: Wed May 6 00:57:17 2020 +0200 Invoke rake task in upgrader instead of system call (#1815) commit 6d9e5d824a2ff0023fb4dc474e37e5071312ff8d Author: Thomas von Deyen Date: Wed May 6 00:56:57 2020 +0200 Remove old 4.4 upgrader class (#1814) commit 12c97fea27f7a54f86cb07231a8c801bc127fe9e Author: Thomas von Deyen Date: Tue May 5 20:53:40 2020 +0200 Remove layout root pages (#1812) * Remove layout root page We do not need this hidden page. All pages that share the same language and have `layoutpage` set to true are the layoutpages for the current language. * Pass the language in new page form We want to be sure that the language we instantiate the page with gets passed with the form * Only set the language from parent if present And use the current page, not the default (that is the current anyway if no current language has been explicitely set). * Add upgrader for removing layout root pages commit 9a67a364060a860c40963d5c25c76c63d89e9475 Author: Thomas von Deyen Date: Tue May 5 17:52:22 2020 +0200 Use timestamps method in migration files (#1811) Instead of an database dependent datetime column, we should use the Rails database agnostic timestamps method for creating the columns. commit afd266d332bc58921fdbde1b04353fc44aa441ef Author: Thomas von Deyen Date: Tue May 5 17:49:51 2020 +0200 Remove legacy element serializer (#1810) This serializer has been introduced 4 years ago with the release of Alchemy 3.1. This can be safely removed now. commit 34b1721f7bf608eb885097a2480105d21e5f42d0 Author: Thomas von Deyen Date: Tue May 5 17:12:08 2020 +0200 Remove timestamps from essences and contents (#1809) * Remove timestamps from essence and contents tables These records always ever get created within an element. So, this information is duplicated. * Format attachment and picture model classes with Rufo * Touch element after essence has been saved The content will rarely be cached inside of an already cached element. * Format attachment and picture spec files * Touch elements after attachment or picture has been saved Do not touch contents any more. We removed the timestamps as they only get created in the context of an element and the element gets cached, not the single content. * Rubocop -a commit c206a2ad00ce015f29eb7c7a46234a5925187698 Author: Thomas von Deyen Date: Tue May 5 12:24:50 2020 +0200 Remove stamper from content model (#1808) The content model always ever is created within an element and it does not make sense to have this information twice. commit 09abf7b016db47538868b50781159fe74e453d09 Author: Martin Meyerhoff Date: Tue May 5 12:21:43 2020 +0200 Add Alchemy::Language.has_many :nodes (#1806) We need those association declarations for better preloading. commit ba1acf5db71fbe74acf5b9bf4b092d4020cc9b71 Author: Thomas von Deyen Date: Tue May 5 09:18:54 2020 +0200 Drop Rails 5.0 and 5.1 support (#1805) * Drop Rails 5.0 and 5.1 support These Rails versions are not officially supported anymore and we want to be able to better support MySQL with bigint foreign keys. * Use references in migrations for foreign keys That way the database adapter will chose the correct column type for foreign keys. Adds better support for MySQL. Closes #1796 commit a6f36404755e4db3bc69cb3cff25073aeeffdc7f Author: Thomas von Deyen Date: Tue May 5 08:53:04 2020 +0200 Remove acts_as_list from Content (#1798) Closes #1793 commit 4b60c7b4ba8bbbc8fb01e3671f1095a1164db965 Author: Martin Meyerhoff Date: Mon May 4 23:10:24 2020 +0200 Remove Site ID from nodes Nodes can get their Site through their language. commit 9301a0610fd2b8fa4a35c20d2d2ca205e820076f Author: Thomas von Deyen Date: Mon May 4 23:31:27 2020 +0200 Remove enforce_ssl (#1804) Removes the enforce_ssl configuration and the SSLProtection module. Please use the Rails build in config.force_ssl or your Webserver for that. commit 09f3041cfd26c9956fd0a9373cad75d75e8c5618 Author: Thomas von Deyen Date: Mon May 4 23:30:39 2020 +0200 Remove stamper from essences (#1802) We do not need the creator and updater information on the essences. We already have them on the elements. commit 7596a4898658093b293396478138b954e2bf28bc Author: Thomas von Deyen Date: Thu Apr 30 11:36:11 2020 +0200 Make the preview url configurable (#1803) * Make the preview url configurable By default Alchemy uses its internal page preview renderer, but you can configure it now to be any URL instead. Basic Auth is supported as well. Example config/alchemy/config.yml preview: host: https://www.my-static-site.com auth: username: <%= ENV["BASIC_AUTH_USERNAME"] %> password: <%= ENV["BASIC_AUTH_PASSWORD"] %> This is great for static sites. * Satisfy the Hound commit 1e95b3199f7eb9665e544e7594a65072aaeabfa3 Author: Thomas von Deyen Date: Wed Apr 29 21:54:56 2020 +0200 Use Rufo to format all files in a consistent way (#1799) * Rubocop -a * Fix rubocop config * [Rufo] Add trailing commas * [Rufo] Use double quotes for strings * Add Rufo as local dev dependency commit 7a79235489560a9d4dc272d2917af69bf5a8b882 Author: Martin Meyerhoff Date: Tue Apr 28 12:52:14 2020 +0200 Add EssenceNode (#1792) This Essence can be used to add a menu and its children to an Element. commit 489181e6efb857ea6bf2c9f308c99749b4841943 Merge: 5093856a3 28876c6fa Author: Thomas von Deyen Date: Mon Apr 27 08:34:43 2020 +0200 Merge branch 'fix-email' commit 5093856a3b680be0a2c4cffb78d13bc93c9c4d99 Author: Thomas von Deyen Date: Mon Apr 27 08:28:08 2020 +0200 Convert NodeTree into ES6 (#1782) * Install sortablejs npm package * Revert "Add favicon to assets manifest" The favicon is already linked with the images folder. * Convert NodeTree and utils into ES6 modules And make the `on` delegated event handler work with multiple base nodes * Fix base node folding * Extract ajax and events into own utils modules commit addc2116db78ccc4d0e005d9cc8c08a919eeb486 Author: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> Date: Wed Apr 22 11:25:37 2020 +0200 Update rubocop to version 0.82.0 (#1785) Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> commit 37d7737e546ee924591684ae6c14a23e0944e8d1 Author: Thomas von Deyen Date: Wed Apr 22 10:40:49 2020 +0200 Use 2.5.7 of code climate coverage reporter GH action (#1790) * Use 2.5.7 of code climate coverage reporter GH action * Raise mysql service health check retries This service takes for ever to start commit 4433ede860fc51fc10f77f609acfc19959853ee2 Author: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> Date: Wed Apr 22 09:51:36 2020 +0200 Update sassc to version 2.3.0 (#1787) Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> commit 5d8ae3bea34d6558cdd3956d4bf01e539f8bdcfd Author: Thomas von Deyen Date: Fri Apr 17 08:51:14 2020 +0200 Fix regular icons (#1784) * Fix Font Awesome regular icons It's `asset_url` not `assets_url`. * Update icons to Font Awesome 5.13.0 Aka. the Corona release commit e24643227dab5346182273ceddb66c882dfffa1d Author: Thomas von Deyen Date: Tue Apr 7 21:38:24 2020 +0200 Add Webpacker (#1775) * Install webpacker and configure own instance Following the official webpacker engines guide * Add demo admin JS pack Something to work with during testing * Serve and compile Alchemy packs in host app Serve the Alchemy packs via Rack::Static if public file server is enabled (ie. during development) and enhance the yarn:install and assets:precompile tasks so that the Alchemy packs get compiled asd well. Copy over the files into host apps public/ folder afterwards. * Ensure that we run yarn install before installing Alchemy * Ensure to also serve packs in tests * Install node modules on GH CI * Do not use our own webpacker instance in page preview We want the webpacker instance of the host app in the preview frame. * Use webpacker 5 * Add a prettier config * Add a webpack-dev-server proxy * Only enhance rake tasks that are present If you install webpacker into a fresh Rails app there is not yarn:install task yet. * Update Babel config and add core-js * Add and configure Jest * Run Jest specs in GH CI * Convert i18n module into ES6 * Add favicon to assets Sprockets complains that we need this file * Enable Jest coverage reports for code climate * Ignore unknown window messages Now that we have Webpack installed the dev server emits messages on the window as well. Lets just ignore them. commit 28876c6fab6382b27698bcc8246667b73ac37930 Author: Thomas von Deyen Date: Sun Feb 23 15:12:55 2020 +0100 Fix email in gemspec --- .github/workflows/ci.yml | 45 +- .github/workflows/stale.yml | 2 +- .gitignore | 22 +- .prettierrc | 6 + .rubocop.yml | 16 +- CHANGELOG.md | 90 ++ Gemfile | 45 +- README.md | 3 +- Rakefile | 1 + alchemy_cms.gemspec | 11 +- app/assets/javascripts/alchemy/admin.js | 6 +- .../alchemy/alchemy.base.js.coffee | 3 +- .../alchemy/alchemy.element_editors.js.coffee | 2 - .../alchemy/alchemy.i18n.js.coffee | 32 - .../alchemy/alchemy.link_dialog.js.coffee | 10 +- .../javascripts/alchemy/alchemy.node_tree.js | 66 - .../alchemy/alchemy.page_sorter.js | 34 +- .../alchemy/alchemy.translations.js.coffee | 29 - .../javascripts/alchemy/alchemy.utils.js | 45 - app/assets/javascripts/alchemy/node_select.js | 39 + .../javascripts/alchemy/templates/index.js | 1 + .../javascripts/alchemy/templates/node.hbs | 16 + .../javascripts/alchemy/templates/page.hbs | 2 +- app/assets/stylesheets/alchemy/_mixins.scss | 5 +- .../stylesheets/alchemy/_variables.scss | 4 +- app/assets/stylesheets/alchemy/admin.scss | 1 + app/assets/stylesheets/alchemy/lists.scss | 8 - .../stylesheets/alchemy/node-select.scss | 43 + app/assets/stylesheets/alchemy/nodes.scss | 4 +- app/assets/stylesheets/alchemy/sitemap.scss | 84 +- .../alchemy/admin/attachments_controller.rb | 16 +- .../alchemy/admin/base_controller.rb | 23 +- .../alchemy/admin/clipboard_controller.rb | 8 +- .../alchemy/admin/contents_controller.rb | 2 +- .../alchemy/admin/dashboard_controller.rb | 18 +- .../alchemy/admin/elements_controller.rb | 40 +- .../admin/essence_pictures_controller.rb | 6 +- .../alchemy/admin/languages_controller.rb | 8 +- .../alchemy/admin/layoutpages_controller.rb | 2 +- .../alchemy/admin/nodes_controller.rb | 7 +- .../alchemy/admin/pages_controller.rb | 66 +- .../alchemy/admin/pictures_controller.rb | 28 +- .../alchemy/admin/resources_controller.rb | 29 +- .../alchemy/admin/sites_controller.rb | 4 +- .../alchemy/admin/tags_controller.rb | 6 +- .../alchemy/admin/trash_controller.rb | 12 +- .../alchemy/api/base_controller.rb | 4 +- .../alchemy/api/contents_controller.rb | 8 +- .../alchemy/api/elements_controller.rb | 16 +- .../alchemy/api/nodes_controller.rb | 38 +- .../alchemy/api/pages_controller.rb | 25 +- .../alchemy/attachments_controller.rb | 10 +- app/controllers/alchemy/base_controller.rb | 16 +- .../alchemy/messages_controller.rb | 28 +- app/controllers/alchemy/pages_controller.rb | 22 +- .../concerns/alchemy/admin/archive_overlay.rb | 4 +- .../alchemy/admin/current_language.rb | 2 +- .../alchemy/admin/uploader_responses.rb | 10 +- .../concerns/alchemy/legacy_page_redirects.rb | 8 +- .../concerns/alchemy/page_redirects.rb | 2 +- .../concerns/alchemy/site_redirects.rb | 2 +- app/decorators/alchemy/content_editor.rb | 10 +- app/decorators/alchemy/element_editor.rb | 16 +- .../alchemy/admin/attachments_helper.rb | 12 +- app/helpers/alchemy/admin/base_helper.rb | 70 +- app/helpers/alchemy/admin/contents_helper.rb | 6 +- app/helpers/alchemy/admin/elements_helper.rb | 4 +- app/helpers/alchemy/admin/essences_helper.rb | 8 +- app/helpers/alchemy/admin/form_helper.rb | 2 +- .../alchemy/admin/navigation_helper.rb | 46 +- app/helpers/alchemy/admin/pages_helper.rb | 24 +- app/helpers/alchemy/admin/pictures_helper.rb | 10 +- app/helpers/alchemy/admin/tags_helper.rb | 14 +- app/helpers/alchemy/base_helper.rb | 14 +- app/helpers/alchemy/elements_block_helper.rb | 4 +- app/helpers/alchemy/elements_helper.rb | 28 +- app/helpers/alchemy/pages_helper.rb | 44 +- app/helpers/alchemy/url_helper.rb | 2 +- app/mailers/alchemy/base_mailer.rb | 2 +- app/mailers/alchemy/messages_mailer.rb | 2 +- app/models/alchemy/attachment.rb | 20 +- app/models/alchemy/base_record.rb | 6 +- app/models/alchemy/content.rb | 50 +- app/models/alchemy/content/factory.rb | 10 +- app/models/alchemy/element.rb | 76 +- app/models/alchemy/element/definitions.rb | 6 +- .../alchemy/element/element_contents.rb | 12 +- .../alchemy/element/element_essences.rb | 6 +- app/models/alchemy/element/presenters.rb | 4 +- app/models/alchemy/element_to_page.rb | 2 +- app/models/alchemy/essence_boolean.rb | 4 +- app/models/alchemy/essence_date.rb | 4 +- app/models/alchemy/essence_file.rb | 6 +- app/models/alchemy/essence_html.rb | 4 +- app/models/alchemy/essence_link.rb | 4 +- app/models/alchemy/essence_node.rb | 18 + app/models/alchemy/essence_page.rb | 19 +- app/models/alchemy/essence_picture.rb | 14 +- app/models/alchemy/essence_picture_view.rb | 8 +- app/models/alchemy/essence_richtext.rb | 4 +- app/models/alchemy/essence_select.rb | 4 +- app/models/alchemy/essence_text.rb | 2 - app/models/alchemy/language.rb | 39 +- app/models/alchemy/language/code.rb | 8 +- app/models/alchemy/legacy_page_url.rb | 2 +- app/models/alchemy/message.rb | 6 +- app/models/alchemy/node.rb | 43 +- app/models/alchemy/page.rb | 162 +-- app/models/alchemy/page/fixed_attributes.rb | 3 +- app/models/alchemy/page/page_elements.rb | 76 +- app/models/alchemy/page/page_naming.rb | 77 +- app/models/alchemy/page/page_natures.rb | 15 +- app/models/alchemy/page/page_scopes.rb | 52 +- app/models/alchemy/page/url_path.rb | 64 + app/models/alchemy/picture.rb | 68 +- app/models/alchemy/picture/preprocessor.rb | 26 + app/models/alchemy/picture/transformations.rb | 14 +- app/models/alchemy/picture/url.rb | 8 +- app/models/alchemy/site/layout.rb | 4 +- .../concerns/alchemy/content_touching.rb | 24 - app/models/concerns/alchemy/touch_elements.rb | 24 + app/serializers/alchemy/content_serializer.rb | 3 - .../alchemy/essence_boolean_serializer.rb | 6 +- .../alchemy/essence_date_serializer.rb | 6 +- .../alchemy/essence_file_serializer.rb | 6 +- .../alchemy/essence_html_serializer.rb | 6 +- .../alchemy/essence_link_serializer.rb | 6 +- .../alchemy/essence_picture_serializer.rb | 8 +- .../alchemy/essence_richtext_serializer.rb | 6 +- .../alchemy/essence_select_serializer.rb | 6 +- .../alchemy/essence_text_serializer.rb | 8 +- .../alchemy/legacy_element_serializer.rb | 15 - app/serializers/alchemy/node_serializer.rb | 2 + app/serializers/alchemy/page_serializer.rb | 3 +- .../alchemy/page_tree_serializer.rb | 23 +- .../alchemy/admin/layoutpages/index.html.erb | 8 +- app/views/alchemy/admin/nodes/_form.html.erb | 37 +- app/views/alchemy/admin/nodes/_node.html.erb | 6 +- app/views/alchemy/admin/nodes/index.html.erb | 3 +- .../pages/_create_language_form.html.erb | 8 - app/views/alchemy/admin/pages/_form.html.erb | 3 +- .../alchemy/admin/pages/_menu_fields.html.erb | 33 - .../admin/pages/_new_page_form.html.erb | 1 + app/views/alchemy/admin/pages/_page.html.erb | 9 +- .../alchemy/admin/pages/_page_infos.html.erb | 4 - .../alchemy/admin/pages/_sitemap.html.erb | 6 + app/views/alchemy/admin/pages/edit.html.erb | 2 +- app/views/alchemy/admin/pages/info.html.erb | 6 +- app/views/alchemy/admin/pages/unlock.js.erb | 19 +- .../alchemy/admin/pictures/index.html.erb | 21 +- .../essences/_essence_node_editor.html.erb | 27 + .../essences/_essence_node_view.html.erb | 1 + .../essences/_essence_page_editor.html.erb | 2 +- app/views/alchemy/pages/show.rss.builder | 4 +- app/views/layouts/alchemy/admin.html.erb | 1 + babel.config.js | 12 + bin/rails | 8 +- config/alchemy/config.yml | 40 +- config/initializers/assets.rb | 2 +- config/initializers/dragonfly.rb | 2 +- config/initializers/mini_profiler.rb | 4 +- config/initializers/simple_form.rb | 12 +- config/locales/alchemy.en.yml | 22 +- config/routes.rb | 48 +- config/spring.rb | 4 +- .../20200226213334_alchemy_four_point_four.rb | 146 +- ...0423073425_create_alchemy_essence_nodes.rb | 11 + ...0200504210159_remove_site_id_from_nodes.rb | 28 + ...anguage_id_foreign_key_to_alchemy_pages.rb | 8 + ...11113603_add_menu_type_to_alchemy_nodes.rb | 27 + ...4091507_make_page_layoutpage_null_false.rb | 6 + ...73500_remove_visible_from_alchemy_pages.rb | 24 + lib/alchemy/admin/locale.rb | 2 +- lib/alchemy/admin/preview_url.rb | 85 ++ lib/alchemy/auth_accessors.rb | 14 +- lib/alchemy/cache_digests/template_tracker.rb | 8 +- lib/alchemy/config.rb | 27 +- lib/alchemy/configuration_methods.rb | 1 + lib/alchemy/controller_actions.rb | 2 +- lib/alchemy/deprecation.rb | 2 +- lib/alchemy/elements_finder.rb | 10 +- lib/alchemy/engine.rb | 24 +- lib/alchemy/essence.rb | 30 +- lib/alchemy/filetypes.rb | 10 +- lib/alchemy/forms/builder.rb | 8 +- lib/alchemy/hints.rb | 2 +- lib/alchemy/i18n.rb | 2 +- lib/alchemy/modules.rb | 24 +- lib/alchemy/name_conversions.rb | 10 +- lib/alchemy/page_layout.rb | 23 +- lib/alchemy/paths.rb | 2 +- lib/alchemy/permissions.rb | 12 +- lib/alchemy/resource.rb | 26 +- lib/alchemy/resources_helper.rb | 24 +- lib/alchemy/routing_constraints.rb | 2 +- lib/alchemy/seeder.rb | 39 +- lib/alchemy/shell.rb | 10 +- lib/alchemy/ssl_protection.rb | 32 - lib/alchemy/tasks/tidy.rb | 6 +- .../test_support/essence_shared_examples.rb | 144 +- .../factories/attachment_factory.rb | 10 +- .../test_support/factories/content_factory.rb | 12 +- .../factories/dummy_user_factory.rb | 14 +- .../test_support/factories/element_factory.rb | 18 +- .../factories/essence_file_factory.rb | 6 +- .../factories/essence_page_factory.rb | 6 +- .../factories/essence_picture_factory.rb | 8 +- .../factories/essence_text_factory.rb | 6 +- .../factories/language_factory.rb | 31 +- .../test_support/factories/node_factory.rb | 14 +- .../test_support/factories/page_factory.rb | 42 +- .../test_support/factories/picture_factory.rb | 10 +- .../test_support/factories/site_factory.rb | 12 +- lib/alchemy/test_support/shared_contexts.rb | 8 +- .../test_support/shared_uploader_examples.rb | 6 +- lib/alchemy/tinymce.rb | 26 +- lib/alchemy/upgrader.rb | 12 +- lib/alchemy/upgrader/five_point_zero.rb | 33 +- lib/alchemy/upgrader/four_point_four.rb | 52 - .../upgrader/tasks/element_views_updater.rb | 8 +- .../tasks/harden_gutentag_migrations.rb | 6 +- lib/alchemy/version.rb | 2 +- lib/alchemy_cms.rb | 101 +- lib/{rails => }/generators/alchemy/base.rb | 8 +- .../alchemy/elements/elements_generator.rb | 21 +- .../alchemy/elements/templates/view.html.erb | 0 .../alchemy/elements/templates/view.html.haml | 0 .../alchemy/elements/templates/view.html.slim | 0 .../alchemy/essence/essence_generator.rb | 6 +- .../alchemy/essence/templates/editor.html.erb | 0 .../alchemy/essence/templates/view.html.erb | 0 .../alchemy/install/files/_article.html.erb | 0 .../alchemy/install/files/_standard.html.erb | 0 .../alchemy/install/files/alchemy.en.yml | 0 .../alchemy/install/files/alchemy_admin.js | 1 + .../generators/alchemy/install/files/all.css | 0 .../generators/alchemy/install/files/all.js | 0 .../install/files/application.html.erb | 0 .../alchemy/install/files/article.scss | 0 .../alchemy/install/install_generator.rb | 110 ++ .../alchemy/install/templates/dragonfly.rb.tt | 0 .../alchemy/install/templates/elements.yml.tt | 0 .../alchemy/install/templates/menus.yml.tt | 0 .../install/templates/page_layouts.yml.tt | 0 .../alchemy/menus/menus_generator.rb | 4 +- .../alchemy/menus/templates/node.html.erb | 5 +- .../alchemy/menus/templates/node.html.haml | 5 +- .../alchemy/menus/templates/node.html.slim | 5 +- .../alchemy/menus/templates/wrapper.html.erb | 2 +- .../alchemy/menus/templates/wrapper.html.haml | 2 +- .../alchemy/menus/templates/wrapper.html.slim | 2 +- .../alchemy/module/module_generator.rb | 4 +- .../alchemy/module/templates/ability.rb.tt | 0 .../alchemy/module/templates/controller.rb.tt | 0 .../module/templates/module_config.rb.tt | 0 .../page_layouts/page_layouts_generator.rb | 6 +- .../page_layouts/templates/layout.html.erb | 0 .../page_layouts/templates/layout.html.haml | 0 .../page_layouts/templates/layout.html.slim | 0 .../site_layouts/site_layouts_generator.rb | 4 +- .../site_layouts/templates/layout.html.erb | 0 .../site_layouts/templates/layout.html.haml | 0 .../site_layouts/templates/layout.html.slim | 0 .../alchemy/views/views_generator.rb | 12 +- .../alchemy/install/install_generator.rb | 65 - lib/tasks/alchemy/convert.rake | 38 - lib/tasks/alchemy/db.rake | 3 +- lib/tasks/alchemy/install.rake | 4 +- lib/tasks/alchemy/tidy.rake | 16 +- lib/tasks/alchemy/upgrade.rake | 46 +- package.json | 45 + package/admin.js | 14 + package/src/__tests__/i18n.spec.js | 70 + package/src/i18n.js | 48 + package/src/node_tree.js | 72 + package/src/translations.js | 32 + package/src/utils/__tests__/ajax.spec.js | 124 ++ package/src/utils/__tests__/events.spec.js | 38 + package/src/utils/ajax.js | 48 + package/src/utils/events.js | 16 + .../admin/attachments_controller_spec.rb | 106 +- .../alchemy/admin/base_controller_spec.rb | 38 +- .../admin/clipboard_controller_spec.rb | 48 +- .../admin/dashboard_controller_spec.rb | 46 +- .../alchemy/admin/elements_controller_spec.rb | 74 +- .../admin/essence_files_controller_spec.rb | 62 +- .../admin/essence_pictures_controller_spec.rb | 136 +- .../admin/languages_controller_spec.rb | 58 +- .../admin/layoutpages_controller_spec.rb | 28 +- .../alchemy/admin/nodes_controller_spec.rb | 40 +- .../alchemy/admin/pictures_controller_spec.rb | 184 +-- .../admin/resources_controller_spec.rb | 75 +- .../alchemy/admin/sites_controller_spec.rb | 28 +- .../alchemy/admin/tags_controller_spec.rb | 30 +- .../alchemy/admin/translations_spec.rb | 24 +- .../alchemy/admin/trash_controller_spec.rb | 2 +- .../alchemy/api/contents_controller_spec.rb | 62 +- .../alchemy/api/elements_controller_spec.rb | 78 +- .../alchemy/api/pages_controller_spec.rb | 225 +-- .../alchemy/attachments_controller_spec.rb | 16 +- .../alchemy/base_controller_spec.rb | 20 +- .../alchemy/elements_controller_spec.rb | 8 +- .../alchemy/messages_controller_spec.rb | 80 +- .../alchemy/on_page_layout_mixin_spec.rb | 88 +- .../alchemy/pages_controller_spec.rb | 145 +- .../decorators/alchemy/content_editor_spec.rb | 32 +- .../decorators/alchemy/element_editor_spec.rb | 50 +- spec/dummy/Rakefile | 2 +- .../dummy/app/controllers/login_controller.rb | 2 +- spec/dummy/app/models/dummy_model.rb | 2 +- spec/dummy/app/models/dummy_user.rb | 2 +- spec/dummy/app/models/event.rb | 12 +- .../app/views/alchemy/elements/_menu.html.erb | 5 + .../menus/footer_navigation/_node.html.erb | 5 +- .../menus/footer_navigation/_wrapper.html.erb | 4 +- .../_node.html.erb | 5 +- .../alchemy/menus/main_menu/_wrapper.html.erb | 6 + .../menus/main_navigation/_wrapper.html.erb | 6 - .../app/views/layouts/application.html.erb | 6 +- spec/dummy/bin/bundle | 4 +- spec/dummy/bin/rails | 6 +- spec/dummy/bin/rake | 4 +- spec/dummy/bin/setup | 16 +- spec/dummy/bin/update | 16 +- spec/dummy/config.ru | 2 +- spec/dummy/config/alchemy/elements.yml | 5 + spec/dummy/config/alchemy/page_layouts.yml | 3 +- .../initializers/content_security_policy.rb | 23 +- ...0423073425_create_alchemy_essence_nodes.rb | 1 + ...0200504210159_remove_site_id_from_nodes.rb | 1 + ...anguage_id_foreign_key_to_alchemy_pages.rb | 1 + ...11113603_add_menu_type_to_alchemy_nodes.rb | 1 + ...4091507_make_page_layoutpage_null_false.rb | 1 + ...73500_remove_visible_from_alchemy_pages.rb | 1 + spec/dummy/db/schema.rb | 107 +- .../assets/javascripts/alchemy/admin/all.js | 2 +- .../assets/stylesheets/alchemy/admin/all.css | 2 +- spec/factories.rb | 8 +- spec/features/admin/admin_layout_spec.rb | 8 +- .../attachment_assignment_overlay_spec.rb | 2 +- spec/features/admin/dashboard_spec.rb | 34 +- .../admin/edit_elements_feature_spec.rb | 18 +- .../admin/language_tree_feature_spec.rb | 32 +- .../features/admin/languages_features_spec.rb | 50 +- .../admin/legacy_page_url_management_spec.rb | 50 +- spec/features/admin/link_overlay_spec.rb | 28 +- .../admin/locale_select_feature_spec.rb | 26 +- .../admin/locked_page_feature_spec.rb | 18 +- spec/features/admin/menus_features_spec.rb | 28 +- .../admin/modules_integration_spec.rb | 12 +- .../features/admin/navigation_feature_spec.rb | 18 +- .../admin/page_creation_feature_spec.rb | 20 +- .../admin/page_destroy_feature_spec.rb | 14 +- .../admin/page_editing_feature_spec.rb | 109 +- .../admin/page_sorting_feature_spec.rb | 12 +- .../admin/picture_assignment_overlay_spec.rb | 6 +- .../admin/picture_library_integration_spec.rb | 36 +- .../admin/resources_integration_spec.rb | 54 +- .../admin/site_select_feature_spec.rb | 22 +- spec/features/admin/tinymce_feature_spec.rb | 14 +- spec/features/navigation_spec.rb | 2 +- spec/features/page_feature_spec.rb | 70 +- spec/features/page_redirects_spec.rb | 73 +- spec/features/page_seeder_spec.rb | 38 +- spec/features/security_spec.rb | 18 +- spec/features/user_seeder_spec.rb | 20 +- .../alchemy/admin/attachments_helper_spec.rb | 10 +- .../helpers/alchemy/admin/base_helper_spec.rb | 86 +- .../alchemy/admin/contents_helper_spec.rb | 32 +- .../alchemy/admin/elements_helper_spec.rb | 18 +- .../alchemy/admin/essences_helper_spec.rb | 16 +- .../alchemy/admin/navigation_helper_spec.rb | 168 +-- .../alchemy/admin/pages_helper_spec.rb | 24 +- .../alchemy/admin/pictures_helper_spec.rb | 12 +- .../helpers/alchemy/admin/tags_helper_spec.rb | 34 +- spec/helpers/alchemy/base_helper_spec.rb | 70 +- .../alchemy/elements_block_helper_spec.rb | 40 +- spec/helpers/alchemy/elements_helper_spec.rb | 64 +- spec/helpers/alchemy/pages_helper_spec.rb | 108 +- spec/helpers/alchemy/url_helper_spec.rb | 44 +- spec/libraries/admin/preview_url_spec.rb | 140 ++ spec/libraries/auth_accessors_spec.rb | 30 +- spec/libraries/config_spec.rb | 91 +- spec/libraries/configuration_methods_spec.rb | 26 +- spec/libraries/controller_actions_spec.rb | 18 +- spec/libraries/elements_finder_spec.rb | 116 +- spec/libraries/i18n_spec.rb | 40 +- .../scoped_pagination_url_helper_spec.rb | 6 +- spec/libraries/logger_spec.rb | 10 +- spec/libraries/modules_spec.rb | 64 +- spec/libraries/page_layout_spec.rb | 64 +- spec/libraries/paths_spec.rb | 12 +- spec/libraries/permissions_spec.rb | 56 +- spec/libraries/resource_spec.rb | 76 +- spec/libraries/resources_helper_spec.rb | 88 +- spec/libraries/shell_spec.rb | 42 +- spec/libraries/template_tracker_spec.rb | 54 +- spec/libraries/tinymce_spec.rb | 70 +- spec/libraries/userstamp_spec.rb | 6 +- spec/mailers/alchemy/messages_mailer_spec.rb | 10 +- spec/models/alchemy/attachment_spec.rb | 116 +- spec/models/alchemy/content_spec.rb | 207 ++- spec/models/alchemy/element_spec.rb | 382 +++--- spec/models/alchemy/element_to_page_spec.rb | 6 +- spec/models/alchemy/essence_boolean_spec.rb | 2 +- spec/models/alchemy/essence_date_spec.rb | 4 +- spec/models/alchemy/essence_file_spec.rb | 10 +- spec/models/alchemy/essence_html_spec.rb | 10 +- spec/models/alchemy/essence_link_spec.rb | 4 +- spec/models/alchemy/essence_node_spec.rb | 23 + spec/models/alchemy/essence_page_spec.rb | 46 +- spec/models/alchemy/essence_picture_spec.rb | 118 +- .../alchemy/essence_picture_view_spec.rb | 90 +- spec/models/alchemy/essence_richtext_spec.rb | 8 +- spec/models/alchemy/essence_select_spec.rb | 4 +- spec/models/alchemy/essence_text_spec.rb | 52 +- spec/models/alchemy/folded_page_spec.rb | 2 +- spec/models/alchemy/language_spec.rb | 121 +- spec/models/alchemy/legacy_page_url_spec.rb | 10 +- spec/models/alchemy/message_spec.rb | 18 +- spec/models/alchemy/node_spec.rb | 103 +- .../alchemy/page/fixed_attributes_spec.rb | 58 +- spec/models/alchemy/page/url_path_spec.rb | 68 + spec/models/alchemy/page_spec.rb | 1202 +++++++---------- spec/models/alchemy/picture_spec.rb | 188 +-- spec/models/alchemy/picture_url_spec.rb | 80 +- spec/models/alchemy/site_spec.rb | 88 +- spec/models/alchemy/tag_spec.rb | 18 +- spec/models/dummy_model_spec.rb | 4 +- spec/rails_helper.rb | 50 +- .../alchemy/admin/contents_controller_spec.rb | 10 +- .../alchemy/admin/pages_controller_spec.rb | 381 +++--- .../alchemy/admin/resources_requests_spec.rb | 28 +- .../alchemy/admin/site_requests_spec.rb | 12 +- .../alchemy/api/nodes_controller_spec.rb | 101 +- .../alchemy/legacy_page_redirecting_spec.rb | 28 +- .../alchemy/page_request_caching_spec.rb | 38 +- spec/requests/alchemy/site_requests_spec.rb | 10 +- spec/requests/alchemy/sitemap_spec.rb | 48 +- spec/routing/api_routing_spec.rb | 46 +- spec/routing/routing_spec.rb | 90 +- .../alchemy/element_serializer_spec.rb | 28 +- .../alchemy/node_serializer_spec.rb | 17 +- spec/spec_helper.rb | 12 +- spec/support/capybara_helpers.rb | 18 +- spec/support/custom_news_elements_finder.rb | 2 +- spec/support/hint_examples.rb | 18 +- spec/support/transformation_examples.rb | 30 +- spec/views/admin/pictures/show_spec.rb | 12 +- .../admin/elements/element_view_spec.rb | 32 +- .../_main_navigation_entry.html.erb_spec.rb | 36 +- .../essences/essence_boolean_editor_spec.rb | 24 +- .../essences/essence_boolean_view_spec.rb | 16 +- .../essences/essence_date_editor_spec.rb | 6 +- spec/views/essences/essence_date_view_spec.rb | 20 +- .../essences/essence_file_editor_spec.rb | 28 +- spec/views/essences/essence_file_view_spec.rb | 36 +- spec/views/essences/essence_html_view_spec.rb | 10 +- .../essences/essence_link_editor_spec.rb | 8 +- spec/views/essences/essence_link_view_spec.rb | 18 +- .../essences/essence_page_editor_spec.rb | 10 +- spec/views/essences/essence_page_view_spec.rb | 12 +- .../essences/essence_picture_editor_spec.rb | 32 +- .../essences/essence_richtext_view_spec.rb | 22 +- .../essences/essence_select_editor_spec.rb | 18 +- .../essences/essence_select_view_spec.rb | 8 +- .../essences/essence_text_editor_spec.rb | 18 +- spec/views/essences/essence_text_view_spec.rb | 34 +- spec/views/pages/meta_data_spec.rb | 10 +- vendor/assets/fonts/fa-regular-400.eot | Bin 34390 -> 34390 bytes vendor/assets/fonts/fa-regular-400.svg | 4 +- vendor/assets/fonts/fa-regular-400.ttf | Bin 34092 -> 34092 bytes vendor/assets/fonts/fa-regular-400.woff | Bin 16800 -> 16800 bytes vendor/assets/fonts/fa-regular-400.woff2 | Bin 13600 -> 13584 bytes vendor/assets/fonts/fa-solid-900.eot | Bin 194078 -> 202902 bytes vendor/assets/fonts/fa-solid-900.svg | 244 +++- vendor/assets/fonts/fa-solid-900.ttf | Bin 193792 -> 202616 bytes vendor/assets/fonts/fa-solid-900.woff | Bin 99004 -> 103300 bytes vendor/assets/fonts/fa-solid-900.woff2 | Bin 76120 -> 79444 bytes .../javascripts/sortable/Sortable.min.js | 2 - .../stylesheets/fontawesome/_icons.scss | 31 + .../stylesheets/fontawesome/_variables.scss | 35 +- .../stylesheets/fontawesome/fontawesome.scss | 2 +- .../stylesheets/fontawesome/regular.scss | 14 +- .../assets/stylesheets/fontawesome/solid.scss | 2 +- 485 files changed, 7726 insertions(+), 6718 deletions(-) create mode 100644 .prettierrc delete mode 100644 app/assets/javascripts/alchemy/alchemy.i18n.js.coffee delete mode 100644 app/assets/javascripts/alchemy/alchemy.node_tree.js delete mode 100644 app/assets/javascripts/alchemy/alchemy.translations.js.coffee delete mode 100644 app/assets/javascripts/alchemy/alchemy.utils.js create mode 100644 app/assets/javascripts/alchemy/node_select.js create mode 100644 app/assets/javascripts/alchemy/templates/node.hbs create mode 100644 app/assets/stylesheets/alchemy/node-select.scss create mode 100644 app/models/alchemy/essence_node.rb create mode 100644 app/models/alchemy/page/url_path.rb create mode 100644 app/models/alchemy/picture/preprocessor.rb delete mode 100644 app/models/concerns/alchemy/content_touching.rb create mode 100644 app/models/concerns/alchemy/touch_elements.rb delete mode 100644 app/serializers/alchemy/legacy_element_serializer.rb delete mode 100644 app/views/alchemy/admin/pages/_menu_fields.html.erb create mode 100644 app/views/alchemy/essences/_essence_node_editor.html.erb create mode 100644 app/views/alchemy/essences/_essence_node_view.html.erb create mode 100644 babel.config.js create mode 100644 db/migrate/20200423073425_create_alchemy_essence_nodes.rb create mode 100644 db/migrate/20200504210159_remove_site_id_from_nodes.rb create mode 100644 db/migrate/20200505215518_add_language_id_foreign_key_to_alchemy_pages.rb create mode 100644 db/migrate/20200511113603_add_menu_type_to_alchemy_nodes.rb create mode 100644 db/migrate/20200514091507_make_page_layoutpage_null_false.rb create mode 100644 db/migrate/20200519073500_remove_visible_from_alchemy_pages.rb create mode 100644 lib/alchemy/admin/preview_url.rb delete mode 100644 lib/alchemy/ssl_protection.rb delete mode 100644 lib/alchemy/upgrader/four_point_four.rb rename lib/{rails => }/generators/alchemy/base.rb (83%) rename lib/{rails => }/generators/alchemy/elements/elements_generator.rb (56%) rename lib/{rails => }/generators/alchemy/elements/templates/view.html.erb (100%) rename lib/{rails => }/generators/alchemy/elements/templates/view.html.haml (100%) rename lib/{rails => }/generators/alchemy/elements/templates/view.html.slim (100%) rename lib/{rails => }/generators/alchemy/essence/essence_generator.rb (93%) rename lib/{rails => }/generators/alchemy/essence/templates/editor.html.erb (100%) rename lib/{rails => }/generators/alchemy/essence/templates/view.html.erb (100%) rename lib/{rails => }/generators/alchemy/install/files/_article.html.erb (100%) rename lib/{rails => }/generators/alchemy/install/files/_standard.html.erb (100%) rename lib/{rails => }/generators/alchemy/install/files/alchemy.en.yml (100%) create mode 100644 lib/generators/alchemy/install/files/alchemy_admin.js rename lib/{rails => }/generators/alchemy/install/files/all.css (100%) rename lib/{rails => }/generators/alchemy/install/files/all.js (100%) rename lib/{rails => }/generators/alchemy/install/files/application.html.erb (100%) rename lib/{rails => }/generators/alchemy/install/files/article.scss (100%) create mode 100644 lib/generators/alchemy/install/install_generator.rb rename lib/{rails => }/generators/alchemy/install/templates/dragonfly.rb.tt (100%) rename lib/{rails => }/generators/alchemy/install/templates/elements.yml.tt (100%) rename lib/{rails => }/generators/alchemy/install/templates/menus.yml.tt (100%) rename lib/{rails => }/generators/alchemy/install/templates/page_layouts.yml.tt (100%) rename lib/{rails => }/generators/alchemy/menus/menus_generator.rb (88%) rename lib/{rails => }/generators/alchemy/menus/templates/node.html.erb (74%) rename lib/{rails => }/generators/alchemy/menus/templates/node.html.haml (71%) rename lib/{rails => }/generators/alchemy/menus/templates/node.html.slim (70%) rename lib/{rails => }/generators/alchemy/menus/templates/wrapper.html.erb (76%) rename lib/{rails => }/generators/alchemy/menus/templates/wrapper.html.haml (73%) rename lib/{rails => }/generators/alchemy/menus/templates/wrapper.html.slim (73%) rename lib/{rails => }/generators/alchemy/module/module_generator.rb (92%) rename lib/{rails => }/generators/alchemy/module/templates/ability.rb.tt (100%) rename lib/{rails => }/generators/alchemy/module/templates/controller.rb.tt (100%) rename lib/{rails => }/generators/alchemy/module/templates/module_config.rb.tt (100%) rename lib/{rails => }/generators/alchemy/page_layouts/page_layouts_generator.rb (81%) rename lib/{rails => }/generators/alchemy/page_layouts/templates/layout.html.erb (100%) rename lib/{rails => }/generators/alchemy/page_layouts/templates/layout.html.haml (100%) rename lib/{rails => }/generators/alchemy/page_layouts/templates/layout.html.slim (100%) rename lib/{rails => }/generators/alchemy/site_layouts/site_layouts_generator.rb (88%) rename lib/{rails => }/generators/alchemy/site_layouts/templates/layout.html.erb (100%) rename lib/{rails => }/generators/alchemy/site_layouts/templates/layout.html.haml (100%) rename lib/{rails => }/generators/alchemy/site_layouts/templates/layout.html.slim (100%) rename lib/{rails => }/generators/alchemy/views/views_generator.rb (77%) delete mode 100644 lib/rails/generators/alchemy/install/install_generator.rb delete mode 100644 lib/tasks/alchemy/convert.rake create mode 100644 package.json create mode 100644 package/admin.js create mode 100644 package/src/__tests__/i18n.spec.js create mode 100644 package/src/i18n.js create mode 100644 package/src/node_tree.js create mode 100644 package/src/translations.js create mode 100644 package/src/utils/__tests__/ajax.spec.js create mode 100644 package/src/utils/__tests__/events.spec.js create mode 100644 package/src/utils/ajax.js create mode 100644 package/src/utils/events.js create mode 100644 spec/dummy/app/views/alchemy/elements/_menu.html.erb rename spec/dummy/app/views/alchemy/menus/{main_navigation => main_menu}/_node.html.erb (72%) create mode 100644 spec/dummy/app/views/alchemy/menus/main_menu/_wrapper.html.erb delete mode 100644 spec/dummy/app/views/alchemy/menus/main_navigation/_wrapper.html.erb create mode 120000 spec/dummy/db/migrate/20200423073425_create_alchemy_essence_nodes.rb create mode 120000 spec/dummy/db/migrate/20200504210159_remove_site_id_from_nodes.rb create mode 120000 spec/dummy/db/migrate/20200505215518_add_language_id_foreign_key_to_alchemy_pages.rb create mode 120000 spec/dummy/db/migrate/20200511113603_add_menu_type_to_alchemy_nodes.rb create mode 120000 spec/dummy/db/migrate/20200514091507_make_page_layoutpage_null_false.rb create mode 120000 spec/dummy/db/migrate/20200519073500_remove_visible_from_alchemy_pages.rb create mode 100644 spec/libraries/admin/preview_url_spec.rb create mode 100644 spec/models/alchemy/essence_node_spec.rb create mode 100644 spec/models/alchemy/page/url_path_spec.rb delete mode 100644 vendor/assets/javascripts/sortable/Sortable.min.js diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e99baefce..5e176f7325 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,7 @@ jobs: MYSQL_PASSWORD: password MYSQL_DATABASE: alchemy_cms_dummy_test MYSQL_ROOT_PASSWORD: password - options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3 + options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5 steps: - uses: actions/checkout@v1 - name: Set up Ruby @@ -60,15 +60,15 @@ jobs: if: matrix.database == 'postgresql' run: | mkdir -p /home/runner/apt/cache - sudo apt-get update -qq - sudo apt-get install -qq --fix-missing libpq-dev -o dir::cache::archives="/home/runner/apt/cache" + sudo apt update -qq + sudo apt install -qq --fix-missing libpq-dev -o dir::cache::archives="/home/runner/apt/cache" sudo chown -R runner /home/runner/apt/cache - name: Install MySQL headers if: matrix.database == 'mysql' run: | mkdir -p /home/runner/apt/cache - sudo apt-get update -qq - sudo apt-get install -qq --fix-missing libmysqlclient-dev -o dir::cache::archives="/home/runner/apt/cache" + sudo apt update -qq + sudo apt install -qq --fix-missing libmysqlclient-dev -o dir::cache::archives="/home/runner/apt/cache" sudo chown -R runner /home/runner/apt/cache - name: Install bundler run: | @@ -85,11 +85,19 @@ jobs: timeout-minutes: 10 run: | bundle install --jobs 4 --retry 3 --path vendor/bundle + - name: Restore node modules cache + id: yarn-cache + uses: actions/cache@preview + with: + path: spec/dummy/node_modules + key: ${{ runner.os }}-yarn-dummy-${{ hashFiles('./package.json') }} + restore-keys: | + ${{ runner.os }}-yarn-dummy- - name: Prepare database run: | bundle exec rake alchemy:spec:prepare - name: Run tests & publish code coverage - uses: paambaati/codeclimate-action@v2.5.5 + uses: paambaati/codeclimate-action@v2.5.7 env: CC_TEST_REPORTER_ID: bca4349e32f97919210ac8a450b04904b90683fcdd57d65a22c0f5065482bc22 with: @@ -99,3 +107,28 @@ jobs: with: name: Screenshots path: spec/dummy/tmp/screenshots + Jest: + runs-on: ubuntu-latest + env: + NODE_ENV: test + steps: + - uses: actions/checkout@v1 + - name: Restore node modules cache + uses: actions/cache@preview + with: + path: node_modules + key: ${{ runner.os }}-yarn-${{ hashFiles('./package.json') }} + restore-keys: | + ${{ runner.os }}-yarn- + - name: Install yarn + run: yarn install + - name: Run jest + run: yarn jest + - name: Run jest & publish code coverage + uses: paambaati/codeclimate-action@v2.5.7 + env: + CC_TEST_REPORTER_ID: bca4349e32f97919210ac8a450b04904b90683fcdd57d65a22c0f5065482bc22 + with: + coverageLocations: + ./coverage/lcov.info:lcov + coverageCommand: yarn jest --collectCoverage --coverageDirectory=coverage diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 75f22b4762..262e51d5a9 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -13,5 +13,5 @@ jobs: - uses: actions/stale@v1 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - stale-issue-message: 'This issue has not seen any activity in a long time. If the issue descriped still exists in recent versions of Alchemy, please open a new issue or preferably open a PR with a fix. Thanks for reporting.' + stale-issue-message: 'This issue has not seen any activity in a long time. If the issue described still exists in recent versions of Alchemy, please open a new issue or preferably open a PR with a fix. Thanks for reporting.' stale-pr-message: 'This pull request has not seen any activiy in a long time. Probably because of missing tests or a necessary rebase. Please open a new PR to latest master if you want to continue working on this. Thanks for the contribution.' diff --git a/.gitignore b/.gitignore index 3a28ffe484..a49a90c1cb 100644 --- a/.gitignore +++ b/.gitignore @@ -9,9 +9,22 @@ pkg tmp log .sass-cache -spec/dummy/uploads/ +spec/dummy/.browserslistrc +spec/dummy/app/assets/stylesheets/alchemy/ +spec/dummy/app/javascript/ +spec/dummy/babel.config.js +spec/dummy/bin/webpack +spec/dummy/bin/webpack-dev-server +spec/dummy/config/alchemy/config.yml +spec/dummy/config/webpack/ +spec/dummy/config/webpacker.yml spec/dummy/db/*.sqlite3* -spec/dummy/public/assets +spec/dummy/package.json +spec/dummy/postcss.config.js +spec/dummy/public/assets/ +spec/dummy/public/packs/ +spec/dummy/public/packs-test/ +spec/dummy/uploads/ .rvmrc /coverage/ *.gem @@ -22,3 +35,8 @@ spec/dummy/public/assets .ruby-version .env .rspec +node_modules +yarn-error.log +yarn-debug.log* +.yarn-integrity +yarn.lock diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000000..348cb46f7b --- /dev/null +++ b/.prettierrc @@ -0,0 +1,6 @@ +{ + "semi": false, + "trailingComma": "none", + "vueIndentScriptAndStyle": true, + "arrowParens": "always" +} diff --git a/.rubocop.yml b/.rubocop.yml index 076dc5c8a0..05dd2cc324 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,7 +1,7 @@ # Relaxed.Ruby.Style AllCops: - TargetRubyVersion: 2.3 + TargetRubyVersion: 2.4 Exclude: - 'bin/rspec' - 'vendor/**/*' @@ -9,6 +9,7 @@ AllCops: - 'spec/dummy/config/**/*' - 'alchemy_cms.gemspec' - 'Rakefile' + - 'node_modules/**/*' # Really, rubocop? Bundler/OrderedGems: @@ -220,8 +221,19 @@ Style/SpecialGlobalVars: StyleGuide: http://relaxed.ruby.style/#stylespecialglobalvars Style/StringLiterals: + EnforcedStyle: double_quotes + +Style/StringLiteralsInInterpolation: + EnforcedStyle: double_quotes + +Style/TrailingCommaInArguments: Enabled: false - StyleGuide: http://relaxed.ruby.style/#stylestringliterals + +Style/TrailingCommaInArrayLiteral: + EnforcedStyleForMultiline: comma + +Style/TrailingCommaInHashLiteral: + EnforcedStyleForMultiline: consistent_comma Style/WhileUntilModifier: Enabled: false diff --git a/CHANGELOG.md b/CHANGELOG.md index f9002419dc..0e62bef2de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,74 @@ ## 5.0.0 (unreleased) +- Language Factory: Create default language in host app's locale [#1884](https://github.com/AlchemyCMS/alchemy_cms/pull/1884) ([mamhoff](https://github.com/mamhoff)) +- Respect filter and tagging params in picture archive size buttons [#1880](https://github.com/AlchemyCMS/alchemy_cms/pull/1880) ([tvdeyen](https://github.com/tvdeyen)) +- Extract picture thumbnail sizes in a constant [#1879](https://github.com/AlchemyCMS/alchemy_cms/pull/1879) ([tvdeyen](https://github.com/tvdeyen)) +- Configurable Image Preprocessor [#1878](https://github.com/AlchemyCMS/alchemy_cms/pull/1878) ([tvdeyen](https://github.com/tvdeyen)) +- Configure edit page preview per site [#1877](https://github.com/AlchemyCMS/alchemy_cms/pull/1877) ([tvdeyen](https://github.com/tvdeyen)) +- Fix Page tree sorting after root page removal [#1876](https://github.com/AlchemyCMS/alchemy_cms/pull/1876) ([tvdeyen](https://github.com/tvdeyen)) +- 5.0 Upgrader fixes [#1874](https://github.com/AlchemyCMS/alchemy_cms/pull/1874) ([tvdeyen](https://github.com/tvdeyen)) +- Remove url_nesting config [#1872](https://github.com/AlchemyCMS/alchemy_cms/pull/1872) ([tvdeyen](https://github.com/tvdeyen)) +- [ruby] Upgrade sassc to version 2.4.0 [#1871](https://github.com/AlchemyCMS/alchemy_cms/pull/1871) ([depfu](https://github.com/apps/depfu)) +- fix GitHub Actions spelling [#1869](https://github.com/AlchemyCMS/alchemy_cms/pull/1869) ([alexanderadam](https://github.com/alexanderadam)) +- Remove Page#visible [#1868](https://github.com/AlchemyCMS/alchemy_cms/pull/1868) ([tvdeyen](https://github.com/tvdeyen)) +- 4.6 backports for master [#1867](https://github.com/AlchemyCMS/alchemy_cms/pull/1867) ([tvdeyen](https://github.com/tvdeyen)) +- Use apt update instead of apt-get in GH action [#1866](https://github.com/AlchemyCMS/alchemy_cms/pull/1866) ([tvdeyen](https://github.com/tvdeyen)) +- [ruby] Upgrade rubocop to version 0.85.0 [#1863](https://github.com/AlchemyCMS/alchemy_cms/pull/1863) ([depfu](https://github.com/apps/depfu)) +- Remove active_record_5_1? method [#1854](https://github.com/AlchemyCMS/alchemy_cms/pull/1854) ([tvdeyen](https://github.com/tvdeyen)) +- Use Alchemy npm package instead of hacking webpacker [#1853](https://github.com/AlchemyCMS/alchemy_cms/pull/1853) ([tvdeyen](https://github.com/tvdeyen)) +- Fix node select ES5 syntax [#1851](https://github.com/AlchemyCMS/alchemy_cms/pull/1851) ([tvdeyen](https://github.com/tvdeyen)) +- Run yarn:install after installing webpacker in install generator [#1850](https://github.com/AlchemyCMS/alchemy_cms/pull/1850) ([mamhoff](https://github.com/mamhoff)) +- Remove male sign after emoji [#1849](https://github.com/AlchemyCMS/alchemy_cms/pull/1849) ([mamhoff](https://github.com/mamhoff)) +- Do not use ES6 Syntax in Node Selector [#1846](https://github.com/AlchemyCMS/alchemy_cms/pull/1846) ([mamhoff](https://github.com/mamhoff)) +- [ruby] Upgrade rubocop to version 0.84.0 [#1845](https://github.com/AlchemyCMS/alchemy_cms/pull/1845) ([depfu](https://github.com/apps/depfu)) +- Always create nested urls [#1844](https://github.com/AlchemyCMS/alchemy_cms/pull/1844) ([tvdeyen](https://github.com/tvdeyen)) +- Fix: Add indifferent access to default options in encoded_image [#1840](https://github.com/AlchemyCMS/alchemy_cms/pull/1840) ([mickenorlen](https://github.com/mickenorlen)) +- Set proper nested set scope on page [#1837](https://github.com/AlchemyCMS/alchemy_cms/pull/1837) ([tvdeyen](https://github.com/tvdeyen)) +- Install Webpacker in install generator [#1835](https://github.com/AlchemyCMS/alchemy_cms/pull/1835) ([mamhoff](https://github.com/mamhoff)) +- Fix deleting an EssenceNode from a content [#1834](https://github.com/AlchemyCMS/alchemy_cms/pull/1834) ([mamhoff](https://github.com/mamhoff)) +- Use Rails standards for deleting pages from EssencePage [#1833](https://github.com/AlchemyCMS/alchemy_cms/pull/1833) ([mamhoff](https://github.com/mamhoff)) +- Scope has one site [#1832](https://github.com/AlchemyCMS/alchemy_cms/pull/1832) ([mamhoff](https://github.com/mamhoff)) +- Render nodes [#1831](https://github.com/AlchemyCMS/alchemy_cms/pull/1831) ([mamhoff](https://github.com/mamhoff)) +- Add errors when node cant be deleted [#1828](https://github.com/AlchemyCMS/alchemy_cms/pull/1828) ([mamhoff](https://github.com/mamhoff)) +- Add error flash to resource controller [#1827](https://github.com/AlchemyCMS/alchemy_cms/pull/1827) ([mamhoff](https://github.com/mamhoff)) +- Fix Association between Nodes and EssenceNodes [#1826](https://github.com/AlchemyCMS/alchemy_cms/pull/1826) ([mamhoff](https://github.com/mamhoff)) +- Translated root menus [#1825](https://github.com/AlchemyCMS/alchemy_cms/pull/1825) ([mamhoff](https://github.com/mamhoff)) +- Use rails root in install generator [#1822](https://github.com/AlchemyCMS/alchemy_cms/pull/1822) ([tvdeyen](https://github.com/tvdeyen)) +- Add a quick Node select [#1821](https://github.com/AlchemyCMS/alchemy_cms/pull/1821) ([mamhoff](https://github.com/mamhoff)) +- Add has_one association for root page [#1820](https://github.com/AlchemyCMS/alchemy_cms/pull/1820) ([mamhoff](https://github.com/mamhoff)) +- [js] Upgrade babel-jest to version 26.0.1 [#1819](https://github.com/AlchemyCMS/alchemy_cms/pull/1819) ([depfu](https://github.com/apps/depfu)) +- Make page language mandatory [#1818](https://github.com/AlchemyCMS/alchemy_cms/pull/1818) ([tvdeyen](https://github.com/tvdeyen)) +- Remove root page [#1817](https://github.com/AlchemyCMS/alchemy_cms/pull/1817) ([tvdeyen](https://github.com/tvdeyen)) +- Fix page unlock page icon replacement [#1816](https://github.com/AlchemyCMS/alchemy_cms/pull/1816) ([tvdeyen](https://github.com/tvdeyen)) +- Invoke rake task in upgrader instead of system call [#1815](https://github.com/AlchemyCMS/alchemy_cms/pull/1815) ([tvdeyen](https://github.com/tvdeyen)) +- Remove old 4.4 upgrader class [#1814](https://github.com/AlchemyCMS/alchemy_cms/pull/1814) ([tvdeyen](https://github.com/tvdeyen)) +- Remove Page.ancestors_for [#1813](https://github.com/AlchemyCMS/alchemy_cms/pull/1813) ([tvdeyen](https://github.com/tvdeyen)) +- Remove layout root pages [#1812](https://github.com/AlchemyCMS/alchemy_cms/pull/1812) ([tvdeyen](https://github.com/tvdeyen)) +- Use timestamps in migration [#1811](https://github.com/AlchemyCMS/alchemy_cms/pull/1811) ([tvdeyen](https://github.com/tvdeyen)) +- Remove legacy element serializer [#1810](https://github.com/AlchemyCMS/alchemy_cms/pull/1810) ([tvdeyen](https://github.com/tvdeyen)) +- Remove timestamps from essences and contents [#1809](https://github.com/AlchemyCMS/alchemy_cms/pull/1809) ([tvdeyen](https://github.com/tvdeyen)) +- Remove stamper from contents [#1808](https://github.com/AlchemyCMS/alchemy_cms/pull/1808) ([tvdeyen](https://github.com/tvdeyen)) +- Remove Site ID from nodes [#1807](https://github.com/AlchemyCMS/alchemy_cms/pull/1807) ([mamhoff](https://github.com/mamhoff)) +- Add Alchemy::Language.has_many :nodes [#1806](https://github.com/AlchemyCMS/alchemy_cms/pull/1806) ([mamhoff](https://github.com/mamhoff)) +- Drop Rails 5.0 and 5.1 support [#1805](https://github.com/AlchemyCMS/alchemy_cms/pull/1805) ([tvdeyen](https://github.com/tvdeyen)) +- Remove enforce_ssl [#1804](https://github.com/AlchemyCMS/alchemy_cms/pull/1804) ([tvdeyen](https://github.com/tvdeyen)) +- Make the preview url configurable [#1803](https://github.com/AlchemyCMS/alchemy_cms/pull/1803) ([tvdeyen](https://github.com/tvdeyen)) +- Remove stamper from essences [#1802](https://github.com/AlchemyCMS/alchemy_cms/pull/1802) ([tvdeyen](https://github.com/tvdeyen)) +- Use Rufo to format all files in a consistent way [#1799](https://github.com/AlchemyCMS/alchemy_cms/pull/1799) ([tvdeyen](https://github.com/tvdeyen)) +- Remove acts_as_list from Content [#1798](https://github.com/AlchemyCMS/alchemy_cms/pull/1798) ([tvdeyen](https://github.com/tvdeyen)) +- Add EssenceNode [#1792](https://github.com/AlchemyCMS/alchemy_cms/pull/1792) ([mamhoff](https://github.com/mamhoff)) +- Use 2.5.7 of code climate coverage reporter GH action [#1790](https://github.com/AlchemyCMS/alchemy_cms/pull/1790) ([tvdeyen](https://github.com/tvdeyen)) +- [ruby] Upgrade sassc to version 2.3.0 [#1787](https://github.com/AlchemyCMS/alchemy_cms/pull/1787) ([depfu](https://github.com/apps/depfu)) +- [ruby] Upgrade rubocop to version 0.82.0 [#1785](https://github.com/AlchemyCMS/alchemy_cms/pull/1785) ([depfu](https://github.com/apps/depfu)) +- Fix regular icons [#1784](https://github.com/AlchemyCMS/alchemy_cms/pull/1784) ([tvdeyen](https://github.com/tvdeyen)) +- Convert NodeTree into ES6 [#1782](https://github.com/AlchemyCMS/alchemy_cms/pull/1782) ([tvdeyen](https://github.com/tvdeyen)) +- Add Webpacker [#1775](https://github.com/AlchemyCMS/alchemy_cms/pull/1775) ([tvdeyen](https://github.com/tvdeyen)) +- Multi language menus [#1774](https://github.com/AlchemyCMS/alchemy_cms/pull/1774) ([rmparr](https://github.com/rmparr)) +- On Boarding Flow [#1770](https://github.com/AlchemyCMS/alchemy_cms/pull/1770) ([tvdeyen](https://github.com/tvdeyen)) +- Fix bug in language from session w/o site [#1769](https://github.com/AlchemyCMS/alchemy_cms/pull/1769) ([tvdeyen](https://github.com/tvdeyen)) +- Fix fontawesome in production [#1765](https://github.com/AlchemyCMS/alchemy_cms/pull/1765) ([mickenorlen](https://github.com/mickenorlen)) +- Remove implicit Site and Language creation [#1763](https://github.com/AlchemyCMS/alchemy_cms/pull/1763) ([mamhoff](https://github.com/mamhoff)) +- Add content editor data attributes based on name/id and css_classes presenter method [#1761](https://github.com/AlchemyCMS/alchemy_cms/pull/1761) ([mickenorlen](https://github.com/mickenorlen)) - Add alchemy.test to development domains [#1760](https://github.com/AlchemyCMS/alchemy_cms/pull/1760) ([tvdeyen](https://github.com/tvdeyen)) - Update Fontawesome [#1759](https://github.com/AlchemyCMS/alchemy_cms/pull/1759) ([tvdeyen](https://github.com/tvdeyen)) - Fix test coverage reporting [#1757](https://github.com/AlchemyCMS/alchemy_cms/pull/1757) ([tvdeyen](https://github.com/tvdeyen)) @@ -24,6 +93,27 @@ - Add ContentEditor decorator [#1645](https://github.com/AlchemyCMS/alchemy_cms/pull/1645) ([tvdeyen](https://github.com/tvdeyen)) - Remove local options from essence editors [#1638](https://github.com/AlchemyCMS/alchemy_cms/pull/1638) ([tvdeyen](https://github.com/tvdeyen)) +## 4.6.1 (2020-06-04) + +- Fix 4.6 upgrader + +## 4.6.0 (2020-06-04) + +- Use apt update instead of apt-get in GH action [#1865](https://github.com/AlchemyCMS/alchemy_cms/pull/1865) ([tvdeyen](https://github.com/tvdeyen)) +- Use depth for page tree serializer root_or_leaf [#1864](https://github.com/AlchemyCMS/alchemy_cms/pull/1864) ([tvdeyen](https://github.com/tvdeyen)) +- Fix sitemap wrapper height [#1861](https://github.com/AlchemyCMS/alchemy_cms/pull/1861) ([tvdeyen](https://github.com/tvdeyen)) +- Do not return the root page with API responses. [#1860](https://github.com/AlchemyCMS/alchemy_cms/pull/1860) ([tvdeyen](https://github.com/tvdeyen)) +- Introduce page.url_path and use it for alchemyPageSelect [#1859](https://github.com/AlchemyCMS/alchemy_cms/pull/1859) ([tvdeyen](https://github.com/tvdeyen)) +- Update Urlname translation [#1857](https://github.com/AlchemyCMS/alchemy_cms/pull/1857) ([tvdeyen](https://github.com/tvdeyen)) +- Show url name in Page tree [#1856](https://github.com/AlchemyCMS/alchemy_cms/pull/1856) ([tvdeyen](https://github.com/tvdeyen)) +- Deprecate Page#visible attribute [#1855](https://github.com/AlchemyCMS/alchemy_cms/pull/1855) ([tvdeyen](https://github.com/tvdeyen)) +- 4.6: Re-add `auto_logout_time` configuration option [#1852](https://github.com/AlchemyCMS/alchemy_cms/pull/1852) ([mamhoff](https://github.com/mamhoff)) +- Backport ContentEditor to 4.6, deprecate removed methods on `Alchemy::Content` [#1847](https://github.com/AlchemyCMS/alchemy_cms/pull/1847) ([mamhoff](https://github.com/mamhoff)) +- Deprecate auto_logout_time (4.6) [#1843](https://github.com/AlchemyCMS/alchemy_cms/pull/1843) ([tvdeyen](https://github.com/tvdeyen)) +- Deprecate require_ssl (4.6) [#1842](https://github.com/AlchemyCMS/alchemy_cms/pull/1842) ([tvdeyen](https://github.com/tvdeyen)) +- Deprecate url_nesting configuration (4.6) [#1841](https://github.com/AlchemyCMS/alchemy_cms/pull/1841) ([tvdeyen](https://github.com/tvdeyen)) +- Allow page visible toggle (4.6) [#1838](https://github.com/AlchemyCMS/alchemy_cms/pull/1838) ([tvdeyen](https://github.com/tvdeyen)) + ## 4.5.0 (2020-03-30) - Sortable menus [#1758](https://github.com/AlchemyCMS/alchemy_cms/pull/1758) ([mamhoff](https://github.com/mamhoff)) diff --git a/Gemfile b/Gemfile index e43124be57..b1f343681e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,33 +1,34 @@ # frozen_string_literal: true -source 'https://rubygems.org' +source "https://rubygems.org" gemspec -rails_version = ENV.fetch('RAILS_VERSION', 6.0).to_f -gem 'rails', "~> #{rails_version}.0" +rails_version = ENV.fetch("RAILS_VERSION", 6.0).to_f +gem "rails", "~> #{rails_version}.0" -if ENV['DB'].nil? || ENV['DB'] == 'sqlite' - gem 'sqlite3', rails_version > 5.0 ? '~> 1.4.1' : '~> 1.3.6' +if ENV["DB"].nil? || ENV["DB"] == "sqlite" + gem "sqlite3", "~> 1.4.1" end -gem 'mysql2', '~> 0.5.1' if ENV['DB'] == 'mysql' -gem 'pg', '~> 1.0' if ENV['DB'] == 'postgresql' +gem "mysql2", "~> 0.5.1" if ENV["DB"] == "mysql" +gem "pg", "~> 1.0" if ENV["DB"] == "postgresql" group :development, :test do - if ENV['GITHUB_ACTIONS'] - gem 'sassc', '~> 2.1.0' # https://github.com/sass/sassc-ruby/issues/146 + if ENV["GITHUB_ACTIONS"] + gem "sassc", "~> 2.4.0" # https://github.com/sass/sassc-ruby/issues/146 else - gem 'launchy' - gem 'annotate' - gem 'bumpy' - gem 'yard' - gem 'redcarpet' - gem 'pry-byebug' - gem 'rubocop', '~> 0.80.1', require: false - gem 'listen' - gem 'localeapp', '~> 3.0', require: false - gem 'dotenv', '~> 2.2' - gem 'github_fast_changelog', require: false - gem 'active_record_query_trace', require: false - gem 'rack-mini-profiler', require: false + gem "launchy" + gem "annotate" + gem "bumpy" + gem "yard" + gem "redcarpet" + gem "pry-byebug" + gem "rubocop", "~> 0.85.0", require: false + gem "listen" + gem "localeapp", "~> 3.0", require: false + gem "dotenv", "~> 2.2" + gem "github_fast_changelog", require: false + gem "active_record_query_trace", require: false + gem "rack-mini-profiler", require: false + gem "rufo", require: false end end diff --git a/README.md b/README.md index f559b8597b..a972eb19cf 100644 --- a/README.md +++ b/README.md @@ -51,8 +51,9 @@ or visit the existing demo at https://alchemy-demo.herokuapp.com ## đźš‚ Rails Version -**This version of AlchemyCMS runs with all versions of Rails 5 and Rails 6** +**This version of AlchemyCMS runs with Rails 5.2 and Rails 6.0** +* For a Rails 5.0 or 5.1 compatible version use the [`4.5-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/4.5-stable). * For a Rails 4.2 compatible version use the [`3.6-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/3.6-stable). * For a Rails 4.0/4.1 compatible version use the [`3.1-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/3.1-stable). * For a Rails 3.2 compatible version use the [`2.8-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/2.8-stable). diff --git a/Rakefile b/Rakefile index f3c0b67156..494e284beb 100644 --- a/Rakefile +++ b/Rakefile @@ -45,6 +45,7 @@ namespace :alchemy do bin/rake db:create && \ bin/rake db:environment:set && \ bin/rake db:migrate:reset && \ + bin/rails g alchemy:install --skip --skip-demo-files && \ cd - BASH result || fail diff --git a/alchemy_cms.gemspec b/alchemy_cms.gemspec index 7d442a1b3c..74dec0ef7e 100644 --- a/alchemy_cms.gemspec +++ b/alchemy_cms.gemspec @@ -8,10 +8,10 @@ Gem::Specification.new do |gem| gem.version = Alchemy::VERSION gem.platform = Gem::Platform::RUBY gem.authors = ['Thomas von Deyen', 'Robin Boening', 'Marc Schettke', 'Hendrik Mans', 'Carsten Fregin', 'Martin Meyerhoff'] - gem.email = ['alchemy@magiclabs.de'] + gem.email = ['hello@alchemy-cms.com'] gem.homepage = 'https://alchemy-cms.com' - gem.summary = 'A powerful, userfriendly and flexible CMS for Rails 5' - gem.description = 'Alchemy is a powerful, userfriendly and flexible Rails 5 CMS.' + gem.summary = 'A powerful, userfriendly and flexible CMS for Rails' + gem.description = 'Alchemy is a powerful, userfriendly and flexible Rails CMS.' gem.requirements << 'ImageMagick (libmagick), v6.6 or greater.' gem.required_ruby_version = '>= 2.3.0' gem.license = 'BSD New' @@ -32,7 +32,7 @@ Gem::Specification.new do |gem| gem.add_runtime_dependency 'kaminari', ['~> 1.1'] gem.add_runtime_dependency 'originator', ['~> 3.1'] gem.add_runtime_dependency 'non-stupid-digest-assets', ['~> 1.0.8'] - gem.add_runtime_dependency 'rails', ['>= 5.0.0', '< 6.1'] + gem.add_runtime_dependency 'rails', ['>= 5.2.0', '< 6.1'] gem.add_runtime_dependency 'ransack', ['>= 1.8', '< 3.0'] gem.add_runtime_dependency 'request_store', ['~> 1.2'] gem.add_runtime_dependency 'responders', ['>= 2.0', '< 4.0'] @@ -41,10 +41,11 @@ Gem::Specification.new do |gem| gem.add_runtime_dependency 'simple_form', ['>= 4.0', '< 6'] gem.add_runtime_dependency 'sprockets', ['>= 3.0', '< 5'] gem.add_runtime_dependency 'turbolinks', ['>= 2.5'] + gem.add_runtime_dependency 'webpacker', ['>= 4.0', '< 6'] gem.add_development_dependency 'capybara', ['~> 3.0'] gem.add_development_dependency 'capybara-screenshot', ['~> 1.0'] - gem.add_development_dependency 'factory_bot_rails', ['~> 5.0'] + gem.add_development_dependency 'factory_bot_rails', ['~> 6.0'] gem.add_development_dependency 'puma', ['~> 4.0'] gem.add_development_dependency 'rails-controller-testing', ['~> 1.0'] gem.add_development_dependency 'rspec-activemodel-mocks', ['~> 1.0'] diff --git a/app/assets/javascripts/alchemy/admin.js b/app/assets/javascripts/alchemy/admin.js index 7b728dfd24..32c2d118e3 100644 --- a/app/assets/javascripts/alchemy/admin.js +++ b/app/assets/javascripts/alchemy/admin.js @@ -15,10 +15,8 @@ //= require requestAnimationFrame //= require select2 //= require handlebars -//= require sortable/Sortable.min //= require alchemy/templates //= require alchemy/alchemy.base -//= require alchemy/alchemy.utils //= require alchemy/alchemy.autocomplete //= require alchemy/alchemy.browser //= require alchemy/alchemy.buttons @@ -34,14 +32,12 @@ //= require alchemy/alchemy.growler //= require alchemy/alchemy.gui //= require alchemy/alchemy.hotkeys -//= require alchemy/alchemy.i18n //= require alchemy/alchemy.image_cropper //= require alchemy/alchemy.image_overlay //= require alchemy/alchemy.string_extension //= require alchemy/alchemy.link_dialog //= require alchemy/alchemy.list_filter //= require alchemy/alchemy.initializer -//= require alchemy/alchemy.node_tree //= require alchemy/alchemy.page_sorter //= require alchemy/alchemy.uploader //= require alchemy/alchemy.preview_window @@ -49,6 +45,6 @@ //= require alchemy/alchemy.spinner //= require alchemy/alchemy.tinymce //= require alchemy/alchemy.tooltips -//= require alchemy/alchemy.translations //= require alchemy/alchemy.trash_window //= require alchemy/page_select +//= require alchemy/node_select diff --git a/app/assets/javascripts/alchemy/alchemy.base.js.coffee b/app/assets/javascripts/alchemy/alchemy.base.js.coffee index db7ea0bbe8..20b7de18a8 100644 --- a/app/assets/javascripts/alchemy/alchemy.base.js.coffee +++ b/app/assets/javascripts/alchemy/alchemy.base.js.coffee @@ -62,9 +62,10 @@ $.extend Alchemy, removePicture: (selector) -> $form_field = $(selector) $element = $form_field.closest(".element-editor") + $content = $form_field.closest(".content_editor") if $form_field[0] $form_field.val "" - $element.find(".thumbnail_background").html('') + $content.find(".thumbnail_background").html('') Alchemy.setElementDirty $element false diff --git a/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee b/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee index 1d86ff16f1..80ae7b18be 100644 --- a/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee +++ b/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee @@ -179,8 +179,6 @@ Alchemy.ElementEditors = if data.message == 'Alchemy.focusElementEditor' $element = $("#element_#{data.element_id}") Alchemy.ElementEditors.focusElement($element) - else - console.warn 'Unknown message received!', data onClickBody: (e) -> element = $(e.target).parents('.element-editor')[0] diff --git a/app/assets/javascripts/alchemy/alchemy.i18n.js.coffee b/app/assets/javascripts/alchemy/alchemy.i18n.js.coffee deleted file mode 100644 index 5f08c82c07..0000000000 --- a/app/assets/javascripts/alchemy/alchemy.i18n.js.coffee +++ /dev/null @@ -1,32 +0,0 @@ -#= require alchemy/alchemy.translations - -window.Alchemy = {} if typeof(window.Alchemy) is 'undefined' - -Alchemy.I18n = - - KEY_SEPARATOR: /\./ - - # Translates given string - # - translate: (key, replacement) -> - if !Alchemy.locale? - throw 'Alchemy.locale is not set! Please set Alchemy.locale to a locale string in order to translate something.' - translations = Alchemy.translations[Alchemy.locale] - if translations - if @KEY_SEPARATOR.test(key) - keys = key.split(@KEY_SEPARATOR) - translation = translations[keys[0]][keys[1]] || key - else - translation = translations[key] || key - if replacement - translation.replace(/%\{.+\}/, replacement) - else - translation - else - console.warn "Translations for locale #{Alchemy.locale} not found!" - key - -# Global utility method for translating a given string -# -Alchemy.t = (key, replacement) -> - Alchemy.I18n.translate(key, replacement) diff --git a/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee b/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee index 46bf1bad57..cbc7e463b3 100644 --- a/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee +++ b/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee @@ -76,16 +76,16 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog meta = data.meta results: data.pages.map (page) -> - id: "/#{page.urlname}" + id: page.url_path name: page.name - urlname: page.urlname + url_path: page.url_path page_id: page.id more: meta.page * meta.per_page < meta.total_count initSelection: ($element, callback) => urlname = $element.val() $.get Alchemy.routes.api_pages_path, q: - urlname_eq: urlname.replace(/^\//, '') + urlname_eq: urlname.replace(/^\/([a-z]{2}(-[A-Z]{2})?\/)?/, '') page: 1 per_page: 1, (data) => @@ -93,9 +93,9 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog if page @initElementSelect(page.id) callback - id: "/#{page.urlname}" + id: page.url_path name: page.name - urlname: page.name + url_path: page.url_path page_id: page.id formatSelection: (page) -> page.name diff --git a/app/assets/javascripts/alchemy/alchemy.node_tree.js b/app/assets/javascripts/alchemy/alchemy.node_tree.js deleted file mode 100644 index 9213d8bb70..0000000000 --- a/app/assets/javascripts/alchemy/alchemy.node_tree.js +++ /dev/null @@ -1,66 +0,0 @@ -Alchemy.NodeTree = { - onFinishDragging: function (evt) { - var url = Alchemy.routes.move_api_node_path(evt.item.dataset.id) - var data = { - target_parent_id: evt.to.dataset.nodeId, - new_position: evt.newIndex - }; - var ajax = Alchemy.ajax('PATCH', url, data) - - ajax.then(function(response) { - Alchemy.growl('Successfully moved menu item.') - Alchemy.NodeTree.displayNodeFolders() - }).catch(function() { - Alchemy.growl(error.message || error); - }) - }, - - displayNodeFolders: function () { - document.querySelectorAll('li.menu-item').forEach(function (el) { - var leftIconArea = el.querySelector('.nodes_tree-left_images') - var list = el.querySelector('ul') - var node = { folded: el.dataset.folded === 'true', id: el.dataset.id } - - if (list.children.length > 0 || node.folded ) { - leftIconArea.innerHTML = HandlebarsTemplates.node_folder({ node: node }) - } else { - leftIconArea.innerHTML = ' ' - } - }); - }, - - handleNodeFolders: function() { - Alchemy.on('click', '.nodes_tree', '.node_folder', function(evt) { - var nodeId = this.dataset.nodeId - var menu_item = this.closest('li.menu-item') - var url = Alchemy.routes.toggle_folded_api_node_path(nodeId) - var list = menu_item.querySelector('.children') - var ajax = Alchemy.ajax('PATCH', url) - - ajax.then(function() { - list.classList.toggle('folded') - menu_item.dataset.folded = menu_item.dataset.folded == 'true' ? 'false' : 'true' - Alchemy.NodeTree.displayNodeFolders(); - }).catch(function(error){ - Alchemy.growl(error.message || error); - }); - }); - }, - - init: function() { - this.handleNodeFolders() - this.displayNodeFolders() - - document.querySelectorAll('.nodes_tree ul.children').forEach(function (el) { - new Sortable(el, { - group: 'nodes', - animation: 150, - fallbackOnBody: true, - swapThreshold: 0.65, - handle: '.node_name', - invertSwap: true, - onEnd: Alchemy.NodeTree.onFinishDragging - }); - }); - } -} diff --git a/app/assets/javascripts/alchemy/alchemy.page_sorter.js b/app/assets/javascripts/alchemy/alchemy.page_sorter.js index df57ce4be1..9c4039c97d 100644 --- a/app/assets/javascripts/alchemy/alchemy.page_sorter.js +++ b/app/assets/javascripts/alchemy/alchemy.page_sorter.js @@ -1,24 +1,24 @@ -Alchemy.PageSorter = function() { - var $sortables = $('ul#sitemap').find('ul.level_1_children'); +Alchemy.PageSorter = function () { + var $sortables = $("ul#sitemap").find("ul.level_0_children") $sortables.nestedSortable({ - disableNesting: 'no-nest', + disableNesting: "no-nest", forcePlaceholderSize: true, - handle: '.handle', - items: 'li', - listType: 'ul', + handle: ".handle", + items: "li", + listType: "ul", opacity: 0.5, - placeholder: 'placeholder', + placeholder: "placeholder", tabSize: 16, - tolerance: 'pointer', - toleranceElement: '> div' - }); + tolerance: "pointer", + toleranceElement: "> div" + }) - $('#save_page_order').click(function(e) { - e.preventDefault(); - Alchemy.Buttons.disable(this); + $("#save_page_order").click(function (e) { + e.preventDefault() + Alchemy.Buttons.disable(this) $.post(Alchemy.routes.order_admin_pages_path, { - set: JSON.stringify($sortables.nestedSortable('toHierarchy')) - }); - }); -}; + set: JSON.stringify($sortables.nestedSortable("toHierarchy")) + }) + }) +} diff --git a/app/assets/javascripts/alchemy/alchemy.translations.js.coffee b/app/assets/javascripts/alchemy/alchemy.translations.js.coffee deleted file mode 100644 index 57e2f84d49..0000000000 --- a/app/assets/javascripts/alchemy/alchemy.translations.js.coffee +++ /dev/null @@ -1,29 +0,0 @@ -window.Alchemy = {} if typeof(window.Alchemy) is 'undefined' - -# Holds translations for javascripts -# -Alchemy.translations = - en: - allowed_chars: 'of %{count} chars' - cancel: 'Cancel' - cancelled: 'Cancelled' - click_to_edit: 'click to edit' - complete: 'Complete' - element_dirty_notice: 'This element has unsaved changes. Do you really want to fold it?' - help: 'Help' - ok: 'Ok' - page_dirty_notice: 'You have unsaved changes on this page. They will be lost if you continue.' - page_found: 'Page found' - pages_found: 'Pages found' - url_validation_failed: 'The url has no valid format.' - warning: 'Warning!' - 'File is too large': 'File is too large' - 'File is too small': 'File is too small' - 'File type not allowed': 'File type not allowed' - 'Maximum number of files exceeded': 'Maximum number of files exceeded.' - 'Uploaded bytes exceed file size': 'Uploaded bytes exceed file size' - formats: - datetime: "Y-m-d H:i" - date: "Y-m-d" - time: "H:i" - time_24hr: false diff --git a/app/assets/javascripts/alchemy/alchemy.utils.js b/app/assets/javascripts/alchemy/alchemy.utils.js deleted file mode 100644 index 5c35fa08e0..0000000000 --- a/app/assets/javascripts/alchemy/alchemy.utils.js +++ /dev/null @@ -1,45 +0,0 @@ -Alchemy.on = function (eventName, baseSelector, targetSelector, callback) { - var baseNode = document.querySelector(baseSelector) - baseNode.addEventListener(eventName, function (evt) { - var targets = Array.from(baseNode.querySelectorAll(targetSelector)) - var currentNode = evt.target - while (currentNode !== baseNode) { - if (targets.includes(currentNode)) { - callback.call(currentNode, evt) - return - } - currentNode = currentNode.parentElement - } - }); -} - -Alchemy.ajax = function(method, url, data) { - var xhr = new XMLHttpRequest() - var token = document.querySelector('meta[name="csrf-token"]').attributes.content.textContent - var promise = new Promise(function (resolve, reject) { - xhr.onload = function() { - try { - resolve({ - data: JSON.parse(xhr.responseText), - status: xhr.status - }) - } catch (error) { - reject(new Error(JSON.parse(xhr.responseText).error)) - } - }; - xhr.onerror = function() { - reject(new Error(xhr.statusText)) - } - }); - xhr.open(method, url); - xhr.setRequestHeader('Content-type', 'application/json; charset=utf-8'); - xhr.setRequestHeader('Accept', 'application/json'); - xhr.setRequestHeader('X-CSRF-Token', token) - if (data) { - xhr.send(JSON.stringify(data)) - } else { - xhr.send() - } - - return promise -} diff --git a/app/assets/javascripts/alchemy/node_select.js b/app/assets/javascripts/alchemy/node_select.js new file mode 100644 index 0000000000..a358703905 --- /dev/null +++ b/app/assets/javascripts/alchemy/node_select.js @@ -0,0 +1,39 @@ +$.fn.alchemyNodeSelect = function (options) { + var renderNodeTemplate = function (node) { + return HandlebarsTemplates.node({ node: node }) + } + var queryParamsFromTerm = function (term) { + return { + filter: Object.assign( + { name_or_page_name_cont: term }, + options.query_params + ) + } + } + var resultsFromResponse = function (response) { + var meta = response.meta + var data = response.data + var more = meta.page * meta.per_page < meta.total_count + return { results: data, more: more } + } + + return this.select2({ + placeholder: options.placeholder, + allowClear: true, + minimumInputLength: 3, + initSelection: function (_$el, callback) { + if (options.initialSelection) { + callback(options.initialSelection) + } + }, + ajax: { + url: options.url, + datatype: "json", + quietMillis: 300, + data: queryParamsFromTerm, + results: resultsFromResponse + }, + formatSelection: renderNodeTemplate, + formatResult: renderNodeTemplate + }) +} diff --git a/app/assets/javascripts/alchemy/templates/index.js b/app/assets/javascripts/alchemy/templates/index.js index 0405d22de6..acbaf8b3db 100644 --- a/app/assets/javascripts/alchemy/templates/index.js +++ b/app/assets/javascripts/alchemy/templates/index.js @@ -1,3 +1,4 @@ //= require alchemy/templates/spinner //= require alchemy/templates/page //= require alchemy/templates/node_folder +//= require alchemy/templates/node diff --git a/app/assets/javascripts/alchemy/templates/node.hbs b/app/assets/javascripts/alchemy/templates/node.hbs new file mode 100644 index 0000000000..50d487d912 --- /dev/null +++ b/app/assets/javascripts/alchemy/templates/node.hbs @@ -0,0 +1,16 @@ +
+ +
+ + {{#each node.ancestors}} + {{ this.name }} /  + {{/each}} + + + {{ node.name }} + +
+
+ {{ node.url }} +
+
diff --git a/app/assets/javascripts/alchemy/templates/page.hbs b/app/assets/javascripts/alchemy/templates/page.hbs index 1686cacbe1..81748efe20 100644 --- a/app/assets/javascripts/alchemy/templates/page.hbs +++ b/app/assets/javascripts/alchemy/templates/page.hbs @@ -4,6 +4,6 @@ {{ page.name }} - /{{ page.urlname }} + {{ page.url_path }} diff --git a/app/assets/stylesheets/alchemy/_mixins.scss b/app/assets/stylesheets/alchemy/_mixins.scss index f68687d3f4..2251b133b6 100644 --- a/app/assets/stylesheets/alchemy/_mixins.scss +++ b/app/assets/stylesheets/alchemy/_mixins.scss @@ -49,9 +49,8 @@ border-color: $hover-border-color; } - &:active, &:active:focus { - border-color: $hover-border-color; - box-shadow: none; + &:active, &.active { + box-shadow: inset $button-box-shadow; } &:focus { diff --git a/app/assets/stylesheets/alchemy/_variables.scss b/app/assets/stylesheets/alchemy/_variables.scss index 343c204b5e..6bb3e2bd14 100644 --- a/app/assets/stylesheets/alchemy/_variables.scss +++ b/app/assets/stylesheets/alchemy/_variables.scss @@ -76,7 +76,7 @@ $button-text-shadow: none !default; $button-box-shadow: 0px 1px 1px -1px #333 !default; $button-focus-box-shadow: 0px 1px 1px 0px $button-focus-border-color !default; $button-padding: 0.55em 2em !default; -$small-button-padding: 0.4em 1.25em !default; +$small-button-padding: 0.4em 0.8em !default; $button-margin: $form-field-margin !default; $secondary-button-bg-color: transparent !default; @@ -108,7 +108,7 @@ $form-right-width: 65% !default; $sitemap-line-height: 32px !default; $sitemap-page-background-color: rgba($white, 0.75) !default; $sitemap-page-hover-color: rgba($light_yellow, 0.5) !default; -$sitemap-info-background-color: rgba($linked-color, 0.5) !default; +$sitemap-info-background-color: rgba($white, 0.5) !default; $sitemap-highlight-color: rgba(#fffba5, 0.5) !default; $main-menu-width: 150px !default; diff --git a/app/assets/stylesheets/alchemy/admin.scss b/app/assets/stylesheets/alchemy/admin.scss index 16e2418dc8..e657f50327 100644 --- a/app/assets/stylesheets/alchemy/admin.scss +++ b/app/assets/stylesheets/alchemy/admin.scss @@ -31,6 +31,7 @@ @import "alchemy/image_library"; @import "alchemy/labels"; @import "alchemy/nodes"; +@import "alchemy/node-select"; @import "alchemy/notices"; @import "alchemy/page-select"; @import "alchemy/pagination"; diff --git a/app/assets/stylesheets/alchemy/lists.scss b/app/assets/stylesheets/alchemy/lists.scss index 6463353737..890a52be88 100644 --- a/app/assets/stylesheets/alchemy/lists.scss +++ b/app/assets/stylesheets/alchemy/lists.scss @@ -13,14 +13,6 @@ ul.list { padding: 0; list-style-type: none; - &#layoutpages { - margin-top: 16px; - - li { - margin-left: 8px; - } - } - li { list-style-type: none; display: block; diff --git a/app/assets/stylesheets/alchemy/node-select.scss b/app/assets/stylesheets/alchemy/node-select.scss new file mode 100644 index 0000000000..ebccde55db --- /dev/null +++ b/app/assets/stylesheets/alchemy/node-select.scss @@ -0,0 +1,43 @@ +.node-select--node, +.node-select--node-url { + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; +} + +.node-select--node { + display: flex; + align-items: center; + + .icon { + margin: 0 8px 0 4px; + + .select2-highlighted & { + color: $white + } + } +} + +.node-select--node-name { + font-weight: bold; +} + +.node-select--node-url { + margin-left: auto; + padding: $default-padding 2*$default-padding; + color: $dark-gray; + font-size: $small-font-size; + + .select2-highlighted & { + color: $white + } +} + +// The container of the rendered node is slightly larger than other a line of +// text, as it would be for the Alchemy::EssencePage. Reducing the padding here from 0.6em +// to 0.4em centers the content nicely. +.essence_node { + .select2-container.alchemy_selectbox .select2-choice { + padding: 0.4em 0.75em; + } +} diff --git a/app/assets/stylesheets/alchemy/nodes.scss b/app/assets/stylesheets/alchemy/nodes.scss index c35731998c..4c2aa6512f 100644 --- a/app/assets/stylesheets/alchemy/nodes.scss +++ b/app/assets/stylesheets/alchemy/nodes.scss @@ -18,7 +18,7 @@ .node_page, .node_url { - width: 200px; + width: 250px; max-width: 45%; white-space: nowrap; text-overflow: ellipsis; @@ -64,7 +64,7 @@ margin: 0; padding: 0; - .folded > li { + &.folded > li { display: none; } } diff --git a/app/assets/stylesheets/alchemy/sitemap.scss b/app/assets/stylesheets/alchemy/sitemap.scss index 35fb24957c..13c5fc24a0 100644 --- a/app/assets/stylesheets/alchemy/sitemap.scss +++ b/app/assets/stylesheets/alchemy/sitemap.scss @@ -1,3 +1,6 @@ +$sitemap-url-large-width: 250px; +$sitemap-url-xlarge-width: 350px; + #sort_panel { background: $light-gray; padding: 47px 0 8px 0; @@ -20,7 +23,7 @@ #sitemap-wrapper { position: relative; - min-height: 100%; + min-height: calc(100vh - 96px); } .sitemap_pagename_link { @@ -28,23 +31,35 @@ padding: 0 10px; margin: 2px; text-decoration: none; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; &.inactive { color: #656565; } } -.redirect_url { +.sitemap_url { + display: none; float: right; - text-align: right; background-color: $sitemap-info-background-color; - line-height: $sitemap-line-height; + line-height: $sitemap-line-height - 2px; font-size: $small-font-size; - padding: 0 2*$default-padding; - max-width: 45%; + padding: 0 2 * $default-padding; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + border: 1px solid $sitemap-page-background-color; + + @media screen and (min-width: $large-screen-break-point) { + display: block; + width: $sitemap-url-large-width; + } + + @media screen and (min-width: 1440px) { + width: $sitemap-url-xlarge-width; + } } .sitemap_line_spacer { @@ -55,7 +70,7 @@ .sitemap_page { height: $sitemap-line-height; - margin: 3*$default-margin 0; + margin: 3 * $default-margin 0; position: relative; transition: background-color $transition-duration; @@ -89,13 +104,13 @@ width: 32px; line-height: $sitemap-line-height; float: left; - padding: 0 2*$default-padding; + padding: 0 2 * $default-padding; text-align: center; } .sitemap_right_tools { height: $sitemap-line-height; - padding: 0 2*$default-padding; + padding: 0 2 * $default-padding; float: right; .sitemap_tool { @@ -130,7 +145,9 @@ &.sorting { padding-top: 100px; - .page_icon { cursor: move } + .page_icon { + cursor: move; + } } .page_folder { @@ -180,28 +197,51 @@ .page_status { display: inline-block; + + .alchemy-dialog & { + display: block; + } } #sitemap_heading { + display: flex; padding: 0; - - .page_infos { - margin-right: 210px; - text-align: left; - float: right; - line-height: 28px; - background: transparent; - } + line-height: 28px; .page_name { - line-height: 28px; margin-left: 43px; } + + .page_urlname { + display: none; + margin-left: auto; + padding-left: 2 * $default-padding; + padding-right: 2 * $default-padding; + + @media screen and (min-width: $large-screen-break-point) { + display: block; + width: $sitemap-url-large-width; + } + + @media screen and (min-width: 1440px) { + width: $sitemap-url-xlarge-width; + } + } + + .page_status { + padding-left: 2 * $default-padding; + margin-right: 188px; + margin-left: auto; + + @media screen and (min-width: $large-screen-break-point) { + margin-left: initial; + } + } } #page_filter_result { display: none; - margin-left: 2*$default-margin; + margin-left: 2 * $default-margin; } .alchemy-dialog { @@ -213,6 +253,8 @@ margin: 0; padding: 0 24px 8px 8px; - .page_icon { cursor: default } + .page_icon { + cursor: default; + } } } diff --git a/app/controllers/alchemy/admin/attachments_controller.rb b/app/controllers/alchemy/admin/attachments_controller.rb index 54eecdc262..47bc3ca362 100644 --- a/app/controllers/alchemy/admin/attachments_controller.rb +++ b/app/controllers/alchemy/admin/attachments_controller.rb @@ -6,11 +6,11 @@ class AttachmentsController < ResourcesController include UploaderResponses include ArchiveOverlay - helper 'alchemy/admin/tags' + helper "alchemy/admin/tags" def index @query = Attachment.ransack(search_filter_params[:q]) - @query.sorts = 'name asc' if @query.sorts.empty? + @query.sorts = "name asc" if @query.sorts.empty? @attachments = @query.result if search_filter_params[:tagged_with].present? @@ -42,13 +42,13 @@ def create def update @attachment.update(attachment_attributes) - if attachment_attributes['file'].present? + if attachment_attributes["file"].present? handle_uploader_response(status: :accepted) else render_errors_or_redirect( @attachment, admin_attachments_path(search_filter_params), - Alchemy.t("File successfully updated") + Alchemy.t("File successfully updated"), ) end end @@ -57,14 +57,14 @@ def destroy name = @attachment.name @attachment.destroy @url = admin_attachments_url(search_filter_params) - flash[:notice] = Alchemy.t('File deleted successfully', name: name) + flash[:notice] = Alchemy.t("File deleted successfully", name: name) end def download @attachment = Attachment.find(params[:id]) send_file @attachment.file.path, { filename: @attachment.file_name, - type: @attachment.file_mime_type + type: @attachment.file_mime_type, } end @@ -74,8 +74,8 @@ def search_filter_params @_search_filter_params ||= params.except(*COMMON_SEARCH_FILTER_EXCLUDES + [:attachment]).permit( *common_search_filter_includes + [ :file_type, - :content_id - ] + :content_id, + ], ) end diff --git a/app/controllers/alchemy/admin/base_controller.rb b/app/controllers/alchemy/admin/base_controller.rb index 4e3e16c3cb..63a0a4e34e 100644 --- a/app/controllers/alchemy/admin/base_controller.rb +++ b/app/controllers/alchemy/admin/base_controller.rb @@ -6,7 +6,6 @@ class BaseController < Alchemy::BaseController include Userstamp include Locale - before_action { enforce_ssl if ssl_required? && !request.ssl? } before_action :load_locked_pages helper_method :clipboard_empty?, :trash_empty?, :get_clipboard, :is_admin? @@ -27,14 +26,14 @@ class BaseController < Alchemy::BaseController def leave authorize! :leave, :alchemy_admin - render template: '/alchemy/admin/leave', layout: !request.xhr? + render template: "/alchemy/admin/leave", layout: !request.xhr? end private # Disable layout rendering for xhr requests. def set_layout - request.xhr? ? false : 'alchemy/admin' + request.xhr? ? false : "alchemy/admin" end # Handles exceptions @@ -55,7 +54,7 @@ def show_error_notice(error) if request.xhr? render action: "error_notice" else - render '500', status: 500 + render "500", status: 500 end end @@ -105,7 +104,7 @@ def render_errors_or_redirect(object, redirect_url, flash_notice) flash[:notice] = Alchemy.t(flash_notice) do_redirect_to redirect_url else - render action: (params[:action] == 'update' ? 'edit' : 'new') + render action: (params[:action] == "update" ? "edit" : "new") end end @@ -113,7 +112,7 @@ def render_errors_or_redirect(object, redirect_url, flash_notice) # def do_redirect_to(url_or_path) respond_to do |format| - format.js { + format.js { @redirect_url = url_or_path render :redirect } @@ -131,7 +130,7 @@ def raise_exception? # Are we currently in the page edit mode page preview. def is_page_preview? - controller_path == 'alchemy/admin/pages' && action_name == 'show' + controller_path == "alchemy/admin/pages" && action_name == "show" end def load_locked_pages @@ -142,11 +141,11 @@ def load_locked_pages # def current_alchemy_site @current_alchemy_site ||= begin - site_id = params[:site_id] || session[:alchemy_site_id] - site = Site.find_by(id: site_id) || super - session[:alchemy_site_id] = site&.id - site - end + site_id = params[:site_id] || session[:alchemy_site_id] + site = Site.find_by(id: site_id) || super + session[:alchemy_site_id] = site&.id + site + end end end end diff --git a/app/controllers/alchemy/admin/clipboard_controller.rb b/app/controllers/alchemy/admin/clipboard_controller.rb index 3977e72ede..06c6733f4a 100644 --- a/app/controllers/alchemy/admin/clipboard_controller.rb +++ b/app/controllers/alchemy/admin/clipboard_controller.rb @@ -17,10 +17,10 @@ def index def insert @item = model_class.find(remarkable_params[:remarkable_id]) - unless @clipboard.detect { |item| item['id'] == remarkable_params[:remarkable_id] } + unless @clipboard.detect { |item| item["id"] == remarkable_params[:remarkable_id] } @clipboard << { - 'id' => remarkable_params[:remarkable_id], - 'action' => params[:remove] ? 'cut' : 'copy' + "id" => remarkable_params[:remarkable_id], + "action" => params[:remove] ? "cut" : "copy", } end respond_to do |format| @@ -30,7 +30,7 @@ def insert def remove @item = model_class.find(remarkable_params[:remarkable_id]) - @clipboard.delete_if { |item| item['id'] == remarkable_params[:remarkable_id] } + @clipboard.delete_if { |item| item["id"] == remarkable_params[:remarkable_id] } respond_to do |format| format.js end diff --git a/app/controllers/alchemy/admin/contents_controller.rb b/app/controllers/alchemy/admin/contents_controller.rb index d4685c266e..13b460dc69 100644 --- a/app/controllers/alchemy/admin/contents_controller.rb +++ b/app/controllers/alchemy/admin/contents_controller.rb @@ -3,7 +3,7 @@ module Alchemy module Admin class ContentsController < Alchemy::Admin::BaseController - helper 'alchemy/admin/essences' + helper "alchemy/admin/essences" authorize_resource class: Alchemy::Content diff --git a/app/controllers/alchemy/admin/dashboard_controller.rb b/app/controllers/alchemy/admin/dashboard_controller.rb index 0ec91fcedc..cde544c502 100644 --- a/app/controllers/alchemy/admin/dashboard_controller.rb +++ b/app/controllers/alchemy/admin/dashboard_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true -require 'net/http' -require 'alchemy/version' +require "net/http" +require "alchemy/version" module Alchemy module Admin @@ -28,9 +28,9 @@ def info def update_check @alchemy_version = Alchemy.version if @alchemy_version < latest_alchemy_version - render plain: 'true' + render plain: "true" else - render plain: 'false' + render plain: "false" end rescue UpdateServiceUnavailable => e render plain: e, status: 503 @@ -41,7 +41,7 @@ def update_check # Returns latest alchemy version. def latest_alchemy_version versions = get_alchemy_versions - return '' if versions.blank? + return "" if versions.blank? # reject any non release version versions.reject! { |v| v =~ /[a-z]/ } @@ -54,14 +54,14 @@ def get_alchemy_versions response = query_rubygems if response.code == "200" alchemy_versions = JSON.parse(response.body) - alchemy_versions.collect { |h| h['number'] }.sort + alchemy_versions.collect { |h| h["number"] }.sort else # rubygems.org not available? # then we try github response = query_github if response.code == "200" alchemy_tags = JSON.parse(response.body) - alchemy_tags.collect { |h| h['name'].tr('v', '') }.sort + alchemy_tags.collect { |h| h["name"].tr("v", "") }.sort else # no luck at all? raise UpdateServiceUnavailable @@ -71,12 +71,12 @@ def get_alchemy_versions # Query the RubyGems API for Alchemy versions. def query_rubygems - make_api_request('https://rubygems.org/api/v1/versions/alchemy_cms.json') + make_api_request("https://rubygems.org/api/v1/versions/alchemy_cms.json") end # Query the GitHub API for Alchemy tags. def query_github - make_api_request('https://api.github.com/repos/AlchemyCMS/alchemy_cms/tags') + make_api_request("https://api.github.com/repos/AlchemyCMS/alchemy_cms/tags") end # Make a HTTP API request for given request url. diff --git a/app/controllers/alchemy/admin/elements_controller.rb b/app/controllers/alchemy/admin/elements_controller.rb index 11520da98a..54ad29933c 100644 --- a/app/controllers/alchemy/admin/elements_controller.rb +++ b/app/controllers/alchemy/admin/elements_controller.rb @@ -17,7 +17,7 @@ def new @parent_element = Element.find_by(id: params[:parent_element_id]) @elements = @page.available_elements_within_current_scope(@parent_element) @element = @page.elements.build - @clipboard = get_clipboard('elements') + @clipboard = get_clipboard("elements") @clipboard_items = Element.all_from_clipboard_for_page(@clipboard, @page) end @@ -30,7 +30,7 @@ def create else @element = Element.create(create_element_params) end - if @page.definition['insert_elements_at'] == 'top' + if @page.definition["insert_elements_at"] == "top" @insert_at_top = true @element.move_to_top end @@ -40,7 +40,7 @@ def create else @element.page = @page @elements = @page.available_element_definitions - @clipboard = get_clipboard('elements') + @clipboard = get_clipboard("elements") @clipboard_items = Element.all_from_clipboard_for_page(@clipboard, @page) render :new end @@ -56,7 +56,7 @@ def update @element_validated = @element.update(element_params) else @element_validated = false - @notice = Alchemy.t('Validation failed') + @notice = Alchemy.t("Validation failed") @error_message = "

#{@notice}

#{Alchemy.t(:content_validations_headline)}

".html_safe end end @@ -81,7 +81,7 @@ def order Element.where(id: element_id).update_all( page_id: params[:page_id], parent_element_id: params[:parent_element_id], - position: idx + 1 + position: idx + 1, ) end @parent_element.try!(:touch) @@ -100,20 +100,20 @@ def element_includes [ { contents: { - essence: :ingredient_association - } + essence: :ingredient_association, + }, }, :tags, { all_nested_elements: [ { contents: { - essence: :ingredient_association - } + essence: :ingredient_association, + }, }, - :tags - ] - } + :tags, + ], + }, ] end @@ -123,20 +123,20 @@ def load_element def element_from_clipboard @element_from_clipboard ||= begin - @clipboard = get_clipboard('elements') - @clipboard.detect { |item| item['id'].to_i == params[:paste_from_clipboard].to_i } - end + @clipboard = get_clipboard("elements") + @clipboard.detect { |item| item["id"].to_i == params[:paste_from_clipboard].to_i } + end end def paste_element_from_clipboard - @source_element = Element.find(element_from_clipboard['id']) + @source_element = Element.find(element_from_clipboard["id"]) element = Element.copy(@source_element, { parent_element_id: create_element_params[:parent_element_id], - page_id: @page.id} - ) - if element_from_clipboard['action'] == 'cut' + page_id: @page.id, + }) + if element_from_clipboard["action"] == "cut" @cut_element_id = @source_element.id - @clipboard.delete_if { |item| item['id'] == @source_element.id.to_s } + @clipboard.delete_if { |item| item["id"] == @source_element.id.to_s } @source_element.destroy end element diff --git a/app/controllers/alchemy/admin/essence_pictures_controller.rb b/app/controllers/alchemy/admin/essence_pictures_controller.rb index 4bc85b2c9e..9656635ec5 100644 --- a/app/controllers/alchemy/admin/essence_pictures_controller.rb +++ b/app/controllers/alchemy/admin/essence_pictures_controller.rb @@ -9,9 +9,9 @@ class EssencePicturesController < Alchemy::Admin::BaseController before_action :load_essence_picture, only: [:edit, :crop, :update] before_action :load_content, only: [:edit, :update, :assign] - helper 'alchemy/admin/contents' - helper 'alchemy/admin/essences' - helper 'alchemy/url' + helper "alchemy/admin/contents" + helper "alchemy/admin/essences" + helper "alchemy/url" def edit end diff --git a/app/controllers/alchemy/admin/languages_controller.rb b/app/controllers/alchemy/admin/languages_controller.rb index b3f97d30b9..402ee0e395 100644 --- a/app/controllers/alchemy/admin/languages_controller.rb +++ b/app/controllers/alchemy/admin/languages_controller.rb @@ -14,14 +14,14 @@ def index def new @language = Language.new( site: @current_site, - page_layout: Config.get(:default_language)['page_layout'] + page_layout: Config.get(:default_language)["page_layout"], ) end def create @language = Alchemy::Language.new(resource_params) if @language.save - flash[:notice] = Alchemy.t('Language successfully created') + flash[:notice] = Alchemy.t("Language successfully created") redirect_to alchemy.admin_pages_path(language_id: @language) else render :new @@ -30,7 +30,7 @@ def create def destroy if @language.destroy - flash[:notice] = Alchemy.t('Language successfully removed') + flash[:notice] = Alchemy.t("Language successfully removed") else flash[:warning] = @language.errors.full_messages.to_sentence end @@ -47,7 +47,7 @@ def switch def load_current_site @current_site = Alchemy::Site.current if @current_site.nil? - flash[:warning] = Alchemy.t('Please create a site first.') + flash[:warning] = Alchemy.t("Please create a site first.") redirect_to admin_sites_path end end diff --git a/app/controllers/alchemy/admin/layoutpages_controller.rb b/app/controllers/alchemy/admin/layoutpages_controller.rb index 23a2e42765..2279f19e42 100644 --- a/app/controllers/alchemy/admin/layoutpages_controller.rb +++ b/app/controllers/alchemy/admin/layoutpages_controller.rb @@ -10,7 +10,7 @@ class LayoutpagesController < Alchemy::Admin::BaseController helper Alchemy::Admin::PagesHelper def index - @layout_root = Page.find_or_create_layout_root_for(@current_language.id) + @layout_pages = Page.layoutpages.where(language: @current_language) @languages = Language.on_current_site end diff --git a/app/controllers/alchemy/admin/nodes_controller.rb b/app/controllers/alchemy/admin/nodes_controller.rb index 98ca0bb1f4..e0db2ef6c0 100644 --- a/app/controllers/alchemy/admin/nodes_controller.rb +++ b/app/controllers/alchemy/admin/nodes_controller.rb @@ -11,9 +11,8 @@ def index def new @node = Node.new( - site: Alchemy::Site.current, parent_id: params[:parent_id], - language: @current_language + language: @current_language, ) end @@ -21,7 +20,7 @@ def new def resource_params params.require(:node).permit( - :site_id, + :menu_type, :parent_id, :language_id, :page_id, @@ -29,7 +28,7 @@ def resource_params :url, :title, :nofollow, - :external + :external, ) end end diff --git a/app/controllers/alchemy/admin/pages_controller.rb b/app/controllers/alchemy/admin/pages_controller.rb index 36716c5f8d..d5ce82c902 100644 --- a/app/controllers/alchemy/admin/pages_controller.rb +++ b/app/controllers/alchemy/admin/pages_controller.rb @@ -5,7 +5,7 @@ module Admin class PagesController < Alchemy::Admin::BaseController include OnPageLayout::CallbacksRunner - helper 'alchemy/pages' + helper "alchemy/pages" before_action :load_page, except: [:index, :flush, :new, :order, :create, :copy_language_tree, :link, :sort] @@ -48,7 +48,7 @@ def show Page.current_preview = @page # Setting the locale to pages language, so the page content has it's correct translations. ::I18n.locale = @page.language.locale - render(layout: Alchemy::Config.get(:admin_page_preview_layout) || 'application') + render(layout: Alchemy::Config.get(:admin_page_preview_layout) || "application") end def info @@ -56,9 +56,9 @@ def info end def new - @page ||= Page.new(layoutpage: params[:layoutpage] == 'true', parent_id: params[:parent_id]) + @page ||= Page.new(layoutpage: params[:layoutpage] == "true", parent_id: params[:parent_id]) @page_layouts = PageLayout.layouts_for_select(@current_language.id, @page.layoutpage?) - @clipboard = get_clipboard('pages') + @clipboard = get_clipboard("pages") @clipboard_items = Page.all_from_clipboard_for_select(@clipboard, @current_language.id, @page.layoutpage?) end @@ -80,11 +80,12 @@ def create def edit # fetching page via before filter if page_is_locked? - flash[:warning] = Alchemy.t('This page is locked', name: @page.locker_name) + flash[:warning] = Alchemy.t("This page is locked", name: @page.locker_name) redirect_to admin_pages_path elsif page_needs_lock? @page.lock_to!(current_alchemy_user) end + @preview_url = Alchemy::Admin::PREVIEW_URL.url_for(@page) @layoutpage = @page.layoutpage? end @@ -102,7 +103,7 @@ def update @old_page_layout = @page.page_layout if @page.update(page_params) @notice = Alchemy.t("Page saved", name: @page.name) - @while_page_edit = request.referer.include?('edit') + @while_page_edit = request.referer.include?("edit") unless @while_page_edit @tree = serialized_page_tree @@ -118,17 +119,17 @@ def destroy flash[:notice] = Alchemy.t("Page deleted", name: @page.name) # Remove page from clipboard - clipboard = get_clipboard('pages') - clipboard.delete_if { |item| item['id'] == @page.id.to_s } + clipboard = get_clipboard("pages") + clipboard.delete_if { |item| item["id"] == @page.id.to_s } end respond_to do |format| format.js do @redirect_url = if @page.layoutpage? - alchemy.admin_layoutpages_path - else - alchemy.admin_pages_path - end + alchemy.admin_layoutpages_path + else + alchemy.admin_pages_path + end render :redirect end @@ -139,7 +140,6 @@ def link @attachments = Attachment.all.collect { |f| [f.name, download_attachment_path(id: f.id, name: f.urlname)] } - @url_prefix = prefix_locale? ? "#{@current_language.code}/" : "" end def fold @@ -169,7 +169,7 @@ def visit redirect_to show_page_url( urlname: @page.urlname, locale: prefix_locale? ? @page.language_code : nil, - host: @page.site.host == "*" ? request.host : @page.site.host + host: @page.site.host == "*" ? request.host : @page.site.host, ) end @@ -221,13 +221,11 @@ def flush private def copy_of_language_root - page_copy = Page.copy( + Page.copy( language_root_to_copy_from, language_id: params[:languages][:new_lang_id], - language_code: @current_language.code + language_code: @current_language.code, ) - page_copy.move_to_child_of Page.root - page_copy end def language_root_to_copy_from @@ -257,14 +255,14 @@ def language_root_to_copy_from def visit_nodes(nodes, my_left, parent, depth, tree, url, restricted) nodes.each do |item| my_right = my_left + 1 - my_restricted = item['restricted'] || restricted + my_restricted = item["restricted"] || restricted urls = process_url(url, item) - if item['children'] - my_right, tree = visit_nodes(item['children'], my_left + 1, item['id'], depth + 1, tree, urls[:children_path], my_restricted) + if item["children"] + my_right, tree = visit_nodes(item["children"], my_left + 1, item["id"], depth + 1, tree, urls[:children_path], my_restricted) end - tree[item['id']] = TreeNode.new(my_left, my_right, parent, depth, urls[:my_urlname], my_restricted) + tree[item["id"]] = TreeNode.new(my_left, my_right, parent, depth, urls[:my_urlname], my_restricted) my_left = my_right + 1 end @@ -293,24 +291,14 @@ def create_tree(items, rootpage) # This function will add a node's own slug into their ancestor's path # in order to create the full URL of a node # - # NOTE: Invisible pages are not part of the full path of their children - # # @param [String] # The node's ancestors path # @param [Hash] # A children node # def process_url(ancestors_path, item) - default_urlname = (ancestors_path.blank? ? "" : "#{ancestors_path}/") + item['slug'].to_s - - pair = {my_urlname: default_urlname, children_path: default_urlname} - - if item['visible'] == false - # children ignore an ancestor in their path if invisible - pair[:children_path] = ancestors_path - end - - pair + default_urlname = (ancestors_path.blank? ? "" : "#{ancestors_path}/") + item["slug"].to_s + { my_urlname: default_urlname, children_path: default_urlname } end def load_page @@ -318,10 +306,10 @@ def load_page end def pages_from_raw_request - request.raw_post.split('&').map do |i| - parts = i.split('=') + request.raw_post.split("&").map do |i| + parts = i.split("=") { - parts[0].gsub(/[^0-9]/, '') => parts[1] + parts[0].gsub(/[^0-9]/, "") => parts[1], } end end @@ -362,7 +350,7 @@ def page_needs_lock? def paste_from_clipboard if params[:paste_from_clipboard] source = Page.find(params[:paste_from_clipboard]) - parent = Page.find_by(id: params[:page][:parent_id]) || Page.root + parent = Page.find_by(id: params[:page][:parent_id]) Page.copy_and_paste(source, parent, params[:page][:name]) end end @@ -374,7 +362,7 @@ def set_root_page def serialized_page_tree PageTreeSerializer.new(@page, ability: current_ability, user: current_alchemy_user, - full: params[:full] == 'true') + full: params[:full] == "true") end end end diff --git a/app/controllers/alchemy/admin/pictures_controller.rb b/app/controllers/alchemy/admin/pictures_controller.rb index 75354555ed..7869a3ee42 100644 --- a/app/controllers/alchemy/admin/pictures_controller.rb +++ b/app/controllers/alchemy/admin/pictures_controller.rb @@ -6,7 +6,7 @@ class PicturesController < Alchemy::Admin::ResourcesController include UploaderResponses include ArchiveOverlay - helper 'alchemy/admin/tags' + helper "alchemy/admin/tags" before_action :load_resource, only: [:show, :edit, :update, :destroy, :info] @@ -14,12 +14,12 @@ class PicturesController < Alchemy::Admin::ResourcesController authorize_resource class: Alchemy::Picture def index - @size = params[:size].present? ? params[:size] : 'medium' + @size = params[:size].present? ? params[:size] : "medium" @query = Picture.ransack(search_filter_params[:q]) @pictures = Picture.search_by( search_filter_params, @query, - items_per_page + items_per_page, ) if in_overlay? @@ -31,7 +31,7 @@ def show @previous = @picture.previous(params) @next = @picture.next(params) @assignments = @picture.essence_pictures.joins(content: {element: :page}) - render action: 'show' + render action: "show" end def create @@ -46,19 +46,19 @@ def create def edit_multiple @pictures = Picture.where(id: params[:picture_ids]) - @tags = @pictures.collect(&:tag_list).flatten.uniq.join(', ') + @tags = @pictures.collect(&:tag_list).flatten.uniq.join(", ") end def update if @picture.update(picture_params) @message = { body: Alchemy.t(:picture_updated_successfully, name: @picture.name), - type: 'notice' + type: "notice", } else @message = { body: Alchemy.t(:picture_update_failed), - type: 'error' + type: "error", } end render :update @@ -89,7 +89,7 @@ def delete_multiple if not_deletable.any? flash[:warn] = Alchemy.t( "These pictures could not be deleted, because they were in use", - names: not_deletable.to_sentence + names: not_deletable.to_sentence, ) else flash[:notice] = Alchemy.t("Pictures deleted successfully", names: names.to_sentence) @@ -116,8 +116,8 @@ def destroy def items_per_page if in_overlay? case params[:size] - when 'small' then 25 - when 'large' then 4 + when "small" then 25 + when "large" then 4 else 9 end @@ -137,8 +137,8 @@ def items_per_page_options def pictures_per_page_for_size(size) case size - when 'small' then 60 - when 'large' then 12 + when "small" then 60 + when "large" then 12 else 20 end @@ -154,8 +154,8 @@ def search_filter_params :size, :element_id, :swap, - :content_id - ] + :content_id, + ], ) end diff --git a/app/controllers/alchemy/admin/resources_controller.rb b/app/controllers/alchemy/admin/resources_controller.rb index e6079942c8..4bbf962c89 100644 --- a/app/controllers/alchemy/admin/resources_controller.rb +++ b/app/controllers/alchemy/admin/resources_controller.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -require 'csv' -require 'alchemy/resource' -require 'alchemy/resources_helper' +require "csv" +require "alchemy/resource" +require "alchemy/resources_helper" module Alchemy module Admin @@ -53,7 +53,7 @@ def new end def show - render action: 'edit' + render action: "edit" end def edit; end @@ -64,7 +64,7 @@ def create render_errors_or_redirect( resource_instance_variable, resources_path(resource_instance_variable.class, search_filter_params), - flash_notice_for_resource_action + flash_notice_for_resource_action, ) end @@ -73,14 +73,17 @@ def update render_errors_or_redirect( resource_instance_variable, resources_path(resource_instance_variable.class, search_filter_params), - flash_notice_for_resource_action + flash_notice_for_resource_action, ) end def destroy resource_instance_variable.destroy + if resource_instance_variable.errors.any? + flash[:error] = resource_instance_variable.errors.full_messages.join(", ") + end flash_notice_for_resource_action - do_redirect_to resource_url_proxy.url_for(search_filter_params.merge(action: 'index')) + do_redirect_to resource_url_proxy.url_for(search_filter_params.merge(action: "index")) end def resource_handler @@ -106,11 +109,11 @@ def flash_notice_for_resource_action(action = params[:action]) end def is_alchemy_module? - !alchemy_module.nil? && !alchemy_module['engine_name'].nil? + !alchemy_module.nil? && !alchemy_module["engine_name"].nil? end def alchemy_module - @alchemy_module ||= module_definition_for(controller: params[:controller], action: 'index') + @alchemy_module ||= module_definition_for(controller: params[:controller], action: "index") end def load_resource @@ -147,12 +150,12 @@ def common_search_filter_includes [ {q: [ resource_handler.search_field_name, - :s + :s, ]}, :tagged_with, :filter, :page, - :per_page + :per_page, ].freeze end @@ -166,8 +169,8 @@ def items_per_page_options end def default_sort_order - name = resource_handler.attributes.detect { |attr| attr[:name] == 'name' } - name ? 'name asc' : "#{resource_handler.attributes.first[:name]} asc" + name = resource_handler.attributes.detect { |attr| attr[:name] == "name" } + name ? "name asc" : "#{resource_handler.attributes.first[:name]} asc" end end end diff --git a/app/controllers/alchemy/admin/sites_controller.rb b/app/controllers/alchemy/admin/sites_controller.rb index 3fd772b664..be79b0dd29 100644 --- a/app/controllers/alchemy/admin/sites_controller.rb +++ b/app/controllers/alchemy/admin/sites_controller.rb @@ -6,7 +6,7 @@ class SitesController < ResourcesController def create @site = Alchemy::Site.new(resource_params) if @site.save - flash[:notice] = Alchemy.t('Please create a default language for this site.') + flash[:notice] = Alchemy.t("Please create a default language for this site.") redirect_to alchemy.admin_languages_path(site_id: @site) else render :new @@ -15,7 +15,7 @@ def create def destroy if @site.destroy - flash[:notice] = Alchemy.t('Site successfully removed') + flash[:notice] = Alchemy.t("Site successfully removed") else flash[:warning] = @site.errors.full_messages.to_sentence end diff --git a/app/controllers/alchemy/admin/tags_controller.rb b/app/controllers/alchemy/admin/tags_controller.rb index d418b7aca9..857e4f4778 100644 --- a/app/controllers/alchemy/admin/tags_controller.rb +++ b/app/controllers/alchemy/admin/tags_controller.rb @@ -21,7 +21,7 @@ def new def create @tag = Gutentag::Tag.create(tag_params) - render_errors_or_redirect @tag, admin_tags_path, Alchemy.t('New Tag Created') + render_errors_or_redirect @tag, admin_tags_path, Alchemy.t("New Tag Created") end def edit @@ -32,7 +32,7 @@ def update if tag_params[:merge_to] @new_tag = Gutentag::Tag.find(tag_params[:merge_to]) Tag.replace(@tag, @new_tag) - operation_text = Alchemy.t('Replaced Tag') % {old_tag: @tag.name, new_tag: @new_tag.name} + operation_text = Alchemy.t("Replaced Tag") % {old_tag: @tag.name, new_tag: @new_tag.name} @tag.destroy else @tag.update(tag_params) @@ -67,7 +67,7 @@ def tag_params def tags_from_term(term) return [] if term.blank? - Gutentag::Tag.where(['LOWER(name) LIKE ?', "#{term.downcase}%"]) + Gutentag::Tag.where(["LOWER(name) LIKE ?", "#{term.downcase}%"]) end def json_for_autocomplete(items, attribute) diff --git a/app/controllers/alchemy/admin/trash_controller.rb b/app/controllers/alchemy/admin/trash_controller.rb index 8956f70b79..98c3dce514 100644 --- a/app/controllers/alchemy/admin/trash_controller.rb +++ b/app/controllers/alchemy/admin/trash_controller.rb @@ -25,16 +25,16 @@ def element_includes [ { contents: { - essence: :ingredient_association + essence: :ingredient_association, }, all_nested_elements: [ { contents: { - essence: :ingredient_association - } - } - ] - } + essence: :ingredient_association, + }, + }, + ], + }, ] end end diff --git a/app/controllers/alchemy/api/base_controller.rb b/app/controllers/alchemy/api/base_controller.rb index b3e21c42f5..c79f5badcd 100644 --- a/app/controllers/alchemy/api/base_controller.rb +++ b/app/controllers/alchemy/api/base_controller.rb @@ -11,11 +11,11 @@ class Api::BaseController < Alchemy::BaseController private def render_not_authorized - render json: {error: 'Not authorized'}, status: 403 + render json: {error: "Not authorized"}, status: 403 end def render_not_found - render json: {error: 'Record not found'}, status: 404 + render json: {error: "Record not found"}, status: 404 end end end diff --git a/app/controllers/alchemy/api/contents_controller.rb b/app/controllers/alchemy/api/contents_controller.rb index 13162e08ca..c864de5fe2 100644 --- a/app/controllers/alchemy/api/contents_controller.rb +++ b/app/controllers/alchemy/api/contents_controller.rb @@ -18,7 +18,7 @@ def index end @contents = @contents.includes(*content_includes) - render json: @contents, adapter: :json, root: 'contents' + render json: @contents, adapter: :json, root: "contents" end # Returns a json object for content @@ -36,7 +36,7 @@ def show elsif params[:element_id] && params[:name] @content = Content.where( element_id: params[:element_id], - name: params[:name] + name: params[:name], ).includes(*content_includes).first || raise(ActiveRecord::RecordNotFound) end authorize! :show, @content @@ -48,8 +48,8 @@ def show def content_includes [ { - essence: :ingredient_association - } + essence: :ingredient_association, + }, ] end end diff --git a/app/controllers/alchemy/api/elements_controller.rb b/app/controllers/alchemy/api/elements_controller.rb index 45367a8104..1ad9583065 100644 --- a/app/controllers/alchemy/api/elements_controller.rb +++ b/app/controllers/alchemy/api/elements_controller.rb @@ -22,7 +22,7 @@ def index end @elements = @elements.includes(*element_includes) - render json: @elements, adapter: :json, root: 'elements' + render json: @elements, adapter: :json, root: "elements" end # Returns a json object for element @@ -41,18 +41,18 @@ def element_includes nested_elements: [ { contents: { - essence: :ingredient_association - } + essence: :ingredient_association, + }, }, - :tags - ] + :tags, + ], }, { contents: { - essence: :ingredient_association - } + essence: :ingredient_association, + }, }, - :tags + :tags, ] end end diff --git a/app/controllers/alchemy/api/nodes_controller.rb b/app/controllers/alchemy/api/nodes_controller.rb index 3e61059fb5..766f85ce7a 100644 --- a/app/controllers/alchemy/api/nodes_controller.rb +++ b/app/controllers/alchemy/api/nodes_controller.rb @@ -2,9 +2,21 @@ module Alchemy class Api::NodesController < Api::BaseController - before_action :load_node + before_action :load_node, except: :index before_action :authorize_access, only: [:move, :toggle_folded] + def index + @nodes = Node.all + @nodes = @nodes.includes(:parent) + @nodes = @nodes.ransack(params[:filter]).result + + if params[:page] + @nodes = @nodes.page(params[:page]).per(params[:per_page]) + end + + render json: @nodes, adapter: :json, root: "data", meta: meta_data, include: params[:include] + end + def move target_parent_node = Node.find(params[:target_parent_id]) @node.move_to_child_with_index(target_parent_node, params[:new_position]) @@ -25,5 +37,29 @@ def load_node def authorize_access authorize! :update, @node end + + def meta_data + { + total_count: total_count_value, + per_page: per_page_value, + page: page_value, + } + end + + def total_count_value + params[:page] ? @nodes.total_count : @nodes.size + end + + def per_page_value + if params[:page] + (params[:per_page] || Kaminari.config.default_per_page).to_i + else + @nodes.size + end + end + + def page_value + params[:page] ? params[:page].to_i : 1 + end end end diff --git a/app/controllers/alchemy/api/pages_controller.rb b/app/controllers/alchemy/api/pages_controller.rb index 0946d6a39e..1b24ddfebe 100644 --- a/app/controllers/alchemy/api/pages_controller.rb +++ b/app/controllers/alchemy/api/pages_controller.rb @@ -20,7 +20,7 @@ def index @pages = @pages.page(params[:page]).per(params[:per_page]) end - render json: @pages, adapter: :json, root: 'pages', meta: meta_data + render json: @pages, adapter: :json, root: "pages", meta: meta_data end # Returns all pages as nested json object for tree views @@ -64,7 +64,7 @@ def load_page_by_urlname Language.current.pages.where( urlname: params[:urlname], - language_code: params[:locale] || Language.current.code + language_code: params[:locale] || Language.current.code, ).includes(page_includes).first end @@ -72,7 +72,7 @@ def meta_data { total_count: total_count_value, per_page: per_page_value, - page: page_value + page: page_value, } end @@ -96,25 +96,26 @@ def page_includes [ :tags, { + language: :site, elements: [ { nested_elements: [ { contents: { - essence: :ingredient_association - } + essence: :ingredient_association, + }, }, - :tags - ] + :tags, + ], }, { contents: { - essence: :ingredient_association - } + essence: :ingredient_association, + }, }, - :tags - ] - } + :tags, + ], + }, ] end end diff --git a/app/controllers/alchemy/attachments_controller.rb b/app/controllers/alchemy/attachments_controller.rb index 3327d67849..8841ad8a35 100644 --- a/app/controllers/alchemy/attachments_controller.rb +++ b/app/controllers/alchemy/attachments_controller.rb @@ -7,24 +7,24 @@ class AttachmentsController < BaseController # sends file inline. i.e. for viewing pdfs/movies in browser def show - response.headers['Content-Length'] = @attachment.file.size.to_s + response.headers["Content-Length"] = @attachment.file.size.to_s send_file( @attachment.file.path, { filename: @attachment.file_name, type: @attachment.file_mime_type, - disposition: 'inline' - } + disposition: "inline", + }, ) end # sends file as attachment. aka download def download - response.headers['Content-Length'] = @attachment.file.size.to_s + response.headers["Content-Length"] = @attachment.file.size.to_s send_file( @attachment.file.path, { filename: @attachment.file_name, - type: @attachment.file_mime_type + type: @attachment.file_mime_type, } ) end diff --git a/app/controllers/alchemy/base_controller.rb b/app/controllers/alchemy/base_controller.rb index dad72d6c72..ea201d954d 100644 --- a/app/controllers/alchemy/base_controller.rb +++ b/app/controllers/alchemy/base_controller.rb @@ -8,14 +8,13 @@ class BaseController < ApplicationController include Alchemy::AbilityHelper include Alchemy::ControllerActions include Alchemy::Modules - include Alchemy::SSLProtection protect_from_forgery before_action :mailer_set_url_options before_action :set_locale - helper 'alchemy/admin/form' + helper "alchemy/admin/form" rescue_from CanCan::AccessDenied do |exception| permission_denied(exception) @@ -27,6 +26,7 @@ class BaseController < ApplicationController # def set_locale return unless Language.current + ::I18n.locale = Language.current&.locale end @@ -61,11 +61,11 @@ def permission_denied(exception = nil) end def handle_redirect_for_user - flash[:warning] = Alchemy.t('You are not authorized') + flash[:warning] = Alchemy.t("You are not authorized") if can?(:index, :alchemy_admin_dashboard) redirect_or_render_notice else - redirect_to('/') + redirect_to("/") end end @@ -76,8 +76,8 @@ def redirect_or_render_notice render plain: flash.discard(:warning), status: 403 end format.html do - render partial: 'alchemy/admin/partials/flash', - locals: {message: flash[:warning], flash_type: 'warning'} + render partial: "alchemy/admin/partials/flash", + locals: { message: flash[:warning], flash_type: "warning" } end end else @@ -86,7 +86,7 @@ def redirect_or_render_notice end def handle_redirect_for_guest - flash[:info] = Alchemy.t('Please log in') + flash[:info] = Alchemy.t("Please log in") if request.xhr? render :permission_denied else @@ -99,7 +99,7 @@ def handle_redirect_for_guest def exception_logger(error) Rails.logger.error("\n#{error.class} #{error.message} in #{error.backtrace.first}") Rails.logger.error(error.backtrace[1..50].each { |line| - line.gsub(/#{Rails.root}/, '') + line.gsub(/#{Rails.root}/, "") }.join("\n")) end end diff --git a/app/controllers/alchemy/messages_controller.rb b/app/controllers/alchemy/messages_controller.rb index 1503f71b6e..0148f29d1c 100644 --- a/app/controllers/alchemy/messages_controller.rb +++ b/app/controllers/alchemy/messages_controller.rb @@ -39,18 +39,18 @@ module Alchemy class MessagesController < Alchemy::BaseController before_action :get_page, except: :create - helper 'alchemy/pages' + helper "alchemy/pages" def index #:nodoc: redirect_to show_page_path( urlname: @page.urlname, - locale: prefix_locale? ? @page.language_code : nil + locale: prefix_locale? ? @page.language_code : nil, ) end def new #:nodoc: @message = Message.new - render template: 'alchemy/pages/show' + render template: "alchemy/pages/show" end def create #:nodoc: @@ -67,7 +67,7 @@ def create #:nodoc: MessagesMailer.contact_form_mail(@message, mail_to, mail_from, subject).deliver redirect_to_success_page else - render template: 'alchemy/pages/show' + render template: "alchemy/pages/show" end end @@ -78,29 +78,29 @@ def mailer_config end def mail_to - @element.ingredient(:mail_to) || mailer_config['mail_to'] + @element.ingredient(:mail_to) || mailer_config["mail_to"] end def mail_from - @element.ingredient(:mail_from) || mailer_config['mail_from'] + @element.ingredient(:mail_from) || mailer_config["mail_from"] end def subject - @element.ingredient(:subject) || mailer_config['subject'] + @element.ingredient(:subject) || mailer_config["subject"] end def redirect_to_success_page - flash[:notice] = Alchemy.t(:success, scope: 'contactform.messages') + flash[:notice] = Alchemy.t(:success, scope: "contactform.messages") if success_page urlname = success_page_urlname - elsif mailer_config['forward_to_page'] && mailer_config['mail_success_page'] - urlname = Page.find_by(urlname: mailer_config['mail_success_page']).urlname + elsif mailer_config["forward_to_page"] && mailer_config["mail_success_page"] + urlname = Page.find_by(urlname: mailer_config["mail_success_page"]).urlname else urlname = Language.current_root_page.urlname end redirect_to show_page_path( urlname: urlname, - locale: prefix_locale? ? Language.current.code : nil + locale: prefix_locale? ? Language.current.code : nil, ) end @@ -118,16 +118,16 @@ def success_page_urlname end def get_page - @page = Language.current.pages.find_by(page_layout: mailer_config['page_layout_name']) + @page = Language.current.pages.find_by(page_layout: mailer_config["page_layout_name"]) if @page.blank? - raise "Page for page_layout #{mailer_config['page_layout_name']} not found" + raise "Page for page_layout #{mailer_config["page_layout_name"]} not found" end @root_page = @page.get_language_root end def message_params - params.require(:message).permit(*mailer_config['fields']) + params.require(:message).permit(*mailer_config["fields"]) end end end diff --git a/app/controllers/alchemy/pages_controller.rb b/app/controllers/alchemy/pages_controller.rb index 87c153d2e7..674ff91ed9 100644 --- a/app/controllers/alchemy/pages_controller.rb +++ b/app/controllers/alchemy/pages_controller.rb @@ -3,10 +3,10 @@ module Alchemy class PagesController < Alchemy::BaseController SHOW_PAGE_PARAMS_KEYS = [ - 'action', - 'controller', - 'urlname', - 'locale' + "action", + "controller", + "urlname", + "locale", ] include OnPageLayout::CallbacksRunner @@ -78,7 +78,7 @@ def show def sitemap @pages = Page.sitemap respond_to do |format| - format.xml { render layout: 'alchemy/sitemap' } + format.xml { render layout: "alchemy/sitemap" } end end @@ -95,7 +95,7 @@ def sitemap # def load_index_page @page ||= Language.current_root_page - render template: 'alchemy/welcome', layout: false if signup_required? + render template: "alchemy/welcome", layout: false if signup_required? end # == Loads page by urlname @@ -112,7 +112,7 @@ def load_page @page ||= Language.current.pages.contentpages.find_by( urlname: params[:urlname], - language_code: params[:locale] || Language.current.code + language_code: params[:locale] || Language.current.code, ) end @@ -150,7 +150,7 @@ def render_page if @page.contains_feed? render action: :show, layout: false, handlers: [:builder] else - render xml: {error: 'Not found'}, status: 404 + render xml: { error: "Not found" }, status: 404 end end end @@ -193,9 +193,9 @@ def page_etag # def render_fresh_page? must_not_cache? || stale?(etag: page_etag, - last_modified: @page.published_at, - public: !@page.restricted, - template: 'pages/show') + last_modified: @page.published_at, + public: !@page.restricted, + template: "pages/show") end # don't cache pages if we have flash message to display or the page has caching disabled diff --git a/app/controllers/concerns/alchemy/admin/archive_overlay.rb b/app/controllers/concerns/alchemy/admin/archive_overlay.rb index 782228a730..6346d646d6 100644 --- a/app/controllers/concerns/alchemy/admin/archive_overlay.rb +++ b/app/controllers/concerns/alchemy/admin/archive_overlay.rb @@ -12,8 +12,8 @@ def archive_overlay @content = Content.find_by(id: params[:content_id]) respond_to do |format| - format.html { render partial: 'archive_overlay' } - format.js { render action: 'archive_overlay' } + format.html { render partial: "archive_overlay" } + format.js { render action: "archive_overlay" } end end end diff --git a/app/controllers/concerns/alchemy/admin/current_language.rb b/app/controllers/concerns/alchemy/admin/current_language.rb index 6a6a864e1a..d2bf50a6e7 100644 --- a/app/controllers/concerns/alchemy/admin/current_language.rb +++ b/app/controllers/concerns/alchemy/admin/current_language.rb @@ -14,7 +14,7 @@ module CurrentLanguage def load_current_language @current_language = Alchemy::Language.current if @current_language.nil? - flash[:warning] = Alchemy.t('Please create a language first.') + flash[:warning] = Alchemy.t("Please create a language first.") redirect_to admin_languages_path end end diff --git a/app/controllers/concerns/alchemy/admin/uploader_responses.rb b/app/controllers/concerns/alchemy/admin/uploader_responses.rb index 4662ea384a..6a2f21f2e6 100644 --- a/app/controllers/concerns/alchemy/admin/uploader_responses.rb +++ b/app/controllers/concerns/alchemy/admin/uploader_responses.rb @@ -8,12 +8,12 @@ module UploaderResponses def successful_uploader_response(file:, status: :created) message = Alchemy.t(:upload_success, scope: [:uploader, file.class.model_name.i18n_key], - name: file.name + name: file.name, ) { json: uploader_response(file: file, message: message), - status: status + status: status, } end @@ -21,12 +21,12 @@ def failed_uploader_response(file:) message = Alchemy.t(:upload_failure, scope: [:uploader, file.class.model_name.i18n_key], error: file.errors[:file].join, - name: file.name + name: file.name, ) { json: uploader_response(file: file, message: message), - status: :unprocessable_entity + status: :unprocessable_entity, } end @@ -35,7 +35,7 @@ def failed_uploader_response(file:) def uploader_response(file:, message:) { files: [file.to_jq_upload], - growl_message: message + growl_message: message, } end end diff --git a/app/controllers/concerns/alchemy/legacy_page_redirects.rb b/app/controllers/concerns/alchemy/legacy_page_redirects.rb index e00780d26d..aa18739edf 100644 --- a/app/controllers/concerns/alchemy/legacy_page_redirects.rb +++ b/app/controllers/concerns/alchemy/legacy_page_redirects.rb @@ -36,18 +36,18 @@ def legacy_page_redirect_url alchemy.show_page_path( locale: prefix_locale? ? page.language_code : nil, - urlname: page.urlname + urlname: page.urlname, ) end def legacy_urls # /slug/tree => slug/tree - urlname = (request.fullpath[1..-1] if request.fullpath[0] == '/') || request.fullpath + urlname = (request.fullpath[1..-1] if request.fullpath[0] == "/") || request.fullpath LegacyPageUrl.joins(:page).where( urlname: urlname, Page.table_name => { - language_id: Language.current.id - } + language_id: Language.current.id, + }, ) end diff --git a/app/controllers/concerns/alchemy/page_redirects.rb b/app/controllers/concerns/alchemy/page_redirects.rb index 751f42c3e9..b39d766670 100644 --- a/app/controllers/concerns/alchemy/page_redirects.rb +++ b/app/controllers/concerns/alchemy/page_redirects.rb @@ -51,7 +51,7 @@ def public_child_redirect_url def page_redirect_url(options = {}) options = { locale: prefix_locale? ? @page.language_code : nil, - urlname: @page.urlname + urlname: @page.urlname, }.merge(options) alchemy.show_page_path additional_params.merge(options) diff --git a/app/controllers/concerns/alchemy/site_redirects.rb b/app/controllers/concerns/alchemy/site_redirects.rb index e0696dd7fb..059bd7a5d3 100644 --- a/app/controllers/concerns/alchemy/site_redirects.rb +++ b/app/controllers/concerns/alchemy/site_redirects.rb @@ -17,7 +17,7 @@ def enforce_primary_host_for_site def needs_redirect_to_primary_host? current_alchemy_site&.redirect_to_primary_host? && - current_alchemy_site.host != '*' && + current_alchemy_site.host != "*" && current_alchemy_site.host != request.host end end diff --git a/app/decorators/alchemy/content_editor.rb b/app/decorators/alchemy/content_editor.rb index 2e5055aee5..4d7bcf6317 100644 --- a/app/decorators/alchemy/content_editor.rb +++ b/app/decorators/alchemy/content_editor.rb @@ -10,15 +10,15 @@ def to_partial_path def css_classes [ - 'content_editor', - essence_partial_name + "content_editor", + essence_partial_name, ].compact end def data_attributes { content_id: id, - content_name: name + content_name: name, } end @@ -36,11 +36,11 @@ def data_attributes # # <%= text_field_tag content_editor.form_field_name(:link), content_editor.ingredient %> # - def form_field_name(essence_column = 'ingredient') + def form_field_name(essence_column = "ingredient") "contents[#{id}][#{essence_column}]" end - def form_field_id(essence_column = 'ingredient') + def form_field_id(essence_column = "ingredient") "contents_#{id}_#{essence_column}" end diff --git a/app/decorators/alchemy/element_editor.rb b/app/decorators/alchemy/element_editor.rb index ba2b1ce838..29c9478079 100644 --- a/app/decorators/alchemy/element_editor.rb +++ b/app/decorators/alchemy/element_editor.rb @@ -11,14 +11,14 @@ def to_partial_path # CSS classes for the element editor partial. def css_classes [ - 'element-editor', - content_definitions.present? ? 'with-contents' : 'without-contents', - nestable_elements.any? ? 'nestable' : 'not-nestable', - taggable? ? 'taggable' : 'not-taggable', - folded ? 'folded' : 'expanded', - compact? ? 'compact' : nil, - fixed? ? 'is-fixed' : 'not-fixed' - ].join(' ') + "element-editor", + content_definitions.present? ? "with-contents" : "without-contents", + nestable_elements.any? ? "nestable" : "not-nestable", + taggable? ? "taggable" : "not-taggable", + folded ? "folded" : "expanded", + compact? ? "compact" : nil, + fixed? ? "is-fixed" : "not-fixed", + ].join(" ") end # Tells us, if we should show the element footer and form inputs. diff --git a/app/helpers/alchemy/admin/attachments_helper.rb b/app/helpers/alchemy/admin/attachments_helper.rb index 22bb255b39..8bc876a275 100644 --- a/app/helpers/alchemy/admin/attachments_helper.rb +++ b/app/helpers/alchemy/admin/attachments_helper.rb @@ -6,17 +6,17 @@ module AttachmentsHelper include Alchemy::Admin::BaseHelper def mime_to_human(mime) - Alchemy.t(mime, scope: 'mime_types', default: Alchemy.t(:document)) + Alchemy.t(mime, scope: "mime_types", default: Alchemy.t(:document)) end def attachment_preview_size(attachment) case attachment.icon_css_class - when 'image' then '600x475' - when 'audio' then '600x190' - when 'video' then '600x485' - when 'pdf' then '600x500' + when "image" then "600x475" + when "audio" then "600x190" + when "video" then "600x485" + when "pdf" then "600x500" else - '600x145' + "600x145" end end end diff --git a/app/helpers/alchemy/admin/base_helper.rb b/app/helpers/alchemy/admin/base_helper.rb index ca7afd44c0..617390178f 100644 --- a/app/helpers/alchemy/admin/base_helper.rb +++ b/app/helpers/alchemy/admin/base_helper.rb @@ -23,7 +23,7 @@ module BaseHelper def current_alchemy_user_name name = current_alchemy_user.try(:alchemy_display_name) if name.present? - content_tag :span, "#{Alchemy.t('Logged in as')} #{name}", class: 'current-user-name' + content_tag :span, "#{Alchemy.t("Logged in as")} #{name}", class: "current-user-name" end end @@ -55,7 +55,7 @@ def link_to_dialog(content, url, options = {}, html_options = {}) default_options = {modal: true} options = default_options.merge(options) link_to content, url, - html_options.merge('data-alchemy-dialog' => options.to_json) + html_options.merge("data-alchemy-dialog" => options.to_json) end # Used for translations selector in Alchemy cockpit user settings. @@ -99,13 +99,13 @@ def sites_for_select # def js_filter_field(items, options = {}) options = { - class: 'js_filter_field', - data: {'alchemy-list-filter' => items} + class: "js_filter_field", + data: {"alchemy-list-filter" => items}, }.merge(options) - content_tag(:div, class: 'js_filter_field_box') do + content_tag(:div, class: "js_filter_field_box") do concat text_field_tag(nil, nil, options) concat render_icon(:search) - concat link_to(render_icon(:times, size: 'xs'), '', class: 'js_filter_field_clear', title: Alchemy.t(:click_to_show_all)) + concat link_to(render_icon(:times, size: "xs"), "", class: "js_filter_field_clear", title: Alchemy.t(:click_to_show_all)) end end @@ -136,12 +136,12 @@ def js_filter_field(items, options = {}) def link_to_confirm_dialog(link_string = "", message = "", url = "", html_options = {}) link_to(link_string, url, html_options.merge( - 'data-alchemy-confirm-delete' => { + "data-alchemy-confirm-delete" => { title: Alchemy.t(:please_confirm), message: message, ok_label: Alchemy.t("Yes"), - cancel_label: Alchemy.t("No") - }.to_json + cancel_label: Alchemy.t("No"), + }.to_json, ) ) end @@ -170,10 +170,10 @@ def button_with_confirm(value = "", url = "", options = {}, html_options = {}) message: Alchemy.t(:confirm_to_proceed), ok_label: Alchemy.t("Yes"), title: Alchemy.t(:please_confirm), - cancel_label: Alchemy.t("No") + cancel_label: Alchemy.t("No"), }.merge(options) - form_tag url, {method: html_options.delete(:method), class: 'button-with-confirm'} do - button_tag value, html_options.merge('data-alchemy-confirm' => options.to_json) + form_tag url, {method: html_options.delete(:method), class: "button-with-confirm"} do + button_tag value, html_options.merge("data-alchemy-confirm" => options.to_json) end end @@ -188,18 +188,18 @@ def button_with_confirm(value = "", url = "", options = {}, html_options = {}) # def delete_button(url, options = {}, html_options = {}) options = { - title: Alchemy.t('Delete'), - message: Alchemy.t('Are you sure?'), - icon: :minus + title: Alchemy.t("Delete"), + message: Alchemy.t("Are you sure?"), + icon: :minus, }.merge(options) button_with_confirm( render_icon(options[:icon]), url, { - message: options[:message] + message: options[:message], }, { - method: 'delete', + method: "delete", title: options[:title], - class: "icon_button #{html_options.delete(:class)}".strip + class: "icon_button #{html_options.delete(:class)}".strip, }.merge(html_options) ) end @@ -259,11 +259,11 @@ def toolbar_button(options = {}) active: false, link_options: {}, dialog_options: {}, - loading_indicator: false + loading_indicator: false, }.merge(options.symbolize_keys) button = render( - 'alchemy/admin/partials/toolbar_button', - options: options + "alchemy/admin/partials/toolbar_button", + options: options, ) if options[:skip_permission_check] || can?(*permission_from_options(options)) button @@ -302,13 +302,13 @@ def toolbar_button(options = {}) def toolbar(options = {}) defaults = { buttons: [], - search: true + search: true, } options = defaults.merge(options) content_for(:toolbar) do content = <<-CONTENT.strip_heredoc #{options[:buttons].map { |button_options| toolbar_button(button_options) }.join} - #{render('alchemy/admin/partials/search_form', url: options[:search_url]) if options[:search]} + #{render("alchemy/admin/partials/search_form", url: options[:search_url]) if options[:search]} CONTENT content.html_safe end @@ -360,7 +360,7 @@ def new_asset_path_with_session_information(asset_type) # The value the input displays. If you pass a String its parsed with +Time.parse+ # def alchemy_datepicker(object, method, html_options = {}) - type = html_options.delete(:type) || 'date' + type = html_options.delete(:type) || "date" date = html_options.delete(:value) || object.send(method.to_sym).presence date = Time.zone.parse(date) if date.is_a?(String) value = date ? date.iso8601 : nil @@ -374,9 +374,9 @@ def alchemy_datepicker(object, method, html_options = {}) def render_hint_for(element) return unless element.has_hint? - content_tag :span, class: 'hint-with-icon' do - render_icon('question-circle') + - content_tag(:span, element.hint.html_safe, class: 'hint-bubble') + content_tag :span, class: "hint-with-icon" do + render_icon("question-circle") + + content_tag(:span, element.hint.html_safe, class: "hint-bubble") end end @@ -386,7 +386,7 @@ def alchemy_body_class controller_name, action_name, content_for(:main_menu_style), - content_for(:alchemy_body_class) + content_for(:alchemy_body_class), ].compact end @@ -405,7 +405,7 @@ def clipboard_select_tag_options(items) # Returns the regular expression used for external url validation in link dialog. def link_url_regexp - Alchemy::Config.get(:format_matchers)['link_url'] || /^(mailto:|\/|[a-z]+:\/\/)/ + Alchemy::Config.get(:format_matchers)["link_url"] || /^(mailto:|\/|[a-z]+:\/\/)/ end # Renders a hint with tooltip @@ -418,9 +418,9 @@ def link_url_regexp # @param icon: 'exclamation-triangle' [String] - Icon name # # @return [String] - def hint_with_tooltip(text, icon: 'exclamation-triangle') - content_tag :span, class: 'hint-with-icon' do - render_icon(icon) + content_tag(:span, text, class: 'hint-bubble') + def hint_with_tooltip(text, icon: "exclamation-triangle") + content_tag :span, class: "hint-with-icon" do + render_icon(icon) + content_tag(:span, text, class: "hint-bubble") end end @@ -428,7 +428,7 @@ def hint_with_tooltip(text, icon: 'exclamation-triangle') # that explains the user that the page layout is missing def page_layout_missing_warning hint_with_tooltip( - Alchemy.t(:page_definition_missing) + Alchemy.t(:page_definition_missing), ) end @@ -443,10 +443,10 @@ def permission_from_options(options) end def permission_array_from_url(options) - action_controller = options[:url].gsub(/\A\//, '').split('/') + action_controller = options[:url].gsub(/\A\//, "").split("/") [ action_controller.last.to_sym, - action_controller[0..action_controller.length - 2].join('_').to_sym + action_controller[0..action_controller.length - 2].join("_").to_sym, ] end end diff --git a/app/helpers/alchemy/admin/contents_helper.rb b/app/helpers/alchemy/admin/contents_helper.rb index 609d6980a7..18b4fcf214 100644 --- a/app/helpers/alchemy/admin/contents_helper.rb +++ b/app/helpers/alchemy/admin/contents_helper.rb @@ -13,7 +13,7 @@ module ContentsHelper # def render_content_name(content) if content.blank? - warning('Content is nil') + warning("Content is nil") return end @@ -23,7 +23,7 @@ def render_content_name(content) warning("Content #{content.name} is missing its definition") icon = hint_with_tooltip( - Alchemy.t(:content_definition_missing) + Alchemy.t(:content_definition_missing), ) content_name = "#{icon} #{content_name}".html_safe @@ -39,7 +39,7 @@ def render_content_name(content) # Renders the label and a remove link for a content. def content_label(content) content_tag :label, for: content.form_field_id do - [render_hint_for(content), render_content_name(content)].compact.join(' ').html_safe + [render_hint_for(content), render_content_name(content)].compact.join(" ").html_safe end end end diff --git a/app/helpers/alchemy/admin/elements_helper.rb b/app/helpers/alchemy/admin/elements_helper.rb index 07b01eb8ca..56d0aeec66 100644 --- a/app/helpers/alchemy/admin/elements_helper.rb +++ b/app/helpers/alchemy/admin/elements_helper.rb @@ -16,8 +16,8 @@ def elements_for_select(elements) elements.collect do |e| [ - Element.display_name_for(e['name']), - e['name'] + Element.display_name_for(e["name"]), + e["name"], ] end end diff --git a/app/helpers/alchemy/admin/essences_helper.rb b/app/helpers/alchemy/admin/essences_helper.rb index 9f67587dca..00fefb240a 100644 --- a/app/helpers/alchemy/admin/essences_helper.rb +++ b/app/helpers/alchemy/admin/essences_helper.rb @@ -13,17 +13,17 @@ def essence_picture_thumbnail(content) image_tag( essence.thumbnail_url, alt: picture.name, - class: 'img_paddingtop', - title: Alchemy.t(:image_name) + ": #{picture.name}" + class: "img_paddingtop", + title: Alchemy.t(:image_name) + ": #{picture.name}", ) end # Size value for edit picture dialog def edit_picture_dialog_size(content) if content.settings[:caption_as_textarea] - content.settings[:sizes] ? '380x320' : '380x300' + content.settings[:sizes] ? "380x320" : "380x300" else - content.settings[:sizes] ? '380x290' : '380x255' + content.settings[:sizes] ? "380x290" : "380x255" end end end diff --git a/app/helpers/alchemy/admin/form_helper.rb b/app/helpers/alchemy/admin/form_helper.rb index 2e0dc0a9cd..1a132029a2 100644 --- a/app/helpers/alchemy/admin/form_helper.rb +++ b/app/helpers/alchemy/admin/form_helper.rb @@ -19,7 +19,7 @@ def alchemy_form_for(object, *args, &block) options[:remote] = request.xhr? options[:html] = { id: options.delete(:id), - class: ["alchemy", options.delete(:class)].compact.join(' ') + class: ["alchemy", options.delete(:class)].compact.join(" "), } simple_form_for(object, *(args << options), &block) end diff --git a/app/helpers/alchemy/admin/navigation_helper.rb b/app/helpers/alchemy/admin/navigation_helper.rb index 846e08a628..63654d9cc3 100644 --- a/app/helpers/alchemy/admin/navigation_helper.rb +++ b/app/helpers/alchemy/admin/navigation_helper.rb @@ -12,9 +12,9 @@ module NavigationHelper # def alchemy_main_navigation_entry(alchemy_module) render( - 'alchemy/admin/partials/main_navigation_entry', + "alchemy/admin/partials/main_navigation_entry", alchemy_module: alchemy_module, - navigation: alchemy_module['navigation'] + navigation: alchemy_module["navigation"], ) end @@ -36,8 +36,8 @@ def alchemy_main_navigation_entry(alchemy_module) # def navigate_module(navigation) [ - navigation['action'].to_sym, - navigation['controller'].to_s.gsub(/\A\//, '').gsub(/\//, '_').to_sym + navigation["action"].to_sym, + navigation["controller"].to_s.gsub(/\A\//, "").gsub(/\//, "_").to_sym, ] end @@ -45,9 +45,9 @@ def navigate_module(navigation) # def main_navigation_css_classes(navigation) [ - 'main_navi_entry', - admin_mainnavi_active?(navigation) ? 'active' : nil, - navigation.key?('sub_navigation') ? 'has_sub_navigation' : nil + "main_navi_entry", + admin_mainnavi_active?(navigation) ? "active" : nil, + navigation.key?("sub_navigation") ? "has_sub_navigation" : nil, ].compact end @@ -74,8 +74,8 @@ def entry_active?(entry) # def url_for_module(alchemy_module) route_from_engine_or_main_app( - alchemy_module['engine_name'], - url_options_for_module(alchemy_module) + alchemy_module["engine_name"], + url_options_for_module(alchemy_module), ) end @@ -93,8 +93,8 @@ def url_for_module_sub_navigation(navigation) return if alchemy_module.nil? route_from_engine_or_main_app( - alchemy_module['engine_name'], - url_options_for_navigation_entry(navigation) + alchemy_module["engine_name"], + url_options_for_navigation_entry(navigation), ) end @@ -106,13 +106,13 @@ def sorted_alchemy_modules sorted = [] not_sorted = [] alchemy_modules.map do |m| - if m['position'].blank? + if m["position"].blank? not_sorted << m else sorted << m end end - sorted.sort_by { |m| m['position'] } + not_sorted + sorted.sort_by { |m| m["position"] } + not_sorted end private @@ -138,7 +138,7 @@ def route_from_engine_or_main_app(engine_name, url_options) # A Alchemy module definition # def url_options_for_module(alchemy_module) - url_options_for_navigation_entry(alchemy_module['navigation'] || {}) + url_options_for_navigation_entry(alchemy_module["navigation"] || {}) end # Returns a url options hash for given navigation entry. @@ -148,26 +148,26 @@ def url_options_for_module(alchemy_module) # def url_options_for_navigation_entry(entry) { - controller: entry['controller'], - action: entry['action'], + controller: entry["controller"], + action: entry["action"], only_path: true, - params: entry['params'] + params: entry["params"], }.delete_if { |_k, v| v.nil? } end # Retrieves the current Alchemy module from controller and index action. # def current_alchemy_module - module_definition_for(controller: params[:controller], action: 'index') + module_definition_for(controller: params[:controller], action: "index") end # Returns true if the current controller and action is in a modules navigation definition. # def admin_mainnavi_active?(navigation) # Has the given navigation entry a active sub navigation? - has_active_entry?(navigation['sub_navigation'] || []) || + has_active_entry?(navigation["sub_navigation"] || []) || # Has the given navigation entry a active nested navigation? - has_active_entry?(navigation['nested'] || []) || + has_active_entry?(navigation["nested"] || []) || # Is the navigation entry active? entry_active?(navigation || {}) end @@ -175,7 +175,7 @@ def admin_mainnavi_active?(navigation) # Returns true if the given entry's controller is current controller # def is_entry_controller_active?(entry) - entry['controller'].gsub(/\A\//, '') == params[:controller] + entry["controller"].gsub(/\A\//, "") == params[:controller] end # Returns true if the given entry's action is current controllers action @@ -183,8 +183,8 @@ def is_entry_controller_active?(entry) # Also checks if given entry has a +nested_actions+ key, if so it checks if one of them is current controller's action # def is_entry_action_active?(entry) - entry['action'] == params[:action] || - entry.fetch('nested_actions', []).include?(params[:action]) + entry["action"] == params[:action] || + entry.fetch("nested_actions", []).include?(params[:action]) end # Returns true if an entry of given entries is active. diff --git a/app/helpers/alchemy/admin/pages_helper.rb b/app/helpers/alchemy/admin/pages_helper.rb index f46664bff3..af2037bf3e 100644 --- a/app/helpers/alchemy/admin/pages_helper.rb +++ b/app/helpers/alchemy/admin/pages_helper.rb @@ -9,13 +9,13 @@ module PagesHelper # def preview_sizes_for_select options_for_select([ - 'auto', - [Alchemy.t('240', scope: 'preview_sizes'), 240], - [Alchemy.t('320', scope: 'preview_sizes'), 320], - [Alchemy.t('480', scope: 'preview_sizes'), 480], - [Alchemy.t('768', scope: 'preview_sizes'), 768], - [Alchemy.t('1024', scope: 'preview_sizes'), 1024], - [Alchemy.t('1280', scope: 'preview_sizes'), 1280] + "auto", + [Alchemy.t("240", scope: "preview_sizes"), 240], + [Alchemy.t("320", scope: "preview_sizes"), 320], + [Alchemy.t("480", scope: "preview_sizes"), 480], + [Alchemy.t("768", scope: "preview_sizes"), 768], + [Alchemy.t("1024", scope: "preview_sizes"), 1024], + [Alchemy.t("1280", scope: "preview_sizes"), 1280], ]) end @@ -27,8 +27,8 @@ def page_layout_label(page) if page.persisted? && page.definition.blank? [ page_layout_missing_warning, - Alchemy.t(:page_type) - ].join(' ').html_safe + Alchemy.t(:page_type), + ].join(" ").html_safe else Alchemy.t(:page_type) end @@ -39,10 +39,10 @@ def page_status_checkbox(page, attribute) if page.attribute_fixed?(attribute) checkbox = check_box(:page, attribute, disabled: true) - hint = content_tag(:span, class: 'hint-bubble') do + hint = content_tag(:span, class: "hint-bubble") do Alchemy.t(:attribute_fixed, attribute: attribute) end - content = content_tag(:span, class: 'with-hint') do + content = content_tag(:span, class: "with-hint") do "#{checkbox}\n#{label}\n#{hint}".html_safe end else @@ -50,7 +50,7 @@ def page_status_checkbox(page, attribute) content = "#{checkbox}\n#{label}".html_safe end - content_tag(:label, class: 'checkbox') { content } + content_tag(:label, class: "checkbox") { content } end end end diff --git a/app/helpers/alchemy/admin/pictures_helper.rb b/app/helpers/alchemy/admin/pictures_helper.rb index 0cf9ab0ec4..d2c5f47cc4 100644 --- a/app/helpers/alchemy/admin/pictures_helper.rb +++ b/app/helpers/alchemy/admin/pictures_helper.rb @@ -4,12 +4,10 @@ module Alchemy module Admin module PicturesHelper def preview_size(size) - case size - when 'small' then '80x60' - when 'large' then '240x180' - else - '160x120' - end + Alchemy::Picture::THUMBNAIL_SIZES.fetch( + size, + Alchemy::Picture::THUMBNAIL_SIZES[:medium] + ) end end end diff --git a/app/helpers/alchemy/admin/tags_helper.rb b/app/helpers/alchemy/admin/tags_helper.rb index c9e7a9709a..05212f15f0 100644 --- a/app/helpers/alchemy/admin/tags_helper.rb +++ b/app/helpers/alchemy/admin/tags_helper.rb @@ -12,18 +12,18 @@ module TagsHelper # A HTML string containing
  • tags # def render_tag_list(class_name) - raise ArgumentError, 'Please provide a String as class_name' if class_name.nil? + raise ArgumentError, "Please provide a String as class_name" if class_name.nil? sorted_tags_from(class_name: class_name).map do |tag| - content_tag('li', name: tag.name, class: filtered_by_tag?(tag) ? 'active' : nil) do + content_tag("li", name: tag.name, class: filtered_by_tag?(tag) ? "active" : nil) do link_to( "#{tag.name} (#{tag.taggings_count})", url_for( search_filter_params.except(:page, :tagged_with).merge( - tagged_with: tags_for_filter(current: tag).presence - ) + tagged_with: tags_for_filter(current: tag).presence, + ), ), - remote: request.xhr? + remote: request.xhr?, ) end end.join.html_safe @@ -44,13 +44,13 @@ def tags_for_filter(current:) tags_from_params - Array(current.name) else tags_from_params.push(current.name) - end.uniq.join(',') + end.uniq.join(",") end # Returns tags from params # @returns [Array] def tags_from_params - search_filter_params[:tagged_with].to_s.split(',') + search_filter_params[:tagged_with].to_s.split(",") end def sorted_tags_from(class_name:) diff --git a/app/helpers/alchemy/base_helper.rb b/app/helpers/alchemy/base_helper.rb index 55c60f98c3..76b9826326 100644 --- a/app/helpers/alchemy/base_helper.rb +++ b/app/helpers/alchemy/base_helper.rb @@ -27,16 +27,16 @@ def warning(message, text = nil) # # @return [String] def render_icon(icon_class, options = {}) - options = {style: 'solid'}.merge(options) + options = {style: "solid"}.merge(options) classes = [ "icon fa-fw", "fa-#{icon_class}", "fa#{options[:style].first}", options[:size] ? "fa-#{options[:size]}" : nil, options[:transform] ? "fa-#{options[:transform]}" : nil, - options[:class] + options[:class], ].compact - content_tag('i', nil, class: classes) + content_tag("i", nil, class: classes) end # Returns a div with an icon and the passed content @@ -64,7 +64,7 @@ def render_message(type = :info, msg = nil, &blk) # @param [Symbol] style The style of this flash. Valid values are +:notice+ (default), +:warn+ and +:error+ # def render_flash_notice(notice, style = :notice) - render('alchemy/admin/partials/flash', flash_type: style, message: notice) + render("alchemy/admin/partials/flash", flash_type: style, message: notice) end # Checks if the given argument is a String or a Page object. @@ -93,9 +93,9 @@ def page_or_find(page) # @return [String] The FontAwesome icon name def message_icon_class(message_type) case message_type.to_s - when 'warning', 'warn', 'alert' then 'exclamation' - when 'notice' then 'check' - when 'error' then 'bug' + when "warning", "warn", "alert" then "exclamation" + when "notice" then "check" + when "error" then "bug" else message_type end diff --git a/app/helpers/alchemy/elements_block_helper.rb b/app/helpers/alchemy/elements_block_helper.rb index 91aafeed07..6d5e0459c8 100644 --- a/app/helpers/alchemy/elements_block_helper.rb +++ b/app/helpers/alchemy/elements_block_helper.rb @@ -33,7 +33,7 @@ def render(name, options = {}, html_options = {}) helpers.render(content, { content: content, options: options, - html_options: html_options + html_options: html_options, }) end @@ -107,7 +107,7 @@ def element_view_for(element, options = {}) tag: :div, id: element_dom_id(element), class: element.name, - tags_formatter: ->(tags) { tags.join(" ") } + tags_formatter: ->(tags) { tags.join(" ") }, }.merge(options) # capture inner template block diff --git a/app/helpers/alchemy/elements_helper.rb b/app/helpers/alchemy/elements_helper.rb index 981ee81503..0d3e31e247 100644 --- a/app/helpers/alchemy/elements_helper.rb +++ b/app/helpers/alchemy/elements_helper.rb @@ -91,7 +91,7 @@ module ElementsHelper def render_elements(options = {}) options = { from_page: @page, - render_format: 'html' + render_format: "html", }.update(options) finder = options[:finder] || Alchemy::ElementsFinder.new(options) @@ -150,8 +150,8 @@ def render_elements(options = {}) # def render_element(element, options = {}, counter = 1) if element.nil? - warning('Element is nil') - render "alchemy/elements/view_not_found", {name: 'nil'} + warning("Element is nil") + render "alchemy/elements/view_not_found", {name: "nil"} return end @@ -160,7 +160,7 @@ def render_element(element, options = {}, counter = 1) render element, { element: element, counter: counter, - options: options + options: options, }.merge(options.delete(:locals) || {}) rescue ActionView::MissingTemplate => e warning(%( @@ -179,19 +179,14 @@ def element_dom_id(element) # Renders the HTML tag attributes required for preview mode. def element_preview_code(element) - if respond_to?(:tag_options) - tag_options(element_preview_code_attributes(element)) - else - # Rails 5.1 uses TagBuilder - tag_builder.tag_options(element_preview_code_attributes(element)) - end + tag_builder.tag_options(element_preview_code_attributes(element)) end # Returns a hash containing the HTML tag attributes required for preview mode. def element_preview_code_attributes(element) return {} unless element.present? && @preview_mode && element.page == @page - { 'data-alchemy-element' => element.id } + { "data-alchemy-element" => element.id } end # Returns the element's tags information as a string. Parameters and options @@ -203,12 +198,7 @@ def element_preview_code_attributes(element) # HTML tag attributes containing the element's tag information. # def element_tags(element, options = {}) - if respond_to?(:tag_options) - tag_options(element_tags_attributes(element, options)) - else - # Rails 5.1 uses TagBuilder - tag_builder.tag_options(element_tags_attributes(element, options)) - end + tag_builder.tag_options(element_tags_attributes(element, options)) end # Returns the element's tags information as an attribute hash. @@ -224,12 +214,12 @@ def element_tags(element, options = {}) # def element_tags_attributes(element, options = {}) options = { - formatter: lambda { |tags| tags.join(' ') } + formatter: lambda { |tags| tags.join(" ") }, }.merge(options) return {} if !element.taggable? || element.tag_list.blank? - { 'data-element-tags' => options[:formatter].call(element.tag_list) } + { "data-element-tags" => options[:formatter].call(element.tag_list) } end end end diff --git a/app/helpers/alchemy/pages_helper.rb b/app/helpers/alchemy/pages_helper.rb index b9af4d9c5c..c98ee22d4c 100644 --- a/app/helpers/alchemy/pages_helper.rb +++ b/app/helpers/alchemy/pages_helper.rb @@ -25,19 +25,19 @@ def picture_essence_caption(content) # def language_links(options = {}) options = { - linkname: 'name', + linkname: "name", show_title: true, - spacer: '', - reverse: false + spacer: "", + reverse: false, }.merge(options) - languages = Language.on_current_site.published.with_root_page.order("name #{options[:reverse] ? 'DESC' : 'ASC'}") + languages = Language.on_current_site.published.with_root_page.order("name #{options[:reverse] ? "DESC" : "ASC"}") return nil if languages.count < 2 render( partial: "alchemy/language_links/language", collection: languages, spacer_template: "alchemy/language_links/spacer", - locals: {languages: languages, options: options} + locals: { languages: languages, options: options }, ) end @@ -51,7 +51,7 @@ def render_page_layout render @page, page: @page rescue ActionView::MissingTemplate warning("PageLayout: '#{@page.page_layout}' not found. Rendering standard page_layout.") - render 'alchemy/page_layouts/standard', page: @page + render "alchemy/page_layouts/standard", page: @page end # Renders a partial for current site @@ -78,26 +78,22 @@ def render_site_layout # Menu partials are placed in the `app/views/alchemy/menus` folder # Use the `rails g alchemy:menus` generator to create the partials # - # @param [String] - Name of the menu + # @param [String] - Type of the menu # @param [Hash] - A set of options available in your menu partials - def render_menu(name, options = {}) + def render_menu(menu_type, options = {}) root_node = Alchemy::Node.roots.find_by( - name: name, - language: Alchemy::Language.current + menu_type: menu_type, + language: Alchemy::Language.current, ) if root_node.nil? - warning("Menu with name #{name} not found!") + warning("Menu with type #{menu_type} not found!") return end - options = { - node_partial_name: "#{root_node.view_folder_name}/node" - }.merge(options) - - render(root_node.to_partial_path, menu: root_node, node: root_node, options: options) + render("alchemy/menus/#{menu_type}/wrapper", menu: root_node, options: options) rescue ActionView::MissingTemplate => e warning <<~WARN - Menu partial not found for #{name}. + Menu partial not found for #{menu_type}. #{e} WARN end @@ -124,11 +120,11 @@ def render_breadcrumb(options = {}) page: @page, restricted_only: false, reverse: false, - link_active_page: false + link_active_page: false, }.merge(options) - pages = Page. - ancestors_for(options[:page]). + pages = options[:page]. + self_and_ancestors.contentpages. accessible_by(current_ability, :see) if options.delete(:restricted_only) @@ -136,7 +132,7 @@ def render_breadcrumb(options = {}) end if options.delete(:reverse) - pages = pages.reorder('lft DESC') + pages = pages.reorder("lft DESC") end if options[:without].present? @@ -144,7 +140,7 @@ def render_breadcrumb(options = {}) pages = pages.where.not(id: without.try(:collect, &:id) || without.id) end - render 'alchemy/breadcrumb/wrapper', pages: pages, options: options + render "alchemy/breadcrumb/wrapper", pages: pages, options: options end # Returns current page title @@ -160,7 +156,7 @@ def page_title(options = {}) options = { prefix: "", suffix: "", - separator: "" + separator: "", }.update(options) title_parts = [options[:prefix]] if response.status == 200 @@ -181,7 +177,7 @@ def meta_keywords end def meta_robots - "#{@page.robot_index? ? '' : 'no'}index, #{@page.robot_follow? ? '' : 'no'}follow" + "#{@page.robot_index? ? "" : "no"}index, #{@page.robot_follow? ? "" : "no"}follow" end end end diff --git a/app/helpers/alchemy/url_helper.rb b/app/helpers/alchemy/url_helper.rb index 0ce6846d80..a628ac6ecd 100644 --- a/app/helpers/alchemy/url_helper.rb +++ b/app/helpers/alchemy/url_helper.rb @@ -18,7 +18,7 @@ def show_alchemy_page_url(page, optional_params = {}) # Returns the correct params-hash for passing to show_page_path def show_page_path_params(page, optional_params = {}) - raise ArgumentError, 'Page is nil' if page.nil? + raise ArgumentError, "Page is nil" if page.nil? url_params = {urlname: page.urlname}.update(optional_params) prefix_locale? ? url_params.update(locale: page.language_code) : url_params diff --git a/app/mailers/alchemy/base_mailer.rb b/app/mailers/alchemy/base_mailer.rb index 7a72340240..ff69598fdc 100644 --- a/app/mailers/alchemy/base_mailer.rb +++ b/app/mailers/alchemy/base_mailer.rb @@ -2,7 +2,7 @@ module Alchemy begin - base_class = Object.const_get('::ApplicationMailer') + base_class = Object.const_get("::ApplicationMailer") rescue NameError base_class = ActionMailer::Base end diff --git a/app/mailers/alchemy/messages_mailer.rb b/app/mailers/alchemy/messages_mailer.rb index 61640737e3..b5d2e77080 100644 --- a/app/mailers/alchemy/messages_mailer.rb +++ b/app/mailers/alchemy/messages_mailer.rb @@ -8,7 +8,7 @@ def contact_form_mail(message, mail_to, mail_from, subject) from: mail_from, to: mail_to, reply_to: message.try(:email), - subject: subject + subject: subject, ) end end diff --git a/app/models/alchemy/attachment.rb b/app/models/alchemy/attachment.rb index a3b9a451eb..080247d20b 100644 --- a/app/models/alchemy/attachment.rb +++ b/app/models/alchemy/attachment.rb @@ -22,7 +22,7 @@ class Attachment < BaseRecord include Alchemy::Filetypes include Alchemy::NameConversions include Alchemy::Taggable - include Alchemy::ContentTouching + include Alchemy::TouchElements dragonfly_accessor :file, app: :alchemy_attachments do after_assign { |f| write_attribute(:file_mime_type, f.mime_type) } @@ -30,7 +30,7 @@ class Attachment < BaseRecord stampable stamper_class_name: Alchemy.user_class_name - has_many :essence_files, class_name: 'Alchemy::EssenceFile', foreign_key: 'attachment_id' + has_many :essence_files, class_name: "Alchemy::EssenceFile", foreign_key: "attachment_id" has_many :contents, through: :essence_files has_many :elements, through: :contents has_many :pages, through: :elements @@ -42,24 +42,25 @@ def searchable_alchemy_resource_attributes end def allowed_filetypes - Config.get(:uploader).fetch('allowed_filetypes', {}).fetch('alchemy/attachments', []) + Config.get(:uploader).fetch("allowed_filetypes", {}).fetch("alchemy/attachments", []) end def file_types_for_select file_types = Alchemy::Attachment.pluck(:file_mime_type).uniq.map do |type| - [Alchemy.t(type, scope: 'mime_types'), type] + [Alchemy.t(type, scope: "mime_types"), type] end file_types.sort_by(&:first) end end validates_presence_of :file - validates_size_of :file, maximum: Config.get(:uploader)['file_size_limit'].megabytes - validates_property :ext, of: :file, + validates_size_of :file, maximum: Config.get(:uploader)["file_size_limit"].megabytes + validates_property :ext, + of: :file, in: allowed_filetypes, case_sensitive: false, message: Alchemy.t("not a valid file"), - unless: -> { self.class.allowed_filetypes.include?('*') } + unless: -> { self.class.allowed_filetypes.include?("*") } before_save :set_name, if: :file_name_changed? @@ -71,13 +72,13 @@ def to_jq_upload { "name" => read_attribute(:file_name), "size" => read_attribute(:file_size), - 'error' => errors[:file].join + "error" => errors[:file].join, } end # An url save filename without format suffix def urlname - CGI.escape(file_name.gsub(/\.#{extension}$/, '').tr('.', ' ')) + CGI.escape(file_name.gsub(/\.#{extension}$/, "").tr(".", " ")) end # Checks if the attachment is restricted, because it is attached on restricted pages only @@ -89,6 +90,7 @@ def restricted? def extension file_name.split(".").last end + alias_method :suffix, :extension # Returns a css class name for kind of file diff --git a/app/models/alchemy/base_record.rb b/app/models/alchemy/base_record.rb index 3a023c6460..300e372563 100644 --- a/app/models/alchemy/base_record.rb +++ b/app/models/alchemy/base_record.rb @@ -1,14 +1,10 @@ # frozen_string_literal: true module Alchemy def self.table_name_prefix - 'alchemy_' + "alchemy_" end class BaseRecord < ActiveRecord::Base self.abstract_class = true - - def active_record_5_1? - ActiveRecord.gem_version >= Gem::Version.new('5.1.0') - end end end diff --git a/app/models/alchemy/content.rb b/app/models/alchemy/content.rb index 25621726c7..c6b34e5f28 100644 --- a/app/models/alchemy/content.rb +++ b/app/models/alchemy/content.rb @@ -28,29 +28,25 @@ class Content < BaseRecord belongs_to :element, touch: true, inverse_of: :contents has_one :page, through: :element - stampable stamper_class_name: Alchemy.user_class_name - - acts_as_list scope: [:element_id] - # Essence scopes - scope :essence_booleans, -> { where(essence_type: "Alchemy::EssenceBoolean") } - scope :essence_dates, -> { where(essence_type: "Alchemy::EssenceDate") } - scope :essence_files, -> { where(essence_type: "Alchemy::EssenceFile") } - scope :essence_htmls, -> { where(essence_type: "Alchemy::EssenceHtml") } - scope :essence_links, -> { where(essence_type: "Alchemy::EssenceLink") } - scope :essence_pictures, -> { where(essence_type: "Alchemy::EssencePicture") } + scope :essence_booleans, -> { where(essence_type: "Alchemy::EssenceBoolean") } + scope :essence_dates, -> { where(essence_type: "Alchemy::EssenceDate") } + scope :essence_files, -> { where(essence_type: "Alchemy::EssenceFile") } + scope :essence_htmls, -> { where(essence_type: "Alchemy::EssenceHtml") } + scope :essence_links, -> { where(essence_type: "Alchemy::EssenceLink") } + scope :essence_pictures, -> { where(essence_type: "Alchemy::EssencePicture") } scope :essence_richtexts, -> { where(essence_type: "Alchemy::EssenceRichtext") } - scope :essence_selects, -> { where(essence_type: "Alchemy::EssenceSelect") } - scope :essence_texts, -> { where(essence_type: "Alchemy::EssenceText") } - scope :named, ->(name) { where(name: name) } - scope :available, -> { published.not_trashed } - scope :published, -> { joins(:element).merge(Element.published) } - scope :not_trashed, -> { joins(:element).merge(Element.not_trashed) } - scope :not_restricted, -> { joins(:element).merge(Element.not_restricted) } - - delegate :restricted?, to: :page, allow_nil: true - delegate :trashed?, to: :element, allow_nil: true - delegate :public?, to: :element, allow_nil: true + scope :essence_selects, -> { where(essence_type: "Alchemy::EssenceSelect") } + scope :essence_texts, -> { where(essence_type: "Alchemy::EssenceText") } + scope :named, ->(name) { where(name: name) } + scope :available, -> { published.not_trashed } + scope :published, -> { joins(:element).merge(Element.published) } + scope :not_trashed, -> { joins(:element).merge(Element.not_trashed) } + scope :not_restricted, -> { joins(:element).merge(Element.not_restricted) } + + delegate :restricted?, to: :page, allow_nil: true + delegate :trashed?, to: :element, allow_nil: true + delegate :public?, to: :element, allow_nil: true class << self # Returns the translated label for a content name. @@ -72,7 +68,7 @@ def translated_label_for(content_name, element_name = nil) Alchemy.t( content_name, scope: "content_names.#{element_name}", - default: Alchemy.t("content_names.#{content_name}", default: content_name.humanize) + default: Alchemy.t("content_names.#{content_name}", default: content_name.humanize), ) end end @@ -132,7 +128,7 @@ def serialize { name: name, value: serialized_ingredient, - link: essence.try(:link) + link: essence.try(:link), }.delete_if { |_k, v| v.blank? } end @@ -174,12 +170,12 @@ def essence_validation_failed? end def has_validations? - definition['validate'].present? + definition["validate"].present? end # Returns a string used as dom id on html elements. def dom_id - return '' if essence.nil? + return "" if essence.nil? "#{essence_partial_name}_#{id}" end @@ -195,7 +191,7 @@ def linked? # Returns true if this content should be taken for element preview. def preview_content? - !!definition['as_element_title'] + !!definition["as_element_title"] end # Proxy method that returns the preview text from essence. @@ -205,7 +201,7 @@ def preview_text(maxlength = 30) end def essence_partial_name - return '' if essence.nil? + return "" if essence.nil? essence.partial_name end diff --git a/app/models/alchemy/content/factory.rb b/app/models/alchemy/content/factory.rb index c01ba3505b..44c197125a 100644 --- a/app/models/alchemy/content/factory.rb +++ b/app/models/alchemy/content/factory.rb @@ -56,11 +56,11 @@ def copy(source, differences = {}) new_content = Content.new( source.attributes. except(*SKIPPED_ATTRIBUTES_ON_COPY). - merge(differences.with_indifferent_access) + merge(differences.with_indifferent_access), ) new_essence = source.essence.class.create!( source.essence.attributes. - except(*SKIPPED_ATTRIBUTES_ON_COPY) + except(*SKIPPED_ATTRIBUTES_ON_COPY), ) new_content.tap do |content| content.essence = new_essence @@ -71,7 +71,7 @@ def copy(source, differences = {}) # Returns all content definitions from elements.yml # def definitions - definitions = Element.definitions.flat_map { |e| e['contents'] } + definitions = Element.definitions.flat_map { |e| e["contents"] } definitions.compact! definitions end @@ -119,7 +119,7 @@ def definition # def build_essence(type = essence_type) self.essence = essence_class(type).new({ - ingredient: default_value + ingredient: default_value, }) end @@ -139,7 +139,7 @@ def create_essence!(type = nil) # If an optional type is passed, this type of essence gets constantized. # def essence_class(type = nil) - Content.normalize_essence_type(type || definition['type']).constantize + Content.normalize_essence_type(type || definition["type"]).constantize end end end diff --git a/app/models/alchemy/element.rb b/app/models/alchemy/element.rb index 2385a3269c..4cef90a3b2 100644 --- a/app/models/alchemy/element.rb +++ b/app/models/alchemy/element.rb @@ -22,6 +22,8 @@ module Alchemy class Element < BaseRecord + NAME_REGEXP = /\A[a-z0-9_-]+\z/ + include Alchemy::Logger include Alchemy::Taggable include Alchemy::Hints @@ -34,7 +36,7 @@ class Element < BaseRecord "hint", "taggable", "compact", - "message" + "message", ].freeze SKIPPED_ATTRIBUTES_ON_COPY = [ @@ -45,7 +47,7 @@ class Element < BaseRecord "folded", "position", "updated_at", - "updater_id" + "updater_id", ].freeze # All Elements that share the same page id and parent element id and are fixed or not are considered a list. @@ -60,17 +62,17 @@ class Element < BaseRecord stampable stamper_class_name: Alchemy.user_class_name - has_many :contents, -> { order(:position) }, dependent: :destroy, inverse_of: :element + has_many :contents, dependent: :destroy, inverse_of: :element has_many :all_nested_elements, -> { order(:position).not_trashed }, - class_name: 'Alchemy::Element', + class_name: "Alchemy::Element", foreign_key: :parent_element_id, dependent: :destroy has_many :nested_elements, -> { order(:position).available }, - class_name: 'Alchemy::Element', + class_name: "Alchemy::Element", foreign_key: :parent_element_id, dependent: :destroy, inverse_of: :parent_element @@ -79,17 +81,17 @@ class Element < BaseRecord # A nested element belongs to a parent element. belongs_to :parent_element, - class_name: 'Alchemy::Element', + class_name: "Alchemy::Element", optional: true, touch: true, inverse_of: :nested_elements has_and_belongs_to_many :touchable_pages, -> { distinct }, - class_name: 'Alchemy::Page', + class_name: "Alchemy::Page", join_table: ElementToPage.table_name validates_presence_of :name, on: :create - validates_format_of :name, on: :create, with: /\A[a-z0-9_-]+\z/ + validates_format_of :name, on: :create, with: NAME_REGEXP attr_accessor :autogenerate_contents attr_accessor :autogenerate_nested_elements @@ -98,19 +100,19 @@ class Element < BaseRecord after_update :touch_touchable_pages - scope :trashed, -> { where(position: nil).order('updated_at DESC') } - scope :not_trashed, -> { where.not(position: nil) } - scope :published, -> { where(public: true) } - scope :not_restricted, -> { joins(:page).merge(Page.not_restricted) } - scope :available, -> { published.not_trashed } - scope :named, ->(names) { where(name: names) } - scope :excluded, ->(names) { where.not(name: names) } - scope :fixed, -> { where(fixed: true) } - scope :unfixed, -> { where(fixed: false) } - scope :from_current_site, -> { where(Language.table_name => {site_id: Site.current || Site.default}).joins(page: 'language') } - scope :folded, -> { where(folded: true) } - scope :expanded, -> { where(folded: false) } - scope :not_nested, -> { where(parent_element_id: nil) } + scope :trashed, -> { where(position: nil).order("updated_at DESC") } + scope :not_trashed, -> { where.not(position: nil) } + scope :published, -> { where(public: true) } + scope :not_restricted, -> { joins(:page).merge(Page.not_restricted) } + scope :available, -> { published.not_trashed } + scope :named, ->(names) { where(name: names) } + scope :excluded, ->(names) { where.not(name: names) } + scope :fixed, -> { where(fixed: true) } + scope :unfixed, -> { where(fixed: false) } + scope :from_current_site, -> { where(Language.table_name => { site_id: Site.current || Site.default }).joins(page: "language") } + scope :folded, -> { where(folded: true) } + scope :expanded, -> { where(folded: false) } + scope :not_nested, -> { where(parent_element_id: nil) } delegate :restricted?, to: :page, allow_nil: true @@ -132,7 +134,7 @@ class << self def new(attributes = {}) return super if attributes[:name].blank? - element_attributes = attributes.to_h.merge(name: attributes[:name].split('#').first) + element_attributes = attributes.to_h.merge(name: attributes[:name].split("#").first) element_definition = Element.definition_by_name(element_attributes[:name]) if element_definition.nil? raise(ElementDefinitionError, attributes) @@ -154,13 +156,13 @@ def new(attributes = {}) # def copy(source_element, differences = {}) attributes = source_element.attributes.with_indifferent_access - .except(*SKIPPED_ATTRIBUTES_ON_COPY) - .merge(differences) - .merge({ - autogenerate_contents: false, - autogenerate_nested_elements: false, - tag_list: source_element.tag_list - }) + .except(*SKIPPED_ATTRIBUTES_ON_COPY) + .merge(differences) + .merge({ + autogenerate_contents: false, + autogenerate_nested_elements: false, + tag_list: source_element.tag_list, + }) new_element = create!(attributes) @@ -178,7 +180,7 @@ def copy(source_element, differences = {}) def all_from_clipboard(clipboard) return [] if clipboard.nil? - where(id: clipboard.collect { |e| e['id'] }) + where(id: clipboard.collect { |e| e["id"] }) end # All elements in clipboard that could be placed on page @@ -197,7 +199,7 @@ def all_from_clipboard_for_page(clipboard, page) # Pass an element name to get next of this kind. # def next(name = nil) - elements = page.elements.published.where('position > ?', position) + elements = page.elements.published.where("position > ?", position) select_element(elements, name, :asc) end @@ -206,7 +208,7 @@ def next(name = nil) # Pass an element name to get previous of this kind. # def prev(name = nil) - elements = page.elements.published.where('position < ?', position) + elements = page.elements.published.where("position < ?", position) select_element(elements, name, :desc) end @@ -232,7 +234,7 @@ def trashed? # Returns true if the definition of this element has a taggable true value. def taggable? - definition['taggable'] == true + definition["taggable"] == true end # The opposite of folded? @@ -242,7 +244,7 @@ def expanded? # Defined as compact element? def compact? - definition['compact'] == true + definition["compact"] == true end # The element's view partial is dependent from its name @@ -279,7 +281,7 @@ def cache_key # A collection of element names that can be nested inside this element. def nestable_elements - definition.fetch('nestable_elements', []) + definition.fetch("nestable_elements", []) end # Copy all nested elements from current element to given target element. @@ -287,7 +289,7 @@ def copy_nested_elements_to(target_element) nested_elements.map do |nested_element| Element.copy(nested_element, { parent_element_id: target_element.id, - page_id: target_element.page_id + page_id: target_element.page_id, }) end end @@ -295,7 +297,7 @@ def copy_nested_elements_to(target_element) private def generate_nested_elements - definition.fetch('autogenerate', []).each do |nestable_element| + definition.fetch("autogenerate", []).each do |nestable_element| if nestable_elements.include?(nestable_element) Element.create(page: page, parent_element_id: id, name: nestable_element) else diff --git a/app/models/alchemy/element/definitions.rb b/app/models/alchemy/element/definitions.rb index ed42ab42a2..6bea4c26a0 100644 --- a/app/models/alchemy/element/definitions.rb +++ b/app/models/alchemy/element/definitions.rb @@ -19,7 +19,7 @@ def definitions # Returns one element definition by given name. # def definition_by_name(name) - definitions.detect { |d| d['name'] == name } + definitions.detect { |d| d["name"] == name } end private @@ -37,14 +37,14 @@ def read_definitions_file # Returns the +elements.yml+ file path # def definitions_file_path - Rails.root.join 'config/alchemy/elements.yml' + Rails.root.join "config/alchemy/elements.yml" end end # The definition of this element. # def definition - if definition = self.class.definitions.detect { |d| d['name'] == name } + if definition = self.class.definitions.detect { |d| d["name"] == name } definition else log_warning "Could not find element definition for #{name}. Please check your elements.yml file!" diff --git a/app/models/alchemy/element/element_contents.rb b/app/models/alchemy/element/element_contents.rb index 254b941740..6175097b5a 100644 --- a/app/models/alchemy/element/element_contents.rb +++ b/app/models/alchemy/element/element_contents.rb @@ -73,7 +73,7 @@ def copy_contents_to(element) # rss_title: true # def content_for_rss_title - content_for_rss_meta('title') + content_for_rss_meta("title") end # Returns the content that is marked as rss description. @@ -87,14 +87,14 @@ def content_for_rss_title # rss_description: true # def content_for_rss_description - content_for_rss_meta('description') + content_for_rss_meta("description") end # Returns the array with the hashes for all element contents in the elements.yml file def content_definitions return nil if definition.blank? - definition['contents'] + definition["contents"] end # Returns the definition for given content_name @@ -103,7 +103,7 @@ def content_definition_for(content_name) log_warning "Element #{name} is missing the content definition for #{content_name}" nil else - content_definitions.detect { |d| d['name'] == content_name.to_s } + content_definitions.detect { |d| d["name"] == content_name.to_s } end end @@ -139,12 +139,12 @@ def content_for_rss_meta(type) definition = content_definitions.detect { |c| c["rss_#{type}"] } return if definition.blank? - contents.detect { |content| content.name == definition['name'] } + contents.detect { |content| content.name == definition["name"] } end # creates the contents for this element as described in the elements.yml def create_contents - definition.fetch('contents', []).each do |attributes| + definition.fetch("contents", []).each do |attributes| Content.create(attributes.merge(element: self)) end end diff --git a/app/models/alchemy/element/element_essences.rb b/app/models/alchemy/element/element_essences.rb index 706cde4fb2..e94237a8dc 100644 --- a/app/models/alchemy/element/element_essences.rb +++ b/app/models/alchemy/element/element_essences.rb @@ -97,12 +97,12 @@ def essence_error_messages errors.each do |error| messages << Alchemy.t( "#{name}.#{content_name}.#{error}", - scope: 'content_validations', + scope: "content_validations", default: [ "fields.#{content_name}.#{error}".to_sym, - "errors.#{error}".to_sym + "errors.#{error}".to_sym, ], - field: Content.translated_label_for(content_name, name) + field: Content.translated_label_for(content_name, name), ) end end diff --git a/app/models/alchemy/element/presenters.rb b/app/models/alchemy/element/presenters.rb index 2f08573ef1..2feb754185 100644 --- a/app/models/alchemy/element/presenters.rb +++ b/app/models/alchemy/element/presenters.rb @@ -23,7 +23,7 @@ module ClassMethods # If no translation is found a humanized name is used. # def display_name_for(name) - Alchemy.t(name, scope: 'element_names', default: name.to_s.humanize) + Alchemy.t(name, scope: "element_names", default: name.to_s.humanize) end end @@ -32,7 +32,7 @@ def display_name_for(name) # @see Alchemy::Element::Presenters#display_name_for # def display_name - self.class.display_name_for(definition['name'] || name) + self.class.display_name_for(definition["name"] || name) end # Returns a preview text for element. diff --git a/app/models/alchemy/element_to_page.rb b/app/models/alchemy/element_to_page.rb index f48f6d79ef..4fe35ffb56 100644 --- a/app/models/alchemy/element_to_page.rb +++ b/app/models/alchemy/element_to_page.rb @@ -3,7 +3,7 @@ module Alchemy class ElementToPage def self.table_name - [Alchemy::Element.table_name, Alchemy::Page.table_name].join('_') + [Alchemy::Element.table_name, Alchemy::Page.table_name].join("_") end end end diff --git a/app/models/alchemy/essence_boolean.rb b/app/models/alchemy/essence_boolean.rb index b943e4f67a..075ef37f6a 100644 --- a/app/models/alchemy/essence_boolean.rb +++ b/app/models/alchemy/essence_boolean.rb @@ -8,14 +8,12 @@ # value :boolean # created_at :datetime not null # updated_at :datetime not null -# creator_id :integer -# updater_id :integer # # Stores boolean values. # Provides a checkbox in the editor views. module Alchemy class EssenceBoolean < BaseRecord - acts_as_essence ingredient_column: 'value' + acts_as_essence ingredient_column: "value" end end diff --git a/app/models/alchemy/essence_date.rb b/app/models/alchemy/essence_date.rb index 8b4bfa8534..d3b7db2b4e 100644 --- a/app/models/alchemy/essence_date.rb +++ b/app/models/alchemy/essence_date.rb @@ -6,15 +6,13 @@ # # id :integer not null, primary key # date :datetime -# creator_id :integer -# updater_id :integer # created_at :datetime not null # updated_at :datetime not null # module Alchemy class EssenceDate < BaseRecord - acts_as_essence ingredient_column: 'date' + acts_as_essence ingredient_column: "date" # Returns self.date for the Element#preview_text method. def preview_text(_maxlength = nil) diff --git a/app/models/alchemy/essence_file.rb b/app/models/alchemy/essence_file.rb index c732875553..3485d53a3a 100644 --- a/app/models/alchemy/essence_file.rb +++ b/app/models/alchemy/essence_file.rb @@ -8,8 +8,6 @@ # attachment_id :integer # title :string # css_class :string -# creator_id :integer -# updater_id :integer # created_at :datetime not null # updated_at :datetime not null # link_text :string @@ -18,7 +16,7 @@ module Alchemy class EssenceFile < BaseRecord belongs_to :attachment, optional: true - acts_as_essence ingredient_column: 'attachment' + acts_as_essence ingredient_column: "attachment" def attachment_url return if attachment.nil? @@ -26,7 +24,7 @@ def attachment_url routes.download_attachment_path( id: attachment.id, name: attachment.urlname, - format: attachment.suffix + format: attachment.suffix, ) end diff --git a/app/models/alchemy/essence_html.rb b/app/models/alchemy/essence_html.rb index bb8b5bc7bc..09208db337 100644 --- a/app/models/alchemy/essence_html.rb +++ b/app/models/alchemy/essence_html.rb @@ -6,15 +6,13 @@ # # id :integer not null, primary key # source :text -# creator_id :integer -# updater_id :integer # created_at :datetime not null # updated_at :datetime not null # module Alchemy class EssenceHtml < BaseRecord - acts_as_essence ingredient_column: 'source' + acts_as_essence ingredient_column: "source" # Returns the first x (default = 30) (HTML escaped) characters from self.source for the Element#preview_text method. def preview_text(maxlength = 30) diff --git a/app/models/alchemy/essence_link.rb b/app/models/alchemy/essence_link.rb index 6b0f0a5491..77735d8d22 100644 --- a/app/models/alchemy/essence_link.rb +++ b/app/models/alchemy/essence_link.rb @@ -11,12 +11,10 @@ # link_class_name :string # created_at :datetime not null # updated_at :datetime not null -# creator_id :integer -# updater_id :integer # module Alchemy class EssenceLink < BaseRecord - acts_as_essence ingredient_column: 'link' + acts_as_essence ingredient_column: "link" end end diff --git a/app/models/alchemy/essence_node.rb b/app/models/alchemy/essence_node.rb new file mode 100644 index 0000000000..162dba46cc --- /dev/null +++ b/app/models/alchemy/essence_node.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +module Alchemy + class EssenceNode < BaseRecord + acts_as_essence( + ingredient_column: :node, + preview_text_column: :node_name, + belongs_to: { + class_name: "Alchemy::Node", + foreign_key: :node_id, + inverse_of: :essence_nodes, + optional: true, + }, + ) + + delegate :name, to: :node, prefix: true, allow_nil: true + end +end diff --git a/app/models/alchemy/essence_page.rb b/app/models/alchemy/essence_page.rb index ad369cd975..749583bcdf 100644 --- a/app/models/alchemy/essence_page.rb +++ b/app/models/alchemy/essence_page.rb @@ -2,28 +2,15 @@ module Alchemy class EssencePage < BaseRecord - PAGE_ID = /\A\d+\z/ - acts_as_essence( ingredient_column: :page, preview_text_method: :name, belongs_to: { - class_name: 'Alchemy::Page', + class_name: "Alchemy::Page", foreign_key: :page_id, inverse_of: :essence_pages, - optional: true - } + optional: true, + }, ) - - def ingredient=(page) - case page - when PAGE_ID - self.page = Alchemy::Page.new(id: page) - when Alchemy::Page - self.page = page - else - super - end - end end end diff --git a/app/models/alchemy/essence_picture.rb b/app/models/alchemy/essence_picture.rb index 473f1dbd96..dc777a296a 100644 --- a/app/models/alchemy/essence_picture.rb +++ b/app/models/alchemy/essence_picture.rb @@ -14,8 +14,6 @@ # link_title :string # css_class :string # link_target :string -# creator_id :integer -# updater_id :integer # created_at :datetime not null # updated_at :datetime not null # crop_from :string @@ -26,10 +24,10 @@ module Alchemy class EssencePicture < BaseRecord acts_as_essence ingredient_column: :picture, belongs_to: { - class_name: 'Alchemy::Picture', + class_name: "Alchemy::Picture", foreign_key: :picture_id, inverse_of: :essence_pictures, - optional: true + optional: true, } serialize :render_gravity, JSON @@ -83,7 +81,7 @@ def picture_url_options format: picture.default_render_format, crop_from: crop_from.presence, crop_size: crop_size.presence, - size: content.settings[:size] + size: content.settings[:size], }.with_indifferent_access end @@ -105,7 +103,7 @@ def thumbnail_url crop_from: crop_from.presence, crop_size: crop_size.presence, flatten: true, - format: picture.image_file_format + format: picture.image_file_format, } picture.url(options) @@ -201,7 +199,7 @@ def allow_image_cropping? content && content.settings[:crop] && picture && picture.can_be_cropped_to( content.settings[:size], - content.settings[:upsample] + content.settings[:upsample], ) end @@ -231,7 +229,7 @@ def validate_render_gravity end def normalize_crop_value(crop_value) - self[crop_value].split('x').map { |n| normalize_number(n) }.join('x') + self[crop_value].split("x").map { |n| normalize_number(n) }.join("x") end def normalize_number(number) diff --git a/app/models/alchemy/essence_picture_view.rb b/app/models/alchemy/essence_picture_view.rb index d8af6bbec0..ddd97e7c42 100644 --- a/app/models/alchemy/essence_picture_view.rb +++ b/app/models/alchemy/essence_picture_view.rb @@ -41,12 +41,12 @@ def render output = link_to(output, url_for(essence.link), { title: essence.link_title.presence, target: essence.link_target == "blank" ? "_blank" : nil, - data: {link_target: essence.link_target.presence} + data: { link_target: essence.link_target.presence }, }) end if caption - content_tag(:figure, output, {class: essence.css_class.presence}.merge(html_options)) + content_tag(:figure, output, { class: essence.css_class.presence }.merge(html_options)) else output end @@ -66,8 +66,8 @@ def img_tag alt: essence.alt_tag.presence, title: essence.title.presence, class: caption ? nil : essence.css_class.presence, - srcset: srcset.join(', ').presence, - sizes: options[:sizes].join(', ').presence + srcset: srcset.join(", ").presence, + sizes: options[:sizes].join(", ").presence, }.merge(caption ? {} : html_options) ) end diff --git a/app/models/alchemy/essence_richtext.rb b/app/models/alchemy/essence_richtext.rb index 8c545d76c8..606b1af90b 100644 --- a/app/models/alchemy/essence_richtext.rb +++ b/app/models/alchemy/essence_richtext.rb @@ -8,15 +8,13 @@ # body :text # stripped_body :text # public :boolean -# creator_id :integer -# updater_id :integer # created_at :datetime not null # updated_at :datetime not null # module Alchemy class EssenceRichtext < BaseRecord - acts_as_essence preview_text_column: 'stripped_body' + acts_as_essence preview_text_column: "stripped_body" before_save :strip_content diff --git a/app/models/alchemy/essence_select.rb b/app/models/alchemy/essence_select.rb index b9e2865fbe..167e94abda 100644 --- a/app/models/alchemy/essence_select.rb +++ b/app/models/alchemy/essence_select.rb @@ -8,13 +8,11 @@ # value :string # created_at :datetime not null # updated_at :datetime not null -# creator_id :integer -# updater_id :integer # # Provides a select box that stores string values. module Alchemy class EssenceSelect < BaseRecord - acts_as_essence ingredient_column: 'value' + acts_as_essence ingredient_column: "value" end end diff --git a/app/models/alchemy/essence_text.rb b/app/models/alchemy/essence_text.rb index 7f10c0ef1c..dbde3047dd 100644 --- a/app/models/alchemy/essence_text.rb +++ b/app/models/alchemy/essence_text.rb @@ -11,8 +11,6 @@ # link_class_name :string # public :boolean default(FALSE) # link_target :string -# creator_id :integer -# updater_id :integer # created_at :datetime not null # updated_at :datetime not null # diff --git a/app/models/alchemy/language.rb b/app/models/alchemy/language.rb index 3770f1c2c0..9626acdc45 100644 --- a/app/models/alchemy/language.rb +++ b/app/models/alchemy/language.rb @@ -20,15 +20,18 @@ # locale :string # -require_dependency 'alchemy/site' +require_dependency "alchemy/site" module Alchemy class Language < BaseRecord belongs_to :site - has_many :pages + has_many :pages, inverse_of: :language + has_many :nodes, inverse_of: :language before_validation :set_locale, if: -> { locale.blank? } + has_one :root_page, -> { where(parent: nil, layoutpage: false) }, class_name: "Alchemy::Page" + validates :name, presence: true validates :page_layout, presence: true validates :frontpage_name, presence: true @@ -59,8 +62,8 @@ class Language < BaseRecord throw(:abort) end - scope :published, -> { where(public: true) } - scope :with_root_page, -> { joins(:pages).where(Page.table_name => {language_root: true}) } + scope :published, -> { where(public: true) } + scope :with_root_page, -> { joins(:pages).where(Page.table_name => { language_root: true }) } class << self def on_site(site) @@ -104,16 +107,6 @@ def label(attrib) include Alchemy::Language::Code - # Root page - def root_page - @root_page ||= pages.language_roots.first - end - - # Layout root page - def layout_root_page - @layout_root_page ||= Page.layout_root_for(id) - end - # All available locales matching this language # # Matching either the code (+language_code+ + +country_code+) or the +language_code+ @@ -122,10 +115,14 @@ def layout_root_page # def matching_locales @_matching_locales ||= ::I18n.available_locales.select do |locale| - locale.to_s.split('-')[0] == language_code + locale.to_s.split("-")[0] == language_code end end + def available_menu_names + Alchemy::Node.available_menu_names - nodes.reject(&:parent_id).map(&:menu_type) + end + private def set_locale @@ -167,11 +164,7 @@ def remove_old_default end def should_set_pages_language? - if active_record_5_1? - saved_change_to_language_code? || saved_change_to_country_code? - else - language_code_changed? || country_code_changed? - end + saved_change_to_language_code? || saved_change_to_country_code? end def set_pages_language @@ -179,11 +172,7 @@ def set_pages_language end def should_unpublish_pages? - if active_record_5_1? - saved_changes[:public] == [true, false] - else - changes[:public] == [true, false] - end + saved_changes[:public] == [true, false] end def unpublish_pages diff --git a/app/models/alchemy/language/code.rb b/app/models/alchemy/language/code.rb index 3b90d98b75..78d257315e 100644 --- a/app/models/alchemy/language/code.rb +++ b/app/models/alchemy/language/code.rb @@ -4,7 +4,7 @@ module Alchemy::Language::Code extend ActiveSupport::Concern def code - [language_code, country_code].select(&:present?).join('-') + [language_code, country_code].select(&:present?).join("-") end def code=(code) @@ -13,11 +13,11 @@ def code=(code) module ClassMethods def find_by_code(code) - codes = code.split('-') - codes << '' if codes.length == 1 + codes = code.split("-") + codes << "" if codes.length == 1 on_current_site.find_by( language_code: codes[0], - country_code: codes[1] + country_code: codes[1], ) end end diff --git a/app/models/alchemy/legacy_page_url.rb b/app/models/alchemy/legacy_page_url.rb index 5e24960d0b..f733105e28 100644 --- a/app/models/alchemy/legacy_page_url.rb +++ b/app/models/alchemy/legacy_page_url.rb @@ -13,7 +13,7 @@ class Alchemy::LegacyPageUrl < ActiveRecord::Base belongs_to :page, - class_name: 'Alchemy::Page', + class_name: "Alchemy::Page", required: true validates :urlname, diff --git a/app/models/alchemy/message.rb b/app/models/alchemy/message.rb index e1c5fea234..64326e07c5 100644 --- a/app/models/alchemy/message.rb +++ b/app/models/alchemy/message.rb @@ -22,17 +22,17 @@ def self.config attr_accessor :contact_form_id, :ip - config['fields'].each do |field| + config["fields"].each do |field| attr_accessor field.to_sym end - config['validate_fields'].each do |field| + config["validate_fields"].each do |field| validates_presence_of field case field.to_sym when /email/ validates_format_of field, - with: Alchemy::Config.get('format_matchers')['email'], + with: Alchemy::Config.get("format_matchers")["email"], if: -> { send(field).present? } when :email_confirmation validates_confirmation_of :email diff --git a/app/models/alchemy/node.rb b/app/models/alchemy/node.rb index 7649a5d64a..187c310cf7 100644 --- a/app/models/alchemy/node.rb +++ b/app/models/alchemy/node.rb @@ -4,13 +4,22 @@ module Alchemy class Node < BaseRecord VALID_URL_REGEX = /\A(\/|\D[a-z\+\d\.\-]+:)/ - acts_as_nested_set scope: 'language_id', touch: true + before_destroy :check_if_related_essence_nodes_present + + acts_as_nested_set scope: "language_id", touch: true stampable stamper_class_name: Alchemy.user_class_name - belongs_to :site, class_name: 'Alchemy::Site' - belongs_to :language, class_name: 'Alchemy::Language' - belongs_to :page, class_name: 'Alchemy::Page', optional: true, inverse_of: :nodes + belongs_to :language, class_name: "Alchemy::Language" + belongs_to :page, class_name: "Alchemy::Page", optional: true, inverse_of: :nodes + + has_one :site, through: :language + + has_many :essence_nodes, class_name: "Alchemy::EssenceNode", foreign_key: :node_id, inverse_of: :ingredient_association + before_validation :translate_root_menu_name, if: -> { root? } + before_validation :set_menu_type_from_root, unless: -> { root? } + + validates :menu_type, presence: true validates :name, presence: true, if: -> { page.nil? } validates :url, format: { with: VALID_URL_REGEX }, unless: -> { url.nil? } @@ -25,7 +34,7 @@ def name class << self # Returns all root nodes for current language def language_root_nodes - raise 'No language found' if Language.current.nil? + raise "No language found" if Language.current.nil? roots.where(language_id: Language.current.id) end @@ -49,7 +58,7 @@ def read_definitions_file # Returns the +menus.yml+ file path # def definitions_file_path - Rails.root.join 'config/alchemy/menus.yml' + Rails.root.join "config/alchemy/menus.yml" end end @@ -58,15 +67,29 @@ def definitions_file_path # Either the value is stored in the database, aka. an external url. # Or, if attached, the values comes from a page. def url - page && "/#{page.urlname}" || read_attribute(:url).presence + page&.url_path || read_attribute(:url).presence end def to_partial_path - "#{view_folder_name}/wrapper" + "alchemy/menus/#{menu_type}/node" + end + + private + + def check_if_related_essence_nodes_present + dependent_essence_nodes = self_and_descendants.flat_map(&:essence_nodes) + if dependent_essence_nodes.any? + errors.add(:base, :essence_nodes_present, page_names: dependent_essence_nodes.map(&:page).map(&:name).to_sentence) + throw(:abort) + end + end + + def translate_root_menu_name + self.name ||= Alchemy.t(menu_type, scope: :menu_names) end - def view_folder_name - "alchemy/menus/#{name.parameterize.underscore}" + def set_menu_type_from_root + self.menu_type = root.menu_type end end end diff --git a/app/models/alchemy/page.rb b/app/models/alchemy/page.rb index f4d6b051d9..669ad7b92c 100644 --- a/app/models/alchemy/page.rb +++ b/app/models/alchemy/page.rb @@ -17,7 +17,6 @@ # rgt :integer # parent_id :integer # depth :integer -# visible :boolean default(FALSE) # locked_by :integer # restricted :boolean default(FALSE) # robot_index :boolean default(TRUE) @@ -44,11 +43,10 @@ class Page < BaseRecord DEFAULT_ATTRIBUTES_FOR_COPY = { autogenerate_elements: false, - visible: false, public_on: nil, public_until: nil, locked_at: nil, - locked_by: nil + locked_by: nil, } SKIPPED_ATTRIBUTES_ON_COPY = %w( @@ -78,16 +76,15 @@ class Page < BaseRecord :tag_list, :title, :urlname, - :visible, :layoutpage, - :menu_id + :menu_id, ] - acts_as_nested_set(dependent: :destroy) + acts_as_nested_set(dependent: :destroy, scope: [:layoutpage, :language_id]) stampable stamper_class_name: Alchemy.user_class_name - belongs_to :language, optional: true + belongs_to :language belongs_to :creator, primary_key: Alchemy.user_class_primary_key, @@ -110,42 +107,33 @@ class Page < BaseRecord has_one :site, through: :language has_many :site_languages, through: :site, source: :languages has_many :folded_pages - has_many :legacy_urls, class_name: 'Alchemy::LegacyPageUrl' - has_many :nodes, class_name: 'Alchemy::Node', inverse_of: :page + has_many :legacy_urls, class_name: "Alchemy::LegacyPageUrl" + has_many :nodes, class_name: "Alchemy::Node", inverse_of: :page - validates_presence_of :language, on: :create, unless: :root - validates_presence_of :page_layout, unless: :systempage? - validates_format_of :page_layout, with: /\A[a-z0-9_-]+\z/, unless: -> { systempage? || page_layout.blank? } - validates_presence_of :parent_id, if: proc { Page.count > 1 } + before_validation :set_language, + if: -> { language.nil? } + + validates_presence_of :page_layout + validates_format_of :page_layout, with: /\A[a-z0-9_-]+\z/, unless: -> { page_layout.blank? } + validates_presence_of :parent, unless: -> { layoutpage? || language_root? } before_save :set_language_code, - if: -> { language.present? }, - unless: :systempage? + if: -> { language.present? } before_save :set_restrictions_to_child_pages, - if: :restricted_changed?, - unless: :systempage? + if: :restricted_changed? before_save :inherit_restricted_status, - if: -> { parent && parent.restricted? }, - unless: :systempage? + if: -> { parent && parent.restricted? } before_save :set_published_at, - if: -> { public_on.present? && published_at.nil? }, - unless: :systempage? + if: -> { public_on.present? && published_at.nil? } before_save :set_fixed_attributes, if: -> { fixed_attributes.any? } - before_create :set_language_from_parent_or_default, - if: -> { language_id.blank? }, - unless: :systempage? - after_update :create_legacy_url, - if: :should_create_legacy_url? - - after_update :attach_to_menu!, - if: :should_attach_to_menu? + if: :saved_change_to_urlname? after_update -> { nodes.update_all(updated_at: Time.current) } @@ -158,22 +146,9 @@ class Page < BaseRecord # site_name accessor delegate :name, to: :site, prefix: true, allow_nil: true - attr_accessor :menu_id - # Class methods # class << self - # The root page of the page tree - # - # Internal use only. You wouldn't use this page ever. - # - # Automatically created when accessed the first time. - # - def root - super || create!(name: 'Root') - end - alias_method :rootpage, :root - # Used to store the current page previewed in the edit page template. # def current_preview=(page) @@ -217,30 +192,12 @@ def copy(source, differences = {}) end end - def layout_root_for(language_id) - where({parent_id: Page.root.id, layoutpage: true, language_id: language_id}).limit(1).first - end - - def find_or_create_layout_root_for(language_id) - layoutroot = layout_root_for(language_id) - return layoutroot if layoutroot - - language = Language.find(language_id) - Page.create!( - name: "Layoutroot for #{language.name}", - layoutpage: true, - language: language, - autogenerate_elements: false, - parent_id: Page.root.id - ) - end - def copy_and_paste(source, new_parent, new_name) page = copy(source, { parent_id: new_parent.id, language: new_parent.language, name: new_name, - title: new_name + title: new_name, }) if source.children.any? source.copy_children_to(page) @@ -251,7 +208,7 @@ def copy_and_paste(source, new_parent, new_name) def all_from_clipboard(clipboard) return [] if clipboard.blank? - where(id: clipboard.collect { |p| p['id'] }) + where(id: clipboard.collect { |p| p["id"] }) end def all_from_clipboard_for_select(clipboard, language_id, layoutpage = false) @@ -259,28 +216,20 @@ def all_from_clipboard_for_select(clipboard, language_id, layoutpage = false) clipboard_pages = all_from_clipboard(clipboard) allowed_page_layouts = Alchemy::PageLayout.selectable_layouts(language_id, layoutpage) - allowed_page_layout_names = allowed_page_layouts.collect { |p| p['name'] } + allowed_page_layout_names = allowed_page_layouts.collect { |p| p["name"] } clipboard_pages.select { |cp| allowed_page_layout_names.include?(cp.page_layout) } end def link_target_options - options = [[Alchemy.t(:default, scope: 'link_target_options'), '']] + options = [[Alchemy.t(:default, scope: "link_target_options"), ""]] link_target_options = Config.get(:link_target_options) link_target_options.each do |option| - options << [Alchemy.t(option, scope: 'link_target_options', - default: option.to_s.humanize), option] + options << [Alchemy.t(option, scope: "link_target_options", + default: option.to_s.humanize), option] end options end - # Returns an array of all pages in the same branch from current. - # I.e. used to find the active page in navigation. - def ancestors_for(current) - return [] if current.nil? - - current.self_and_ancestors.contentpages - end - private # Aggregates the attributes from given source for copy of page. @@ -295,7 +244,7 @@ def attributes_from_source_for_copy(source, differences = {}) differences.stringify_keys! attributes = source.attributes.merge(differences) attributes.merge!(DEFAULT_ATTRIBUTES_FOR_COPY) - attributes['name'] = new_name_for_copy(differences['name'], source.name) + attributes["name"] = new_name_for_copy(differences["name"], source.name) attributes.except(*SKIPPED_ATTRIBUTES_ON_COPY) end @@ -312,7 +261,7 @@ def attributes_from_source_for_copy(source, differences = {}) def new_name_for_copy(custom_name, source_name) return custom_name if custom_name.present? - "#{source_name} (#{Alchemy.t('Copy')})" + "#{source_name} (#{Alchemy.t("Copy")})" end end @@ -345,6 +294,13 @@ def find_elements(options = {}) finder.elements(page: self) end + # = The url_path for this page + # + # @see Alchemy::Page::UrlPath#call + def url_path + Alchemy::Page::UrlPath.new(self).call + end + # The page's view partial is dependent from its page layout # # == Define page layouts @@ -371,9 +327,10 @@ def to_partial_path # only public pages (true), skip public pages (false) # def previous(options = {}) - pages = self_and_siblings.where('lft < ?', lft) + pages = self_and_siblings.where("lft < ?", lft) select_page(pages, options.merge(order: :desc)) end + alias_method :previous_page, :previous # Returns the next page on the same level or nil. @@ -384,9 +341,10 @@ def previous(options = {}) # only public pages (true), skip public pages (false) # def next(options = {}) - pages = self_and_siblings.where('lft > ?', lft) + pages = self_and_siblings.where("lft > ?", lft) select_page(pages, options.merge(order: :asc)) end + alias_method :next_page, :next # Locks the page to given user @@ -435,7 +393,7 @@ def copy_children_to(new_parent) new_child = Page.copy(child, { language_id: new_parent.language_id, - language_code: new_parent.language_code + language_code: new_parent.language_code, }) new_child.move_to_child_of(new_parent) child.copy_children_to(new_child) unless child.children.blank? @@ -454,7 +412,7 @@ def publish! update_columns( published_at: current_time, public_on: already_public_for?(current_time) ? public_on : current_time, - public_until: still_public_for?(current_time) ? public_until : nil + public_until: still_public_for?(current_time) ? public_until : nil, ) end @@ -467,9 +425,9 @@ def publish! # A tree node with new lft, rgt, depth, url, parent_id and restricted indexes to be updated # def update_node!(node) - hash = {lft: node.left, rgt: node.right, parent_id: node.parent, depth: node.depth, restricted: node.restricted} + hash = { lft: node.left, rgt: node.right, parent_id: node.parent, depth: node.depth, restricted: node.restricted } - if Config.get(:url_nesting) && urlname != node.url + if urlname != node.url LegacyPageUrl.create(page_id: id, urlname: urlname) hash[:urlname] = node.url end @@ -520,7 +478,7 @@ def public_until # does not respond to +#name+ it returns +'unknown'+ # def creator_name - creator.try(:name) || Alchemy.t('unknown') + creator.try(:name) || Alchemy.t("unknown") end # Returns the name of the last updater of this page. @@ -529,7 +487,7 @@ def creator_name # does not respond to +#name+ it returns +'unknown'+ # def updater_name - updater.try(:name) || Alchemy.t('unknown') + updater.try(:name) || Alchemy.t("unknown") end # Returns the name of the user currently editing this page. @@ -538,7 +496,7 @@ def updater_name # does not respond to +#name+ it returns +'unknown'+ # def locker_name - locker.try(:name) || Alchemy.t('unknown') + locker.try(:name) || Alchemy.t("unknown") end # Menus (aka. root nodes) this page is attached to @@ -562,8 +520,8 @@ def select_page(pages, options = {}) .limit(1).first end - def set_language_from_parent_or_default - self.language = parent.language || Language.default + def set_language + self.language = parent&.language || Language.current set_language_code end @@ -571,41 +529,13 @@ def set_language_code self.language_code = language.code end - def should_create_legacy_url? - if active_record_5_1? - saved_change_to_urlname? - else - urlname_changed? - end - end - # Stores the old urlname in a LegacyPageUrl def create_legacy_url - if active_record_5_1? - former_urlname = urlname_before_last_save - else - former_urlname = urlname_was - end - legacy_urls.find_or_create_by(urlname: former_urlname) + legacy_urls.find_or_create_by(urlname: urlname_before_last_save) end def set_published_at self.published_at = Time.current end - - def attach_to_menu! - current_site_id = Alchemy::Site.current.id - node = Alchemy::Node.find_by!(id: menu_id, site_id: current_site_id) - node.children.create!( - site_id: current_site_id, - language_id: language_id, - page_id: id, - name: name - ) - end - - def should_attach_to_menu? - menu_id.present? && nodes.none? - end end end diff --git a/app/models/alchemy/page/fixed_attributes.rb b/app/models/alchemy/page/fixed_attributes.rb index 9a91116d92..679a058eb0 100644 --- a/app/models/alchemy/page/fixed_attributes.rb +++ b/app/models/alchemy/page/fixed_attributes.rb @@ -15,7 +15,6 @@ module Alchemy # fixed_attributes: # - public_on: nil # - public_until: nil - # - visible: false # class Page::FixedAttributes attr_reader :page @@ -31,7 +30,7 @@ def initialize(page) # @return Hash # def attributes - @_attributes ||= page.definition.fetch('fixed_attributes', {}).symbolize_keys + @_attributes ||= page.definition.fetch("fixed_attributes", {}).symbolize_keys end alias_method :all, :attributes diff --git a/app/models/alchemy/page/page_elements.rb b/app/models/alchemy/page/page_elements.rb index 7caa06ce01..ea9fbe33c0 100644 --- a/app/models/alchemy/page/page_elements.rb +++ b/app/models/alchemy/page/page_elements.rb @@ -9,37 +9,37 @@ module Page::PageElements has_many :all_elements, -> { order(:position) }, - class_name: 'Alchemy::Element', + class_name: "Alchemy::Element", inverse_of: :page has_many :elements, -> { order(:position).not_nested.unfixed.available }, - class_name: 'Alchemy::Element', + class_name: "Alchemy::Element", inverse_of: :page has_many :trashed_elements, -> { Element.trashed.order(:position) }, - class_name: 'Alchemy::Element', + class_name: "Alchemy::Element", inverse_of: :page has_many :fixed_elements, -> { order(:position).fixed.available }, - class_name: 'Alchemy::Element', + class_name: "Alchemy::Element", inverse_of: :page has_many :dependent_destroyable_elements, -> { not_nested }, - class_name: 'Alchemy::Element', + class_name: "Alchemy::Element", dependent: :destroy has_many :contents, through: :elements has_and_belongs_to_many :to_be_swept_elements, -> { distinct }, - class_name: 'Alchemy::Element', + class_name: "Alchemy::Element", join_table: ElementToPage.table_name after_create :generate_elements, - unless: -> { systempage? || autogenerate_elements == false } + unless: -> { autogenerate_elements == false } after_update :trash_not_allowed_elements!, - if: :has_page_layout_changed? + if: :saved_change_to_page_layout? after_update :generate_elements, - if: :has_page_layout_changed? + if: :saved_change_to_page_layout? end module ClassMethods @@ -53,7 +53,7 @@ def copy_elements(source, target) source_elements = source.all_elements.not_nested.not_trashed source_elements.order(:position).map do |source_element| Element.copy(source_element, { - page_id: target.id + page_id: target.id, }).tap(&:move_to_bottom) end end @@ -81,11 +81,11 @@ def copy_elements(source, target) # def available_element_definitions(only_element_named = nil) @_element_definitions ||= if only_element_named - definition = Element.definition_by_name(only_element_named) - element_definitions_by_name(definition['nestable_elements']) - else - element_definitions - end + definition = Element.definition_by_name(only_element_named) + element_definitions_by_name(definition["nestable_elements"]) + else + element_definitions + end return [] if @_element_definitions.blank? @@ -100,20 +100,20 @@ def available_element_definitions(only_element_named = nil) # All names of elements that can actually be placed on current page. # def available_element_names - @_available_element_names ||= available_element_definitions.map { |e| e['name'] } + @_available_element_names ||= available_element_definitions.map { |e| e["name"] } end # Available element definitions excluding nested unique elements. # def available_elements_within_current_scope(parent) @_available_elements = if parent - parents_unique_nested_elements = parent.nested_elements.where(unique: true).pluck(:name) - available_element_definitions(parent.name).reject do |e| - parents_unique_nested_elements.include? e['name'] + parents_unique_nested_elements = parent.nested_elements.where(unique: true).pluck(:name) + available_element_definitions(parent.name).reject do |e| + parents_unique_nested_elements.include? e["name"] + end + else + available_element_definitions end - else - available_element_definitions - end end # All element definitions defined for page's page layout @@ -129,10 +129,10 @@ def element_definitions # def descendent_element_definitions definitions = element_definitions_by_name(element_definition_names) - definitions.select { |d| d.key?('nestable_elements') }.each do |d| - definitions += element_definitions_by_name(d['nestable_elements']) + definitions.select { |d| d.key?("nestable_elements") }.each do |d| + definitions += element_definitions_by_name(d["nestable_elements"]) end - definitions.uniq { |d| d['name'] } + definitions.uniq { |d| d["name"] } end # All names of elements that are defined in the page definition. @@ -145,7 +145,7 @@ def descendent_element_definitions # elements: [headline, contactform] # def element_definition_names - definition['elements'] || [] + definition["elements"] || [] end # Element definitions with given name(s) @@ -161,7 +161,7 @@ def element_definitions_by_name(names) if names.to_s == "all" Element.definitions else - Element.definitions.select { |e| names.include? e['name'] } + Element.definitions.select { |e| names.include? e["name"] } end end @@ -174,14 +174,14 @@ def element_definitions_by_name(names) # feed_elements: [element_name, element_2_name] # def feed_elements - elements.named(definition['feed_elements']) + elements.named(definition["feed_elements"]) end # Returns an array of all EssenceRichtext contents ids from not folded elements # def richtext_contents_ids Alchemy::Content.joins(:element) - .where(Element.table_name => {page_id: id, folded: false}) + .where(Element.table_name => { page_id: id, folded: false }) .select(&:has_tinymce?) .collect(&:id) end @@ -195,7 +195,7 @@ def richtext_contents_ids def generate_elements existing_elements = all_elements.not_nested.not_trashed existing_element_names = existing_elements.pluck(:name).uniq - definition.fetch('autogenerate', []).each do |element_name| + definition.fetch("autogenerate", []).each do |element_name| next if existing_element_names.include?(element_name) Element.create(page: self, name: element_name) @@ -206,24 +206,16 @@ def generate_elements def trash_not_allowed_elements! not_allowed_elements = elements.where([ "#{Element.table_name}.name NOT IN (?)", - element_definition_names + element_definition_names, ]) not_allowed_elements.to_a.map(&:trash!) end - def has_page_layout_changed? - if active_record_5_1? - saved_change_to_page_layout? - else - page_layout_changed? - end - end - # Deletes unique and already present definitions from @_element_definitions. # def delete_unique_element_definitions! @_element_definitions.delete_if do |element| - element['unique'] && @_existing_element_names.include?(element['name']) + element["unique"] && @_existing_element_names.include?(element["name"]) end end @@ -231,8 +223,8 @@ def delete_unique_element_definitions! # def delete_outnumbered_element_definitions! @_element_definitions.delete_if do |element| - outnumbered = @_existing_element_names.select { |name| name == element['name'] } - element['amount'] && outnumbered.count >= element['amount'].to_i + outnumbered = @_existing_element_names.select { |name| name == element["name"] } + element["amount"] && outnumbered.count >= element["amount"].to_i end end end diff --git a/app/models/alchemy/page/page_naming.rb b/app/models/alchemy/page/page_naming.rb index dd55a5668f..6c6f8f61b5 100644 --- a/app/models/alchemy/page/page_naming.rb +++ b/app/models/alchemy/page/page_naming.rb @@ -9,24 +9,22 @@ module Page::PageNaming included do before_validation :set_urlname, if: :renamed?, - unless: -> { systempage? || name.blank? } + unless: -> { name.blank? } validates :name, presence: true validates :urlname, - uniqueness: {scope: [:language_id, :layoutpage], if: -> { urlname.present? }}, - exclusion: {in: RESERVED_URLNAMES}, - length: {minimum: 3, if: -> { urlname.present? }} + uniqueness: { scope: [:language_id, :layoutpage], if: -> { urlname.present? } }, + exclusion: { in: RESERVED_URLNAMES }, + length: { minimum: 3, if: -> { urlname.present? } } before_save :set_title, - unless: -> { systempage? }, if: -> { title.blank? } after_update :update_descendants_urlnames, - if: :should_update_descendants_urlnames? + if: :saved_change_to_urlname? - after_move :update_urlname!, - if: -> { Config.get(:url_nesting) } + after_move :update_urlname! end # Returns true if name or urlname has changed. @@ -37,7 +35,7 @@ def renamed? # Makes a slug of all ancestors urlnames including mine and delimit them be slash. # So the whole path is stored as urlname in the database. def update_urlname! - new_urlname = nested_url_name(slug) + new_urlname = nested_url_name if urlname != new_urlname legacy_urls.create(urlname: urlname) update_column(:urlname, new_urlname) @@ -46,34 +44,11 @@ def update_urlname! # Returns always the last part of a urlname path def slug - urlname.to_s.split('/').last - end - - # Returns an array of visible/non-language_root ancestors. - def visible_ancestors - return [] unless parent - - if new_record? - parent.visible_ancestors.tap do |base| - base.push(parent) if parent.visible? - end - else - ancestors.visible.contentpages.where(language_root: nil).to_a - end + urlname.to_s.split("/").last end private - def should_update_descendants_urlnames? - return false if !Config.get(:url_nesting) - - if active_record_5_1? - saved_change_to_urlname? || saved_change_to_visible? - else - urlname_changed? || visible_changed? - end - end - def update_descendants_urlnames reload descendants.each(&:update_urlname!) @@ -81,14 +56,9 @@ def update_descendants_urlnames # Sets the urlname to a url friendly slug. # Either from name, or if present, from urlname. - # If url_nesting is enabled the urlname contains the whole path. + # The urlname contains the whole path including parent urlnames. def set_urlname - if Config.get(:url_nesting) - value = slug - else - value = urlname - end - self[:urlname] = nested_url_name(value) + self[:urlname] = nested_url_name end def set_title @@ -100,26 +70,17 @@ def set_title # Names shorter than 3 will be filled up with dashes, # so it does not collidate with the language code. # - def convert_url_name(value) - url_name = convert_to_urlname(value.blank? ? name : value) - if url_name.length < 3 - ('-' * (3 - url_name.length)) + url_name - else - url_name - end + def converted_url_name + url_name = convert_to_urlname(slug.blank? ? name : slug) + url_name.rjust(3, "-") end - def nested_url_name(value) - (ancestor_slugs << convert_url_name(value)).join('/') - end - - # Slugs of all visible/non-language_root ancestors. - # Returns [], if there is no parent, the parent is - # the root page itself, or url_nesting is off. - def ancestor_slugs - return [] if !Config.get(:url_nesting) || parent.nil? || parent.root? - - visible_ancestors.map(&:slug).compact + def nested_url_name + if parent&.language_root? + converted_url_name + else + [parent&.urlname, converted_url_name].compact.join("/") + end end end end diff --git a/app/models/alchemy/page/page_natures.rb b/app/models/alchemy/page/page_natures.rb index 63be5afe2b..5347f35596 100644 --- a/app/models/alchemy/page/page_natures.rb +++ b/app/models/alchemy/page/page_natures.rb @@ -14,19 +14,13 @@ def expiration_time end def taggable? - definition['taggable'] == true + definition["taggable"] == true end def rootpage? !new_record? && parent_id.blank? end - def systempage? - return true if Page.count.zero? - - rootpage? || (parent_id == Page.root.id && !language_root?) - end - def folded?(user_id) return unless Alchemy.user_class < ActiveRecord::Base @@ -67,9 +61,8 @@ def locked? def status { public: public?, - visible: visible?, locked: locked?, - restricted: restricted? + restricted: restricted?, } end @@ -95,7 +88,7 @@ def definition # Page layout names are defined inside the config/alchemy/page_layouts.yml file. # Translate the name in your config/locales language yml file. def layout_display_name - Alchemy.t(page_layout, scope: 'page_layout_names') + Alchemy.t(page_layout, scope: "page_layout_names") end # Returns the name for the layout partial @@ -155,7 +148,7 @@ def cache_page? return false unless caching_enabled? page_layout = PageLayout.get(self.page_layout) - page_layout['cache'] != false && page_layout['searchresults'] != true + page_layout["cache"] != false && page_layout["searchresults"] != true end private diff --git a/app/models/alchemy/page/page_scopes.rb b/app/models/alchemy/page/page_scopes.rb index acfbafd2a1..8f6255750b 100644 --- a/app/models/alchemy/page/page_scopes.rb +++ b/app/models/alchemy/page/page_scopes.rb @@ -21,20 +21,17 @@ module Page::PageScopes # All pages locked by given user # - scope :locked_by, ->(user) { - if user.class.respond_to? :primary_key - locked.where(locked_by: user.send(user.class.primary_key)) - end - } + scope :locked_by, + ->(user) { + if user.class.respond_to? :primary_key + locked.where(locked_by: user.send(user.class.primary_key)) + end + } # All not locked pages # scope :not_locked, -> { where(locked_at: nil, locked_by: nil) } - # All visible pages - # - scope :visible, -> { where(visible: true) } - # All not restricted pages # scope :not_restricted, -> { where(restricted: false) } @@ -45,29 +42,27 @@ module Page::PageScopes # All pages that are a published language root # - scope :public_language_roots, -> { - published.language_roots.where( - language_code: Language.published.pluck(:language_code) - ) - } + scope :public_language_roots, + -> { + published.language_roots.where( + language_code: Language.published.pluck(:language_code), + ) + } # Last 5 pages that where recently edited by given user # - scope :all_last_edited_from, ->(user) { - where(updater_id: user.id).order('updated_at DESC').limit(5) - } + scope :all_last_edited_from, + ->(user) { + where(updater_id: user.id).order("updated_at DESC").limit(5) + } # Returns all pages that have the given +language_id+ # - scope :with_language, ->(language_id) { - where(language_id: language_id) - } + scope :with_language, ->(language_id) { where(language_id: language_id) } # Returns all content pages. # - scope :contentpages, -> { - where(layoutpage: [false, nil]).where.not(parent_id: nil) - } + scope :contentpages, -> { where(layoutpage: [false, nil]) } # Returns all public contentpages that are not locked. # @@ -79,9 +74,7 @@ module Page::PageScopes # # Used for flushing all pages caches at once. # - scope :flushable_layoutpages, -> { - not_locked.layoutpages.where.not(parent_id: Page.unscoped.root.id) - } + scope :flushable_layoutpages, -> { not_locked.layoutpages } # All searchable pages # @@ -89,9 +82,10 @@ module Page::PageScopes # All pages from +Alchemy::Site.current+ # - scope :from_current_site, -> { - where(Language.table_name => {site_id: Site.current || Site.default}).joins(:language) - } + scope :from_current_site, + -> { + where(Language.table_name => { site_id: Site.current || Site.default }).joins(:language) + } # All pages for xml sitemap # diff --git a/app/models/alchemy/page/url_path.rb b/app/models/alchemy/page/url_path.rb new file mode 100644 index 0000000000..b5fca4aa08 --- /dev/null +++ b/app/models/alchemy/page/url_path.rb @@ -0,0 +1,64 @@ +# frozen_string_literal: true + +module Alchemy + class Page + # = The url_path for this page + # + # Use this to build relative links to this page + # + # It takes several circumstances into account: + # + # 1. It returns just a slash for language root pages of the default langauge + # 2. It returns a url path with a leading slash for regular pages + # 3. It returns a url path with a leading slash and language code prefix for pages not having the default language + # 4. It returns a url path with a leading slash and the language code for language root pages of a non-default language + # + # == Examples + # + # Using Rails' link_to helper + # + # link_to page.url + # + class UrlPath + ROOT_PATH = "/" + + def initialize(page) + @page = page + @language = @page.language + @site = @language.site + end + + def call + if @page.language_root? + language_root_path + elsif @site.languages.select(&:public?).length > 1 + page_path_with_language_prefix + else + page_path_with_leading_slash + end + end + + private + + def language_root_path + @language.default? ? ROOT_PATH : language_path + end + + def page_path_with_language_prefix + @language.default? ? page_path : language_path + page_path + end + + def page_path_with_leading_slash + @page.language_root? ? ROOT_PATH : page_path + end + + def language_path + "/#{@page.language_code}" + end + + def page_path + "/#{@page.urlname}" + end + end + end +end diff --git a/app/models/alchemy/picture.rb b/app/models/alchemy/picture.rb index 9deb1fd11e..961f14805f 100644 --- a/app/models/alchemy/picture.rb +++ b/app/models/alchemy/picture.rb @@ -22,17 +22,23 @@ module Alchemy class Picture < BaseRecord + THUMBNAIL_SIZES = { + small: "80x60", + medium: "160x120", + large: "240x180", + }.with_indifferent_access.freeze + CONVERTIBLE_FILE_FORMATS = %w(gif jpg jpeg png).freeze include Alchemy::NameConversions include Alchemy::Taggable - include Alchemy::ContentTouching + include Alchemy::TouchElements include Alchemy::Picture::Transformations include Alchemy::Picture::Url has_many :essence_pictures, - class_name: 'Alchemy::EssencePicture', - foreign_key: 'picture_id', + class_name: "Alchemy::EssencePicture", + foreign_key: "picture_id", inverse_of: :ingredient_association has_many :contents, through: :essence_pictures @@ -50,24 +56,37 @@ class Picture < BaseRecord raise PictureInUseError, Alchemy.t(:cannot_delete_picture_notice) % { name: name } end + # Image preprocessing class + def self.preprocessor_class + @_preprocessor_class ||= Preprocessor + end + + # Set a image preprocessing class + # + # # config/initializers/alchemy.rb + # Alchemy::Picture.preprocessor_class = My::ImagePreprocessor + # + def self.preprocessor_class=(klass) + @_preprocessor_class = klass + end + # Enables Dragonfly image processing dragonfly_accessor :image_file, app: :alchemy_pictures do # Preprocess after uploading the picture - after_assign do |p| - resize = Config.get(:preprocess_image_resize) - p.thumb!(resize) if resize.present? + after_assign do |image| + self.class.preprocessor_class.new(image).call end end # We need to define this method here to have it available in the validations below. class << self def allowed_filetypes - Config.get(:uploader).fetch('allowed_filetypes', {}).fetch('alchemy/pictures', []) + Config.get(:uploader).fetch("allowed_filetypes", {}).fetch("alchemy/pictures", []) end end validates_presence_of :image_file - validates_size_of :image_file, maximum: Config.get(:uploader)['file_size_limit'].megabytes + validates_size_of :image_file, maximum: Config.get(:uploader)["file_size_limit"].megabytes validates_property :format, of: :image_file, in: allowed_filetypes, @@ -76,21 +95,10 @@ def allowed_filetypes stampable stamper_class_name: Alchemy.user_class_name - scope :named, ->(name) { - where("#{table_name}.name LIKE ?", "%#{name}%") - } - - scope :recent, -> { - where("#{table_name}.created_at > ?", Time.current - 24.hours).order(:created_at) - } - - scope :deletable, -> { - where("#{table_name}.id NOT IN (SELECT picture_id FROM #{EssencePicture.table_name})") - } - - scope :without_tag, -> { - left_outer_joins(:taggings).where(gutentag_taggings: {id: nil}) - } + scope :named, ->(name) { where("#{table_name}.name LIKE ?", "%#{name}%") } + scope :recent, -> { where("#{table_name}.created_at > ?", Time.current - 24.hours).order(:created_at) } + scope :deletable, -> { where("#{table_name}.id NOT IN (SELECT picture_id FROM #{EssencePicture.table_name})") } + scope :without_tag, -> { left_outer_joins(:taggings).where(gutentag_taggings: { id: nil }) } # Class methods @@ -124,11 +132,11 @@ def search_by(params, query, per_page = nil) pictures.order(:name) end - def filtered_by(filter = '') + def filtered_by(filter = "") case filter - when 'recent' then recent - when 'last_upload' then last_upload - when 'without_tag' then without_tag + when "recent" then recent + when "last_upload" then last_upload + when "without_tag" then without_tag else all end @@ -167,7 +175,7 @@ def to_jq_upload { name: image_file_name, size: image_file_size, - error: errors[:image_file].join + error: errors[:image_file].join, } end @@ -177,7 +185,7 @@ def urlname if name.blank? "image_#{id}" else - ::CGI.escape(name.gsub(/\.(gif|png|jpe?g|tiff?)/i, '').tr('.', ' ')) + ::CGI.escape(name.gsub(/\.(gif|png|jpe?g|tiff?)/i, "").tr(".", " ")) end end @@ -215,7 +223,7 @@ def default_render_format # def convertible? Config.get(:image_output_format) && - Config.get(:image_output_format) != 'original' && + Config.get(:image_output_format) != "original" && has_convertible_format? end diff --git a/app/models/alchemy/picture/preprocessor.rb b/app/models/alchemy/picture/preprocessor.rb new file mode 100644 index 0000000000..9798ae125b --- /dev/null +++ b/app/models/alchemy/picture/preprocessor.rb @@ -0,0 +1,26 @@ +# frozen_string_literal: true + +module Alchemy + class Picture < BaseRecord + class Preprocessor + def initialize(image_file) + @image_file = image_file + end + + # Preprocess images after upload + # + # Define preprocessing options in the Alchemy::Config + # + # preprocess_image_resize [String] - Downsizing example: '1000x1000>' + # + def call + max_image_size = Alchemy::Config.get(:preprocess_image_resize) + image_file.thumb!(max_image_size) if max_image_size.present? + end + + private + + attr_reader :image_file + end + end +end diff --git a/app/models/alchemy/picture/transformations.rb b/app/models/alchemy/picture/transformations.rb index 9382afd970..3ef3819722 100644 --- a/app/models/alchemy/picture/transformations.rb +++ b/app/models/alchemy/picture/transformations.rb @@ -279,7 +279,7 @@ def sizes_from_string(string = "0x0") height = 0 if height.nil? { width: width, - height: height + height: height, } end @@ -309,7 +309,7 @@ def square_format? def image_size { width: image_file_width, - height: image_file_height + height: image_file_height, } end @@ -348,7 +348,7 @@ def point_from_string(string = "0x0") y = 0 if y.nil? { x: x, - y: y + y: y, } end @@ -359,7 +359,7 @@ def point_from_string(string = "0x0") def get_top_left_crop_corner(dimensions) { x: (image_file_width - dimensions[:width]) / 2, - y: (image_file_height - dimensions[:height]) / 2 + y: (image_file_height - dimensions[:height]) / 2, } end @@ -383,7 +383,7 @@ def get_base_dimensions def size_when_fitting(target, dimensions = get_base_dimensions) zoom = [ dimensions[:width].to_f / target[:width], - dimensions[:height].to_f / target[:height] + dimensions[:height].to_f / target[:height], ].max if zoom == 0.0 @@ -406,7 +406,7 @@ def point_and_mask_to_points(point, mask) x1: point[:x], y1: point[:y], x2: point[:x] + mask[:width], - y2: point[:y] + mask[:height] + y2: point[:y] + mask[:height], } end @@ -449,7 +449,7 @@ def xy_crop_resize(dimensions, top_left, crop_dimensions, upsample) def reduce_to_image(dimensions) { width: [dimensions[:width], image_file_width].min, - height: [dimensions[:height], image_file_height].min + height: [dimensions[:height], image_file_height].min, } end end diff --git a/app/models/alchemy/picture/url.rb b/app/models/alchemy/picture/url.rb index 6b2f8a7f13..160e3fe2af 100644 --- a/app/models/alchemy/picture/url.rb +++ b/app/models/alchemy/picture/url.rb @@ -77,8 +77,8 @@ def encoded_image(image, options = {}) end options = { - flatten: target_format != 'gif' && image_file_format == 'gif' - }.merge(options) + flatten: target_format != "gif" && image_file_format == "gif", + }.with_indifferent_access.merge(options) encoding_options = [] @@ -88,13 +88,13 @@ def encoded_image(image, options = {}) end if options[:flatten] - encoding_options << '-flatten' + encoding_options << "-flatten" end convertion_needed = target_format != image_file_format || encoding_options.present? if has_convertible_format? && convertion_needed - image = image.encode(target_format, encoding_options.join(' ')) + image = image.encode(target_format, encoding_options.join(" ")) end image diff --git a/app/models/alchemy/site/layout.rb b/app/models/alchemy/site/layout.rb index a863e834f5..12088dfb8b 100644 --- a/app/models/alchemy/site/layout.rb +++ b/app/models/alchemy/site/layout.rb @@ -3,7 +3,7 @@ module Alchemy module Site::Layout extend ActiveSupport::Concern - SITE_DEFINITIONS_FILE = Rails.root.join('config/alchemy/site_layouts.yml') + SITE_DEFINITIONS_FILE = Rails.root.join("config/alchemy/site_layouts.yml") module ClassMethods # Returns the site layouts definition defined in +site_layouts.yml+ file @@ -28,7 +28,7 @@ def read_site_definitions # Returns site's layout definition # def definition - self.class.definitions.detect { |l| l['name'] == partial_name } + self.class.definitions.detect { |l| l["name"] == partial_name } end # Returns the name for the layout partial diff --git a/app/models/concerns/alchemy/content_touching.rb b/app/models/concerns/alchemy/content_touching.rb deleted file mode 100644 index f7fe71d1be..0000000000 --- a/app/models/concerns/alchemy/content_touching.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -module Alchemy - module ContentTouching - def self.included(base) - base.after_update(:touch_contents) - end - - private - - # If the model has a +contents+ association, - # it updates all their timestamps. - # - # CAUTION: Only use on bottom to top releations, - # e.g. +Alchemy::Picture+ or +Alchemy::Attachment+ - # not on top to bottom ones like +Alchemy::Element+. - # - def touch_contents - return unless respond_to?(:contents) - - contents.update_all(updated_at: Time.current) - end - end -end diff --git a/app/models/concerns/alchemy/touch_elements.rb b/app/models/concerns/alchemy/touch_elements.rb new file mode 100644 index 0000000000..53d07df594 --- /dev/null +++ b/app/models/concerns/alchemy/touch_elements.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true + +module Alchemy + # If the model has a +elements+ association, + # it updates all their timestamps after save. + # + # Should only be used on bottom to top relations, + # e.g. +Alchemy::Picture+ or +Alchemy::Attachment+ + # not on top to bottom ones like +Alchemy::Page+. + # + module TouchElements + def self.included(base) + base.after_save(:touch_elements) + end + + private + + def touch_elements + return unless respond_to?(:elements) + + elements.map(&:touch) + end + end +end diff --git a/app/serializers/alchemy/content_serializer.rb b/app/serializers/alchemy/content_serializer.rb index e9b39494ec..1adc3b6e98 100644 --- a/app/serializers/alchemy/content_serializer.rb +++ b/app/serializers/alchemy/content_serializer.rb @@ -6,9 +6,6 @@ class ContentSerializer < ActiveModel::Serializer :name, :ingredient, :element_id, - :position, - :created_at, - :updated_at, :settings has_one :essence, polymorphic: true diff --git a/app/serializers/alchemy/essence_boolean_serializer.rb b/app/serializers/alchemy/essence_boolean_serializer.rb index d1cc8d2571..6b790875df 100644 --- a/app/serializers/alchemy/essence_boolean_serializer.rb +++ b/app/serializers/alchemy/essence_boolean_serializer.rb @@ -2,9 +2,9 @@ module Alchemy class EssenceBooleanSerializer < ActiveModel::Serializer - attributes :id, + attributes( + :id, :value, - :created_at, - :updated_at + ) end end diff --git a/app/serializers/alchemy/essence_date_serializer.rb b/app/serializers/alchemy/essence_date_serializer.rb index 889fa6e322..b738f6a4e7 100644 --- a/app/serializers/alchemy/essence_date_serializer.rb +++ b/app/serializers/alchemy/essence_date_serializer.rb @@ -2,9 +2,9 @@ module Alchemy class EssenceDateSerializer < ActiveModel::Serializer - attributes :id, + attributes( + :id, :date, - :created_at, - :updated_at + ) end end diff --git a/app/serializers/alchemy/essence_file_serializer.rb b/app/serializers/alchemy/essence_file_serializer.rb index 9afc98fc3f..7ccb46ea7a 100644 --- a/app/serializers/alchemy/essence_file_serializer.rb +++ b/app/serializers/alchemy/essence_file_serializer.rb @@ -2,9 +2,11 @@ module Alchemy class EssenceFileSerializer < ActiveModel::Serializer - attributes :id, + attributes( + :id, :title, - :css_class + :css_class, + ) has_one :attachment end diff --git a/app/serializers/alchemy/essence_html_serializer.rb b/app/serializers/alchemy/essence_html_serializer.rb index afaafafc88..8f76946360 100644 --- a/app/serializers/alchemy/essence_html_serializer.rb +++ b/app/serializers/alchemy/essence_html_serializer.rb @@ -2,9 +2,9 @@ module Alchemy class EssenceHtmlSerializer < ActiveModel::Serializer - attributes :id, + attributes( + :id, :source, - :created_at, - :updated_at + ) end end diff --git a/app/serializers/alchemy/essence_link_serializer.rb b/app/serializers/alchemy/essence_link_serializer.rb index b665693da1..29dcec97dd 100644 --- a/app/serializers/alchemy/essence_link_serializer.rb +++ b/app/serializers/alchemy/essence_link_serializer.rb @@ -2,12 +2,12 @@ module Alchemy class EssenceLinkSerializer < ActiveModel::Serializer - attributes :id, + attributes( + :id, :link, :link_title, :link_target, :link_class_name, - :created_at, - :updated_at + ) end end diff --git a/app/serializers/alchemy/essence_picture_serializer.rb b/app/serializers/alchemy/essence_picture_serializer.rb index 3082b78b39..5ae7a34c22 100644 --- a/app/serializers/alchemy/essence_picture_serializer.rb +++ b/app/serializers/alchemy/essence_picture_serializer.rb @@ -2,15 +2,15 @@ module Alchemy class EssencePictureSerializer < ActiveModel::Serializer - attributes :id, + attributes( + :id, :picture_id, :caption, :title, :alt_tag, :css_class, :link, - :created_at, - :updated_at + ) has_one :picture @@ -21,7 +21,7 @@ def link url: object.link, css_class: object.link_class_name, title: object.link_title, - target: object.link_target + target: object.link_target, } end end diff --git a/app/serializers/alchemy/essence_richtext_serializer.rb b/app/serializers/alchemy/essence_richtext_serializer.rb index b519ce7c65..bd8291748f 100644 --- a/app/serializers/alchemy/essence_richtext_serializer.rb +++ b/app/serializers/alchemy/essence_richtext_serializer.rb @@ -2,10 +2,10 @@ module Alchemy class EssenceRichtextSerializer < ActiveModel::Serializer - attributes :id, + attributes( + :id, :body, :stripped_body, - :created_at, - :updated_at + ) end end diff --git a/app/serializers/alchemy/essence_select_serializer.rb b/app/serializers/alchemy/essence_select_serializer.rb index 86483bfa6b..51d9a1a731 100644 --- a/app/serializers/alchemy/essence_select_serializer.rb +++ b/app/serializers/alchemy/essence_select_serializer.rb @@ -2,9 +2,9 @@ module Alchemy class EssenceSelectSerializer < ActiveModel::Serializer - attributes :id, + attributes( + :id, :value, - :created_at, - :updated_at + ) end end diff --git a/app/serializers/alchemy/essence_text_serializer.rb b/app/serializers/alchemy/essence_text_serializer.rb index 3f1d9c6ec6..dd2326518c 100644 --- a/app/serializers/alchemy/essence_text_serializer.rb +++ b/app/serializers/alchemy/essence_text_serializer.rb @@ -2,11 +2,11 @@ module Alchemy class EssenceTextSerializer < ActiveModel::Serializer - attributes :id, + attributes( + :id, :body, :link, - :created_at, - :updated_at + ) def link return if object.link.blank? @@ -15,7 +15,7 @@ def link url: object.link, title: object.link_title, css_class: object.link_class_name, - target: object.link_target + target: object.link_target, } end end diff --git a/app/serializers/alchemy/legacy_element_serializer.rb b/app/serializers/alchemy/legacy_element_serializer.rb deleted file mode 100644 index e3e4e119e2..0000000000 --- a/app/serializers/alchemy/legacy_element_serializer.rb +++ /dev/null @@ -1,15 +0,0 @@ -# frozen_string_literal: true - -module Alchemy - class LegacyElementSerializer < ActiveModel::Serializer - attributes :id, - :name, - :position, - :page_id, - :tag_list, - :created_at, - :updated_at - - has_many :contents - end -end diff --git a/app/serializers/alchemy/node_serializer.rb b/app/serializers/alchemy/node_serializer.rb index a260fba3b9..95fc2f8bd1 100644 --- a/app/serializers/alchemy/node_serializer.rb +++ b/app/serializers/alchemy/node_serializer.rb @@ -8,5 +8,7 @@ class NodeSerializer < ActiveModel::Serializer :rgt, :url, :parent_id + + has_many :ancestors, record_type: :node, serializer: self end end diff --git a/app/serializers/alchemy/page_serializer.rb b/app/serializers/alchemy/page_serializer.rb index 776cda862e..1fb53f3b41 100644 --- a/app/serializers/alchemy/page_serializer.rb +++ b/app/serializers/alchemy/page_serializer.rb @@ -13,7 +13,8 @@ class PageSerializer < ActiveModel::Serializer :tag_list, :created_at, :updated_at, - :status + :status, + :url_path has_many :elements end diff --git a/app/serializers/alchemy/page_tree_serializer.rb b/app/serializers/alchemy/page_tree_serializer.rb index f6a36b6d29..a59b6d810c 100644 --- a/app/serializers/alchemy/page_tree_serializer.rb +++ b/app/serializers/alchemy/page_tree_serializer.rb @@ -3,7 +3,7 @@ module Alchemy class PageTreeSerializer < BaseSerializer def attributes - {'pages' => nil} + {"pages" => nil} end def pages @@ -53,15 +53,15 @@ def page_hash(page, has_children, level, folded) id: page.id, name: page.name, public: page.public?, - visible: page.visible?, restricted: page.restricted?, page_layout: page.page_layout, slug: page.slug, urlname: page.urlname, + url_path: page.url_path, level: level, - root: level == 1, - root_or_leaf: level == 1 || !has_children, - children: [] + root: page.depth == 1, + root_or_leaf: page.depth == 1 || !has_children, + children: [], } if opts[:elements] @@ -73,9 +73,9 @@ def page_hash(page, has_children, level, folded) definition_missing: page.definition.blank?, folded: folded, locked: page.locked?, - locked_notice: page.locked? ? Alchemy.t('This page is locked', name: page.locker_name) : nil, + locked_notice: page.locked? ? Alchemy.t("This page is locked", name: page.locker_name) : nil, permissions: page_permissions(page, opts[:ability]), - status_titles: page_status_titles(page) + status_titles: page_status_titles(page), }) else p_hash @@ -83,10 +83,10 @@ def page_hash(page, has_children, level, folded) end def page_elements(page) - if opts[:elements] == 'true' + if opts[:elements] == "true" page.elements else - page.elements.named(opts[:elements].split(',') || []) + page.elements.named(opts[:elements].split(",") || []) end end @@ -97,15 +97,14 @@ def page_permissions(page, ability) copy: ability.can?(:copy, page), destroy: ability.can?(:destroy, page), create: ability.can?(:create, Alchemy::Page), - edit_content: ability.can?(:edit_content, page) + edit_content: ability.can?(:edit_content, page), } end def page_status_titles(page) { public: page.status_title(:public), - visible: page.status_title(:visible), - restricted: page.status_title(:restricted) + restricted: page.status_title(:restricted), } end end diff --git a/app/views/alchemy/admin/layoutpages/index.html.erb b/app/views/alchemy/admin/layoutpages/index.html.erb index 43e7e1e0aa..d7dbe6dcea 100644 --- a/app/views/alchemy/admin/layoutpages/index.html.erb +++ b/app/views/alchemy/admin/layoutpages/index.html.erb @@ -4,7 +4,7 @@ <%= render 'alchemy/admin/partials/language_tree_select' %> <%= toolbar_button( icon: :plus, - url: alchemy.new_admin_page_path(parent_id: @layout_root.id, layoutpage: true), + url: alchemy.new_admin_page_path(language: @current_language, layoutpage: true), hotkey: 'alt+n', dialog_options: { title: Alchemy.t('Add global page'), @@ -30,6 +30,10 @@ <% end %> +

    + <%= Alchemy::Page.human_attribute_name(:name) %> +

    +
      - <%= render partial: "layoutpage", collection: @layout_root.children %> + <%= render partial: "layoutpage", collection: @layout_pages %>
    diff --git a/app/views/alchemy/admin/nodes/_form.html.erb b/app/views/alchemy/admin/nodes/_form.html.erb index dca2a49c03..e8c1602b28 100644 --- a/app/views/alchemy/admin/nodes/_form.html.erb +++ b/app/views/alchemy/admin/nodes/_form.html.erb @@ -1,23 +1,26 @@ <%= alchemy_form_for([:admin, node]) do |f| %> - <% if node.root? %> - <%= f.input :name, - collection: Alchemy::Node.available_menu_names.map { |n| [I18n.t(n, scope: [:alchemy, :menu_names]), n] }, + <% if node.new_record? && node.root? %> + <%= f.input :menu_type, + collection: Alchemy::Language.current.available_menu_names.map { |n| [I18n.t(n, scope: [:alchemy, :menu_names]), n] }, include_blank: false, input_html: { class: 'alchemy_selectbox' } %> <% else %> - <%= f.input :name, input_html: { - autofocus: true, - value: node.page && node.read_attribute(:name).blank? ? nil : node.name, - placeholder: node.page ? node.page.name : nil - } %> - <%= f.input :page_id, label: Alchemy::Page.model_name.human, input_html: { class: 'alchemy_selectbox' } %> - <%= f.input :url, input_html: { disabled: node.page }, hint: Alchemy.t(:node_url_hint) %> - <%= f.input :title %> - <%= f.input :nofollow %> - <%= f.input :external %> - <%= f.hidden_field :parent_id %> + <% if node.root? %> + <%= f.input :name %> + <% else %> + <%= f.input :name, input_html: { + autofocus: true, + value: node.page && node.read_attribute(:name).blank? ? nil : node.name, + placeholder: node.page ? node.page.name : nil + } %> + <%= f.input :page_id, label: Alchemy::Page.model_name.human, input_html: { class: 'alchemy_selectbox' } %> + <%= f.input :url, input_html: { disabled: node.page }, hint: Alchemy.t(:node_url_hint) %> + <%= f.input :title %> + <%= f.input :nofollow %> + <%= f.input :external %> + <%= f.hidden_field :parent_id %> + <% end %> <% end %> - <%= f.hidden_field :site_id %> <%= f.hidden_field :language_id %> <%= f.submit button_label %> <% end %> @@ -30,7 +33,7 @@ initialSelection: { id: <%= node.page_id %>, text: "<%= node.page.name %>", - url: "/<%= node.page.urlname %>" + url_path: "<%= node.page.url_path %>" } <% end %> }).on('change', function(e) { @@ -39,7 +42,7 @@ $('#node_url').val('').prop('disabled', false) } else { $('#node_name').attr('placeholder', e.added.name) - $('#node_url').val('/' + e.added.urlname).prop('disabled', true) + $('#node_url').val(e.added.url_path).prop('disabled', true) } }) diff --git a/app/views/alchemy/admin/nodes/_node.html.erb b/app/views/alchemy/admin/nodes/_node.html.erb index 1615497ed0..143473bc0b 100644 --- a/app/views/alchemy/admin/nodes/_node.html.erb +++ b/app/views/alchemy/admin/nodes/_node.html.erb @@ -47,11 +47,7 @@ <% end %>
    - <% if node.root? %> - <%= I18n.t(node.name, scope: [:alchemy, :menu_names]) %> - <% else %> - <%= node.name || ' '.html_safe %> - <% end %> + <%= node.name || ' '.html_safe %> <% if node.page %> diff --git a/app/views/alchemy/admin/nodes/index.html.erb b/app/views/alchemy/admin/nodes/index.html.erb index 38e6a701c1..41259a463b 100644 --- a/app/views/alchemy/admin/nodes/index.html.erb +++ b/app/views/alchemy/admin/nodes/index.html.erb @@ -43,6 +43,5 @@
    diff --git a/app/views/alchemy/admin/pages/_create_language_form.html.erb b/app/views/alchemy/admin/pages/_create_language_form.html.erb index 5e2ccc088c..482099da00 100644 --- a/app/views/alchemy/admin/pages/_create_language_form.html.erb +++ b/app/views/alchemy/admin/pages/_create_language_form.html.erb @@ -1,4 +1,3 @@ -<% if root = Alchemy::Page.rootpage %>
    <%= render_message do %>

    <%= Alchemy.t(:language_does_not_exist) %>

    @@ -37,7 +36,6 @@ <%= form.hidden_field :language_id, value: @language.id %> <%= form.hidden_field :language_code, value: @language.code %> <%= form.hidden_field :language_root, value: true %> - <%= form.hidden_field :parent_id, value: root.id %> <%= form.hidden_field :public, value: Alchemy::Language.all.size == 1 %> <%= form.submit Alchemy.t("create_tree_as_new_language", language: @language.name), autofocus: true %> <% end %> @@ -50,9 +48,3 @@ <%- end -%>
    -<% else %> -<%= render_message :error do %> -

    Root page not found.

    -

    Please run bin/rake db:seed task.

    -<% end %> -<% end %> diff --git a/app/views/alchemy/admin/pages/_form.html.erb b/app/views/alchemy/admin/pages/_form.html.erb index a0b0a66e5e..2112d973ed 100644 --- a/app/views/alchemy/admin/pages/_form.html.erb +++ b/app/views/alchemy/admin/pages/_form.html.erb @@ -10,7 +10,6 @@
    <%= render 'alchemy/admin/pages/publication_fields' %> <%= page_status_checkbox(@page, :restricted) %> - <%= render 'alchemy/admin/pages/menu_fields', f: f %> <% if configuration(:sitemap)['show_flag'] %> <%= page_status_checkbox(@page, :sitemap) %> <% end %> @@ -18,7 +17,7 @@
    <%= f.input :name, autofocus: true %> - <%= f.input :urlname, as: 'string', input_html: {value: @page.slug} %> + <%= f.input :urlname, as: 'string', input_html: {value: @page.slug}, label: Alchemy::Page.human_attribute_name(:slug) %> <%= f.input :title, input_html: {'data-alchemy-char-counter' => 60} %> diff --git a/app/views/alchemy/admin/pages/_menu_fields.html.erb b/app/views/alchemy/admin/pages/_menu_fields.html.erb deleted file mode 100644 index dadb0f2641..0000000000 --- a/app/views/alchemy/admin/pages/_menu_fields.html.erb +++ /dev/null @@ -1,33 +0,0 @@ -<% if @page.menus.any? %> - - <% @page.menus.each do |menu| %> - - <%= menu.name %> - - <% end %> -<% elsif Alchemy::Node.roots.any? %> - <%= page_status_checkbox(@page, :visible) %> - <%= f.input :menu_id, collection: Alchemy::Node.roots.map { |n| [n.name, n.id] }, - prompt: Alchemy.t('Please choose a menu'), - input_html: { class: 'alchemy_selectbox' }, - wrapper_html: { style: @page.visible? ? 'display: block' : 'display: none' }, - label: false %> - -<% else %> - <%= page_status_checkbox(@page, :visible) %> -<% end %> diff --git a/app/views/alchemy/admin/pages/_new_page_form.html.erb b/app/views/alchemy/admin/pages/_new_page_form.html.erb index b44f5ed276..f717ae233e 100644 --- a/app/views/alchemy/admin/pages/_new_page_form.html.erb +++ b/app/views/alchemy/admin/pages/_new_page_form.html.erb @@ -1,5 +1,6 @@ <%= alchemy_form_for([:admin, @page]) do |f| %> <%= f.hidden_field(:parent_id) %> + <%= f.hidden_field(:language_id) %> <%= f.hidden_field(:layoutpage) %> <%= f.input :page_layout, collection: @page_layouts, diff --git a/app/views/alchemy/admin/pages/_page.html.erb b/app/views/alchemy/admin/pages/_page.html.erb index 9ddda23f77..c43cbbb4d2 100644 --- a/app/views/alchemy/admin/pages/_page.html.erb +++ b/app/views/alchemy/admin/pages/_page.html.erb @@ -1,4 +1,4 @@ -
  • +
  • <% unless @sorting %> @@ -150,15 +150,14 @@ {{status_titles.public}} - - - {{status_titles.visible}} - {{status_titles.restricted}}
    +
    + {{ url_path }} +
    {{#if permissions.edit_content}} <%= link_to_unless( diff --git a/app/views/alchemy/admin/pages/_page_infos.html.erb b/app/views/alchemy/admin/pages/_page_infos.html.erb index 4482354206..81a5318b61 100644 --- a/app/views/alchemy/admin/pages/_page_infos.html.erb +++ b/app/views/alchemy/admin/pages/_page_infos.html.erb @@ -2,10 +2,6 @@ <%= render_icon(:compass, transform: 'shrink-2', class: @page.public? ? nil : 'disabled') %> <%= page.status_title(:public) %> - - <%= render_icon(:eye, transform: 'shrink-2', class: @page.visible? ? nil : 'disabled') %> - <%= page.status_title(:visible) %> - <%= render_icon(:lock, transform: 'shrink-2', class: @page.restricted? ? nil : 'disabled') %> <%= page.status_title(:restricted) %> diff --git a/app/views/alchemy/admin/pages/_sitemap.html.erb b/app/views/alchemy/admin/pages/_sitemap.html.erb index 7f03406879..8df5cdf2d9 100644 --- a/app/views/alchemy/admin/pages/_sitemap.html.erb +++ b/app/views/alchemy/admin/pages/_sitemap.html.erb @@ -1,4 +1,10 @@
    +

    + <%= Alchemy::Page.human_attribute_name(:name) %> + <%= Alchemy::Page.human_attribute_name(:urlname) %> + <%= Alchemy.t(:page_status) %> +

    +

    diff --git a/app/views/alchemy/admin/pages/edit.html.erb b/app/views/alchemy/admin/pages/edit.html.erb index d887e5c550..d9801d114a 100644 --- a/app/views/alchemy/admin/pages/edit.html.erb +++ b/app/views/alchemy/admin/pages/edit.html.erb @@ -190,7 +190,7 @@ } }); - Alchemy.PreviewWindow.init('<%= admin_page_path(@page) %>'); + Alchemy.PreviewWindow.init('<%= @preview_url %>'); $('#preview_size').bind('open.selectBoxIt', function (e) { $('#top_menu').css('z-index', 5000); diff --git a/app/views/alchemy/admin/pages/info.html.erb b/app/views/alchemy/admin/pages/info.html.erb index e3a8f5ee6c..b665bb1545 100644 --- a/app/views/alchemy/admin/pages/info.html.erb +++ b/app/views/alchemy/admin/pages/info.html.erb @@ -14,7 +14,7 @@

    <%= @page.layout_display_name %>

    - +

    <%= "/#{@page.urlname}" %>

    @@ -24,10 +24,6 @@ <%= render_icon(:compass, transform: 'shrink-2', class: @page.public? ? nil : 'disabled') %> <%= @page.status_title(:public) %> - - <%= render_icon(:eye, transform: 'shrink-2', class: @page.visible? ? nil : 'disabled') %> - <%= @page.status_title(:visible) %> - <%= render_icon(:lock, transform: 'shrink-2', class: @page.restricted? ? nil : 'disabled') %> <%= @page.status_title(:restricted) %> diff --git a/app/views/alchemy/admin/pages/unlock.js.erb b/app/views/alchemy/admin/pages/unlock.js.erb index 52f4f5fbcf..9c7761b3e0 100644 --- a/app/views/alchemy/admin/pages/unlock.js.erb +++ b/app/views/alchemy/admin/pages/unlock.js.erb @@ -1,6 +1,13 @@ -(function($) { - $('#locked_page_<%= @page.id -%>').remove(); - $('#page_<%= @page.id -%> .sitemap_left_images .with-hint').remove(); - $('#page_<%= @page.id -%> .sitemap_left_images').append('<%= j render_icon(:file, style: 'regular', size: 'lg') %>'); - Alchemy.growl('<%= flash[:notice] -%>'); -})(jQuery); +(function() { + var locked_page_tab = document.querySelector('#locked_page_<%= @page.id -%>') + var locked_page_icon = document.querySelector( + '#page_<%= @page.id -%> > .sitemap_page > .sitemap_left_images .with-hint' + ) + if (locked_page_tab) { + locked_page_tab.remove() + } + if (locked_page_icon) { + locked_page_icon.innerHTML = '<%= j render_icon(:file, style: 'regular', size: 'lg') %>' + } + Alchemy.growl('<%= flash[:notice] -%>') +})() diff --git a/app/views/alchemy/admin/pictures/index.html.erb b/app/views/alchemy/admin/pictures/index.html.erb index 572a171c3a..090d117a05 100644 --- a/app/views/alchemy/admin/pictures/index.html.erb +++ b/app/views/alchemy/admin/pictures/index.html.erb @@ -14,7 +14,12 @@
    <%= link_to( render_icon('search-minus'), - alchemy.admin_pictures_path(size: "small", q: search_filter_params[:q]), + alchemy.admin_pictures_path( + size: "small", + q: search_filter_params[:q], + filter: search_filter_params[:filter], + tagged_with: search_filter_params[:tagged_with] + ), title: Alchemy.t(:small_thumbnails), class: "icon_button" ) %> @@ -22,7 +27,12 @@
    <%= link_to( render_icon('search'), - alchemy.admin_pictures_path(size: "medium", q: search_filter_params[:q]), + alchemy.admin_pictures_path( + size: "medium", + q: search_filter_params[:q], + filter: search_filter_params[:filter], + tagged_with: search_filter_params[:tagged_with] + ), title: Alchemy.t(:medium_thumbnails), class: "icon_button" ) %> @@ -30,7 +40,12 @@
    <%= link_to( render_icon('search-plus'), - alchemy.admin_pictures_path(size: "large", q: search_filter_params[:q]), + alchemy.admin_pictures_path( + size: "large", + q: search_filter_params[:q], + filter: search_filter_params[:filter], + tagged_with: search_filter_params[:tagged_with] + ), title: Alchemy.t(:big_thumbnails), class: "icon_button" ) %> diff --git a/app/views/alchemy/essences/_essence_node_editor.html.erb b/app/views/alchemy/essences/_essence_node_editor.html.erb new file mode 100644 index 0000000000..13d5112583 --- /dev/null +++ b/app/views/alchemy/essences/_essence_node_editor.html.erb @@ -0,0 +1,27 @@ +<%= content_tag :div, + id: essence_node_editor.dom_id, + class: essence_node_editor.css_classes, + data: essence_node_editor.data_attributes do %> + <%= content_label(essence_node_editor) %> + <%= text_field_tag( + essence_node_editor.form_field_name("node_id"), + essence_node_editor.essence.node_id, + id: essence_node_editor.form_field_id, + class: 'alchemy_selectbox full_width' + ) %> +<% end %> + + diff --git a/app/views/alchemy/essences/_essence_node_view.html.erb b/app/views/alchemy/essences/_essence_node_view.html.erb new file mode 100644 index 0000000000..f1b1ca8ccf --- /dev/null +++ b/app/views/alchemy/essences/_essence_node_view.html.erb @@ -0,0 +1 @@ +<%= render content.ingredient if content.ingredient %> diff --git a/app/views/alchemy/essences/_essence_page_editor.html.erb b/app/views/alchemy/essences/_essence_page_editor.html.erb index 25fcde586b..4dbf0727c6 100644 --- a/app/views/alchemy/essences/_essence_page_editor.html.erb +++ b/app/views/alchemy/essences/_essence_page_editor.html.erb @@ -4,7 +4,7 @@ data: essence_page_editor.data_attributes do %> <%= content_label(essence_page_editor) %> <%= text_field_tag( - essence_page_editor.form_field_name, + essence_page_editor.form_field_name("page_id"), essence_page_editor.essence.page_id, id: essence_page_editor.form_field_id, class: 'alchemy_selectbox full_width' diff --git a/app/views/alchemy/pages/show.rss.builder b/app/views/alchemy/pages/show.rss.builder index 19377b16b8..608239ed2e 100644 --- a/app/views/alchemy/pages/show.rss.builder +++ b/app/views/alchemy/pages/show.rss.builder @@ -10,8 +10,8 @@ xml.rss version: "2.0" do xml.item do xml.title element.content_for_rss_title.try(:ingredient) xml.description element.content_for_rss_description.try(:ingredient) - if element.has_ingredient?('date') - xml.pubDate element.ingredient('date').to_s(:rfc822) + if element.has_ingredient?("date") + xml.pubDate element.ingredient("date").to_s(:rfc822) end xml.link show_alchemy_page_url(@page, anchor: element_dom_id(element)) xml.guid show_alchemy_page_url(@page, anchor: element_dom_id(element)) diff --git a/app/views/layouts/alchemy/admin.html.erb b/app/views/layouts/alchemy/admin.html.erb index d8ac6b27f1..79bf6394e0 100644 --- a/app/views/layouts/alchemy/admin.html.erb +++ b/app/views/layouts/alchemy/admin.html.erb @@ -36,6 +36,7 @@ <%= render 'alchemy/admin/partials/routes' %> <%= javascript_include_tag('alchemy/admin/all', 'data-turbolinks-track' => true) %> + <%= javascript_pack_tag('alchemy/admin') %> <%= yield :javascript_includes %> <%= content_tag :body, id: 'alchemy', class: alchemy_body_class do %> diff --git a/babel.config.js b/babel.config.js new file mode 100644 index 0000000000..ec5616cd71 --- /dev/null +++ b/babel.config.js @@ -0,0 +1,12 @@ +module.exports = { + presets: [ + [ + "@babel/preset-env", + { + targets: { + node: "current" + } + } + ] + ] +} diff --git a/bin/rails b/bin/rails index 5d8a41f30e..7ad4e14e01 100755 --- a/bin/rails +++ b/bin/rails @@ -2,8 +2,8 @@ # frozen_string_literal: true # This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application. -ENGINE_ROOT = File.expand_path('..', __dir__) -ENGINE_PATH = File.expand_path('../lib/alchemy/engine', __dir__) +ENGINE_ROOT = File.expand_path("..", __dir__) +ENGINE_PATH = File.expand_path("../lib/alchemy/engine", __dir__) -require 'rails/all' -require 'rails/engine/commands' +require "rails/all" +require "rails/engine/commands" diff --git a/config/alchemy/config.yml b/config/alchemy/config.yml index 9e5c07c899..5c063790bf 100644 --- a/config/alchemy/config.yml +++ b/config/alchemy/config.yml @@ -1,12 +1,6 @@ # == This is the global Alchemy configuration file # -# === Require SSL for login form and all admin modules -# -# NOTE: You have to create a SSL certificate on your server to make this work -# -require_ssl: false - # === Auto Log Out Time # # The amount of time of inactivity in minutes after which the user is kicked out of his current session. @@ -17,7 +11,7 @@ auto_logout_time: 30 # === Redirect Options # -# redirect_to_public_child [Boolean] # Alchemy redirects to the first public child page found, if a page is not visible. +# redirect_to_public_child [Boolean] # Alchemy redirects to the first public child page found, if a page is not public. # redirect_to_public_child: true @@ -44,23 +38,33 @@ sitemap: show_root: true show_flag: false -# === URL nesting +# === Default items per page in admin views +# +# In Alchemy's Admin, change how many items you would get shown per page by Kaminari +items_per_page: 15 + +# === Preview window URL configuration # -# Since Alchemy 2.6.0, page urls are nested, respectively to their tree position. +# By default Alchemy uses its internal page preview renderer, +# but you can configure it to be any URL instead. # -# Disable +url_nesting+ to get slug only urls. +# Basic Auth is supported. # -# NOTE: After changing the url_nesting, you should run one of these convert rake tasks: +# preview: +# host: https://www.my-static-site.com +# auth: +# username: <%= ENV["BASIC_AUTH_USERNAME"] %> +# password: <%= ENV["BASIC_AUTH_PASSWORD"] %> # -# rake alchemy:convert:urlnames:to_nested -# rake alchemy:convert:urlnames:to_slug +# Preview config per site is supported as well. # -url_nesting: true - -# === Default items per page in admin views +# preview: +# My site name: +# host: https://www.my-static-site.com +# auth: +# username: <%= ENV["BASIC_AUTH_USERNAME"] %> +# password: <%= ENV["BASIC_AUTH_PASSWORD"] %> # -# In Alchemy's Admin, change how many items you would get shown per page by Kaminari -items_per_page: 15 # === Picture rendering settings # diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 150ad0fdc4..4a75c7e252 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -1,3 +1,3 @@ # frozen_string_literal: true # Add Alchemy assets for precompiling -Rails.application.config.assets.precompile << 'alchemy_manifest.js' +Rails.application.config.assets.precompile << "alchemy_manifest.js" diff --git a/config/initializers/dragonfly.rb b/config/initializers/dragonfly.rb index 8ed78220d8..786b23a6b5 100644 --- a/config/initializers/dragonfly.rb +++ b/config/initializers/dragonfly.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require 'dragonfly_svg' +require "dragonfly_svg" # Logger Dragonfly.logger = Rails.logger diff --git a/config/initializers/mini_profiler.rb b/config/initializers/mini_profiler.rb index af008dc7c7..562b940e05 100644 --- a/config/initializers/mini_profiler.rb +++ b/config/initializers/mini_profiler.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true begin - require 'rack-mini-profiler' - Rack::MiniProfiler.config.position = 'right' + require "rack-mini-profiler" + Rack::MiniProfiler.config.position = "right" Rack::MiniProfiler.config.start_hidden = true rescue LoadError end diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb index 9e632b7e09..1da4f1892c 100644 --- a/config/initializers/simple_form.rb +++ b/config/initializers/simple_form.rb @@ -77,7 +77,7 @@ config.boolean_style = :inline # Default class for buttons - config.button_class = 'button' + config.button_class = "button" # Method used to tidy up errors. Specify any Rails Array method. # :first lists the first message for each field. @@ -88,7 +88,7 @@ config.error_notification_tag = :div # CSS class to add for error notification helper. - config.error_notification_class = 'field_with_errors' + config.error_notification_class = "field_with_errors" # ID to add for error notification helper. # config.error_notification_id = nil @@ -103,7 +103,7 @@ config.collection_wrapper_tag = :div # You can define the class to use on all collection wrappers. Defaulting to none. - config.collection_wrapper_class = 'control_group' + config.collection_wrapper_class = "control_group" # You can wrap each item in a collection of radio/check boxes with a tag, # defaulting to :span. @@ -116,7 +116,7 @@ config.label_text = proc { |label, required| "#{label}#{required}" } # You can define the class to use on all labels. Default is nil. - config.label_class = 'control-label' + config.label_class = "control-label" # You can define the default class to be used on forms. Can be overriden # with `html: { :class }`. Defaulting to none. @@ -170,12 +170,12 @@ # config.input_class = nil # Define the default class of the input wrapper of the boolean input. - config.boolean_label_class = 'checkbox' + config.boolean_label_class = "checkbox" # Defines if the default input wrapper class should be included in radio # collection wrappers. # config.include_default_input_wrapper_class = true # Defines which i18n scope will be used in Simple Form. - config.i18n_scope = 'alchemy.forms' + config.i18n_scope = "alchemy.forms" end diff --git a/config/locales/alchemy.en.yml b/config/locales/alchemy.en.yml index 51ea9c2659..cacd677308 100644 --- a/config/locales/alchemy.en.yml +++ b/config/locales/alchemy.en.yml @@ -488,9 +488,6 @@ en: page_published: "Published page" page_restricted: "restricted" page_states: - visible: - "true": "Page is visible in navigation." - "false": "Page is not visible in navigation." public: "true": "Page is published." "false": "Page is unpublished." @@ -587,8 +584,6 @@ en: button_label: Upload image(s) upload_success: "Picture %{name} uploaded successfully" upload_failure: "Error while uploading %{name}: %{error}" - url_name: "URL-Name" - visible: "visible" want_to_create_new_language: "Do you want to create a new empty language tree?" want_to_make_copy_of_existing_language: "Do you want to copy an existing language tree?" "We need at least one default.": "A default language must exist." @@ -684,9 +679,9 @@ en: page_layout: blank: "^Please choose a page layout." urlname: - too_short: "^The pages urlname is too short (minimum of 3 characters)." - taken: "^URL-Name already taken." - exclusion: "^URL-Name reserved." + too_short: "^URL-Path is too short (minimum of 3 characters)." + taken: "^URL-Path already taken." + exclusion: "^URL-Path reserved." alchemy/picture: attributes: image_file: @@ -720,6 +715,10 @@ en: activerecord: errors: models: + alchemy/node: + attributes: + base: + essence_nodes_present: "This menu item is in use inside an Alchemy element on the following pages: %{page_names}." alchemy/site: attributes: languages: @@ -805,8 +804,9 @@ en: locale: Localization code: ISO Code alchemy/legacy_page_url: - urlname: "URL path" + urlname: "URL-Path" alchemy/node: + menu_type: Menu Type name: "Name" title: "Title" nofollow: "Search engine must not follow" @@ -830,8 +830,8 @@ en: tag_list: Tags title: "Title" updated_at: "Updated at" - urlname: "Urlname" - visible: "visible in navigation" + urlname: "URL-Path" + slug: "Slug" alchemy/picture: image_file_name: "Filename" image_file_height: "Height" diff --git a/config/routes.rb b/config/routes.rb index 1cf0de3483..30aad4e77a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,18 +1,18 @@ # frozen_string_literal: true -require 'alchemy/routing_constraints' +require "alchemy/routing_constraints" Alchemy::Engine.routes.draw do - root to: 'pages#index' + root to: "pages#index" - get '/sitemap.xml' => 'pages#sitemap', format: 'xml' + get "/sitemap.xml" => "pages#sitemap", format: "xml" scope Alchemy.admin_path, {constraints: Alchemy.admin_constraints} do - get '/' => redirect("#{Alchemy.admin_path}/dashboard"), as: :admin - get '/dashboard' => 'admin/dashboard#index', as: :admin_dashboard - get '/dashboard/info' => 'admin/dashboard#info', as: :dashboard_info - get '/help' => 'admin/dashboard#help', as: :help - get '/dashboard/update_check' => 'admin/dashboard#update_check', as: :update_check - get '/leave' => 'admin/base#leave', as: :leave_admin + get "/" => redirect("#{Alchemy.admin_path}/dashboard"), as: :admin + get "/dashboard" => "admin/dashboard#index", as: :admin_dashboard + get "/dashboard/info" => "admin/dashboard#info", as: :dashboard_info + get "/help" => "admin/dashboard#help", as: :help + get "/dashboard/update_check" => "admin/dashboard#update_check", as: :update_check + get "/leave" => "admin/base#leave", as: :leave_admin end namespace :admin, {path: Alchemy.admin_path, constraints: Alchemy.admin_constraints} do @@ -95,7 +95,7 @@ end end - resource :clipboard, only: :index, controller: 'clipboard' do + resource :clipboard, only: :index, controller: "clipboard" do collection do get :index delete :clear @@ -104,7 +104,7 @@ end end - resource :trash, only: :index, controller: 'trash' do + resource :trash, only: :index, controller: "trash" do collection do get :index delete :clear @@ -119,38 +119,38 @@ resources :sites - get '/styleguide' => 'styleguide#index' + get "/styleguide" => "styleguide#index" end - get '/attachment/:id/download(/:name)' => 'attachments#download', + get "/attachment/:id/download(/:name)" => "attachments#download", as: :download_attachment - get '/attachment/:id/show' => 'attachments#show', + get "/attachment/:id/show" => "attachments#show", as: :show_attachment resources :messages, only: [:index, :new, :create] resources :elements, only: :show resources :contents, only: :show - namespace :api, defaults: {format: 'json'} do + namespace :api, defaults: {format: "json"} do resources :contents, only: [:index, :show] resources :elements, only: [:index, :show] do - get '/contents' => 'contents#index', as: 'contents' - get '/contents/:name' => 'contents#show', as: 'content' + get "/contents" => "contents#index", as: "contents" + get "/contents/:name" => "contents#show", as: "content" end resources :pages, only: [:index] do - get 'elements' => 'elements#index', as: 'elements' - get 'elements/:named' => 'elements#index', as: 'named_elements' + get "elements" => "elements#index", as: "elements" + get "elements/:named" => "elements#index", as: "named_elements" collection do get :nested end end - get '/pages/*urlname(.:format)' => 'pages#show', as: 'page' - get '/admin/pages/:id(.:format)' => 'pages#show', as: 'preview_page' + get "/pages/*urlname(.:format)" => "pages#show", as: "page" + get "/admin/pages/:id(.:format)" => "pages#show", as: "preview_page" - resources :nodes, only: [] do + resources :nodes, only: [:index] do member do patch :move patch :toggle_folded @@ -158,13 +158,13 @@ end end - get '/:locale' => 'pages#index', + get "/:locale" => "pages#index", constraints: {locale: Alchemy::RoutingConstraints::LOCALE_REGEXP}, as: :show_language_root # The page show action has to be last route constraints(locale: Alchemy::RoutingConstraints::LOCALE_REGEXP) do - get '(/:locale)/*urlname(.:format)' => 'pages#show', + get "(/:locale)/*urlname(.:format)" => "pages#show", constraints: Alchemy::RoutingConstraints.new, as: :show_page end diff --git a/config/spring.rb b/config/spring.rb index 9ee5253fd9..a28a83bf50 100755 --- a/config/spring.rb +++ b/config/spring.rb @@ -1,3 +1,3 @@ # frozen_string_literal: true -Spring.application_root = './spec/dummy' -Spring.watch 'lib/**/*' +Spring.application_root = "./spec/dummy" +Spring.watch "lib/**/*" diff --git a/db/migrate/20200226213334_alchemy_four_point_four.rb b/db/migrate/20200226213334_alchemy_four_point_four.rb index 3de012be7a..2dcb61665d 100644 --- a/db/migrate/20200226213334_alchemy_four_point_four.rb +++ b/db/migrate/20200226213334_alchemy_four_point_four.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class AlchemyFourPointFour < ActiveRecord::Migration[5.0] +class AlchemyFourPointFour < ActiveRecord::Migration[5.2] def up unless table_exists?("alchemy_attachments") create_table "alchemy_attachments", force: :cascade do |t| @@ -8,10 +8,9 @@ def up t.string "file_name" t.string "file_mime_type" t.integer "file_size" - t.integer "creator_id" - t.integer "updater_id" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.references "creator" + t.references "updater" + t.timestamps null: false t.string "file_uid" t.index ["file_uid"], name: "index_alchemy_attachments_on_file_uid" end @@ -20,16 +19,8 @@ def up unless table_exists?("alchemy_contents") create_table "alchemy_contents", force: :cascade do |t| t.string "name" - t.string "essence_type", null: false - t.integer "essence_id", null: false - t.integer "element_id", null: false - t.integer "position" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false - t.integer "creator_id" - t.integer "updater_id" - t.index ["element_id", "position"], name: "index_contents_on_element_id_and_position" - t.index ["essence_id", "essence_type"], name: "index_alchemy_contents_on_essence_id_and_essence_type", unique: true + t.references "essence", null: false, polymorphic: true, index: { unique: true } + t.references "element", null: false end end @@ -37,15 +28,14 @@ def up create_table "alchemy_elements", force: :cascade do |t| t.string "name" t.integer "position" - t.integer "page_id", null: false + t.references "page", null: false, index: false t.boolean "public", default: true t.boolean "folded", default: false t.boolean "unique", default: false - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false - t.integer "creator_id" - t.integer "updater_id" - t.integer "parent_element_id" + t.timestamps null: false + t.references "creator" + t.references "updater" + t.references "parent_element", index: false t.boolean "fixed", default: false, null: false t.index ["fixed"], name: "index_alchemy_elements_on_fixed" t.index ["page_id", "parent_element_id"], name: "index_alchemy_elements_on_page_id_and_parent_element_id" @@ -55,18 +45,14 @@ def up unless table_exists?("alchemy_elements_alchemy_pages") create_table "alchemy_elements_alchemy_pages", id: false, force: :cascade do |t| - t.integer "element_id" - t.integer "page_id" + t.references "element" + t.references "page" end end unless table_exists?("alchemy_essence_booleans") create_table "alchemy_essence_booleans", force: :cascade do |t| t.boolean "value" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false - t.integer "creator_id" - t.integer "updater_id" t.index ["value"], name: "index_alchemy_essence_booleans_on_value" end end @@ -74,34 +60,21 @@ def up unless table_exists?("alchemy_essence_dates") create_table "alchemy_essence_dates", force: :cascade do |t| t.datetime "date" - t.integer "creator_id" - t.integer "updater_id" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false end end unless table_exists?("alchemy_essence_files") create_table "alchemy_essence_files", force: :cascade do |t| - t.integer "attachment_id" + t.references "attachment" t.string "title" t.string "css_class" - t.integer "creator_id" - t.integer "updater_id" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false t.string "link_text" - t.index ["attachment_id"], name: "index_alchemy_essence_files_on_attachment_id" end end unless table_exists?("alchemy_essence_htmls") create_table "alchemy_essence_htmls", force: :cascade do |t| t.text "source" - t.integer "creator_id" - t.integer "updater_id" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false end end @@ -111,25 +84,18 @@ def up t.string "link_title" t.string "link_target" t.string "link_class_name" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false - t.integer "creator_id" - t.integer "updater_id" end end unless table_exists?("alchemy_essence_pages") create_table "alchemy_essence_pages", force: :cascade do |t| - t.integer "page_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.index ["page_id"], name: "index_alchemy_essence_pages_on_page_id" + t.references "page" end end unless table_exists?("alchemy_essence_pictures") create_table "alchemy_essence_pictures", force: :cascade do |t| - t.integer "picture_id" + t.references "picture" t.string "caption" t.string "title" t.string "alt_tag" @@ -138,14 +104,9 @@ def up t.string "link_title" t.string "css_class" t.string "link_target" - t.integer "creator_id" - t.integer "updater_id" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false t.string "crop_from" t.string "crop_size" t.string "render_size" - t.index ["picture_id"], name: "index_alchemy_essence_pictures_on_picture_id" end end @@ -154,20 +115,12 @@ def up t.text "body" t.text "stripped_body" t.boolean "public" - t.integer "creator_id" - t.integer "updater_id" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false end end unless table_exists?("alchemy_essence_selects") create_table "alchemy_essence_selects", force: :cascade do |t| t.string "value" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false - t.integer "creator_id" - t.integer "updater_id" t.index ["value"], name: "index_alchemy_essence_selects_on_value" end end @@ -180,17 +133,13 @@ def up t.string "link_class_name" t.boolean "public", default: false t.string "link_target" - t.integer "creator_id" - t.integer "updater_id" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false end end unless table_exists?("alchemy_folded_pages") create_table "alchemy_folded_pages", force: :cascade do |t| - t.integer "page_id", null: false - t.integer "user_id", null: false + t.references "page", null: false, index: false + t.references "user", null: false, index: false t.boolean "folded", default: false t.index ["page_id", "user_id"], name: "index_alchemy_folded_pages_on_page_id_and_user_id", unique: true end @@ -203,27 +152,23 @@ def up t.string "frontpage_name" t.string "page_layout", default: "intro" t.boolean "public", default: false - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false - t.integer "creator_id" - t.integer "updater_id" + t.timestamps null: false + t.references "creator" + t.references "updater" t.boolean "default", default: false t.string "country_code", default: "", null: false - t.integer "site_id", null: false + t.references "site", null: false t.string "locale" t.index ["language_code", "country_code"], name: "index_alchemy_languages_on_language_code_and_country_code" t.index ["language_code"], name: "index_alchemy_languages_on_language_code" - t.index ["site_id"], name: "index_alchemy_languages_on_site_id" end end unless table_exists?("alchemy_legacy_page_urls") create_table "alchemy_legacy_page_urls", force: :cascade do |t| t.string "urlname", null: false - t.integer "page_id", null: false - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false - t.index ["page_id"], name: "index_alchemy_legacy_page_urls_on_page_id" + t.references "page", null: false + t.timestamps null: false t.index ["urlname"], name: "index_alchemy_legacy_page_urls_on_urlname" end end @@ -236,25 +181,18 @@ def up t.boolean "nofollow", default: false, null: false t.boolean "external", default: false, null: false t.boolean "folded", default: false, null: false - t.integer "parent_id" + t.references "parent" t.integer "lft", null: false t.integer "rgt", null: false t.integer "depth", default: 0, null: false - t.integer "page_id" - t.integer "language_id", null: false - t.integer "creator_id" - t.integer "updater_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.integer "site_id", null: false - t.index ["creator_id"], name: "index_alchemy_nodes_on_creator_id" - t.index ["language_id"], name: "index_alchemy_nodes_on_language_id" + t.references "page" + t.references "language", null: false + t.references "creator" + t.references "updater" + t.timestamps null: false + t.references "site", null: false t.index ["lft"], name: "index_alchemy_nodes_on_lft" - t.index ["page_id"], name: "index_alchemy_nodes_on_page_id" - t.index ["parent_id"], name: "index_alchemy_nodes_on_parent_id" t.index ["rgt"], name: "index_alchemy_nodes_on_rgt" - t.index ["site_id"], name: "index_alchemy_nodes_on_site_id" - t.index ["updater_id"], name: "index_alchemy_nodes_on_updater_id" end end @@ -270,7 +208,7 @@ def up t.text "meta_description" t.integer "lft" t.integer "rgt" - t.integer "parent_id" + t.references "parent", index: false t.integer "depth" t.boolean "visible", default: false t.integer "locked_by" @@ -279,16 +217,14 @@ def up t.boolean "robot_follow", default: true t.boolean "sitemap", default: true t.boolean "layoutpage", default: false - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false - t.integer "creator_id" - t.integer "updater_id" - t.integer "language_id" + t.timestamps null: false + t.references "creator" + t.references "updater" + t.references "language" t.datetime "published_at" t.datetime "public_on" t.datetime "public_until" t.datetime "locked_at" - t.index ["language_id"], name: "index_pages_on_language_id" t.index ["locked_at", "locked_by"], name: "index_alchemy_pages_on_locked_at_and_locked_by" t.index ["parent_id", "lft"], name: "index_pages_on_parent_id_and_lft" t.index ["public_on", "public_until"], name: "index_alchemy_pages_on_public_on_and_public_until" @@ -303,10 +239,9 @@ def up t.string "image_file_name" t.integer "image_file_width" t.integer "image_file_height" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false - t.integer "creator_id" - t.integer "updater_id" + t.timestamps null: false + t.references "creator" + t.references "updater" t.string "upload_hash" t.string "image_file_uid" t.integer "image_file_size" @@ -318,8 +253,7 @@ def up create_table "alchemy_sites", force: :cascade do |t| t.string "host" t.string "name" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.timestamps null: false t.boolean "public", default: false t.text "aliases" t.boolean "redirect_to_primary_host" diff --git a/db/migrate/20200423073425_create_alchemy_essence_nodes.rb b/db/migrate/20200423073425_create_alchemy_essence_nodes.rb new file mode 100644 index 0000000000..cc766c88eb --- /dev/null +++ b/db/migrate/20200423073425_create_alchemy_essence_nodes.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class CreateAlchemyEssenceNodes < ActiveRecord::Migration[5.2] + def change + create_table :alchemy_essence_nodes do |t| + t.references "node" + t.timestamps + end + add_foreign_key "alchemy_essence_nodes", "alchemy_nodes", column: "node_id" + end +end diff --git a/db/migrate/20200504210159_remove_site_id_from_nodes.rb b/db/migrate/20200504210159_remove_site_id_from_nodes.rb new file mode 100644 index 0000000000..629056023b --- /dev/null +++ b/db/migrate/20200504210159_remove_site_id_from_nodes.rb @@ -0,0 +1,28 @@ +# frozen_string_literal: true +class RemoveSiteIdFromNodes < ActiveRecord::Migration[5.2] + def up + remove_foreign_key :alchemy_nodes, :alchemy_sites + remove_index :alchemy_nodes, :site_id + remove_column :alchemy_nodes, :site_id, :integer, null: false + end + + def down + add_column :alchemy_nodes, :site_id, :integer, null: true + sql = <<~SQL + UPDATE alchemy_nodes + SET site_id = ( + SELECT alchemy_languages.site_id FROM alchemy_languages WHERE alchemy_nodes.language_id = alchemy_languages.id + ) WHERE + EXISTS ( + SELECT * + FROM alchemy_languages + WHERE alchemy_languages.id = alchemy_nodes.language_id + ); + SQL + + connection.execute(sql) + change_column :alchemy_nodes, :site_id, :integer, null: false + add_index :alchemy_nodes, :site_id + add_foreign_key :alchemy_nodes, :alchemy_sites, column: :site_id + end +end diff --git a/db/migrate/20200505215518_add_language_id_foreign_key_to_alchemy_pages.rb b/db/migrate/20200505215518_add_language_id_foreign_key_to_alchemy_pages.rb new file mode 100644 index 0000000000..83dde8a837 --- /dev/null +++ b/db/migrate/20200505215518_add_language_id_foreign_key_to_alchemy_pages.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +class AddLanguageIdForeignKeyToAlchemyPages < ActiveRecord::Migration[5.2] + def change + add_foreign_key :alchemy_pages, :alchemy_languages, column: :language_id + change_column_null :alchemy_pages, :language_id, false, Alchemy::Language.default&.id + end +end diff --git a/db/migrate/20200511113603_add_menu_type_to_alchemy_nodes.rb b/db/migrate/20200511113603_add_menu_type_to_alchemy_nodes.rb new file mode 100644 index 0000000000..258f31cae1 --- /dev/null +++ b/db/migrate/20200511113603_add_menu_type_to_alchemy_nodes.rb @@ -0,0 +1,27 @@ +# frozen_string_literal: true +class AddMenuTypeToAlchemyNodes < ActiveRecord::Migration[5.2] + class LocalNode < ActiveRecord::Base + self.table_name = :alchemy_nodes + acts_as_nested_set scope: :language_id + + def self.root_for(node) + return node if node.parent_id.nil? + + root_for(node.parent) + end + end + + def up + add_column :alchemy_nodes, :menu_type, :string + LocalNode.all.each do |node| + root = LocalNode.root_for(node) + menu_type = root.name.parameterize.underscore + node.update(menu_type: menu_type) + end + change_column_null :alchemy_nodes, :menu_type, false + end + + def down + remove_column :alchemy_nodes, :menu_type + end +end diff --git a/db/migrate/20200514091507_make_page_layoutpage_null_false.rb b/db/migrate/20200514091507_make_page_layoutpage_null_false.rb new file mode 100644 index 0000000000..1e68bc1c48 --- /dev/null +++ b/db/migrate/20200514091507_make_page_layoutpage_null_false.rb @@ -0,0 +1,6 @@ +# frozen_string_literal: true +class MakePageLayoutpageNullFalse < ActiveRecord::Migration[5.2] + def change + change_column_null :alchemy_pages, :layoutpage, false, false + end +end diff --git a/db/migrate/20200519073500_remove_visible_from_alchemy_pages.rb b/db/migrate/20200519073500_remove_visible_from_alchemy_pages.rb new file mode 100644 index 0000000000..566f450255 --- /dev/null +++ b/db/migrate/20200519073500_remove_visible_from_alchemy_pages.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true +class RemoveVisibleFromAlchemyPages < ActiveRecord::Migration[5.2] + class LocalPage < ActiveRecord::Base + self.table_name = "alchemy_pages" + + scope :invisible, -> { where(visible: [false, nil]) } + scope :contentpages, -> { where(layoutpage: [false, nil]) } + end + + def up + if LocalPage.invisible.contentpages.where.not(parent_id: nil).any? + abort "You have invisible pages in your database! " \ + "Please re-structure your page tree before running this migration. " \ + "You might also downgrade to Alchemy 4.6 and " \ + "run the `alchemy:upgrade:4.6:restructure_page_tree` rake task." + end + + remove_column :alchemy_pages, :visible + end + + def down + add_column :alchemy_pages, :visible, :boolean, default: false + end +end diff --git a/lib/alchemy/admin/locale.rb b/lib/alchemy/admin/locale.rb index 7300e4b5e1..d5627afa77 100644 --- a/lib/alchemy/admin/locale.rb +++ b/lib/alchemy/admin/locale.rb @@ -64,7 +64,7 @@ def user_has_preferred_language? # Try to get the locale from browser headers. def locale_from_browser - request.env['HTTP_ACCEPT_LANGUAGE'].try(:scan, /\A[a-z]{2}/).try(:first) + request.env["HTTP_ACCEPT_LANGUAGE"].try(:scan, /\A[a-z]{2}/).try(:first) end end end diff --git a/lib/alchemy/admin/preview_url.rb b/lib/alchemy/admin/preview_url.rb new file mode 100644 index 0000000000..2b2325e88a --- /dev/null +++ b/lib/alchemy/admin/preview_url.rb @@ -0,0 +1,85 @@ +# frozen_string_literal: true + +require "uri" + +module Alchemy + module Admin + # = Preview window URL configuration + # + # By default Alchemy uses its internal page preview renderer, + # but you can configure it to be any URL instead. + # + # Basic Auth is supported. + # + # == Example config/alchemy/config.yml + # + # preview: + # host: https://www.my-static-site.com + # auth: + # username: <%= ENV["BASIC_AUTH_USERNAME"] %> + # password: <%= ENV["BASIC_AUTH_PASSWORD"] %> + # + # Preview config per site is supported as well. + # + # == Example config/alchemy/config.yml + # + # preview: + # My site name: + # host: https://www.my-static-site.com + # auth: + # username: <%= ENV["BASIC_AUTH_USERNAME"] %> + # password: <%= ENV["BASIC_AUTH_PASSWORD"] %> + # + class PreviewUrl + class MissingProtocolError < StandardError; end + + def initialize(routes:) + @routes = routes.url_helpers + end + + def url_for(page) + @preview_config = preview_config_for(page) + + if @preview_config && uri + uri_class.build( + host: uri.host, + path: page.url_path, + userinfo: userinfo, + ).to_s + else + routes.admin_page_path(page) + end + end + + private + + attr_reader :routes + + def preview_config_for(page) + preview_config = Alchemy::Config.get(:preview) + return unless preview_config + + preview_config[page.site.name] || preview_config + end + + def uri + return unless @preview_config["host"] + + URI(@preview_config["host"]) + end + + def uri_class + if uri.class == URI::Generic + raise MissingProtocolError, "Please provide the protocol with preview['host']" + else + uri.class + end + end + + def userinfo + auth = @preview_config["auth"] + auth ? "#{auth["username"]}:#{auth["password"]}" : nil + end + end + end +end diff --git a/lib/alchemy/auth_accessors.rb b/lib/alchemy/auth_accessors.rb index d35fa6afe3..0114eff556 100644 --- a/lib/alchemy/auth_accessors.rb +++ b/lib/alchemy/auth_accessors.rb @@ -53,13 +53,13 @@ module Alchemy # Defaults # - @@user_class_name = 'User' + @@user_class_name = "User" @@user_class_primary_key = :id - @@current_user_method = 'current_user' - @@signup_path = '/signup' - @@login_path = '/login' - @@logout_path = '/logout' - @@logout_method = 'delete' + @@current_user_method = "current_user" + @@signup_path = "/signup" + @@login_path = "/login" + @@logout_path = "/logout" + @@logout_method = "delete" # Returns the user class # @@ -76,7 +76,7 @@ module Alchemy # Prefix with :: when getting to avoid constant name conflicts def self.user_class_name if !@@user_class_name.is_a?(String) - raise TypeError, 'Alchemy.user_class_name must be a String, not a Class.' + raise TypeError, "Alchemy.user_class_name must be a String, not a Class." end "::#{@@user_class_name}" diff --git a/lib/alchemy/cache_digests/template_tracker.rb b/lib/alchemy/cache_digests/template_tracker.rb index ef1e646759..d6f6aa7a88 100644 --- a/lib/alchemy/cache_digests/template_tracker.rb +++ b/lib/alchemy/cache_digests/template_tracker.rb @@ -14,10 +14,10 @@ def initialize(name, template) def dependencies case @name.to_s when /^alchemy\/pages\/show/ - PageLayout.all.map { |p| "alchemy/page_layouts/_#{p['name']}" } + PageLayout.all.map { |p| "alchemy/page_layouts/_#{p["name"]}" } when /^alchemy\/page_layouts\/_(\w+)/ page_layout = PageLayout.get($1) - layout_elements = page_layout.fetch('elements', []) + layout_elements = page_layout.fetch("elements", []) layout_elements.map { |name| "alchemy/elements/_#{name}_view" } + layout_elements.map { |name| "alchemy/elements/_#{name}" } when /^alchemy\/elements\/_(\w+)_view/, /^alchemy\/elements\/_(\w+)/ @@ -32,10 +32,10 @@ def dependencies private def essence_types(name) - element = Element.definitions.detect { |e| e['name'] == name } + element = Element.definitions.detect { |e| e["name"] == name } return [] unless element - element.fetch('contents', []).collect { |c| c['type'] } + element.fetch("contents", []).collect { |c| c["type"] } end end end diff --git a/lib/alchemy/config.rb b/lib/alchemy/config.rb index 7b60a8919d..ebaf634c71 100644 --- a/lib/alchemy/config.rb +++ b/lib/alchemy/config.rb @@ -8,8 +8,10 @@ class << self # @param name [String] # def get(name) + check_deprecation(name) show[name.to_s] end + alias_method :parameter, :get # Returns a merged configuration of the following files @@ -25,11 +27,18 @@ def show @config ||= merge_configs!(alchemy_config, main_app_config, env_specific_config) end + # A list of deprecated configurations + # a value of nil means there is no new default + # any not nil value is the new default + def deprecated_configs + {} + end + private # Alchemy default configuration def alchemy_config - read_file(File.join(File.dirname(__FILE__), '..', '..', 'config/alchemy/config.yml')) + read_file(File.join(File.dirname(__FILE__), "..", "..", "config/alchemy/config.yml")) end # Application specific configuration @@ -54,12 +63,26 @@ def read_file(file) # Merges all given configs together # def merge_configs!(*config_files) - raise LoadError, 'No Alchemy config file found!' if config_files.map(&:blank?).all? + raise LoadError, "No Alchemy config file found!" if config_files.map(&:blank?).all? config = {} config_files.each { |h| config.merge!(h.stringify_keys!) } config end + + def check_deprecation(name) + if deprecated_configs.key?(name.to_sym) + config = deprecated_configs[name.to_sym] + if config.nil? + Alchemy::Deprecation.warn("#{name} configuration is deprecated and will be removed from Alchemy 5.0") + else + value = show[name.to_s] + if value != config + Alchemy::Deprecation.warn("Setting #{name} configuration to #{value} is deprecated and will be always #{config} in Alchemy 5.0") + end + end + end + end end end end diff --git a/lib/alchemy/configuration_methods.rb b/lib/alchemy/configuration_methods.rb index 973f323fcd..a80fab9478 100644 --- a/lib/alchemy/configuration_methods.rb +++ b/lib/alchemy/configuration_methods.rb @@ -30,6 +30,7 @@ def multi_language? # def prefix_locale?(locale = Language.current&.code) return false unless locale + multi_language? && locale != ::I18n.default_locale.to_s end diff --git a/lib/alchemy/controller_actions.rb b/lib/alchemy/controller_actions.rb index 6ac7db7fc7..177323055e 100644 --- a/lib/alchemy/controller_actions.rb +++ b/lib/alchemy/controller_actions.rb @@ -8,7 +8,7 @@ module ControllerActions before_action :set_current_alchemy_site before_action :set_alchemy_language - helper 'alchemy/pages' + helper "alchemy/pages" helper_method :current_alchemy_user, :alchemy_user_signed_in?, diff --git a/lib/alchemy/deprecation.rb b/lib/alchemy/deprecation.rb index c2ccd9c987..37c738abc0 100644 --- a/lib/alchemy/deprecation.rb +++ b/lib/alchemy/deprecation.rb @@ -1,4 +1,4 @@ # frozen_string_literal: true module Alchemy - Deprecation = ActiveSupport::Deprecation.new('5.0', 'Alchemy') + Deprecation = ActiveSupport::Deprecation.new("5.0", "Alchemy") end diff --git a/lib/alchemy/elements_finder.rb b/lib/alchemy/elements_finder.rb index 0befac9a8b..66c06416a2 100644 --- a/lib/alchemy/elements_finder.rb +++ b/lib/alchemy/elements_finder.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'alchemy/logger' +require "alchemy/logger" module Alchemy # Loads elements from given page @@ -86,7 +86,7 @@ def get_page(page_or_layout) Alchemy::Page.find_by( language: Alchemy::Language.current, page_layout: page_or_layout, - restricted: false + restricted: false, ) end end @@ -104,10 +104,10 @@ def fallback_elements def random_function case ActiveRecord::Base.connection_config[:adapter] - when 'postgresql', 'sqlite3' - 'RANDOM()' + when "postgresql", "sqlite3" + "RANDOM()" else - 'RAND()' + "RAND()" end end end diff --git a/lib/alchemy/engine.rb b/lib/alchemy/engine.rb index c041313997..08b2ad8e64 100644 --- a/lib/alchemy/engine.rb +++ b/lib/alchemy/engine.rb @@ -2,42 +2,46 @@ module Alchemy class Engine < Rails::Engine isolate_namespace Alchemy - engine_name 'alchemy' - config.mount_at = '/' + engine_name "alchemy" + config.mount_at = "/" - initializer 'alchemy.lookup_context' do - Alchemy::LOOKUP_CONTEXT = ActionView::LookupContext.new(Rails.root.join('app', 'views', 'alchemy')) + initializer "alchemy.lookup_context" do + Alchemy::LOOKUP_CONTEXT = ActionView::LookupContext.new(Rails.root.join("app", "views", "alchemy")) end - initializer 'alchemy.dependency_tracker' do + initializer "alchemy.admin.preview_url" do + Alchemy::Admin::PREVIEW_URL = Alchemy::Admin::PreviewUrl.new(routes: Alchemy::Engine.routes) + end + + initializer "alchemy.dependency_tracker" do [:erb, :slim, :haml].each do |handler| ActionView::DependencyTracker.register_tracker(handler, CacheDigests::TemplateTracker) end end - initializer 'alchemy.non_digest_assets' do + initializer "alchemy.non_digest_assets" do NonStupidDigestAssets.whitelist += [/^tinymce\//] end # Gutentag downcases all tgas before save. # We support having tags with uppercase characters. # The Gutentag search is case insensitive. - initializer 'alchemy.gutentag_normalizer' do + initializer "alchemy.gutentag_normalizer" do Gutentag.normaliser = ->(value) { value.to_s } end # Custom Ransack sort arrows - initializer 'alchemy.ransack' do + initializer "alchemy.ransack" do Ransack.configure do |config| config.custom_arrows = { up_arrow: '', - down_arrow: '' + down_arrow: '', } end end config.after_initialize do - require_relative './userstamp' + require_relative "./userstamp" end end end diff --git a/lib/alchemy/essence.rb b/lib/alchemy/essence.rb index 81baa58d20..5bb8f77da1 100644 --- a/lib/alchemy/essence.rb +++ b/lib/alchemy/essence.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'active_record' +require "active_record" module Alchemy #:nodoc: # A bogus association that skips eager loading for essences not having an ingredient association @@ -40,7 +40,7 @@ def acts_as_essence(options = {}) register_as_essence_association! configuration = { - ingredient_column: 'body' + ingredient_column: "body", }.update(options) @_classes_with_ingredient_association ||= [] @@ -48,7 +48,7 @@ def acts_as_essence(options = {}) class_eval <<-RUBY, __FILE__, __LINE__ + 1 attr_writer :validation_errors include Alchemy::Essence::InstanceMethods - stampable stamper_class_name: Alchemy.user_class_name + validate :validate_ingredient, on: :update, if: -> { validations.any? } has_one :content, as: :essence, class_name: "Alchemy::Content", inverse_of: :essence @@ -62,7 +62,7 @@ def acts_as_essence(options = {}) delegate :trashed?, to: :element, allow_nil: true delegate :public?, to: :element, allow_nil: true - after_update :touch_content + after_save :touch_element def acts_as_essence_class #{name} @@ -109,7 +109,7 @@ def _reflect_on_association(name) def register_as_essence_association! klass_name = model_name.to_s arguments = [:has_many, klass_name.demodulize.tableize.to_sym, through: :contents, - source: :essence, source_type: klass_name] + source: :essence, source_type: klass_name] %w(Page Element).each { |k| "Alchemy::#{k}".constantize.send(*arguments) } end end @@ -171,7 +171,7 @@ def validate_ingredient end def validations - @validations ||= definition.present? ? definition['validate'] || [] : [] + @validations ||= definition.present? ? definition["validate"] || [] : [] end def validation_errors @@ -195,7 +195,7 @@ def validate_uniqueness(validate = true) end def validate_format(format) - matcher = Config.get('format_matchers')[format] || format + matcher = Config.get("format_matchers")[format] || format if ingredient.to_s.match(Regexp.new(matcher)).nil? errors.add(ingredient_column, :invalid) validation_errors << :invalid @@ -226,21 +226,19 @@ def ingredient=(value) # Returns the setter method for ingredient column def ingredient_setter_method - ingredient_column.to_s + '=' + ingredient_column.to_s + "=" end # Essence definition from config/elements.yml def definition return {} if element.nil? || element.content_definitions.nil? - element.content_definitions.detect { |c| c['name'] == content.name } || {} + element.content_definitions.detect { |c| c["name"] == content.name } || {} end - # Touch content. Called after update. - def touch_content - return nil if content.nil? - - content.touch + # Touches element. Called after save. + def touch_element + element&.touch end # Returns the first x (default 30) characters of ingredient for the Element#preview_text method. @@ -250,11 +248,11 @@ def preview_text(maxlength = 30) end def open_link_in_new_window? - respond_to?(:link_target) && link_target == 'blank' + respond_to?(:link_target) && link_target == "blank" end def partial_name - self.class.name.split('::').last.underscore + self.class.name.split("::").last.underscore end def acts_as_essence? diff --git a/lib/alchemy/filetypes.rb b/lib/alchemy/filetypes.rb index 947b55de4c..d5461342bb 100644 --- a/lib/alchemy/filetypes.rb +++ b/lib/alchemy/filetypes.rb @@ -8,7 +8,7 @@ module Filetypes "audio/mpeg", "audio/mp4", "audio/wav", - "audio/x-wav" + "audio/x-wav", ] IMAGE_FILE_TYPES = [ @@ -17,7 +17,7 @@ module Filetypes "image/png", "image/svg+xml", "image/tiff", - "image/x-psd" + "image/x-psd", ] VCARD_FILE_TYPES = ["text/x-vcard", "application/vcard"] @@ -29,18 +29,18 @@ module Filetypes "video/mpeg", "video/quicktime", "video/x-msvideo", - "video/x-ms-wmv" + "video/x-ms-wmv", ] TEXT_FILE_TYPES = [ "application/rtf", - "text/plain" + "text/plain", ] EXCEL_FILE_TYPES = [ "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "application/vnd.ms-excel", - "text/csv" + "text/csv", ] end end diff --git a/lib/alchemy/forms/builder.rb b/lib/alchemy/forms/builder.rb index 159957ad87..53fd36da68 100644 --- a/lib/alchemy/forms/builder.rb +++ b/lib/alchemy/forms/builder.rb @@ -11,7 +11,7 @@ def input(attribute_name, options = {}, &block) if object.respond_to?(:attribute_fixed?) && object.attribute_fixed?(attribute_name) options[:disabled] = true options[:input_html] = options.fetch(:input_html, {}).merge( - 'data-alchemy-tooltip' => Alchemy.t(:attribute_fixed, attribute_name) + "data-alchemy-tooltip" => Alchemy.t(:attribute_fixed, attribute_name), ) end @@ -22,10 +22,10 @@ def input(attribute_name, options = {}, &block) # def submit(label, options = {}) options = { - wrapper_html: {class: 'submit'} + wrapper_html: {class: "submit"}, }.update(options) - template.content_tag('div', options.delete(:wrapper_html)) do - template.content_tag('button', label, options.delete(:input_html)) + template.content_tag("div", options.delete(:wrapper_html)) do + template.content_tag("button", label, options.delete(:input_html)) end end end diff --git a/lib/alchemy/hints.rb b/lib/alchemy/hints.rb index a7ed3128fa..e767626bc2 100644 --- a/lib/alchemy/hints.rb +++ b/lib/alchemy/hints.rb @@ -35,7 +35,7 @@ module Hints # @return String # def hint - hint = definition['hint'] + hint = definition["hint"] if hint == true Alchemy.t(name, scope: hint_translation_scope) else diff --git a/lib/alchemy/i18n.rb b/lib/alchemy/i18n.rb index 4f139709fd..fdfe934d47 100644 --- a/lib/alchemy/i18n.rb +++ b/lib/alchemy/i18n.rb @@ -79,7 +79,7 @@ def humanize_default_string!(msg, options) end def alchemy_scoped_scope(options) - default_scope = ['alchemy'] + default_scope = ["alchemy"] case options[:scope] when Array default_scope + options[:scope] diff --git a/lib/alchemy/modules.rb b/lib/alchemy/modules.rb index 898f9ce4d0..907fa00225 100644 --- a/lib/alchemy/modules.rb +++ b/lib/alchemy/modules.rb @@ -4,7 +4,7 @@ module Alchemy module Modules mattr_accessor :alchemy_modules - @@alchemy_modules = YAML.load_file(File.expand_path('../../config/alchemy/modules.yml', __dir__)) + @@alchemy_modules = YAML.load_file(File.expand_path("../../config/alchemy/modules.yml", __dir__)) class << self def included(base) @@ -28,11 +28,11 @@ def register_module(module_definition) definition_hash = module_definition.deep_stringify_keys ### Validate controller(s) existence - if definition_hash['navigation'].is_a?(Hash) - defined_controllers = [definition_hash['navigation']['controller']] + if definition_hash["navigation"].is_a?(Hash) + defined_controllers = [definition_hash["navigation"]["controller"]] - if definition_hash['navigation']['sub_navigation'].is_a?(Array) - defined_controllers.concat(definition_hash['navigation']['sub_navigation'].map{ |x| x['controller'] }) + if definition_hash["navigation"]["sub_navigation"].is_a?(Array) + defined_controllers.concat(definition_hash["navigation"]["sub_navigation"].map{ |x| x["controller"] }) end validate_controllers_existence(defined_controllers) @@ -52,7 +52,7 @@ def validate_controllers_existence(controllers) begin controller_name.constantize rescue NameError - raise "Error in AlchemyCMS module definition: '#{definition_hash['name']}'. Could not find the matching controller class #{controller_name.sub(/^::/, '')} for the specified controller: '#{controller_val}'" + raise "Error in AlchemyCMS module definition: '#{definition_hash["name"]}'. Could not find the matching controller class #{controller_name.sub(/^::/, "")} for the specified controller: '#{controller_val}'" end end end @@ -66,11 +66,11 @@ def validate_controllers_existence(controllers) def module_definition_for(name_or_params) case name_or_params when String - alchemy_modules.detect { |m| m['name'] == name_or_params } + alchemy_modules.detect { |m| m["name"] == name_or_params } when Hash name_or_params.stringify_keys! alchemy_modules.detect do |alchemy_module| - module_navi = alchemy_module.fetch('navigation', {}) + module_navi = alchemy_module.fetch("navigation", {}) definition_from_mainnavi(module_navi, name_or_params) || definition_from_subnavi(module_navi, name_or_params) end @@ -86,7 +86,7 @@ def definition_from_mainnavi(module_navi, params) end def definition_from_subnavi(module_navi, params) - subnavi = module_navi['sub_navigation'] + subnavi = module_navi["sub_navigation"] return if subnavi.nil? subnavi.any? do |navi| @@ -95,15 +95,15 @@ def definition_from_subnavi(module_navi, params) end def controller_matches?(navi, params) - remove_slash(navi['controller']) == remove_slash(params['controller']) + remove_slash(navi["controller"]) == remove_slash(params["controller"]) end def action_matches?(navi, params) - navi['action'] == params['action'] + navi["action"] == params["action"] end def remove_slash(str) - str.gsub(/^\//, '') + str.gsub(/^\//, "") end end end diff --git a/lib/alchemy/name_conversions.rb b/lib/alchemy/name_conversions.rb index 9d3b84db03..6962366b2a 100644 --- a/lib/alchemy/name_conversions.rb +++ b/lib/alchemy/name_conversions.rb @@ -10,17 +10,17 @@ module NameConversions # @returns String def convert_to_urlname(name) name - .gsub(/[äÄ]/, 'ae') - .gsub(/[üÜ]/, 'ue') - .gsub(/[öÖ]/, 'oe') - .gsub(/[ß]/, 'ss') + .gsub(/[äÄ]/, "ae") + .gsub(/[üÜ]/, "ue") + .gsub(/[öÖ]/, "oe") + .gsub(/[ß]/, "ss") .parameterize end # Converts a filename and suffix into a human readable name. # def convert_to_humanized_name(name, suffix) - name.gsub(/\.#{::Regexp.quote(suffix)}$/i, '').tr('_', ' ').strip + name.gsub(/\.#{::Regexp.quote(suffix)}$/i, "").tr("_", " ").strip end end end diff --git a/lib/alchemy/page_layout.rb b/lib/alchemy/page_layout.rb index fec48f918c..6827b6eafa 100644 --- a/lib/alchemy/page_layout.rb +++ b/lib/alchemy/page_layout.rb @@ -38,7 +38,7 @@ def add(page_layout) def get(name) return {} if name.blank? - all.detect { |a| a['name'].casecmp(name).zero? } + all.detect { |a| a["name"].casecmp(name).zero? } end def get_all_by_attributes(attributes) @@ -67,7 +67,7 @@ def layouts_for_select(language_id, only_layoutpages = false) # def layouts_with_own_for_select(page_layout_name, language_id, only_layoutpages = false) layouts = selectable_layouts(language_id, only_layoutpages) - if layouts.detect { |l| l['name'] == page_layout_name }.nil? + if layouts.detect { |l| l["name"] == page_layout_name }.nil? @map_array = [[human_layout_name(page_layout_name), page_layout_name]] else @map_array = [] @@ -88,9 +88,9 @@ def selectable_layouts(language_id, only_layoutpages = false) @language_id = language_id all.select do |layout| if only_layoutpages - layout['layoutpage'] && layout_available?(layout) + layout["layoutpage"] && layout_available?(layout) else - !layout['layoutpage'] && layout_available?(layout) + !layout["layoutpage"] && layout_available?(layout) end end end @@ -99,7 +99,7 @@ def selectable_layouts(language_id, only_layoutpages = false) # def element_names_for(page_layout) if definition = get(page_layout) - definition.fetch('elements', []) + definition.fetch("elements", []) else Rails.logger.warn "\n+++ Warning: No layout definition for #{page_layout} found! in page_layouts.yml\n" [] @@ -119,7 +119,7 @@ def element_names_for(page_layout) # The layout name # def human_layout_name(layout) - Alchemy.t(layout, scope: 'page_layout_names', default: layout.to_s.humanize) + Alchemy.t(layout, scope: "page_layout_names", default: layout.to_s.humanize) end private @@ -127,13 +127,13 @@ def human_layout_name(layout) # Returns true if the given layout is unique and not already taken or it should be hidden. # def layout_available?(layout) - !layout['hide'] && !already_taken?(layout) && available_on_site?(layout) + !layout["hide"] && !already_taken?(layout) && available_on_site?(layout) end # Returns true if this layout is unique and already taken by another page. # def already_taken?(layout) - layout['unique'] && page_with_layout_existing?(layout['name']) + layout["unique"] && page_with_layout_existing?(layout["name"]) end # Returns true if one page already has the given layout @@ -154,8 +154,9 @@ def page_with_layout_existing?(layout) # def available_on_site?(layout) return false unless Alchemy::Site.current + Alchemy::Site.current.definition.blank? || - Alchemy::Site.current.definition.fetch('page_layouts', []).include?(layout['name']) + Alchemy::Site.current.definition.fetch("page_layouts", []).include?(layout["name"]) end # Reads the layout definitions from +config/alchemy/page_layouts.yml+. @@ -171,14 +172,14 @@ def read_definitions_file # Returns the page_layouts.yml file path # def layouts_file_path - Rails.root.join 'config/alchemy/page_layouts.yml' + Rails.root.join "config/alchemy/page_layouts.yml" end # Maps given layouts for Rails select form helper. # def mapped_layouts_for_select(layouts) layouts.each do |layout| - @map_array << [human_layout_name(layout['name']), layout["name"]] + @map_array << [human_layout_name(layout["name"]), layout["name"]] end @map_array end diff --git a/lib/alchemy/paths.rb b/lib/alchemy/paths.rb index 241eeca1c5..a3e263d795 100644 --- a/lib/alchemy/paths.rb +++ b/lib/alchemy/paths.rb @@ -29,6 +29,6 @@ module Alchemy # Defaults # - @@admin_path = 'admin' + @@admin_path = "admin" @@admin_constraints = {} end diff --git a/lib/alchemy/permissions.rb b/lib/alchemy/permissions.rb index 81bb3b606b..946e0a643b 100644 --- a/lib/alchemy/permissions.rb +++ b/lib/alchemy/permissions.rb @@ -36,7 +36,7 @@ def initialize(user) module GuestUser def alchemy_guest_user_rules can([:show, :download], Alchemy::Attachment) { |a| !a.restricted? } - can :see, Alchemy::Page, restricted: false, visible: true + can :see, Alchemy::Page, restricted: false can :read, Alchemy::Content, Alchemy::Content.available.not_restricted do |c| c.public? && !c.restricted? && !c.trashed? @@ -64,7 +64,7 @@ def alchemy_member_rules # Resources can [:show, :download], Alchemy::Attachment - can :see, Alchemy::Page, restricted: true, visible: true + can :see, Alchemy::Page, restricted: true can :read, Alchemy::Content, Alchemy::Content.available do |c| c.public? && !c.trashed? @@ -99,7 +99,7 @@ def alchemy_author_rules :alchemy_admin_pages, :alchemy_admin_pictures, :alchemy_admin_tags, - :alchemy_admin_users + :alchemy_admin_users, ] # Controller actions @@ -137,7 +137,7 @@ def alchemy_editor_rules # Navigation can :index, [ :alchemy_admin_languages, - :alchemy_admin_users + :alchemy_admin_users, ] # Controller actions @@ -150,7 +150,7 @@ def alchemy_editor_rules :flush, :order, :sort, - :switch_language + :switch_language, ], Alchemy::Page # Resources which may be locked via template permissions @@ -164,7 +164,7 @@ def alchemy_editor_rules can([ :create, :destroy, - :publish + :publish, ], Alchemy::Page) { |p| p.editable_by?(@user) } can :manage, Alchemy::Picture diff --git a/lib/alchemy/resource.rb b/lib/alchemy/resource.rb index 7bd647217f..c7326b54d0 100644 --- a/lib/alchemy/resource.rb +++ b/lib/alchemy/resource.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -require 'active_support' -require 'active_support/core_ext' -require 'active_support/inflector' +require "active_support" +require "active_support/core_ext" +require "active_support/inflector" module Alchemy # = Alchemy::Resource @@ -120,7 +120,7 @@ def initialize(controller_path, module_definition = nil, custom_model = nil) end def resource_array - @_resource_array ||= controller_path_array.reject { |el| el == 'admin' } + @_resource_array ||= controller_path_array.reject { |el| el == "admin" } end def resources_name @@ -139,7 +139,7 @@ def namespaced_resources_name @_namespaced_resources_name ||= begin resource_name_array = resource_array.dup resource_name_array.delete(engine_name) if in_engine? - resource_name_array.join('_') + resource_name_array.join("_") end end @@ -166,16 +166,16 @@ def attributes { name: col.name, type: resource_column_type(col), - relation: resource_relation(col.name) + relation: resource_relation(col.name), }.delete_if { |_k, v| v.nil? } end.compact end def sorted_attributes @_sorted_attributes ||= attributes. - sort_by { |attr| attr[:name] == 'name' ? 0 : 1 }. + sort_by { |attr| attr[:name] == "name" ? 0 : 1 }. sort_by! { |attr| attr[:type] == :boolean ? 1 : 0 }. - sort_by! { |attr| attr[:name] == 'updated_at' ? 1 : 0 } + sort_by! { |attr| attr[:name] == "updated_at" ? 1 : 0 } end def editable_attributes @@ -207,7 +207,7 @@ def in_engine? end def engine_name - @module_definition && @module_definition['engine_name'] + @module_definition && @module_definition["engine_name"] end # Returns a help text for resource's form @@ -264,16 +264,16 @@ def searchable_relation_attributes(attrs) def searchable_relation_attribute(attribute) { name: "#{attribute[:relation][:model_association].name}_#{attribute[:relation][:attr_method]}", - type: attribute[:relation][:attr_type] + type: attribute[:relation][:attr_type], } end def guess_model_from_controller_path - resource_array.join('/').classify.constantize + resource_array.join("/").classify.constantize end def controller_path_array - @controller_path.split('/') + @controller_path.split("/") end def namespace_diff @@ -296,7 +296,7 @@ def resource_relation(column_name) def map_relations self.resource_relations = {} model.alchemy_resource_relations.each do |name, options| - name = name.to_s.gsub(/_id$/, '') # ensure that we don't have an id + name = name.to_s.gsub(/_id$/, "") # ensure that we don't have an id association = association_from_relation_name(name) foreign_key = association.options[:foreign_key] || "#{association.name}_id".to_sym resource_relations[foreign_key] = options.merge(model_association: association, name: name) diff --git a/lib/alchemy/resources_helper.rb b/lib/alchemy/resources_helper.rb index de75ad51ea..c8a7241576 100644 --- a/lib/alchemy/resources_helper.rb +++ b/lib/alchemy/resources_helper.rb @@ -104,21 +104,21 @@ def resource_attribute_field_options(attribute) options = {hint: resource_handler.help_text_for(attribute)} input_type = attribute[:type].to_s case input_type - when 'boolean' + when "boolean" options - when 'date', 'time', 'datetime' + when "date", "time", "datetime" date = resource_instance_variable.send(attribute[:name]) || Time.current options.merge( - as: 'string', + as: "string", input_html: { - 'data-datepicker-type' => input_type, - value: date ? date.iso8601 : nil - } + "data-datepicker-type" => input_type, + value: date ? date.iso8601 : nil, + }, ) - when 'text' - options.merge(as: 'text', input_html: {rows: 4}) + when "text" + options.merge(as: "text", input_html: {rows: 4}) else - options.merge(as: 'string') + options.merge(as: "string") end end @@ -165,7 +165,7 @@ def sortable_resource_header_column(attribute) def render_resources render partial: resource_name, collection: resources_instance_variable rescue ActionView::MissingTemplate - render partial: 'resource', collection: resources_instance_variable + render partial: "resource", collection: resources_instance_variable end def resource_has_tags @@ -179,8 +179,8 @@ def resource_has_filters def resource_filter_select resource_model.alchemy_resource_filters.map do |filter_scope| [ - Alchemy.t(filter_scope.to_sym, scope: ['resources', resource_name, 'filters']), - filter_scope + Alchemy.t(filter_scope.to_sym, scope: ["resources", resource_name, "filters"]), + filter_scope, ] end end diff --git a/lib/alchemy/routing_constraints.rb b/lib/alchemy/routing_constraints.rb index 54844b2bcc..16390a46ed 100644 --- a/lib/alchemy/routing_constraints.rb +++ b/lib/alchemy/routing_constraints.rb @@ -34,7 +34,7 @@ def handable_format? def no_rails_route? return true if !%w(development test).include?(Rails.env) - (@params['urlname'] =~ /\Arails\//).nil? + (@params["urlname"] =~ /\Arails\//).nil? end end end diff --git a/lib/alchemy/seeder.rb b/lib/alchemy/seeder.rb index 6cb2e35fab..31f1bcfa62 100644 --- a/lib/alchemy/seeder.rb +++ b/lib/alchemy/seeder.rb @@ -45,9 +45,8 @@ def seed_pages contentpages.each do |page| create_page(page, { - parent: Alchemy::Page.root, language: Alchemy::Language.default, - language_root: true + language_root: true, }) end end @@ -55,12 +54,8 @@ def seed_pages def seed_layoutpages desc "Seeding Alchemy layout pages from #{page_seeds_file}" language = Alchemy::Language.default - layout_root = Alchemy::Page.find_or_create_layout_root_for(language.id) layoutpages.each do |page| - create_page(page, { - parent: layout_root, - language: language - }) + create_page(page, { language: language }) end end @@ -83,7 +78,7 @@ def seed_users private def page_seeds_file - @_page_seeds_file ||= Rails.root.join('db', 'seeds', 'alchemy', 'pages.yml') + @_page_seeds_file ||= Rails.root.join("db", "seeds", "alchemy", "pages.yml") end def page_yml @@ -91,23 +86,23 @@ def page_yml end def contentpages - page_yml.reject { |p| p['layoutpage'] } + page_yml.reject { |p| p["layoutpage"] } end def layoutpages - page_yml.select { |p| p['layoutpage'] } + page_yml.select { |p| p["layoutpage"] } end def user_seeds_file - @_user_seeds_file ||= Rails.root.join('db', 'seeds', 'alchemy', 'users.yml') + @_user_seeds_file ||= Rails.root.join("db", "seeds", "alchemy", "users.yml") end def create_page(draft, attributes = {}) - children = draft.delete('children') || [] + children = draft.delete("children") || [] page = Alchemy::Page.create!(draft.merge(attributes)) log "Created page: #{page.name}" children.each do |child| - create_page(child, parent: page) + create_page(child, parent: page, language: page.language) end end @@ -117,14 +112,14 @@ def create_default_language! default_language = Alchemy::Config.get(:default_language) if default_language Alchemy::Language.create!( - name: default_language['name'], - language_code: default_language['code'], - locale: default_language['code'], - frontpage_name: default_language['frontpage_name'], - page_layout: default_language['page_layout'], - public: true, - default: true, - site: Alchemy::Site.default + name: default_language["name"], + language_code: default_language["code"], + locale: default_language["code"], + frontpage_name: default_language["frontpage_name"], + page_layout: default_language["page_layout"], + public: true, + default: true, + site: Alchemy::Site.default, ) else raise DefaultLanguageNotFoundError @@ -134,7 +129,7 @@ def create_default_language! def create_default_site! default_site = Alchemy::Config.get(:default_site) if default_site - Alchemy::Site.create!(name: default_site['name'], host: default_site['host']) + Alchemy::Site.create!(name: default_site["name"], host: default_site["host"]) else raise DefaultSiteNotFoundError end diff --git a/lib/alchemy/shell.rb b/lib/alchemy/shell.rb index b15b2ebbd4..d3b71e2f52 100644 --- a/lib/alchemy/shell.rb +++ b/lib/alchemy/shell.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require 'thor/shell/color' +require "thor/shell/color" module Alchemy # Provides methods for collecting sentences and displaying them @@ -10,7 +10,7 @@ module Shell clear: Thor::Shell::Color::CLEAR, green: Thor::Shell::Color::GREEN, red: Thor::Shell::Color::RED, - yellow: Thor::Shell::Color::YELLOW + yellow: Thor::Shell::Color::YELLOW, }.freeze def self.silence! @@ -28,11 +28,11 @@ def self.silenced? def desc(message) unless Alchemy::Shell.silenced? puts "\n#{message}" - puts "#{'-' * message.length}\n" + puts "#{"-" * message.length}\n" end end - def todo(todo, title = '') + def todo(todo, title = "") add_todo [title, todo] end @@ -64,7 +64,7 @@ def display_todos todos.each_with_index do |todo, i| title = "\n#{i + 1}. #{todo[0]}" log title, :message - puts '=' * title.length + puts "=" * title.length puts "" log todo[1], :message end diff --git a/lib/alchemy/ssl_protection.rb b/lib/alchemy/ssl_protection.rb deleted file mode 100644 index aa134e848e..0000000000 --- a/lib/alchemy/ssl_protection.rb +++ /dev/null @@ -1,32 +0,0 @@ -# frozen_string_literal: true - -module Alchemy - module SSLProtection - private - - # Enforce ssl for login and all admin modules. - # - # Default is +false+ - # - # === Usage - # - # # config/alchemy/config.yml - # ... - # require_ssl: true - # ... - # - # === Note - # - # You have to create a ssl certificate - # if you want to use the ssl protection. - # - def ssl_required? - !Rails.env.test? && Config.get(:require_ssl) - end - - # Redirects current request to https. - def enforce_ssl - redirect_to url_for(request.params.merge(protocol: 'https')) - end - end -end diff --git a/lib/alchemy/tasks/tidy.rb b/lib/alchemy/tasks/tidy.rb index ef2c662cad..e60c37547f 100644 --- a/lib/alchemy/tasks/tidy.rb +++ b/lib/alchemy/tasks/tidy.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require 'alchemy/shell' +require "alchemy/shell" module Alchemy class Tidy @@ -53,7 +53,7 @@ def remove_orphaned_elements end if orphaned_elements.any? log "Found #{orphaned_elements.size} orphaned elements" - destroy_orphaned_records(orphaned_elements, 'element') + destroy_orphaned_records(orphaned_elements, "element") else log "No orphaned elements found", :skip end @@ -72,7 +72,7 @@ def remove_orphaned_contents end if orphaned_contents.any? log "Found #{orphaned_contents.size} orphaned contents" - destroy_orphaned_records(orphaned_contents, 'content') + destroy_orphaned_records(orphaned_contents, "content") else log "No orphaned contents found", :skip end diff --git a/lib/alchemy/test_support/essence_shared_examples.rb b/lib/alchemy/test_support/essence_shared_examples.rb index e1a2af7c30..1d5ea09418 100644 --- a/lib/alchemy/test_support/essence_shared_examples.rb +++ b/lib/alchemy/test_support/essence_shared_examples.rb @@ -1,36 +1,36 @@ # frozen_string_literal: true -require 'shoulda-matchers' -require 'alchemy/test_support/factories/page_factory' -require 'alchemy/test_support/factories/element_factory' -require 'alchemy/test_support/factories/content_factory' +require "shoulda-matchers" +require "alchemy/test_support/factories/page_factory" +require "alchemy/test_support/factories/element_factory" +require "alchemy/test_support/factories/content_factory" RSpec.shared_examples_for "an essence" do let(:element) { Alchemy::Element.new } - let(:content) { Alchemy::Content.new(name: 'foo') } - let(:content_definition) { {'name' => 'foo'} } + let(:content) { Alchemy::Content.new(name: "foo") } + let(:content_definition) { { "name" => "foo" } } - describe 'eager loading' do + describe "eager loading" do before do 2.times { described_class.create! } end - it 'does not throw error if eager loaded' do + it "does not throw error if eager loaded" do expect { described_class.all.includes(:ingredient_association).to_a }.to_not raise_error end end - it "touches the content after update" do + it "touches the element after save" do element = FactoryBot.create(:alchemy_element) content = FactoryBot.create(:alchemy_content, element: element, essence: essence, essence_type: essence.class.name) - content.update_column(:updated_at, 3.days.ago) + element.update_column(:updated_at, 3.days.ago) content.essence.update(essence.ingredient_column.to_sym => ingredient_value) - content.reload - expect(content.updated_at).to be_within(3.seconds).of(Time.current) + element.reload + expect(element.updated_at).to be_within(3.seconds).of(Time.current) end it "should have correct partial path" do @@ -38,28 +38,28 @@ expect(essence.to_partial_path).to eq("alchemy/essences/#{underscored_essence}_view") end - describe '#definition' do + describe "#definition" do subject { essence.definition } - context 'without element' do + context "without element" do it { is_expected.to eq({}) } end - context 'with element' do + context "with element" do before do expect(essence).to receive(:element).at_least(:once).and_return(element) end - context 'but without content definitions' do + context "but without content definitions" do it { is_expected.to eq({}) } end - context 'and content definitions' do + context "and content definitions" do before do allow(essence).to receive(:content).and_return(content) end - context 'containing the content name' do + context "containing the content name" do before do expect(element).to receive(:content_definitions).at_least(:once).and_return([content_definition]) end @@ -69,7 +69,7 @@ end end - context 'not containing the content name' do + context "not containing the content name" do before do expect(element).to receive(:content_definitions).at_least(:once).and_return([]) end @@ -80,200 +80,200 @@ end end - describe '#ingredient=' do - it 'should set the value to ingredient column' do + describe "#ingredient=" do + it "should set the value to ingredient column" do essence.ingredient = ingredient_value expect(essence.ingredient).to eq ingredient_value end end - describe 'validations' do - context 'without essence definition in elements.yml' do - it 'should return an empty array' do + describe "validations" do + context "without essence definition in elements.yml" do + it "should return an empty array" do allow(essence).to receive(:definition).and_return nil expect(essence.validations).to eq([]) end end - context 'without validations defined in essence definition in elements.yml' do - it 'should return an empty array' do - allow(essence).to receive(:definition).and_return({name: 'test', type: 'EssenceText'}) + context "without validations defined in essence definition in elements.yml" do + it "should return an empty array" do + allow(essence).to receive(:definition).and_return({ name: "test", type: "EssenceText" }) expect(essence.validations).to eq([]) end end - describe 'presence' do - context 'with string given as validation type' do + describe "presence" do + context "with string given as validation type" do before do - allow(essence).to receive(:definition).and_return({'validate' => ['presence']}) + allow(essence).to receive(:definition).and_return({ "validate" => ["presence"] }) end - context 'when the ingredient column is empty' do + context "when the ingredient column is empty" do before do essence.update(essence.ingredient_column.to_sym => nil) end - it 'should not be valid' do + it "should not be valid" do expect(essence).to_not be_valid end end - context 'when the ingredient column is not nil' do + context "when the ingredient column is not nil" do before do essence.update(essence.ingredient_column.to_sym => ingredient_value) end - it 'should be valid' do + it "should be valid" do expect(essence).to be_valid end end end - context 'with hash given as validation type' do - context 'where the value is true' do + context "with hash given as validation type" do + context "where the value is true" do before do - allow(essence).to receive(:definition).and_return({'validate' => [{'presence' => true}]}) + allow(essence).to receive(:definition).and_return({ "validate" => [{ "presence" => true }] }) end - context 'when the ingredient column is empty' do + context "when the ingredient column is empty" do before do essence.update(essence.ingredient_column.to_sym => nil) end - it 'should not be valid' do + it "should not be valid" do expect(essence).to_not be_valid end end - context 'when the ingredient column is not nil' do + context "when the ingredient column is not nil" do before do essence.update(essence.ingredient_column.to_sym => ingredient_value) end - it 'should be valid' do + it "should be valid" do expect(essence).to be_valid end end end - context 'where the value is false' do + context "where the value is false" do before do - allow(essence).to receive(:definition).and_return({'validate' => [{'presence' => false}]}) + allow(essence).to receive(:definition).and_return({ "validate" => [{ "presence" => false }] }) end - it 'should be valid' do + it "should be valid" do expect(essence).to be_valid end end end end - describe 'uniqueness' do + describe "uniqueness" do before do - allow(essence).to receive(:element).and_return(FactoryBot.build_stubbed(:alchemy_element)) + allow(essence).to receive(:element).and_return(FactoryBot.create(:alchemy_element)) essence.update(essence.ingredient_column.to_sym => ingredient_value) end - context 'with string given as validation type' do + context "with string given as validation type" do before do - expect(essence).to receive(:definition).at_least(:once).and_return({'validate' => ['uniqueness']}) + expect(essence).to receive(:definition).at_least(:once).and_return({ "validate" => ["uniqueness"] }) end - context 'when a duplicate exists' do + context "when a duplicate exists" do before do allow(essence).to receive(:duplicates).and_return([essence.dup]) end - it 'should not be valid' do + it "should not be valid" do expect(essence).to_not be_valid end - context 'when validated essence is not public' do + context "when validated essence is not public" do before do expect(essence).to receive(:public?).and_return(false) end - it 'should be valid' do + it "should be valid" do expect(essence).to be_valid end end end - context 'when no duplicate exists' do + context "when no duplicate exists" do before do expect(essence).to receive(:duplicates).and_return([]) end - it 'should be valid' do + it "should be valid" do expect(essence).to be_valid end end end - context 'with hash given as validation type' do - context 'where the value is true' do + context "with hash given as validation type" do + context "where the value is true" do before do - expect(essence).to receive(:definition).at_least(:once).and_return({'validate' => [{'uniqueness' => true}]}) + expect(essence).to receive(:definition).at_least(:once).and_return({ "validate" => [{ "uniqueness" => true }] }) end - context 'when a duplicate exists' do + context "when a duplicate exists" do before do allow(essence).to receive(:duplicates).and_return([essence.dup]) end - it 'should not be valid' do + it "should not be valid" do expect(essence).to_not be_valid end - context 'when validated essence is not public' do + context "when validated essence is not public" do before do expect(essence).to receive(:public?).and_return(false) end - it 'should be valid' do + it "should be valid" do expect(essence).to be_valid end end end - context 'when no duplicate exists' do + context "when no duplicate exists" do before do expect(essence).to receive(:duplicates).and_return([]) end - it 'should be valid' do + it "should be valid" do expect(essence).to be_valid end end end - context 'where the value is false' do + context "where the value is false" do before do - allow(essence).to receive(:definition).and_return({'validate' => [{'uniqueness' => false}]}) + allow(essence).to receive(:definition).and_return({ "validate" => [{ "uniqueness" => false }] }) end - it 'should be valid' do + it "should be valid" do expect(essence).to be_valid end end end end - describe '#acts_as_essence?' do - it 'should return true' do + describe "#acts_as_essence?" do + it "should return true" do expect(essence.acts_as_essence?).to be_truthy end end end - context 'delegations' do + context "delegations" do it { should delegate_method(:restricted?).to(:page) } it { should delegate_method(:trashed?).to(:element) } - it { should delegate_method(:public?).to(:element) } + it { should delegate_method(:public?).to(:element) } end - describe 'essence relations' do - let(:page) { FactoryBot.create(:alchemy_page, :restricted) } + describe "essence relations" do + let(:page) { FactoryBot.create(:alchemy_page, :restricted) } let(:element) { FactoryBot.create(:alchemy_element) } it "registers itself on page as essence relation" do diff --git a/lib/alchemy/test_support/factories/attachment_factory.rb b/lib/alchemy/test_support/factories/attachment_factory.rb index 515712ef07..085cf90938 100644 --- a/lib/alchemy/test_support/factories/attachment_factory.rb +++ b/lib/alchemy/test_support/factories/attachment_factory.rb @@ -1,13 +1,13 @@ # frozen_string_literal: true -require 'factory_bot' +require "factory_bot" FactoryBot.define do - factory :alchemy_attachment, class: 'Alchemy::Attachment' do + factory :alchemy_attachment, class: "Alchemy::Attachment" do file do - File.new(Alchemy::Engine.root.join('lib', 'alchemy', 'test_support', 'fixtures', 'image.png')) + File.new(Alchemy::Engine.root.join("lib", "alchemy", "test_support", "fixtures", "image.png")) end - name { 'image' } - file_name { 'image.png' } + name { "image" } + file_name { "image.png" } end end diff --git a/lib/alchemy/test_support/factories/content_factory.rb b/lib/alchemy/test_support/factories/content_factory.rb index 3c5ac27700..44ab890c67 100644 --- a/lib/alchemy/test_support/factories/content_factory.rb +++ b/lib/alchemy/test_support/factories/content_factory.rb @@ -1,13 +1,13 @@ # frozen_string_literal: true -require 'factory_bot' -require 'alchemy/test_support/factories/element_factory' -require 'alchemy/test_support/factories/essence_file_factory' -require 'alchemy/test_support/factories/essence_picture_factory' -require 'alchemy/test_support/factories/essence_text_factory' +require "factory_bot" +require "alchemy/test_support/factories/element_factory" +require "alchemy/test_support/factories/essence_file_factory" +require "alchemy/test_support/factories/essence_picture_factory" +require "alchemy/test_support/factories/essence_text_factory" FactoryBot.define do - factory :alchemy_content, class: 'Alchemy::Content' do + factory :alchemy_content, class: "Alchemy::Content" do name { "text" } essence_type { "Alchemy::EssenceText" } association :essence, factory: :alchemy_essence_text diff --git a/lib/alchemy/test_support/factories/dummy_user_factory.rb b/lib/alchemy/test_support/factories/dummy_user_factory.rb index a06ecbfc0f..0b40c47df4 100644 --- a/lib/alchemy/test_support/factories/dummy_user_factory.rb +++ b/lib/alchemy/test_support/factories/dummy_user_factory.rb @@ -1,23 +1,23 @@ # frozen_string_literal: true -require 'factory_bot' +require "factory_bot" FactoryBot.define do - factory :alchemy_dummy_user, class: 'DummyUser' do + factory :alchemy_dummy_user, class: "DummyUser" do sequence(:email) { |n| "john.#{n}@doe.com" } - password { 's3cr3t' } - alchemy_roles { ['member'] } + password { "s3cr3t" } + alchemy_roles { ["member"] } trait :as_admin do - alchemy_roles { ['admin'] } + alchemy_roles { ["admin"] } end trait :as_author do - alchemy_roles { ['author'] } + alchemy_roles { ["author"] } end trait :as_editor do - alchemy_roles { ['editor'] } + alchemy_roles { ["editor"] } end end end diff --git a/lib/alchemy/test_support/factories/element_factory.rb b/lib/alchemy/test_support/factories/element_factory.rb index 1ef960c0af..8140b6d3e8 100644 --- a/lib/alchemy/test_support/factories/element_factory.rb +++ b/lib/alchemy/test_support/factories/element_factory.rb @@ -1,22 +1,22 @@ # frozen_string_literal: true -require 'factory_bot' -require 'alchemy/test_support/factories/page_factory' +require "factory_bot" +require "alchemy/test_support/factories/page_factory" FactoryBot.define do - factory :alchemy_element, class: 'Alchemy::Element' do - name { 'article' } + factory :alchemy_element, class: "Alchemy::Element" do + name { "article" } autogenerate_contents { false } association :page, factory: :alchemy_page trait :fixed do fixed { true } - name { 'right_column' } + name { "right_column" } end trait :unique do unique { true } - name { 'header' } + name { "header" } end trait :trashed do @@ -26,12 +26,12 @@ end trait :with_nestable_elements do - name { 'slider' } + name { "slider" } end trait :nested do - association :parent_element, factory: :alchemy_element, name: 'slider' - name { 'slide' } + association :parent_element, factory: :alchemy_element, name: "slider" + name { "slide" } end trait :with_contents do diff --git a/lib/alchemy/test_support/factories/essence_file_factory.rb b/lib/alchemy/test_support/factories/essence_file_factory.rb index aaf38558f6..aaf1b425f5 100644 --- a/lib/alchemy/test_support/factories/essence_file_factory.rb +++ b/lib/alchemy/test_support/factories/essence_file_factory.rb @@ -1,10 +1,10 @@ # frozen_string_literal: true -require 'factory_bot' -require 'alchemy/test_support/factories/attachment_factory' +require "factory_bot" +require "alchemy/test_support/factories/attachment_factory" FactoryBot.define do - factory :alchemy_essence_file, class: 'Alchemy::EssenceFile' do + factory :alchemy_essence_file, class: "Alchemy::EssenceFile" do attachment factory: :alchemy_attachment end end diff --git a/lib/alchemy/test_support/factories/essence_page_factory.rb b/lib/alchemy/test_support/factories/essence_page_factory.rb index ce346ad9e0..ad4b7a2494 100644 --- a/lib/alchemy/test_support/factories/essence_page_factory.rb +++ b/lib/alchemy/test_support/factories/essence_page_factory.rb @@ -1,10 +1,10 @@ # frozen_string_literal: true -require 'factory_bot' -require 'alchemy/test_support/factories/page_factory' +require "factory_bot" +require "alchemy/test_support/factories/page_factory" FactoryBot.define do - factory :alchemy_essence_page, class: 'Alchemy::EssencePage' do + factory :alchemy_essence_page, class: "Alchemy::EssencePage" do page factory: :alchemy_page end end diff --git a/lib/alchemy/test_support/factories/essence_picture_factory.rb b/lib/alchemy/test_support/factories/essence_picture_factory.rb index 2337815a8b..267f2bac45 100644 --- a/lib/alchemy/test_support/factories/essence_picture_factory.rb +++ b/lib/alchemy/test_support/factories/essence_picture_factory.rb @@ -1,11 +1,11 @@ # frozen_string_literal: true -require 'factory_bot' -require 'alchemy/test_support/factories/content_factory' -require 'alchemy/test_support/factories/picture_factory' +require "factory_bot" +require "alchemy/test_support/factories/content_factory" +require "alchemy/test_support/factories/picture_factory" FactoryBot.define do - factory :alchemy_essence_picture, class: 'Alchemy::EssencePicture' do + factory :alchemy_essence_picture, class: "Alchemy::EssencePicture" do picture factory: :alchemy_picture trait :with_content do diff --git a/lib/alchemy/test_support/factories/essence_text_factory.rb b/lib/alchemy/test_support/factories/essence_text_factory.rb index 6472895cc7..4982cccebb 100644 --- a/lib/alchemy/test_support/factories/essence_text_factory.rb +++ b/lib/alchemy/test_support/factories/essence_text_factory.rb @@ -1,9 +1,9 @@ # frozen_string_literal: true -require 'factory_bot' +require "factory_bot" FactoryBot.define do - factory :alchemy_essence_text, class: 'Alchemy::EssenceText' do - body { 'This is a headline' } + factory :alchemy_essence_text, class: "Alchemy::EssenceText" do + body { "This is a headline" } end end diff --git a/lib/alchemy/test_support/factories/language_factory.rb b/lib/alchemy/test_support/factories/language_factory.rb index 3668e42851..3bbc4d47e5 100644 --- a/lib/alchemy/test_support/factories/language_factory.rb +++ b/lib/alchemy/test_support/factories/language_factory.rb @@ -1,31 +1,36 @@ # frozen_string_literal: true -require 'factory_bot' -require 'alchemy/test_support/factories/site_factory' +require "factory_bot" +require "alchemy/test_support/factories/site_factory" FactoryBot.define do - factory :alchemy_language, class: 'Alchemy::Language' do - name { 'Deutsch' } - code { 'de' } + factory :alchemy_language, class: "Alchemy::Language" do + name { "Your Language" } + code { ::I18n.available_locales.first.to_s } default { true } - frontpage_name { 'Intro' } - page_layout { Alchemy::Config.get(:default_language)['page_layout'] } + frontpage_name { "Intro" } + page_layout { Alchemy::Config.get(:default_language)["page_layout"] } public { true } site { Alchemy::Site.default || create(:alchemy_site, :default) } trait :klingon do - name { 'Klingon' } - code { 'kl' } - frontpage_name { 'Tuq' } + name { "Klingon" } + code { "kl" } + frontpage_name { "Tuq" } default { false } end trait :english do - name { 'English' } - code { 'en' } - frontpage_name { 'Intro' } + name { "English" } + code { "en" } + default { false } + end + + trait :german do + name { "Deutsch" } + code { "de" } default { false } end end diff --git a/lib/alchemy/test_support/factories/node_factory.rb b/lib/alchemy/test_support/factories/node_factory.rb index bedc16e046..05aea03ad3 100644 --- a/lib/alchemy/test_support/factories/node_factory.rb +++ b/lib/alchemy/test_support/factories/node_factory.rb @@ -1,14 +1,14 @@ # frozen_string_literal: true -require 'factory_bot' -require 'alchemy/test_support/factories/language_factory' -require 'alchemy/test_support/factories/page_factory' +require "factory_bot" +require "alchemy/test_support/factories/language_factory" +require "alchemy/test_support/factories/page_factory" FactoryBot.define do - factory :alchemy_node, class: 'Alchemy::Node' do - site { Alchemy::Site.default || create(:alchemy_site) } + factory :alchemy_node, class: "Alchemy::Node" do language { Alchemy::Language.default || create(:alchemy_language) } - name { 'A Node' } + name { "A Node" } + menu_type { Alchemy::Node.available_menu_names.first } trait :with_page do association :page, factory: :alchemy_page @@ -16,7 +16,7 @@ end trait :with_url do - url { 'https://example.com' } + url { "https://example.com" } end end end diff --git a/lib/alchemy/test_support/factories/page_factory.rb b/lib/alchemy/test_support/factories/page_factory.rb index 03c6f0aa08..25136903e6 100644 --- a/lib/alchemy/test_support/factories/page_factory.rb +++ b/lib/alchemy/test_support/factories/page_factory.rb @@ -1,36 +1,33 @@ # frozen_string_literal: true -require 'factory_bot' -require 'alchemy/test_support/factories/language_factory' +require "factory_bot" +require "alchemy/test_support/factories/language_factory" FactoryBot.define do - factory :alchemy_page, class: 'Alchemy::Page' do - language { Alchemy::Language.default || FactoryBot.create(:alchemy_language) } + factory :alchemy_page, class: "Alchemy::Page" do + language do + @cached_attributes[:parent]&.language || + Alchemy::Language.default || + FactoryBot.create(:alchemy_language) + end sequence(:name) { |n| "A Page #{n}" } page_layout { "standard" } - parent_id do - (Alchemy::Page.find_by(language_root: true) || - FactoryBot.create(:alchemy_page, :language_root, language: language)).id + parent do + Alchemy::Page.find_by(language_root: true, language: language) || + FactoryBot.create(:alchemy_page, :language_root, language: language) end # This speeds up creating of pages dramatically. # Pass autogenerate_elements: true to generate elements autogenerate_elements { false } - trait :root do - name { 'Root' } - language { nil } - parent_id { nil } - page_layout { nil } - end - trait :language_root do - name { 'Startseite' } - page_layout { language.page_layout } + name { language&.frontpage_name || "Intro" } + page_layout { language&.page_layout || "index" } language_root { true } public_on { Time.current } - parent_id { Alchemy::Page.root.id } + parent { nil } end trait :public do @@ -38,17 +35,8 @@ public_on { Time.current } end - trait :system do - name { "Systempage" } - parent_id { Alchemy::Page.root.id } - language_root { false } - page_layout { nil } - language { nil } - end - trait :layoutpage do - name { "Footer" } - parent_id { Alchemy::Page.find_or_create_layout_root_for(Alchemy::Language.current.id).id } + parent { nil } layoutpage { true } page_layout { "footer" } end diff --git a/lib/alchemy/test_support/factories/picture_factory.rb b/lib/alchemy/test_support/factories/picture_factory.rb index bdcf6c323b..881cf83c21 100644 --- a/lib/alchemy/test_support/factories/picture_factory.rb +++ b/lib/alchemy/test_support/factories/picture_factory.rb @@ -1,14 +1,14 @@ # frozen_string_literal: true -require 'factory_bot' +require "factory_bot" FactoryBot.define do - factory :alchemy_picture, class: 'Alchemy::Picture' do + factory :alchemy_picture, class: "Alchemy::Picture" do image_file do - File.new(Alchemy::Engine.root.join('lib', 'alchemy', 'test_support', 'fixtures', 'image.png')) + File.new(Alchemy::Engine.root.join("lib", "alchemy", "test_support", "fixtures", "image.png")) end - name { 'image' } - image_file_name { 'image.png' } + name { "image" } + image_file_name { "image.png" } upload_hash { Time.current.hash } end end diff --git a/lib/alchemy/test_support/factories/site_factory.rb b/lib/alchemy/test_support/factories/site_factory.rb index 834318090d..5d848fd010 100644 --- a/lib/alchemy/test_support/factories/site_factory.rb +++ b/lib/alchemy/test_support/factories/site_factory.rb @@ -1,17 +1,17 @@ # frozen_string_literal: true -require 'factory_bot' +require "factory_bot" FactoryBot.define do - factory :alchemy_site, class: 'Alchemy::Site' do - name { 'A Site' } - host { 'domain.com' } + factory :alchemy_site, class: "Alchemy::Site" do + name { "A Site" } + host { "domain.com" } trait :default do public { true } - name { Alchemy::Config.get(:default_site)['name'] } - host { Alchemy::Config.get(:default_site)['host'] } + name { Alchemy::Config.get(:default_site)["name"] } + host { Alchemy::Config.get(:default_site)["host"] } end trait :public do diff --git a/lib/alchemy/test_support/shared_contexts.rb b/lib/alchemy/test_support/shared_contexts.rb index c14a28b53e..6946f87a50 100644 --- a/lib/alchemy/test_support/shared_contexts.rb +++ b/lib/alchemy/test_support/shared_contexts.rb @@ -1,15 +1,15 @@ # frozen_string_literal: true -RSpec.shared_context 'with invalid file' do +RSpec.shared_context "with invalid file" do let(:invalid_file) do fixture_file_upload( - File.expand_path('../../../spec/fixtures/users.yml', __dir__), - 'text/x-yaml' + File.expand_path("../../../spec/fixtures/users.yml", __dir__), + "text/x-yaml", ) end before do allow(Alchemy::Attachment).to receive(:allowed_filetypes) do - ['png'] + ["png"] end end end diff --git a/lib/alchemy/test_support/shared_uploader_examples.rb b/lib/alchemy/test_support/shared_uploader_examples.rb index f35d5249c7..563d269727 100644 --- a/lib/alchemy/test_support/shared_uploader_examples.rb +++ b/lib/alchemy/test_support/shared_uploader_examples.rb @@ -2,10 +2,10 @@ RSpec.shared_examples_for "having a json uploader error message" do it "renders json response with error message" do subject - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") expect(response.status).to eq(422) json = JSON.parse(response.body) - expect(json).to have_key('growl_message') - expect(json).to have_key('files') + expect(json).to have_key("growl_message") + expect(json).to have_key("files") end end diff --git a/lib/alchemy/tinymce.rb b/lib/alchemy/tinymce.rb index 2d52de9040..27f3862187 100644 --- a/lib/alchemy/tinymce.rb +++ b/lib/alchemy/tinymce.rb @@ -6,23 +6,23 @@ module Tinymce @@plugins = %w(alchemy_link anchor autoresize charmap code directionality fullscreen hr link lists paste tabfocus table) @@init = { - skin: 'alchemy', - width: 'auto', + skin: "alchemy", + width: "auto", resize: true, - autoresize_min_height: '105', - autoresize_max_height: '480', + autoresize_min_height: "105", + autoresize_max_height: "480", menubar: false, statusbar: true, toolbar: [ - 'bold italic underline | strikethrough subscript superscript | numlist bullist indent outdent | removeformat | fullscreen', - 'pastetext charmap hr | undo redo | alchemy_link unlink anchor | code' + "bold italic underline | strikethrough subscript superscript | numlist bullist indent outdent | removeformat | fullscreen", + "pastetext charmap hr | undo redo | alchemy_link unlink anchor | code", ], fix_list_elements: true, convert_urls: false, - entity_encoding: 'raw', + entity_encoding: "raw", paste_as_text: true, - element_format: 'html', - branding: false + element_format: "html", + branding: false, } class << self @@ -42,14 +42,14 @@ def custom_config_contents(page) def content_definitions_from_elements(definitions) definitions.collect do |el| - next if el['contents'].blank? + next if el["contents"].blank? - contents = el['contents'].select do |c| - c['settings'] && c['settings']['tinymce'].is_a?(Hash) + contents = el["contents"].select do |c| + c["settings"] && c["settings"]["tinymce"].is_a?(Hash) end next if contents.blank? - contents.map { |c| c.merge('element' => el['name']) } + contents.map { |c| c.merge("element" => el["name"]) } end.flatten.compact end end diff --git a/lib/alchemy/upgrader.rb b/lib/alchemy/upgrader.rb index 7d628ad41e..fa32620c51 100644 --- a/lib/alchemy/upgrader.rb +++ b/lib/alchemy/upgrader.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require 'alchemy/shell' +require "alchemy/shell" module Alchemy class Upgrader @@ -10,18 +10,18 @@ class Upgrader class << self def copy_new_config_file desc "Copy configuration file." - config_file = Rails.root.join('config/alchemy/config.yml') - default_config = File.join(File.dirname(__FILE__), '../../config/alchemy/config.yml') + config_file = Rails.root.join("config/alchemy/config.yml") + default_config = File.join(File.dirname(__FILE__), "../../config/alchemy/config.yml") if !File.exist? config_file log "No configuration file found. Creating it." - FileUtils.cp default_config, Rails.root.join('config/alchemy/config.yml') + FileUtils.cp default_config, Rails.root.join("config/alchemy/config.yml") elsif FileUtils.identical? default_config, config_file log "Configuration file already present.", :skip else log "Custom configuration file found." - FileUtils.cp default_config, Rails.root.join('config/alchemy/config.yml.defaults') + FileUtils.cp default_config, Rails.root.join("config/alchemy/config.yml.defaults") log "Copied new default configuration file." - todo "Check the default configuration file (./config/alchemy/config.yml.defaults) for new configuration options and insert them into your config file.", 'Configuration has changed' + todo "Check the default configuration file (./config/alchemy/config.yml.defaults) for new configuration options and insert them into your config file.", "Configuration has changed" end end end diff --git a/lib/alchemy/upgrader/five_point_zero.rb b/lib/alchemy/upgrader/five_point_zero.rb index 9cbaff7c13..338df576ea 100644 --- a/lib/alchemy/upgrader/five_point_zero.rb +++ b/lib/alchemy/upgrader/five_point_zero.rb @@ -1,15 +1,40 @@ # frozen_string_literal: true -require_relative 'tasks/harden_gutentag_migrations' +require_relative "tasks/harden_gutentag_migrations" module Alchemy class Upgrader::FivePointZero < Upgrader class << self def install_gutentag_migrations - desc 'Install Gutentag migrations' - `bundle exec rake gutentag:install:migrations` + desc "Install Gutentag migrations" + Rake::Task["gutentag:install:migrations"].invoke Alchemy::Upgrader::Tasks::HardenGutentagMigrations.new.patch_migrations - `bundle exec rake db:migrate` + Rake::Task["db:migrate"].invoke + end + + def remove_layout_roots + desc "Remove layout root pages" + layout_roots = Alchemy::Page.where(layoutpage: true).where("name LIKE 'Layoutroot for%'") + if layout_roots.size.positive? + log "Removing #{layout_roots.size} layout root pages." + layout_roots.delete_all + Alchemy::Page.where(layoutpage: true).update_all(parent_id: nil) + log "Done.", :success + else + log "No layout root pages found.", :skip + end + end + + def remove_root_page + desc "Remove root page" + root_page = Alchemy::Page.find_by(parent_id: nil, name: "Root") + if root_page + Alchemy::Page.where(parent_id: root_page.id).update_all(parent_id: nil) + root_page.delete + log "Done.", :success + else + log "Root page not found.", :skip + end end end end diff --git a/lib/alchemy/upgrader/four_point_four.rb b/lib/alchemy/upgrader/four_point_four.rb deleted file mode 100644 index 85525df828..0000000000 --- a/lib/alchemy/upgrader/four_point_four.rb +++ /dev/null @@ -1,52 +0,0 @@ -# frozen_string_literal: true - -require_relative 'tasks/element_views_updater' - -module Alchemy - class Upgrader::FourPointFour < Upgrader - class << self - def rename_element_views - desc "Remove '_view' suffix from element views." - Alchemy::Upgrader::Tasks::ElementViewsUpdater.new.rename_element_views - end - - def update_local_variable - desc 'Update element views local variable to element name.' - Alchemy::Upgrader::Tasks::ElementViewsUpdater.new.update_local_variable - end - - def alchemy_4_4_todos - notice = <<-NOTE.strip_heredoc - - ℹ️ Element editor partials are deprecated - ----------------------------------------- - - The element editor partials are not needed anymore. They still work, but in order to - prepare the Alchemy 5 upgrade your should consider removing them now. - - In order to update check if you have any messages in your editor partials and move them - to either a `warning` or `message` in your element definition. - - Also check if you pass any values to EssenceSelects `select_values`. Move static values - to the `settings` of your content definition and either use EssencePage for referencing - pages or create a custom essence for other dynamic values. - - - ℹ️ The `_view` suffix of Element view partials is deprecated - ----------------------------------------------------------- - - The element view partials do not need the `_view` suffix anymore. Your files have been - renamed. - - The local variable in your element views has been replaced by a variable named after the - element itself. A "article" element has a "_article.html.erb" partial and therefore - a `article` local variable now. - - The former `element` variable is still present, though. - - NOTE - todo notice, 'Alchemy v4.4 TODO' - end - end - end -end diff --git a/lib/alchemy/upgrader/tasks/element_views_updater.rb b/lib/alchemy/upgrader/tasks/element_views_updater.rb index dbb0c6ab13..8ca26465f6 100644 --- a/lib/alchemy/upgrader/tasks/element_views_updater.rb +++ b/lib/alchemy/upgrader/tasks/element_views_updater.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'alchemy/upgrader' +require "alchemy/upgrader" module Alchemy::Upgrader::Tasks class ElementViewsUpdater < Thor @@ -11,14 +11,14 @@ def rename_element_views puts "-- Removing '_view' suffix from element views" Dir.glob("#{elements_view_folder}/*_view.*").each do |file| - FileUtils.mv(file, file.to_s.sub(/_view/, '')) + FileUtils.mv(file, file.to_s.sub(/_view/, "")) end end def update_local_variable puts "-- Updating element views local variable to element name" - Alchemy::Element.definitions.map { |e| e['name'] }.each do |name| + Alchemy::Element.definitions.map { |e| e["name"] }.each do |name| view = Dir.glob("#{elements_view_folder}/_#{name}.*").last gsub_file(view, /\b#{name}_view\b/, name) end @@ -28,7 +28,7 @@ def update_local_variable private def elements_view_folder - Rails.root.join('app', 'views', 'alchemy', 'elements') + Rails.root.join("app", "views", "alchemy", "elements") end end end diff --git a/lib/alchemy/upgrader/tasks/harden_gutentag_migrations.rb b/lib/alchemy/upgrader/tasks/harden_gutentag_migrations.rb index 53e8b9abd8..b8533a05d4 100644 --- a/lib/alchemy/upgrader/tasks/harden_gutentag_migrations.rb +++ b/lib/alchemy/upgrader/tasks/harden_gutentag_migrations.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'thor' +require "thor" module Alchemy::Upgrader::Tasks class HardenGutentagMigrations < Thor @@ -10,14 +10,14 @@ class HardenGutentagMigrations < Thor def patch_migrations sentinel = /def up/ - migration_file = Dir.glob('db/migrate/*_gutentag_tables.gutentag.rb').first + migration_file = Dir.glob("db/migrate/*_gutentag_tables.gutentag.rb").first if migration_file inject_into_file migration_file, "\n # inserted by Alchemy CMS upgrader\n return if table_exists?(:gutentag_taggings)\n", { after: sentinel, verbose: true } end - migration_file = Dir.glob('db/migrate/*_gutentag_cache_counter.gutentag.rb').first + migration_file = Dir.glob("db/migrate/*_gutentag_cache_counter.gutentag.rb").first if migration_file inject_into_file migration_file, "\n # inserted by Alchemy CMS upgrader\n return if column_exists?(:gutentag_tags, :taggings_count)\n", diff --git a/lib/alchemy/version.rb b/lib/alchemy/version.rb index a8f0f51f27..1f4eeafe4a 100644 --- a/lib/alchemy/version.rb +++ b/lib/alchemy/version.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Alchemy - VERSION = "5.0.0.a" + VERSION = "5.0.0.beta2" def self.version VERSION diff --git a/lib/alchemy_cms.rb b/lib/alchemy_cms.rb index 73df9914f3..5cd6e4712c 100644 --- a/lib/alchemy_cms.rb +++ b/lib/alchemy_cms.rb @@ -1,62 +1,63 @@ # frozen_string_literal: true # Instantiate the global Alchemy namespace module Alchemy - Alchemy::YAML_WHITELIST_CLASSES = %w(Symbol Date Regexp) + YAML_WHITELIST_CLASSES = %w(Symbol Date Regexp) end # Require globally used external libraries -require 'acts_as_list' -require 'action_view/dependency_tracker' -require 'active_model_serializers' -require 'awesome_nested_set' -require 'cancan' -require 'dragonfly' -require 'gutentag' -require 'handlebars_assets' -require 'jquery-rails' -require 'jquery-ui-rails' -require 'kaminari' -require 'non-stupid-digest-assets' -require 'ransack' -require 'request_store' -require 'responders' -require 'sassc-rails' -require 'simple_form' -require 'select2-rails' -require 'turbolinks' -require 'userstamp' +require "acts_as_list" +require "action_view/dependency_tracker" +require "active_model_serializers" +require "awesome_nested_set" +require "cancan" +require "dragonfly" +require "gutentag" +require "handlebars_assets" +require "jquery-rails" +require "jquery-ui-rails" +require "kaminari" +require "non-stupid-digest-assets" +require "ransack" +require "request_store" +require "responders" +require "sassc-rails" +require "simple_form" +require "select2-rails" +require "turbolinks" +require "userstamp" +require "webpacker" # Require globally used Alchemy mixins -require_relative 'alchemy/ability_helper' -require_relative 'alchemy/admin/locale' -require_relative 'alchemy/auth_accessors' -require_relative 'alchemy/cache_digests/template_tracker' -require_relative 'alchemy/config' -require_relative 'alchemy/configuration_methods' -require_relative 'alchemy/controller_actions' -require_relative 'alchemy/deprecation' -require_relative 'alchemy/elements_finder' -require_relative 'alchemy/errors' -require_relative 'alchemy/essence' -require_relative 'alchemy/filetypes' -require_relative 'alchemy/forms/builder' -require_relative 'alchemy/hints' -require_relative 'alchemy/i18n' -require_relative 'alchemy/logger' -require_relative 'alchemy/modules' -require_relative 'alchemy/name_conversions' -require_relative 'alchemy/on_page_layout' -require_relative 'alchemy/on_page_layout/callbacks_runner' -require_relative 'alchemy/page_layout' -require_relative 'alchemy/paths' -require_relative 'alchemy/permissions' -require_relative 'alchemy/ssl_protection' -require_relative 'alchemy/resource' -require_relative 'alchemy/tinymce' -require_relative 'alchemy/taggable' +require_relative "alchemy/ability_helper" +require_relative "alchemy/admin/locale" +require_relative "alchemy/admin/preview_url" +require_relative "alchemy/auth_accessors" +require_relative "alchemy/cache_digests/template_tracker" +require_relative "alchemy/config" +require_relative "alchemy/configuration_methods" +require_relative "alchemy/controller_actions" +require_relative "alchemy/deprecation" +require_relative "alchemy/elements_finder" +require_relative "alchemy/errors" +require_relative "alchemy/essence" +require_relative "alchemy/filetypes" +require_relative "alchemy/forms/builder" +require_relative "alchemy/hints" +require_relative "alchemy/i18n" +require_relative "alchemy/logger" +require_relative "alchemy/modules" +require_relative "alchemy/name_conversions" +require_relative "alchemy/on_page_layout" +require_relative "alchemy/on_page_layout/callbacks_runner" +require_relative "alchemy/page_layout" +require_relative "alchemy/paths" +require_relative "alchemy/permissions" +require_relative "alchemy/resource" +require_relative "alchemy/tinymce" +require_relative "alchemy/taggable" # Require hacks -require_relative 'kaminari/scoped_pagination_url_helper' +require_relative "kaminari/scoped_pagination_url_helper" # Finally require Alchemy itself -require_relative 'alchemy/engine' +require_relative "alchemy/engine" diff --git a/lib/rails/generators/alchemy/base.rb b/lib/generators/alchemy/base.rb similarity index 83% rename from lib/rails/generators/alchemy/base.rb rename to lib/generators/alchemy/base.rb index 43c3c1811a..0074ac243e 100644 --- a/lib/rails/generators/alchemy/base.rb +++ b/lib/generators/alchemy/base.rb @@ -1,15 +1,15 @@ # frozen_string_literal: true -require 'rails' +require "rails" module Alchemy module Generators class Base < ::Rails::Generators::Base - class_option :template_engine, type: :string, aliases: '-e', desc: 'Template engine for the views. Available options are "erb", "haml", and "slim".' + class_option :template_engine, type: :string, aliases: "-e", desc: 'Template engine for the views. Available options are "erb", "haml", and "slim".' private def conditional_template(source, destination) - files = Dir.glob(destination.gsub(/\.([a-z]+)$/, '*')) + files = Dir.glob(destination.gsub(/\.([a-z]+)$/, "*")) if files.any? ext = File.extname(files.first)[1..-1] @@ -29,7 +29,7 @@ def template_engine # Rails is clever enough to default this to whatever template # engine is configured through its generator configuration, # but we'll default it to erb anyway, just in case. - options[:template_engine] || 'erb' + options[:template_engine] || "erb" end def load_alchemy_yaml(name) diff --git a/lib/rails/generators/alchemy/elements/elements_generator.rb b/lib/generators/alchemy/elements/elements_generator.rb similarity index 56% rename from lib/rails/generators/alchemy/elements/elements_generator.rb rename to lib/generators/alchemy/elements/elements_generator.rb index e3c182dfda..966dc85af6 100644 --- a/lib/rails/generators/alchemy/elements/elements_generator.rb +++ b/lib/generators/alchemy/elements/elements_generator.rb @@ -1,25 +1,20 @@ # frozen_string_literal: true -require_relative '../base' +require_relative "../base" module Alchemy module Generators class ElementsGenerator < Base desc "This generator generates your elements view partials." - source_root File.expand_path('templates', __dir__) + source_root File.expand_path("templates", __dir__) def create_partials - @elements = load_alchemy_yaml('elements.yml') + @elements = load_alchemy_yaml("elements.yml") return unless @elements @elements.each do |element| @element = element @contents = element["contents"] || [] - if element["name"] =~ /\A[a-z0-9_-]+\z/ - @element_name = element["name"].underscore - else - raise "Element name '#{element['name']}' has wrong format. Only lowercase and non whitespace characters allowed." - end - + @element_name = element_name(element) conditional_template "view.html.#{template_engine}", "#{elements_dir}/_#{@element_name}.html.#{template_engine}" end end @@ -29,6 +24,14 @@ def create_partials def elements_dir @_elements_dir ||= "app/views/alchemy/elements" end + + def element_name(element) + if element["name"] =~ Alchemy::Element::NAME_REGEXP + element["name"].underscore + else + raise "Element name '#{element["name"]}' has wrong format. Only lowercase and non whitespace characters allowed." + end + end end end end diff --git a/lib/rails/generators/alchemy/elements/templates/view.html.erb b/lib/generators/alchemy/elements/templates/view.html.erb similarity index 100% rename from lib/rails/generators/alchemy/elements/templates/view.html.erb rename to lib/generators/alchemy/elements/templates/view.html.erb diff --git a/lib/rails/generators/alchemy/elements/templates/view.html.haml b/lib/generators/alchemy/elements/templates/view.html.haml similarity index 100% rename from lib/rails/generators/alchemy/elements/templates/view.html.haml rename to lib/generators/alchemy/elements/templates/view.html.haml diff --git a/lib/rails/generators/alchemy/elements/templates/view.html.slim b/lib/generators/alchemy/elements/templates/view.html.slim similarity index 100% rename from lib/rails/generators/alchemy/elements/templates/view.html.slim rename to lib/generators/alchemy/elements/templates/view.html.slim diff --git a/lib/rails/generators/alchemy/essence/essence_generator.rb b/lib/generators/alchemy/essence/essence_generator.rb similarity index 93% rename from lib/rails/generators/alchemy/essence/essence_generator.rb rename to lib/generators/alchemy/essence/essence_generator.rb index 72688d8a4d..8946856ba8 100644 --- a/lib/rails/generators/alchemy/essence/essence_generator.rb +++ b/lib/generators/alchemy/essence/essence_generator.rb @@ -1,16 +1,16 @@ # frozen_string_literal: true -require 'rails' +require "rails" module Alchemy module Generators class EssenceGenerator < ::Rails::Generators::Base desc "This generator generates an Alchemy essence for you." argument :essence_name, banner: "YourEssenceName" - source_root File.expand_path('templates', __dir__) + source_root File.expand_path("templates", __dir__) def init @essence_name = essence_name.underscore - @essence_view_path = 'app/views/alchemy/essences' + @essence_view_path = "app/views/alchemy/essences" end def create_model diff --git a/lib/rails/generators/alchemy/essence/templates/editor.html.erb b/lib/generators/alchemy/essence/templates/editor.html.erb similarity index 100% rename from lib/rails/generators/alchemy/essence/templates/editor.html.erb rename to lib/generators/alchemy/essence/templates/editor.html.erb diff --git a/lib/rails/generators/alchemy/essence/templates/view.html.erb b/lib/generators/alchemy/essence/templates/view.html.erb similarity index 100% rename from lib/rails/generators/alchemy/essence/templates/view.html.erb rename to lib/generators/alchemy/essence/templates/view.html.erb diff --git a/lib/rails/generators/alchemy/install/files/_article.html.erb b/lib/generators/alchemy/install/files/_article.html.erb similarity index 100% rename from lib/rails/generators/alchemy/install/files/_article.html.erb rename to lib/generators/alchemy/install/files/_article.html.erb diff --git a/lib/rails/generators/alchemy/install/files/_standard.html.erb b/lib/generators/alchemy/install/files/_standard.html.erb similarity index 100% rename from lib/rails/generators/alchemy/install/files/_standard.html.erb rename to lib/generators/alchemy/install/files/_standard.html.erb diff --git a/lib/rails/generators/alchemy/install/files/alchemy.en.yml b/lib/generators/alchemy/install/files/alchemy.en.yml similarity index 100% rename from lib/rails/generators/alchemy/install/files/alchemy.en.yml rename to lib/generators/alchemy/install/files/alchemy.en.yml diff --git a/lib/generators/alchemy/install/files/alchemy_admin.js b/lib/generators/alchemy/install/files/alchemy_admin.js new file mode 100644 index 0000000000..4691676a39 --- /dev/null +++ b/lib/generators/alchemy/install/files/alchemy_admin.js @@ -0,0 +1 @@ +import "@alchemy_cms/admin" diff --git a/lib/rails/generators/alchemy/install/files/all.css b/lib/generators/alchemy/install/files/all.css similarity index 100% rename from lib/rails/generators/alchemy/install/files/all.css rename to lib/generators/alchemy/install/files/all.css diff --git a/lib/rails/generators/alchemy/install/files/all.js b/lib/generators/alchemy/install/files/all.js similarity index 100% rename from lib/rails/generators/alchemy/install/files/all.js rename to lib/generators/alchemy/install/files/all.js diff --git a/lib/rails/generators/alchemy/install/files/application.html.erb b/lib/generators/alchemy/install/files/application.html.erb similarity index 100% rename from lib/rails/generators/alchemy/install/files/application.html.erb rename to lib/generators/alchemy/install/files/application.html.erb diff --git a/lib/rails/generators/alchemy/install/files/article.scss b/lib/generators/alchemy/install/files/article.scss similarity index 100% rename from lib/rails/generators/alchemy/install/files/article.scss rename to lib/generators/alchemy/install/files/article.scss diff --git a/lib/generators/alchemy/install/install_generator.rb b/lib/generators/alchemy/install/install_generator.rb new file mode 100644 index 0000000000..53c5db14d8 --- /dev/null +++ b/lib/generators/alchemy/install/install_generator.rb @@ -0,0 +1,110 @@ +# frozen_string_literal: true +require "rails/generators" + +module Alchemy + module Generators + class InstallGenerator < ::Rails::Generators::Base + desc "Installs Alchemy into your App." + + class_option :skip_demo_files, + type: :boolean, + default: false, + desc: "Skip creation of demo element, page and application layout." + + class_option :skip_webpacker_installer, + type: :boolean, + default: false, + desc: "Skip running the webpacker installer." + + source_root File.expand_path("files", __dir__) + + def copy_config + copy_file "#{gem_config_path}/config.yml", app_config_path.join("alchemy", "config.yml") + end + + def copy_yml_files + %w(elements page_layouts menus).each do |file| + template "#{__dir__}/templates/#{file}.yml.tt", app_config_path.join("alchemy", "#{file}.yml") + end + end + + def install_assets + copy_file "all.js", app_vendor_assets_path.join("javascripts", "alchemy", "admin", "all.js") + copy_file "all.css", app_vendor_assets_path.join("stylesheets", "alchemy", "admin", "all.css") + end + + def copy_demo_views + return if options[:skip_demo_files] + + copy_file "application.html.erb", app_views_path.join("layouts", "application.html.erb") + copy_file "article.scss", app_assets_path.join("stylesheets", "alchemy", "elements", "article.scss") + + stylesheet_require = " *= require_tree ./alchemy/elements\n" + if File.exist?(app_assets_path.join("stylesheets", "application.css")) + insert_into_file app_assets_path.join("stylesheets", "application.css"), stylesheet_require, + before: " */" + else + create_file app_assets_path.join("stylesheets", "application.css"), "/*\n#{stylesheet_require} */\n" + end + + copy_file "_article.html.erb", app_views_path.join("alchemy", "elements", "_article.html.erb") + copy_file "_standard.html.erb", app_views_path.join("alchemy", "page_layouts", "_standard.html.erb") + copy_file "alchemy.en.yml", app_config_path.join("locales", "alchemy.en.yml") + end + + def copy_dragonfly_config + template "#{__dir__}/templates/dragonfly.rb.tt", app_config_path.join("initializers", "dragonfly.rb") + end + + def install_gutentag_migrations + rake "gutentag:install:migrations" + end + + def run_webpacker_installer + unless options[:skip_webpacker_installer] + # Webpacker does not create a package.json, but we need one + unless File.exist? app_root.join("package.json") + in_root { run "echo '{}' > package.json" } + end + rake("webpacker:install", abort_on_failure: true) + end + end + + def add_npm_package + run "yarn add @alchemy_cms/admin" + end + + def copy_alchemy_entry_point + webpack_config = YAML.load_file(app_root.join("config", "webpacker.yml"))[Rails.env] + copy_file "alchemy_admin.js", + app_root.join(webpack_config["source_path"], webpack_config["source_entry_path"], "alchemy/admin.js") + end + + private + + def gem_config_path + @_config_path ||= File.expand_path("../../../../config/alchemy", __dir__) + end + + def app_config_path + @_app_config_path ||= app_root.join("config") + end + + def app_views_path + @_app_views_path ||= app_root.join("app", "views") + end + + def app_assets_path + @_app_assets_path ||= app_root.join("app", "assets") + end + + def app_vendor_assets_path + @_app_vendor_assets_path ||= app_root.join("vendor", "assets") + end + + def app_root + @_app_root ||= Rails.root + end + end + end +end diff --git a/lib/rails/generators/alchemy/install/templates/dragonfly.rb.tt b/lib/generators/alchemy/install/templates/dragonfly.rb.tt similarity index 100% rename from lib/rails/generators/alchemy/install/templates/dragonfly.rb.tt rename to lib/generators/alchemy/install/templates/dragonfly.rb.tt diff --git a/lib/rails/generators/alchemy/install/templates/elements.yml.tt b/lib/generators/alchemy/install/templates/elements.yml.tt similarity index 100% rename from lib/rails/generators/alchemy/install/templates/elements.yml.tt rename to lib/generators/alchemy/install/templates/elements.yml.tt diff --git a/lib/rails/generators/alchemy/install/templates/menus.yml.tt b/lib/generators/alchemy/install/templates/menus.yml.tt similarity index 100% rename from lib/rails/generators/alchemy/install/templates/menus.yml.tt rename to lib/generators/alchemy/install/templates/menus.yml.tt diff --git a/lib/rails/generators/alchemy/install/templates/page_layouts.yml.tt b/lib/generators/alchemy/install/templates/page_layouts.yml.tt similarity index 100% rename from lib/rails/generators/alchemy/install/templates/page_layouts.yml.tt rename to lib/generators/alchemy/install/templates/page_layouts.yml.tt diff --git a/lib/rails/generators/alchemy/menus/menus_generator.rb b/lib/generators/alchemy/menus/menus_generator.rb similarity index 88% rename from lib/rails/generators/alchemy/menus/menus_generator.rb rename to lib/generators/alchemy/menus/menus_generator.rb index 9545a1c138..3e0bfca40d 100644 --- a/lib/rails/generators/alchemy/menus/menus_generator.rb +++ b/lib/generators/alchemy/menus/menus_generator.rb @@ -1,12 +1,12 @@ # frozen_string_literal: true -require_relative '../base' +require_relative "../base" module Alchemy module Generators class MenusGenerator < Base desc "This generator generates Alchemy menu partials." - source_root File.expand_path('templates', __dir__) + source_root File.expand_path("templates", __dir__) def create_partials menus = Alchemy::Node.available_menu_names diff --git a/lib/rails/generators/alchemy/menus/templates/node.html.erb b/lib/generators/alchemy/menus/templates/node.html.erb similarity index 74% rename from lib/rails/generators/alchemy/menus/templates/node.html.erb rename to lib/generators/alchemy/menus/templates/node.html.erb index ed6099437e..cd92392c61 100644 --- a/lib/rails/generators/alchemy/menus/templates/node.html.erb +++ b/lib/generators/alchemy/menus/templates/node.html.erb @@ -9,10 +9,7 @@ rel: node.nofollow? ? 'nofollow' : nil %> <%% if node.children.any? %>
      - <%%= render partial: options[:node_partial_name], - collection: node.children.includes(:page, :children), - locals: { options: options }, - as: 'node' %> + <%%= render node.children.includes(:page, :children), as: 'node' %>
    <%% end %> <%% end %> diff --git a/lib/rails/generators/alchemy/menus/templates/node.html.haml b/lib/generators/alchemy/menus/templates/node.html.haml similarity index 71% rename from lib/rails/generators/alchemy/menus/templates/node.html.haml rename to lib/generators/alchemy/menus/templates/node.html.haml index 555998f0cc..f186012dad 100644 --- a/lib/rails/generators/alchemy/menus/templates/node.html.haml +++ b/lib/generators/alchemy/menus/templates/node.html.haml @@ -10,7 +10,4 @@ rel: node.nofollow? ? 'nofollow' : nil - if node.children.any? %ul.dropdown-menu - = render partial: options[:node_partial_name], - collection: node.children.includes(:page, :children), - locals: { options: options }, - as: 'node' + = render node.children.includes(:page, :children), as: 'node' diff --git a/lib/rails/generators/alchemy/menus/templates/node.html.slim b/lib/generators/alchemy/menus/templates/node.html.slim similarity index 70% rename from lib/rails/generators/alchemy/menus/templates/node.html.slim rename to lib/generators/alchemy/menus/templates/node.html.slim index f7d6d3e166..b07bb2355f 100644 --- a/lib/rails/generators/alchemy/menus/templates/node.html.slim +++ b/lib/generators/alchemy/menus/templates/node.html.slim @@ -10,7 +10,4 @@ rel: node.nofollow? ? 'nofollow' : nil - if node.children.any? ul.dropdown-menu - = render partial: options[:node_partial_name], - collection: node.children.includes(:page, :children), - locals: { options: options }, - as: 'node' + = render node.children.includes(:page, :children), as: 'node' diff --git a/lib/rails/generators/alchemy/menus/templates/wrapper.html.erb b/lib/generators/alchemy/menus/templates/wrapper.html.erb similarity index 76% rename from lib/rails/generators/alchemy/menus/templates/wrapper.html.erb rename to lib/generators/alchemy/menus/templates/wrapper.html.erb index 5480e7055f..5d8767acba 100644 --- a/lib/rails/generators/alchemy/menus/templates/wrapper.html.erb +++ b/lib/generators/alchemy/menus/templates/wrapper.html.erb @@ -1,6 +1,6 @@ <%% cache menu do %>
      - <%%= render partial: options[:node_partial_name], + <%%= render partial: menu.to_partial_path, collection: menu.children.includes(:page, :children), locals: { options: options }, as: 'node' %> diff --git a/lib/rails/generators/alchemy/menus/templates/wrapper.html.haml b/lib/generators/alchemy/menus/templates/wrapper.html.haml similarity index 73% rename from lib/rails/generators/alchemy/menus/templates/wrapper.html.haml rename to lib/generators/alchemy/menus/templates/wrapper.html.haml index 62a9e09222..b4f4533630 100644 --- a/lib/rails/generators/alchemy/menus/templates/wrapper.html.haml +++ b/lib/generators/alchemy/menus/templates/wrapper.html.haml @@ -1,6 +1,6 @@ - cache menu do %ul.nav - = render partial: options[:node_partial_name], + = render partial: menu.to_partial_path, collection: menu.children.includes(:page, :children), locals: { options: options }, as: 'node' diff --git a/lib/rails/generators/alchemy/menus/templates/wrapper.html.slim b/lib/generators/alchemy/menus/templates/wrapper.html.slim similarity index 73% rename from lib/rails/generators/alchemy/menus/templates/wrapper.html.slim rename to lib/generators/alchemy/menus/templates/wrapper.html.slim index 704b5b9ac4..83845288ff 100644 --- a/lib/rails/generators/alchemy/menus/templates/wrapper.html.slim +++ b/lib/generators/alchemy/menus/templates/wrapper.html.slim @@ -1,6 +1,6 @@ - cache menu do ul.nav - = render partial: options[:node_partial_name], + = render partial: menu.to_partial_path, collection: menu.children.includes(:page, :children), locals: { options: options }, as: 'node' diff --git a/lib/rails/generators/alchemy/module/module_generator.rb b/lib/generators/alchemy/module/module_generator.rb similarity index 92% rename from lib/rails/generators/alchemy/module/module_generator.rb rename to lib/generators/alchemy/module/module_generator.rb index 7d6651b1c6..a2a08bcb16 100644 --- a/lib/rails/generators/alchemy/module/module_generator.rb +++ b/lib/generators/alchemy/module/module_generator.rb @@ -1,12 +1,12 @@ # frozen_string_literal: true -require 'rails' +require "rails" module Alchemy module Generators class ModuleGenerator < ::Rails::Generators::Base desc "This generator generates an Alchemy module for you." argument :module_name, banner: "your_module_name" - source_root File.expand_path('templates', __dir__) + source_root File.expand_path("templates", __dir__) def init @module_name = module_name.downcase diff --git a/lib/rails/generators/alchemy/module/templates/ability.rb.tt b/lib/generators/alchemy/module/templates/ability.rb.tt similarity index 100% rename from lib/rails/generators/alchemy/module/templates/ability.rb.tt rename to lib/generators/alchemy/module/templates/ability.rb.tt diff --git a/lib/rails/generators/alchemy/module/templates/controller.rb.tt b/lib/generators/alchemy/module/templates/controller.rb.tt similarity index 100% rename from lib/rails/generators/alchemy/module/templates/controller.rb.tt rename to lib/generators/alchemy/module/templates/controller.rb.tt diff --git a/lib/rails/generators/alchemy/module/templates/module_config.rb.tt b/lib/generators/alchemy/module/templates/module_config.rb.tt similarity index 100% rename from lib/rails/generators/alchemy/module/templates/module_config.rb.tt rename to lib/generators/alchemy/module/templates/module_config.rb.tt diff --git a/lib/rails/generators/alchemy/page_layouts/page_layouts_generator.rb b/lib/generators/alchemy/page_layouts/page_layouts_generator.rb similarity index 81% rename from lib/rails/generators/alchemy/page_layouts/page_layouts_generator.rb rename to lib/generators/alchemy/page_layouts/page_layouts_generator.rb index 1ceb9ce2b1..d747a96c57 100644 --- a/lib/rails/generators/alchemy/page_layouts/page_layouts_generator.rb +++ b/lib/generators/alchemy/page_layouts/page_layouts_generator.rb @@ -1,14 +1,14 @@ # frozen_string_literal: true -require_relative '../base' +require_relative "../base" module Alchemy module Generators class PageLayoutsGenerator < Base desc "This generator generates your page_layouts view partials." - source_root File.expand_path('templates', __dir__) + source_root File.expand_path("templates", __dir__) def create_partials - @page_layouts = load_alchemy_yaml('page_layouts.yml') + @page_layouts = load_alchemy_yaml("page_layouts.yml") return unless @page_layouts @page_layouts.each do |page_layout| diff --git a/lib/rails/generators/alchemy/page_layouts/templates/layout.html.erb b/lib/generators/alchemy/page_layouts/templates/layout.html.erb similarity index 100% rename from lib/rails/generators/alchemy/page_layouts/templates/layout.html.erb rename to lib/generators/alchemy/page_layouts/templates/layout.html.erb diff --git a/lib/rails/generators/alchemy/page_layouts/templates/layout.html.haml b/lib/generators/alchemy/page_layouts/templates/layout.html.haml similarity index 100% rename from lib/rails/generators/alchemy/page_layouts/templates/layout.html.haml rename to lib/generators/alchemy/page_layouts/templates/layout.html.haml diff --git a/lib/rails/generators/alchemy/page_layouts/templates/layout.html.slim b/lib/generators/alchemy/page_layouts/templates/layout.html.slim similarity index 100% rename from lib/rails/generators/alchemy/page_layouts/templates/layout.html.slim rename to lib/generators/alchemy/page_layouts/templates/layout.html.slim diff --git a/lib/rails/generators/alchemy/site_layouts/site_layouts_generator.rb b/lib/generators/alchemy/site_layouts/site_layouts_generator.rb similarity index 88% rename from lib/rails/generators/alchemy/site_layouts/site_layouts_generator.rb rename to lib/generators/alchemy/site_layouts/site_layouts_generator.rb index aba495be9d..0cf8f8d2a4 100644 --- a/lib/rails/generators/alchemy/site_layouts/site_layouts_generator.rb +++ b/lib/generators/alchemy/site_layouts/site_layouts_generator.rb @@ -1,11 +1,11 @@ # frozen_string_literal: true -require_relative '../base' +require_relative "../base" module Alchemy module Generators class SiteLayoutsGenerator < Base desc "This generator generates your site layouts view partials." - source_root File.expand_path('templates', __dir__) + source_root File.expand_path("templates", __dir__) def create_partials @sites = Alchemy::Site.all diff --git a/lib/rails/generators/alchemy/site_layouts/templates/layout.html.erb b/lib/generators/alchemy/site_layouts/templates/layout.html.erb similarity index 100% rename from lib/rails/generators/alchemy/site_layouts/templates/layout.html.erb rename to lib/generators/alchemy/site_layouts/templates/layout.html.erb diff --git a/lib/rails/generators/alchemy/site_layouts/templates/layout.html.haml b/lib/generators/alchemy/site_layouts/templates/layout.html.haml similarity index 100% rename from lib/rails/generators/alchemy/site_layouts/templates/layout.html.haml rename to lib/generators/alchemy/site_layouts/templates/layout.html.haml diff --git a/lib/rails/generators/alchemy/site_layouts/templates/layout.html.slim b/lib/generators/alchemy/site_layouts/templates/layout.html.slim similarity index 100% rename from lib/rails/generators/alchemy/site_layouts/templates/layout.html.slim rename to lib/generators/alchemy/site_layouts/templates/layout.html.slim diff --git a/lib/rails/generators/alchemy/views/views_generator.rb b/lib/generators/alchemy/views/views_generator.rb similarity index 77% rename from lib/rails/generators/alchemy/views/views_generator.rb rename to lib/generators/alchemy/views/views_generator.rb index a9750a87ef..edb7952008 100644 --- a/lib/rails/generators/alchemy/views/views_generator.rb +++ b/lib/generators/alchemy/views/views_generator.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require 'rails' +require "rails" module Alchemy module Generators @@ -22,17 +22,17 @@ class ViewsGenerator < ::Rails::Generators::Base def copy_alchemy_views views_to_copy.each do |dir| - directory dir, Rails.root.join('app/views/alchemy', dir) + directory dir, Rails.root.join("app/views/alchemy", dir) end end private def views_to_copy - if @options['except'] - ALCHEMY_VIEWS - @options['except'] - elsif @options['only'] - ALCHEMY_VIEWS.select { |v| @options['only'].include?(v) } + if @options["except"] + ALCHEMY_VIEWS - @options["except"] + elsif @options["only"] + ALCHEMY_VIEWS.select { |v| @options["only"].include?(v) } else ALCHEMY_VIEWS end diff --git a/lib/rails/generators/alchemy/install/install_generator.rb b/lib/rails/generators/alchemy/install/install_generator.rb deleted file mode 100644 index 17598238ca..0000000000 --- a/lib/rails/generators/alchemy/install/install_generator.rb +++ /dev/null @@ -1,65 +0,0 @@ -# frozen_string_literal: true -require 'rails' - -module Alchemy - module Generators - class InstallGenerator < ::Rails::Generators::Base - desc "Installs Alchemy into your App." - - class_option :skip_demo_files, - type: :boolean, - default: false, - desc: "Skip creation of demo element, page and application layout." - - source_root File.expand_path('files', __dir__) - - def copy_config - copy_file "#{config_path}/config.yml", "config/alchemy/config.yml" - end - - def copy_yml_files - %w(elements page_layouts menus).each do |file| - template "#{__dir__}/templates/#{file}.yml.tt", "config/alchemy/#{file}.yml" - end - end - - def install_assets - copy_file "all.js", "vendor/assets/javascripts/alchemy/admin/all.js" - copy_file "all.css", "vendor/assets/stylesheets/alchemy/admin/all.css" - end - - def copy_demo_views - return if @options[:skip_demo_files] - - copy_file "application.html.erb", "app/views/layouts/application.html.erb" - copy_file "article.scss", "app/assets/stylesheets/alchemy/elements/article.scss" - - stylesheet_require = " *= require_tree ./alchemy/elements\n" - if File.exist?("app/assets/stylesheets/application.css") - insert_into_file "app/assets/stylesheets/application.css", stylesheet_require, - before: " */" - else - create_file "app/assets/stylesheets/application.css", "/*\n#{stylesheet_require} */\n" - end - - copy_file "_article.html.erb", "app/views/alchemy/elements/_article.html.erb" - copy_file "_standard.html.erb", "app/views/alchemy/page_layouts/_standard.html.erb" - copy_file "alchemy.en.yml", "config/locales/alchemy.en.yml" - end - - def copy_dragonfly_config - template "#{__dir__}/templates/dragonfly.rb.tt", "config/initializers/dragonfly.rb" - end - - def install_gutentag_migrations - rake 'gutentag:install:migrations' - end - - private - - def config_path - @_config_path ||= File.expand_path('../../../../../config/alchemy', __dir__) - end - end - end -end diff --git a/lib/tasks/alchemy/convert.rake b/lib/tasks/alchemy/convert.rake deleted file mode 100644 index 2ae48e28e6..0000000000 --- a/lib/tasks/alchemy/convert.rake +++ /dev/null @@ -1,38 +0,0 @@ -# frozen_string_literal: true -namespace :alchemy do - namespace :convert do - namespace :urlnames do - desc "Converts the urlname of all pages to nested url paths." - task to_nested: [:environment] do - unless Alchemy::Config.get(:url_nesting) - raise "\nURL nesting is disabled! Please enable url_nesting in `config/alchemy/config.yml` first.\n\n" - end - - puts "Converting..." - pages = Alchemy::Page.contentpages - count = pages.count - pages.each_with_index do |page, n| - puts "Updating page #{n + 1} of #{count}" - page.update_urlname! - end - puts "Done." - end - - desc "Converts the urlname of all pages to contain the slug only." - task to_slug: [:environment] do - if Alchemy::Config.get(:url_nesting) - raise "\nURL nesting is enabled! Please disable url_nesting in `config/alchemy/config.yml` first.\n\n" - end - - puts "Converting..." - pages = Alchemy::Page.contentpages - count = pages.count - pages.each_with_index do |page, n| - puts "Updating page #{n + 1} of #{count}" - page.update_attribute :urlname, page.slug - end - puts "Done." - end - end - end -end diff --git a/lib/tasks/alchemy/db.rake b/lib/tasks/alchemy/db.rake index 3dab98e15a..d5c2b07af7 100644 --- a/lib/tasks/alchemy/db.rake +++ b/lib/tasks/alchemy/db.rake @@ -1,10 +1,9 @@ # frozen_string_literal: true -require 'alchemy/seeder' +require "alchemy/seeder" namespace :alchemy do namespace :db do - desc "Seeds the database with Alchemy defaults" task seed: [:environment] do Alchemy::Seeder.seed! diff --git a/lib/tasks/alchemy/install.rake b/lib/tasks/alchemy/install.rake index 27fd3d62ff..c84a2433cd 100644 --- a/lib/tasks/alchemy/install.rake +++ b/lib/tasks/alchemy/install.rake @@ -1,5 +1,5 @@ # frozen_string_literal: true -require 'thor' +require "thor" class Alchemy::InstallTask < Thor include Thor::Actions @@ -30,7 +30,7 @@ end namespace :alchemy do desc "Installs Alchemy CMS into your app." - task :install do + task install: "alchemy:yarn:install" do install_helper = Alchemy::InstallTask.new puts "\nAlchemy Installer" diff --git a/lib/tasks/alchemy/tidy.rake b/lib/tasks/alchemy/tidy.rake index 856ab588f4..29b390d026 100644 --- a/lib/tasks/alchemy/tidy.rake +++ b/lib/tasks/alchemy/tidy.rake @@ -1,13 +1,13 @@ # frozen_string_literal: true -require 'alchemy/tasks/tidy' +require "alchemy/tasks/tidy" namespace :alchemy do namespace :tidy do desc "Tidy up Alchemy database." task :up do - Rake::Task['alchemy:tidy:element_positions'].invoke - Rake::Task['alchemy:tidy:content_positions'].invoke - Rake::Task['alchemy:tidy:remove_orphaned_records'].invoke + Rake::Task["alchemy:tidy:element_positions"].invoke + Rake::Task["alchemy:tidy:content_positions"].invoke + Rake::Task["alchemy:tidy:remove_orphaned_records"].invoke end desc "Fixes element positions." @@ -22,8 +22,8 @@ namespace :alchemy do desc "Remove orphaned records (elements & contents)." task remove_orphaned_records: [:environment] do - Rake::Task['alchemy:tidy:remove_orphaned_elements'].invoke - Rake::Task['alchemy:tidy:remove_orphaned_contents'].invoke + Rake::Task["alchemy:tidy:remove_orphaned_elements"].invoke + Rake::Task["alchemy:tidy:remove_orphaned_contents"].invoke end desc "Remove orphaned elements." @@ -40,7 +40,7 @@ namespace :alchemy do task elements_usage: :environment do puts "\n" removable_elements = [] - names = Alchemy::Element.definitions.map { |e| e['name'] } + names = Alchemy::Element.definitions.map { |e| e["name"] } longest_name = names.max_by { |name| name.to_s.length }.length + 1 names.sort.each do |name| names = Alchemy::Element.where(name: name) @@ -49,7 +49,7 @@ namespace :alchemy do if count.zero? removable_elements.push(name) else - spacer = ' ' * (longest_name - name.length) + spacer = " " * (longest_name - name.length) puts "#{name}#{spacer}is used\t#{count}\ttime(s) on\t#{page_count}\tpublic page(s)" end end diff --git a/lib/tasks/alchemy/upgrade.rake b/lib/tasks/alchemy/upgrade.rake index ccf58bed5e..45c134dcc8 100644 --- a/lib/tasks/alchemy/upgrade.rake +++ b/lib/tasks/alchemy/upgrade.rake @@ -1,28 +1,27 @@ # frozen_string_literal: true -require 'alchemy/upgrader' -require 'alchemy/version' +require "alchemy/upgrader" +require "alchemy/version" namespace :alchemy do desc "Upgrades your app to AlchemyCMS v#{Alchemy::VERSION}." task upgrade: [ - 'alchemy:upgrade:prepare' + "alchemy:upgrade:prepare", + "alchemy:upgrade:5.0:run", ] do Alchemy::Upgrader.display_todos end namespace :upgrade do - desc 'Alchemy Upgrader: Prepares the database and updates Alchemys configuration file.' + desc "Alchemy Upgrader: Prepares the database and updates Alchemys configuration file." task prepare: [ - 'alchemy:upgrade:database', - 'alchemy:upgrade:config' + "alchemy:upgrade:database", + "alchemy:upgrade:config", ] desc "Alchemy Upgrader: Prepares the database." task database: [ - 'alchemy:upgrade:5.0:install_gutentag_migrations', - 'alchemy:install:migrations', - 'db:migrate', - 'alchemy:db:seed' + "alchemy:install:migrations", + "db:migrate", ] desc "Alchemy Upgrader: Copy configuration file." @@ -30,18 +29,35 @@ namespace :alchemy do Alchemy::Upgrader.copy_new_config_file end - desc 'Upgrade Alchemy to v5.0' - task '5.0' => [ - 'alchemy:upgrade:prepare' + desc "Upgrade Alchemy to v5.0" + task "5.0" => [ + "alchemy:upgrade:prepare", + "alchemy:upgrade:5.0:run", ] do Alchemy::Upgrader.display_todos end - namespace '5.0' do - desc 'Install Gutentag migrations' + namespace "5.0" do + task "run" => [ + "alchemy:upgrade:5.0:install_gutentag_migrations", + "alchemy:upgrade:5.0:remove_layout_roots", + "alchemy:upgrade:5.0:remove_root_page", + ] + + desc "Install Gutentag migrations" task install_gutentag_migrations: [:environment] do Alchemy::Upgrader::FivePointZero.install_gutentag_migrations end + + desc "Remove layout root pages" + task remove_layout_roots: [:environment] do + Alchemy::Upgrader::FivePointZero.remove_layout_roots + end + + desc "Remove root page" + task remove_root_page: [:environment] do + Alchemy::Upgrader::FivePointZero.remove_root_page + end end end end diff --git a/package.json b/package.json new file mode 100644 index 0000000000..c5150b560e --- /dev/null +++ b/package.json @@ -0,0 +1,45 @@ +{ + "name": "@alchemy_cms/admin", + "version": "0.2.0", + "description": "AlchemyCMS", + "browser": "package/admin.js", + "files": [ + "package/**/*" + ], + "directories": { + "lib": "package" + }, + "scripts": { + "test": "jest" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/AlchemyCMS/alchemy_cms.git" + }, + "keywords": [], + "author": "Thomas von Deyen", + "license": "BSD-3-Clause", + "bugs": { + "url": "https://github.com/AlchemyCMS/alchemy_cms/issues" + }, + "homepage": "https://github.com/AlchemyCMS/alchemy_cms#readme", + "dependencies": { + "sortablejs": "^1.10.2" + }, + "devDependencies": { + "@babel/core": "^7.9.6", + "@babel/preset-env": "^7.9.6", + "babel-jest": "^26.0.1", + "jest": "^25.2.7", + "prettier": "^2.0.2", + "xhr-mock": "^2.5.1" + }, + "jest": { + "globals": { + "Alchemy": {} + }, + "roots": [ + "package" + ] + } +} diff --git a/package/admin.js b/package/admin.js new file mode 100644 index 0000000000..ac4cdad839 --- /dev/null +++ b/package/admin.js @@ -0,0 +1,14 @@ +import translate from "./src/i18n" +import NodeTree from "./src/node_tree" + +// Global Alchemy object +if (typeof window.Alchemy === "undefined") { + window.Alchemy = {} +} + +// Enhance the global Alchemy object with imported features +Object.assign(Alchemy, { + // Global utility method for translating a given string + t: translate, + NodeTree +}) diff --git a/package/src/__tests__/i18n.spec.js b/package/src/__tests__/i18n.spec.js new file mode 100644 index 0000000000..0f2ffbbeae --- /dev/null +++ b/package/src/__tests__/i18n.spec.js @@ -0,0 +1,70 @@ +import translate from "../i18n" + +describe("translate", () => { + describe("if Alchemy.locale is not set", () => { + it("Throws an error", () => { + expect(() => { + translate("help") + }).toThrow("Alchemy.locale is not set") + }) + }) + + describe("if Alchemy.locale is set to a known locale", () => { + beforeEach(() => { + Alchemy.locale = "en" + }) + + describe("if translation is present", () => { + it("Returns translated string", () => { + expect(translate("help")).toEqual("Help") + }) + + describe("if key includes a period", () => { + describe("that is translated", () => { + it("splits into group", () => { + expect(translate("formats.date")).toEqual("Y-m-d") + }) + }) + + describe("that is not translated", () => { + it("returns key", () => { + expect(translate("formats.lala")).toEqual("formats.lala") + }) + }) + + describe("that has unknown group", () => { + it("returns key", () => { + expect(translate("foo.bar")).toEqual("foo.bar") + }) + }) + }) + + describe("if replacement is given", () => { + it("replaces it", () => { + expect(translate("allowed_chars", 5)).toEqual("of 5 chars") + }) + }) + }) + + describe("if translation is not present", () => { + it("Returns passed string", () => { + expect(translate("foo")).toEqual("foo") + }) + }) + }) + + describe("if Alchemy.locale is set to a unknown locale", () => { + beforeEach(() => { + Alchemy.locale = "kl" + }) + + it("Returns passed string and logs a warning", () => { + const spy = jest.spyOn(console, "warn").mockImplementation(() => {}) + expect(translate("help")).toEqual("help") + expect(spy.mock.calls).toEqual([ + ["Translations for locale kl not found!"] + ]) + spy.mockRestore() + }) + }) +}) diff --git a/package/src/i18n.js b/package/src/i18n.js new file mode 100644 index 0000000000..a96bca74cb --- /dev/null +++ b/package/src/i18n.js @@ -0,0 +1,48 @@ +import translationData from "./translations" + +const KEY_SEPARATOR = /\./ + +function currentLocale() { + if (Alchemy.locale == null) { + throw "Alchemy.locale is not set! Please set Alchemy.locale to a locale string in order to translate something." + } + return Alchemy.locale +} + +function getTranslations() { + const locale = currentLocale() + const translations = translationData[locale] + + if (translations) { + return translations + } + console.warn(`Translations for locale ${locale} not found!`) + return {} +} + +function nestedTranslation(translations, key) { + const keys = key.split(KEY_SEPARATOR) + const group = translations[keys[0]] + if (group) { + return group[keys[1]] || key + } + return key +} + +function getTranslation(key) { + const translations = getTranslations() + + if (KEY_SEPARATOR.test(key)) { + return nestedTranslation(translations, key) + } + return translations[key] || key +} + +export default function translate(key, replacement) { + let translation = getTranslation(key) + + if (replacement) { + return translation.replace(/%\{.+\}/, replacement) + } + return translation +} diff --git a/package/src/node_tree.js b/package/src/node_tree.js new file mode 100644 index 0000000000..f44447c9cf --- /dev/null +++ b/package/src/node_tree.js @@ -0,0 +1,72 @@ +import Sortable from "sortablejs" +import ajax from "./utils/ajax" +import { on } from "./utils/events" + +function displayNodeFolders() { + document.querySelectorAll("li.menu-item").forEach((el) => { + const leftIconArea = el.querySelector(".nodes_tree-left_images") + const list = el.querySelector(".children") + const node = { folded: el.dataset.folded === "true", id: el.dataset.id } + + if (list.children.length > 0 || node.folded) { + leftIconArea.innerHTML = HandlebarsTemplates.node_folder({ node: node }) + } else { + leftIconArea.innerHTML = " " + } + }) +} + +function onFinishDragging(evt) { + const url = Alchemy.routes.move_api_node_path(evt.item.dataset.id) + const data = { + target_parent_id: evt.to.dataset.nodeId, + new_position: evt.newIndex + } + + ajax("PATCH", url, data) + .then(() => { + const message = Alchemy.t("Successfully moved menu item") + Alchemy.growl(message) + displayNodeFolders() + }) + .catch((error) => { + Alchemy.growl(error.message || error, "error") + }) +} + +function handleNodeFolders() { + on("click", ".nodes_tree", ".node_folder", function () { + const nodeId = this.dataset.nodeId + const menu_item = this.closest("li.menu-item") + const url = Alchemy.routes.toggle_folded_api_node_path(nodeId) + const list = menu_item.querySelector(".children") + + ajax("PATCH", url) + .then(() => { + list.classList.toggle("folded") + menu_item.dataset.folded = + menu_item.dataset.folded == "true" ? "false" : "true" + displayNodeFolders() + }) + .catch((error) => { + Alchemy.growl(error.message || error) + }) + }) +} + +export default function NodeTree() { + handleNodeFolders() + displayNodeFolders() + + document.querySelectorAll(".nodes_tree ul.children").forEach((el) => { + new Sortable(el, { + group: "nodes", + animation: 150, + fallbackOnBody: true, + swapThreshold: 0.65, + handle: ".node_name", + invertSwap: true, + onEnd: onFinishDragging + }) + }) +} diff --git a/package/src/translations.js b/package/src/translations.js new file mode 100644 index 0000000000..602e29fee7 --- /dev/null +++ b/package/src/translations.js @@ -0,0 +1,32 @@ +const translations = { + en: { + allowed_chars: "of %{count} chars", + cancel: "Cancel", + cancelled: "Cancelled", + click_to_edit: "click to edit", + complete: "Complete", + element_dirty_notice: + "This element has unsaved changes. Do you really want to fold it?", + help: "Help", + ok: "Ok", + page_dirty_notice: + "You have unsaved changes on this page. They will be lost if you continue.", + page_found: "Page found", + pages_found: "Pages found", + url_validation_failed: "The url has no valid format.", + warning: "Warning!", + "File is too large": "File is too large", + "File is too small": "File is too small", + "File type not allowed": "File type not allowed", + "Maximum number of files exceeded": "Maximum number of files exceeded.", + "Uploaded bytes exceed file size": "Uploaded bytes exceed file size", + formats: { + datetime: "Y-m-d H:i", + date: "Y-m-d", + time: "H:i", + time_24hr: false + } + } +} + +export default translations diff --git a/package/src/utils/__tests__/ajax.spec.js b/package/src/utils/__tests__/ajax.spec.js new file mode 100644 index 0000000000..52f3077e0b --- /dev/null +++ b/package/src/utils/__tests__/ajax.spec.js @@ -0,0 +1,124 @@ +import xhrMock from "xhr-mock" +import ajax from "../ajax" + +const token = "s3cr3t" + +beforeEach(() => { + document.head.innerHTML = `` + xhrMock.setup() +}) + +describe("ajax('get')", () => { + it("sends X-CSRF-TOKEN header", async () => { + xhrMock.get("/users", (req, res) => { + expect(req.header("X-CSRF-TOKEN")).toEqual(token) + return res.status(200).body('{"message":"Ok"}') + }) + await ajax("get", "/users") + }) + + it("sends Content-Type header", async () => { + xhrMock.get("/users", (req, res) => { + expect(req.header("Content-Type")).toEqual( + "application/json; charset=utf-8" + ) + return res.status(200).body('{"message":"Ok"}') + }) + await ajax("get", "/users") + }) + + it("sends Accept header", async () => { + xhrMock.get("/users", (req, res) => { + expect(req.header("Accept")).toEqual("application/json") + return res.status(200).body('{"message":"Ok"}') + }) + await ajax("get", "/users") + }) + + it("returns JSON", async () => { + xhrMock.get("/users", (_req, res) => { + return res.status(200).body('{"email":"mail@example.com"}') + }) + await ajax("get", "/users").then((res) => { + expect(res.data).toEqual({ email: "mail@example.com" }) + }) + }) + + it("JSON parse errors get rejected", async () => { + xhrMock.get("/users", (_req, res) => { + return res.status(200).body('email => "mail@example.com"') + }) + expect.assertions(1) + await ajax("get", "/users").catch((e) => { + expect(e.message).toMatch("Unexpected token") + }) + }) + + it("network errors get rejected", async () => { + xhrMock.get("/users", () => { + return Promise.reject(new Error()) + }) + expect.assertions(1) + await ajax("get", "/users").catch((e) => { + expect(e.message).toEqual("An error occurred during the transaction") + }) + }) + + it("server errors get rejected", async () => { + xhrMock.get("/users", (_req, res) => { + return res.status(401).body('{"error":"Unauthorized"}') + }) + expect.assertions(1) + await ajax("get", "/users").catch((e) => { + expect(e.error).toEqual("Unauthorized") + }) + }) + + it("server errors parsing errors get rejected", async () => { + xhrMock.get("/users", (_req, res) => { + return res.status(401).body("Unauthorized") + }) + expect.assertions(1) + await ajax("get", "/users").catch((e) => { + expect(e.message).toMatch("Unexpected token") + }) + }) +}) + +describe("ajax('post')", () => { + it("sends X-CSRF-TOKEN header", async () => { + xhrMock.post("/users", (req, res) => { + expect(req.header("X-CSRF-TOKEN")).toEqual(token) + return res.status(200).body('{"message":"Ok"}') + }) + await ajax("post", "/users") + }) + + it("sends Content-Type header", async () => { + xhrMock.post("/users", (req, res) => { + expect(req.header("Content-Type")).toEqual( + "application/json; charset=utf-8" + ) + return res.status(200).body('{"message":"Ok"}') + }) + await ajax("post", "/users") + }) + + it("sends Accept header", async () => { + xhrMock.post("/users", (req, res) => { + expect(req.header("Accept")).toEqual("application/json") + return res.status(200).body('{"message":"Ok"}') + }) + await ajax("post", "/users") + }) + + it("sends JSON data", async () => { + xhrMock.post("/users", (req, res) => { + expect(req.body()).toEqual('{"email":"mail@example.com"}') + return res.status(200).body('{"message":"Ok"}') + }) + await ajax("post", "/users", { email: "mail@example.com" }) + }) +}) + +afterEach(() => xhrMock.teardown()) diff --git a/package/src/utils/__tests__/events.spec.js b/package/src/utils/__tests__/events.spec.js new file mode 100644 index 0000000000..e9b56634eb --- /dev/null +++ b/package/src/utils/__tests__/events.spec.js @@ -0,0 +1,38 @@ +import { on } from "../events" + +describe("on", () => { + const callback = jest.fn() + + beforeEach(() => { + document.body.innerHTML = ` +
        +
      • One
        • +
      • Two
        • +
      + ` + }) + + it("adds event listener to base node", () => { + const baseNode = document.querySelector(".list") + const spy = jest.spyOn(baseNode, "addEventListener") + on("click", ".list", ".item", callback) + expect(spy).toHaveBeenCalledWith("click", expect.any(Function)) + spy.mockReset() + }) + + it("event triggered on matching child node calls callback", () => { + const childNode = document.querySelector(".first.item") + on("click", ".list", ".item", callback) + childNode.click() + expect(callback).toHaveBeenCalledWith(expect.any(MouseEvent)) + }) + + it("event triggered on child of registered target still calls callback", () => { + const child = document.querySelector(".first.item span") + on("click", ".list", ".item", callback) + child.click() + expect(callback).toHaveBeenCalledWith(expect.any(MouseEvent)) + }) + + afterEach(() => callback.mockReset()) +}) diff --git a/package/src/utils/ajax.js b/package/src/utils/ajax.js new file mode 100644 index 0000000000..3266a7a4ad --- /dev/null +++ b/package/src/utils/ajax.js @@ -0,0 +1,48 @@ +function buildPromise(xhr) { + return new Promise((resolve, reject) => { + xhr.onload = () => { + if (xhr.status >= 200 && xhr.status < 400) { + try { + resolve({ + data: JSON.parse(xhr.responseText), + status: xhr.status + }) + } catch (error) { + reject(error) + } + } else { + try { + reject(JSON.parse(xhr.responseText)) + } catch (error) { + reject(error) + } + } + } + xhr.onerror = () => { + reject(new Error("An error occurred during the transaction")) + } + }) +} + +function getToken() { + const metaTag = document.querySelector('meta[name="csrf-token"]') + return metaTag.attributes.content.textContent +} + +export default function ajax(method, url, data) { + const xhr = new XMLHttpRequest() + const promise = buildPromise(xhr) + + xhr.open(method, url) + xhr.setRequestHeader("Content-type", "application/json; charset=utf-8") + xhr.setRequestHeader("Accept", "application/json") + xhr.setRequestHeader("X-CSRF-Token", getToken()) + + if (data) { + xhr.send(JSON.stringify(data)) + } else { + xhr.send() + } + + return promise +} diff --git a/package/src/utils/events.js b/package/src/utils/events.js new file mode 100644 index 0000000000..8d085ae993 --- /dev/null +++ b/package/src/utils/events.js @@ -0,0 +1,16 @@ +export function on(eventName, baseSelector, targetSelector, callback) { + document.querySelectorAll(baseSelector).forEach((baseNode) => { + baseNode.addEventListener(eventName, (evt) => { + const targets = Array.from(baseNode.querySelectorAll(targetSelector)) + let currentNode = evt.target + + while (currentNode !== baseNode) { + if (targets.includes(currentNode)) { + callback.call(currentNode, evt) + return + } + currentNode = currentNode.parentElement + } + }) + }) +} diff --git a/spec/controllers/alchemy/admin/attachments_controller_spec.rb b/spec/controllers/alchemy/admin/attachments_controller_spec.rb index 8ec06a7697..3a6a697cd1 100644 --- a/spec/controllers/alchemy/admin/attachments_controller_spec.rb +++ b/spec/controllers/alchemy/admin/attachments_controller_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Admin::AttachmentsController do @@ -10,8 +10,8 @@ module Alchemy let(:file) do fixture_file_upload( - File.expand_path('../../../fixtures/500x500.png', __dir__), - 'image/png' + File.expand_path("../../../fixtures/500x500.png", __dir__), + "image/png", ) end @@ -28,7 +28,7 @@ module Alchemy context "when params[:tagged_with] is set" do it "should filter the records by tags" do expect(Attachment).to receive(:tagged_with).and_return(Attachment.all) - get :index, params: {tagged_with: "pdf"} + get :index, params: { tagged_with: "pdf" } end end @@ -38,8 +38,8 @@ module Alchemy context "is set" do it "it renders the archive_overlay partial" do expect(Content).to receive(:find_by).and_return(content) - get :index, params: {content_id: content.id} - expect(response).to render_template(partial: '_archive_overlay') + get :index, params: { content_id: content.id } + expect(response).to render_template(partial: "_archive_overlay") expect(assigns(:content)).to eq(content) end end @@ -52,17 +52,17 @@ module Alchemy end end - describe 'file_type filter' do + describe "file_type filter" do let!(:png) { create(:alchemy_attachment) } let!(:jpg) do create :alchemy_attachment, - file: File.new(File.expand_path('../../../fixtures/image3.jpeg', __dir__)) + file: File.new(File.expand_path("../../../fixtures/image3.jpeg", __dir__)) end - context 'with params[:file_type]' do - it 'loads only attachments with matching content type' do - get :index, params: {file_type: 'image/jpeg'} + context "with params[:file_type]" do + it "loads only attachments with matching content type" do + get :index, params: { file_type: "image/jpeg" } expect(assigns(:attachments).to_a).to eq([jpg]) expect(assigns(:attachments).to_a).to_not eq([png]) end @@ -70,46 +70,46 @@ module Alchemy end end - describe '#show' do + describe "#show" do before do expect(Attachment).to receive(:find).and_return(attachment) end it "renders the show template" do - get :show, params: {id: attachment.id} + get :show, params: { id: attachment.id } expect(response).to render_template(:show) end end - describe '#create' do + describe "#create" do subject { post :create, params: params } - context 'with passing validations' do - let(:params) { {attachment: {file: file}} } + context "with passing validations" do + let(:params) { { attachment: { file: file } } } it "renders json response with success message" do subject - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") expect(response.status).to eq(201) json = JSON.parse(response.body) - expect(json).to have_key('growl_message') - expect(json).to have_key('files') + expect(json).to have_key("growl_message") + expect(json).to have_key("files") end end - context 'with failing validations' do - include_context 'with invalid file' + context "with failing validations" do + include_context "with invalid file" - let(:params) { {attachment: {file: invalid_file}} } + let(:params) { { attachment: { file: invalid_file } } } - it_behaves_like 'having a json uploader error message' + it_behaves_like "having a json uploader error message" end end - describe '#update' do + describe "#update" do let(:params) do { - id: attachment.id, attachment: {name: ''} + id: attachment.id, attachment: { name: "" }, } end @@ -122,25 +122,25 @@ module Alchemy context "when file is passed" do let(:file) do fixture_file_upload( - File.expand_path('../../../fixtures/image2.PNG', __dir__), - 'image/png' + File.expand_path("../../../fixtures/image2.PNG", __dir__), + "image/png", ) end - context 'with passing validations' do + context "with passing validations" do let(:params) do { - id: attachment.id, attachment: {file: file} + id: attachment.id, attachment: { file: file }, } end it "renders json response with success message" do subject - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") expect(response.status).to eq(202) json = JSON.parse(response.body) - expect(json).to have_key('growl_message') - expect(json).to have_key('files') + expect(json).to have_key("growl_message") + expect(json).to have_key("files") end it "replaces the file" do @@ -149,25 +149,25 @@ module Alchemy end end - context 'with passing validations' do + context "with passing validations" do it "redirects to index path" do is_expected.to redirect_to admin_attachments_path end - context 'with search params' do + context "with search params" do let(:search_filter_params) do { - q: {name_or_file_name_cont: 'kitten'}, - tagged_with: 'cute', - file_type: 'pdf', - page: 2 + q: { name_or_file_name_cont: "kitten" }, + tagged_with: "cute", + file_type: "pdf", + page: 2, } end subject do put :update, params: { - id: attachment.id, attachment: {name: ''} - }.merge(search_filter_params) + id: attachment.id, attachment: { name: "" }, + }.merge(search_filter_params) end it "passes them along" do @@ -176,8 +176,8 @@ module Alchemy end end - context 'with failing validations' do - include_context 'with invalid file' + context "with failing validations" do + include_context "with invalid file" it "renders edit form" do is_expected.to render_template(:edit) @@ -185,33 +185,33 @@ module Alchemy end end - describe '#destroy' do + describe "#destroy" do before do expect(Attachment).to receive(:find).and_return(attachment) end it "destroys the attachment and sets a success message" do expect(attachment).to receive(:destroy) - delete :destroy, params: {id: 1}, xhr: true + delete :destroy, params: { id: 1 }, xhr: true expect(assigns(:attachment)).to eq(attachment) expect(assigns(:url)).not_to be_blank expect(flash[:notice]).not_to be_blank end - context 'with search params' do + context "with search params" do let(:search_filter_params) do { - q: {name_or_file_name_cont: 'kitten'}, - tagged_with: 'cute', - file_type: 'pdf', - page: 2 + q: { name_or_file_name_cont: "kitten" }, + tagged_with: "cute", + file_type: "pdf", + page: 2, } end it "passes them along" do expect(attachment).to receive(:destroy) { true } - delete :destroy, params: {id: 1}.merge(search_filter_params), xhr: true - expect(assigns(:url)).to eq admin_attachments_url(search_filter_params.merge(host: 'test.host')) + delete :destroy, params: { id: 1 }.merge(search_filter_params), xhr: true + expect(assigns(:url)).to eq admin_attachments_url(search_filter_params.merge(host: "test.host")) end end end @@ -222,8 +222,8 @@ module Alchemy end it "sends the file as download" do - get :download, params: {id: attachment.id} - expect(response.headers['Content-Disposition']).to match(/attachment/) + get :download, params: { id: attachment.id } + expect(response.headers["Content-Disposition"]).to match(/attachment/) end end end diff --git a/spec/controllers/alchemy/admin/base_controller_spec.rb b/spec/controllers/alchemy/admin/base_controller_spec.rb index 861319d2e9..cce76cd11a 100644 --- a/spec/controllers/alchemy/admin/base_controller_spec.rb +++ b/spec/controllers/alchemy/admin/base_controller_spec.rb @@ -1,38 +1,38 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" describe Alchemy::Admin::BaseController do - describe '#raise_exception?' do + describe "#raise_exception?" do subject { controller.send(:raise_exception?) } - context 'in test mode' do + context "in test mode" do before { expect(Rails.env).to receive(:test?).and_return true } it { is_expected.to be_truthy } end - context 'not in test mode' do + context "not in test mode" do before { expect(Rails.env).to receive(:test?).and_return false } it { is_expected.to be_falsey } - context 'and in page preview' do + context "and in page preview" do before { expect(controller).to receive(:is_page_preview?).and_return true } it { is_expected.to be_truthy } end - context 'and not in page preview' do + context "and not in page preview" do before { expect(controller).to receive(:is_page_preview?).and_return false } it { is_expected.to be_falsey } end end end - describe '#set_translation' do - context 'with unavailable locale in the session' do + describe "#set_translation" do + context "with unavailable locale in the session" do before do allow(I18n).to receive(:default_locale) { :es } allow(I18n).to receive(:available_locales) { [:es] } - allow(controller).to receive(:session) { { alchemy_locale: 'kl'} } + allow(controller).to receive(:session) { { alchemy_locale: "kl"} } end it "sets I18n.locale to the default locale" do @@ -42,27 +42,27 @@ end end - describe '#is_page_preview?' do + describe "#is_page_preview?" do subject { controller.send(:is_page_preview?) } it { is_expected.to be_falsey } - context 'is pages controller and show action' do + context "is pages controller and show action" do before do - expect(controller).to receive(:controller_path).and_return('alchemy/admin/pages') - expect(controller).to receive(:action_name).and_return('show') + expect(controller).to receive(:controller_path).and_return("alchemy/admin/pages") + expect(controller).to receive(:action_name).and_return("show") end it { is_expected.to be_truthy } end end - context 'when current_alchemy_user is present' do - let!(:page_1) { create(:alchemy_page, name: 'Page 1') } - let!(:page_2) { create(:alchemy_page, name: 'Page 2') } + context "when current_alchemy_user is present" do + let!(:page_1) { create(:alchemy_page, name: "Page 1") } + let!(:page_2) { create(:alchemy_page, name: "Page 2") } let(:user) { create(:alchemy_dummy_user, :as_admin) } - context 'and she has locked pages' do + context "and she has locked pages" do before do allow(controller).to receive(:current_alchemy_user) { user } [page_1, page_2].each_with_index do |p, i| @@ -70,9 +70,9 @@ end end - it 'loads locked pages ordered by locked_at date' do + it "loads locked pages ordered by locked_at date" do controller.send(:load_locked_pages) - expect(assigns(:locked_pages).pluck(:name)).to eq(['Page 2', 'Page 1']) + expect(assigns(:locked_pages).pluck(:name)).to eq(["Page 2", "Page 1"]) end end end diff --git a/spec/controllers/alchemy/admin/clipboard_controller_spec.rb b/spec/controllers/alchemy/admin/clipboard_controller_spec.rb index 09b90b81d5..c9f57d8dc7 100644 --- a/spec/controllers/alchemy/admin/clipboard_controller_spec.rb +++ b/spec/controllers/alchemy/admin/clipboard_controller_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Admin::ClipboardController do @@ -15,47 +15,47 @@ module Alchemy session[:alchemy_clipboard] = {} end - describe '#index' do - context 'with `remarkable_type` being an allowed type' do - it 'is successful' do - get :index, params: {remarkable_type: 'elements'} + describe "#index" do + context "with `remarkable_type` being an allowed type" do + it "is successful" do + get :index, params: {remarkable_type: "elements"} expect(response).to be_successful end end - context 'with `remarkable_type` not an allowed type' do - it 'raises 400 Bad Request' do + context "with `remarkable_type` not an allowed type" do + it "raises 400 Bad Request" do expect { - get :index, params: {remarkable_type: 'evil'} + get :index, params: {remarkable_type: "evil"} }.to raise_error(ActionController::BadRequest) end end end - context 'for elements' do + context "for elements" do before do expect(Element).to receive(:find).and_return(element) end describe "#insert" do it "should hold element ids" do - post :insert, params: {remarkable_type: 'elements', remarkable_id: element.id}, xhr: true - expect(session[:alchemy_clipboard]['elements']).to eq([{'id' => element.id.to_s, 'action' => 'copy'}]) + post :insert, params: {remarkable_type: "elements", remarkable_id: element.id}, xhr: true + expect(session[:alchemy_clipboard]["elements"]).to eq([{"id" => element.id.to_s, "action" => "copy"}]) end it "should not have the same element twice" do - session[:alchemy_clipboard]['elements'] = [{'id' => element.id.to_s, 'action' => 'copy'}] - post :insert, params: {remarkable_type: 'elements', remarkable_id: element.id}, xhr: true - expect(session[:alchemy_clipboard]['elements'].collect { |e| e['id'] }).not_to eq([element.id, element.id]) + session[:alchemy_clipboard]["elements"] = [{"id" => element.id.to_s, "action" => "copy"}] + post :insert, params: {remarkable_type: "elements", remarkable_id: element.id}, xhr: true + expect(session[:alchemy_clipboard]["elements"].collect { |e| e["id"] }).not_to eq([element.id, element.id]) end end describe "#delete" do it "should remove element ids from clipboard" do - session[:alchemy_clipboard]['elements'] = [{'id' => element.id.to_s, 'action' => 'copy'}] - session[:alchemy_clipboard]['elements'] << {'id' => another_element.id.to_s, 'action' => 'copy'} - delete :remove, params: {remarkable_type: 'elements', remarkable_id: another_element.id}, xhr: true - expect(session[:alchemy_clipboard]['elements']).to eq([{'id' => element.id.to_s, 'action' => 'copy'}]) + session[:alchemy_clipboard]["elements"] = [{"id" => element.id.to_s, "action" => "copy"}] + session[:alchemy_clipboard]["elements"] << {"id" => another_element.id.to_s, "action" => "copy"} + delete :remove, params: {remarkable_type: "elements", remarkable_id: another_element.id}, xhr: true + expect(session[:alchemy_clipboard]["elements"]).to eq([{"id" => element.id.to_s, "action" => "copy"}]) end end end @@ -63,17 +63,17 @@ module Alchemy describe "#clear" do context "with elements as remarkable_type" do it "should clear the elements clipboard" do - session[:alchemy_clipboard]['elements'] = [{'id' => element.id.to_s}] - delete :clear, params: {remarkable_type: 'elements'}, xhr: true - expect(session[:alchemy_clipboard]['elements']).to be_empty + session[:alchemy_clipboard]["elements"] = [{"id" => element.id.to_s}] + delete :clear, params: {remarkable_type: "elements"}, xhr: true + expect(session[:alchemy_clipboard]["elements"]).to be_empty end end context "with pages as remarkable_type" do it "should clear the pages clipboard" do - session[:alchemy_clipboard]['pages'] = [{'id' => public_page.id.to_s}] - delete :clear, params: {remarkable_type: 'pages'}, xhr: true - expect(session[:alchemy_clipboard]['pages']).to be_empty + session[:alchemy_clipboard]["pages"] = [{"id" => public_page.id.to_s}] + delete :clear, params: {remarkable_type: "pages"}, xhr: true + expect(session[:alchemy_clipboard]["pages"]).to be_empty end end end diff --git a/spec/controllers/alchemy/admin/dashboard_controller_spec.rb b/spec/controllers/alchemy/admin/dashboard_controller_spec.rb index 2b4ca871f6..fb2861566c 100644 --- a/spec/controllers/alchemy/admin/dashboard_controller_spec.rb +++ b/spec/controllers/alchemy/admin/dashboard_controller_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Admin::DashboardController do @@ -10,14 +10,14 @@ module Alchemy before { authorize_user(user) } - describe '#index' do + describe "#index" do before do allow(Page).to receive(:from_current_site).and_return( double( all_last_edited_from: [], locked_by: [], - locked: [] - ) + locked: [], + ), ) end @@ -31,9 +31,9 @@ module Alchemy expect(assigns(:all_locked_pages)).to eq([]) end - context 'with user class having logged_in scope' do - context 'with other users online' do - let(:another_user) { mock_model('DummyUser') } + context "with user class having logged_in scope" do + context "with other users online" do + let(:another_user) { mock_model("DummyUser") } before do expect(Alchemy.user_class).to receive(:logged_in).and_return([another_user]) @@ -45,7 +45,7 @@ module Alchemy end end - context 'without other users online' do + context "without other users online" do it "does not assign @online_users" do get :index expect(assigns(:online_users)).to eq([]) @@ -53,7 +53,7 @@ module Alchemy end end - context 'user having signed in before' do + context "user having signed in before" do before do expect(user).to receive(:sign_in_count).and_return(5) expect(user).to receive(:last_sign_in_at).and_return(Time.current) @@ -71,22 +71,22 @@ module Alchemy end end - describe '#info' do + describe "#info" do it "assigns @alchemy_version with the current Alchemy version" do get :info expect(assigns(:alchemy_version)).to eq(Alchemy.version) end end - describe '#update_check' do + describe "#update_check" do before do WebMock.enable! end context "requesting rubygems.org" do before do - stub_request(:get, 'https://rubygems.org/api/v1/versions/alchemy_cms.json').to_return( - status: 200, body: '[{"number": "3.0.0.alpha"}, {"number": "2.6.0"}, {"number": "2.5.1"}]' + stub_request(:get, "https://rubygems.org/api/v1/versions/alchemy_cms.json").to_return( + status: 200, body: '[{"number": "3.0.0.alpha"}, {"number": "2.6.0"}, {"number": "2.5.1"}]', ) end @@ -97,8 +97,8 @@ module Alchemy it "should render 'false'" do get :update_check - expect(response.code).to eq('200') - expect(response.body).to eq('false') + expect(response.code).to eq("200") + expect(response.body).to eq("false") end end @@ -109,25 +109,25 @@ module Alchemy it "should render 'true'" do get :update_check - expect(response.code).to eq('200') - expect(response.body).to eq('true') + expect(response.code).to eq("200") + expect(response.body).to eq("true") end end end context "if rubygems.org is unavailable" do before do - stub_request(:get, 'https://rubygems.org/api/v1/versions/alchemy_cms.json').to_return(status: 503) - stub_request(:get, 'https://api.github.com/repos/AlchemyCMS/alchemy_cms/tags').to_return( - status: 200, body: '[{"name": "v2.6.0"}, {"name": "v2.5.0"}]' + stub_request(:get, "https://rubygems.org/api/v1/versions/alchemy_cms.json").to_return(status: 503) + stub_request(:get, "https://api.github.com/repos/AlchemyCMS/alchemy_cms/tags").to_return( + status: 200, body: '[{"name": "v2.6.0"}, {"name": "v2.5.0"}]', ) allow(Alchemy).to receive(:version).and_return("2.6.2") end it "should request github.com" do get :update_check - expect(response.code).to eq('200') - expect(response.body).to eq('false') + expect(response.code).to eq("200") + expect(response.body).to eq("false") end end @@ -138,7 +138,7 @@ module Alchemy it "should have status code 503" do get :update_check - expect(response.code).to eq('503') + expect(response.code).to eq("503") end end diff --git a/spec/controllers/alchemy/admin/elements_controller_spec.rb b/spec/controllers/alchemy/admin/elements_controller_spec.rb index 9ffc9e32a5..b87b39b2e7 100644 --- a/spec/controllers/alchemy/admin/elements_controller_spec.rb +++ b/spec/controllers/alchemy/admin/elements_controller_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Admin::ElementsController do @@ -13,14 +13,14 @@ module Alchemy before { authorize_user(:as_author) } - describe '#index' do + describe "#index" do let!(:alchemy_page) { create(:alchemy_page) } let!(:element) { create(:alchemy_element, page: alchemy_page) } let!(:trashed_element) { create(:alchemy_element, page: alchemy_page).tap(&:trash!) } let!(:nested_element) { create(:alchemy_element, :nested, page: alchemy_page) } let!(:hidden_element) { create(:alchemy_element, page: alchemy_page, public: false) } - context 'with fixed elements' do + context "with fixed elements" do let!(:fixed_element) do create(:alchemy_element, :fixed, page: alchemy_page) @@ -50,7 +50,7 @@ module Alchemy end end - describe '#order' do + describe "#order" do let(:element_1) { create(:alchemy_element) } let(:element_2) { create(:alchemy_element, page: page) } let(:element_3) { create(:alchemy_element, page: page) } @@ -62,8 +62,8 @@ module Alchemy expect(Element.all.pluck(:id)).to eq(element_ids) end - context 'with missing [:element_ids] param' do - it 'does not raise any error and silently rejects to order' do + context "with missing [:element_ids] param" do + it "does not raise any error and silently rejects to order" do expect { post :order, params: {page_id: page.id}, xhr: true }.to_not raise_error @@ -73,21 +73,21 @@ module Alchemy context "when nested inside parent element" do let(:parent) { create(:alchemy_element) } - it 'touches the cache key of parent element' do + it "touches the cache key of parent element" do expect(Element).to receive(:find_by) { parent } expect(parent).to receive(:touch) { true } post :order, params: { page_id: page.id, element_ids: element_ids, - parent_element_id: parent.id + parent_element_id: parent.id, }, xhr: true end - it 'assigns parent element id to each element' do + it "assigns parent element id to each element" do post :order, params: { page_id: page.id, element_ids: element_ids, - parent_element_id: parent.id + parent_element_id: parent.id, }, xhr: true [element_1, element_2, element_3].each do |element| expect(element.reload.parent_element_id).to eq parent.id @@ -121,7 +121,7 @@ module Alchemy end end - describe '#new' do + describe "#new" do let(:alchemy_page) { build_stubbed(:alchemy_page) } before do @@ -135,9 +135,9 @@ module Alchemy context "with elements in clipboard" do let(:element) { build_stubbed(:alchemy_element) } - let(:clipboard_items) { [{'id' => element.id.to_s, 'action' => 'copy'}] } + let(:clipboard_items) { [{"id" => element.id.to_s, "action" => "copy"}] } - before { clipboard['elements'] = clipboard_items } + before { clipboard["elements"] = clipboard_items } it "should load all elements from clipboard" do expect(Element).to receive(:all_from_clipboard_for_page).and_return(clipboard_items) @@ -147,29 +147,29 @@ module Alchemy end end - describe '#create' do - describe 'insertion position' do + describe "#create" do + describe "insertion position" do before { element } it "should insert the element at bottom of list" do - post :create, params: {element: {name: 'news', page_id: alchemy_page.id}}, xhr: true + post :create, params: {element: {name: "news", page_id: alchemy_page.id}}, xhr: true expect(alchemy_page.elements.count).to eq(2) - expect(alchemy_page.elements.last.name).to eq('news') + expect(alchemy_page.elements.last.name).to eq("news") end context "on a page with a setting for insert_elements_at of top" do before do expect(PageLayout).to receive(:get).at_least(:once).and_return({ - 'name' => 'news', - 'elements' => ['news'], - 'insert_elements_at' => 'top' + "name" => "news", + "elements" => ["news"], + "insert_elements_at" => "top", }) end it "should insert the element at top of list" do - post :create, params: {element: {name: 'news', page_id: alchemy_page.id}}, xhr: true + post :create, params: {element: {name: "news", page_id: alchemy_page.id}}, xhr: true expect(alchemy_page.elements.count).to eq(2) - expect(alchemy_page.elements.first.name).to eq('news') + expect(alchemy_page.elements.first.name).to eq("news") end end end @@ -178,7 +178,7 @@ module Alchemy let(:parent_element) { create(:alchemy_element, :with_nestable_elements, page: alchemy_page) } it "creates the element in the parent element" do - post :create, params: {element: {name: 'slide', page_id: alchemy_page.id, parent_element_id: parent_element.id}}, xhr: true + post :create, params: {element: {name: "slide", page_id: alchemy_page.id, parent_element_id: parent_element.id}}, xhr: true expect(Alchemy::Element.last.parent_element_id).to eq(parent_element.id) end end @@ -187,7 +187,7 @@ module Alchemy render_views before do - clipboard['elements'] = [{'id' => element_in_clipboard.id.to_s, 'action' => 'cut'}] + clipboard["elements"] = [{"id" => element_in_clipboard.id.to_s, "action" => "cut"}] end it "should create an element from clipboard" do @@ -199,7 +199,7 @@ module Alchemy context "and with cut as action parameter" do it "should also remove the element id from clipboard" do post :create, params: {paste_from_clipboard: element_in_clipboard.id, element: {page_id: alchemy_page.id}}, xhr: true - expect(session[:alchemy_clipboard]['elements'].detect { |item| item['id'] == element_in_clipboard.id.to_s }).to be_nil + expect(session[:alchemy_clipboard]["elements"].detect { |item| item["id"] == element_in_clipboard.id.to_s }).to be_nil end end @@ -214,7 +214,7 @@ module Alchemy end end - context 'if element could not be saved' do + context "if element could not be saved" do subject { post :create, params: {element: {page_id: alchemy_page.id}} } before do @@ -227,11 +227,11 @@ module Alchemy end end - describe '#update' do + describe "#update" do let(:page) { build_stubbed(:alchemy_page) } let(:element) { build_stubbed(:alchemy_element, page: page) } - let(:contents_parameters) { ActionController::Parameters.new(1 => {ingredient: 'Title'}) } - let(:element_parameters) { ActionController::Parameters.new(tag_list: 'Tag 1', public: false) } + let(:contents_parameters) { ActionController::Parameters.new(1 => {ingredient: "Title"}) } + let(:element_parameters) { ActionController::Parameters.new(tag_list: "Tag 1", public: false) } before do expect(Element).to receive(:find).and_return element @@ -259,9 +259,9 @@ module Alchemy end end - describe 'params security' do + describe "params security" do context "contents params" do - let(:parameters) { ActionController::Parameters.new(contents: {1 => {ingredient: 'Title'}}) } + let(:parameters) { ActionController::Parameters.new(contents: {1 => {ingredient: "Title"}}) } specify ":contents is required" do expect(controller.params).to receive(:fetch).and_return(parameters) @@ -284,7 +284,7 @@ module Alchemy expect(parameters).to receive(:fetch).with(:element, {}).and_return(parameters) end - context 'with taggable element' do + context "with taggable element" do before do controller.instance_variable_set(:'@element', mock_model(Element, taggable?: true)) end @@ -295,7 +295,7 @@ module Alchemy end end - context 'with not taggable element' do + context "with not taggable element" do before do controller.instance_variable_set(:'@element', mock_model(Element, taggable?: false)) end @@ -308,7 +308,7 @@ module Alchemy end end - describe '#trash' do + describe "#trash" do subject { delete :trash, params: {id: element.id}, xhr: true } let(:element) { build_stubbed(:alchemy_element) } @@ -321,7 +321,7 @@ module Alchemy end end - describe '#fold' do + describe "#fold" do subject { post :fold, params: {id: element.id}, xhr: true } let(:element) { build_stubbed(:alchemy_element) } @@ -331,7 +331,7 @@ module Alchemy expect(Element).to receive(:find).and_return element end - context 'if element is folded' do + context "if element is folded" do before { expect(element).to receive(:folded).and_return true } it "sets folded to false." do @@ -340,7 +340,7 @@ module Alchemy end end - context 'if element is not folded' do + context "if element is not folded" do before { expect(element).to receive(:folded).and_return false } it "sets folded to true." do diff --git a/spec/controllers/alchemy/admin/essence_files_controller_spec.rb b/spec/controllers/alchemy/admin/essence_files_controller_spec.rb index ffae4c8678..2bed1b95dd 100644 --- a/spec/controllers/alchemy/admin/essence_files_controller_spec.rb +++ b/spec/controllers/alchemy/admin/essence_files_controller_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Admin::EssenceFilesController do @@ -10,51 +10,53 @@ module Alchemy authorize_user(:as_admin) end - let(:essence_file) { mock_model('EssenceFile', :attachment= => nil, content: content) } - let(:content) { mock_model('Content') } - let(:attachment) { mock_model('Attachment') } + let(:essence_file) { mock_model("EssenceFile", :attachment= => nil, content: content) } + let(:content) { mock_model("Content") } + let(:attachment) { mock_model("Attachment") } - describe '#edit' do + describe "#edit" do before do - expect(EssenceFile).to receive(:find) - .with(essence_file.id.to_s) - .and_return(essence_file) + expect(EssenceFile).to receive(:find).with(essence_file.id.to_s) { essence_file } end it "assigns @essence_file with the EssenceFile found by id" do - get :edit, params: {id: essence_file.id} + get :edit, params: { id: essence_file.id } expect(assigns(:essence_file)).to eq(essence_file) end it "should assign @content with essence_file's content" do - get :edit, params: {id: essence_file.id} + get :edit, params: { id: essence_file.id } expect(assigns(:content)).to eq(content) end end - describe '#update' do + describe "#update" do let(:essence_file) { create(:alchemy_essence_file) } + let(:params) do + { + id: essence_file.id, + essence_file: { + title: "new title", + css_class: "left", + link_text: "Download this file", + }, + } + end + before do - expect(EssenceFile).to receive(:find).and_return(essence_file) + expect(EssenceFile).to receive(:find) { essence_file } end it "should update the attributes of essence_file" do - put :update, params: { - id: essence_file.id, - essence_file: { - title: 'new title', - css_class: 'left', - link_text: 'Download this file' - } - }, xhr: true - expect(essence_file.title).to eq 'new title' - expect(essence_file.css_class).to eq 'left' - expect(essence_file.link_text).to eq 'Download this file' + put :update, params: params, xhr: true + expect(essence_file.title).to eq "new title" + expect(essence_file.css_class).to eq "left" + expect(essence_file.link_text).to eq "Download this file" end end - describe '#assign' do + describe "#assign" do let(:content) { create(:alchemy_content) } before do @@ -64,20 +66,20 @@ module Alchemy end it "should assign @attachment with the Attachment found by attachment_id" do - put :assign, params: {content_id: content.id, attachment_id: attachment.id}, xhr: true + put :assign, params: { content_id: content.id, attachment_id: attachment.id }, xhr: true expect(assigns(:attachment)).to eq(attachment) end it "should assign @content.essence.attachment with the attachment found by id" do expect(content.essence).to receive(:attachment=).with(attachment) - put :assign, params: {content_id: content.id, attachment_id: attachment.id}, xhr: true + put :assign, params: { content_id: content.id, attachment_id: attachment.id }, xhr: true end - it "updates the @content.updated_at column" do - content.update_column(:updated_at, 3.days.ago) + it "updates the elements updated_at column" do + content.element.update_column(:updated_at, 3.days.ago) expect { - put :assign, params: {content_id: content.id, attachment_id: attachment.id}, xhr: true - }.to change(content, :updated_at) + put :assign, params: { content_id: content.id, attachment_id: attachment.id }, xhr: true + }.to change(content.element, :updated_at) end end end diff --git a/spec/controllers/alchemy/admin/essence_pictures_controller_spec.rb b/spec/controllers/alchemy/admin/essence_pictures_controller_spec.rb index 01ab27c7f4..5e93626027 100644 --- a/spec/controllers/alchemy/admin/essence_pictures_controller_spec.rb +++ b/spec/controllers/alchemy/admin/essence_pictures_controller_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Admin::EssencePicturesController do @@ -12,42 +12,42 @@ module Alchemy let(:content) { Content.new } let(:picture) { Picture.new } - describe '#edit' do + describe "#edit" do before do expect(EssencePicture).to receive(:find).and_return(essence) expect(Content).to receive(:find).and_return(content) end - it 'should assign @essence_picture and @content instance variables' do - post :edit, params: {id: 1, content_id: 1} + it "should assign @essence_picture and @content instance variables" do + post :edit, params: { id: 1, content_id: 1 } expect(assigns(:essence_picture)).to be_a(EssencePicture) expect(assigns(:content)).to be_a(Content) end end - describe '#crop' do + describe "#crop" do before do expect(EssencePicture).to receive(:find).and_return(essence) end - context 'with no picture assigned' do + context "with no picture assigned" do before do expect(essence).to receive(:picture).at_least(:once).and_return(nil) end it "renders error message" do - get :crop, params: {id: 1} + get :crop, params: { id: 1 } expect(assigns(:no_image_notice)).to eq(Alchemy.t(:no_image_for_cropper_found)) end end - context 'with picture assigned' do + context "with picture assigned" do let(:default_mask) do { x1: 0, y1: 0, x2: 300, - y2: 250 + y2: 250, } end @@ -60,44 +60,44 @@ module Alchemy allow(content).to receive(:settings) { settings } end - context 'with no render_size present in essence' do + context "with no render_size present in essence" do before do expect(essence).to receive(:render_size).at_least(:once).and_return(nil) end - context 'with sizes in content settings' do + context "with sizes in content settings" do let(:settings) do - { size: '300x250' } + { size: "300x250" } end it "sets sizes to given values" do - get :crop, params: {id: 1} + get :crop, params: { id: 1 } expect(assigns(:min_size)).to eq({ width: 300, height: 250 }) end end - context 'with no sizes in content settngs' do + context "with no sizes in content settngs" do it "sets sizes to zero" do - get :crop, params: {id: 1} + get :crop, params: { id: 1 } expect(assigns(:min_size)).to eq({ width: 0, height: 0 }) end end end - context 'with render_size present in essence' do + context "with render_size present in essence" do it "sets sizes from these values" do - expect(essence).to receive(:render_size).at_least(:once).and_return('30x25') + expect(essence).to receive(:render_size).at_least(:once).and_return("30x25") - get :crop, params: {id: 1} + get :crop, params: { id: 1 } expect(assigns(:min_size)).to eq({ width: 30, height: 25 }) end - context 'when width or height is not fixed' do - it 'infers the height from the image file preserving the aspect ratio' do - expect(essence).to receive(:render_size).at_least(:once).and_return('30x') + context "when width or height is not fixed" do + it "infers the height from the image file preserving the aspect ratio" do + expect(essence).to receive(:render_size).at_least(:once).and_return("30x") - get :crop, params: {id: 1} - expect(assigns(:min_size)).to eq({ width: 30, height: 0}) + get :crop, params: { id: 1 } + expect(assigns(:min_size)).to eq({ width: 30, height: 0 }) end context "and aspect ratio set on the contents settings" do @@ -105,96 +105,96 @@ module Alchemy { fixed_ratio: "2" } end - it 'does not infer the height from the image file preserving the aspect ratio' do - expect(essence).to receive(:render_size).at_least(:once).and_return('x25') + it "does not infer the height from the image file preserving the aspect ratio" do + expect(essence).to receive(:render_size).at_least(:once).and_return("x25") - get :crop, params: {id: 1} + get :crop, params: { id: 1 } expect(assigns(:min_size)).to eq({ width: 50, height: 25 }) end end end - context 'when width or height is not fixed and an aspect ratio is given' do + context "when width or height is not fixed and an aspect ratio is given" do context "and aspect ratio set on the contents setting" do let(:settings) do { fixed_ratio: "0.5" } end - it 'width is given, it infers the height from width and ratio' do - expect(essence).to receive(:render_size).at_least(:once).and_return('30x') + it "width is given, it infers the height from width and ratio" do + expect(essence).to receive(:render_size).at_least(:once).and_return("30x") - get :crop, params: {id: 1} + get :crop, params: { id: 1 } expect(assigns(:min_size)).to eq({ width: 30, height: 60 }) end end - it 'infers the height from the image file preserving the aspect ratio' do - expect(essence).to receive(:render_size).at_least(:once).and_return('x25') + it "infers the height from the image file preserving the aspect ratio" do + expect(essence).to receive(:render_size).at_least(:once).and_return("x25") - get :crop, params: {id: 1} - expect(assigns(:min_size)).to eq({ width: 0, height: 25}) + get :crop, params: { id: 1 } + expect(assigns(:min_size)).to eq({ width: 0, height: 25 }) end end end - context 'no crop sizes present in essence' do + context "no crop sizes present in essence" do before do expect(essence).to receive(:crop_from).and_return(nil) allow(essence).to receive(:crop_size).and_return(nil) end it "assigns default mask boxes" do - get :crop, params: {id: 1} + get :crop, params: { id: 1 } expect(assigns(:initial_box)).to eq(default_mask) expect(assigns(:default_box)).to eq(default_mask) end end - context 'crop sizes present in essence' do - let(:mask) { {'x1' => '0', 'y1' => '0', 'x2' => '120', 'y2' => '160'} } + context "crop sizes present in essence" do + let(:mask) { { "x1" => "0", "y1" => "0", "x2" => "120", "y2" => "160" } } before do - allow(essence).to receive(:crop_from).and_return('0x0') - allow(essence).to receive(:crop_size).and_return('120x160') + allow(essence).to receive(:crop_from).and_return("0x0") + allow(essence).to receive(:crop_size).and_return("120x160") end it "assigns cropping boxes" do expect(essence).to receive(:cropping_mask).and_return(mask) - get :crop, params: {id: 1} + get :crop, params: { id: 1 } expect(assigns(:initial_box)).to eq(mask) expect(assigns(:default_box)).to eq(default_mask) end end - context 'with fixed_ratio set to false' do + context "with fixed_ratio set to false" do let(:settings) do { fixed_ratio: false } end it "sets ratio to false" do - get :crop, params: {id: 1} + get :crop, params: { id: 1 } expect(assigns(:ratio)).to eq(false) end end - context 'with fixed_ratio set to a non float string' do + context "with fixed_ratio set to a non float string" do let(:settings) do - { fixed_ratio: '123,45' } + { fixed_ratio: "123,45" } end it "doesn't set a fixed ratio" do - get :crop, params: {id: 1} + get :crop, params: { id: 1 } expect(assigns(:ratio)).to eq(false) end end - context 'with no fixed_ratio set' do + context "with no fixed_ratio set" do let(:settings) do - { size: '80x60' } + { size: "80x60" } end it "sets a fixed ratio from sizes" do - get :crop, params: {id: 1} + get :crop, params: { id: 1 } expect(assigns(:ratio)).to eq(80.0 / 60.0) end end @@ -209,29 +209,29 @@ module Alchemy let(:attributes) do { - render_size: '1x1', - alt_tag: 'Alt Tag', - caption: 'Caption', - css_class: 'CSS Class', - title: 'Title' + render_size: "1x1", + alt_tag: "Alt Tag", + caption: "Caption", + css_class: "CSS Class", + title: "Title", } end it "updates the essence attributes" do expect(essence).to receive(:update).and_return(true) - put :update, params: {id: 1, essence_picture: attributes}, xhr: true + put :update, params: { id: 1, essence_picture: attributes }, xhr: true end it "saves the cropping mask" do expect(essence).to receive(:update).and_return(true) put :update, params: { - id: 1, - essence_picture: { - render_size: '1x1', - crop_from: '0x0', - crop_size: '100x100' - } - }, xhr: true + id: 1, + essence_picture: { + render_size: "1x1", + crop_from: "0x0", + crop_size: "100x100", + }, + }, xhr: true end context 'with render_gravity params' do @@ -311,7 +311,7 @@ module Alchemy end end - describe '#assign' do + describe "#assign" do let(:content) { create(:alchemy_content) } before do @@ -321,15 +321,15 @@ module Alchemy end it "should assign a Picture" do - put :assign, params: {content_id: '1', picture_id: '1'}, xhr: true + put :assign, params: { content_id: "1", picture_id: "1" }, xhr: true expect(assigns(:content).essence.picture).to eq(picture) end - it "updates the content timestamp" do - content.update_column(:updated_at, 3.days.ago) + it "updates the element timestamp" do + content.element.update_column(:updated_at, 3.days.ago) expect { - put :assign, params: {content_id: '1', picture_id: '1'}, xhr: true - }.to change(content, :updated_at) + put :assign, params: { content_id: "1", picture_id: "1" }, xhr: true + }.to change(content.element, :updated_at) end end end diff --git a/spec/controllers/alchemy/admin/languages_controller_spec.rb b/spec/controllers/alchemy/admin/languages_controller_spec.rb index 0944a97b63..f109154fc5 100644 --- a/spec/controllers/alchemy/admin/languages_controller_spec.rb +++ b/spec/controllers/alchemy/admin/languages_controller_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" describe Alchemy::Admin::LanguagesController do routes { Alchemy::Engine.routes } @@ -10,7 +10,7 @@ end describe "#index" do - context 'without a site' do + context "without a site" do it "redirects to the sites admin" do get :index expect(response).to redirect_to(admin_sites_path) @@ -23,14 +23,14 @@ end let!(:site_2) do - create(:alchemy_site, host: 'another-site.com') + create(:alchemy_site, host: "another-site.com") end let!(:site_2_language) do site_2.default_language end - it 'only shows languages from current site' do + it "only shows languages from current site" do get :index expect(assigns(:languages)).to include(default_site_language) expect(assigns(:languages)).to_not include(site_2_language) @@ -52,27 +52,27 @@ end describe "#new" do - context 'without a site' do + context "without a site" do it "redirects to the sites admin" do get :new expect(response).to redirect_to(admin_sites_path) end - end + end - context 'with a site' do - let!(:site) { create(:alchemy_site) } + context "with a site" do + let!(:site) { create(:alchemy_site) } - it "has default language's page_layout set" do - get :new - expect(assigns(:language).page_layout). - to eq(Alchemy::Config.get(:default_language)['page_layout']) - end - end + it "has default language's page_layout set" do + get :new + expect(assigns(:language).page_layout). + to eq(Alchemy::Config.get(:default_language)["page_layout"]) + end + end end describe "#create" do - context 'with valid params' do - it 'redirects to the pages admin' do + context "with valid params" do + it "redirects to the pages admin" do post :create, params: { language: { name: "English", @@ -81,18 +81,18 @@ page_layout: "index", public: true, default: true, - site_id: create(:alchemy_site) - } + site_id: create(:alchemy_site), + }, } language = Alchemy::Language.last expect(response).to redirect_to admin_pages_path(language_id: language) - expect(flash[:notice]).to eq('Language successfully created.') + expect(flash[:notice]).to eq("Language successfully created.") end end - context 'with invalid params' do - it 'shows the form again' do - post :create, params: { language: { name: '' } } + context "with invalid params" do + it "shows the form again" do + post :create, params: { language: { name: "" } } expect(response).to render_template(:new) end end @@ -101,22 +101,22 @@ describe "#destroy" do let(:language) { create(:alchemy_language) } - context 'with pages attached' do + context "with pages attached" do let!(:page) { create(:alchemy_page, language: language) } - it 'returns with error message' do + it "returns with error message" do delete :destroy, params: { id: language.id } expect(response).to redirect_to admin_languages_path expect(flash[:warning]).to \ - eq('Pages are still attached to this language. Please remove them first.') + eq("Pages are still attached to this language. Please remove them first.") end end - context 'without pages' do - it 'removes the language' do + context "without pages" do + it "removes the language" do delete :destroy, params: { id: language.id } expect(response).to redirect_to admin_languages_path - expect(flash[:notice]).to eq('Language successfully removed.') + expect(flash[:notice]).to eq("Language successfully removed.") end end end @@ -136,7 +136,7 @@ context "having a referer" do before do expect_any_instance_of(ActionDispatch::Request).to receive(:referer) do - '/admin/pages' + "/admin/pages" end end diff --git a/spec/controllers/alchemy/admin/layoutpages_controller_spec.rb b/spec/controllers/alchemy/admin/layoutpages_controller_spec.rb index 32aaddc044..266bd6037f 100644 --- a/spec/controllers/alchemy/admin/layoutpages_controller_spec.rb +++ b/spec/controllers/alchemy/admin/layoutpages_controller_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Admin::LayoutpagesController do @@ -11,19 +11,23 @@ module Alchemy end describe "#index" do - context 'with no language present' do - it 'redirects to the languages admin' do + context "with no language present" do + it "redirects to the languages admin" do get :index expect(response).to redirect_to(admin_languages_path) end end - context 'with a language present' do + context "with a language present" do let!(:language) { create(:alchemy_language) } - it "should assign @layout_root" do - get :index - expect(assigns(:layout_root)).to be_a(Page) + context "and layoutpages present" do + let!(:layoutpages) { create_list(:alchemy_page, 2, :layoutpage, language: language) } + + it "should assign @layout_pages" do + get :index + expect(assigns(:layout_pages)).to match_array(layoutpages) + end end it "should assign @languages" do @@ -33,23 +37,23 @@ module Alchemy context "with multiple sites" do let!(:site_2) do - create(:alchemy_site, host: 'another-site.com') + create(:alchemy_site, host: "another-site.com") end - context 'if no language exists for the current site' do - it 'redirects to the languages admin' do + context "if no language exists for the current site" do + it "redirects to the languages admin" do get :index, session: { alchemy_site_id: site_2.id } expect(response).to redirect_to(admin_languages_path) end end - context 'if an language exists for the current site' do + context "if an language exists for the current site" do let!(:language) { create(:alchemy_language) } let!(:language_2) do create(:alchemy_language, site: site_2) end - it 'only shows languages from current site' do + it "only shows languages from current site" do get :index, session: { alchemy_site_id: site_2.id } expect(assigns(:languages)).to_not include(language) expect(assigns(:languages)).to include(language_2) diff --git a/spec/controllers/alchemy/admin/nodes_controller_spec.rb b/spec/controllers/alchemy/admin/nodes_controller_spec.rb index 9039223b69..82cfb3a334 100644 --- a/spec/controllers/alchemy/admin/nodes_controller_spec.rb +++ b/spec/controllers/alchemy/admin/nodes_controller_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Admin::NodesController do @@ -10,70 +10,70 @@ module Alchemy authorize_user(:as_admin) end - describe '#index' do - context 'if no language is present' do - it 'redirects to the language admin' do + describe "#index" do + context "if no language is present" do + it "redirects to the language admin" do get :index expect(response).to redirect_to(admin_languages_path) end end - context 'if root nodes present' do + context "if root nodes present" do let!(:root_node) { create(:alchemy_node) } let!(:child_node) { create(:alchemy_node, parent_id: root_node.id) } it "loads only root nodes from current language" do get :index - expect(assigns('root_nodes').to_a).to eq([root_node]) - expect(assigns('root_nodes').to_a).to_not eq([child_node]) + expect(assigns("root_nodes").to_a).to eq([root_node]) + expect(assigns("root_nodes").to_a).to_not eq([child_node]) end end end - describe '#new' do - context 'if no language is present' do - it 'redirects to the language admin' do + describe "#new" do + context "if no language is present" do + it "redirects to the language admin" do get :new expect(response).to redirect_to(admin_languages_path) end end - context 'if language is present' do + context "if language is present" do let!(:default_language) { create(:alchemy_language) } it "sets the current language on new node" do get :new - expect(assigns('node').language).to eq(default_language) + expect(assigns("node").language).to eq(default_language) end - context 'with parent id in params' do + context "with parent id in params" do it "sets it to new node" do get :new, params: { parent_id: 1 } - expect(assigns('node').parent_id).to eq(1) + expect(assigns("node").parent_id).to eq(1) end end end end - describe '#create' do - context 'with valid params' do + describe "#create" do + context "with valid params" do let(:language) { create(:alchemy_language) } it "creates node and redirects to index" do expect { - post :create, params: { node: { name: 'Node', language_id: language.id, site_id: language.site_id } } + post :create, params: { node: { menu_type: "main_menu", language_id: language.id } } }.to change { Alchemy::Node.count }.by(1) expect(response).to redirect_to(admin_nodes_path) end end end - describe '#update' do + describe "#update" do let(:node) { create(:alchemy_node) } - context 'with valid params' do + context "with valid params" do it "redirects to nodes path" do - put :update, params: { id: node.id, node: { name: 'Node'} } + put :update, params: { id: node.id, node: { name: "Node"} } expect(response).to redirect_to(admin_nodes_path) end end diff --git a/spec/controllers/alchemy/admin/pictures_controller_spec.rb b/spec/controllers/alchemy/admin/pictures_controller_spec.rb index e14220b07a..b94e43c3c8 100644 --- a/spec/controllers/alchemy/admin/pictures_controller_spec.rb +++ b/spec/controllers/alchemy/admin/pictures_controller_spec.rb @@ -1,19 +1,19 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" RSpec.shared_examples :redirecting_to_picture_library do let(:params) do { - filter: 'latest', + filter: "latest", page: 2, - q: {name_or_image_file_name_cont: 'kitten'}, - size: 'small', - tagged_with: 'cat' + q: {name_or_image_file_name_cont: "kitten"}, + size: "small", + tagged_with: "cat", } end - it 'redirects to index keeping all query, filter and page params' do + it "redirects to index keeping all query, filter and page params" do is_expected.to redirect_to admin_pictures_path(params) end end @@ -26,62 +26,62 @@ module Alchemy authorize_user(:as_admin) end - describe '#index' do - context 'with search params' do - let!(:picture_1) { create(:alchemy_picture, name: 'cute kitten') } - let!(:picture_2) { create(:alchemy_picture, name: 'nice beach') } + describe "#index" do + context "with search params" do + let!(:picture_1) { create(:alchemy_picture, name: "cute kitten") } + let!(:picture_2) { create(:alchemy_picture, name: "nice beach") } - it 'assigns @pictures with filtered pictures' do - get :index, params: {q: {name_or_image_file_name_cont: 'kitten'}} + it "assigns @pictures with filtered pictures" do + get :index, params: {q: {name_or_image_file_name_cont: "kitten"}} expect(assigns(:pictures)).to include(picture_1) expect(assigns(:pictures)).to_not include(picture_2) end end - context 'with filter params' do + context "with filter params" do let!(:picture_1) { create(:alchemy_picture) } let!(:picture_2) { create(:alchemy_picture, tag_list: %w(kitten)) } - it 'assigns @pictures with filtered pictures' do - get :index, params: {filter: 'without_tag'} + it "assigns @pictures with filtered pictures" do + get :index, params: {filter: "without_tag"} expect(assigns(:pictures)).to include(picture_1) expect(assigns(:pictures)).to_not include(picture_2) end end - context 'with tag params' do + context "with tag params" do let!(:picture_1) { create(:alchemy_picture, tag_list: %w(water)) } let!(:picture_2) { create(:alchemy_picture, tag_list: %w(kitten)) } let!(:picture_3) { create(:alchemy_picture, tag_list: %w(water nature)) } - it 'assigns @pictures with filtered pictures' do - get :index, params: {tagged_with: 'water'} + it "assigns @pictures with filtered pictures" do + get :index, params: {tagged_with: "water"} expect(assigns(:pictures)).to include(picture_1) expect(assigns(:pictures)).to_not include(picture_2) expect(assigns(:pictures)).to include(picture_3) end end - context 'with multiple tag params' do + context "with multiple tag params" do let!(:picture_1) { create(:alchemy_picture, tag_list: %w(water)) } let!(:picture_2) { create(:alchemy_picture, tag_list: %w(water nature)) } - it 'assigns @pictures with filtered pictures' do - get :index, params: {tagged_with: 'water,nature'} + it "assigns @pictures with filtered pictures" do + get :index, params: {tagged_with: "water,nature"} expect(assigns(:pictures)).to_not include(picture_1) expect(assigns(:pictures)).to include(picture_2) end end - it 'assigns @size to default value' do + it "assigns @size to default value" do get :index - expect(assigns(:size)).to eq('medium') + expect(assigns(:size)).to eq("medium") end context "with params[:size] set to 'large'" do - it 'assigns @size to large' do - get :index, params: {size: 'large'} - expect(assigns(:size)).to eq('large') + it "assigns @size to large" do + get :index, params: {size: "large"} + expect(assigns(:size)).to eq("large") end end @@ -89,7 +89,7 @@ module Alchemy context "is set" do it "for html requests it renders the archive_overlay partial" do get :index, params: {content_id: 1} - expect(response).to render_template(partial: '_archive_overlay') + expect(response).to render_template(partial: "_archive_overlay") end it "for ajax requests it renders the archive_overlay template" do @@ -107,101 +107,101 @@ module Alchemy end end - describe '#create' do + describe "#create" do subject { post :create, params: params } - let(:params) { {picture: {name: ''}} } - let(:picture) { mock_model('Picture', humanized_name: 'Cute kittens', to_jq_upload: {}) } + let(:params) { {picture: {name: ""}} } + let(:picture) { mock_model("Picture", humanized_name: "Cute kittens", to_jq_upload: {}) } - context 'with passing validations' do + context "with passing validations" do before do expect(Picture).to receive(:new).and_return(picture) - expect(picture).to receive(:name=).and_return('Cute kittens') - expect(picture).to receive(:name).and_return('Cute kittens') + expect(picture).to receive(:name=).and_return("Cute kittens") + expect(picture).to receive(:name).and_return("Cute kittens") expect(picture).to receive(:save).and_return(true) end it "renders json response with success message" do subject - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") expect(response.status).to eq(201) json = JSON.parse(response.body) - expect(json).to have_key('growl_message') - expect(json).to have_key('files') + expect(json).to have_key("growl_message") + expect(json).to have_key("files") end end - context 'with failing validations' do - it_behaves_like 'having a json uploader error message' + context "with failing validations" do + it_behaves_like "having a json uploader error message" end end - describe '#show' do - let(:picture) { create(:alchemy_picture, name: 'kitten') } + describe "#show" do + let(:picture) { create(:alchemy_picture, name: "kitten") } - it 'assigns @picture' do + it "assigns @picture" do get :show, params: {id: picture.id} expect(assigns(:picture).id).to eq(picture.id) end - context 'with assignments' do + context "with assignments" do let!(:page) { create(:alchemy_page) } let!(:element) { create(:alchemy_element, page: page) } let!(:content) { create(:alchemy_content, element: element) } let!(:essence) { create(:alchemy_essence_picture, content: content, picture: picture) } - it 'assigns all essence pictures having an assignment to @assignments' do + it "assigns all essence pictures having an assignment to @assignments" do get :show, params: {id: picture.id} expect(assigns(:assignments)).to eq([essence]) end end - context 'with previous picture existing' do - let!(:previous) { create(:alchemy_picture, name: 'abraham') } + context "with previous picture existing" do + let!(:previous) { create(:alchemy_picture, name: "abraham") } - it 'assigns @previous to previous picture' do + it "assigns @previous to previous picture" do get :show, params: {id: picture.id} expect(assigns(:previous).id).to eq(previous.id) end end - context 'with next picture existing' do - let!(:next_picture) { create(:alchemy_picture, name: 'zebra') } + context "with next picture existing" do + let!(:next_picture) { create(:alchemy_picture, name: "zebra") } - it 'assigns @next to next picture' do + it "assigns @next to next picture" do get :show, params: {id: picture.id} expect(assigns(:next).id).to eq(next_picture.id) end end end - describe '#edit_multiple' do - let(:pictures) { [mock_model('Picture', tag_list: 'kitten')] } + describe "#edit_multiple" do + let(:pictures) { [mock_model("Picture", tag_list: "kitten")] } before { expect(Picture).to receive(:where).and_return(pictures) } - it 'assigns pictures instance variable' do + it "assigns pictures instance variable" do get :edit_multiple expect(assigns(:pictures)).to eq(pictures) end - it 'assigns tags instance variable' do + it "assigns tags instance variable" do get :edit_multiple - expect(assigns(:tags)).to include('kitten') + expect(assigns(:tags)).to include("kitten") end end - describe '#update' do + describe "#update" do subject do - put :update, params: {id: 1, picture: {name: ''}}, xhr: true + put :update, params: {id: 1, picture: {name: ""}}, xhr: true end - let(:picture) { build_stubbed(:alchemy_picture, name: 'Cute kitten') } + let(:picture) { build_stubbed(:alchemy_picture, name: "Cute kitten") } before do expect(Picture).to receive(:find).and_return(picture) end - context 'with passing validations' do + context "with passing validations" do before do expect(picture).to receive(:update).and_return(true) end @@ -210,11 +210,11 @@ module Alchemy subject expect(assigns(:message)[:body]).to \ eq(Alchemy.t(:picture_updated_successfully, name: picture.name)) - expect(assigns(:message)[:type]).to eq('notice') + expect(assigns(:message)[:type]).to eq("notice") end end - context 'with failing validations' do + context "with failing validations" do before do expect(picture).to receive(:update).and_return(false) end @@ -222,12 +222,12 @@ module Alchemy it "sets error notice" do subject expect(assigns(:message)[:body]).to eq(Alchemy.t(:picture_update_failed)) - expect(assigns(:message)[:type]).to eq('error') + expect(assigns(:message)[:type]).to eq("error") end end end - describe '#update_multiple' do + describe "#update_multiple" do let(:picture) { build_stubbed(:alchemy_picture) } let(:pictures) { [picture] } @@ -252,25 +252,25 @@ module Alchemy it_behaves_like :redirecting_to_picture_library do let(:subject) do delete :delete_multiple, params: { - picture_ids: %w(1 2) + picture_ids: %w(1 2), }.merge(params) end end let(:deletable_picture) do - mock_model('Picture', name: 'pic of the pig', deletable?: true) + mock_model("Picture", name: "pic of the pig", deletable?: true) end let(:not_deletable_picture) do - mock_model('Picture', name: 'pic of the chick', deletable?: false) + mock_model("Picture", name: "pic of the chick", deletable?: false) end context "no picture_ids given" do - let(:picture_ids) { '' } + let(:picture_ids) { "" } it "should give a warning about not deleting any pictures" do subject - expect(flash[:warn]).to match('Could not delete Pictures') + expect(flash[:warn]).to match("Could not delete Pictures") end end @@ -284,7 +284,7 @@ module Alchemy it "should delete the pictures give a notice about deleting them" do subject - expect(flash[:notice]).to match('successfully') + expect(flash[:notice]).to match("successfully") end end @@ -298,15 +298,15 @@ module Alchemy it "should give a warning for the non deletable pictures and delete the others" do expect(deletable_picture).to receive(:destroy) subject - expect(flash[:warn]).to match('could not be deleted') + expect(flash[:warn]).to match("could not be deleted") end end - context 'with error happening' do + context "with error happening" do let(:picture_ids) { deletable_picture.id.to_s } before do - expect(Picture).to receive(:find).and_raise('yada') + expect(Picture).to receive(:find).and_raise("yada") end it "sets error message" do @@ -322,8 +322,8 @@ module Alchemy end end - describe '#destroy' do - let(:picture) { build_stubbed(:alchemy_picture, name: 'Cute kitten') } + describe "#destroy" do + let(:picture) { build_stubbed(:alchemy_picture, name: "Cute kitten") } before do expect(Picture).to receive(:find).and_return(picture) @@ -336,9 +336,9 @@ module Alchemy expect(flash[:notice]).not_to be_blank end - context 'if an error happens' do + context "if an error happens" do before do - expect(picture).to receive(:destroy).and_raise('yada') + expect(picture).to receive(:destroy).and_raise("yada") end it "shows error notice" do @@ -357,51 +357,51 @@ module Alchemy end end - describe '#items_per_page' do + describe "#items_per_page" do subject { controller.send(:items_per_page) } before do expect(controller).to receive(:params).at_least(:once) { params } end - context 'in overlay' do + context "in overlay" do let(:params) { {content_id: :id, size: size} } - context 'with params[:size] set to medium' do - let(:size) { 'medium' } + context "with params[:size] set to medium" do + let(:size) { "medium" } it { is_expected.to eq(9) } end - context 'with params[:size] set to small' do - let(:size) { 'small' } + context "with params[:size] set to small" do + let(:size) { "small" } it { is_expected.to eq(25) } end - context 'with params[:size] set to large' do - let(:size) { 'large' } + context "with params[:size] set to large" do + let(:size) { "large" } it { is_expected.to eq(4) } end end - context 'in archive' do + context "in archive" do let(:params) { {size: size} } - context 'with params[:size] set to medium' do - let(:size) { 'medium' } + context "with params[:size] set to medium" do + let(:size) { "medium" } it { is_expected.to eq(20) } - context 'with cookie set' do + context "with cookie set" do before do @request.cookies[:alchemy_pictures_per_page] = 2 end it { is_expected.to eq(2) } - context 'with params[:per_page] given' do + context "with params[:per_page] given" do let(:params) { {per_page: 8, size: size} } it { is_expected.to eq(8) } @@ -409,14 +409,14 @@ module Alchemy end end - context 'with params[:size] set to small' do - let(:size) { 'small' } + context "with params[:size] set to small" do + let(:size) { "small" } it { is_expected.to eq(60) } end - context 'with params[:size] set to large' do - let(:size) { 'large' } + context "with params[:size] set to large" do + let(:size) { "large" } it { is_expected.to eq(12) } end diff --git a/spec/controllers/alchemy/admin/resources_controller_spec.rb b/spec/controllers/alchemy/admin/resources_controller_spec.rb index ac3cccc6a1..349e6d4096 100644 --- a/spec/controllers/alchemy/admin/resources_controller_spec.rb +++ b/spec/controllers/alchemy/admin/resources_controller_spec.rb @@ -1,16 +1,16 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" describe Admin::EventsController do it "should include ResourcesHelper" do expect(controller.respond_to?(:resource_window_size)).to be_truthy end - describe '#index' do + describe "#index" do let(:params) { Hash.new } - let!(:peter) { create(:event, name: 'Peter') } - let!(:lustig) { create(:event, name: 'Lustig') } + let!(:peter) { create(:event, name: "Peter") } + let!(:lustig) { create(:event, name: "Lustig") } before do authorize_user(:as_admin) @@ -22,7 +22,7 @@ expect(assigns(:events)).to include(lustig) end - context 'with search query given' do + context "with search query given" do let(:params) { {q: {name_or_hidden_name_or_description_or_location_name_cont: "PeTer"}} } it "returns only matching records" do @@ -32,7 +32,7 @@ end context "but searching for record with certain association" do - let(:bauwagen) { create(:location, name: 'Bauwagen') } + let(:bauwagen) { create(:location, name: "Bauwagen") } let(:params) { {q: {name_or_hidden_name_or_description_or_location_name_cont: "Bauwagen"}} } before do @@ -47,7 +47,7 @@ end end - context 'with sort parameter given' do + context "with sort parameter given" do let(:params) { {q: {s: "name desc"}} } it "returns records in the defined order" do @@ -56,15 +56,15 @@ end end - context 'without sort parameter given' do - context 'if resource has name attribute' do + context "without sort parameter given" do + context "if resource has name attribute" do it "returns records sorted by name" do get :index expect(assigns(:events)).to eq([lustig, peter]) end end - context 'if resource has no name attribute' do + context "if resource has no name attribute" do let!(:booking1) { Booking.create!(from: 2.week.from_now) } let!(:booking2) { Booking.create!(from: 1.weeks.from_now) } @@ -83,59 +83,70 @@ def resource_handler end end - describe '#update' do - let(:params) { {q: {name_or_hidden_name_or_description_or_location_name_cont: 'some_query'}, page: 6} } + describe "#update" do + let(:params) { {q: {name_or_hidden_name_or_description_or_location_name_cont: "some_query"}, page: 6} } - context 'with regular noun model name' do - let(:peter) { create(:event, name: 'Peter') } + context "with regular noun model name" do + let(:peter) { create(:event, name: "Peter") } - it 'redirects to index, keeping the current location parameters' do + it "redirects to index, keeping the current location parameters" do post :update, params: {id: peter.id, event: {name: "Hans"}}.merge(params) expect(response.redirect_url).to eq("http://test.host/admin/events?page=6&q%5Bname_or_hidden_name_or_description_or_location_name_cont%5D=some_query") end end - context 'with zero plural noun model name' do - let!(:peter) { create(:series, name: 'Peter') } - let(:params) { {q: { name_cont: 'some_query'}, page: 6} } + context "with zero plural noun model name" do + let!(:peter) { create(:series, name: "Peter") } + let(:params) { {q: { name_cont: "some_query"}, page: 6} } - it 'redirects to index, keeping the current location parameters' do - expect(controller).to receive(:controller_path) { 'admin/series' } + it "redirects to index, keeping the current location parameters" do + expect(controller).to receive(:controller_path) { "admin/series" } post :update, params: {id: peter.id, series: {name: "Hans"}}.merge(params) expect(response.redirect_url).to eq("http://test.host/admin/series?page=6&q%5Bname_cont%5D=some_query") end end end - describe '#create' do - let(:params) { {q: {name_or_hidden_name_or_description_or_location_name_cont: 'some_query'}, page: 6} } + describe "#create" do + let(:params) { {q: {name_or_hidden_name_or_description_or_location_name_cont: "some_query"}, page: 6} } let!(:location) { create(:location) } - context 'with regular noun model name' do - it 'redirects to index, keeping the current location parameters' do + context "with regular noun model name" do + it "redirects to index, keeping the current location parameters" do post :create, params: {event: {name: "Hans", location_id: location.id}}.merge(params) expect(response.redirect_url).to eq("http://test.host/admin/events?page=6&q%5Bname_or_hidden_name_or_description_or_location_name_cont%5D=some_query") end end - context 'with zero plural noun model name' do - let(:params) { {q: {name_cont: 'some_query'}, page: 6} } + context "with zero plural noun model name" do + let(:params) { {q: {name_cont: "some_query"}, page: 6} } - it 'redirects to index, keeping the current location parameters' do - expect(controller).to receive(:controller_path) { 'admin/series' } + it "redirects to index, keeping the current location parameters" do + expect(controller).to receive(:controller_path) { "admin/series" } post :create, params: {series: {name: "Hans"}}.merge(params) expect(response.redirect_url).to eq("http://test.host/admin/series?page=6&q%5Bname_cont%5D=some_query") end end end - describe '#destroy' do - let(:params) { {q: {name_or_hidden_name_or_description_or_location_name_cont: 'some_query'}, page: 6} } - let!(:peter) { create(:event, name: 'Peter') } + describe "#destroy" do + let(:params) { {q: {name_or_hidden_name_or_description_or_location_name_cont: "some_query"}, page: 6} } + let!(:peter) { create(:event, name: "Peter") } - it 'redirects to index, keeping the current location parameters' do + it "redirects to index, keeping the current location parameters" do delete :destroy, params: {id: peter.id}.merge(params) expect(response.redirect_url).to eq("http://test.host/admin/events?page=6&q%5Bname_or_hidden_name_or_description_or_location_name_cont%5D=some_query") end + + context "If the resource is not destroyable" do + let!(:undestroyable) { create(:event, name: "Undestructible") } + + it "adds an error flash" do + delete :destroy, params: {id: undestroyable.id}.merge(params) + + expect(response.redirect_url).to eq("http://test.host/admin/events?page=6&q%5Bname_or_hidden_name_or_description_or_location_name_cont%5D=some_query") + expect(flash[:error]).to eq("This is the undestructible event!") + end + end end end diff --git a/spec/controllers/alchemy/admin/sites_controller_spec.rb b/spec/controllers/alchemy/admin/sites_controller_spec.rb index d23aa3eeeb..af19397f17 100644 --- a/spec/controllers/alchemy/admin/sites_controller_spec.rb +++ b/spec/controllers/alchemy/admin/sites_controller_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" describe Alchemy::Admin::SitesController do routes { Alchemy::Engine.routes } @@ -10,18 +10,18 @@ end describe "#create" do - context 'with valid params' do - it 'redirects to the languages admin' do - post :create, params: { site: { host: '*' } } + context "with valid params" do + it "redirects to the languages admin" do + post :create, params: { site: { host: "*" } } site = Alchemy::Site.last expect(response).to redirect_to admin_languages_path(site_id: site) - expect(flash[:notice]).to eq('Please create a default language for this site.') + expect(flash[:notice]).to eq("Please create a default language for this site.") end end - context 'with invalid params' do - it 'shows the form again' do - post :create, params: { site: { host: '' } } + context "with invalid params" do + it "shows the form again" do + post :create, params: { site: { host: "" } } expect(response).to render_template(:new) end end @@ -30,22 +30,22 @@ describe "#destroy" do let(:site) { create(:alchemy_site) } - context 'with languages attached' do + context "with languages attached" do let!(:language) { create(:alchemy_language, site: site) } - it 'returns with error message' do + it "returns with error message" do delete :destroy, params: { id: site.id } expect(response).to redirect_to admin_sites_path expect(flash[:warning]).to \ - eq('Languages are still attached to this site. Please remove them first.') + eq("Languages are still attached to this site. Please remove them first.") end end - context 'without languages' do - it 'removes the site' do + context "without languages" do + it "removes the site" do delete :destroy, params: { id: site.id } expect(response).to redirect_to admin_sites_path - expect(flash[:notice]).to eq('Website successfully removed.') + expect(flash[:notice]).to eq("Website successfully removed.") end end end diff --git a/spec/controllers/alchemy/admin/tags_controller_spec.rb b/spec/controllers/alchemy/admin/tags_controller_spec.rb index b1d0f31c8c..8ed53cb767 100644 --- a/spec/controllers/alchemy/admin/tags_controller_spec.rb +++ b/spec/controllers/alchemy/admin/tags_controller_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy module Admin @@ -9,29 +9,29 @@ module Admin before { authorize_user(:as_admin) } - describe '#create' do - context 'without required params' do + describe "#create" do + context "without required params" do render_views it "does not create tag" do - post :create, params: {tag: {name: ''}} + post :create, params: {tag: {name: ""}} expect(response.body).to have_content("can't be blank") end end - context 'with required params' do + context "with required params" do it "creates tag and redirects to tags view" do expect { - post :create, params: {tag: {name: 'Foo'}} + post :create, params: {tag: {name: "Foo"}} }.to change { Gutentag::Tag.count }.by(1) expect(response).to redirect_to admin_tags_path end end end - describe '#edit' do - let(:tag) { Gutentag::Tag.create(name: 'Sputz') } - let(:another_tag) { Gutentag::Tag.create(name: 'Hutzl') } + describe "#edit" do + let(:tag) { Gutentag::Tag.create(name: "Sputz") } + let(:another_tag) { Gutentag::Tag.create(name: "Hutzl") } before { another_tag; tag } @@ -42,17 +42,17 @@ module Admin end end - describe '#update' do - let(:tag) { Gutentag::Tag.create(name: 'Sputz') } + describe "#update" do + let(:tag) { Gutentag::Tag.create(name: "Sputz") } it "changes tags name" do - put :update, params: {id: tag.id, tag: {name: 'Foo'}} + put :update, params: {id: tag.id, tag: {name: "Foo"}} expect(response).to redirect_to(admin_tags_path) - expect(tag.reload.name).to eq('Foo') + expect(tag.reload.name).to eq("Foo") end - context 'with merg_to param given' do - let(:another_tag) { Gutentag::Tag.create(name: 'Hutzl') } + context "with merg_to param given" do + let(:another_tag) { Gutentag::Tag.create(name: "Hutzl") } it "replaces tag with other tag" do expect(Alchemy::Tag).to receive(:replace) diff --git a/spec/controllers/alchemy/admin/translations_spec.rb b/spec/controllers/alchemy/admin/translations_spec.rb index 0661f29583..6271d887b1 100644 --- a/spec/controllers/alchemy/admin/translations_spec.rb +++ b/spec/controllers/alchemy/admin/translations_spec.rb @@ -1,16 +1,16 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" describe Alchemy::Admin::DashboardController do routes { Alchemy::Engine.routes } context "in admin backend" do - let(:dummy_user) { mock_model(Alchemy.user_class, alchemy_roles: %w(admin), language: 'de') } + let(:dummy_user) { mock_model(Alchemy.user_class, alchemy_roles: %w(admin), language: "de") } before { authorize_user(dummy_user) } - context 'if locale is available' do + context "if locale is available" do before do expect(Alchemy::I18n).to receive(:available_locales).at_least(:once) do [:de, :nl, :en] @@ -18,26 +18,26 @@ end it "should be possible to set the locale of the admin backend via params" do - get :index, params: {admin_locale: 'nl'} + get :index, params: {admin_locale: "nl"} expect(::I18n.locale).to eq(:nl) end it "should store the current locale in the session" do - get :index, params: {admin_locale: 'nl'} + get :index, params: {admin_locale: "nl"} expect(session[:alchemy_locale]).to eq(:nl) end it "should be possible to change the current locale in the session" do - get :index, params: {admin_locale: 'de'} + get :index, params: {admin_locale: "de"} expect(session[:alchemy_locale]).to eq(:de) - get :index, params: {admin_locale: 'en'} + get :index, params: {admin_locale: "en"} expect(session[:alchemy_locale]).to eq(:en) end end - context 'with unknown locale' do + context "with unknown locale" do it "it uses the users default language" do - get :index, params: {admin_locale: 'ko'} + get :index, params: {admin_locale: "ko"} expect(::I18n.locale).to eq(:de) end end @@ -51,7 +51,7 @@ context "if user has no preferred locale" do let(:dummy_user) { mock_model(Alchemy.user_class, alchemy_roles: %w(admin), language: nil) } - context 'if locale is available' do + context "if locale is available" do before do expect(Alchemy::I18n).to receive(:available_locales).at_least(:once) do [:es, :nl] @@ -59,7 +59,7 @@ end it "should use the browsers language setting" do - request.headers['ACCEPT-LANGUAGE'] = 'es-ES' + request.headers["ACCEPT-LANGUAGE"] = "es-ES" get :index expect(::I18n.locale).to eq(:es) end @@ -70,7 +70,7 @@ context "if language doesn't return a valid locale symbol" do it "should use the browsers language setting" do - request.headers['ACCEPT-LANGUAGE'] = 'es-ES' + request.headers["ACCEPT-LANGUAGE"] = "es-ES" get :index expect(::I18n.locale).to eq(:es) end diff --git a/spec/controllers/alchemy/admin/trash_controller_spec.rb b/spec/controllers/alchemy/admin/trash_controller_spec.rb index acba8ceb16..708ee66b4f 100644 --- a/spec/controllers/alchemy/admin/trash_controller_spec.rb +++ b/spec/controllers/alchemy/admin/trash_controller_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy module Admin diff --git a/spec/controllers/alchemy/api/contents_controller_spec.rb b/spec/controllers/alchemy/api/contents_controller_spec.rb index 3d0d56a4cc..d4fba343aa 100644 --- a/spec/controllers/alchemy/api/contents_controller_spec.rb +++ b/spec/controllers/alchemy/api/contents_controller_spec.rb @@ -1,12 +1,12 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Api::ContentsController do routes { Alchemy::Engine.routes } - describe '#index' do + describe "#index" do let!(:page) { create(:alchemy_page) } let!(:element) { create(:alchemy_element, page: page) } let!(:content) { create(:alchemy_content, element: element) } @@ -15,15 +15,15 @@ module Alchemy get :index, params: {format: :json} expect(response.status).to eq(200) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) expect(result).to have_key("contents") - expect(result['contents'].size).to eq(Alchemy::Content.count) + expect(result["contents"].size).to eq(Alchemy::Content.count) end - context 'with element_id' do + context "with element_id" do let!(:other_element) { create(:alchemy_element, page: page) } let!(:other_content) { create(:alchemy_content, element: other_element) } @@ -31,31 +31,31 @@ module Alchemy get :index, params: {element_id: other_element.id, format: :json} expect(response.status).to eq(200) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) expect(result).to have_key("contents") - expect(result['contents'].size).to eq(1) - expect(result['contents'][0]['element_id']).to eq(other_element.id) + expect(result["contents"].size).to eq(1) + expect(result["contents"][0]["element_id"]).to eq(other_element.id) end end - context 'with empty element_id' do + context "with empty element_id" do it "returns all contents" do get :index, params: {element_id: element.id, format: :json} expect(response.status).to eq(200) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) expect(result).to have_key("contents") - expect(result['contents'].size).to eq(Alchemy::Content.count) + expect(result["contents"].size).to eq(Alchemy::Content.count) end end - context 'as author' do + context "as author" do before do authorize_user(build(:alchemy_dummy_user, :as_author)) end @@ -64,18 +64,18 @@ module Alchemy get :index, params: {format: :json} expect(response.status).to eq(200) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) - expect(result).to have_key('contents') - expect(result['contents'].size).to eq(Alchemy::Content.count) + expect(result).to have_key("contents") + expect(result["contents"].size).to eq(Alchemy::Content.count) end end end - describe '#show' do - context 'with no other params given' do + describe "#show" do + context "with no other params given" do let(:page) { create(:alchemy_page) } let(:element) { create(:alchemy_element, page: page) } let(:content) { create(:alchemy_content, element: element) } @@ -84,58 +84,58 @@ module Alchemy get :show, params: {id: content.id, format: :json} expect(response.status).to eq(200) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) - expect(result['id']).to eq(content.id) + expect(result["id"]).to eq(content.id) end - context 'requesting an restricted content' do + context "requesting an restricted content" do let(:page) { create(:alchemy_page, restricted: true) } it "responds with 403" do get :show, params: {id: content.id, format: :json} - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") expect(response.status).to eq(403) result = JSON.parse(response.body) expect(result).to have_key("error") - expect(result['error']).to eq("Not authorized") + expect(result["error"]).to eq("Not authorized") end end end - context 'with element_id and name params given' do + context "with element_id and name params given" do let!(:page) { create(:alchemy_page) } let!(:element) { create(:alchemy_element, page: page) } let!(:content) { create(:alchemy_content, element: element) } - it 'returns the named content from element with given id.' do + it "returns the named content from element with given id." do get :show, params: {element_id: element.id, name: content.name, format: :json} expect(response.status).to eq(200) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) - expect(result['id']).to eq(content.id) + expect(result["id"]).to eq(content.id) end end - context 'with empty element_id or name param' do - it 'returns 404 error.' do - get :show, params: {element_id: '', name: '', format: :json} + context "with empty element_id or name param" do + it "returns 404 error." do + get :show, params: {element_id: "", name: "", format: :json} expect(response.status).to eq(404) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) expect(result).to have_key("error") - expect(result['error']).to eq("Record not found") + expect(result["error"]).to eq("Record not found") end end end diff --git a/spec/controllers/alchemy/api/elements_controller_spec.rb b/spec/controllers/alchemy/api/elements_controller_spec.rb index ddd3118252..0173aeda63 100644 --- a/spec/controllers/alchemy/api/elements_controller_spec.rb +++ b/spec/controllers/alchemy/api/elements_controller_spec.rb @@ -1,12 +1,12 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Api::ElementsController do routes { Alchemy::Engine.routes } - describe '#index' do + describe "#index" do let(:page) { create(:alchemy_page, :public) } before do @@ -18,15 +18,15 @@ module Alchemy get :index, params: {format: :json} expect(response.status).to eq(200) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) - expect(result).to have_key('elements') - expect(result['elements'].last['nested_elements']).to_not be_empty - expect(result['elements'].size).to eq(Alchemy::Element.not_nested.count) + expect(result).to have_key("elements") + expect(result["elements"].last["nested_elements"]).to_not be_empty + expect(result["elements"].size).to eq(Alchemy::Element.not_nested.count) end - context 'with page_id param' do + context "with page_id param" do let!(:other_page) { create(:alchemy_page, :public) } let!(:other_element) { create(:alchemy_element, page: other_page) } @@ -34,62 +34,62 @@ module Alchemy get :index, params: {page_id: other_page.id, format: :json} expect(response.status).to eq(200) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) - expect(result).to have_key('elements') - expect(result['elements'].size).to eq(1) - expect(result['elements'][0]['page_id']).to eq(other_page.id) + expect(result).to have_key("elements") + expect(result["elements"].size).to eq(1) + expect(result["elements"][0]["page_id"]).to eq(other_page.id) end end - context 'with empty page_id param' do + context "with empty page_id param" do it "returns all not nested elements" do - get :index, params: {page_id: '', format: :json} + get :index, params: {page_id: "", format: :json} expect(response.status).to eq(200) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) - expect(result).to have_key('elements') - expect(result['elements'].size).to eq(Alchemy::Element.not_nested.count) + expect(result).to have_key("elements") + expect(result["elements"].size).to eq(Alchemy::Element.not_nested.count) end end - context 'with named param' do - let!(:other_element) { create(:alchemy_element, page: page, name: 'news') } + context "with named param" do + let!(:other_element) { create(:alchemy_element, page: page, name: "news") } it "returns only elements named like this." do - get :index, params: {named: 'news', format: :json} + get :index, params: {named: "news", format: :json} expect(response.status).to eq(200) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) - expect(result).to have_key('elements') - expect(result['elements'].size).to eq(1) - expect(result['elements'][0]['name']).to eq('news') + expect(result).to have_key("elements") + expect(result["elements"].size).to eq(1) + expect(result["elements"][0]["name"]).to eq("news") end end - context 'with empty named param' do + context "with empty named param" do it "returns all not nested elements" do - get :index, params: {named: '', format: :json} + get :index, params: {named: "", format: :json} expect(response.status).to eq(200) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) - expect(result).to have_key('elements') - expect(result['elements'].size).to eq(Alchemy::Element.not_nested.count) + expect(result).to have_key("elements") + expect(result["elements"].size).to eq(Alchemy::Element.not_nested.count) end end - context 'as author' do + context "as author" do before do authorize_user(build(:alchemy_dummy_user, :as_author)) end @@ -98,17 +98,17 @@ module Alchemy get :index, params: {format: :json} expect(response.status).to eq(200) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) - expect(result).to have_key('elements') - expect(result['elements'].size).to eq(Alchemy::Element.not_nested.count) + expect(result).to have_key("elements") + expect(result["elements"].size).to eq(Alchemy::Element.not_nested.count) end end end - describe '#show' do + describe "#show" do let(:page) { create(:alchemy_page) } let(:element) { create(:alchemy_element, page: page, position: 1) } @@ -116,26 +116,26 @@ module Alchemy get :show, params: {id: element.id, format: :json} expect(response.status).to eq(200) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) - expect(result['id']).to eq(element.id) + expect(result["id"]).to eq(element.id) end - context 'requesting an restricted element' do + context "requesting an restricted element" do let(:page) { create(:alchemy_page, restricted: true) } it "responds with 403" do get :show, params: {id: element.id, format: :json} expect(response.status).to eq(403) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) - expect(result).to have_key('error') - expect(result['error']).to eq("Not authorized") + expect(result).to have_key("error") + expect(result["error"]).to eq("Not authorized") end end end diff --git a/spec/controllers/alchemy/api/pages_controller_spec.rb b/spec/controllers/alchemy/api/pages_controller_spec.rb index 67f08cee50..57b96dc1ee 100644 --- a/spec/controllers/alchemy/api/pages_controller_spec.rb +++ b/spec/controllers/alchemy/api/pages_controller_spec.rb @@ -1,61 +1,61 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Api::PagesController do routes { Alchemy::Engine.routes } - describe '#index' do - context 'without a Language present' do + describe "#index" do + context "without a Language present" do let(:result) { JSON.parse(response.body) } - it 'returns JSON' do - get :index, params: {format: :json} - expect(result['pages']).to eq([]) + it "returns JSON" do + get :index, params: { format: :json } + expect(result["pages"]).to eq([]) end end - context 'with a language and a page present' do + context "with a language and a page present" do let!(:page) { create(:alchemy_page, :public) } let(:result) { JSON.parse(response.body) } - it 'returns JSON' do - get :index, params: {format: :json} + it "returns JSON" do + get :index, params: { format: :json } expect(response.status).to eq(200) - expect(response.media_type).to eq('application/json') - expect(result).to have_key('pages') + expect(response.media_type).to eq("application/json") + expect(result).to have_key("pages") end it "returns all public pages" do - get :index, params: {format: :json} + get :index, params: { format: :json } - expect(result['pages'].size).to eq(2) + expect(result["pages"].size).to eq(2) end - context 'as author' do + context "as author" do before do authorize_user(build(:alchemy_dummy_user, :as_author)) end it "returns all pages" do - get :index, params: {format: :json} + get :index, params: { format: :json } - expect(result['pages'].size).to eq(Alchemy::Page.count) + expect(result["pages"].size).to eq(Alchemy::Page.count) end end - it 'includes meta data' do + it "includes meta data" do get :index, params: { format: :json } - expect(result['pages'].size).to eq(2) - expect(result['meta']['page']).to be_nil - expect(result['meta']['per_page']).to eq(2) - expect(result['meta']['total_count']).to eq(2) + expect(result["pages"].size).to eq(2) + expect(result["meta"]["page"]).to be_nil + expect(result["meta"]["per_page"]).to eq(2) + expect(result["meta"]["total_count"]).to eq(2) end - context 'with page param given' do + context "with page param given" do let!(:page1) { create(:alchemy_page) } let!(:page2) { create(:alchemy_page) } @@ -63,49 +63,49 @@ module Alchemy expect(Kaminari.config).to receive(:default_per_page).at_least(:once) { 1 } end - it 'returns paginated result' do + it "returns paginated result" do get :index, params: { page: 2, format: :json } - expect(result['pages'].size).to eq(1) - expect(result['meta']['page']).to eq(2) - expect(result['meta']['per_page']).to eq(1) - expect(result['meta']['total_count']).to eq(2) + expect(result["pages"].size).to eq(1) + expect(result["meta"]["page"]).to eq(2) + expect(result["meta"]["per_page"]).to eq(1) + expect(result["meta"]["total_count"]).to eq(2) end end - context 'with ransack query param given' do - it 'returns filtered result' do + context "with ransack query param given" do + it "returns filtered result" do get :index, params: { q: { name_eq: page.name }, format: :json } - expect(result['pages'].size).to eq(1) + expect(result["pages"].size).to eq(1) end end end - describe '#nested' do - let!(:page) { create(:alchemy_page, :public, page_layout: 'contact') } + describe "#nested" do + let!(:page) { create(:alchemy_page, :public, page_layout: "contact") } it "returns all pages as nested json tree without admin related infos", :aggregate_failures do - get :nested, params: {format: :json} + get :nested, params: { format: :json } expect(response.status).to eq(200) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) - expect(result).to have_key('pages') - expect(result['pages'].size).to eq(1) - expect(result['pages'][0]).to have_key('children') - expect(result['pages'][0]['children'].size).to eq(1) + expect(result).to have_key("pages") + expect(result["pages"].size).to eq(1) + expect(result["pages"][0]).to have_key("children") + expect(result["pages"][0]["children"].size).to eq(1) - child = result['pages'][0]['children'][0] + child = result["pages"][0]["children"][0] - expect(child['name']).to eq(page.name) - expect(child).to_not have_key('definition_missing') - expect(child).to_not have_key('folded') - expect(child).to_not have_key('locked') - expect(child).to_not have_key('permissions') - expect(child).to_not have_key('status_titles') + expect(child["name"]).to eq(page.name) + expect(child).to_not have_key("definition_missing") + expect(child).to_not have_key("folded") + expect(child).to_not have_key("locked") + expect(child).to_not have_key("permissions") + expect(child).to_not have_key("status_titles") end context "as author" do @@ -114,54 +114,54 @@ module Alchemy end it "returns all pages as nested json tree with admin related infos", :aggregate_failures do - get :nested, params: {format: :json} + get :nested, params: { format: :json } expect(response.status).to eq(200) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) - expect(result).to have_key('pages') - expect(result['pages'].size).to eq(1) - expect(result['pages'][0]).to have_key('children') - expect(result['pages'][0]['children'].size).to eq(1) + expect(result).to have_key("pages") + expect(result["pages"].size).to eq(1) + expect(result["pages"][0]).to have_key("children") + expect(result["pages"][0]["children"].size).to eq(1) - child = result['pages'][0]['children'][0] + child = result["pages"][0]["children"][0] - expect(child['name']).to eq(page.name) - expect(child).to have_key('definition_missing') - expect(child).to have_key('folded') - expect(child).to have_key('locked') - expect(child).to have_key('permissions') - expect(child).to have_key('status_titles') + expect(child["name"]).to eq(page.name) + expect(child).to have_key("definition_missing") + expect(child).to have_key("folded") + expect(child).to have_key("locked") + expect(child).to have_key("permissions") + expect(child).to have_key("status_titles") end end context "when a page_id is passed" do - it 'returns all pages as nested json from this page only' do - get :nested, params: {page_id: page.id, format: :json} + it "returns all pages as nested json from this page only" do + get :nested, params: { page_id: page.id, format: :json } expect(response.status).to eq(200) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) - expect(result).to have_key('pages') - expect(result['pages'][0]['name']).to eq(page.name) + expect(result).to have_key("pages") + expect(result["pages"][0]["name"]).to eq(page.name) end end context "when `elements=true` is passed" do - it 'returns all pages as nested json tree with elements included' do - get :nested, params: {elements: 'true', format: :json} + it "returns all pages as nested json tree with elements included" do + get :nested, params: { elements: "true", format: :json } expect(response.status).to eq(200) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) - expect(result).to have_key('pages') - expect(result['pages'][0]).to have_key('elements') + expect(result).to have_key("pages") + expect(result["pages"][0]).to have_key("elements") end context "and elements is a comma separated list of element names" do @@ -169,128 +169,129 @@ module Alchemy page.send(:generate_elements) end - it 'returns all pages as nested json tree with only these elements included' do - get :nested, params: {elements: 'headline,text', format: :json} + it "returns all pages as nested json tree with only these elements included" do + get :nested, params: { elements: "headline,text", format: :json } result = JSON.parse(response.body) - elements = result['pages'][0]['children'][0]['elements'] - element_names = elements.collect { |element| element['name'] } - expect(element_names).to include('headline', 'text') - expect(element_names).to_not include('contactform') + elements = result["pages"][0]["children"][0]["elements"] + element_names = elements.collect { |element| element["name"] } + expect(element_names).to include("headline", "text") + expect(element_names).to_not include("contactform") end end end end end - describe '#show' do - context 'for existing page' do - let(:page) { create(:alchemy_page, :public, urlname: 'a-page') } + describe "#show" do + context "for existing page" do + let(:page) { create(:alchemy_page, :public, urlname: "a-page") } it "returns page as json" do - get :show, params: {urlname: page.urlname, format: :json} + get :show, params: { urlname: page.urlname, format: :json } expect(response.status).to eq(200) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) - expect(result['id']).to eq(page.id) + expect(result["id"]).to eq(page.id) + expect(result["url_path"]).to eq("/a-page") end - context 'requesting an restricted page' do - let(:page) { create(:alchemy_page, restricted: true, urlname: 'a-page') } + context "requesting an restricted page" do + let(:page) { create(:alchemy_page, restricted: true, urlname: "a-page") } it "responds with 403" do - get :show, params: {urlname: page.urlname, format: :json} + get :show, params: { urlname: page.urlname, format: :json } expect(response.status).to eq(403) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) - expect(result).to have_key('error') - expect(result['error']).to eq("Not authorized") + expect(result).to have_key("error") + expect(result["error"]).to eq("Not authorized") end end - context 'requesting a not public page' do - let(:page) { create(:alchemy_page, urlname: 'a-page') } + context "requesting a not public page" do + let(:page) { create(:alchemy_page, urlname: "a-page") } it "responds with 403" do - get :show, params: {urlname: page.urlname, format: :json} + get :show, params: { urlname: page.urlname, format: :json } expect(response.status).to eq(403) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) - expect(result).to have_key('error') - expect(result['error']).to eq("Not authorized") + expect(result).to have_key("error") + expect(result["error"]).to eq("Not authorized") end end end - context 'requesting an unknown page' do + context "requesting an unknown page" do it "responds with 404" do - get :show, params: {urlname: 'not-existing', format: :json} + get :show, params: { urlname: "not-existing", format: :json } expect(response.status).to eq(404) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) - expect(result).to have_key('error') - expect(result['error']).to eq("Record not found") + expect(result).to have_key("error") + expect(result["error"]).to eq("Record not found") end context "because of requesting not existing language" do let(:page) { create(:alchemy_page, :public) } it "responds with 404" do - get :show, params: {urlname: page.urlname, locale: 'na', format: :json} + get :show, params: { urlname: page.urlname, locale: "na", format: :json } expect(response.status).to eq(404) end end end - context 'requesting a page with id' do + context "requesting a page with id" do let(:page) { create(:alchemy_page, :public) } it "responds with json" do - get :show, params: {urlname: page.id, format: :json} + get :show, params: { urlname: page.id, format: :json } expect(response.status).to eq(200) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) - expect(result['id']).to eq(page.id) + expect(result["id"]).to eq(page.id) end end - context 'in an environment with multiple languages' do + context "in an environment with multiple languages" do let!(:default_language) { create(:alchemy_language, :english, default: true) } let(:klingon) { create(:alchemy_language, :klingon) } - context 'having two pages with the same url names in different languages' do + context "having two pages with the same url names in different languages" do let!(:english_page) { create(:alchemy_page, :public, language: default_language, name: "same-name") } let!(:klingon_page) { create(:alchemy_page, :public, language: klingon, name: "same-name") } - context 'when a locale is given' do - it 'renders the page related to its language' do - get :show, params: {urlname: "same-name", locale: klingon_page.language_code, format: :json} + context "when a locale is given" do + it "renders the page related to its language" do + get :show, params: { urlname: "same-name", locale: klingon_page.language_code, format: :json } result = JSON.parse(response.body) - expect(result['id']).to eq(klingon_page.id) + expect(result["id"]).to eq(klingon_page.id) end end - context 'when no locale is given' do - it 'renders the page of the default language' do - get :show, params: {urlname: "same-name", format: :json} + context "when no locale is given" do + it "renders the page of the default language" do + get :show, params: { urlname: "same-name", format: :json } result = JSON.parse(response.body) - expect(result['id']).to eq(english_page.id) + expect(result["id"]).to eq(english_page.id) end end end diff --git a/spec/controllers/alchemy/attachments_controller_spec.rb b/spec/controllers/alchemy/attachments_controller_spec.rb index f25a409004..86b8b6ef2e 100644 --- a/spec/controllers/alchemy/attachments_controller_spec.rb +++ b/spec/controllers/alchemy/attachments_controller_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe AttachmentsController do @@ -12,7 +12,7 @@ module Alchemy expect { get :download, params: {id: 0} }.to raise_error(ActiveRecord::RecordNotFound) end - context 'with public attachment' do + context "with public attachment" do before do allow(Attachment).to receive(:find).and_return(attachment) end @@ -20,35 +20,35 @@ module Alchemy it "sends download as attachment." do get :download, params: {id: attachment.id} expect(response.status).to eq(200) - expect(response.headers['Content-Disposition']).to match(/attachment/) + expect(response.headers["Content-Disposition"]).to match(/attachment/) end it "sends download inline." do get :show, params: {id: attachment.id} expect(response.status).to eq(200) - expect(response.headers['Content-Disposition']).to match(/inline/) + expect(response.headers["Content-Disposition"]).to match(/inline/) end context "adds Content-Length to header" do it "when downloading attachment" do get :download, params: {id: attachment.id} - expect(response.headers['Content-Length']).to eq(attachment.file_size.to_s) + expect(response.headers["Content-Length"]).to eq(attachment.file_size.to_s) end it "when showing attachment" do get :show, params: {id: attachment.id} - expect(response.headers['Content-Length']).to eq(attachment.file_size.to_s) + expect(response.headers["Content-Length"]).to eq(attachment.file_size.to_s) end end end - context 'with restricted attachment' do + context "with restricted attachment" do before do allow(attachment).to receive(:restricted?).and_return(true) allow(Attachment).to receive(:find).and_return(attachment) end - context 'as anonymous user' do + context "as anonymous user" do it "should not be possible to download attachments from restricted pages" do get :download, params: {id: attachment.id} expect(response.status).to eq(302) diff --git a/spec/controllers/alchemy/base_controller_spec.rb b/spec/controllers/alchemy/base_controller_spec.rb index 1ad49a6ba8..8287779e22 100644 --- a/spec/controllers/alchemy/base_controller_spec.rb +++ b/spec/controllers/alchemy/base_controller_spec.rb @@ -1,11 +1,11 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe BaseController do - describe '#set_locale' do - context 'with Language.current set' do + describe "#set_locale" do + context "with Language.current set" do let(:language) { create(:alchemy_language, :klingon) } before { Alchemy::Language.current = language } @@ -16,7 +16,7 @@ module Alchemy end end - context 'without Language.current set' do + context "without Language.current set" do before { Alchemy::Language.current = nil } it "does not set the ::I18n.locale" do @@ -59,14 +59,14 @@ module Alchemy let!(:default_site) { create(:alchemy_site, :default) } let!(:site_2) do - create(:alchemy_site, host: 'another-host.com') + create(:alchemy_site, host: "another-host.com") end let!(:site_2_language_2) do create(:alchemy_language, :klingon, site: site_2) end - it 'only is true for current site' do + it "only is true for current site" do is_expected.to be(false) end end @@ -83,7 +83,7 @@ module Alchemy context "and current language is not the default locale" do before do - allow(Alchemy::Language).to receive(:current) { double(code: 'kl') } + allow(Alchemy::Language).to receive(:current) { double(code: "kl") } allow(::I18n).to receive(:default_locale) { :de } end @@ -92,7 +92,7 @@ module Alchemy context "and current language is the default locale" do before do - allow(Alchemy::Language).to receive(:current) { double(code: 'de') } + allow(Alchemy::Language).to receive(:current) { double(code: "de") } allow(::I18n).to receive(:default_locale) { :de } end @@ -100,7 +100,7 @@ module Alchemy end context "and passed in locale is not the default locale" do - subject(:prefix_locale?) { controller.prefix_locale?('en') } + subject(:prefix_locale?) { controller.prefix_locale?("en") } before do allow(::I18n).to receive(:default_locale) { :de } @@ -110,7 +110,7 @@ module Alchemy end context "and passed in locale is the default locale" do - subject(:prefix_locale?) { controller.prefix_locale?('de') } + subject(:prefix_locale?) { controller.prefix_locale?("de") } before do allow(::I18n).to receive(:default_locale) { :de } diff --git a/spec/controllers/alchemy/elements_controller_spec.rb b/spec/controllers/alchemy/elements_controller_spec.rb index 2ddfc9869f..bcbe46c07a 100644 --- a/spec/controllers/alchemy/elements_controller_spec.rb +++ b/spec/controllers/alchemy/elements_controller_spec.rb @@ -1,17 +1,17 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe ElementsController do routes { Alchemy::Engine.routes } let(:public_page) { create(:alchemy_page, :public) } - let(:element) { create(:alchemy_element, page: public_page, name: 'download') } + let(:element) { create(:alchemy_element, page: public_page, name: "download") } let(:restricted_page) { create(:alchemy_page, :public, restricted: true) } - let(:restricted_element) { create(:alchemy_element, page: restricted_page, name: 'download') } + let(:restricted_element) { create(:alchemy_element, page: restricted_page, name: "download") } - describe '#show' do + describe "#show" do it "should render available elements" do get :show, params: {id: element.id} expect(response.status).to eq(200) diff --git a/spec/controllers/alchemy/messages_controller_spec.rb b/spec/controllers/alchemy/messages_controller_spec.rb index 43c5a4579d..504544b568 100644 --- a/spec/controllers/alchemy/messages_controller_spec.rb +++ b/spec/controllers/alchemy/messages_controller_spec.rb @@ -1,12 +1,12 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe MessagesController do routes { Alchemy::Engine.routes } - let(:page) { mock_model('Page') } + let(:page) { mock_model("Page") } before do controller.instance_variable_set(:@page, page) @@ -14,7 +14,7 @@ module Alchemy end describe "#index" do - let(:page) { mock_model('Page', {urlname: 'contact', page_layout: 'contact'}) } + let(:page) { mock_model("Page", {urlname: "contact", page_layout: "contact"}) } it "should redirect to @page" do expect(get(:index)).to redirect_to(show_page_path(urlname: page.urlname)) @@ -24,17 +24,17 @@ module Alchemy describe "#new" do it "should render the alchemy/pages/show template" do get :new - expect(get(:new)).to render_template('alchemy/pages/show') + expect(get(:new)).to render_template("alchemy/pages/show") end end describe "#create" do subject do - post :create, params: {message: {email: ''}} + post :create, params: {message: {email: ""}} end - let(:page) { mock_model('Page', get_language_root: mock_model('Page')) } - let(:element) { mock_model('Element', page: page, ingredient: '') } + let(:page) { mock_model("Page", get_language_root: mock_model("Page")) } + let(:element) { mock_model("Element", page: page, ingredient: "") } let(:message) { Message.new } it "should raise ActiveRecord::RecordNotFound if element of contactform could not be found" do @@ -44,7 +44,7 @@ module Alchemy context "if validation of message" do before do allow(Element).to receive(:find_by).and_return(element) - allow(element).to receive(:ingredient).with(:success_page).and_return('thank-you') + allow(element).to receive(:ingredient).with(:success_page).and_return("thank-you") allow_any_instance_of(Message).to receive(:contact_form_id).and_return(1) end @@ -54,7 +54,7 @@ module Alchemy end it "should render 'alchemy/pages/show' template" do - expect(subject).to render_template('alchemy/pages/show') + expect(subject).to render_template("alchemy/pages/show") end end @@ -69,16 +69,16 @@ module Alchemy subject end - describe '#mail_to' do + describe "#mail_to" do context "with element having mail_to ingredient" do before do - allow(element).to receive(:ingredient).with(:mail_to).and_return('peter@schroeder.de') + allow(element).to receive(:ingredient).with(:mail_to).and_return("peter@schroeder.de") message allow(Message).to receive(:new).and_return(message) end it "returns the ingredient" do - expect(MessagesMailer).to receive(:contact_form_mail).with(message, 'peter@schroeder.de', '', '') + expect(MessagesMailer).to receive(:contact_form_mail).with(message, "peter@schroeder.de", "", "") subject end end @@ -91,22 +91,22 @@ module Alchemy end it "returns the config value" do - expect(MessagesMailer).to receive(:contact_form_mail).with(message, 'your.mail@your-domain.com', '', '') + expect(MessagesMailer).to receive(:contact_form_mail).with(message, "your.mail@your-domain.com", "", "") subject end end end - describe '#mail_from' do + describe "#mail_from" do context "with element having mail_from ingredient" do before do - allow(element).to receive(:ingredient).with(:mail_from).and_return('peter@schroeder.de') + allow(element).to receive(:ingredient).with(:mail_from).and_return("peter@schroeder.de") message allow(Message).to receive(:new).and_return(message) end it "returns the ingredient" do - expect(MessagesMailer).to receive(:contact_form_mail).with(message, '', 'peter@schroeder.de', '') + expect(MessagesMailer).to receive(:contact_form_mail).with(message, "", "peter@schroeder.de", "") subject end end @@ -119,22 +119,22 @@ module Alchemy end it "returns the config value" do - expect(MessagesMailer).to receive(:contact_form_mail).with(message, '', 'your.mail@your-domain.com', '') + expect(MessagesMailer).to receive(:contact_form_mail).with(message, "", "your.mail@your-domain.com", "") subject end end end - describe '#subject' do + describe "#subject" do context "with element having subject ingredient" do before do - allow(element).to receive(:ingredient).with(:subject).and_return('A new message') + allow(element).to receive(:ingredient).with(:subject).and_return("A new message") message allow(Message).to receive(:new).and_return(message) end it "returns the ingredient" do - expect(MessagesMailer).to receive(:contact_form_mail).with(message, '', '', 'A new message') + expect(MessagesMailer).to receive(:contact_form_mail).with(message, "", "", "A new message") subject end end @@ -147,7 +147,7 @@ module Alchemy end it "returns the config value" do - expect(MessagesMailer).to receive(:contact_form_mail).with(message, '', '', 'A new contact form message') + expect(MessagesMailer).to receive(:contact_form_mail).with(message, "", "", "A new contact form message") subject end end @@ -155,20 +155,20 @@ module Alchemy describe "#redirect_to_success_page" do context "if 'success_page' ingredient of element" do - context 'is set with urlname string' do + context "is set with urlname string" do before do - allow(element).to receive(:ingredient).with(:success_page).and_return('success-page') + allow(element).to receive(:ingredient).with(:success_page).and_return("success-page") end it "should redirect to the given urlname" do expect( - subject - ).to redirect_to(show_page_path(urlname: 'success-page')) + subject, + ).to redirect_to(show_page_path(urlname: "success-page")) end end - context 'is set with page instance' do - let(:page) { build(:alchemy_page, name: 'Success', urlname: 'success-page') } + context "is set with page instance" do + let(:page) { build(:alchemy_page, name: "Success", urlname: "success-page") } before do allow(element).to receive(:ingredient).with(:success_page).and_return(page) @@ -176,8 +176,8 @@ module Alchemy it "should redirect to the given urlname" do expect( - subject - ).to redirect_to(show_page_path(urlname: 'success-page')) + subject, + ).to redirect_to(show_page_path(urlname: "success-page")) end end end @@ -191,34 +191,34 @@ module Alchemy before do allow(controller).to receive(:mailer_config) do { - 'fields' => %w(email), - 'forward_to_page' => true, - 'mail_success_page' => 'mailer-config-success-page' + "fields" => %w(email), + "forward_to_page" => true, + "mail_success_page" => "mailer-config-success-page", } end - allow(Page).to receive(:find_by).and_return double(urlname: 'mailer-config-success-page') + allow(Page).to receive(:find_by).and_return double(urlname: "mailer-config-success-page") end it "redirect to the given success page" do expect( - subject - ).to redirect_to(show_page_path(urlname: 'mailer-config-success-page')) + subject, + ).to redirect_to(show_page_path(urlname: "mailer-config-success-page")) end end context "and mailer_config has no instructions for success_page" do - let(:language) { mock_model('Language', code: 'en', locale: 'en', pages: double(find_by: build_stubbed(:alchemy_page))) } + let(:language) { mock_model("Language", code: "en", locale: "en", pages: double(find_by: build_stubbed(:alchemy_page))) } before do - allow(controller).to receive(:mailer_config).and_return({'fields' => %w(email)}) - allow(Language).to receive(:current_root_page).and_return double(urlname: 'lang-root') + allow(controller).to receive(:mailer_config).and_return({"fields" => %w(email)}) + allow(Language).to receive(:current_root_page).and_return double(urlname: "lang-root") end it "should redirect to the language root page" do allow(Language).to receive(:current).and_return(language) expect( - subject - ).to redirect_to(show_page_path(urlname: 'lang-root')) + subject, + ).to redirect_to(show_page_path(urlname: "lang-root")) end end end diff --git a/spec/controllers/alchemy/on_page_layout_mixin_spec.rb b/spec/controllers/alchemy/on_page_layout_mixin_spec.rb index 2c07c94a9d..2c3fc3fc8b 100644 --- a/spec/controllers/alchemy/on_page_layout_mixin_spec.rb +++ b/spec/controllers/alchemy/on_page_layout_mixin_spec.rb @@ -1,18 +1,18 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -RSpec.describe Alchemy::PagesController, 'OnPageLayout mixin', type: :controller do +RSpec.describe Alchemy::PagesController, "OnPageLayout mixin", type: :controller do routes { Alchemy::Engine.routes } before(:all) do ApplicationController.extend Alchemy::OnPageLayout end - let(:page) { create(:alchemy_page, :public, page_layout: 'standard') } + let(:page) { create(:alchemy_page, :public, page_layout: "standard") } - describe '.on_page_layout' do - context 'with :all as argument for page_layout' do + describe ".on_page_layout" do + context "with :all as argument for page_layout" do before do ApplicationController.class_eval do on_page_layout(:all) do @@ -43,7 +43,7 @@ end end - context 'with :standard as argument for page_layout' do + context "with :standard as argument for page_layout" do before do ApplicationController.class_eval do on_page_layout(:standard) do @@ -52,28 +52,28 @@ end end - context 'and page having standard layout' do + context "and page having standard layout" do context "for show action" do - let(:page) { create(:alchemy_page, :public, page_layout: 'standard') } + let(:page) { create(:alchemy_page, :public, page_layout: "standard") } - it 'runs the callback' do + it "runs the callback" do get :show, params: {urlname: page.urlname} expect(assigns(:successful_for_standard)).to eq(true) end end context "for index action" do - let!(:page) { create(:alchemy_page, :language_root, page_layout: 'standard') } + let!(:page) { create(:alchemy_page, :language_root, page_layout: "standard") } - it 'runs the callback' do + it "runs the callback" do get :index expect(assigns(:successful_for_standard)).to eq(true) end end end - context 'and page not having standard layout' do - let(:page) { create(:alchemy_page, :public, page_layout: 'news') } + context "and page not having standard layout" do + let(:page) { create(:alchemy_page, :public, page_layout: "news") } context "for show action" do it "doesn't run the callback" do @@ -83,7 +83,7 @@ end context "for index action" do - let!(:page) { create(:alchemy_page, :language_root, page_layout: 'news') } + let!(:page) { create(:alchemy_page, :language_root, page_layout: "news") } it "doesn't run the callback" do get :index @@ -93,7 +93,7 @@ end end - context 'when defining two callbacks for different page layouts' do + context "when defining two callbacks for different page layouts" do context "for show action" do before do ApplicationController.class_eval do @@ -141,7 +141,7 @@ end end - context 'when defining two callbacks for the same page_layout' do + context "when defining two callbacks for the same page_layout" do before do ApplicationController.class_eval do on_page_layout(:standard) do @@ -155,7 +155,7 @@ end context "for show action" do - it 'runs both callbacks' do + it "runs both callbacks" do get :show, params: {urlname: page.urlname} expect(assigns(:successful_for_standard_first)).to eq(true) expect(assigns(:successful_for_standard_second)).to eq(true) @@ -163,9 +163,9 @@ end context "for index action" do - let!(:page) { create(:alchemy_page, :language_root, page_layout: 'standard') } + let!(:page) { create(:alchemy_page, :language_root, page_layout: "standard") } - it 'runs both callbacks' do + it "runs both callbacks" do get :index expect(assigns(:successful_for_standard_first)).to eq(true) expect(assigns(:successful_for_standard_second)).to eq(true) @@ -173,7 +173,7 @@ end end - context 'when block is given' do + context "when block is given" do before do ApplicationController.class_eval do on_page_layout :standard do @@ -182,24 +182,24 @@ end end - context 'for show action' do - it 'evaluates the given block' do + context "for show action" do + it "evaluates the given block" do get :show, params: {urlname: page.urlname} expect(assigns(:successful_for_callback_method)).to eq(true) end end - context 'for index action' do - let!(:page) { create(:alchemy_page, :language_root, page_layout: 'standard') } + context "for index action" do + let!(:page) { create(:alchemy_page, :language_root, page_layout: "standard") } - it 'evaluates the given block' do + it "evaluates the given block" do get :index expect(assigns(:successful_for_callback_method)).to eq(true) end end end - context 'when callback method name is given' do + context "when callback method name is given" do before do ApplicationController.class_eval do on_page_layout :standard, :run_method @@ -210,25 +210,25 @@ def run_method end end - context 'for show action' do - it 'runs the given callback method' do + context "for show action" do + it "runs the given callback method" do get :show, params: {urlname: page.urlname} expect(assigns(:successful_for_callback_method)).to eq(true) end end - context 'for index action' do - let!(:page) { create(:alchemy_page, :language_root, page_layout: 'standard') } + context "for index action" do + let!(:page) { create(:alchemy_page, :language_root, page_layout: "standard") } - it 'runs the given callback method' do + it "runs the given callback method" do get :index expect(assigns(:successful_for_callback_method)).to eq(true) end end end - context 'when neither callback method name nor block given' do - it 'raises an ArgumentError' do + context "when neither callback method name nor block given" do + it "raises an ArgumentError" do expect do ApplicationController.class_eval do on_page_layout :standard @@ -237,7 +237,7 @@ def run_method end end - context 'when passing two page_layouts for a callback' do + context "when passing two page_layouts for a callback" do before do ApplicationController.class_eval do on_page_layout([:standard, :news]) do @@ -247,7 +247,7 @@ def run_method end %w(standard news).each do |page_layout| - it 'evaluates the given callback on both page_layouts for show action' do + it "evaluates the given callback on both page_layouts for show action" do page = create(:alchemy_page, :public, page_layout: page_layout) get :show, params: {urlname: page.urlname} @@ -256,7 +256,7 @@ def run_method end %w(standard news).each do |page_layout| - it 'evaluates the given callback on both page_layouts for index action' do + it "evaluates the given callback on both page_layouts for index action" do create(:alchemy_page, :language_root, page_layout: page_layout) get :index @@ -267,7 +267,7 @@ def run_method end end -RSpec.describe ApplicationController, 'OnPageLayout mixin', type: :controller do +RSpec.describe ApplicationController, "OnPageLayout mixin", type: :controller do before(:all) do ApplicationController.extend Alchemy::OnPageLayout end @@ -279,7 +279,7 @@ def index end end - context 'in another controller' do + context "in another controller" do before do ApplicationController.class_eval do on_page_layout(:standard) do @@ -288,7 +288,7 @@ def index end end - it 'callback does not run' do + it "callback does not run" do get :index expect(assigns(:another_controller)).to eq(true) expect(assigns(:successful_for_another_controller)).to eq(nil) @@ -296,14 +296,14 @@ def index end end -RSpec.describe Alchemy::Admin::PagesController, 'OnPageLayout mixin', type: :controller do +RSpec.describe Alchemy::Admin::PagesController, "OnPageLayout mixin", type: :controller do routes { Alchemy::Engine.routes } before(:all) do ApplicationController.extend Alchemy::OnPageLayout end - context 'in admin/pages_controller' do + context "in admin/pages_controller" do before do ApplicationController.class_eval do on_page_layout(:standard) do @@ -314,16 +314,16 @@ def index end context "for show action" do - let(:page) { create(:alchemy_page, page_layout: 'standard') } + let(:page) { create(:alchemy_page, page_layout: "standard") } - it 'callback also runs' do + it "callback also runs" do get :show, params: {id: page.id} expect(assigns(:successful_for_alchemy_admin_pages_controller)).to be(true) end end context "for index action" do - it 'does not run callback' do + it "does not run callback" do get :index expect(assigns(:successful_for_alchemy_admin_pages_controller)).to be(nil) end diff --git a/spec/controllers/alchemy/pages_controller_spec.rb b/spec/controllers/alchemy/pages_controller_spec.rb index 20c07e6ca1..1a01297168 100644 --- a/spec/controllers/alchemy/pages_controller_spec.rb +++ b/spec/controllers/alchemy/pages_controller_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true -require 'ostruct' -require 'rails_helper' +require "ostruct" +require "rails_helper" module Alchemy describe PagesController do @@ -10,15 +10,15 @@ module Alchemy let(:default_language) { create(:alchemy_language) } let(:default_language_root) do - create(:alchemy_page, :language_root, language: default_language, name: 'Home') + create(:alchemy_page, :language_root, language: default_language, name: "Home") end let(:page) do create :alchemy_page, :public, parent_id: default_language_root.id, - page_layout: 'news', - name: 'News', - urlname: 'news', + page_layout: "news", + name: "News", + urlname: "news", language: default_language, autogenerate_elements: true end @@ -28,46 +28,46 @@ module Alchemy end describe "#index" do - context 'without a site or language present' do - it 'returns a 404' do + context "without a site or language present" do + it "returns a 404" do expect { get(:index) }.to raise_exception( ActionController::RoutingError, - 'Alchemy::Page not found "/"' + 'Alchemy::Page not found "/"', ) end end - context 'with site and language root present' do + context "with site and language root present" do before do default_language_root end - it 'renders :show template' do + it "renders :show template" do expect(get(:index)).to render_template(:show) end - context 'requesting nothing' do - it 'loads default language root page' do + context "requesting nothing" do + it "loads default language root page" do get :index expect(assigns(:page)).to eq(default_language_root) end - it 'sets @root_page to default language root' do + it "sets @root_page to default language root" do get :index expect(assigns(:root_page)).to eq(default_language_root) end - context 'and the root page is not public' do + context "and the root page is not public" do before do default_language_root.update!(public_on: nil) end - context 'and redirect_to_public_child is set to false' do + context "and redirect_to_public_child is set to false" do before do stub_alchemy_config(:redirect_to_public_child, false) end - it 'raises routing error (404)' do + it "raises routing error (404)" do expect { get :index }.to raise_error(ActionController::RoutingError) @@ -77,7 +77,7 @@ module Alchemy before do ApplicationController.extend Alchemy::OnPageLayout ApplicationController.class_eval do - on_page_layout('index') { "do something" } + on_page_layout("index") { "do something" } end end @@ -89,44 +89,44 @@ module Alchemy end end - context 'and redirect_to_public_child is set to true' do + context "and redirect_to_public_child is set to true" do before do stub_alchemy_config(:redirect_to_public_child, true) end - context 'that has a public child' do + context "that has a public child" do let!(:public_child) do create(:alchemy_page, :public, parent: default_language_root) end - it 'loads this page' do + it "loads this page" do get :index expect(assigns(:page)).to eq(public_child) end end - context 'that has a non public child' do + context "that has a non public child" do let!(:non_public_child) do create(:alchemy_page, parent: default_language_root) end - context 'that has a public child' do + context "that has a public child" do let!(:public_child) do create(:alchemy_page, :public, parent: non_public_child) end - it 'loads this page' do + it "loads this page" do get :index expect(assigns(:page)).to eq(public_child) end end - context 'that has a non public child' do + context "that has a non public child" do before do create(:alchemy_page, parent: non_public_child) end - it 'raises routing error (404)' do + it "raises routing error (404)" do expect { get :index }.to raise_error(ActionController::RoutingError) @@ -137,34 +137,34 @@ module Alchemy end end - context 'requesting non default locale' do - let!(:english) do - create(:alchemy_language, :english, default: false) + context "requesting non default locale" do + let!(:klingon) do + create(:alchemy_language, :klingon, default: false) end let!(:start_page) do create :alchemy_page, :language_root, - language: english, - name: 'Start Page' + language: klingon, + name: "Start Page" end before do - allow(::I18n).to receive(:default_locale) { 'de' } + allow(::I18n).to receive(:default_locale) { "de" } end - it 'loads the root page of that language' do - get :index, params: {locale: 'en'} + it "loads the root page of that language" do + get :index, params: { locale: "kl" } expect(assigns(:page)).to eq(start_page) end - it 'sets @root_page to root page of that language' do - get :index, params: {locale: 'en'} + it "sets @root_page to root page of that language" do + get :index, params: { locale: "kl" } expect(assigns(:root_page)).to eq(start_page) end end end - describe 'requesting a not yet public page' do + describe "requesting a not yet public page" do let(:not_yet_public) do create :alchemy_page, parent: default_language_root, @@ -173,12 +173,12 @@ module Alchemy it "renders 404" do expect { - get :show, params: {urlname: not_yet_public.urlname} + get :show, params: { urlname: not_yet_public.urlname } }.to raise_error(ActionController::RoutingError) end end - describe 'requesting a no longer public page' do + describe "requesting a no longer public page" do let(:no_longer_public) do create :alchemy_page, parent: default_language_root, @@ -188,12 +188,12 @@ module Alchemy it "renders 404" do expect { - get :show, params: {urlname: no_longer_public.urlname} + get :show, params: { urlname: no_longer_public.urlname } }.to raise_error(ActionController::RoutingError) end end - describe 'requesting a still public page' do + describe "requesting a still public page" do let(:still_public_page) do create :alchemy_page, parent: default_language_root, @@ -202,12 +202,12 @@ module Alchemy end it "renders page" do - get :show, params: {urlname: still_public_page.urlname} + get :show, params: { urlname: still_public_page.urlname } expect(response).to be_successful end end - describe 'requesting a page without time limit' do + describe "requesting a page without time limit" do let(:still_public_page) do create :alchemy_page, parent: default_language_root, @@ -216,7 +216,7 @@ module Alchemy end it "renders page" do - get :show, params: {urlname: still_public_page.urlname} + get :show, params: { urlname: still_public_page.urlname } expect(response).to be_successful end end @@ -225,20 +225,20 @@ module Alchemy render_views it "should render a rss feed" do - get :show, params: {urlname: page.urlname, format: :rss} - expect(response.media_type).to eq('application/rss+xml') + get :show, params: { urlname: page.urlname, format: :rss } + expect(response.media_type).to eq("application/rss+xml") end it "should include content" do - page.elements.first.content_by_name('news_headline').essence.update_columns(body: 'Peters Petshop') - get :show, params: {urlname: 'news', format: :rss} + page.elements.first.content_by_name("news_headline").essence.update_columns(body: "Peters Petshop") + get :show, params: { urlname: "news", format: :rss } expect(response.body).to match /Peters Petshop/ end end context "requested for a page that does not contain a feed" do it "should render xml 404 error" do - get :show, params: {urlname: default_language_root.urlname, format: :rss} + get :show, params: { urlname: default_language_root.urlname, format: :rss } expect(response.status).to eq(404) end end @@ -246,9 +246,9 @@ module Alchemy describe "Layout rendering" do context "with ajax request" do it "should not render a layout" do - get :show, params: {urlname: page.urlname}, xhr: true + get :show, params: { urlname: page.urlname }, xhr: true expect(response).to render_template(:show) - expect(response).not_to render_template(layout: 'application') + expect(response).not_to render_template(layout: "application") end end end @@ -256,19 +256,18 @@ module Alchemy describe "url nesting" do render_views - let(:catalog) { create(:alchemy_page, :public, name: "Catalog", urlname: 'catalog', parent: default_language_root, language: default_language, visible: true) } - let(:products) { create(:alchemy_page, :public, name: "Products", urlname: 'products', parent: catalog, language: default_language, visible: true) } - let(:product) { create(:alchemy_page, :public, name: "Screwdriver", urlname: 'screwdriver', parent: products, language: default_language, autogenerate_elements: true, visible: true) } + let(:catalog) { create(:alchemy_page, :public, name: "Catalog", urlname: "catalog", parent: default_language_root, language: default_language) } + let(:products) { create(:alchemy_page, :public, name: "Products", urlname: "products", parent: catalog, language: default_language) } + let(:product) { create(:alchemy_page, :public, name: "Screwdriver", urlname: "screwdriver", parent: products, language: default_language, autogenerate_elements: true) } before do allow(Alchemy.user_class).to receive(:admins).and_return(OpenStruct.new(count: 1)) - stub_alchemy_config(:url_nesting, true) - product.elements.find_by_name('article').contents.essence_texts.first.essence.update_column(:body, 'screwdriver') + product.elements.find_by_name("article").contents.essence_texts.first.essence.update_column(:body, "screwdriver") end context "with correct levelnames in params" do it "should show the requested page" do - get :show, params: {urlname: 'catalog/products/screwdriver'} + get :show, params: { urlname: "catalog/products/screwdriver" } expect(response.status).to eq(200) expect(response.body).to have_content("screwdriver") end @@ -277,7 +276,7 @@ module Alchemy context "with incorrect levelnames in params" do it "should render a 404 page" do expect { - get :show, params: {urlname: 'catalog/faqs/screwdriver'} + get :show, params: { urlname: "catalog/faqs/screwdriver" } }.to raise_error(ActionController::RoutingError) end end @@ -286,7 +285,7 @@ module Alchemy context "when a non-existent page is requested" do it "should rescue a RoutingError with rendering a 404 page." do expect { - get :show, params: {urlname: 'doesntexist'} + get :show, params: { urlname: "doesntexist" } }.to raise_error(ActionController::RoutingError) end end @@ -299,22 +298,22 @@ module Alchemy context "with no lang parameter present" do it "should store defaults language id in the session." do - get :show, params: {urlname: page.urlname} + get :show, params: { urlname: page.urlname } expect(controller.session[:alchemy_language_id]).to eq(Language.default.id) end it "should store default language as class var." do - get :show, params: {urlname: page.urlname} + get :show, params: { urlname: page.urlname } expect(Language.current).to eq(Language.default) end end end end - context 'in an environment with multiple languages' do + context "in an environment with multiple languages" do let(:klingon) { create(:alchemy_language, :klingon) } - context 'having two pages with the same url names in different languages' do + context "having two pages with the same url names in different languages" do render_views let!(:klingon_page) { create(:alchemy_page, :public, language: klingon, name: "same-name", autogenerate_elements: true) } @@ -322,35 +321,35 @@ module Alchemy before do # Set a text in an essence rendered on the page so we can match against that - klingon_page.essence_texts.first.update_column(:body, 'klingon page') + klingon_page.essence_texts.first.update_column(:body, "klingon page") end - it 'renders the page related to its language' do - get :show, params: {urlname: "same-name", locale: klingon_page.language_code} + it "renders the page related to its language" do + get :show, params: { urlname: "same-name", locale: klingon_page.language_code } expect(response.body).to have_content("klingon page") end end end - describe '#page_etag' do + describe "#page_etag" do subject { controller.send(:page_etag) } before do - expect(page).to receive(:cache_key).and_return('aaa') - controller.instance_variable_set('@page', page) + expect(page).to receive(:cache_key).and_return("aaa") + controller.instance_variable_set("@page", page) end it "returns the etag for response headers" do - expect(subject).to eq('aaa') + expect(subject).to eq("aaa") end - context 'with user logged in' do + context "with user logged in" do before do - authorize_user(mock_model(Alchemy.user_class, cache_key: 'bbb')) + authorize_user(mock_model(Alchemy.user_class, cache_key: "bbb")) end it "returns another etag for response headers" do - expect(subject).to eq('aaabbb') + expect(subject).to eq("aaabbb") end end end diff --git a/spec/decorators/alchemy/content_editor_spec.rb b/spec/decorators/alchemy/content_editor_spec.rb index 8d7572e145..69cf742917 100644 --- a/spec/decorators/alchemy/content_editor_spec.rb +++ b/spec/decorators/alchemy/content_editor_spec.rb @@ -1,21 +1,21 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" RSpec.describe Alchemy::ContentEditor do let(:essence) { Alchemy::EssenceText.new } let(:content) { Alchemy::Content.new(id: 1, essence: essence) } let(:content_editor) { described_class.new(content) } - describe '#content' do - it 'returns content object' do + describe "#content" do + it "returns content object" do expect(content_editor.content).to eq(content) end end describe "#css_classes" do it "includes content_editor class" do - expect(content_editor.css_classes).to include('content_editor') + expect(content_editor.css_classes).to include("content_editor") end it "includes essence partial class" do @@ -33,39 +33,39 @@ end end - describe '#to_partial_path' do + describe "#to_partial_path" do subject { content_editor.to_partial_path } - it 'returns the editor partial path' do - is_expected.to eq('alchemy/essences/essence_text_editor') + it "returns the editor partial path" do + is_expected.to eq("alchemy/essences/essence_text_editor") end end - describe '#form_field_name' do + describe "#form_field_name" do it "returns a name value for form fields with ingredient as default" do - expect(content_editor.form_field_name).to eq('contents[1][ingredient]') + expect(content_editor.form_field_name).to eq("contents[1][ingredient]") end - context 'with a essence column given' do + context "with a essence column given" do it "returns a name value for form fields for that column" do - expect(content_editor.form_field_name(:link_title)).to eq('contents[1][link_title]') + expect(content_editor.form_field_name(:link_title)).to eq("contents[1][link_title]") end end end - describe '#form_field_id' do + describe "#form_field_id" do it "returns a id value for form fields with ingredient as default" do - expect(content_editor.form_field_id).to eq('contents_1_ingredient') + expect(content_editor.form_field_id).to eq("contents_1_ingredient") end - context 'with a essence column given' do + context "with a essence column given" do it "returns a id value for form fields for that column" do - expect(content_editor.form_field_id(:link_title)).to eq('contents_1_link_title') + expect(content_editor.form_field_id(:link_title)).to eq("contents_1_link_title") end end end - describe '#respond_to?(:to_model)' do + describe "#respond_to?(:to_model)" do subject { content_editor.respond_to?(:to_model) } it { is_expected.to be(false) } diff --git a/spec/decorators/alchemy/element_editor_spec.rb b/spec/decorators/alchemy/element_editor_spec.rb index 5d2f71f828..469a3b4220 100644 --- a/spec/decorators/alchemy/element_editor_spec.rb +++ b/spec/decorators/alchemy/element_editor_spec.rb @@ -1,90 +1,90 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" RSpec.describe Alchemy::ElementEditor do let(:element) { Alchemy::Element.new } let(:element_editor) { described_class.new(element) } - describe '#element' do - it 'returns element object' do + describe "#element" do + it "returns element object" do expect(element_editor.element).to eq(element) end end - describe '#to_partial_path' do + describe "#to_partial_path" do subject { element_editor.to_partial_path } - it 'returns the editor partial path' do - is_expected.to eq('alchemy/admin/elements/element') + it "returns the editor partial path" do + is_expected.to eq("alchemy/admin/elements/element") end end - describe '#css_classes' do + describe "#css_classes" do subject { element_editor.css_classes } it "returns css classes for element editor partial" do - is_expected.to include('element-editor') + is_expected.to include("element-editor") end - context 'with element is folded' do + context "with element is folded" do let(:element) { build_stubbed(:alchemy_element, folded: true) } - it { is_expected.to include('folded') } + it { is_expected.to include("folded") } end - context 'with element is expanded' do + context "with element is expanded" do let(:element) { build_stubbed(:alchemy_element, folded: false) } - it { is_expected.to include('expanded') } + it { is_expected.to include("expanded") } end - context 'with element is taggable' do + context "with element is taggable" do before do allow(element).to receive(:taggable?) { true } end - it { is_expected.to include('taggable') } + it { is_expected.to include("taggable") } end - context 'with element is not taggable' do + context "with element is not taggable" do before do allow(element).to receive(:taggable?) { false } end - it { is_expected.to include('not-taggable') } + it { is_expected.to include("not-taggable") } end - context 'with element having content_definitions' do + context "with element having content_definitions" do before do allow(element).to receive(:content_definitions) { [1] } end - it { is_expected.to include('with-contents') } + it { is_expected.to include("with-contents") } end - context 'with element not having content_definitions' do + context "with element not having content_definitions" do before do allow(element).to receive(:content_definitions) { [] } end - it { is_expected.to include('without-contents') } + it { is_expected.to include("without-contents") } end - context 'with element having nestable_elements' do + context "with element having nestable_elements" do before do allow(element).to receive(:nestable_elements) { [1] } end - it { is_expected.to include('nestable') } + it { is_expected.to include("nestable") } end - context 'with element not having nestable_elements' do + context "with element not having nestable_elements" do before do allow(element).to receive(:nestable_elements) { [] } end - it { is_expected.to include('not-nestable') } + it { is_expected.to include("not-nestable") } end end @@ -124,7 +124,7 @@ end end - describe '#respond_to?(:to_model)' do + describe "#respond_to?(:to_model)" do subject { element_editor.respond_to?(:to_model) } it { is_expected.to be(false) } diff --git a/spec/dummy/Rakefile b/spec/dummy/Rakefile index 488c551fee..d2a78aa258 100644 --- a/spec/dummy/Rakefile +++ b/spec/dummy/Rakefile @@ -3,6 +3,6 @@ # Add your own tasks in files placed in lib/tasks ending in .rake, # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. -require_relative 'config/application' +require_relative "config/application" Rails.application.load_tasks diff --git a/spec/dummy/app/controllers/login_controller.rb b/spec/dummy/app/controllers/login_controller.rb index a64f2242d5..9ab5b154e4 100644 --- a/spec/dummy/app/controllers/login_controller.rb +++ b/spec/dummy/app/controllers/login_controller.rb @@ -2,6 +2,6 @@ class LoginController < ApplicationController def new - render plain: 'Please login' + render plain: "Please login" end end diff --git a/spec/dummy/app/models/dummy_model.rb b/spec/dummy/app/models/dummy_model.rb index 1a021d5283..7a369c9ff7 100644 --- a/spec/dummy/app/models/dummy_model.rb +++ b/spec/dummy/app/models/dummy_model.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true class DummyModel < ActiveRecord::Base - acts_as_essence ingredient_column: 'data' + acts_as_essence ingredient_column: "data" end diff --git a/spec/dummy/app/models/dummy_user.rb b/spec/dummy/app/models/dummy_user.rb index ab60542797..1f8f9f9811 100644 --- a/spec/dummy/app/models/dummy_user.rb +++ b/spec/dummy/app/models/dummy_user.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class DummyUser < ActiveRecord::Base - has_many :folded_pages, class_name: 'Alchemy::FoldedPage' + has_many :folded_pages, class_name: "Alchemy::FoldedPage" attr_writer :alchemy_roles, :name def self.logged_in diff --git a/spec/dummy/app/models/event.rb b/spec/dummy/app/models/event.rb index b63fbc7ffd..51ce96545c 100644 --- a/spec/dummy/app/models/event.rb +++ b/spec/dummy/app/models/event.rb @@ -5,17 +5,27 @@ class Event < ActiveRecord::Base validates_presence_of :name belongs_to :location + before_destroy :abort_if_name_is_undestructible scope :starting_today, -> { where(starts_at: Time.current.at_midnight..Date.tomorrow.at_midnight) } scope :future, -> { where("starts_at > ?", Date.tomorrow.at_midnight) } def self.alchemy_resource_relations { - location: {attr_method: 'name', attr_type: 'string'} + location: {attr_method: "name", attr_type: "string"}, } end def self.alchemy_resource_filters %w(starting_today future) end + + private + + def abort_if_name_is_undestructible + if name == "Undestructible" + errors.add(:base, "This is the undestructible event!") + throw(:abort) + end + end end diff --git a/spec/dummy/app/views/alchemy/elements/_menu.html.erb b/spec/dummy/app/views/alchemy/elements/_menu.html.erb new file mode 100644 index 0000000000..f33c169bb8 --- /dev/null +++ b/spec/dummy/app/views/alchemy/elements/_menu.html.erb @@ -0,0 +1,5 @@ +<%- cache(menu) do -%> + <%= element_view_for(menu) do |el| -%> + <%= el.render :menu %> + <%- end -%> +<%- end -%> diff --git a/spec/dummy/app/views/alchemy/menus/footer_navigation/_node.html.erb b/spec/dummy/app/views/alchemy/menus/footer_navigation/_node.html.erb index ed71624a72..e2453605f5 100644 --- a/spec/dummy/app/views/alchemy/menus/footer_navigation/_node.html.erb +++ b/spec/dummy/app/views/alchemy/menus/footer_navigation/_node.html.erb @@ -8,10 +8,7 @@ rel: node.nofollow? ? 'nofollow' : nil %> <% if node.children.any? %>
        - <%= render partial: options[:node_partial_name], - collection: node.children.includes(:page, :children), - locals: { options: options }, - as: 'node' %> + <%= render node.children.includes(:page, :children), as: 'node' %>
      <% end %> <% end %> diff --git a/spec/dummy/app/views/alchemy/menus/footer_navigation/_wrapper.html.erb b/spec/dummy/app/views/alchemy/menus/footer_navigation/_wrapper.html.erb index f314d3eedc..66a9fd7f20 100644 --- a/spec/dummy/app/views/alchemy/menus/footer_navigation/_wrapper.html.erb +++ b/spec/dummy/app/views/alchemy/menus/footer_navigation/_wrapper.html.erb @@ -1,6 +1,6 @@
        - <%= render partial: options[:node_partial_name], - collection: node.children.includes(:page, :children), + <%= render partial: menu.to_partial_path, + collection: menu.children.includes(:page, :children), locals: { options: options }, as: 'node' %>
      diff --git a/spec/dummy/app/views/alchemy/menus/main_navigation/_node.html.erb b/spec/dummy/app/views/alchemy/menus/main_menu/_node.html.erb similarity index 72% rename from spec/dummy/app/views/alchemy/menus/main_navigation/_node.html.erb rename to spec/dummy/app/views/alchemy/menus/main_menu/_node.html.erb index ed71624a72..e2453605f5 100644 --- a/spec/dummy/app/views/alchemy/menus/main_navigation/_node.html.erb +++ b/spec/dummy/app/views/alchemy/menus/main_menu/_node.html.erb @@ -8,10 +8,7 @@ rel: node.nofollow? ? 'nofollow' : nil %> <% if node.children.any? %>
        - <%= render partial: options[:node_partial_name], - collection: node.children.includes(:page, :children), - locals: { options: options }, - as: 'node' %> + <%= render node.children.includes(:page, :children), as: 'node' %>
      <% end %> <% end %> diff --git a/spec/dummy/app/views/alchemy/menus/main_menu/_wrapper.html.erb b/spec/dummy/app/views/alchemy/menus/main_menu/_wrapper.html.erb new file mode 100644 index 0000000000..7eeeadaded --- /dev/null +++ b/spec/dummy/app/views/alchemy/menus/main_menu/_wrapper.html.erb @@ -0,0 +1,6 @@ +
        + <%= render partial: menu.to_partial_path, + collection: menu.children.includes(:page, :children), + locals: { options: options }, + as: "node" %> +
      diff --git a/spec/dummy/app/views/alchemy/menus/main_navigation/_wrapper.html.erb b/spec/dummy/app/views/alchemy/menus/main_navigation/_wrapper.html.erb deleted file mode 100644 index f314d3eedc..0000000000 --- a/spec/dummy/app/views/alchemy/menus/main_navigation/_wrapper.html.erb +++ /dev/null @@ -1,6 +0,0 @@ -
        - <%= render partial: options[:node_partial_name], - collection: node.children.includes(:page, :children), - locals: { options: options }, - as: 'node' %> -
      diff --git a/spec/dummy/app/views/layouts/application.html.erb b/spec/dummy/app/views/layouts/application.html.erb index 17d080b35d..63b2236ffc 100644 --- a/spec/dummy/app/views/layouts/application.html.erb +++ b/spec/dummy/app/views/layouts/application.html.erb @@ -8,9 +8,13 @@ <%= yield %> <%= render "alchemy/edit_mode" %> + +
      + <%= render_elements from_page: :footer %> +
      diff --git a/spec/dummy/bin/bundle b/spec/dummy/bin/bundle index 7b9c7cdc8a..db7742b94a 100755 --- a/spec/dummy/bin/bundle +++ b/spec/dummy/bin/bundle @@ -1,4 +1,4 @@ #!/usr/bin/env ruby # frozen_string_literal: true -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__) -load Gem.bin_path('bundler', 'bundle') +ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../Gemfile", __dir__) +load Gem.bin_path("bundler", "bundle") diff --git a/spec/dummy/bin/rails b/spec/dummy/bin/rails index dd027b406c..cbfe38b1c3 100755 --- a/spec/dummy/bin/rails +++ b/spec/dummy/bin/rails @@ -1,5 +1,5 @@ #!/usr/bin/env ruby # frozen_string_literal: true -APP_PATH = File.expand_path('../config/application', __dir__) -require_relative '../config/boot' -require 'rails/commands' +APP_PATH = File.expand_path("../config/application", __dir__) +require_relative "../config/boot" +require "rails/commands" diff --git a/spec/dummy/bin/rake b/spec/dummy/bin/rake index 609af74703..d648cf02d5 100755 --- a/spec/dummy/bin/rake +++ b/spec/dummy/bin/rake @@ -1,5 +1,5 @@ #!/usr/bin/env ruby # frozen_string_literal: true -require_relative '../config/boot' -require 'rake' +require_relative "../config/boot" +require "rake" Rake.application.run diff --git a/spec/dummy/bin/setup b/spec/dummy/bin/setup index 2905c03cac..a3bdce2222 100755 --- a/spec/dummy/bin/setup +++ b/spec/dummy/bin/setup @@ -1,9 +1,9 @@ #!/usr/bin/env ruby # frozen_string_literal: true -require 'fileutils' +require "fileutils" # path to your application root. -APP_ROOT = File.expand_path('..', __dir__) +APP_ROOT = File.expand_path("..", __dir__) def system!(*args) system(*args) || abort("\n== Command #{args} failed ==") @@ -14,9 +14,9 @@ FileUtils.chdir APP_ROOT do # This script is idempotent, so that you can run it at anytime and get an expectable outcome. # Add necessary setup steps to this file. - puts '== Installing dependencies ==' - system! 'gem install bundler --conservative' - system('bundle check') || system!('bundle install') + puts "== Installing dependencies ==" + system! "gem install bundler --conservative" + system("bundle check") || system!("bundle install") # Install JavaScript dependencies if using Yarn # system('bin/yarn') @@ -27,11 +27,11 @@ FileUtils.chdir APP_ROOT do # end puts "\n== Preparing database ==" - system! 'bin/rails db:prepare' + system! "bin/rails db:prepare" puts "\n== Removing old logs and tempfiles ==" - system! 'bin/rails log:clear tmp:clear' + system! "bin/rails log:clear tmp:clear" puts "\n== Restarting application server ==" - system! 'bin/rails restart' + system! "bin/rails restart" end diff --git a/spec/dummy/bin/update b/spec/dummy/bin/update index b666346500..965978f20c 100755 --- a/spec/dummy/bin/update +++ b/spec/dummy/bin/update @@ -1,10 +1,10 @@ #!/usr/bin/env ruby # frozen_string_literal: true -require 'fileutils' +require "fileutils" include FileUtils # path to your application root. -APP_ROOT = File.expand_path('..', __dir__) +APP_ROOT = File.expand_path("..", __dir__) def system!(*args) system(*args) || abort("\n== Command #{args} failed ==") @@ -14,19 +14,19 @@ chdir APP_ROOT do # This script is a way to update your development environment automatically. # Add necessary update steps to this file. - puts '== Installing dependencies ==' - system! 'gem install bundler --conservative' - system('bundle check') || system!('bundle install') + puts "== Installing dependencies ==" + system! "gem install bundler --conservative" + system("bundle check") || system!("bundle install") # Install JavaScript dependencies if using Yarn # system('bin/yarn') puts "\n== Updating database ==" - system! 'bin/rails db:migrate' + system! "bin/rails db:migrate" puts "\n== Removing old logs and tempfiles ==" - system! 'bin/rails log:clear tmp:clear' + system! "bin/rails log:clear tmp:clear" puts "\n== Restarting application server ==" - system! 'bin/rails restart' + system! "bin/rails restart" end diff --git a/spec/dummy/config.ru b/spec/dummy/config.ru index 8c92c11334..a591fdd72c 100644 --- a/spec/dummy/config.ru +++ b/spec/dummy/config.ru @@ -1,5 +1,5 @@ # frozen_string_literal: true # This file is used by Rack-based servers to start the application. -require_relative 'config/environment' +require_relative "config/environment" run Rails.application diff --git a/spec/dummy/config/alchemy/elements.yml b/spec/dummy/config/alchemy/elements.yml index 3d2d940ef5..d6dff12559 100644 --- a/spec/dummy/config/alchemy/elements.yml +++ b/spec/dummy/config/alchemy/elements.yml @@ -160,3 +160,8 @@ fixed: true unique: true nestable_elements: [text] + +- name: menu + contents: + - name: menu + type: EssenceNode diff --git a/spec/dummy/config/alchemy/page_layouts.yml b/spec/dummy/config/alchemy/page_layouts.yml index 6ef6402b3f..c1fd6b89e8 100644 --- a/spec/dummy/config/alchemy/page_layouts.yml +++ b/spec/dummy/config/alchemy/page_layouts.yml @@ -6,7 +6,6 @@ page_layout: readonly public_on: ~ public_until: ~ - visible: false restricted: false name: false urlname: false @@ -39,6 +38,8 @@ autogenerate: [headline, text, contactform] - name: footer + elements: + - menu layoutpage: true - name: <%= 'erb_' + 'layout' %> diff --git a/spec/dummy/config/initializers/content_security_policy.rb b/spec/dummy/config/initializers/content_security_policy.rb index 41c43016f1..4a9aad6851 100644 --- a/spec/dummy/config/initializers/content_security_policy.rb +++ b/spec/dummy/config/initializers/content_security_policy.rb @@ -4,17 +4,20 @@ # For further information see the following documentation # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy -# Rails.application.config.content_security_policy do |policy| -# policy.default_src :self, :https -# policy.font_src :self, :https, :data -# policy.img_src :self, :https, :data -# policy.object_src :none -# policy.script_src :self, :https -# policy.style_src :self, :https +Rails.application.config.content_security_policy do |policy| + # policy.default_src :self, :https + # policy.font_src :self, :https, :data + # policy.img_src :self, :https, :data + # policy.object_src :none + # policy.script_src :self, :https + # policy.style_src :self, :https -# # Specify URI for violation reports -# # policy.report_uri "/csp-violation-report-endpoint" -# end + # Specify URI for violation reports + # policy.report_uri "/csp-violation-report-endpoint" + if Rails.env.development? + policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" + end +end # If you are using UJS then enable automatic nonce generation # Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } diff --git a/spec/dummy/db/migrate/20200423073425_create_alchemy_essence_nodes.rb b/spec/dummy/db/migrate/20200423073425_create_alchemy_essence_nodes.rb new file mode 120000 index 0000000000..7c19075432 --- /dev/null +++ b/spec/dummy/db/migrate/20200423073425_create_alchemy_essence_nodes.rb @@ -0,0 +1 @@ +../../../../db/migrate/20200423073425_create_alchemy_essence_nodes.rb \ No newline at end of file diff --git a/spec/dummy/db/migrate/20200504210159_remove_site_id_from_nodes.rb b/spec/dummy/db/migrate/20200504210159_remove_site_id_from_nodes.rb new file mode 120000 index 0000000000..6c80fe7846 --- /dev/null +++ b/spec/dummy/db/migrate/20200504210159_remove_site_id_from_nodes.rb @@ -0,0 +1 @@ +../../../../db/migrate/20200504210159_remove_site_id_from_nodes.rb \ No newline at end of file diff --git a/spec/dummy/db/migrate/20200505215518_add_language_id_foreign_key_to_alchemy_pages.rb b/spec/dummy/db/migrate/20200505215518_add_language_id_foreign_key_to_alchemy_pages.rb new file mode 120000 index 0000000000..b13520df09 --- /dev/null +++ b/spec/dummy/db/migrate/20200505215518_add_language_id_foreign_key_to_alchemy_pages.rb @@ -0,0 +1 @@ +../../../../db/migrate/20200505215518_add_language_id_foreign_key_to_alchemy_pages.rb \ No newline at end of file diff --git a/spec/dummy/db/migrate/20200511113603_add_menu_type_to_alchemy_nodes.rb b/spec/dummy/db/migrate/20200511113603_add_menu_type_to_alchemy_nodes.rb new file mode 120000 index 0000000000..11efc9ef63 --- /dev/null +++ b/spec/dummy/db/migrate/20200511113603_add_menu_type_to_alchemy_nodes.rb @@ -0,0 +1 @@ +../../../../db/migrate/20200511113603_add_menu_type_to_alchemy_nodes.rb \ No newline at end of file diff --git a/spec/dummy/db/migrate/20200514091507_make_page_layoutpage_null_false.rb b/spec/dummy/db/migrate/20200514091507_make_page_layoutpage_null_false.rb new file mode 120000 index 0000000000..4d55e7a290 --- /dev/null +++ b/spec/dummy/db/migrate/20200514091507_make_page_layoutpage_null_false.rb @@ -0,0 +1 @@ +../../../../db/migrate/20200514091507_make_page_layoutpage_null_false.rb \ No newline at end of file diff --git a/spec/dummy/db/migrate/20200519073500_remove_visible_from_alchemy_pages.rb b/spec/dummy/db/migrate/20200519073500_remove_visible_from_alchemy_pages.rb new file mode 120000 index 0000000000..3e5342b228 --- /dev/null +++ b/spec/dummy/db/migrate/20200519073500_remove_visible_from_alchemy_pages.rb @@ -0,0 +1 @@ +../../../../db/migrate/20200519073500_remove_visible_from_alchemy_pages.rb \ No newline at end of file diff --git a/spec/dummy/db/schema.rb b/spec/dummy/db/schema.rb index 5190def6cf..296475e73c 100644 --- a/spec/dummy/db/schema.rb +++ b/spec/dummy/db/schema.rb @@ -19,10 +19,12 @@ t.integer "file_size" t.integer "creator_id" t.integer "updater_id" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.string "file_uid" + t.index ["creator_id"], name: "index_alchemy_attachments_on_creator_id" t.index ["file_uid"], name: "index_alchemy_attachments_on_file_uid" + t.index ["updater_id"], name: "index_alchemy_attachments_on_updater_id" end create_table "alchemy_contents", force: :cascade do |t| @@ -30,13 +32,8 @@ t.string "essence_type", null: false t.integer "essence_id", null: false t.integer "element_id", null: false - t.integer "position" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false - t.integer "creator_id" - t.integer "updater_id" - t.index ["element_id", "position"], name: "index_contents_on_element_id_and_position" - t.index ["essence_id", "essence_type"], name: "index_alchemy_contents_on_essence_id_and_essence_type", unique: true + t.index ["element_id"], name: "index_alchemy_contents_on_element_id" + t.index ["essence_type", "essence_id"], name: "index_alchemy_contents_on_essence_type_and_essence_id", unique: true end create_table "alchemy_elements", force: :cascade do |t| @@ -46,57 +43,45 @@ t.boolean "public", default: true t.boolean "folded", default: false t.boolean "unique", default: false - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.integer "creator_id" t.integer "updater_id" t.integer "parent_element_id" t.boolean "fixed", default: false, null: false + t.index ["creator_id"], name: "index_alchemy_elements_on_creator_id" t.index ["fixed"], name: "index_alchemy_elements_on_fixed" t.index ["page_id", "parent_element_id"], name: "index_alchemy_elements_on_page_id_and_parent_element_id" t.index ["page_id", "position"], name: "index_elements_on_page_id_and_position" + t.index ["updater_id"], name: "index_alchemy_elements_on_updater_id" end create_table "alchemy_elements_alchemy_pages", id: false, force: :cascade do |t| t.integer "element_id" t.integer "page_id" + t.index ["element_id"], name: "index_alchemy_elements_alchemy_pages_on_element_id" + t.index ["page_id"], name: "index_alchemy_elements_alchemy_pages_on_page_id" end create_table "alchemy_essence_booleans", force: :cascade do |t| t.boolean "value" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false - t.integer "creator_id" - t.integer "updater_id" t.index ["value"], name: "index_alchemy_essence_booleans_on_value" end create_table "alchemy_essence_dates", force: :cascade do |t| t.datetime "date" - t.integer "creator_id" - t.integer "updater_id" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false end create_table "alchemy_essence_files", force: :cascade do |t| t.integer "attachment_id" t.string "title" t.string "css_class" - t.integer "creator_id" - t.integer "updater_id" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false t.string "link_text" t.index ["attachment_id"], name: "index_alchemy_essence_files_on_attachment_id" end create_table "alchemy_essence_htmls", force: :cascade do |t| t.text "source" - t.integer "creator_id" - t.integer "updater_id" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false end create_table "alchemy_essence_links", force: :cascade do |t| @@ -104,16 +89,17 @@ t.string "link_title" t.string "link_target" t.string "link_class_name" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false - t.integer "creator_id" - t.integer "updater_id" end - create_table "alchemy_essence_pages", force: :cascade do |t| - t.integer "page_id" + create_table "alchemy_essence_nodes", force: :cascade do |t| + t.integer "node_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["node_id"], name: "index_alchemy_essence_nodes_on_node_id" + end + + create_table "alchemy_essence_pages", force: :cascade do |t| + t.integer "page_id" t.index ["page_id"], name: "index_alchemy_essence_pages_on_page_id" end @@ -127,10 +113,6 @@ t.string "link_title" t.string "css_class" t.string "link_target" - t.integer "creator_id" - t.integer "updater_id" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false t.string "crop_from" t.string "crop_size" t.string "render_size" @@ -142,18 +124,10 @@ t.text "body" t.text "stripped_body" t.boolean "public" - t.integer "creator_id" - t.integer "updater_id" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false end create_table "alchemy_essence_selects", force: :cascade do |t| t.string "value" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false - t.integer "creator_id" - t.integer "updater_id" t.index ["value"], name: "index_alchemy_essence_selects_on_value" end @@ -164,10 +138,6 @@ t.string "link_class_name" t.boolean "public", default: false t.string "link_target" - t.integer "creator_id" - t.integer "updater_id" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false end create_table "alchemy_folded_pages", force: :cascade do |t| @@ -183,24 +153,26 @@ t.string "frontpage_name" t.string "page_layout", default: "intro" t.boolean "public", default: false - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.integer "creator_id" t.integer "updater_id" t.boolean "default", default: false t.string "country_code", default: "", null: false t.integer "site_id", null: false t.string "locale" + t.index ["creator_id"], name: "index_alchemy_languages_on_creator_id" t.index ["language_code", "country_code"], name: "index_alchemy_languages_on_language_code_and_country_code" t.index ["language_code"], name: "index_alchemy_languages_on_language_code" t.index ["site_id"], name: "index_alchemy_languages_on_site_id" + t.index ["updater_id"], name: "index_alchemy_languages_on_updater_id" end create_table "alchemy_legacy_page_urls", force: :cascade do |t| t.string "urlname", null: false t.integer "page_id", null: false - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.index ["page_id"], name: "index_alchemy_legacy_page_urls_on_page_id" t.index ["urlname"], name: "index_alchemy_legacy_page_urls_on_urlname" end @@ -222,14 +194,13 @@ t.integer "updater_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.integer "site_id", null: false + t.string "menu_type", null: false t.index ["creator_id"], name: "index_alchemy_nodes_on_creator_id" t.index ["language_id"], name: "index_alchemy_nodes_on_language_id" t.index ["lft"], name: "index_alchemy_nodes_on_lft" t.index ["page_id"], name: "index_alchemy_nodes_on_page_id" t.index ["parent_id"], name: "index_alchemy_nodes_on_parent_id" t.index ["rgt"], name: "index_alchemy_nodes_on_rgt" - t.index ["site_id"], name: "index_alchemy_nodes_on_site_id" t.index ["updater_id"], name: "index_alchemy_nodes_on_updater_id" end @@ -246,27 +217,28 @@ t.integer "rgt" t.integer "parent_id" t.integer "depth" - t.boolean "visible", default: false t.integer "locked_by" t.boolean "restricted", default: false t.boolean "robot_index", default: true t.boolean "robot_follow", default: true t.boolean "sitemap", default: true - t.boolean "layoutpage", default: false - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.boolean "layoutpage", default: false, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.integer "creator_id" t.integer "updater_id" - t.integer "language_id" + t.integer "language_id", null: false t.datetime "published_at" t.datetime "public_on" t.datetime "public_until" t.datetime "locked_at" - t.index ["language_id"], name: "index_pages_on_language_id" + t.index ["creator_id"], name: "index_alchemy_pages_on_creator_id" + t.index ["language_id"], name: "index_alchemy_pages_on_language_id" t.index ["locked_at", "locked_by"], name: "index_alchemy_pages_on_locked_at_and_locked_by" t.index ["parent_id", "lft"], name: "index_pages_on_parent_id_and_lft" t.index ["public_on", "public_until"], name: "index_alchemy_pages_on_public_on_and_public_until" t.index ["rgt"], name: "index_alchemy_pages_on_rgt" + t.index ["updater_id"], name: "index_alchemy_pages_on_updater_id" t.index ["urlname"], name: "index_pages_on_urlname" end @@ -275,21 +247,23 @@ t.string "image_file_name" t.integer "image_file_width" t.integer "image_file_height" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.integer "creator_id" t.integer "updater_id" t.string "upload_hash" t.string "image_file_uid" t.integer "image_file_size" t.string "image_file_format" + t.index ["creator_id"], name: "index_alchemy_pictures_on_creator_id" + t.index ["updater_id"], name: "index_alchemy_pictures_on_updater_id" end create_table "alchemy_sites", force: :cascade do |t| t.string "host" t.string "name" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.boolean "public", default: false t.text "aliases" t.boolean "redirect_to_primary_host" @@ -361,8 +335,9 @@ add_foreign_key "alchemy_contents", "alchemy_elements", column: "element_id", on_update: :cascade, on_delete: :cascade add_foreign_key "alchemy_elements", "alchemy_pages", column: "page_id", on_update: :cascade, on_delete: :cascade + add_foreign_key "alchemy_essence_nodes", "alchemy_nodes", column: "node_id" add_foreign_key "alchemy_essence_pages", "alchemy_pages", column: "page_id" add_foreign_key "alchemy_nodes", "alchemy_languages", column: "language_id" add_foreign_key "alchemy_nodes", "alchemy_pages", column: "page_id", on_delete: :cascade - add_foreign_key "alchemy_nodes", "alchemy_sites", column: "site_id", on_delete: :cascade + add_foreign_key "alchemy_pages", "alchemy_languages", column: "language_id" end diff --git a/spec/dummy/vendor/assets/javascripts/alchemy/admin/all.js b/spec/dummy/vendor/assets/javascripts/alchemy/admin/all.js index 96cd38c391..5658d5f69d 120000 --- a/spec/dummy/vendor/assets/javascripts/alchemy/admin/all.js +++ b/spec/dummy/vendor/assets/javascripts/alchemy/admin/all.js @@ -1 +1 @@ -../../../../../../../lib/rails/generators/alchemy/install/files/all.js \ No newline at end of file +../../../../../../../lib/generators/alchemy/install/files/all.js \ No newline at end of file diff --git a/spec/dummy/vendor/assets/stylesheets/alchemy/admin/all.css b/spec/dummy/vendor/assets/stylesheets/alchemy/admin/all.css index d2a82e9d54..788797283b 120000 --- a/spec/dummy/vendor/assets/stylesheets/alchemy/admin/all.css +++ b/spec/dummy/vendor/assets/stylesheets/alchemy/admin/all.css @@ -1 +1 @@ -../../../../../../../lib/rails/generators/alchemy/install/files/all.css \ No newline at end of file +../../../../../../../lib/generators/alchemy/install/files/all.css \ No newline at end of file diff --git a/spec/factories.rb b/spec/factories.rb index 700088afaa..f9ab08b0f3 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -2,8 +2,8 @@ FactoryBot.define do factory :event do - name { 'My Event' } - hidden_name { 'not shown' } + name { "My Event" } + hidden_name { "not shown" } location starts_at { Time.local(2012, 03, 02, 8, 15) } ends_at { Time.local(2012, 03, 02, 19, 30) } @@ -15,10 +15,10 @@ end factory :location do - name { 'Awesome Lodge' } + name { "Awesome Lodge" } end factory :series do - name { 'My Series' } + name { "My Series" } end end diff --git a/spec/features/admin/admin_layout_spec.rb b/spec/features/admin/admin_layout_spec.rb index 2a6569fb01..e0ff59dd8f 100644 --- a/spec/features/admin/admin_layout_spec.rb +++ b/spec/features/admin/admin_layout_spec.rb @@ -1,16 +1,16 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -RSpec.describe 'Admin layout', type: :system do +RSpec.describe "Admin layout", type: :system do let(:user) { create(:alchemy_dummy_user, :as_admin, name: "Joe User") } before do authorize_user(user) end - it 'has controller and action name as body class' do + it "has controller and action name as body class" do visit admin_path - expect(page).to have_selector('body.dashboard.index') + expect(page).to have_selector("body.dashboard.index") end end diff --git a/spec/features/admin/attachment_assignment_overlay_spec.rb b/spec/features/admin/attachment_assignment_overlay_spec.rb index 665abd9226..f5fd45bcb2 100644 --- a/spec/features/admin/attachment_assignment_overlay_spec.rb +++ b/spec/features/admin/attachment_assignment_overlay_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" RSpec.describe "Attachment assignment overlay", type: :system do before do diff --git a/spec/features/admin/dashboard_spec.rb b/spec/features/admin/dashboard_spec.rb index 16f0a08a2d..b09b38a334 100644 --- a/spec/features/admin/dashboard_spec.rb +++ b/spec/features/admin/dashboard_spec.rb @@ -1,16 +1,16 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -RSpec.describe 'Dashboard feature', type: :system do +RSpec.describe "Dashboard feature", type: :system do let(:user) { create(:alchemy_dummy_user, :as_admin, name: "Joe User") } before do authorize_user(user) end - describe 'Locked pages summary' do - let(:a_page) { create(:alchemy_page, :public, visible: true) } + describe "Locked pages summary" do + let(:a_page) { create(:alchemy_page, :public) } it "should initially show no pages are locked" do visit admin_dashboard_path @@ -19,7 +19,7 @@ expect(locked_pages_widget).to have_content "no pages" end - context 'When locked by current user' do + context "When locked by current user" do it "should show locked by me" do a_page.lock_to!(user) visit admin_dashboard_path @@ -30,7 +30,7 @@ end end - context 'When locked by another user' do + context "When locked by another user" do let(:other_user) { create(:alchemy_dummy_user, :as_admin) } it "shows the name of the user who locked the page" do @@ -44,10 +44,10 @@ end end - describe 'Sites widget' do - context 'with multiple sites' do + describe "Sites widget" do + context "with multiple sites" do let!(:default_site) { create(:alchemy_site, :default) } - let!(:another_site) { create(:alchemy_site, name: 'Site', host: 'site.com') } + let!(:another_site) { create(:alchemy_site, name: "Site", host: "site.com") } it "lists all sites" do visit admin_dashboard_path @@ -57,9 +57,9 @@ expect(sites_widget).to have_content "Site" end - context 'with alchemy url proxy object having `login_url`' do + context "with alchemy url proxy object having `login_url`" do before do - allow_any_instance_of(ActionDispatch::Routing::RoutesProxy).to receive(:login_url).and_return('http://site.com/admin/login') + allow_any_instance_of(ActionDispatch::Routing::RoutesProxy).to receive(:login_url).and_return("http://site.com/admin/login") end it "links to login page of every site" do @@ -70,7 +70,7 @@ end end - context 'with only one site' do + context "with only one site" do it "does not display" do visit admin_dashboard_path sites_widget = all('div[@class="widget sites"]').first @@ -79,8 +79,8 @@ end end - describe 'Online users' do - context 'with alchemy users' do + describe "Online users" do + context "with alchemy users" do let(:other_user) { build_stubbed(:alchemy_dummy_user) } before do @@ -96,10 +96,10 @@ end end - context 'with non alchemy user class' do + context "with non alchemy user class" do class SomeUser; end before do - Alchemy.user_class_name = 'SomeUser' + Alchemy.user_class_name = "SomeUser" end it "does not list online users" do @@ -109,7 +109,7 @@ class SomeUser; end end after do - Alchemy.user_class_name = 'DummyUser' + Alchemy.user_class_name = "DummyUser" end end end diff --git a/spec/features/admin/edit_elements_feature_spec.rb b/spec/features/admin/edit_elements_feature_spec.rb index eecca5db14..69c87b8f88 100644 --- a/spec/features/admin/edit_elements_feature_spec.rb +++ b/spec/features/admin/edit_elements_feature_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" RSpec.describe "The edit elements feature", type: :system do let!(:a_page) { create(:alchemy_page) } @@ -9,30 +9,30 @@ authorize_user(:as_editor) end - context 'Visiting the new element form' do - context 'with a page_id passed' do - scenario 'a form to select a new element for the page appears.' do + context "Visiting the new element form" do + context "with a page_id passed" do + scenario "a form to select a new element for the page appears." do visit alchemy.new_admin_element_path(page_id: a_page.id) expect(page).to have_selector('select[name="element[name]"]') end end - context 'with a page_id and parent_element_id passed' do + context "with a page_id and parent_element_id passed" do let!(:element) { create(:alchemy_element, :with_nestable_elements, page: a_page) } - scenario 'a hidden field with parent element id is in the form.' do + scenario "a hidden field with parent element id is in the form." do visit alchemy.new_admin_element_path(page_id: a_page.id, parent_element_id: element.id) expect(page).to have_selector(%(input[type="hidden"][name="element[parent_element_id]"][value="#{element.id}"])) end end end - context 'With an element having nestable elements defined' do + context "With an element having nestable elements defined" do let!(:element) { create(:alchemy_element, :with_nestable_elements, page: a_page) } - scenario 'a button to add an nestable element appears.' do + scenario "a button to add an nestable element appears." do visit alchemy.admin_elements_path(page_id: element.page_id) - expect(page).to have_selector('.add-nestable-element-button') + expect(page).to have_selector(".add-nestable-element-button") end end end diff --git a/spec/features/admin/language_tree_feature_spec.rb b/spec/features/admin/language_tree_feature_spec.rb index 2e97e313f8..c3cfc0be34 100644 --- a/spec/features/admin/language_tree_feature_spec.rb +++ b/spec/features/admin/language_tree_feature_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -RSpec.describe 'Language tree feature', type: :system, js: true do +RSpec.describe "Language tree feature", type: :system, js: true do let(:klingon) { create(:alchemy_language, :klingon) } let(:user) { build(:alchemy_dummy_user, :as_admin) } @@ -13,34 +13,34 @@ context "with a single language" do it "one should not be able to switch the language tree" do - visit('/admin/pages') - expect(page).to_not have_selector('label', text: Alchemy.t("Language tree")) + visit("/admin/pages") + expect(page).to_not have_selector("label", text: Alchemy.t("Language tree")) end end context "in a multilangual environment" do - context 'even if one language is not public' do + context "even if one language is not public" do let(:klingon) { create(:alchemy_language, :klingon, public: false) } before do - create(:alchemy_page, :language_root, name: 'Klingon', language: klingon) + create(:alchemy_page, :language_root, name: "Klingon", language: klingon) end - context 'and an author' do + context "and an author" do let(:user) { build(:alchemy_dummy_user, :as_author) } it "one should not be able to switch the language tree" do - visit('/admin/pages') - expect(page).to_not have_selector('label', text: Alchemy.t("Language tree")) + visit("/admin/pages") + expect(page).to_not have_selector("label", text: Alchemy.t("Language tree")) end end - context 'and an editor' do + context "and an editor" do let(:user) { build(:alchemy_dummy_user, :as_editor) } it "one should be able to switch the language tree" do - visit('/admin/pages') - expect(page).to have_selector('label', text: Alchemy.t("Language tree")) + visit("/admin/pages") + expect(page).to have_selector("label", text: Alchemy.t("Language tree")) end end end @@ -50,11 +50,11 @@ before { klingon } it "displays a form for creating language root with preselected page layout and front page name" do - visit('/admin/pages') - select2 'Klingon', from: 'Language tree' - expect(page).to have_content('This language tree does not exist') + visit("/admin/pages") + select2 "Klingon", from: "Language tree" + expect(page).to have_content("This language tree does not exist") - within('form#create_language_tree') do + within("form#create_language_tree") do expect(page).to \ have_selector('input[type="text"][value="' + klingon.frontpage_name + '"]') expect(page).to have_selector('option[selected="selected"][value="' + klingon.page_layout + '"]') diff --git a/spec/features/admin/languages_features_spec.rb b/spec/features/admin/languages_features_spec.rb index ca18cf7c77..acc051d9d2 100644 --- a/spec/features/admin/languages_features_spec.rb +++ b/spec/features/admin/languages_features_spec.rb @@ -1,27 +1,27 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" RSpec.describe "Admin Languages Features", type: :system do before do authorize_user(:as_admin) end - describe 'creating a new language' do - context 'when selected locale is not an available locale' do + describe "creating a new language" do + context "when selected locale is not an available locale" do before do create(:alchemy_site) allow(::I18n).to receive(:available_locales) { [:de, :en] } end - it 'shows a locale select and an error message' do + it "shows a locale select and an error message" do visit alchemy.new_admin_language_path - fill_in 'language_language_code', with: 'kl' - click_button 'Save' + fill_in "language_language_code", with: "kl" + click_button "Save" - expect(page).to have_select('language_locale', options: %w(de en)) - expect(page).to have_selector('.language_locale.field_with_errors .error') + expect(page).to have_select("language_locale", options: %w(de en)) + expect(page).to have_selector(".language_locale.field_with_errors .error") end end @@ -29,20 +29,20 @@ let!(:default_site) { create(:alchemy_site, :default) } let!(:site_2) do - create(:alchemy_site, host: 'another-site.com') + create(:alchemy_site, host: "another-site.com") end let(:language) do Alchemy::Language.last end - it 'creates language for current site' do + it "creates language for current site" do visit alchemy.new_admin_language_path - fill_in "language_name", with: 'Klingon' - fill_in "language_language_code", with: 'kl' - fill_in "language_frontpage_name", with: 'Tuq' - click_button 'Save' + fill_in "language_name", with: "Klingon" + fill_in "language_language_code", with: "kl" + fill_in "language_frontpage_name", with: "Tuq" + click_button "Save" expect(language.site_id).to eq(Alchemy::Site.pluck(:id).first) expect(language.site_id).to_not eq(site_2.id) @@ -50,42 +50,42 @@ end end - describe 'editing an language' do - let!(:language) { create(:alchemy_language) } + describe "editing an language" do + let!(:language) { create(:alchemy_language, :german) } - context 'when selected locale has multiple matching locale files' do + context "when selected locale has multiple matching locale files" do before do allow(::I18n).to receive(:available_locales) { [:de, :'de-at', :en, :'en-uk'] } end - it 'shows a locale select with matching locales only' do + it "shows a locale select with matching locales only" do visit alchemy.edit_admin_language_path(language) - expect(page).to have_select('language_locale', options: ['de', 'de-at']) + expect(page).to have_select("language_locale", options: ["de", "de-at"]) end end - context 'when selected locale has one matching locale file' do + context "when selected locale has one matching locale file" do before do allow(::I18n).to receive(:available_locales) { [:de, :en, :'en-uk'] } end - it 'shows a locale select with matching locale only' do + it "shows a locale select with matching locale only" do visit alchemy.edit_admin_language_path(language) - expect(page).to have_select('language_locale', options: %w(de)) + expect(page).to have_select("language_locale", options: %w(de)) end end - context 'when selected locale has no matching locale files' do + context "when selected locale has no matching locale files" do before do allow(::I18n).to receive(:available_locales) { [:jp, :es] } end - it 'shows a locale select with all available locales' do + it "shows a locale select with all available locales" do visit alchemy.edit_admin_language_path(language) - expect(page).to have_select('language_locale', options: %w(jp es)) + expect(page).to have_select("language_locale", options: %w(jp es)) end end end diff --git a/spec/features/admin/legacy_page_url_management_spec.rb b/spec/features/admin/legacy_page_url_management_spec.rb index d644cc075a..92398530cc 100644 --- a/spec/features/admin/legacy_page_url_management_spec.rb +++ b/spec/features/admin/legacy_page_url_management_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -RSpec.describe 'Legacy page url management', type: :system, js: true do +RSpec.describe "Legacy page url management", type: :system, js: true do before do authorize_user(:as_admin) end @@ -16,45 +16,45 @@ def open_page_properties it "lets a user add a page link" do open_page_properties - click_link 'Links' - fill_in 'legacy_page_url_urlname', with: 'new-urlname' - click_button 'Add' - within '#legacy_page_urls' do - expect(page).to have_content('new-urlname') + click_link "Links" + fill_in "legacy_page_url_urlname", with: "new-urlname" + click_button "Add" + within "#legacy_page_urls" do + expect(page).to have_content("new-urlname") end - within '#legacy_urls_label' do - expect(page).to have_content('(1) Link') + within "#legacy_urls_label" do + expect(page).to have_content("(1) Link") end end - context 'with wrong url format' do + context "with wrong url format" do it "displays error message" do open_page_properties - click_link 'Links' - fill_in 'legacy_page_url_urlname', with: 'invalid url name' - click_button 'Add' - within '#new_legacy_page_url' do - expect(page).to have_content('URL path is invalid') + click_link "Links" + fill_in "legacy_page_url_urlname", with: "invalid url name" + click_button "Add" + within "#new_legacy_page_url" do + expect(page).to have_content("URL-Path is invalid") end end end - context 'with legacy page url present' do + context "with legacy page url present" do before do - a_page.legacy_urls.create!(urlname: 'a-page-link') + a_page.legacy_urls.create!(urlname: "a-page-link") open_page_properties - click_link '(1) Link' + click_link "(1) Link" end it "lets a user remove a page link" do - click_link 'Remove' - click_button 'Yes' - within '#legacy_page_urls' do - expect(page).to_not have_content('a-page-link') - expect(page).to have_content(Alchemy.t('No page links for this page found')) + click_link "Remove" + click_button "Yes" + within "#legacy_page_urls" do + expect(page).to_not have_content("a-page-link") + expect(page).to have_content(Alchemy.t("No page links for this page found")) end - within '#legacy_urls_label' do - expect(page).to have_content('(0) Links') + within "#legacy_urls_label" do + expect(page).to have_content("(0) Links") end end end diff --git a/spec/features/admin/link_overlay_spec.rb b/spec/features/admin/link_overlay_spec.rb index 9c45b11eab..4cedb1ac1f 100644 --- a/spec/features/admin/link_overlay_spec.rb +++ b/spec/features/admin/link_overlay_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" RSpec.describe "Link overlay", type: :system do let!(:language) { create(:alchemy_language) } @@ -12,22 +12,22 @@ context "GUI" do it "has a tab for linking internal pages" do visit link_admin_pages_path - within('#overlay_tabs') { expect(page).to have_content('Internal') } + within("#overlay_tabs") { expect(page).to have_content("Internal") } end it "has a tab for adding anchor links" do visit link_admin_pages_path - within('#overlay_tabs') { expect(page).to have_content('Anchor') } + within("#overlay_tabs") { expect(page).to have_content("Anchor") } end it "has a tab for linking external pages" do visit link_admin_pages_path - within('#overlay_tabs') { expect(page).to have_content('External') } + within("#overlay_tabs") { expect(page).to have_content("External") } end it "has a tab for linking files" do visit link_admin_pages_path - within('#overlay_tabs') { expect(page).to have_content('File') } + within("#overlay_tabs") { expect(page).to have_content("File") } end end @@ -47,33 +47,33 @@ let(:article) { page1.elements.named(:article).first } before do - page1.elements.create!(name: 'article') + page1.elements.create!(name: "article") end it "should be possible to link a page" do visit edit_admin_page_path(page1) within "#element_#{article.id}" do - fill_in 'Headline', with: 'Link me' - click_link 'Link text' + fill_in "Headline", with: "Link me" + click_link "Link text" end begin within "#overlay_tab_internal_link" do - expect(page).to have_selector('#s2id_page_urlname') - select2_search(page2.name, from: 'Page') - click_link 'apply' + expect(page).to have_selector("#s2id_page_urlname") + select2_search(page2.name, from: "Page") + click_link "apply" end within "#element_#{article.id}" do - click_button 'Save' + click_button "Save" end within "#flash_notices" do - expect(page).to have_content 'Saved element.' + expect(page).to have_content "Saved element." end - click_button_with_label 'Publish page' + click_button_with_label "Publish page" visit "/#{page1.urlname}" diff --git a/spec/features/admin/locale_select_feature_spec.rb b/spec/features/admin/locale_select_feature_spec.rb index e09221b9d7..2b8f885aec 100644 --- a/spec/features/admin/locale_select_feature_spec.rb +++ b/spec/features/admin/locale_select_feature_spec.rb @@ -1,46 +1,46 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -RSpec.describe 'Locale select', type: :system do +RSpec.describe "Locale select", type: :system do let(:a_page) { create(:alchemy_page, :public) } before do - allow(Alchemy::I18n).to receive(:translation_files).and_return ['alchemy.kl.yml', 'alchemy.jp.yml', 'alchemy.cz.yml'] + allow(Alchemy::I18n).to receive(:translation_files).and_return ["alchemy.kl.yml", "alchemy.jp.yml", "alchemy.cz.yml"] authorize_user(:as_admin) end it "contains all locales in a selectbox" do visit admin_dashboard_path - expect(page).to have_select('change_locale', options: ['Kl', 'Jp', 'Cz']) + expect(page).to have_select("change_locale", options: ["Kl", "Jp", "Cz"]) end - context 'when having available_locales set for Alchemy::I18n' do + context "when having available_locales set for Alchemy::I18n" do before do allow(Alchemy::I18n).to receive(:available_locales).and_return [:jp, :cz] end it "provides only these locales" do visit admin_dashboard_path - expect(page).to have_select('change_locale', options: ['Jp', 'Cz']) + expect(page).to have_select("change_locale", options: ["Jp", "Cz"]) end end - describe 'user selects locale' do - context 'that is available' do + describe "user selects locale" do + context "that is available" do before do allow(Alchemy::I18n).to receive(:available_locales).and_return [:kl] end - it 'switches the locale' do - visit admin_dashboard_path(admin_locale: 'kl') + it "switches the locale" do + visit admin_dashboard_path(admin_locale: "kl") expect(page).to have_content("majQa' Dub") end end - context 'that is not available' do - it 'does not switch the locale' do - visit admin_dashboard_path(admin_locale: 'de') + context "that is not available" do + it "does not switch the locale" do + visit admin_dashboard_path(admin_locale: "de") expect(page).to have_content("Welcome back") end end diff --git a/spec/features/admin/locked_page_feature_spec.rb b/spec/features/admin/locked_page_feature_spec.rb index 3197a41f12..1570b79035 100644 --- a/spec/features/admin/locked_page_feature_spec.rb +++ b/spec/features/admin/locked_page_feature_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -RSpec.describe 'Locked pages feature', type: :system do +RSpec.describe "Locked pages feature", type: :system do let(:a_page) { create(:alchemy_page) } let(:user) do @@ -14,20 +14,20 @@ authorize_user(user) end - it 'displays tab for each locked page' do + it "displays tab for each locked page" do visit alchemy.admin_pages_path - within '#locked_pages' do + within "#locked_pages" do expect(page).to have_link a_page.name, href: alchemy.edit_admin_page_path(a_page) end end - context 'with multiple languages' do + context "with multiple languages" do let!(:language) do create(:alchemy_language, :klingon) end - it 'displays information for language' do + it "displays information for language" do visit alchemy.admin_pages_path within "#locked_page_#{a_page.id}" do @@ -36,12 +36,12 @@ end end - context 'with multiple sites' do + context "with multiple sites" do let!(:site) do - create(:alchemy_site, host: 'another-site.com') + create(:alchemy_site, host: "another-site.com") end - it 'displays information for site' do + it "displays information for site" do visit alchemy.admin_pages_path within "#locked_page_#{a_page.id}" do diff --git a/spec/features/admin/menus_features_spec.rb b/spec/features/admin/menus_features_spec.rb index 3bf001d6f1..0327fd79d5 100644 --- a/spec/features/admin/menus_features_spec.rb +++ b/spec/features/admin/menus_features_spec.rb @@ -1,42 +1,42 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" RSpec.describe "Admin Menus Features", type: :system do before do authorize_user(:as_admin) end - describe 'adding a new menu' do - context 'on the index page' do + describe "adding a new menu" do + context "on the index page" do let!(:default_language) { create(:alchemy_language) } - it 'creates menu' do + it "creates menu" do visit alchemy.admin_nodes_path - select 'Main Menu', from: 'Name' - click_button 'create' + select "Main Menu", from: "Menu Type" + click_button "create" - expect(page).to have_selector('.node_name', text: 'Main Menu') + expect(page).to have_selector(".node_name", text: "Main Menu") end end end - describe 'adding a new menu' do - context 'with multiple sites' do + describe "adding a new menu" do + context "with multiple sites" do let!(:default_site) { create(:alchemy_site, :default) } let!(:default_language) { create(:alchemy_language, site: default_site) } - let!(:site_2) { create(:alchemy_site, host: 'another-site.com') } + let!(:site_2) { create(:alchemy_site, host: "another-site.com") } let!(:site_2_language) { create(:alchemy_language, site: site_2) } let(:node) { Alchemy::Node.last } - it 'creates menu for current site' do + it "creates menu for current site" do visit alchemy.new_admin_node_path - select 'Main Menu', from: 'Name' - click_button 'create' + select "Main Menu", from: "Menu Type" + click_button "create" - expect(node.site_id).to eq(default_site.id) + expect(node.site).to eq(default_site) end end end diff --git a/spec/features/admin/modules_integration_spec.rb b/spec/features/admin/modules_integration_spec.rb index b14a4513e8..a2937abfaa 100644 --- a/spec/features/admin/modules_integration_spec.rb +++ b/spec/features/admin/modules_integration_spec.rb @@ -1,18 +1,18 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" RSpec.describe "Modules", type: :system do context "A custom module with a main-apps controller" do before { authorize_user(:as_admin) } it "should have a button in main_navigation, pointing to the configured controller" do - visit '/admin' - within '#main_navi' do - first('a', text: 'Events').click + visit "/admin" + within "#main_navi" do + first("a", text: "Events").click end - within '#main_content' do - expect(page).to have_content('0 Events') + within "#main_content" do + expect(page).to have_content("0 Events") end end end diff --git a/spec/features/admin/navigation_feature_spec.rb b/spec/features/admin/navigation_feature_spec.rb index 0a9746e98a..b847a04b57 100644 --- a/spec/features/admin/navigation_feature_spec.rb +++ b/spec/features/admin/navigation_feature_spec.rb @@ -1,25 +1,25 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -RSpec.describe 'Admin navigation feature', type: :system do - context 'admin users' do +RSpec.describe "Admin navigation feature", type: :system do + context "admin users" do before { authorize_user(:as_admin) } it "can leave the admin area" do - visit '/admin/leave' - expect(page).to have_content('You are about to leave Alchemy') + visit "/admin/leave" + expect(page).to have_content("You are about to leave Alchemy") end end - context 'editor users' do + context "editor users" do let!(:default_site) { create(:alchemy_site) } before { authorize_user(:as_editor) } it "can access the languages page" do - visit '/admin' - click_on 'Languages' - expect(current_path).to eq('/admin/languages') + visit "/admin" + click_on "Languages" + expect(current_path).to eq("/admin/languages") end end end diff --git a/spec/features/admin/page_creation_feature_spec.rb b/spec/features/admin/page_creation_feature_spec.rb index af6fcd99dc..3f7401b100 100644 --- a/spec/features/admin/page_creation_feature_spec.rb +++ b/spec/features/admin/page_creation_feature_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" RSpec.describe "Page creation", type: :system do before { authorize_user(:as_admin) } @@ -9,7 +9,7 @@ context "without having a Page in the clipboard" do it "does not contain tabs" do visit new_admin_page_path - within('#main_content') { expect(page).to_not have_selector('#overlay_tabs') } + within("#main_content") { expect(page).to_not have_selector("#overlay_tabs") } end end @@ -20,7 +20,7 @@ it "contains tabs for creating a new page and pasting from clipboard" do visit new_admin_page_path - within('#overlay_tabs') { expect(page).to have_selector '#create_page_tab, #paste_page_tab' } + within("#overlay_tabs") { expect(page).to have_selector "#create_page_tab, #paste_page_tab" } end context "", js: true do @@ -32,18 +32,18 @@ end it "the create page tab is visible by default" do - within('#overlay_tabs') do - expect(page).to have_selector('#create_page_tab', visible: true) - expect(page).to have_selector('#paste_page_tab', visible: false) + within("#overlay_tabs") do + expect(page).to have_selector("#create_page_tab", visible: true) + expect(page).to have_selector("#paste_page_tab", visible: false) end end context "when clicking on an inactive tab" do it "shows that clicked tab" do - within('#overlay_tabs') do - click_link('Paste from clipboard') - expect(find('#create_page_tab')).to_not be_visible - expect(find('#paste_page_tab')).to be_visible + within("#overlay_tabs") do + click_link("Paste from clipboard") + expect(find("#create_page_tab")).to_not be_visible + expect(find("#paste_page_tab")).to be_visible end end end diff --git a/spec/features/admin/page_destroy_feature_spec.rb b/spec/features/admin/page_destroy_feature_spec.rb index d6d0ea0ae4..a8aa704d1d 100644 --- a/spec/features/admin/page_destroy_feature_spec.rb +++ b/spec/features/admin/page_destroy_feature_spec.rb @@ -1,11 +1,11 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" RSpec.describe "Page destroy feature", type: :system, js: true do before { authorize_user(:as_admin) } - context 'destroying a content page' do + context "destroying a content page" do let!(:content_page) { create(:alchemy_page) } it "deletes page and redirects to page tree" do @@ -13,8 +13,8 @@ page.find("a[href='#{admin_page_path(content_page.id)}']").click - within '.alchemy-dialog-buttons' do - click_button 'Yes' + within ".alchemy-dialog-buttons" do + click_button "Yes" end expect(page.current_path).to eq admin_pages_path @@ -22,7 +22,7 @@ end end - context 'destroying a layout page' do + context "destroying a layout page" do let!(:layout_page) { create(:alchemy_page, :layoutpage) } it "deletes page and redirects to layoutpages list" do @@ -30,8 +30,8 @@ page.find("a[href='#{admin_page_path(layout_page.id)}']").click - within '.alchemy-dialog-buttons' do - click_button 'Yes' + within ".alchemy-dialog-buttons" do + click_button "Yes" end expect(page.current_path).to eq admin_layoutpages_path diff --git a/spec/features/admin/page_editing_feature_spec.rb b/spec/features/admin/page_editing_feature_spec.rb index 74b5907136..ce2b20ee2f 100644 --- a/spec/features/admin/page_editing_feature_spec.rb +++ b/spec/features/admin/page_editing_feature_spec.rb @@ -1,16 +1,16 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -RSpec.describe 'Page editing feature', type: :system do +RSpec.describe "Page editing feature", type: :system do let(:a_page) { create(:alchemy_page) } - context 'as author' do + context "as author" do before { authorize_user(:as_author) } - it 'cannot publish page.' do + it "cannot publish page." do visit alchemy.edit_admin_page_path(a_page) - expect(page).to_not have_selector('#publish_page_form') + expect(page).to_not have_selector("#publish_page_form") end describe "the preview frame", :js do @@ -21,27 +21,27 @@ end end - context 'as editor' do + context "as editor" do before { authorize_user(:as_editor) } - it 'can publish page.' do + it "can publish page." do visit alchemy.edit_admin_page_path(a_page) - find('#publish_page_form button').click + find("#publish_page_form button").click expect(page).to have_content Alchemy.t(:page_published, name: a_page.name) end - context 'while editing a global page' do - let(:a_page) { create(:alchemy_page, layoutpage: true) } + context "while editing a global page" do + let(:a_page) { create(:alchemy_page, :layoutpage) } - it 'can publish page.' do + it "can publish page." do visit alchemy.edit_admin_page_path(a_page) - expect(page).to have_selector('#publish_page_form') + expect(page).to have_selector("#publish_page_form") end end end - context 'as admin' do - let(:a_page) { create(:alchemy_page, :public, visible: true) } + context "as admin" do + let(:a_page) { create(:alchemy_page, :public) } before { authorize_user(:as_admin) } @@ -49,15 +49,15 @@ context "when editing a normal page" do it "should show all relevant input fields" do visit alchemy.configure_admin_page_path(a_page) - expect(page).to have_selector('input#page_urlname') - expect(page).to have_selector('input#page_title') - expect(page).to have_selector('input#page_robot_index') - expect(page).to have_selector('input#page_robot_follow') + expect(page).to have_selector("input#page_urlname") + expect(page).to have_selector("input#page_title") + expect(page).to have_selector("input#page_robot_index") + expect(page).to have_selector("input#page_robot_follow") end context "with sitemaps show_flag config option set to true" do before do - stub_alchemy_config(:sitemap, {'show_flag' => true}) + stub_alchemy_config(:sitemap, { "show_flag" => true }) end it "should show sitemap checkbox" do @@ -68,7 +68,7 @@ context "with sitemaps show_flag config option set to false" do before do - stub_alchemy_config(:sitemap, {'show_flag' => false}) + stub_alchemy_config(:sitemap, { "show_flag" => false }) end it "should not show sitemap checkbox" do @@ -79,26 +79,25 @@ end context "when editing a global page" do - let(:layout_page) { create(:alchemy_page, layoutpage: true) } + let(:layout_page) { create(:alchemy_page, :layoutpage) } it "should not show the input fields for normal pages" do visit alchemy.edit_admin_layoutpage_path(layout_page) - expect(page).to_not have_selector('input#page_urlname') - expect(page).to_not have_selector('input#page_title') - expect(page).to_not have_selector('input#page_robot_index') - expect(page).to_not have_selector('input#page_robot_follow') + expect(page).to_not have_selector("input#page_urlname") + expect(page).to_not have_selector("input#page_title") + expect(page).to_not have_selector("input#page_robot_index") + expect(page).to_not have_selector("input#page_robot_follow") end end context "when page is taggable" do before do - expect_any_instance_of(Alchemy::Page) - .to receive(:taggable?).and_return(true) + expect_any_instance_of(Alchemy::Page).to receive(:taggable?).and_return(true) end it "should show the tag_list input field" do visit alchemy.configure_admin_page_path(a_page) - expect(page).to have_selector('input#page_tag_list') + expect(page).to have_selector("input#page_tag_list") end end end @@ -106,53 +105,53 @@ context "in preview frame" do it "the menubar does not render on the page" do visit alchemy.admin_page_path(a_page) - expect(page).not_to have_selector('#alchemy_menubar') + expect(page).not_to have_selector("#alchemy_menubar") end - context 'with menu available' do - let!(:menu) { create(:alchemy_node, name: 'Main Navigation') } - let!(:node) { create(:alchemy_node, url: '/page-1', parent: menu) } + context "with menu available" do + let!(:menu) { create(:alchemy_node, name: "main_menu") } + let!(:node) { create(:alchemy_node, url: "/page-1", parent: menu) } it "navigation links are not clickable" do visit alchemy.admin_page_path(a_page) - within('nav') do + within("nav") do expect(page).to have_selector('a[href="javascript: void(0)"]') end end end end - context 'in element panel' do + context "in element panel" do let!(:everything_page) do - create(:alchemy_page, page_layout: 'everything', autogenerate_elements: true) + create(:alchemy_page, page_layout: "everything", autogenerate_elements: true) end it "renders essence editors for all element contents" do visit alchemy.admin_elements_path(page_id: everything_page.id) - expect(page).to have_selector('div.content_editor.essence_boolean') - expect(page).to have_selector('div.content_editor.essence_date') - expect(page).to have_selector('div.content_editor.essence_file') - expect(page).to have_selector('div.content_editor.essence_html') - expect(page).to have_selector('div.content_editor.essence_link') - expect(page).to have_selector('div.content_editor.essence_picture') - expect(page).to have_selector('div.content_editor.essence_richtext') - expect(page).to have_selector('div.content_editor.essence_select') - expect(page).to have_selector('div.content_editor.essence_text') + expect(page).to have_selector("div.content_editor.essence_boolean") + expect(page).to have_selector("div.content_editor.essence_date") + expect(page).to have_selector("div.content_editor.essence_file") + expect(page).to have_selector("div.content_editor.essence_html") + expect(page).to have_selector("div.content_editor.essence_link") + expect(page).to have_selector("div.content_editor.essence_picture") + expect(page).to have_selector("div.content_editor.essence_richtext") + expect(page).to have_selector("div.content_editor.essence_select") + expect(page).to have_selector("div.content_editor.essence_text") end it "renders data attribute based on content name" do visit alchemy.admin_elements_path(page_id: everything_page.id) - expect(page).to have_selector('div[data-content-name=essence_boolean]') - expect(page).to have_selector('div[data-content-name=essence_date]') - expect(page).to have_selector('div[data-content-name=essence_file]') - expect(page).to have_selector('div[data-content-name=essence_html]') - expect(page).to have_selector('div[data-content-name=essence_link]') - expect(page).to have_selector('div[data-content-name=essence_picture]') - expect(page).to have_selector('div[data-content-name=essence_richtext]') - expect(page).to have_selector('div[data-content-name=essence_select]') - expect(page).to have_selector('div[data-content-name=essence_text]') + expect(page).to have_selector("div[data-content-name=essence_boolean]") + expect(page).to have_selector("div[data-content-name=essence_date]") + expect(page).to have_selector("div[data-content-name=essence_file]") + expect(page).to have_selector("div[data-content-name=essence_html]") + expect(page).to have_selector("div[data-content-name=essence_link]") + expect(page).to have_selector("div[data-content-name=essence_picture]") + expect(page).to have_selector("div[data-content-name=essence_richtext]") + expect(page).to have_selector("div[data-content-name=essence_select]") + expect(page).to have_selector("div[data-content-name=essence_text]") end end end @@ -181,10 +180,10 @@ context "when page has fixed attributes" do let!(:readonly_page) do - create(:alchemy_page, page_layout: 'readonly') + create(:alchemy_page, page_layout: "readonly") end - it 'is not possible to edit the attribute', :aggregate_failures do + it "is not possible to edit the attribute", :aggregate_failures do visit alchemy.configure_admin_page_path(readonly_page) readonly_page.fixed_attributes.all.each do |attribute, _v| expect(page).to have_selector("#page_#{attribute}[disabled=\"disabled\"]") diff --git a/spec/features/admin/page_sorting_feature_spec.rb b/spec/features/admin/page_sorting_feature_spec.rb index 1585a57f60..6f16bdf17b 100644 --- a/spec/features/admin/page_sorting_feature_spec.rb +++ b/spec/features/admin/page_sorting_feature_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" RSpec.describe "Admin page sorting", type: :system do let!(:alchemy_page) { create(:alchemy_page) } @@ -9,15 +9,15 @@ authorize_user(:as_admin) end - specify 'a sorting description is displayed to the user' do + specify "a sorting description is displayed to the user" do visit sort_admin_pages_path expect(page).to have_content(Alchemy.t(:explain_sitemap_dragndrop_sorting)) end - specify 'links to fold or edit the page and all action icons are hidden', :aggregate_failures do + specify "links to fold or edit the page and all action icons are hidden", :aggregate_failures do visit sort_admin_pages_path - expect(page).to_not have_selector('.page_folder') - expect(page).to_not have_selector('.sitemap_pagename_link') - expect(page).to_not have_selector('.sitemap_tool') + expect(page).to_not have_selector(".page_folder") + expect(page).to_not have_selector(".sitemap_pagename_link") + expect(page).to_not have_selector(".sitemap_tool") end end diff --git a/spec/features/admin/picture_assignment_overlay_spec.rb b/spec/features/admin/picture_assignment_overlay_spec.rb index f099585b3e..4b7913c808 100644 --- a/spec/features/admin/picture_assignment_overlay_spec.rb +++ b/spec/features/admin/picture_assignment_overlay_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" RSpec.describe "Picture assignment overlay", type: :system do before do @@ -37,10 +37,10 @@ describe "assigning an image" do let!(:picture) { create(:alchemy_picture) } - let(:element) { create(:alchemy_element, :with_contents, name: 'header') } + let(:element) { create(:alchemy_element, :with_contents, name: "header") } let(:content) { element.contents.last } - scenario 'it has link to assign picture to content' do + scenario "it has link to assign picture to content" do visit alchemy.admin_pictures_path(content_id: content.id) expect(page).to have_css('a[data-method="put"][href*="/admin/essence_pictures/assign"]') end diff --git a/spec/features/admin/picture_library_integration_spec.rb b/spec/features/admin/picture_library_integration_spec.rb index 94ba77d8c9..262e312cd3 100644 --- a/spec/features/admin/picture_library_integration_spec.rb +++ b/spec/features/admin/picture_library_integration_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" RSpec.describe "Picture Library", type: :system do before do @@ -8,57 +8,57 @@ end describe "Tagging" do - let!(:picture_1) { create(:alchemy_picture, tag_list: 'tag1', name: 'TaggedWith1') } - let!(:picture_2) { create(:alchemy_picture, tag_list: 'tag2', name: 'TaggedWith2') } + let!(:picture_1) { create(:alchemy_picture, tag_list: "tag1", name: "TaggedWith1") } + let!(:picture_2) { create(:alchemy_picture, tag_list: "tag2", name: "TaggedWith2") } scenario "it's possible to filter tags by clicking on its name in the tag list." do visit alchemy.admin_pictures_path - click_on 'tag1 (1)' + click_on "tag1 (1)" - expect(page).to have_content('TaggedWith1') - expect(page).not_to have_content('TaggedWith2') + expect(page).to have_content("TaggedWith1") + expect(page).not_to have_content("TaggedWith2") end scenario "it's possible to undo tag filtering by clicking on an active tag name" do visit alchemy.admin_pictures_path - click_on 'tag1 (1)' + click_on "tag1 (1)" - expect(page).to have_content('TaggedWith1') - expect(page).not_to have_content('TaggedWith2') + expect(page).to have_content("TaggedWith1") + expect(page).not_to have_content("TaggedWith2") - click_on 'tag1 (1)' + click_on "tag1 (1)" - expect(page).to have_content('TaggedWith1') - expect(page).to have_content('TaggedWith2') + expect(page).to have_content("TaggedWith1") + expect(page).to have_content("TaggedWith2") end scenario "it's possible to tighten the tag scope by clicking on another tag name." do visit alchemy.admin_pictures_path - click_on 'tag1 (1)' - click_on 'tag2 (1)' + click_on "tag1 (1)" + click_on "tag2 (1)" expect(page).to have_content("You don't have any images in your archive") end end describe "Filter by tag" do - let!(:picture) { create(:alchemy_picture, tag_list: 'bla') } + let!(:picture) { create(:alchemy_picture, tag_list: "bla") } scenario "lists all applied tags." do visit alchemy.admin_pictures_path - expect(page).to have_content('bla') + expect(page).to have_content("bla") end scenario "it's possible to filter pictures by tag." do visit alchemy.admin_pictures_path - click_on 'bla (1)' + click_on "bla (1)" - expect(page).to have_content('bla') + expect(page).to have_content("bla") end end end diff --git a/spec/features/admin/resources_integration_spec.rb b/spec/features/admin/resources_integration_spec.rb index fabb46dfe1..0e1fffe762 100644 --- a/spec/features/admin/resources_integration_spec.rb +++ b/spec/features/admin/resources_integration_spec.rb @@ -1,23 +1,23 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" RSpec.describe "Resources", type: :system do let(:event) { create(:event) } - let(:second_event) { create(:event, name: 'My second Event', entrance_fee: 12.32) } + let(:second_event) { create(:event, name: "My second Event", entrance_fee: 12.32) } before { authorize_user(:as_admin) } describe "index view" do it "should have a button for creating a new resource items" do - visit '/admin/events' - expect(page).to have_selector('#toolbar div.button_with_label a.icon_button .icon.fa-plus') + visit "/admin/events" + expect(page).to have_selector("#toolbar div.button_with_label a.icon_button .icon.fa-plus") end it "should list existing items" do event second_event - visit '/admin/events' + visit "/admin/events" expect(page).to have_content("My Event") expect(page).to have_content("something fancy") expect(page).to have_content("12.32") @@ -25,8 +25,8 @@ it "should list existing resource-items nicely formatted" do event - visit '/admin/events' - expect(page).to have_selector('div#archive_all table.list') + visit "/admin/events" + expect(page).to have_selector("div#archive_all table.list") end describe "date fields" do @@ -38,7 +38,7 @@ end it "displays date values" do - visit '/admin/bookings' + visit "/admin/bookings" expect(page).to have_content(yesterday) expect(page).to have_content(tomorrow) end @@ -47,26 +47,26 @@ describe "form for creating and updating items" do it "renders an input field according to the attribute's type" do - visit '/admin/events/new' + visit "/admin/events/new" expect(page).to have_selector('input#event_name[type="text"]') expect(page).to have_selector('input#event_starts_at[data-datepicker-type="datetime"]') expect(page).to have_selector('input#event_ends_at[data-datepicker-type="datetime"]') - expect(page).to have_selector('textarea#event_description') + expect(page).to have_selector("textarea#event_description") expect(page).to have_selector('input#event_published[type="checkbox"]') expect(page).to have_selector('input#event_lunch_starts_at[data-datepicker-type="time"]') expect(page).to have_selector('input#event_lunch_ends_at[data-datepicker-type="time"]') end it "should have a select box for associated models" do - visit '/admin/events/new' - within('form') do - expect(page).to have_selector('select') + visit "/admin/events/new" + within("form") do + expect(page).to have_selector("select") end end describe "date fields" do it "have date picker" do - visit '/admin/bookings/new' + visit "/admin/bookings/new" expect(page).to have_selector('input#booking_from[data-datepicker-type="date"]') end end @@ -78,11 +78,11 @@ let(:start_date) { 1.week.from_now } before do - visit '/admin/events/new' - fill_in 'event_name', with: 'My second event' - fill_in 'event_starts_at', with: start_date - select location.name, from: 'Location' - click_on 'Save' + visit "/admin/events/new" + fill_in "event_name", with: "My second event" + fill_in "event_starts_at", with: start_date + select location.name, from: "Location" + click_on "Save" end it "lists the new item" do @@ -97,9 +97,9 @@ context "when form filled with invalid data" do before do - visit '/admin/events/new' - fill_in 'event_name', with: '' # invalid! - click_on 'Save' + visit "/admin/events/new" + fill_in "event_name", with: "" # invalid! + click_on "Save" end it "shows the form again" do @@ -119,8 +119,8 @@ describe "updating an item" do before do visit("/admin/events/#{event.id}/edit") - fill_in 'event_name', with: 'New event name' - click_on 'Save' + fill_in "event_name", with: "New event name" + click_on "Save" end it "shows the updated value" do @@ -136,9 +136,9 @@ before do event second_event - visit '/admin/events' - within('tr', text: 'My second Event') do - click_on 'Delete' + visit "/admin/events" + within("tr", text: "My second Event") do + click_on "Delete" end end diff --git a/spec/features/admin/site_select_feature_spec.rb b/spec/features/admin/site_select_feature_spec.rb index cb4ca7207a..8d6561e8a4 100644 --- a/spec/features/admin/site_select_feature_spec.rb +++ b/spec/features/admin/site_select_feature_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -RSpec.describe 'Site select', type: :system do +RSpec.describe "Site select", type: :system do before do authorize_user(:as_admin) end @@ -10,7 +10,7 @@ context "without multiple sites" do it "does not display the site select" do visit admin_pages_path - expect(page).not_to have_select('change_site') + expect(page).not_to have_select("change_site") end end @@ -21,7 +21,7 @@ context "not on pages or languages module" do it "does not display the site select" do visit admin_dashboard_path - expect(page).not_to have_select('change_site') + expect(page).not_to have_select("change_site") end end @@ -29,26 +29,26 @@ it "contains all sites in a selectbox" do %w(admin_pages_path admin_layoutpages_path admin_languages_path).each do |module_path| visit send(module_path) - expect(page).to have_select('change_site', + expect(page).to have_select("change_site", options: [Alchemy::Site.default.name, a_site.name], selected: Alchemy::Site.default.name) end end end - context 'when switching site' do + context "when switching site" do it "stores the site in session" do visit admin_pages_path(site_id: a_site.id) - expect(page).to have_select('change_site', selected: a_site.name) + expect(page).to have_select("change_site", selected: a_site.name) visit admin_languages_path - expect(page).to have_select('change_site', selected: a_site.name) + expect(page).to have_select("change_site", selected: a_site.name) end - context 'when site id is not found' do + context "when site id is not found" do it "stores the default site in session" do - visit admin_pages_path(site_id: '') - expect(page).to have_select('change_site', selected: Alchemy::Site.default.name) + visit admin_pages_path(site_id: "") + expect(page).to have_select("change_site", selected: Alchemy::Site.default.name) end end end diff --git a/spec/features/admin/tinymce_feature_spec.rb b/spec/features/admin/tinymce_feature_spec.rb index a079e853e8..604890f911 100644 --- a/spec/features/admin/tinymce_feature_spec.rb +++ b/spec/features/admin/tinymce_feature_spec.rb @@ -1,28 +1,28 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -RSpec.describe 'TinyMCE Editor', type: :system do +RSpec.describe "TinyMCE Editor", type: :system do before do authorize_user(:as_admin) end - it 'base path should be set to tinymce asset folder' do + it "base path should be set to tinymce asset folder" do visit admin_dashboard_path expect(page).to have_content( - "var tinyMCEPreInit = { base: '/assets/tinymce', suffix: '.min' };" + "var tinyMCEPreInit = { base: '/assets/tinymce', suffix: '.min' };", ) end - context 'with asset host' do + context "with asset host" do before do expect(ActionController::Base.config).to receive(:asset_host_set?).and_return(true) end - it 'base path should be set to tinymce asset folder' do + it "base path should be set to tinymce asset folder" do visit admin_dashboard_path expect(page).to have_content( - "var tinyMCEPreInit = { base: 'http://127.0.0.1/assets/tinymce', suffix: '.min' };" + "var tinyMCEPreInit = { base: 'http://127.0.0.1/assets/tinymce', suffix: '.min' };", ) end end diff --git a/spec/features/navigation_spec.rb b/spec/features/navigation_spec.rb index 992e3636c1..a5283f5869 100644 --- a/spec/features/navigation_spec.rb +++ b/spec/features/navigation_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" RSpec.describe "Dummy App", type: :system do include Capybara::DSL diff --git a/spec/features/page_feature_spec.rb b/spec/features/page_feature_spec.rb index 729eb1d3a1..622faa8e19 100644 --- a/spec/features/page_feature_spec.rb +++ b/spec/features/page_feature_spec.rb @@ -1,20 +1,20 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -RSpec.describe 'Show page feature:', type: :system do +RSpec.describe "Show page feature:", type: :system do let!(:default_language) { create(:alchemy_language) } let!(:default_language_root) do - create(:alchemy_page, :language_root, language: default_language, name: 'Home') + create(:alchemy_page, :language_root, language: default_language, name: "Home") end let(:public_page) do - create(:alchemy_page, :public, visible: true, name: 'Page 1') + create(:alchemy_page, :public, name: "Page 1") end let(:public_child) do - create(:alchemy_page, :public, name: 'Public Child', parent_id: public_page.id) + create(:alchemy_page, :public, name: "Public Child", parent_id: public_page.id) end context "When no page is present" do @@ -27,26 +27,26 @@ Alchemy.user_class.delete_all end - it 'shows a welcome page' do + it "shows a welcome page" do visit "/" - expect(page).to have_content('Welcome to Alchemy') + expect(page).to have_content("Welcome to Alchemy") end end end - context 'rendered' do + context "rendered" do let(:public_page) { create(:alchemy_page, :public, autogenerate_elements: true) } - let(:article) { public_page.elements.find_by_name('article') } - let(:essence) { article.content_by_name('intro').essence } + let(:article) { public_page.elements.find_by_name("article") } + let(:essence) { article.content_by_name("intro").essence } before do - essence.update_columns(body: 'Welcome to Peters Petshop', public: true) + essence.update_columns(body: "Welcome to Peters Petshop", public: true) end it "should include all its elements and contents" do visit "/#{public_page.urlname}" - within('div#content div.article div.intro') do - expect(page).to have_content('Welcome to Peters Petshop') + within("div#content div.article div.intro") do + expect(page).to have_content("Welcome to Peters Petshop") end end end @@ -68,7 +68,7 @@ context "rendering for guest users" do it "is prohibited" do visit "/#{public_page.urlname}" - within('body') { expect(page).not_to have_selector('#alchemy_menubar') } + within("body") { expect(page).not_to have_selector("#alchemy_menubar") } end end @@ -76,7 +76,7 @@ it "is prohibited" do authorize_user(build(:alchemy_dummy_user)) visit "/#{public_page.urlname}" - within('body') { expect(page).not_to have_selector('#alchemy_menubar') } + within("body") { expect(page).not_to have_selector("#alchemy_menubar") } end end @@ -84,7 +84,7 @@ it "is allowed" do authorize_user(:as_author) visit "/#{public_page.urlname}" - within('body') { expect(page).to have_selector('#alchemy_menubar') } + within("body") { expect(page).to have_selector("#alchemy_menubar") } end end @@ -92,7 +92,7 @@ it "is allowed" do authorize_user(:as_editor) visit "/#{public_page.urlname}" - within('body') { expect(page).to have_selector('#alchemy_menubar') } + within("body") { expect(page).to have_selector("#alchemy_menubar") } end end @@ -100,7 +100,7 @@ it "is allowed" do authorize_user(:as_admin) visit "/#{public_page.urlname}" - within('body') { expect(page).to have_selector('#alchemy_menubar') } + within("body") { expect(page).to have_selector("#alchemy_menubar") } end end @@ -111,20 +111,20 @@ end it "a link to the admin area" do - within('#alchemy_menubar') do + within("#alchemy_menubar") do expect(page).to have_selector("li a[href='#{alchemy.admin_dashboard_url(host: Capybara.current_host)}']") end end it "a link to edit the current page" do - within('#alchemy_menubar') do + within("#alchemy_menubar") do expect(page).to \ have_selector("li a[href='#{alchemy.edit_admin_page_url(public_page, host: Capybara.current_host)}']") end end it "a form and button to logout of alchemy" do - within('#alchemy_menubar') do + within("#alchemy_menubar") do expect(page).to \ have_selector("li form[action='#{Alchemy.logout_path}'][method='post']") expect(page).to \ @@ -136,41 +136,41 @@ end end - describe 'navigation rendering' do - context 'with menu available' do - let(:menu) { create(:alchemy_node, name: 'Main Navigation') } - let(:page1) { create(:alchemy_page, :public, visible: true, name: 'Page 1') } - let(:page2) { create(:alchemy_page, :public, visible: true, name: 'Page 2') } + describe "navigation rendering" do + context "with menu available" do + let(:menu) { create(:alchemy_node, menu_type: "main_menu") } + let(:page1) { create(:alchemy_page, :public, name: "Page 1") } + let(:page2) { create(:alchemy_page, :public, name: "Page 2") } let!(:node1) { create(:alchemy_node, page: page1, parent: menu) } let!(:node2) { create(:alchemy_node, page: page2, parent: menu) } - it "should show the navigation with all visible pages" do - visit '/' - within('nav ul') do + it "should show the navigation with all pages" do + visit "/" + within("nav ul") do expect(page).to have_selector('li a[href="/page-1"], li a[href="/page-2"]') end end - it 'shows the navigation in a custom controller' do - visit '/ns/locations' - within('nav ul') do + it "shows the navigation in a custom controller" do + visit "/ns/locations" + within("nav ul") do expect(page).to have_selector('li a[href="/page-1"], li a[href="/page-2"]') end end end end - describe 'accessing restricted pages' do + describe "accessing restricted pages" do let!(:restricted_page) { create(:alchemy_page, :restricted, public_on: Time.current) } - context 'as a guest user' do + context "as a guest user" do it "I am not able to visit the page" do visit restricted_page.urlname expect(current_path).to eq(Alchemy.login_path) end end - context 'as a member user' do + context "as a member user" do before do authorize_user(create(:alchemy_dummy_user)) end diff --git a/spec/features/page_redirects_spec.rb b/spec/features/page_redirects_spec.rb index e76dab2e90..4f679332e3 100644 --- a/spec/features/page_redirects_spec.rb +++ b/spec/features/page_redirects_spec.rb @@ -1,29 +1,29 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -RSpec.describe 'Requesting a page' do +RSpec.describe "Requesting a page" do let!(:default_language) { create(:alchemy_language, :english, default: true) } let!(:default_language_root) do - create(:alchemy_page, :language_root, language: default_language, name: 'Home') + create(:alchemy_page, :language_root, language: default_language, name: "Home") end let(:public_page) do - create(:alchemy_page, :public, visible: true, name: 'Page 1') + create(:alchemy_page, :public, name: "Page 1") end let(:public_child) do - create(:alchemy_page, :public, name: 'Public Child', parent_id: public_page.id) + create(:alchemy_page, :public, name: "Public Child", parent_id: public_page.id) end context "in multi language mode" do - let(:second_page) { create(:alchemy_page, :public, name: 'Second Page') } + let(:second_page) { create(:alchemy_page, :public, name: "Second Page") } let(:legacy_url) do Alchemy::LegacyPageUrl.create( - urlname: 'index.php?option=com_content&view=article&id=48&Itemid=69', - page: second_page + urlname: "index.php?option=com_content&view=article&id=48&Itemid=69", + page: second_page, ) end @@ -31,7 +31,7 @@ allow_any_instance_of(Alchemy::PagesController).to receive(:multi_language?).and_return(true) end - context 'if language params are given' do + context "if language params are given" do context "and page locale is default locale" do it "redirects to unprefixed locale url" do allow(::I18n).to receive(:default_locale) { public_page.language_code.to_sym } @@ -49,7 +49,7 @@ end end - context 'if no language params are given' do + context "if no language params are given" do context "and page locale is default locale" do it "doesn't prepend the url with the locale string" do allow(::I18n).to receive(:default_locale) { public_page.language_code.to_sym } @@ -89,16 +89,15 @@ before do public_page.update( public_on: nil, - visible: false, - name: 'Not Public', - urlname: '' + name: "Not Public", + urlname: "", ) public_child end it "redirects to public child" do visit "/not-public" - expect(page.current_path).to eq("/public-child") + expect(page.current_path).to eq("/not-public/public-child") end context "with only unpublished pages in page tree" do @@ -117,13 +116,13 @@ it "redirects to public child with prefixed locale" do allow(::I18n).to receive(:default_locale).and_return(:de) visit "/not-public" - expect(page.current_path).to eq("/en/public-child") + expect(page.current_path).to eq("/en/not-public/public-child") end end end context "if requested url is the index url" do - context 'and redirect_to_public_child is enabled' do + context "and redirect_to_public_child is enabled" do before do allow(Alchemy::Config).to receive(:get) do |arg| arg == :redirect_to_public_child ? true : Alchemy::Config.parameter(arg) @@ -132,22 +131,21 @@ context "if index page is unpublished" do let!(:public_child) do - create(:alchemy_page, :public, name: 'Public Child', parent_id: default_language_root.id) + create(:alchemy_page, :public, name: "Public Child", parent_id: default_language_root.id) end before do default_language_root.update( public_on: nil, - visible: false, - name: 'Not Public', - urlname: '' + name: "Not Public", + urlname: "", ) end context "and index page locale is default locale" do - it 'redirects to public child without prefixed locale' do - visit '/' - expect(page.current_path).to eq('/public-child') + it "redirects to public child without prefixed locale" do + visit "/" + expect(page.current_path).to eq("/public-child") end end @@ -156,9 +154,9 @@ allow(::I18n).to receive(:default_locale).and_return(:de) end - it 'redirects to public child with prefixed locale' do - visit '/' - expect(page.current_path).to eq('/en/public-child') + it "redirects to public child with prefixed locale" do + visit "/" + expect(page.current_path).to eq("/en/public-child") end end end @@ -173,7 +171,7 @@ it "redirects to '/'" do visit "/#{default_language.code}" - expect(page.current_path).to eq('/') + expect(page.current_path).to eq("/") end end @@ -217,12 +215,12 @@ end context "not in multi language mode" do - let(:second_page) { create(:alchemy_page, :public, name: 'Second Page') } + let(:second_page) { create(:alchemy_page, :public, name: "Second Page") } let(:legacy_url) do Alchemy::LegacyPageUrl.create( - urlname: 'index.php?option=com_content&view=article&id=48&Itemid=69', - page: second_page + urlname: "index.php?option=com_content&view=article&id=48&Itemid=69", + page: second_page, ) end @@ -245,26 +243,25 @@ context "redirects to public child" do before do public_page.update( - visible: false, public_on: nil, - name: 'Not Public', - urlname: '' + name: "Not Public", + urlname: "", ) public_child end it "if requested page is unpublished" do - visit '/not-public' - expect(page.current_path).to eq('/public-child') + visit "/not-public" + expect(page.current_path).to eq("/not-public/public-child") end it "with normal url, if requested url has nested language code and is not public" do - visit '/en/not-public' - expect(page.current_path).to eq('/public-child') + visit "/en/not-public" + expect(page.current_path).to eq("/not-public/public-child") end end - context 'if requested url is index url' do + context "if requested url is index url" do context "when locale is prefixed" do it "redirects to normal url" do visit "/en" diff --git a/spec/features/page_seeder_spec.rb b/spec/features/page_seeder_spec.rb index a4fd1a8a8d..75b07c648b 100644 --- a/spec/features/page_seeder_spec.rb +++ b/spec/features/page_seeder_spec.rb @@ -1,16 +1,16 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -RSpec.describe 'Page seeding', type: :system do - context 'when db/seeds/alchemy/pages.yml file is present' do +RSpec.describe "Page seeding", type: :system do + context "when db/seeds/alchemy/pages.yml file is present" do let(:seeds_file) do - 'spec/fixtures/pages.yml' + "spec/fixtures/pages.yml" end before do - FileUtils.mkdir_p(Rails.root.join('db/seeds/alchemy')) - FileUtils.cp(seeds_file, Rails.root.join('db/seeds/alchemy/pages.yml')) + FileUtils.mkdir_p(Rails.root.join("db/seeds/alchemy")) + FileUtils.cp(seeds_file, Rails.root.join("db/seeds/alchemy/pages.yml")) Alchemy::Seeder.instance_variable_set(:@_page_yml, nil) end @@ -19,26 +19,26 @@ Alchemy::Seeder.seed! end - context 'when no pages are present yet' do + context "when no pages are present yet" do before do Alchemy::Page.delete_all end - it 'seeds pages', :aggregate_failures do + it "seeds pages", :aggregate_failures do seed - expect(Alchemy::Page.find_by(name: 'Index')).to be_present - expect(Alchemy::Page.find_by(name: 'Home')).to be_present - expect(Alchemy::Page.find_by(name: 'About')).to be_present - expect(Alchemy::Page.find_by(name: 'Contact')).to be_present - expect(Alchemy::Page.find_by(name: 'Footer')).to be_present + expect(Alchemy::Page.find_by(name: "Index")).to be_present + expect(Alchemy::Page.find_by(name: "Home")).to be_present + expect(Alchemy::Page.find_by(name: "About")).to be_present + expect(Alchemy::Page.find_by(name: "Contact")).to be_present + expect(Alchemy::Page.find_by(name: "Footer")).to be_present end - context 'when more then one content root page is present' do + context "when more then one content root page is present" do let(:seeds_file) do - 'spec/fixtures/pages_with_two_roots.yml' + "spec/fixtures/pages_with_two_roots.yml" end - it 'aborts' do + it "aborts" do expect { expect { seed }.to output.to_stderr }.to raise_error(SystemExit) @@ -49,14 +49,14 @@ context "when pages are already present" do let!(:page) { create(:alchemy_page) } - it 'does not seed' do + it "does not seed" do seed - expect(Alchemy::Page.find_by(name: 'Home')).to_not be_present + expect(Alchemy::Page.find_by(name: "Home")).to_not be_present end end after do - FileUtils.rm_rf(Rails.root.join('db/seeds')) + FileUtils.rm_rf(Rails.root.join("db/seeds")) end end end diff --git a/spec/features/security_spec.rb b/spec/features/security_spec.rb index e86d38cfc6..d04e93c233 100644 --- a/spec/features/security_spec.rb +++ b/spec/features/security_spec.rb @@ -1,26 +1,12 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" RSpec.describe "Security.", type: :system do context "If user is not logged in" do it "should see login form" do - visit '/admin/dashboard' + visit "/admin/dashboard" expect(current_path).to eq(Alchemy.login_path) end end - - context "If ssl is enforced" do - before do - allow_any_instance_of(Alchemy::BaseController) - .to receive(:ssl_required?) - .and_return(true) - authorize_user(:as_admin) - end - - it "redirects every request to https." do - visit '/admin/dashboard' - expect(current_url).to eq('https://127.0.0.1/admin/dashboard') - end - end end diff --git a/spec/features/user_seeder_spec.rb b/spec/features/user_seeder_spec.rb index 53853e6371..478f353a55 100644 --- a/spec/features/user_seeder_spec.rb +++ b/spec/features/user_seeder_spec.rb @@ -1,26 +1,26 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -RSpec.describe 'User seeding', type: :system do - context 'when db/seeds/alchemy/users.yml file is present' do +RSpec.describe "User seeding", type: :system do + context "when db/seeds/alchemy/users.yml file is present" do let(:seeds_file) do - 'spec/fixtures/users.yml' + "spec/fixtures/users.yml" end before do - FileUtils.mkdir_p(Rails.root.join('db/seeds/alchemy')) - FileUtils.cp(seeds_file, Rails.root.join('db/seeds/alchemy/users.yml')) + FileUtils.mkdir_p(Rails.root.join("db/seeds/alchemy")) + FileUtils.cp(seeds_file, Rails.root.join("db/seeds/alchemy/users.yml")) end - it 'seeds users' do + it "seeds users" do Alchemy::Seeder.seed! - expect(DummyUser.find_by(email: 'admin@example.com')).to be_present - expect(DummyUser.find_by(email: 'member@example.com')).to be_present + expect(DummyUser.find_by(email: "admin@example.com")).to be_present + expect(DummyUser.find_by(email: "member@example.com")).to be_present end after do - FileUtils.rm_rf(Rails.root.join('db/seeds')) + FileUtils.rm_rf(Rails.root.join("db/seeds")) end end end diff --git a/spec/helpers/alchemy/admin/attachments_helper_spec.rb b/spec/helpers/alchemy/admin/attachments_helper_spec.rb index 1448495367..e5164f1724 100644 --- a/spec/helpers/alchemy/admin/attachments_helper_spec.rb +++ b/spec/helpers/alchemy/admin/attachments_helper_spec.rb @@ -1,17 +1,17 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" describe Alchemy::Admin::AttachmentsHelper do - describe '#mime_to_human' do - context 'when given mime type has no translation' do + describe "#mime_to_human" do + context "when given mime type has no translation" do it "should return the default" do - expect(helper.mime_to_human('something')).to eq('File') + expect(helper.mime_to_human("something")).to eq("File") end end it "should return the translation for the given mime type" do - expect(helper.mime_to_human('text/plain')).to eq('Text-Document') + expect(helper.mime_to_human("text/plain")).to eq("Text-Document") end end end diff --git a/spec/helpers/alchemy/admin/base_helper_spec.rb b/spec/helpers/alchemy/admin/base_helper_spec.rb index 2b04920f64..abab59dd87 100644 --- a/spec/helpers/alchemy/admin/base_helper_spec.rb +++ b/spec/helpers/alchemy/admin/base_helper_spec.rb @@ -1,16 +1,16 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Admin::BaseHelper do - describe '#toolbar_button' do + describe "#toolbar_button" do context "with permission" do before { allow(helper).to receive(:can?).and_return(true) } it "renders a toolbar button" do expect(helper.toolbar_button( - url: admin_dashboard_path + url: admin_dashboard_path, )).to match / 'headline', - 'contents' => [] + "name" => "headline", + "contents" => [], }] end subject { helper.elements_for_select(element_definitions) } it "should return a array for option tags" do - expect(subject).to include(['Headline', 'headline']) + expect(subject).to include(["Headline", "headline"]) end it "should render the elements display name" do - expect(Element).to receive(:display_name_for).with('headline') + expect(Element).to receive(:display_name_for).with("headline") subject end end diff --git a/spec/helpers/alchemy/admin/essences_helper_spec.rb b/spec/helpers/alchemy/admin/essences_helper_spec.rb index 235b0bcf59..1ac3e99da9 100644 --- a/spec/helpers/alchemy/admin/essences_helper_spec.rb +++ b/spec/helpers/alchemy/admin/essences_helper_spec.rb @@ -1,15 +1,15 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" describe Alchemy::Admin::EssencesHelper do include Alchemy::Admin::ElementsHelper let(:element) do - create(:alchemy_element, :with_contents, name: 'article') + create(:alchemy_element, :with_contents, name: "article") end - describe '#essence_picture_thumbnail' do + describe "#essence_picture_thumbnail" do let(:essence) do build_stubbed(:alchemy_essence_picture) end @@ -28,7 +28,7 @@ have_selector("img[src].img_paddingtop") end - context 'when given content has no ingredient' do + context "when given content has no ingredient" do before { allow(content).to receive(:ingredient).and_return(nil) } it "should return nil" do @@ -47,7 +47,7 @@ allow(content).to receive(:settings) do { caption_as_textarea: true, - sizes: ['100x100', '200x200'] + sizes: ["100x100", "200x200"], } end @@ -59,7 +59,7 @@ before do allow(content).to receive(:settings) do { - caption_as_textarea: true + caption_as_textarea: true, } end @@ -72,7 +72,7 @@ allow(content).to receive(:settings) do { caption_as_textarea: false, - sizes: ['100x100', '200x200'] + sizes: ["100x100", "200x200"], } end @@ -84,7 +84,7 @@ before do allow(content).to receive(:settings) do { - caption_as_textarea: false + caption_as_textarea: false, } end diff --git a/spec/helpers/alchemy/admin/navigation_helper_spec.rb b/spec/helpers/alchemy/admin/navigation_helper_spec.rb index 68d6f58001..4d2255c58a 100644 --- a/spec/helpers/alchemy/admin/navigation_helper_spec.rb +++ b/spec/helpers/alchemy/admin/navigation_helper_spec.rb @@ -1,81 +1,81 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" describe Alchemy::Admin::NavigationHelper do let(:alchemy_module) do { - 'name' => 'dashboard', - 'engine_name' => 'alchemy', - 'navigation' => { - 'name' => 'modules.dashboard', - 'controller' => 'alchemy/admin/dashboard', - 'action' => 'index', - 'icon' => 'dashboard' - } + "name" => "dashboard", + "engine_name" => "alchemy", + "navigation" => { + "name" => "modules.dashboard", + "controller" => "alchemy/admin/dashboard", + "action" => "index", + "icon" => "dashboard", + }, } end let(:module_with_subnavigation) do { - 'name' => 'library', - 'engine_name' => 'alchemy', - 'navigation' => { - 'name' => 'modules.library', - 'controller' => 'alchemy/admin/pictures', - 'action' => 'index', - 'sub_navigation' => [{ - 'name' => 'modules.pictures', - 'controller' => 'alchemy/admin/pictures', - 'action' => 'index' + "name" => "library", + "engine_name" => "alchemy", + "navigation" => { + "name" => "modules.library", + "controller" => "alchemy/admin/pictures", + "action" => "index", + "sub_navigation" => [{ + "name" => "modules.pictures", + "controller" => "alchemy/admin/pictures", + "action" => "index", }, { - 'name' => 'modules.files', - 'controller' => 'alchemy/admin/attachments', - 'action' => 'index' - }] - } + "name" => "modules.files", + "controller" => "alchemy/admin/attachments", + "action" => "index", + }], + }, } end let(:event_module) do { - 'navigation' => { - 'controller' => '/admin/events', - 'action' => 'index', - 'sub_navigation' => [{ - 'controller' => '/admin/events', - 'action' => 'index' - }] - } + "navigation" => { + "controller" => "/admin/events", + "action" => "index", + "sub_navigation" => [{ + "controller" => "/admin/events", + "action" => "index", + }], + }, } end let(:event_module_with_params) do { - 'navigation' => { - 'controller' => '/admin/events', - 'action' => 'index', - 'params' => { - 'key' => 'value' + "navigation" => { + "controller" => "/admin/events", + "action" => "index", + "params" => { + "key" => "value", }, - 'sub_navigation' => [{ - 'controller' => '/admin/events', - 'action' => 'index', - 'params' => { - 'key' => 'value', - 'key2' => 'value2' - } - }] - } + "sub_navigation" => [{ + "controller" => "/admin/events", + "action" => "index", + "params" => { + "key" => "value", + "key2" => "value2", + }, + }], + }, } end - let(:navigation) { alchemy_module['navigation'] } + let(:navigation) { alchemy_module["navigation"] } - describe '#alchemy_main_navigation_entry' do + describe "#alchemy_main_navigation_entry" do before do - allow(helper).to receive(:url_for_module).and_return('') - allow(Alchemy).to receive(:t).and_return(alchemy_module['name']) + allow(helper).to receive(:url_for_module).and_return("") + allow(Alchemy).to receive(:t).and_return(alchemy_module["name"]) end context "with permission" do @@ -85,7 +85,7 @@ it "renders the main navigation entry partial" do expect(helper.alchemy_main_navigation_entry(alchemy_module)). - to have_selector '.main_navi_entry' + to have_selector ".main_navi_entry" end context "when module has sub navigation" do @@ -99,9 +99,9 @@ end end - it 'includes the sub navigation' do + it "includes the sub navigation" do expect(helper.alchemy_main_navigation_entry(alchemy_module)). - to have_selector '.main_navi_entry .sub_navigation' + to have_selector ".main_navi_entry .sub_navigation" end end end @@ -117,7 +117,7 @@ end end - describe '#navigate_module' do + describe "#navigate_module" do it "returns array with symbolized action and controller name" do expect(helper.navigate_module(navigation)).to eq([:index, :alchemy_admin_dashboard]) end @@ -125,8 +125,8 @@ context "when controller name has a leading slash" do let(:navigation) do { - 'action' => 'index', - 'controller' => '/admin/pictures' + "action" => "index", + "controller" => "/admin/pictures", } end @@ -136,7 +136,7 @@ end end - describe '#main_navigation_css_classes' do + describe "#main_navigation_css_classes" do it "returns string with css classes for main navigation entry" do expect(helper.main_navigation_css_classes(navigation)).to eq(%w(main_navi_entry)) end @@ -144,8 +144,8 @@ context "with active entry" do before do allow(helper).to receive(:params).and_return({ - controller: 'alchemy/admin/dashboard', - action: 'index' + controller: "alchemy/admin/dashboard", + action: "index", }) end @@ -155,17 +155,17 @@ end end - describe '#entry_active?' do + describe "#entry_active?" do let(:entry) do - {'controller' => 'alchemy/admin/dashboard', 'action' => 'index'} + { "controller" => "alchemy/admin/dashboard", "action" => "index" } end context "with active entry" do before do allow(helper).to receive(:params) do { - controller: 'alchemy/admin/dashboard', - action: 'index' + controller: "alchemy/admin/dashboard", + action: "index", } end end @@ -175,7 +175,7 @@ end context "and with leading slash in controller name" do - before { entry['controller'] = '/alchemy/admin/dashboard' } + before { entry["controller"] = "/alchemy/admin/dashboard" } it "returns true" do expect(helper.entry_active?(entry)).to be_truthy @@ -184,8 +184,8 @@ context "but with action listed in nested_actions key" do before do - entry['action'] = nil - entry['nested_actions'] = %w(index) + entry["action"] = nil + entry["nested_actions"] = %w(index) end it "returns true" do @@ -198,8 +198,8 @@ before do expect(helper).to receive(:params) do { - controller: 'alchemy/admin/users', - action: 'index' + controller: "alchemy/admin/users", + action: "index", } end end @@ -210,43 +210,43 @@ end end - describe '#url_for_module' do + describe "#url_for_module" do context "with module within an engine" do it "returns correct url string" do - expect(helper.url_for_module(alchemy_module)).to eq('/admin/dashboard') + expect(helper.url_for_module(alchemy_module)).to eq("/admin/dashboard") end end context "with module within host app" do it "returns correct url string" do - expect(helper.url_for_module(event_module)).to eq('/admin/events') + expect(helper.url_for_module(event_module)).to eq("/admin/events") end it "returns correct url string with params" do - expect(helper.url_for_module(event_module_with_params)).to eq('/admin/events?key=value') + expect(helper.url_for_module(event_module_with_params)).to eq("/admin/events?key=value") end end end - describe '#url_for_module_sub_navigation' do + describe "#url_for_module_sub_navigation" do let(:current_module) do module_with_subnavigation end let(:navigation) do - current_module['navigation']['sub_navigation'].first + current_module["navigation"]["sub_navigation"].first end subject { helper.url_for_module_sub_navigation(navigation) } - context 'with module found' do + context "with module found" do before do expect(helper).to receive(:module_definition_for).and_return current_module end context "with module within an engine" do it "returns correct url string" do - is_expected.to eq('/admin/pictures') + is_expected.to eq("/admin/pictures") end end @@ -254,7 +254,7 @@ let(:current_module) { event_module } it "returns correct url string" do - is_expected.to eq('/admin/events') + is_expected.to eq("/admin/events") end end @@ -262,12 +262,12 @@ let(:current_module) { event_module_with_params } it "returns correct url string with params" do - is_expected.to eq('/admin/events?key2=value2&key=value') + is_expected.to eq("/admin/events?key2=value2&key=value") end end end - context 'without module found' do + context "without module found" do before do expect(helper).to receive(:module_definition_for).and_return nil end @@ -279,10 +279,10 @@ describe "#sorted_alchemy_modules" do subject { helper.sorted_alchemy_modules } - context 'with position attribute on modules' do + context "with position attribute on modules" do before do - alchemy_module['position'] = 1 - event_module['position'] = 2 + alchemy_module["position"] = 1 + event_module["position"] = 2 expect(helper).to receive(:alchemy_modules).and_return [event_module, alchemy_module] end @@ -291,9 +291,9 @@ end end - context 'with no position attribute on one module' do + context "with no position attribute on one module" do before do - event_module['position'] = 2 + event_module["position"] = 2 expect(helper).to receive(:alchemy_modules).and_return [alchemy_module, event_module] end diff --git a/spec/helpers/alchemy/admin/pages_helper_spec.rb b/spec/helpers/alchemy/admin/pages_helper_spec.rb index cebe8853b1..3d134e5705 100644 --- a/spec/helpers/alchemy/admin/pages_helper_spec.rb +++ b/spec/helpers/alchemy/admin/pages_helper_spec.rb @@ -1,41 +1,41 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" describe Alchemy::Admin::PagesHelper do - describe '#preview_sizes_for_select' do + describe "#preview_sizes_for_select" do it "returns a options string of preview screen sizes for select tag" do - expect(helper.preview_sizes_for_select).to include('option', 'auto', '240', '320', '480', '768', '1024', '1280') + expect(helper.preview_sizes_for_select).to include("option", "auto", "240", "320", "480", "768", "1024", "1280") end end - describe '#page_layout_label' do + describe "#page_layout_label" do let(:page) { build(:alchemy_page) } subject { helper.page_layout_label(page) } - context 'when page is not yet persisted' do - it 'displays text only' do + context "when page is not yet persisted" do + it "displays text only" do is_expected.to eq(Alchemy.t(:page_type)) end end - context 'when page is persisted' do + context "when page is persisted" do before { page.save! } - context 'with page layout existing' do - it 'displays text only' do + context "with page layout existing" do + it "displays text only" do is_expected.to eq(Alchemy.t(:page_type)) end end - context 'with page layout definition missing' do + context "with page layout definition missing" do before do expect(page).to receive(:definition).and_return([]) end - it 'displays icon with warning and tooltip' do - is_expected.to have_selector '.hint-with-icon .hint-bubble' + it "displays icon with warning and tooltip" do + is_expected.to have_selector ".hint-with-icon .hint-bubble" end end end diff --git a/spec/helpers/alchemy/admin/pictures_helper_spec.rb b/spec/helpers/alchemy/admin/pictures_helper_spec.rb index 6a5a64f619..c3c9a3320a 100644 --- a/spec/helpers/alchemy/admin/pictures_helper_spec.rb +++ b/spec/helpers/alchemy/admin/pictures_helper_spec.rb @@ -1,27 +1,27 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" describe Alchemy::Admin::PicturesHelper do describe "#preview_size" do subject { helper.preview_size(size) } context "when 'small' is passed in" do - let(:size) { 'small' } + let(:size) { "small" } - it { is_expected.to eq('80x60') } + it { is_expected.to eq("80x60") } end context "when 'large' is passed in" do - let(:size) { 'large' } + let(:size) { "large" } - it { is_expected.to eq('240x180') } + it { is_expected.to eq("240x180") } end context "when anything else is passed in" do let(:size) { nil } - it { is_expected.to eq('160x120') } + it { is_expected.to eq("160x120") } end end end diff --git a/spec/helpers/alchemy/admin/tags_helper_spec.rb b/spec/helpers/alchemy/admin/tags_helper_spec.rb index 0697aa675c..01a3a840ee 100644 --- a/spec/helpers/alchemy/admin/tags_helper_spec.rb +++ b/spec/helpers/alchemy/admin/tags_helper_spec.rb @@ -1,24 +1,24 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Admin::TagsHelper do - let(:tag) { mock_model(Gutentag::Tag, name: 'foo', count: 1) } - let(:tag2) { mock_model(Gutentag::Tag, name: 'abc', count: 1) } + let(:tag) { mock_model(Gutentag::Tag, name: "foo", count: 1) } + let(:tag2) { mock_model(Gutentag::Tag, name: "abc", count: 1) } let(:params) do - ActionController::Parameters.new(tagged_with: 'foo') + ActionController::Parameters.new(tagged_with: "foo") end before do allow(helper).to receive(:search_filter_params) do - params.permit!.merge(controller: 'admin/attachments', action: 'index', use_route: 'alchemy') + params.permit!.merge(controller: "admin/attachments", action: "index", use_route: "alchemy") end end - describe '#render_tag_list' do - subject { helper.render_tag_list('Alchemy::Attachment') } + describe "#render_tag_list" do + subject { helper.render_tag_list("Alchemy::Attachment") } context "with tagged objects" do before { allow(Attachment).to receive(:tag_counts).and_return([tag, tag2]) } @@ -40,7 +40,7 @@ module Alchemy end context "with lowercase and uppercase tag names mixed" do - let(:tag) { mock_model(Gutentag::Tag, name: 'Foo', count: 1) } + let(:tag) { mock_model(Gutentag::Tag, name: "Foo", count: 1) } it "tags are sorted alphabetically correctly" do is_expected.to match(/li.+name="#{tag2.name}.+li.+name="#{tag.name}/) @@ -54,12 +54,12 @@ module Alchemy context "when filter and search params are present" do let(:params) do ActionController::Parameters.new( - filter: 'foo', - q: {name_eq: 'foo'} + filter: "foo", + q: {name_eq: "foo"}, ) end - it 'keeps them' do + it "keeps them" do is_expected.to match(/filter/) is_expected.to match(/name_eq/) end @@ -82,17 +82,17 @@ module Alchemy describe "#filtered_by_tag?" do subject { helper.filtered_by_tag?(tag) } - context 'if the filter list params contains the given tag' do + context "if the filter list params contains the given tag" do let(:params) do - ActionController::Parameters.new(tagged_with: 'foo,bar,baz') + ActionController::Parameters.new(tagged_with: "foo,bar,baz") end it { is_expected.to eq(true) } end - context 'if the filter list params does not contain the given tag' do + context "if the filter list params does not contain the given tag" do let(:params) do - ActionController::Parameters.new(tagged_with: 'bar,baz') + ActionController::Parameters.new(tagged_with: "bar,baz") end it { is_expected.to eq(false) } @@ -122,7 +122,7 @@ module Alchemy context "if params[:tagged_with] contains some tag names" do let(:params) do - ActionController::Parameters.new(tagged_with: 'bar,baz') + ActionController::Parameters.new(tagged_with: "bar,baz") end it "should return a String of tag names including the given one" do @@ -132,7 +132,7 @@ module Alchemy context "if params[:tagged_with] contains current tag name" do let(:params) do - ActionController::Parameters.new(tagged_with: 'bar,baz,foo') + ActionController::Parameters.new(tagged_with: "bar,baz,foo") end it "should return a String of tag names without the current one" do diff --git a/spec/helpers/alchemy/base_helper_spec.rb b/spec/helpers/alchemy/base_helper_spec.rb index 9ee448a6f6..9d28e7887f 100644 --- a/spec/helpers/alchemy/base_helper_spec.rb +++ b/spec/helpers/alchemy/base_helper_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe BaseHelper do @@ -9,39 +9,39 @@ module Alchemy let(:options) { Hash.new } - it 'renders a solid fontawesome icon with fixed width' do - is_expected.to have_css 'i.icon.fa-info.fas.fa-fw' + it "renders a solid fontawesome icon with fixed width" do + is_expected.to have_css "i.icon.fa-info.fas.fa-fw" end - context 'with style set to regular' do - let(:options) { {style: 'regular'} } + context "with style set to regular" do + let(:options) { {style: "regular"} } - it 'renders a regular fontawesome icon' do - is_expected.to have_css 'i.far' + it "renders a regular fontawesome icon" do + is_expected.to have_css "i.far" end end - context 'with size set to xs' do - let(:options) { {size: 'xs'} } + context "with size set to xs" do + let(:options) { {size: "xs"} } - it 'renders a extra small fontawesome icon' do - is_expected.to have_css 'i.fa-xs' + it "renders a extra small fontawesome icon" do + is_expected.to have_css "i.fa-xs" end end - context 'with transform option given' do - let(:options) { {transform: 'flip-horizontal'} } + context "with transform option given" do + let(:options) { {transform: "flip-horizontal"} } - it 'renders a transformed fontawesome icon' do - is_expected.to have_css 'i.fa-flip-horizontal' + it "renders a transformed fontawesome icon" do + is_expected.to have_css "i.fa-flip-horizontal" end end - context 'with class option given' do - let(:options) { {class: 'disabled'} } + context "with class option given" do + let(:options) { {class: "disabled"} } - it 'renders a fontawesome icon with additional css class' do - is_expected.to have_css 'i.disabled' + it "renders a fontawesome icon with additional css class" do + is_expected.to have_css "i.disabled" end end end @@ -60,17 +60,17 @@ module Alchemy end end - describe '#page_or_find' do + describe "#page_or_find" do let(:page) { create(:alchemy_page, :public) } context "passing a page_layout string" do context "of a not existing page" do it "should return nil" do - expect(helper.page_or_find('contact')).to be_nil + expect(helper.page_or_find("contact")).to be_nil end end - context 'of an existing page' do + context "of an existing page" do it "should return the page object" do session[:alchemy_language_id] = page.language_id expect(helper.page_or_find(page.page_layout)).to eq(page) @@ -85,34 +85,34 @@ module Alchemy end end - describe '#message_icon_class' do + describe "#message_icon_class" do subject { helper.message_icon_class(message_type) } - context 'when `warning`, `warn` or `alert` message type is given' do + context "when `warning`, `warn` or `alert` message type is given" do %w(warning warn alert).each do |type| let(:message_type) { type } - it { is_expected.to eq 'exclamation' } + it { is_expected.to eq "exclamation" } end end - context 'when `notice` message type is given' do - let(:message_type) { 'notice' } + context "when `notice` message type is given" do + let(:message_type) { "notice" } - it { is_expected.to eq 'check' } + it { is_expected.to eq "check" } end - context 'when `error` message type is given' do - let(:message_type) { 'error' } + context "when `error` message type is given" do + let(:message_type) { "error" } - it { is_expected.to eq 'bug' } + it { is_expected.to eq "bug" } end - context 'when unknown message type is given' do - let(:message_type) { 'info' } + context "when unknown message type is given" do + let(:message_type) { "info" } - it 'returns the given message type as icon name' do - is_expected.to eq 'info' + it "returns the given message type as icon name" do + is_expected.to eq "info" end end end diff --git a/spec/helpers/alchemy/elements_block_helper_spec.rb b/spec/helpers/alchemy/elements_block_helper_spec.rb index 76298a5509..48c40765c7 100644 --- a/spec/helpers/alchemy/elements_block_helper_spec.rb +++ b/spec/helpers/alchemy/elements_block_helper_spec.rb @@ -1,16 +1,16 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" include Alchemy::ElementsHelper module Alchemy - describe 'ElementsBlockHelper' do - let(:page) { create(:alchemy_page, :public) } - let(:element) { create(:alchemy_element, page: page, tag_list: 'foo, bar') } + describe "ElementsBlockHelper" do + let(:page) { create(:alchemy_page, :public) } + let(:element) { create(:alchemy_element, page: page, tag_list: "foo, bar") } let(:expected_wrapper_tag) { "div.#{element.name}##{element_dom_id(element)}" } - describe '#element_view_for' do + describe "#element_view_for" do it "should yield an instance of ElementViewHelper" do expect { |b| element_view_for(element, &b) }. to yield_with_args(ElementsBlockHelper::ElementViewHelper) @@ -22,8 +22,8 @@ module Alchemy end it "should change the wrapping DOM element according to parameters" do - expect(element_view_for(element, tag: 'span', class: 'some_class', id: 'some_id')). - to have_css 'span.some_class#some_id' + expect(element_view_for(element, tag: "span", class: "some_class", id: "some_id")). + to have_css "span.some_class#some_id" end it "should include the element's tags in the wrapper DOM element" do @@ -38,8 +38,8 @@ module Alchemy it "should include the contents rendered by the block passed to it" do expect(element_view_for(element) do - 'view' - end).to have_content 'view' + "view" + end).to have_content "view" end context "when/if preview mode is not active" do @@ -59,15 +59,15 @@ module Alchemy end end - describe 'ElementsBlockHelper::ElementViewHelper' do + describe "ElementsBlockHelper::ElementViewHelper" do let(:scope) { double } subject { ElementsBlockHelper::ElementViewHelper.new(scope, element: element) } - it 'should have a reference to the specified element' do + it "should have a reference to the specified element" do subject.element == element end - describe '#render' do + describe "#render" do let(:element) { create(:alchemy_element, :with_contents) } let(:content) { element.content_by_name(:headline) } @@ -75,39 +75,39 @@ module Alchemy expect(scope).to receive(:render).with(content, { content: content, options: { - foo: 'bar' + foo: "bar", }, - html_options: {} + html_options: {}, }) - subject.render(:headline, foo: 'bar') + subject.render(:headline, foo: "bar") end end - describe '#content' do + describe "#content" do it "should delegate to the element's #content_by_name method" do expect(element).to receive(:content_by_name).with(:title) subject.content :title end end - describe '#ingredient' do + describe "#ingredient" do it "should delegate to the element's #ingredient method" do expect(element).to receive(:ingredient).with(:title) subject.ingredient :title end end - describe '#has?' do + describe "#has?" do it "should delegate to the element's #has_ingredient? method" do expect(element).to receive(:has_ingredient?).with(:title) subject.has? :title end end - describe '#essence' do + describe "#essence" do it "should provide the specified content essence" do expect(subject).to receive(:content).with(:title). - and_return(mock_model('Content', essence: mock_model('EssenceText'))) + and_return(mock_model("Content", essence: mock_model("EssenceText"))) subject.essence :title end diff --git a/spec/helpers/alchemy/elements_helper_spec.rb b/spec/helpers/alchemy/elements_helper_spec.rb index 4c0e0e689f..e8ff1ad9a4 100644 --- a/spec/helpers/alchemy/elements_helper_spec.rb +++ b/spec/helpers/alchemy/elements_helper_spec.rb @@ -1,38 +1,38 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" include Alchemy::BaseHelper module Alchemy describe ElementsHelper do let(:page) { build_stubbed(:alchemy_page, :public) } - let(:element) { build_stubbed(:alchemy_element, name: 'headline', page: page) } + let(:element) { build_stubbed(:alchemy_element, name: "headline", page: page) } before do assign(:page, page) allow_any_instance_of(Element).to receive(:store_page).and_return(true) end - describe '#render_element' do + describe "#render_element" do subject { render_element(element) } - context 'with nil element' do + context "with nil element" do let(:element) { nil } it { is_expected.to be_nil } end - context 'with element record given' do + context "with element record given" do let(:element) do - create(:alchemy_element, :with_contents, name: 'headline') + create(:alchemy_element, :with_contents, name: "headline") end it "renders the element's view partial" do is_expected.to have_selector("##{element.name}_#{element.id}") end - context 'with element view partial not found' do - let(:element) { build_stubbed(:alchemy_element, name: 'not_present') } + context "with element view partial not found" do + let(:element) { build_stubbed(:alchemy_element, name: "not_present") } it "renders the view not found partial" do is_expected.to match(/Missing view for not_present element/) @@ -40,24 +40,24 @@ module Alchemy end end - context 'with options given' do - subject { render_element(element, locals: { some: 'thing' }) } + context "with options given" do + subject { render_element(element, locals: { some: "thing" }) } - it 'passes them into the view' do + it "passes them into the view" do is_expected.to match(/thing/) end end - context 'with counter given' do + context "with counter given" do subject { render_element(element, {}, 2) } - it 'passes them into the view' do + it "passes them into the view" do is_expected.to match(/2\./) end end end - describe '#element_dom_id' do + describe "#element_dom_id" do subject { helper.element_dom_id(element) } it "should render a unique dom id for element" do @@ -69,10 +69,10 @@ module Alchemy subject { helper.render_elements(options) } let(:page) { create(:alchemy_page, :public) } - let!(:element) { create(:alchemy_element, name: 'headline', page: page) } + let!(:element) { create(:alchemy_element, name: "headline", page: page) } let!(:another_element) { create(:alchemy_element, page: page) } - context 'without any options' do + context "without any options" do let(:options) { {} } it "should render all elements from current page." do @@ -82,14 +82,14 @@ module Alchemy end context "with from_page option" do - context 'is a page object' do + context "is a page object" do let(:another_page) { create(:alchemy_page, :public) } let(:options) do { from_page: another_page } end - let!(:element) { create(:alchemy_element, name: 'headline', page: another_page) } + let!(:element) { create(:alchemy_element, name: "headline", page: another_page) } let!(:another_element) { create(:alchemy_element, page: another_page) } it "should render all elements from that page." do @@ -98,7 +98,7 @@ module Alchemy end end - context 'if from_page is nil' do + context "if from_page is nil" do let(:options) do { from_page: nil } end @@ -107,47 +107,47 @@ module Alchemy end end - context 'with option separator given' do - let(:options) { {separator: '
      '} } + context "with option separator given" do + let(:options) { {separator: "
      "} } it "joins element partials with given string" do - is_expected.to have_selector('hr') + is_expected.to have_selector("hr") end end - context 'with custom elements finder' do + context "with custom elements finder" do let(:options) do { finder: CustomNewsElementsFinder.new } end - it 'uses that to load elements to render' do + it "uses that to load elements to render" do is_expected.to have_selector("#news_1001") end end end - describe '#element_preview_code_attributes' do + describe "#element_preview_code_attributes" do subject { helper.element_preview_code_attributes(element) } - context 'in preview_mode' do + context "in preview_mode" do before { assign(:preview_mode, true) } it "should return the data-alchemy-element HTML attribute for element" do - is_expected.to eq({'data-alchemy-element' => element.id}) + is_expected.to eq({"data-alchemy-element" => element.id}) end end - context 'not in preview_mode' do + context "not in preview_mode" do it "should return an empty hash" do is_expected.to eq({}) end end end - describe '#element_preview_code' do + describe "#element_preview_code" do subject { helper.element_preview_code(element) } - context 'in preview_mode' do + context "in preview_mode" do before { assign(:preview_mode, true) } it "should return the data-alchemy-element HTML attribute for element" do @@ -155,14 +155,14 @@ module Alchemy end end - context 'not in preview_mode' do + context "not in preview_mode" do it "should not return the data-alchemy-element HTML attribute" do is_expected.not_to eq(" data-alchemy-element=\"#{element.id}\"") end end end - describe '#element_tags' do + describe "#element_tags" do subject { element_tags(element, options) } let(:element) { build_stubbed(:alchemy_element) } diff --git a/spec/helpers/alchemy/pages_helper_spec.rb b/spec/helpers/alchemy/pages_helper_spec.rb index 6a8e63de5d..3d93d5f8e9 100644 --- a/spec/helpers/alchemy/pages_helper_spec.rb +++ b/spec/helpers/alchemy/pages_helper_spec.rb @@ -1,28 +1,27 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe PagesHelper do - let(:language_root) { create(:alchemy_page, :language_root) } - let(:public_page) { create(:alchemy_page, :public) } - let(:klingon) { create(:alchemy_language, :klingon) } - let(:klingon_language_root) { create(:alchemy_page, :language_root, language: klingon) } + let(:language_root) { create(:alchemy_page, :language_root) } + let(:public_page) { create(:alchemy_page, :public) } + let(:klingon) { create(:alchemy_language, :klingon) } + let(:klingon_language_root) { create(:alchemy_page, :language_root, language: klingon) } before do helper.controller.class_eval { include Alchemy::ConfigurationMethods } - allow(Config).to receive(:get) { |arg| arg == :url_nesting ? true : Config.parameter(arg) } @root_page = language_root # We need this instance variable in the helpers end describe "#render_page_layout" do it "should render the current page layout" do @page = public_page - expect(helper.render_page_layout).to have_selector('div#content') + expect(helper.render_page_layout).to have_selector("div#content") end end - describe '#render_site_layout' do + describe "#render_site_layout" do let(:default_site) { Alchemy::Site.default } it "renders the partial for current site" do @@ -39,51 +38,51 @@ module Alchemy end end - describe '#render_menu' do - subject { helper.render_menu(name) } + describe "#render_menu" do + subject { helper.render_menu(menu_type) } - let(:name) { 'Main Navigation' } + let(:menu_type) { "main_menu" } - context 'if menu exists' do - let(:menu) { create(:alchemy_node, name: name) } - let!(:node) { create(:alchemy_node, parent: menu, url: '/') } + context "if menu exists" do + let(:menu) { create(:alchemy_node, menu_type: menu_type) } + let!(:node) { create(:alchemy_node, parent: menu, url: "/") } - context 'and the template exists' do - it 'renders the menu' do - is_expected.to have_selector('ul.nav > li.nav-item > a.nav-link') + context "and the template exists" do + it "renders the menu" do + is_expected.to have_selector("ul.nav > li.nav-item > a.nav-link") end end - context 'but the template does not exist' do - let(:name) { 'Unkown' } + context "but the template does not exist" do + let(:menu_type) { "unknown" } it { is_expected.to be_nil } end end - context 'if menu does not exist' do + context "if menu does not exist" do it { is_expected.to be_nil } end - context 'with multiple sites' do - let!(:site_2) { create(:alchemy_site, host: 'another-site.com') } - let!(:menu) { create(:alchemy_node, name: name, site: Alchemy::Site.current) } - let!(:node) { create(:alchemy_node, parent: menu, url: '/default-site') } - let!(:menu_2) { create(:alchemy_node, name: name, site: site_2) } - let!(:node_2) { create(:alchemy_node, parent: menu_2, site: site_2, url: '/site-2') } + context "with multiple sites" do + let!(:site_2) { create(:alchemy_site, host: "another-site.com") } + let!(:menu) { create(:alchemy_node, menu_type: menu_type, language: Alchemy::Language.current) } + let!(:node) { create(:alchemy_node, parent: menu, url: "/default-site") } + let!(:menu_2) { create(:alchemy_node, menu_type: menu_type, language: klingon) } + let!(:node_2) { create(:alchemy_node, parent: menu_2, language: klingon, url: "/site-2") } - it 'renders menu from current site' do + it "renders menu from current site" do is_expected.to have_selector('ul.nav > li.nav-item > a.nav-link[href="/default-site"]') end end - context 'with multiple languages' do - let!(:menu) { create(:alchemy_node, name: name) } - let!(:node) { create(:alchemy_node, parent: menu, url: '/default') } - let!(:klingon_menu) { create(:alchemy_node, name: name, language: klingon) } - let!(:klingon_node) { create(:alchemy_node, parent: klingon_menu, language: klingon, url: '/klingon') } + context "with multiple languages" do + let!(:menu) { create(:alchemy_node, menu_type: menu_type) } + let!(:node) { create(:alchemy_node, parent: menu, url: "/default") } + let!(:klingon_menu) { create(:alchemy_node, menu_type: menu_type, language: klingon) } + let!(:klingon_node) { create(:alchemy_node, parent: klingon_menu, language: klingon, url: "/klingon") } - it 'should return the menu for the current language' do + it "should return the menu for the current language" do is_expected.to have_selector('ul.nav > li.nav-item > a.nav-link[href="/default"]') is_expected.not_to have_selector('ul.nav > li.nav-item > a.nav-link[href="/klingon"]') end @@ -91,9 +90,9 @@ module Alchemy end describe "#render_breadcrumb" do - let(:parent) { create(:alchemy_page, :public, visible: true) } - let(:page) { create(:alchemy_page, :public, parent_id: parent.id, visible: true) } - let(:user) { nil } + let(:parent) { create(:alchemy_page, :public) } + let(:page) { create(:alchemy_page, :public, parent_id: parent.id) } + let(:user) { nil } before do allow(helper).to receive(:multi_language?).and_return(false) @@ -106,7 +105,7 @@ module Alchemy context "with options[:separator] given" do it "should render a breadcrumb with an alternative separator" do - expect(helper.render_breadcrumb(page: page, separator: '###')).to have_selector('span[contains("###")]') + expect(helper.render_breadcrumb(page: page, separator: "###")).to have_selector('span[contains("###")]') end end @@ -120,33 +119,28 @@ module Alchemy let(:user) { build(:alchemy_dummy_user) } it "should render a breadcrumb of restricted pages only" do - page.update_columns(restricted: true, urlname: 'a-restricted-public-page', name: 'A restricted Public Page', title: 'A restricted Public Page') + page.update_columns(restricted: true, urlname: "a-restricted-public-page", name: "A restricted Public Page", title: "A restricted Public Page") result = helper.render_breadcrumb(page: page, restricted_only: true).strip expect(result).to have_selector("*[contains(\"#{page.name}\")]") expect(result).to_not have_selector("*[contains(\"#{parent.name}\")]") end end - it "should render a breadcrumb of visible pages only" do - page.update_columns(visible: false, urlname: 'a-invisible-page', name: 'A Invisible Page', title: 'A Invisible Page') - expect(helper.render_breadcrumb(page: page)).not_to match(/A Invisible Page/) - end - - it "should render a breadcrumb of visible and unpublished pages" do - page.update_columns(public_on: nil, urlname: 'a-unpublic-page', name: 'A Unpublic Page', title: 'A Unpublic Page') + it "should render a breadcrumb of unpublished pages" do + page.update_columns(public_on: nil, urlname: "a-unpublic-page", name: "A Unpublic Page", title: "A Unpublic Page") expect(helper.render_breadcrumb(page: page)).to match(/A Unpublic Page/) end context "with options[:without]" do it "should render a breadcrumb without this page" do - page.update_columns(urlname: 'not-me', name: 'Not Me', title: 'Not Me') + page.update_columns(urlname: "not-me", name: "Not Me", title: "Not Me") expect(helper.render_breadcrumb(page: page, without: page)).not_to match(/Not Me/) end end context "with options[:without] as array" do it "should render a breadcrumb without these pages." do - page.update_columns(urlname: 'not-me', name: 'Not Me', title: 'Not Me') + page.update_columns(urlname: "not-me", name: "Not Me", title: "Not Me") expect(helper.render_breadcrumb(page: page, without: [page])).not_to match(/Not Me/) end end @@ -161,8 +155,8 @@ module Alchemy before { klingon_language_root } - it 'should still only render two links' do - expect(helper.language_links).to have_selector('a', count: 2) + it "should still only render two links" do + expect(helper.language_links).to have_selector("a", count: 2) end end @@ -181,7 +175,7 @@ module Alchemy before { klingon_language_root } it "should render two language links" do - expect(helper.language_links).to have_selector('a', count: 2) + expect(helper.language_links).to have_selector("a", count: 2) end it "should render language links referring to their language root page" do @@ -193,13 +187,13 @@ module Alchemy context "with options[:linkname]" do context "set to 'name'" do it "should render the name of the language" do - expect(helper.language_links(linkname: 'name')).to have_selector("span[contains('#{klingon_language_root.language.name}')]") + expect(helper.language_links(linkname: "name")).to have_selector("span[contains('#{klingon_language_root.language.name}')]") end end context "set to 'code'" do it "should render the code of the language" do - expect(helper.language_links(linkname: 'code')).to have_selector("span[contains('#{klingon_language_root.language.code}')]") + expect(helper.language_links(linkname: "code")).to have_selector("span[contains('#{klingon_language_root.language.code}')]") end end end @@ -213,13 +207,13 @@ module Alchemy context "with options[:reverse]" do context "set to false" do it "should render the language links in an ascending order" do - expect(helper.language_links(reverse: false)).to have_selector("a.de + a.kl") + expect(helper.language_links(reverse: false)).to have_selector("a.kl + a.en") end end context "set to true" do it "should render the language links in a descending order" do - expect(helper.language_links(reverse: true)).to have_selector("a.kl + a.de") + expect(helper.language_links(reverse: true)).to have_selector("a.en + a.kl") end end end @@ -234,7 +228,7 @@ module Alchemy context "set to false" do it "should render the language links without titles" do - expect(helper.language_links(show_title: false)).to_not have_selector('a[title]') + expect(helper.language_links(show_title: false)).to_not have_selector("a[title]") end end end @@ -356,8 +350,8 @@ module Alchemy end describe "#picture_essence_caption" do - let(:essence) { mock_model('EssencePicture', caption: 'my caption') } - let(:content) { mock_model('Content', essence: essence) } + let(:essence) { mock_model("EssencePicture", caption: "my caption") } + let(:content) { mock_model("Content", essence: essence) } it "should return the caption of the contents essence" do expect(helper.picture_essence_caption(content)).to eq "my caption" diff --git a/spec/helpers/alchemy/url_helper_spec.rb b/spec/helpers/alchemy/url_helper_spec.rb index 7ade0b762d..4da64270d3 100644 --- a/spec/helpers/alchemy/url_helper_spec.rb +++ b/spec/helpers/alchemy/url_helper_spec.rb @@ -1,18 +1,18 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" include Alchemy::ElementsHelper module Alchemy describe UrlHelper do - let(:page) { mock_model(Page, urlname: 'testpage', language_code: 'en') } + let(:page) { mock_model(Page, urlname: "testpage", language_code: "en") } before do helper.controller.class_eval { include Alchemy::ConfigurationMethods } end - context 'page path helpers' do + context "page path helpers" do describe "#show_page_path_params" do subject(:show_page_path_params) { helper.show_page_path_params(page) } @@ -22,20 +22,20 @@ module Alchemy end it "returns a Hash with urlname and no locale parameter" do - expect(show_page_path_params).to include(urlname: 'testpage') - expect(show_page_path_params).to_not include(locale: 'en') + expect(show_page_path_params).to include(urlname: "testpage") + expect(show_page_path_params).to_not include(locale: "en") end context "with addiitonal parameters" do subject(:show_page_path_params) do - helper.show_page_path_params(page, {query: 'test'}) + helper.show_page_path_params(page, {query: "test"}) end it "returns a Hash with urlname, no locale and query parameter" do expect(show_page_path_params).to \ - include(urlname: 'testpage', query: 'test') + include(urlname: "testpage", query: "test") expect(show_page_path_params).to_not \ - include(locale: 'en') + include(locale: "en") end end end @@ -47,17 +47,17 @@ module Alchemy it "returns a Hash with urlname and locale parameter" do expect(show_page_path_params).to \ - include(urlname: 'testpage', locale: 'en') + include(urlname: "testpage", locale: "en") end context "with additional parameters" do subject(:show_page_path_params) do - helper.show_page_path_params(page, {query: 'test'}) + helper.show_page_path_params(page, {query: "test"}) end it "returns a Hash with urlname, locale and query parameter" do expect(show_page_path_params).to \ - include(urlname: 'testpage', locale: 'en', query: 'test') + include(urlname: "testpage", locale: "en", query: "test") end end end @@ -74,7 +74,7 @@ module Alchemy end it "should return the correct relative path string with additional parameters" do - expect(helper.show_alchemy_page_path(page, {query: 'test'})).to \ + expect(helper.show_alchemy_page_path(page, {query: "test"})).to \ eq("/#{page.language_code}/testpage?query=test") end end @@ -89,7 +89,7 @@ module Alchemy end it "should return the correct relative path string with additional parameter" do - expect(helper.show_alchemy_page_path(page, {query: 'test'})).to \ + expect(helper.show_alchemy_page_path(page, {query: "test"})).to \ eq("/testpage?query=test") end end @@ -107,7 +107,7 @@ module Alchemy end it "should return the correct url string with additional parameters" do - expect(helper.show_alchemy_page_url(page, {query: 'test'})).to \ + expect(helper.show_alchemy_page_url(page, {query: "test"})).to \ eq("http://#{helper.request.host}/#{page.language_code}/testpage?query=test") end end @@ -123,32 +123,32 @@ module Alchemy end it "should return the correct url string with additional parameter" do - expect(helper.show_alchemy_page_url(page, {query: 'test'})).to \ + expect(helper.show_alchemy_page_url(page, {query: "test"})).to \ eq("http://#{helper.request.host}/testpage?query=test") end end end end - context 'attachment path helpers' do - let(:attachment) { mock_model(Attachment, urlname: 'test-attachment.pdf') } + context "attachment path helpers" do + let(:attachment) { mock_model(Attachment, urlname: "test-attachment.pdf") } - it 'should return the correct relative path to download an attachment' do + it "should return the correct relative path to download an attachment" do expect(helper.download_alchemy_attachment_path(attachment)).to \ eq("/attachment/#{attachment.id}/download/#{attachment.urlname}") end - it 'should return the correct url to download an attachment' do + it "should return the correct url to download an attachment" do expect(helper.download_alchemy_attachment_url(attachment)).to \ eq("http://#{helper.request.host}/attachment/#{attachment.id}/download/#{attachment.urlname}") end end - describe '#full_url_for_element' do + describe "#full_url_for_element" do subject { full_url_for_element(element) } - let(:element) { build_stubbed(:alchemy_element, name: 'headline', page: page) } - let(:current_server) { '' } + let(:element) { build_stubbed(:alchemy_element, name: "headline", page: page) } + let(:current_server) { "" } it "returns the url to this element" do is_expected.to eq("#{current_server}/#{element.page.urlname}##{element_dom_id(element)}") diff --git a/spec/libraries/admin/preview_url_spec.rb b/spec/libraries/admin/preview_url_spec.rb new file mode 100644 index 0000000000..8c2b9e91f7 --- /dev/null +++ b/spec/libraries/admin/preview_url_spec.rb @@ -0,0 +1,140 @@ +# frozen_string_literal: true + +require "rails_helper" + +RSpec.describe Alchemy::Admin::PreviewUrl do + let(:preview_url) do + described_class.new(routes: Alchemy::Engine.routes) + end + + describe "#url_for" do + let(:page) { create(:alchemy_page) } + + subject { preview_url.url_for(page) } + + context "without preview configured" do + it "returns the admin pages preview url" do + is_expected.to eq "/admin/pages/#{page.id}" + end + end + + context "with preview configured" do + context "without protocol" do + before do + stub_alchemy_config(:preview, { + "host" => "www.example.com", + }) + end + + it "raises error" do + expect { subject }.to raise_error(Alchemy::Admin::PreviewUrl::MissingProtocolError) + end + end + + context "as http url" do + before do + stub_alchemy_config(:preview, { + "host" => "http://www.example.com", + }) + end + + it "returns the configured preview url" do + is_expected.to eq "http://www.example.com/#{page.urlname}" + end + end + + context "as https url" do + before do + stub_alchemy_config(:preview, { + "host" => "https://www.example.com", + }) + end + + it "returns the configured preview url with https" do + is_expected.to eq "https://www.example.com/#{page.urlname}" + end + end + + context "and with basic auth configured" do + before do + stub_alchemy_config(:preview, { + "host" => "https://www.example.com", + "auth" => { + "username" => "foo", + "password" => "baz", + }, + }) + end + + it "returns the configured preview url with userinfo" do + is_expected.to eq "https://foo:baz@www.example.com/#{page.urlname}" + end + end + + context "for a site" do + before do + stub_alchemy_config(:preview, config) + end + + context "that matches the pages site name" do + let(:config) do + { + page.site.name => { + "host" => "http://new.example.com", + }, + } + end + + it "returns the configured preview url for that site" do + is_expected.to eq "http://new.example.com/#{page.urlname}" + end + end + + context "that does not match the pages site name" do + context "with a default configured" do + let(:config) do + { + "Not matching site name" => { + "host" => "http://new.example.com", + }, + "host" => "http://www.example.com", + } + end + + it "returns the default configured preview url" do + is_expected.to eq "http://www.example.com/#{page.urlname}" + end + end + + context "without a default configured" do + let(:config) do + { + "Not matching site name" => { + "host" => "http://new.example.com", + }, + } + end + + it "returns the internal preview url" do + is_expected.to eq "/admin/pages/#{page.id}" + end + end + end + end + + context "with page being the language root page" do + let(:page) { create(:alchemy_page, :language_root) } + + before do + stub_alchemy_config(:preview, { + "host" => "https://www.example.com", + }) + end + + it "returns the preview url without urlname" do + is_expected.to eq "https://www.example.com/" + end + end + end + end +end diff --git a/spec/libraries/auth_accessors_spec.rb b/spec/libraries/auth_accessors_spec.rb index 7913194844..a8f521a07b 100644 --- a/spec/libraries/auth_accessors_spec.rb +++ b/spec/libraries/auth_accessors_spec.rb @@ -1,16 +1,16 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy class MyCustomUser end - describe 'AuthAccessors' do - describe '.user_class_name' do + describe "AuthAccessors" do + describe ".user_class_name" do before do # prevent memoization - Alchemy.user_class_name = 'DummyClassName' + Alchemy.user_class_name = "DummyClassName" end it "raises error if user_class_name is not a String" do @@ -25,29 +25,29 @@ class MyCustomUser end after do - Alchemy.user_class_name = 'DummyClassName' + Alchemy.user_class_name = "DummyClassName" end end - describe 'defaults' do - it 'has default value for Alchemy.user_class_primary_key' do + describe "defaults" do + it "has default value for Alchemy.user_class_primary_key" do expect(Alchemy.user_class_primary_key).to eq(:id) end - it 'has default value for Alchemy.signup_path' do - expect(Alchemy.signup_path).to eq('/signup') + it "has default value for Alchemy.signup_path" do + expect(Alchemy.signup_path).to eq("/signup") end - it 'has default value for Alchemy.login_path' do - expect(Alchemy.login_path).to eq('/login') + it "has default value for Alchemy.login_path" do + expect(Alchemy.login_path).to eq("/login") end - it 'has default value for Alchemy.logout_path' do - expect(Alchemy.logout_path).to eq('/logout') + it "has default value for Alchemy.logout_path" do + expect(Alchemy.logout_path).to eq("/logout") end - it 'has default value for Alchemy.logout_method' do - expect(Alchemy.logout_method).to eq('delete') + it "has default value for Alchemy.logout_method" do + expect(Alchemy.logout_method).to eq("delete") end end end diff --git a/spec/libraries/config_spec.rb b/spec/libraries/config_spec.rb index dc08e57fea..50b74f109e 100644 --- a/spec/libraries/config_spec.rb +++ b/spec/libraries/config_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Config do @@ -11,26 +11,63 @@ module Alchemy end it "should return the requested part of the config" do - expect(Config).to receive(:show).and_return({'mailer' => {'setting' => 'true'}}) - expect(Config.get(:mailer)).to eq({'setting' => 'true'}) + expect(Config).to receive(:show).and_return({ "mailer" => { "setting" => "true" } }) + expect(Config.get(:mailer)).to eq({ "setting" => "true" }) + end + + context "if config is deprecated" do + context "without a new default" do + before do + expect(described_class).to receive(:deprecated_configs).at_least(:once) do + { foo: nil } + end + end + + it "warns" do + expect(Alchemy::Deprecation).to receive(:warn) + Config.get(:foo) + end + end + + context "with a new default" do + before do + expect(described_class).to receive(:deprecated_configs).at_least(:once) do + { foo: true } + end + end + + context "and current value is not the default" do + before do + expect(described_class).to receive(:show).at_least(:once) do + { "foo" => false } + end + end + + it "warns about new default" do + expect(Alchemy::Deprecation).to \ + receive(:warn).with("Setting foo configuration to false is deprecated and will be always true in Alchemy 5.0") + Config.get(:foo) + end + end + end end end - describe '.main_app_config' do + describe ".main_app_config" do let(:main_app_config_path) { "#{Rails.root}/config/alchemy/config.yml" } it "should call and return .read_file with the correct config path" do - expect(Config).to receive(:read_file).with(main_app_config_path).once.and_return({setting: 'true'}) - expect(Config.send(:main_app_config)).to eq({setting: 'true'}) + expect(Config).to receive(:read_file).with(main_app_config_path).once.and_return({ setting: "true" }) + expect(Config.send(:main_app_config)).to eq({ setting: "true" }) end end - describe '.env_specific_config' do + describe ".env_specific_config" do let(:env_specific_config_path) { "#{Rails.root}/config/alchemy/#{Rails.env}.config.yml" } it "should call and return .read_file with the correct config path" do - expect(Config).to receive(:read_file).with(env_specific_config_path).once.and_return({setting: 'true'}) - expect(Config.send(:env_specific_config)).to eq({setting: 'true'}) + expect(Config).to receive(:read_file).with(env_specific_config_path).once.and_return({ setting: "true" }) + expect(Config.send(:env_specific_config)).to eq({ setting: "true" }) end end @@ -39,65 +76,67 @@ module Alchemy before { Config.instance_variable_set("@config", nil) } it "should call and return .merge_configs!" do - expect(Config).to receive(:merge_configs!).once.and_return({setting: 'true'}) - expect(Config.show).to eq({setting: 'true'}) + expect(Config).to receive(:merge_configs!).once.and_return({ setting: "true" }) + expect(Config.show).to eq({ setting: "true" }) end end context "when ivar @config was already set" do - before { Config.instance_variable_set("@config", {setting: 'true'}) } + before { Config.instance_variable_set("@config", { setting: "true" }) } after { Config.instance_variable_set("@config", nil) } it "should have memoized the return value of .merge_configs!" do - expect(Config.send(:show)).to eq({setting: 'true'}) + expect(Config.send(:show)).to eq({ setting: "true" }) end end end - describe '.read_file' do - context 'when given path to yml file exists' do - context 'and file is empty' do + describe ".read_file" do + context "when given path to yml file exists" do + context "and file is empty" do before do # YAML.safe_load returns nil if file is empty. allow(YAML).to receive(:safe_load) { nil } end it "should return an empty Hash" do - expect(Config.send(:read_file, 'empty_file.yml')).to eq({}) + expect(Config.send(:read_file, "empty_file.yml")).to eq({}) end end end - context 'when given path to yml file does not exist' do - it 'should return an empty Hash' do - expect(Config.send(:read_file, 'does/not/exist.yml')).to eq({}) + context "when given path to yml file does not exist" do + it "should return an empty Hash" do + expect(Config.send(:read_file, "does/not/exist.yml")).to eq({}) end end end - describe '.merge_configs!' do + describe ".merge_configs!" do let(:config_1) do - {setting_1: 'same', other_setting: 'something'} + { setting_1: "same", other_setting: "something" } end let(:config_2) do - {setting_1: 'same', setting_2: 'anything'} + { setting_1: "same", setting_2: "anything" } end it "should stringify the keys" do expect(Config.send(:merge_configs!, config_1)).to eq(config_1.stringify_keys!) end - context 'when all passed configs are empty' do + context "when all passed configs are empty" do it "should raise an error" do expect { Config.send(:merge_configs!, {}) }.to raise_error(LoadError) end end - context 'when configs containing same keys' do + context "when configs containing same keys" do it "should merge them together" do expect(Config.send(:merge_configs!, config_1, config_2)).to eq( - {'setting_1' => 'same', 'other_setting' => 'something', 'setting_2' => 'anything'} + "setting_1" => "same", + "other_setting" => "something", + "setting_2" => "anything", ) end end diff --git a/spec/libraries/configuration_methods_spec.rb b/spec/libraries/configuration_methods_spec.rb index 2adee6b2b6..c2b88e2e50 100644 --- a/spec/libraries/configuration_methods_spec.rb +++ b/spec/libraries/configuration_methods_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" describe Alchemy::ConfigurationMethods do let(:controller) do @@ -11,45 +11,45 @@ class SomeController < ActionController::Base SomeController.new end - describe '#prefix_locale?' do + describe "#prefix_locale?" do subject { controller.prefix_locale? } - context 'if no languages are present' do + context "if no languages are present" do it { is_expected.to be false } end - context 'if one language is present' do + context "if one language is present" do let!(:language) { create(:alchemy_language) } it { is_expected.to be false } end - context 'if more than one language is present' do - let!(:german) { create(:alchemy_language) } + context "if more than one language is present" do + let!(:german) { create(:alchemy_language, :german, default: true) } let!(:english) { create(:alchemy_language, :english) } subject { controller.prefix_locale?(args) } around do |example| old_locale = I18n.default_locale - ::I18n.default_locale = 'de' + ::I18n.default_locale = "de" example.run ::I18n.default_locale = old_locale end - context 'and it is called with the default language' do - let(:args) { 'de' } + context "and it is called with the default language" do + let(:args) { "de" } it { is_expected.to be false } end - context 'and it is called with the non-default language' do - let(:args) { 'en' } + context "and it is called with the non-default language" do + let(:args) { "en" } it { is_expected.to be true } end - context 'and it is called with bogus stuff' do - let(:args) { 'kl' } + context "and it is called with bogus stuff" do + let(:args) { "kl" } it { is_expected.to be true } end diff --git a/spec/libraries/controller_actions_spec.rb b/spec/libraries/controller_actions_spec.rb index db5d435638..b3857e7130 100644 --- a/spec/libraries/controller_actions_spec.rb +++ b/spec/libraries/controller_actions_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" # Here's a tiny custom matcher making it a bit easier to check the # current session for a language configuration. @@ -11,7 +11,7 @@ end end -describe 'Alchemy::ControllerActions', type: 'controller' do +describe "Alchemy::ControllerActions", type: "controller" do # Anonymous controller to test the integration against controller(ActionController::Base) do include Alchemy::ControllerActions @@ -27,9 +27,9 @@ context "with custom current_user_method" do around do |example| - Alchemy.current_user_method = 'current_admin' + Alchemy.current_user_method = "current_admin" example.run - Alchemy.current_user_method = 'current_user' + Alchemy.current_user_method = "current_user" end it "calls the custom method" do @@ -40,9 +40,9 @@ context "with not implemented current_user_method" do around do |example| - Alchemy.current_user_method = 'not_implemented_method' + Alchemy.current_user_method = "not_implemented_method" example.run - Alchemy.current_user_method = 'current_user' + Alchemy.current_user_method = "current_user" end it "raises an error" do @@ -55,7 +55,7 @@ describe "#set_alchemy_language" do let!(:default_language) { create(:alchemy_language, code: :en) } - let(:klingon) { create(:alchemy_language, :klingon) } + let(:klingon) { create(:alchemy_language, :klingon) } after do # We must never change the app's locale @@ -124,7 +124,7 @@ context "if the language is not on the current site" do let(:french_site) do - create(:alchemy_site, host: 'french.fr') + create(:alchemy_site, host: "french.fr") end let(:french_language) do @@ -157,7 +157,7 @@ context "for language that does not exist" do before do - allow(controller).to receive(:params).and_return(locale: 'fo') + allow(controller).to receive(:params).and_return(locale: "fo") controller.send :set_alchemy_language end diff --git a/spec/libraries/elements_finder_spec.rb b/spec/libraries/elements_finder_spec.rb index 9d4583c396..33a2db02e5 100644 --- a/spec/libraries/elements_finder_spec.rb +++ b/spec/libraries/elements_finder_spec.rb @@ -1,37 +1,37 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" RSpec.describe Alchemy::ElementsFinder do let(:finder) { described_class.new(options) } let(:options) { {} } - describe '#elements' do + describe "#elements" do subject { finder.elements } let(:page) { create(:alchemy_page, :public) } let!(:visible_element) { create(:alchemy_element, public: true, page: page) } let!(:hidden_element) { create(:alchemy_element, public: false, page: page) } - context 'without page given' do + context "without page given" do it do expect { subject }.to raise_error(ArgumentError) end end - context 'with page object given' do + context "with page object given" do subject { finder.elements(page: page) } - it 'returns all public elements from page' do + it "returns all public elements from page" do is_expected.to eq([visible_element]) end - it 'does not return trashed elements' do + it "does not return trashed elements" do visible_element.remove_from_list is_expected.to eq([]) end - context 'with multiple ordered elements' do + context "with multiple ordered elements" do let!(:element_2) do create(:alchemy_element, public: true, page: page).tap { |el| el.update_columns(position: 3) } end @@ -40,40 +40,40 @@ create(:alchemy_element, public: true, page: page).tap { |el| el.update_columns(position: 2) } end - it 'returns elements ordered by position' do + it "returns elements ordered by position" do is_expected.to eq([visible_element, element_3, element_2]) end end - context 'with fixed elements present' do + context "with fixed elements present" do let!(:fixed_element) { create(:alchemy_element, :fixed, page: page) } - it 'does not include fixed elements' do + it "does not include fixed elements" do is_expected.to_not include(fixed_element) end - context 'with options[:fixed] set to true' do + context "with options[:fixed] set to true" do let(:options) do { fixed: true } end - it 'includes only fixed elements' do + it "includes only fixed elements" do is_expected.to eq([fixed_element]) end end end - context 'with nested elements present' do + context "with nested elements present" do let!(:nested_element) { create(:alchemy_element, :nested, page: page) } - it 'does not include nested elements' do + it "does not include nested elements" do is_expected.to_not include(nested_element) end end - context 'with options[:only] given' do + context "with options[:only] given" do let(:options) do - { only: 'article' } + { only: "article" } end it "returns only the elements with that name" do @@ -81,9 +81,9 @@ end end - context 'with options[:except] given' do + context "with options[:except] given" do let(:options) do - { except: 'article' } + { except: "article" } end it "does not return the elements with that name" do @@ -91,7 +91,7 @@ end end - context 'with options[:offset] given' do + context "with options[:offset] given" do let(:options) do { offset: 2 } end @@ -104,7 +104,7 @@ end end - context 'with options[:count] given' do + context "with options[:count] given" do let(:options) do { count: 1 } end @@ -116,7 +116,7 @@ end end - context 'with options[:reverse] given' do + context "with options[:reverse] given" do let(:options) do { reverse: true } end @@ -128,17 +128,17 @@ end end - context 'with options[:random] given' do + context "with options[:random] given" do let(:options) do { random: true } end let(:random_function) do case ActiveRecord::Base.connection_config[:adapter] - when 'postgresql', 'sqlite3' - 'RANDOM()' + when "postgresql", "sqlite3" + "RANDOM()" else - 'RAND()' + "RAND()" end end @@ -150,84 +150,84 @@ end end - context 'with page layout name given as options[:from_page]' do - subject { finder.elements(page: 'standard') } + context "with page layout name given as options[:from_page]" do + subject { finder.elements(page: "standard") } - let(:page) { create(:alchemy_page, :public, page_layout: 'standard') } + let(:page) { create(:alchemy_page, :public, page_layout: "standard") } let!(:visible_element) { create(:alchemy_element, public: true, page: page) } let!(:hidden_element) { create(:alchemy_element, public: false, page: page) } - it 'returns all public elements from page with given page layout' do + it "returns all public elements from page with given page layout" do is_expected.to eq([visible_element]) end - context 'that is not found' do - subject { finder.elements(page: 'foobaz') } + context "that is not found" do + subject { finder.elements(page: "foobaz") } - it 'returns empty active record relation' do + it "returns empty active record relation" do is_expected.to eq(Alchemy::Element.none) end end end - context 'with fallback options given' do + context "with fallback options given" do subject { finder.elements(page: page) } let(:options) do { fallback: { - for: 'download', - from: page_2 - } + for: "download", + from: page_2, + }, } end - context 'and no element from that kind on current page' do - let(:page) { create(:alchemy_page, :public, page_layout: 'standard') } + context "and no element from that kind on current page" do + let(:page) { create(:alchemy_page, :public, page_layout: "standard") } - context 'but element of that kind on fallback page' do - let(:page_2) { create(:alchemy_page, :public, page_layout: 'standard') } - let!(:visible_element_2) { create(:alchemy_element, name: 'download', public: true, page: page_2) } + context "but element of that kind on fallback page" do + let(:page_2) { create(:alchemy_page, :public, page_layout: "standard") } + let!(:visible_element_2) { create(:alchemy_element, name: "download", public: true, page: page_2) } - it 'loads elements from fallback page' do + it "loads elements from fallback page" do is_expected.to eq([visible_element_2]) end end - context 'with fallback element defined' do + context "with fallback element defined" do let(:options) do { fallback: { - for: 'download', - with: 'header', - from: page_2 - } + for: "download", + with: "header", + from: page_2, + }, } end - let(:page_2) { create(:alchemy_page, :public, page_layout: 'standard') } - let!(:visible_element_2) { create(:alchemy_element, name: 'header', public: true, page: page_2) } + let(:page_2) { create(:alchemy_page, :public, page_layout: "standard") } + let!(:visible_element_2) { create(:alchemy_element, name: "header", public: true, page: page_2) } - it 'loads fallback element from fallback page' do + it "loads fallback element from fallback page" do is_expected.to eq([visible_element_2]) end end - context 'with fallback page defined as pagelayout name' do + context "with fallback page defined as pagelayout name" do let(:options) do { fallback: { - for: 'download', - with: 'text', - from: 'everything' - } + for: "download", + with: "text", + from: "everything", + }, } end - let(:page_2) { create(:alchemy_page, :public, page_layout: 'everything') } - let!(:visible_element_2) { create(:alchemy_element, name: 'text', public: true, page: page_2) } + let(:page_2) { create(:alchemy_page, :public, page_layout: "everything") } + let!(:visible_element_2) { create(:alchemy_element, name: "text", public: true, page: page_2) } - it 'loads fallback element from fallback page' do + it "loads fallback element from fallback page" do is_expected.to eq([visible_element_2]) end end diff --git a/spec/libraries/i18n_spec.rb b/spec/libraries/i18n_spec.rb index 27afeb989a..c27c32f841 100644 --- a/spec/libraries/i18n_spec.rb +++ b/spec/libraries/i18n_spec.rb @@ -1,83 +1,83 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe ".t" do - it 'scopes translations intro alchemy namespace' do - expect(::I18n).to receive(:t).with(:foo, default: 'Foo', scope: ['alchemy']) + it "scopes translations intro alchemy namespace" do + expect(::I18n).to receive(:t).with(:foo, default: "Foo", scope: ["alchemy"]) ::Alchemy.t(:foo) end end describe I18n do - describe '.available_locales' do + describe ".available_locales" do subject { I18n.available_locales } it { is_expected.to be_a Array } it { is_expected.to include(:en) } - context 'when locales are already set in @@available_locales' do + context "when locales are already set in @@available_locales" do before { I18n.class_variable_set(:@@available_locales, [:kl, :jp]) } it { is_expected.to match_array([:kl, :jp]) } after { I18n.class_variable_set(:@@available_locales, nil) } end - context 'when locales are present in other gems' do + context "when locales are present in other gems" do before do expect(::I18n).to receive(:load_path) do - ['/Users/tvd/gems/alchemy_i18n/config/locales/alchemy.de.yml'] + ["/Users/tvd/gems/alchemy_i18n/config/locales/alchemy.de.yml"] end end - it 'includes them' do + it "includes them" do is_expected.to eq([:de]) end end - context 'when same locales are present in multiple gems' do + context "when same locales are present in multiple gems" do before do expect(::I18n).to receive(:load_path) do [ - '/Users/tvd/gems/alchemy-devise/config/locales/alchemy.de.yml', - '/Users/tvd/gems/alchemy_i18n/config/locales/alchemy.de.yml' + "/Users/tvd/gems/alchemy-devise/config/locales/alchemy.de.yml", + "/Users/tvd/gems/alchemy_i18n/config/locales/alchemy.de.yml", ] end end - it 'includes them only once' do + it "includes them only once" do is_expected.to eq([:de]) end end - context 'when locales have long iso format' do + context "when locales have long iso format" do before do expect(::I18n).to receive(:load_path) do - ['/Users/tvd/gems/alchemy_i18n/config/locales/alchemy.zh-CN.yml'] + ["/Users/tvd/gems/alchemy_i18n/config/locales/alchemy.zh-CN.yml"] end end - it 'includes them in long format' do + it "includes them in long format" do is_expected.to eq([:'zh-CN']) end end - context 'multiple locales' do + context "multiple locales" do before do expect(::I18n).to receive(:load_path) do [ - '/Users/tvd/gems/alchemy_i18n/config/locales/alchemy.zh-CN.yml', - '/Users/tvd/gems/alchemy_i18n/config/locales/alchemy.de.yml' + "/Users/tvd/gems/alchemy_i18n/config/locales/alchemy.zh-CN.yml", + "/Users/tvd/gems/alchemy_i18n/config/locales/alchemy.de.yml", ] end end - it 'are sorted' do + it "are sorted" do is_expected.to eq([:de, :'zh-CN']) end end end - describe '.available_locales=' do + describe ".available_locales=" do it "assigns the given locales to @@available_locales" do I18n.available_locales = [:kl, :nl, :cn] expect(I18n.class_variable_get(:@@available_locales)).to eq([:kl, :nl, :cn]) diff --git a/spec/libraries/kaminari/scoped_pagination_url_helper_spec.rb b/spec/libraries/kaminari/scoped_pagination_url_helper_spec.rb index 1ddb38fc14..ce4995790a 100644 --- a/spec/libraries/kaminari/scoped_pagination_url_helper_spec.rb +++ b/spec/libraries/kaminari/scoped_pagination_url_helper_spec.rb @@ -1,14 +1,14 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" describe Kaminari::Helpers::Tag do subject { Kaminari::Helpers::Tag.new(template, options) } let(:template) { double(params: {}) } - let(:scope) { double(url_for: '') } + let(:scope) { double(url_for: "") } - describe '#page_url_for' do + describe "#page_url_for" do context "with scope option given" do let(:options) { {scope: scope} } diff --git a/spec/libraries/logger_spec.rb b/spec/libraries/logger_spec.rb index c478510a1f..9c7ba8dcfd 100644 --- a/spec/libraries/logger_spec.rb +++ b/spec/libraries/logger_spec.rb @@ -1,24 +1,24 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" RSpec.describe Alchemy::Logger do let(:message) { "Something bad happened" } - describe '.warn' do + describe ".warn" do let(:caller_string) { "file.rb:14" } subject { Alchemy::Logger.warn(message, caller_string) } it { is_expected.to be_nil } - it 'uses Rails debug logger' do + it "uses Rails debug logger" do expect(Rails.logger).to receive(:debug) { message } subject end end - describe '#log_warning' do + describe "#log_warning" do class Something include Alchemy::Logger end @@ -29,7 +29,7 @@ class Something expect_any_instance_of(Something).to receive(:caller).with(1..1) { ["second"] } end - it 'delegates to Alchemy::Logger.warn class method with second line of callstack' do + it "delegates to Alchemy::Logger.warn class method with second line of callstack" do expect(Alchemy::Logger).to receive(:warn).with(message, ["second"]) subject end diff --git a/spec/libraries/modules_spec.rb b/spec/libraries/modules_spec.rb index 368b1eb0b5..d242601dad 100644 --- a/spec/libraries/modules_spec.rb +++ b/spec/libraries/modules_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy class ModulesTestController < ApplicationController @@ -11,32 +11,32 @@ class ModulesTestController < ApplicationController let(:controller) { ModulesTestController.new } let(:alchemy_modules) do - YAML.load_file(File.expand_path('../../config/alchemy/modules.yml', __dir__)) + YAML.load_file(File.expand_path("../../config/alchemy/modules.yml", __dir__)) end - describe '#module_definition_for' do + describe "#module_definition_for" do subject { controller.module_definition_for(name) } let(:dashboard_module) { alchemy_modules.first } - context 'with a string given as name' do - let(:name) { 'dashboard' } + context "with a string given as name" do + let(:name) { "dashboard" } it "returns the module definition" do is_expected.to eq(dashboard_module) end end - context 'with a hash given as name' do - let(:controller_name) { 'alchemy/admin/dashboard' } - let(:name) { {controller: controller_name, action: 'index'} } + context "with a hash given as name" do + let(:controller_name) { "alchemy/admin/dashboard" } + let(:name) { {controller: controller_name, action: "index"} } it "returns the module definition" do is_expected.to eq(dashboard_module) end - context 'with leading slash in controller name' do - let(:controller_name) { '/alchemy/admin/dashboard' } + context "with leading slash in controller name" do + let(:controller_name) { "/alchemy/admin/dashboard" } it "returns the module definition" do is_expected.to eq(dashboard_module) @@ -44,46 +44,46 @@ class ModulesTestController < ApplicationController end end - context 'with nil given as name' do + context "with nil given as name" do let(:name) { nil } - it 'raises an error' do + it "raises an error" do expect { subject }.to raise_error(ArgumentError) end end end - describe '.register_module' do + describe ".register_module" do let(:alchemy_module) do { - 'name' => 'module', - 'navigation' => { - 'controller' => 'register_module_dummy', - 'action' => 'index' - } + "name" => "module", + "navigation" => { + "controller" => "register_module_dummy", + "action" => "index", + }, } end let(:bad_alchemy_module_a) do { - 'name' => 'bad_module_a', - 'navigation' => { - 'controller' => 'bad_module', - 'action' => 'index' - } + "name" => "bad_module_a", + "navigation" => { + "controller" => "bad_module", + "action" => "index", + }, } end let(:bad_alchemy_module_b) do { - 'name' => 'bad_module_b', - 'navigation' => { - 'controller' => 'register_module_dummy', - 'action' => 'index', - 'sub_navigation' => [{ - 'controller' => 'bad_module', - 'action' => 'index' - }] - } + "name" => "bad_module_b", + "navigation" => { + "controller" => "register_module_dummy", + "action" => "index", + "sub_navigation" => [{ + "controller" => "bad_module", + "action" => "index", + }], + }, } end diff --git a/spec/libraries/page_layout_spec.rb b/spec/libraries/page_layout_spec.rb index 003cf162e7..603e3f4ab3 100644 --- a/spec/libraries/page_layout_spec.rb +++ b/spec/libraries/page_layout_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe PageLayout do @@ -12,15 +12,15 @@ module Alchemy it "should return all page_layouts" do is_expected.to be_instance_of(Array) - expect(subject.collect { |l| l['name'] }).to include('standard') + expect(subject.collect { |l| l["name"] }).to include("standard") end it "should allow erb generated layouts" do - expect(subject.collect { |l| l['name'] }).to include('erb_layout') + expect(subject.collect { |l| l["name"] }).to include("erb_layout") end context "with a YAML file including a symbol" do - let(:yaml) { 'name: :symbol' } + let(:yaml) { "name: :symbol" } before do expect(File).to receive(:exist?).and_return(true) expect(File).to receive(:read).and_return(yaml) @@ -48,23 +48,23 @@ module Alchemy end end - describe '.add' do + describe ".add" do it "adds a definition to all definitions" do - PageLayout.add({'name' => 'foo'}) - expect(PageLayout.all).to include({'name' => 'foo'}) + PageLayout.add({"name" => "foo"}) + expect(PageLayout.all).to include({"name" => "foo"}) end it "adds a array of definitions to all definitions" do - PageLayout.add([{'name' => 'foo'}, {'name' => 'bar'}]) - expect(PageLayout.all).to include({'name' => 'foo'}) - expect(PageLayout.all).to include({'name' => 'bar'}) + PageLayout.add([{"name" => "foo"}, {"name" => "bar"}]) + expect(PageLayout.all).to include({"name" => "foo"}) + expect(PageLayout.all).to include({"name" => "bar"}) end end describe ".get" do it "should return the page_layout definition found by given name" do - allow(PageLayout).to receive(:all).and_return([{'name' => 'default'}, {'name' => 'contact'}]) - expect(PageLayout.get('default')).to eq({'name' => 'default'}) + allow(PageLayout).to receive(:all).and_return([{"name" => "default"}, {"name" => "contact"}]) + expect(PageLayout.get("default")).to eq({"name" => "default"}) end end @@ -72,42 +72,42 @@ module Alchemy subject { PageLayout.get_all_by_attributes(unique: true) } it "should return all page layout with the given attribute" do - expect(subject.map { |page_layout| page_layout['name'] }.to_a).to eq(['index', 'news', 'contact', 'erb_layout']) + expect(subject.map { |page_layout| page_layout["name"] }.to_a).to eq(["index", "news", "contact", "erb_layout"]) end end - describe '.layouts_with_own_for_select' do + describe ".layouts_with_own_for_select" do it "should not hold a layout twice" do - layouts = PageLayout.layouts_with_own_for_select('standard', 1, false) + layouts = PageLayout.layouts_with_own_for_select("standard", 1, false) layouts = layouts.collect(&:last) expect(layouts.select { |l| l == "standard" }.length).to eq(1) end end - describe '.selectable_layouts' do + describe ".selectable_layouts" do let(:site) { create(:alchemy_site) } let(:language) { create(:alchemy_language, code: :de) } before { language } subject { PageLayout.selectable_layouts(language.id) } it "should not display hidden page layouts" do - subject.each { |l| expect(l['hide']).not_to eq(true) } + subject.each { |l| expect(l["hide"]).not_to eq(true) } end context "with already taken layouts" do before do - allow(PageLayout).to receive(:all).and_return([{'unique' => true}]) + allow(PageLayout).to receive(:all).and_return([{"unique" => true}]) allow(Page).to receive(:where).and_return double(pluck: [1]) end it "should not include unique layouts" do - subject.each { |l| expect(l['unique']).not_to eq(true) } + subject.each { |l| expect(l["unique"]).not_to eq(true) } end end context "with sites layouts present" do let(:definition) do - {'name' => 'default_site', 'page_layouts' => %w(index)} + {"name" => "default_site", "page_layouts" => %w(index)} end before do @@ -116,46 +116,46 @@ module Alchemy it "should only return layouts for site" do expect(subject.length).to eq(1) - expect(subject.first['name']).to eq('index') + expect(subject.first["name"]).to eq("index") end end end describe ".element_names_for" do it "should return all element names for the given pagelayout" do - allow(PageLayout).to receive(:get).with('default').and_return({'name' => 'default', 'elements' => ['element_1', 'element_2']}) - expect(PageLayout.element_names_for('default')).to eq(['element_1', 'element_2']) + allow(PageLayout).to receive(:get).with("default").and_return({"name" => "default", "elements" => ["element_1", "element_2"]}) + expect(PageLayout.element_names_for("default")).to eq(["element_1", "element_2"]) end context "when given page_layout name does not exist" do it "should return an empty array" do - expect(PageLayout.element_names_for('layout_does_not_exist!')).to eq([]) + expect(PageLayout.element_names_for("layout_does_not_exist!")).to eq([]) end end context "when page_layout definition does not contain the elements key" do it "should return an empty array" do - allow(PageLayout).to receive(:get).with('layout_without_elements_key').and_return({'name' => 'layout_without_elements_key'}) - expect(PageLayout.element_names_for('layout_without_elements_key')).to eq([]) + allow(PageLayout).to receive(:get).with("layout_without_elements_key").and_return({"name" => "layout_without_elements_key"}) + expect(PageLayout.element_names_for("layout_without_elements_key")).to eq([]) end end end - describe '.human_layout_name' do - let(:layout) { {'name' => 'contact'} } - subject { PageLayout.human_layout_name(layout['name']) } + describe ".human_layout_name" do + let(:layout) { {"name" => "contact"} } + subject { PageLayout.human_layout_name(layout["name"]) } context "with no translation present" do it "returns the name capitalized" do - is_expected.to eq('Contact') + is_expected.to eq("Contact") end end context "with translation present" do - before { expect(Alchemy).to receive(:t).and_return('Kontakt') } + before { expect(Alchemy).to receive(:t).and_return("Kontakt") } it "returns the translated name" do - is_expected.to eq('Kontakt') + is_expected.to eq("Kontakt") end end end diff --git a/spec/libraries/paths_spec.rb b/spec/libraries/paths_spec.rb index 1673d88dbe..1c48ea682b 100644 --- a/spec/libraries/paths_spec.rb +++ b/spec/libraries/paths_spec.rb @@ -1,15 +1,15 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy - describe 'Paths' do - describe 'defaults' do - it 'has default value for Alchemy.admin_path' do - expect(Alchemy.admin_path).to eq('admin') + describe "Paths" do + describe "defaults" do + it "has default value for Alchemy.admin_path" do + expect(Alchemy.admin_path).to eq("admin") end - it 'has default value for Alchemy.admin_constraints' do + it "has default value for Alchemy.admin_constraints" do expect(Alchemy.admin_constraints).to eq({}) end end diff --git a/spec/libraries/permissions_spec.rb b/spec/libraries/permissions_spec.rb index c7e0bc1d08..d7e0ca9f1a 100644 --- a/spec/libraries/permissions_spec.rb +++ b/spec/libraries/permissions_spec.rb @@ -1,26 +1,23 @@ # frozen_string_literal: true -require 'rails_helper' -require 'cancan/matchers' +require "rails_helper" +require "cancan/matchers" describe Alchemy::Permissions do subject { ability } - let(:ability) { Alchemy::Permissions.new(user) } - let(:attachment) { mock_model(Alchemy::Attachment, restricted?: false) } - let(:restricted_attachment) { mock_model(Alchemy::Attachment, restricted?: true) } - let(:picture) { mock_model(Alchemy::Picture, restricted?: false) } - let(:restricted_picture) { mock_model(Alchemy::Picture, restricted?: true) } - let(:public_page) { build_stubbed(:alchemy_page, :public, restricted: false) } - let(:unpublic_page) { build_stubbed(:alchemy_page) } - let(:visible_page) { build_stubbed(:alchemy_page, restricted: false, visible: true) } - let(:not_visible_page) { build_stubbed(:alchemy_page, :public, restricted: false, visible: false) } - let(:restricted_page) { build_stubbed(:alchemy_page, :public, restricted: true) } - let(:visible_restricted_page) { build_stubbed(:alchemy_page, visible: true, restricted: true) } - let(:published_element) { mock_model(Alchemy::Element, restricted?: false, public?: true, trashed?: false) } - let(:restricted_element) { mock_model(Alchemy::Element, restricted?: true, public?: true, trashed?: false) } - let(:published_content) { mock_model(Alchemy::Content, restricted?: false, public?: true, trashed?: false) } - let(:restricted_content) { mock_model(Alchemy::Content, restricted?: true, public?: true, trashed?: false) } + let(:ability) { Alchemy::Permissions.new(user) } + let(:attachment) { mock_model(Alchemy::Attachment, restricted?: false) } + let(:restricted_attachment) { mock_model(Alchemy::Attachment, restricted?: true) } + let(:picture) { mock_model(Alchemy::Picture, restricted?: false) } + let(:restricted_picture) { mock_model(Alchemy::Picture, restricted?: true) } + let(:public_page) { build_stubbed(:alchemy_page, :public, restricted: false) } + let(:unpublic_page) { build_stubbed(:alchemy_page) } + let(:restricted_page) { build_stubbed(:alchemy_page, :public, restricted: true) } + let(:published_element) { mock_model(Alchemy::Element, restricted?: false, public?: true, trashed?: false) } + let(:restricted_element) { mock_model(Alchemy::Element, restricted?: true, public?: true, trashed?: false) } + let(:published_content) { mock_model(Alchemy::Content, restricted?: false, public?: true, trashed?: false) } + let(:restricted_content) { mock_model(Alchemy::Content, restricted?: true, public?: true, trashed?: false) } context "A guest user" do let(:user) { nil } @@ -42,9 +39,9 @@ is_expected.not_to be_able_to(:index, restricted_page) end - it "can only see visible not restricted pages" do - is_expected.to be_able_to(:see, visible_page) - is_expected.not_to be_able_to(:see, not_visible_page) + it "can only see public not restricted pages" do + is_expected.to be_able_to(:see, public_page) + is_expected.not_to be_able_to(:see, restricted_page) end it "can only see public not restricted elements" do @@ -82,13 +79,8 @@ is_expected.to be_able_to(:index, restricted_page) end - it "can see visible restricted pages" do - is_expected.to be_able_to(:see, visible_page) - is_expected.to be_able_to(:see, visible_restricted_page) - end - - it "can not see invisible pages" do - is_expected.not_to be_able_to(:see, not_visible_page) + it "can see restricted pages" do + is_expected.to be_able_to(:see, restricted_page) end it "can see public restricted elements" do @@ -192,10 +184,6 @@ is_expected.to be_able_to(:publish, Alchemy::Page) end - it "can not see invisible pages" do - is_expected.not_to be_able_to(:see, not_visible_page) - end - it "can clear the trash" do is_expected.to be_able_to(:clear, :trash) end @@ -232,9 +220,9 @@ context "A logged in user without a role" do let(:user) { mock_model(Alchemy.user_class, alchemy_roles: []) } - it "can only see visible not restricted pages (like the guest role)" do - is_expected.to be_able_to(:see, visible_page) - is_expected.not_to be_able_to(:see, not_visible_page) + it "can only see public not restricted pages (like the guest role)" do + is_expected.to be_able_to(:see, public_page) + is_expected.not_to be_able_to(:see, restricted_page) end end end diff --git a/spec/libraries/resource_spec.rb b/spec/libraries/resource_spec.rb index 6f040eb3b6..3f95ebbf44 100644 --- a/spec/libraries/resource_spec.rb +++ b/spec/libraries/resource_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" class Party < ActiveRecord::Base belongs_to :location @@ -36,20 +36,20 @@ module Alchemy "name" => "modules.party_list", "controller" => "/admin/parties", "action" => "index", - "image" => "/assets/party_list_module.png" - } + "image" => "/assets/party_list_module.png", + }, } end let(:columns) do [ - double(:column, {name: 'name', type: :string, array: false}), - double(:column, {name: 'hidden_value', type: :string, array: false}), - double(:column, {name: 'description', type: :text, array: false}), - double(:column, {name: 'id', type: :integer, array: false}), - double(:column, {name: 'starts_at', type: :datetime, array: false}), - double(:column, {name: 'location_id', type: :integer, array: false}), - double(:column, {name: 'organizer_id', type: :integer, array: false}) + double(:column, {name: "name", type: :string, array: false}), + double(:column, {name: "hidden_value", type: :string, array: false}), + double(:column, {name: "description", type: :text, array: false}), + double(:column, {name: "id", type: :integer, array: false}), + double(:column, {name: "starts_at", type: :datetime, array: false}), + double(:column, {name: "location_id", type: :integer, array: false}), + double(:column, {name: "organizer_id", type: :integer, array: false}), ] end @@ -90,7 +90,7 @@ module Alchemy context "when model has alchemy_resource_relations defined" do before do allow(Party).to receive(:alchemy_resource_relations) do - {location: {attr_method: 'name', type: 'string'}} + {location: {attr_method: "name", type: "string"}} end end @@ -145,17 +145,17 @@ module Alchemy describe "#namespaced_resource_name" do it "returns resource_name with namespace (namespace_party for Namespace::Party), i.e. for use in forms" do namespaced_resource = Resource.new("admin/namespace/parties") - expect(namespaced_resource.namespaced_resource_name).to eq('namespace_party') + expect(namespaced_resource.namespaced_resource_name).to eq("namespace_party") end it "equals resource_name if resource not namespaced" do namespaced_resource = Resource.new("admin/parties") - expect(namespaced_resource.namespaced_resource_name).to eq('party') + expect(namespaced_resource.namespaced_resource_name).to eq("party") end it "doesn't include the engine's name" do namespaced_resource = Resource.new("admin/party_engine/namespace/parties", module_definition) - expect(namespaced_resource.namespaced_resource_name).to eq('namespace_party') + expect(namespaced_resource.namespaced_resource_name).to eq("namespace_party") end end @@ -182,7 +182,7 @@ module Alchemy {name: "description", type: :text}, {name: "starts_at", type: :datetime}, {name: "location_id", type: :integer}, - {name: "organizer_id", type: :integer} + {name: "organizer_id", type: :integer}, ]) end @@ -224,10 +224,10 @@ module Alchemy end end - describe '#attributes' do + describe "#attributes" do it "does not return the attributes returned by that method" do - expect(resource.attributes.detect { |a| a[:name] == 'hidden_name' }).to be_nil - expect(resource.attributes.detect { |a| a[:name] == 'name' }).not_to be_nil + expect(resource.attributes.detect { |a| a[:name] == "hidden_name" }).to be_nil + expect(resource.attributes.detect { |a| a[:name] == "name" }).not_to be_nil end end end @@ -255,7 +255,7 @@ module Alchemy before do allow(Party).to receive(:alchemy_resource_relations) do { - location: {attr_method: "name", attr_type: :string} + location: {attr_method: "name", attr_type: :string}, } end end @@ -268,8 +268,8 @@ module Alchemy context "with an array attribute" do let(:columns) do [ - double(:column, {name: 'name', type: :string, array: false}), - double(:column, {name: 'languages', type: :string, array: true}) + double(:column, {name: "name", type: :string, array: false}), + double(:column, {name: "languages", type: :string, array: true}), ] end @@ -292,10 +292,10 @@ module Alchemy let(:columns) do [ - double(:column, {name: 'name', type: :string}), - double(:column, {name: 'title', type: :string}), - double(:column, {name: 'synced_at', type: :datetime}), - double(:column, {name: 'remote_record_id', type: :string}) + double(:column, {name: "name", type: :string}), + double(:column, {name: "title", type: :string}), + double(:column, {name: "synced_at", type: :datetime}), + double(:column, {name: "remote_record_id", type: :string}), ] end @@ -315,10 +315,10 @@ module Alchemy let(:columns) do [ - double(:column, {name: 'title', type: :string}), - double(:column, {name: 'name', type: :string}), - double(:column, {name: 'updated_at', type: :datetime}), - double(:column, {name: 'public', type: :boolean}) + double(:column, {name: "title", type: :string}), + double(:column, {name: "name", type: :string}), + double(:column, {name: "updated_at", type: :datetime}), + double(:column, {name: "public", type: :boolean}), ] end @@ -327,7 +327,7 @@ module Alchemy {name: "name", type: :string}, {name: "title", type: :string}, {name: "public", type: :boolean}, - {name: "updated_at", type: :datetime} + {name: "updated_at", type: :datetime}, ]) end end @@ -338,12 +338,12 @@ module Alchemy before do allow(Event).to receive(:alchemy_resource_relations) do { - location: {attr_method: "name", attr_type: :string} + location: {attr_method: "name", attr_type: :string}, } end end - describe '#resource_relations' do + describe "#resource_relations" do it "should contain model_association from ActiveRecord::Reflections" do relation = resource.resource_relations[:location_id] expect(relation.keys).to include(:model_association) @@ -357,25 +357,25 @@ module Alchemy it "stores the relation name" do relation = resource.resource_relations[:location_id] expect(relation.keys).to include(:name) - expect(relation[:name]).to eq('location') + expect(relation[:name]).to eq("location") end end - describe '#model_associations' do + describe "#model_associations" do it "skip default alchemy model associations" do expect(resource.model_associations.collect(&:name)).not_to include(*resource.class.const_get(:DEFAULT_SKIPPED_ASSOCIATIONS).map(&:to_sym)) end end - describe '#model_association_names' do - it 'returns an array of association names' do + describe "#model_association_names" do + it "returns an array of association names" do expect(resource.model_association_names).to include(:location) end end - describe '#attributes' do + describe "#attributes" do it "contains the attribute of the related model" do - expect(resource.attributes.detect { |a| a[:name] == 'location_id' }.keys).to include(:relation) + expect(resource.attributes.detect { |a| a[:name] == "location_id" }.keys).to include(:relation) end it "contains the related model's column type as type" do diff --git a/spec/libraries/resources_helper_spec.rb b/spec/libraries/resources_helper_spec.rb index f9e3ab22d5..8d09e7b396 100644 --- a/spec/libraries/resources_helper_spec.rb +++ b/spec/libraries/resources_helper_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -require_relative '../../lib/alchemy/i18n' -require_relative '../../lib/alchemy/resource' -require_relative '../../lib/alchemy/resources_helper' +require_relative "../../lib/alchemy/i18n" +require_relative "../../lib/alchemy/resource" +require_relative "../../lib/alchemy/resources_helper" module Namespace class MyResource @@ -16,7 +16,7 @@ class ResourcesController include Alchemy::ResourcesHelper def resource_handler - @resource_handler ||= Alchemy::Resource.new('admin/namespace/my_resources') + @resource_handler ||= Alchemy::Resource.new("admin/namespace/my_resources") end end @@ -24,32 +24,32 @@ class ResourcesControllerForEngine include Alchemy::ResourcesHelper def resource_handler - @resource_handler ||= Alchemy::Resource.new('admin/engine_resources', {'engine_name' => 'my_engine'}) + @resource_handler ||= Alchemy::Resource.new("admin/engine_resources", {"engine_name" => "my_engine"}) end end describe Alchemy::ResourcesHelper do let(:controller) { ResourcesController.new } - let(:resource_item) { double('resource-item') } + let(:resource_item) { double("resource-item") } before { - allow(controller).to receive(:main_app).and_return 'main_app_proxy' - controller.instance_variable_set('@my_resource', resource_item) - controller.instance_variable_set('@my_resources', [resource_item]) + allow(controller).to receive(:main_app).and_return "main_app_proxy" + controller.instance_variable_set("@my_resource", resource_item) + controller.instance_variable_set("@my_resources", [resource_item]) } describe "path-helpers" do describe "#resource_url_proxy" do it "returns the current proxy for url-helper-methods" do - expect(controller.resource_url_proxy).to eq('main_app_proxy') + expect(controller.resource_url_proxy).to eq("main_app_proxy") end context "when resource is in engine" do let(:controller_for_engine) { ResourcesControllerForEngine.new } - before { allow(controller_for_engine).to receive('my_engine').and_return('my_engine_proxy') } + before { allow(controller_for_engine).to receive("my_engine").and_return("my_engine_proxy") } it "returns the engine's proxy" do - expect(controller_for_engine.resource_url_proxy).to eq('my_engine_proxy') + expect(controller_for_engine.resource_url_proxy).to eq("my_engine_proxy") end end end @@ -119,75 +119,75 @@ def resource_handler subject { controller.render_attribute(resource_item, attributes, options) } let(:options) { {} } - let(:attributes) { {name: 'name'} } + let(:attributes) { {name: "name"} } it "should return the value from resource attribute" do - allow(resource_item).to receive(:name).and_return('my-name') - is_expected.to eq('my-name') + allow(resource_item).to receive(:name).and_return("my-name") + is_expected.to eq("my-name") end context "resource having a relation" do - let(:associated_object) { double("location", title: 'Title of related object') } + let(:associated_object) { double("location", title: "Title of related object") } let(:relation) do { - attr_method: 'title', - name: 'location' + attr_method: "title", + name: "location", } end let(:attributes) do { - name: 'name', - relation: relation + name: "name", + relation: relation, } end before do - allow(resource_item).to receive(:name).and_return('my-name') + allow(resource_item).to receive(:name).and_return("my-name") expect(resource_item).to receive(:location).and_return(associated_object) end it "should return the value from the related object attribute" do - is_expected.to eq('Title of related object') + is_expected.to eq("Title of related object") end - context 'if the relation is empty' do + context "if the relation is empty" do let(:associated_object) { nil } it { is_expected.to eq("Not found") } end end - context 'with long values' do + context "with long values" do before do - allow(resource_item).to receive(:name).and_return('*' * 51) + allow(resource_item).to receive(:name).and_return("*" * 51) end - it 'truncates the values' do + it "truncates the values" do expect(subject.length).to eq(50) end - context 'but with options[:truncate] set to 10' do + context "but with options[:truncate] set to 10" do let(:options) { {truncate: 10} } - it 'does not truncate the values' do + it "does not truncate the values" do expect(subject.length).to eq(10) end end - context 'but with options[:truncate] set to false' do + context "but with options[:truncate] set to false" do let(:options) { {truncate: false} } - it 'does not truncate the values' do + it "does not truncate the values" do expect(subject.length).to eq(51) end end end - context 'format of timestamps' do + context "format of timestamps" do let(:attributes) do { name: :created_at, - type: :datetime + type: :datetime, } end @@ -197,26 +197,26 @@ def resource_handler allow(resource_item).to receive(:created_at) { now } end - it 'formats the time with alchemy default format' do + it "formats the time with alchemy default format" do expect(controller).to receive(:l).with(now, format: :'alchemy.default') subject end - context 'with options[:datetime_format] set to other format' do - let(:options) { {datetime_format: 'OTHR'} } + context "with options[:datetime_format] set to other format" do + let(:options) { {datetime_format: "OTHR"} } - it 'uses this format' do - expect(controller).to receive(:l).with(now, format: 'OTHR') + it "uses this format" do + expect(controller).to receive(:l).with(now, format: "OTHR") subject end end end - context 'format of time values' do + context "format of time values" do let(:attributes) do { name: :created_at, - type: :time + type: :time, } end @@ -226,16 +226,16 @@ def resource_handler allow(resource_item).to receive(:created_at) { now } end - it 'formats the time with alchemy datetime format' do + it "formats the time with alchemy datetime format" do expect(controller).to receive(:l).with(now, format: :'alchemy.time') subject end - context 'with options[:time_format] set to other format' do - let(:options) { {time_format: 'OTHR'} } + context "with options[:time_format] set to other format" do + let(:options) { {time_format: "OTHR"} } - it 'uses this format' do - expect(controller).to receive(:l).with(now, format: 'OTHR') + it "uses this format" do + expect(controller).to receive(:l).with(now, format: "OTHR") subject end end diff --git a/spec/libraries/shell_spec.rb b/spec/libraries/shell_spec.rb index 339d35e00f..639c008dcb 100644 --- a/spec/libraries/shell_spec.rb +++ b/spec/libraries/shell_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true -require 'rails_helper' -require 'alchemy/shell' +require "rails_helper" +require "alchemy/shell" module Alchemy # Class fixture @@ -12,31 +12,31 @@ class MyToDoList describe Shell do before { allow(MyToDoList).to receive(:puts) } - describe '.todo' do + describe ".todo" do it "should add given string as a todo by delegating to .add_todo" do expect(MyToDoList).to receive(:add_todo).with(["", "new todo"]) MyToDoList.todo("new todo") end end - describe '.todos' do + describe ".todos" do it "should be an Array" do expect(MyToDoList.todos).to be_a(Array) end end - describe '.add_todo' do + describe ".add_todo" do it "should add the given string to the .todos array" do - MyToDoList.add_todo('1') - MyToDoList.add_todo('2') - expect(MyToDoList.todos).to eq(['1', '2']) + MyToDoList.add_todo("1") + MyToDoList.add_todo("2") + expect(MyToDoList.todos).to eq(["1", "2"]) end end - describe '.display_todos' do - context 'if there are todos in the list' do + describe ".display_todos" do + context "if there are todos in the list" do before do - allow(MyToDoList).to receive(:todos).and_return(['My first todo', 'My second todo']) + allow(MyToDoList).to receive(:todos).and_return(["My first todo", "My second todo"]) end it "should log them" do @@ -50,7 +50,7 @@ class MyToDoList end end - context 'if there are todos in the list' do + context "if there are todos in the list" do before do allow(MyToDoList).to receive(:todos).and_return([]) end @@ -62,14 +62,14 @@ class MyToDoList end end - describe '.log' do + describe ".log" do before { Alchemy::Shell.verbose! } context 'if the message type is "skip"' do it "the output color should be yellow and cleared again" do expect(MyToDoList).to receive(:color).with(:yellow) expect(MyToDoList).to receive(:color).with(:clear) - MyToDoList.log('in yellow, please', :skip) + MyToDoList.log("in yellow, please", :skip) end end @@ -77,34 +77,34 @@ class MyToDoList it "the output color should be yellow and cleared again" do expect(MyToDoList).to receive(:color).with(:red) expect(MyToDoList).to receive(:color).with(:clear) - MyToDoList.log('in red, please', :error) + MyToDoList.log("in red, please", :error) end end context 'if the message type is "message"' do it "the output color should just be cleared" do expect(MyToDoList).to receive(:color).with(:clear) - MyToDoList.log('cleared, please', :message) + MyToDoList.log("cleared, please", :message) end end - context 'if no message type is given' do + context "if no message type is given" do it "the output color should be green" do expect(MyToDoList).to receive(:color).with(:green) expect(MyToDoList).to receive(:color).with(:clear) - MyToDoList.log('in green, please') + MyToDoList.log("in green, please") end end end - describe '.color' do - context 'if given name is a constant of Thor::Shell::Color' do + describe ".color" do + context "if given name is a constant of Thor::Shell::Color" do it "should call the constant" do expect(MyToDoList.send(:color, :red)).to eq(Thor::Shell::Color::RED) end end - context 'if given name is not a defined constant of Thor::Shell::Color' do + context "if given name is not a defined constant of Thor::Shell::Color" do it "should return nil" do expect(MyToDoList.send(:color, :not_existing)).to be_nil end diff --git a/spec/libraries/template_tracker_spec.rb b/spec/libraries/template_tracker_spec.rb index f93b266bf8..51f1ee6ce8 100644 --- a/spec/libraries/template_tracker_spec.rb +++ b/spec/libraries/template_tracker_spec.rb @@ -1,45 +1,45 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy module CacheDigests describe TemplateTracker do subject { TemplateTracker.call(name, nil) } - describe '#dependencies' do - context 'with alchemy/pages/show given as template name' do - let(:name) { 'alchemy/pages/show' } - before { allow(PageLayout).to receive(:all).and_return([{'name' => 'intro'}, {'name' => 'contact'}]) } + describe "#dependencies" do + context "with alchemy/pages/show given as template name" do + let(:name) { "alchemy/pages/show" } + before { allow(PageLayout).to receive(:all).and_return([{"name" => "intro"}, {"name" => "contact"}]) } it "returns all page layout view partial names" do - is_expected.to include('alchemy/page_layouts/_intro', 'alchemy/page_layouts/_contact') + is_expected.to include("alchemy/page_layouts/_intro", "alchemy/page_layouts/_contact") end end - context 'with a page layout given as template name' do - let(:name) { 'alchemy/page_layouts/_intro' } - let(:page_layout) { {'name' => 'intro', 'elements' => ['text']} } + context "with a page layout given as template name" do + let(:name) { "alchemy/page_layouts/_intro" } + let(:page_layout) { {"name" => "intro", "elements" => ["text"]} } before { allow(PageLayout).to receive(:get).and_return(page_layout) } it "returns all element layout view partial names for that layout" do - is_expected.to include('alchemy/elements/_text_view') + is_expected.to include("alchemy/elements/_text_view") end end - context 'with an element view given as name' do - let(:name) { 'alchemy/elements/_text_view' } - let(:elements) { [{'name' => 'text', 'contents' => [{'type' => 'EssenceText'}]}] } + context "with an element view given as name" do + let(:name) { "alchemy/elements/_text_view" } + let(:elements) { [{"name" => "text", "contents" => [{"type" => "EssenceText"}]}] } - context 'that is having a definition' do + context "that is having a definition" do before { allow(Element).to receive(:definitions).and_return(elements) } it "returns all essence layout view partial names for that element" do - is_expected.to include('alchemy/essences/_essence_text_view') + is_expected.to include("alchemy/essences/_essence_text_view") end end - context 'that has no definition' do + context "that has no definition" do before { allow(Element).to receive(:definitions).and_return([]) } it "returns empty array" do @@ -48,28 +48,28 @@ module CacheDigests end end - context 'with an element editor given as name' do - let(:name) { 'alchemy/elements/_text_editor' } - let(:elements) { [{'name' => 'text', 'contents' => [{'type' => 'EssenceText'}]}] } + context "with an element editor given as name" do + let(:name) { "alchemy/elements/_text_editor" } + let(:elements) { [{"name" => "text", "contents" => [{"type" => "EssenceText"}]}] } it do is_expected.to be_empty end end - context 'with an element given as name' do - let(:name) { 'alchemy/elements/_text' } - let(:elements) { [{'name' => 'text', 'contents' => [{'type' => 'EssenceText'}]}] } + context "with an element given as name" do + let(:name) { "alchemy/elements/_text" } + let(:elements) { [{"name" => "text", "contents" => [{"type" => "EssenceText"}]}] } - context 'that is having a definition' do + context "that is having a definition" do before { allow(Element).to receive(:definitions).and_return(elements) } it "returns all essence layout view partial names for that element" do - is_expected.to include('alchemy/essences/_essence_text_view') + is_expected.to include("alchemy/essences/_essence_text_view") end end - context 'that has no definition' do + context "that has no definition" do before { allow(Element).to receive(:definitions).and_return([]) } it "returns empty array" do @@ -78,8 +78,8 @@ module CacheDigests end end - context 'with not an alchemy template given as name' do - let(:name) { 'shop/cart' } + context "with not an alchemy template given as name" do + let(:name) { "shop/cart" } it "calls rails template tracker" do expect(ActionView::DependencyTracker::ERBTracker).to receive(:call).with(name, nil) diff --git a/spec/libraries/tinymce_spec.rb b/spec/libraries/tinymce_spec.rb index 599e84eb3f..8d4a2d9a7f 100644 --- a/spec/libraries/tinymce_spec.rb +++ b/spec/libraries/tinymce_spec.rb @@ -1,19 +1,19 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Tinymce do - describe '.init' do + describe ".init" do subject { Tinymce.init } it "returns the default config" do - is_expected.to eq(Tinymce.class_variable_get('@@init')) + is_expected.to eq(Tinymce.class_variable_get("@@init")) end end - describe '.init=' do - let(:another_config) { {theme_advanced_buttons3: 'table'} } + describe ".init=" do + let(:another_config) { {theme_advanced_buttons3: "table"} } it "merges the default config with given config" do Tinymce.init = another_config @@ -21,26 +21,26 @@ module Alchemy end end - context 'Methods for contents with custom tinymce config.' do + context "Methods for contents with custom tinymce config." do let(:content_definition) do { - 'name' => 'text', - 'settings' => { - 'tinymce' => { - 'foo' => 'bar' - } - } + "name" => "text", + "settings" => { + "tinymce" => { + "foo" => "bar", + }, + }, } end let(:element_definition) do { - 'name' => 'article', - 'contents' => [content_definition] + "name" => "article", + "contents" => [content_definition], } end - describe '.custom_config_contents' do + describe ".custom_config_contents" do let(:page) { build_stubbed(:alchemy_page) } let(:element_definitions) do @@ -57,23 +57,23 @@ module Alchemy and element name" do is_expected.to be_an(Array) is_expected.to include({ - 'element' => element_definition['name'] + "element" => element_definition["name"], }.merge(content_definition)) end - context 'with no contents having custom tinymce config' do + context "with no contents having custom tinymce config" do let(:content_definition) do - {'name' => 'text'} + {"name" => "text"} end it { is_expected.to eq([]) } end - context 'with element definition having nil as contents value' do + context "with element definition having nil as contents value" do let(:element_definition) do { - 'name' => 'element', - 'contents' => nil + "name" => "element", + "contents" => nil, } end @@ -82,16 +82,16 @@ module Alchemy end end - context 'with content settings tinymce set to true only' do + context "with content settings tinymce set to true only" do let(:element_definition) do { - 'name' => 'element', - 'contents' => [ - 'name' => 'headline', - 'settings' => { - 'tinymce' => true - } - ] + "name" => "element", + "contents" => [ + "name" => "headline", + "settings" => { + "tinymce" => true, + }, + ], } end @@ -100,20 +100,20 @@ module Alchemy end end - context 'with nestable_elements defined' do + context "with nestable_elements defined" do let(:element_definitions) do [ element_definition, { - 'name' => 'nested_element', - 'contents' => [content_definition] - } + "name" => "nested_element", + "contents" => [content_definition], + }, ] end - it 'includes these configs' do + it "includes these configs" do is_expected.to include({ - 'element' => element_definition['name'] + "element" => element_definition["name"], }.merge(content_definition)) end end diff --git a/spec/libraries/userstamp_spec.rb b/spec/libraries/userstamp_spec.rb index 73dae06c16..91f6c90f09 100644 --- a/spec/libraries/userstamp_spec.rb +++ b/spec/libraries/userstamp_spec.rb @@ -1,9 +1,9 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -describe 'Alchemy::AuthAccessors' do - describe '.user_class' do +describe "Alchemy::AuthAccessors" do + describe ".user_class" do it "injects userstamp class methods" do expect(Alchemy.user_class).to respond_to(:stamper_class_name) expect(Alchemy.user_class.stamper_class_name).to eq(:"::DummyUser") diff --git a/spec/mailers/alchemy/messages_mailer_spec.rb b/spec/mailers/alchemy/messages_mailer_spec.rb index 06406ebc42..eff2aec0be 100644 --- a/spec/mailers/alchemy/messages_mailer_spec.rb +++ b/spec/mailers/alchemy/messages_mailer_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" def reload_mailer_class(class_name) Alchemy.send(:remove_const, class_name) @@ -9,8 +9,8 @@ def reload_mailer_class(class_name) module Alchemy describe MessagesMailer do - let(:message) { Message.new(email: 'jon@doe.com', message: 'Lorem ipsum') } - let(:mail) { MessagesMailer.contact_form_mail(message, 'admin@page.com', 'contact@page.com', 'Subject') } + let(:message) { Message.new(email: "jon@doe.com", message: "Lorem ipsum") } + let(:mail) { MessagesMailer.contact_form_mail(message, "admin@page.com", "contact@page.com", "Subject") } it "inherits from ActionMailer::Base" do expect(MessagesMailer < ActionMailer::Base).to eq(true) @@ -29,8 +29,8 @@ class ::ApplicationMailer; end end it "delivers a mail to owner" do - expect(mail.to).to eq(['admin@page.com']) - expect(mail.subject).to eq('Subject') + expect(mail.to).to eq(["admin@page.com"]) + expect(mail.subject).to eq("Subject") end it "reply_to should be set to senders email" do diff --git a/spec/models/alchemy/attachment_spec.rb b/spec/models/alchemy/attachment_spec.rb index 9c17bfd400..4eb7d1d021 100644 --- a/spec/models/alchemy/attachment_spec.rb +++ b/spec/models/alchemy/attachment_spec.rb @@ -1,20 +1,20 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Attachment do - let(:file) { File.new(File.expand_path('../../fixtures/image with spaces.png', __dir__)) } + let(:file) { File.new(File.expand_path("../../fixtures/image with spaces.png", __dir__)) } let(:attachment) { Attachment.new(file: file) } - describe 'after assign' do + describe "after assign" do it "stores the file mime type into database" do attachment.update(file: file) expect(attachment.file_mime_type).not_to be_blank end end - describe 'after save' do + describe "after save" do subject(:save) { attachment.save! } it "should have a humanized name" do @@ -24,7 +24,7 @@ module Alchemy context "when file_name has not changed" do before do - attachment.update(name: 'image with spaces') + attachment.update(name: "image with spaces") end it "should not change name" do @@ -32,12 +32,12 @@ module Alchemy end end - context 'assigned to contents' do + context "assigned to contents" do let(:attachment) { create(:alchemy_attachment) } let(:content) do create(:alchemy_content, :essence_file).tap do |content| - content.update_column(:updated_at, 3.hours.ago) + content.element.update_column(:updated_at, 3.hours.ago) end end @@ -45,39 +45,39 @@ module Alchemy content.essence.update(attachment: attachment) end - it 'touches contents' do - expect { attachment.save }.to change { content.reload.updated_at } + it "touches elements" do + expect { attachment.save }.to change { attachment.elements.reload.first.updated_at } end end end - describe 'urlname sanitizing' do + describe "urlname sanitizing" do it "escapes unsafe url characters" do - attachment.file_name = 'f#%&cking cute kitten pic.png' - expect(attachment.urlname).to eq('f%23%25%26cking+cute+kitten+pic') + attachment.file_name = "f#%&cking cute kitten pic.png" + expect(attachment.urlname).to eq("f%23%25%26cking+cute+kitten+pic") end it "removes format suffix from end of file name" do - attachment.file_name = 'pic.png.png' - expect(attachment.urlname).to eq('pic+png') + attachment.file_name = "pic.png.png" + expect(attachment.urlname).to eq("pic+png") end it "converts dots into escaped spaces" do - attachment.file_name = 'cute.kitten.pic.png' - expect(attachment.urlname).to eq('cute+kitten+pic') + attachment.file_name = "cute.kitten.pic.png" + expect(attachment.urlname).to eq("cute+kitten+pic") end it "escapes umlauts in the name" do - attachment.file_name = 'süßes katzenbild.png' - expect(attachment.urlname).to eq('s%C3%BC%C3%9Fes+katzenbild') + attachment.file_name = "süßes katzenbild.png" + expect(attachment.urlname).to eq("s%C3%BC%C3%9Fes+katzenbild") end end - describe 'validations' do + describe "validations" do context "having a png, but only pdf allowed" do before do allow(Config).to receive(:get) do - {'allowed_filetypes' => {'alchemy/attachments' => ['pdf']}} + { "allowed_filetypes" => { "alchemy/attachments" => ["pdf"] } } end end @@ -89,7 +89,7 @@ module Alchemy context "having a png and everything allowed" do before do allow(Config).to receive(:get) do - {'allowed_filetypes' => {'alchemy/attachments' => ['*']}} + { "allowed_filetypes" => { "alchemy/attachments" => ["*"] } } end end @@ -100,8 +100,8 @@ module Alchemy context "having a filename with special characters" do before do - attachment.file_name = 'my FileNämü.pdf' - attachment.save + attachment.file_name = "my FileNämü.pdf" + attachment.save end it "should be valid" do @@ -110,107 +110,107 @@ module Alchemy end end - context 'PNG image' do - subject { stub_model(Attachment, file_name: 'kitten.png') } + context "PNG image" do + subject { stub_model(Attachment, file_name: "kitten.png") } - describe '#extension' do + describe "#extension" do subject { super().extension } it { is_expected.to eq("png") } end end - describe '#icon_css_class' do + describe "#icon_css_class" do subject { attachment.icon_css_class } - context 'mp3 file' do - let(:attachment) { stub_model(Attachment, file_mime_type: 'audio/mpeg') } + context "mp3 file" do + let(:attachment) { stub_model(Attachment, file_mime_type: "audio/mpeg") } it { is_expected.to eq("file-audio") } end - context 'video file' do - let(:attachment) { stub_model(Attachment, file_mime_type: 'video/mpeg') } + context "video file" do + let(:attachment) { stub_model(Attachment, file_mime_type: "video/mpeg") } it { is_expected.to eq("file-video") } end - context 'png file' do - let(:attachment) { stub_model(Attachment, file_mime_type: 'image/png') } + context "png file" do + let(:attachment) { stub_model(Attachment, file_mime_type: "image/png") } it { is_expected.to eq("file-image") } end - context 'vcard file' do - let(:attachment) { stub_model(Attachment, file_mime_type: 'application/vcard') } + context "vcard file" do + let(:attachment) { stub_model(Attachment, file_mime_type: "application/vcard") } it { is_expected.to eq("address-card") } end - context 'zip file' do - let(:attachment) { stub_model(Attachment, file_mime_type: 'application/zip') } + context "zip file" do + let(:attachment) { stub_model(Attachment, file_mime_type: "application/zip") } it { is_expected.to eq("file-archive") } end - context 'photoshop file' do - let(:attachment) { stub_model(Attachment, file_mime_type: 'image/x-psd') } + context "photoshop file" do + let(:attachment) { stub_model(Attachment, file_mime_type: "image/x-psd") } it { is_expected.to eq("file-image") } end - context 'text file' do - let(:attachment) { stub_model(Attachment, file_mime_type: 'text/plain') } + context "text file" do + let(:attachment) { stub_model(Attachment, file_mime_type: "text/plain") } it { is_expected.to eq("file-alt") } end - context 'rtf file' do - let(:attachment) { stub_model(Attachment, file_mime_type: 'application/rtf') } + context "rtf file" do + let(:attachment) { stub_model(Attachment, file_mime_type: "application/rtf") } it { is_expected.to eq("file-alt") } end - context 'pdf file' do - let(:attachment) { stub_model(Attachment, file_mime_type: 'application/pdf') } + context "pdf file" do + let(:attachment) { stub_model(Attachment, file_mime_type: "application/pdf") } it { is_expected.to eq("file-pdf") } end - context 'word file' do - let(:attachment) { stub_model(Attachment, file_mime_type: 'application/msword') } + context "word file" do + let(:attachment) { stub_model(Attachment, file_mime_type: "application/msword") } it { is_expected.to eq("file-word") } end - context 'excel file' do - let(:attachment) { stub_model(Attachment, file_mime_type: 'application/vnd.ms-excel') } + context "excel file" do + let(:attachment) { stub_model(Attachment, file_mime_type: "application/vnd.ms-excel") } it { is_expected.to eq("file-excel") } end - context 'xlsx file' do - let(:attachment) { stub_model(Attachment, file_mime_type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet') } + context "xlsx file" do + let(:attachment) { stub_model(Attachment, file_mime_type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") } it { is_expected.to eq("file-excel") } end - context 'csv file' do - let(:attachment) { stub_model(Attachment, file_mime_type: 'text/csv') } + context "csv file" do + let(:attachment) { stub_model(Attachment, file_mime_type: "text/csv") } it { is_expected.to eq("file-excel") } end - context 'unknown file' do - let(:attachment) { stub_model(Attachment, file_mime_type: '') } + context "unknown file" do + let(:attachment) { stub_model(Attachment, file_mime_type: "") } it { is_expected.to eq("file") } end end - describe '#restricted?' do + describe "#restricted?" do subject { attachment.restricted? } - context 'if only on restricted pages' do + context "if only on restricted pages" do before do pages = double(any?: true) expect(pages).to receive(:not_restricted).and_return([]) @@ -220,7 +220,7 @@ module Alchemy it { is_expected.to be_truthy } end - context 'if not only on restricted pages' do + context "if not only on restricted pages" do let(:page) { mock_model(Page) } before do diff --git a/spec/models/alchemy/content_spec.rb b/spec/models/alchemy/content_spec.rb index 92c7afb9e4..f1649caec8 100644 --- a/spec/models/alchemy/content_spec.rb +++ b/spec/models/alchemy/content_spec.rb @@ -1,60 +1,60 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Content do - let(:element) { create(:alchemy_element, :with_contents, name: 'headline') } - let(:content) { element.contents.find_by(essence_type: 'Alchemy::EssenceText') } + let(:element) { create(:alchemy_element, :with_contents, name: "headline") } + let(:content) { element.contents.find_by(essence_type: "Alchemy::EssenceText") } it "should return the ingredient from its essence" do content.essence.update_columns(body: "Hello") expect(content.ingredient).to eq("Hello") end - describe '.normalize_essence_type' do + describe ".normalize_essence_type" do context "passing namespaced essence type" do it "should not add alchemy namespace" do - expect(Content.normalize_essence_type('Alchemy::EssenceText')).to eq("Alchemy::EssenceText") + expect(Content.normalize_essence_type("Alchemy::EssenceText")).to eq("Alchemy::EssenceText") end end context "passing not namespaced essence type" do it "should add alchemy namespace" do - expect(Content.normalize_essence_type('EssenceText')).to eq("Alchemy::EssenceText") + expect(Content.normalize_essence_type("EssenceText")).to eq("Alchemy::EssenceText") end end context "passing non-namespaced essence type for an existing non-namespaced essence" do it "should not add alchemy namespace" do - expect(Content.normalize_essence_type('DummyModel')).to eq("DummyModel") + expect(Content.normalize_essence_type("DummyModel")).to eq("DummyModel") end end end - describe '#normalized_essence_type' do + describe "#normalized_essence_type" do context "without namespace in essence_type column" do it "should return the namespaced essence type" do - expect(Content.new(essence_type: 'EssenceText').normalized_essence_type).to eq('Alchemy::EssenceText') + expect(Content.new(essence_type: "EssenceText").normalized_essence_type).to eq("Alchemy::EssenceText") end end context "with namespace in essence_type column" do it "should return the namespaced essence type" do - expect(Content.new(essence_type: 'Alchemy::EssenceText').normalized_essence_type).to eq('Alchemy::EssenceText') + expect(Content.new(essence_type: "Alchemy::EssenceText").normalized_essence_type).to eq("Alchemy::EssenceText") end end end - describe '#update_essence' do + describe "#update_essence" do subject { content.update_essence(params) } - let(:element) { create(:alchemy_element, :with_contents, name: 'text') } + let(:element) { create(:alchemy_element, :with_contents, name: "text") } let(:content) { element.contents.first } - let(:params) { {} } + let(:params) { {} } - context 'with params given' do - let(:params) { {body: 'Mikes Petshop'} } + context "with params given" do + let(:params) { { body: "Mikes Petshop" } } let(:essence) { content.essence } before do @@ -65,15 +65,10 @@ module Alchemy is_expected.to be_truthy expect(content.ingredient).to eq("Mikes Petshop") end - - it "updates timestamp after updating related essence" do - expect(content).to receive(:touch) - subject - end end - context 'with validations and without params given' do - let(:element) { create(:alchemy_element, :with_contents, name: 'contactform') } + context "with validations and without params given" do + let(:element) { create(:alchemy_element, :with_contents, name: "contactform") } it "should add error messages if save fails and return false" do is_expected.to be_falsey @@ -81,7 +76,7 @@ module Alchemy end end - context 'if essence is missing' do + context "if essence is missing" do before do expect(content).to receive(:essence).and_return nil end @@ -92,13 +87,13 @@ module Alchemy end end - describe '.copy' do + describe ".copy" do let(:element) do - create(:alchemy_element, :with_contents, name: 'text') + create(:alchemy_element, :with_contents, name: "text") end let(:new_element) do - create(:alchemy_element, name: 'text') + create(:alchemy_element, name: "text") end let(:content) do @@ -106,7 +101,7 @@ module Alchemy end it "should create a new record with all attributes of source except given differences" do - copy = Content.copy(content, {element_id: new_element.id}) + copy = Content.copy(content, { element_id: new_element.id }) expect(copy.element_id).to eq(new_element.id) end @@ -116,7 +111,7 @@ module Alchemy end it "should copy source essence attributes" do - content.essence.update_column(:body, 'Lorem ipsum') + content.essence.update_column(:body, "Lorem ipsum") copy = Content.copy(content) copy.essence.body == content.essence.body end @@ -136,28 +131,28 @@ module Alchemy expect(Element).to receive(:definitions) do [ { - 'name' => 'foo', - 'contents' => [{'name' => 'title'}] + "name" => "foo", + "contents" => [{ "name" => "title" }], }, { - 'name' => 'bar' - } + "name" => "bar", + }, ] end end it "returns only content definitions" do expect(Content.definitions).to match_array( - [{'name' => 'title'}] + [{ "name" => "title" }], ) end end end - describe '.new' do + describe ".new" do let(:element) { build(:alchemy_element) } - subject { Content.new({element: element, name: 'headline'}) } + subject { Content.new({ element: element, name: "headline" }) } it "builds a new content instance from elements.yml definition" do is_expected.to be_instance_of(Content) @@ -170,10 +165,10 @@ module Alchemy end end - describe '.create' do - let(:element) { create(:alchemy_element, name: 'article') } + describe ".create" do + let(:element) { create(:alchemy_element, name: "article") } - subject(:content) { Content.create(element: element, name: 'headline') } + subject(:content) { Content.create(element: element, name: "headline") } it "creates the content" do is_expected.to be_instance_of(Alchemy::Content) @@ -189,21 +184,21 @@ module Alchemy it "should have the ingredient column filled with default value." do allow_any_instance_of(Content).to receive(:definition) do { - 'name' => 'headline', - 'type' => 'EssenceText', - 'default' => 'Welcome' + "name" => "headline", + "type" => "EssenceText", + "default" => "Welcome", }.with_indifferent_access end expect(content.ingredient).to eq("Welcome") end - context 'with default value being a symbol' do + context "with default value being a symbol" do it "passes default value through I18n." do allow_any_instance_of(Content).to receive(:definition) do { - 'name' => 'headline', - 'type' => 'EssenceText', - 'default' => :welcome + "name" => "headline", + "type" => "EssenceText", + "default" => :welcome, }.with_indifferent_access end expect(content.ingredient).to eq("Welcome to my site") @@ -212,18 +207,18 @@ module Alchemy end end - describe '#ingredient=' do - let(:element) { create(:alchemy_element, name: 'headline') } + describe "#ingredient=" do + let(:element) { create(:alchemy_element, name: "headline") } it "should set the given value to the ingredient column of essence" do - c = Content.create(element: element, name: 'headline') + c = Content.create(element: element, name: "headline") c.ingredient = "Welcome" expect(c.ingredient).to eq("Welcome") end context "no essence associated" do - let(:element) { create(:alchemy_element, name: 'headline') } - let(:content) { Alchemy::Content.new(element: element, name: 'headline').tap(&:save) } + let(:element) { create(:alchemy_element, name: "headline") } + let(:content) { Alchemy::Content.new(element: element, name: "headline").tap(&:save) } before do expect(content).to receive(:essence) { nil } @@ -246,7 +241,7 @@ module Alchemy before { expect(content).to receive(:essence).and_return nil } it "returns empty string" do - expect(content.dom_id).to eq('') + expect(content.dom_id).to eq("") end end end @@ -263,24 +258,24 @@ module Alchemy before { expect(content).to receive(:essence).and_return nil } it "returns empty string" do - expect(content.essence_partial_name).to eq('') + expect(content.essence_partial_name).to eq("") end end end - describe '#preview_content?' do + describe "#preview_content?" do let(:content) { build_stubbed(:alchemy_content) } - context 'not defined as preview content' do + context "not defined as preview content" do it "returns false" do expect(content.preview_content?).to be false end end - context 'defined as preview content' do + context "defined as preview content" do before do expect(content).to receive(:definition).at_least(:once).and_return({ - 'as_element_title' => true + "as_element_title" => true, }) end @@ -290,8 +285,8 @@ module Alchemy end end - describe '#preview_text' do - let(:essence) { mock_model(EssenceText, preview_text: 'Lorem') } + describe "#preview_text" do + let(:essence) { mock_model(EssenceText, preview_text: "Lorem") } let(:content) { c = Content.new; c.essence = essence; c } it "should return the essences preview_text" do @@ -300,25 +295,25 @@ module Alchemy end end - describe '#has_tinymce?' do - let(:element) { build_stubbed(:alchemy_element, name: 'article') } - let(:content) { build_stubbed(:alchemy_content, name: 'text', element: element) } + describe "#has_tinymce?" do + let(:element) { build_stubbed(:alchemy_element, name: "article") } + let(:content) { build_stubbed(:alchemy_content, name: "text", element: element) } subject { content.has_tinymce? } it { is_expected.to eq(false) } - context 'having custom tinymce config hash' do + context "having custom tinymce config hash" do before do expect(content).to receive(:settings) do - {tinymce: {toolbar: []}} + { tinymce: { toolbar: [] } } end end it { is_expected.to eq(true) } end - context 'having essence that has_tinymce? eq true' do + context "having essence that has_tinymce? eq true" do before do expect(content.essence).to receive(:has_tinymce?) { true } end @@ -326,7 +321,7 @@ module Alchemy it { is_expected.to eq(true) } end - context 'having nil essence' do + context "having nil essence" do before do content.essence = nil end @@ -335,18 +330,18 @@ module Alchemy end end - describe '#has_custom_tinymce_config?' do - let(:element) { build_stubbed(:alchemy_element, name: 'article') } - let(:content) { build_stubbed(:alchemy_content, name: 'text', element: element) } + describe "#has_custom_tinymce_config?" do + let(:element) { build_stubbed(:alchemy_element, name: "article") } + let(:content) { build_stubbed(:alchemy_content, name: "text", element: element) } subject { content.has_custom_tinymce_config? } it { is_expected.to eq(false) } - context 'having custom tinymce config hash' do + context "having custom tinymce config hash" do before do expect(content).to receive(:settings) do - {tinymce: {toolbar: []}} + { tinymce: { toolbar: [] } } end end @@ -354,21 +349,21 @@ module Alchemy end end - describe '#tinymce_class_name' do - let(:element) { build_stubbed(:alchemy_element, name: 'article') } - let(:content) { build_stubbed(:alchemy_content, name: 'text', element: element) } + describe "#tinymce_class_name" do + let(:element) { build_stubbed(:alchemy_element, name: "article") } + let(:content) { build_stubbed(:alchemy_content, name: "text", element: element) } subject { content.tinymce_class_name } - it { is_expected.to eq('has_tinymce') } + it { is_expected.to eq("has_tinymce") } - context 'having custom tinymce config' do + context "having custom tinymce config" do before do expect(content).to receive(:has_custom_tinymce_config?).and_return(true) end - it 'returns name including element name' do - is_expected.to eq('has_tinymce article_text') + it "returns name including element name" do + is_expected.to eq("has_tinymce article_text") end end end @@ -377,16 +372,16 @@ module Alchemy let(:subject) { Content.new } end - describe '#settings' do - let(:element) { build_stubbed(:alchemy_element, name: 'article') } - let(:content) { build_stubbed(:alchemy_content, name: 'headline', element: element) } + describe "#settings" do + let(:element) { build_stubbed(:alchemy_element, name: "article") } + let(:content) { build_stubbed(:alchemy_content, name: "headline", element: element) } it "returns the settings hash from definition" do - expect(content.settings).to eq({'linkable' => true}) + expect(content.settings).to eq({ "linkable" => true }) end - context 'if settings are not defined' do - let(:content) { build_stubbed(:alchemy_content, name: 'intro', element: element) } + context "if settings are not defined" do + let(:content) { build_stubbed(:alchemy_content, name: "intro", element: element) } it "returns empty hash" do expect(content.settings).to eq({}) @@ -394,7 +389,7 @@ module Alchemy end end - describe '#settings_value' do + describe "#settings_value" do let(:key) { :key } let(:settings) { Hash.new } @@ -404,73 +399,73 @@ module Alchemy allow(content).to receive(:settings) { settings } end - context 'with content having settings' do - let(:settings) { {key: 'settings_value'} } + context "with content having settings" do + let(:settings) { { key: "settings_value" } } - context 'and empty options' do + context "and empty options" do let(:options) { {} } it "returns the value for key from content settings" do - expect(subject).to eq('settings_value') + expect(subject).to eq("settings_value") end end - context 'and nil options' do + context "and nil options" do let(:options) { nil } it "returns the value for key from content settings" do - expect(subject).to eq('settings_value') + expect(subject).to eq("settings_value") end end - context 'but same key present in options' do - let(:options) { {key: 'options_value'} } + context "but same key present in options" do + let(:options) { { key: "options_value" } } it "returns the value for key from options" do - expect(subject).to eq('options_value') + expect(subject).to eq("options_value") end end end - context 'with content having no settings' do + context "with content having no settings" do let(:settings) { {} } - context 'and empty options' do + context "and empty options" do let(:options) { {} } it { expect(subject).to eq(nil) } end - context 'but key present in options' do - let(:options) { {key: 'options_value'} } + context "but key present in options" do + let(:options) { { key: "options_value" } } it "returns the value for key from options" do - expect(subject).to eq('options_value') + expect(subject).to eq("options_value") end end end - context 'with content having settings with string as key' do - let(:settings) { {'key' => 'value_from_string_key'} } + context "with content having settings with string as key" do + let(:settings) { { "key" => "value_from_string_key" } } let(:options) { {} } it "returns value" do - expect(subject).to eq('value_from_string_key') + expect(subject).to eq("value_from_string_key") end end - context 'with key passed as string' do - let(:settings) { {key: 'value_from_symbol_key'} } - let(:key) { 'key' } + context "with key passed as string" do + let(:settings) { { key: "value_from_symbol_key" } } + let(:key) { "key" } let(:options) { {} } it "returns value" do - expect(subject).to eq('value_from_symbol_key') + expect(subject).to eq("value_from_symbol_key") end end end - context 'delegations' do + context "delegations" do let(:page) { create(:alchemy_page, :restricted) } it "delegates restricted? to page" do diff --git a/spec/models/alchemy/element_spec.rb b/spec/models/alchemy/element_spec.rb index 861a9629bb..71d0aaa532 100644 --- a/spec/models/alchemy/element_spec.rb +++ b/spec/models/alchemy/element_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Element do @@ -9,126 +9,126 @@ module Alchemy # ClassMethods - describe '.new' do + describe ".new" do it "should initialize an element by name from scratch" do - el = Element.new(name: 'article') + el = Element.new(name: "article") expect(el).to be_an(Alchemy::Element) - expect(el.name).to eq('article') + expect(el.name).to eq("article") end it "should raise an error if the given name is not defined in the elements.yml" do expect { - Element.new(name: 'foobar') + Element.new(name: "foobar") }.to raise_error(ElementDefinitionError) end it "should merge given attributes into defined ones" do - el = Element.new(name: 'article', page_id: 1) + el = Element.new(name: "article", page_id: 1) expect(el.page_id).to eq(1) end it "should not have forbidden attributes from definition" do - el = Element.new(name: 'article') + el = Element.new(name: "article") expect(el.contents).to eq([]) end end - describe '.create' do + describe ".create" do let(:page) { build(:alchemy_page) } - subject(:element) { described_class.create(page: page, name: 'article') } + subject(:element) { described_class.create(page: page, name: "article") } - it 'creates contents' do + it "creates contents" do expect(element.contents).to match_array([ an_instance_of(Alchemy::Content), an_instance_of(Alchemy::Content), an_instance_of(Alchemy::Content), - an_instance_of(Alchemy::Content) + an_instance_of(Alchemy::Content), ]) end - context 'if autogenerate_contents set to false' do + context "if autogenerate_contents set to false" do subject(:element) do described_class.create( page: page, - name: 'article', - autogenerate_contents: false + name: "article", + autogenerate_contents: false, ) end - it 'creates contents' do + it "creates contents" do expect(element.contents).to be_empty end end - context 'if autogenerate is given in definition' do + context "if autogenerate is given in definition" do subject(:element) do - described_class.create(page: page, name: 'slider') + described_class.create(page: page, name: "slider") end - it 'creates nested elements' do + it "creates nested elements" do expect(element.nested_elements).to match_array([ - an_instance_of(Alchemy::Element) + an_instance_of(Alchemy::Element), ]) end - context 'if element name is not a nestable element' do + context "if element name is not a nestable element" do subject(:element) do described_class.create( page: page, - name: 'slider' + name: "slider", ) end before do expect(Alchemy::Element).to receive(:definitions).at_least(:once) do [ - {'name' => 'slider', 'nestable_elements' => ['foo'], 'autogenerate' => ['bar']} + { "name" => "slider", "nestable_elements" => ["foo"], "autogenerate" => ["bar"] }, ] end end - it 'logs error warning' do + it "logs error warning" do expect_any_instance_of(Alchemy::Logger).to \ receive(:log_warning).with("Element 'bar' not a nestable element for 'slider'. Skipping!") element end - it 'skips element' do + it "skips element" do expect(element.nested_elements).to be_empty end end - context 'if autogenerate_nested_elements set to false' do + context "if autogenerate_nested_elements set to false" do subject(:element) do described_class.create( page: page, - name: 'slider', - autogenerate_nested_elements: false + name: "slider", + autogenerate_nested_elements: false, ) end - it 'creates contents' do + it "creates contents" do expect(element.contents).to be_empty end end end end - describe '.copy' do + describe ".copy" do subject { Element.copy(element) } let(:element) do - create(:alchemy_element, :with_contents, tag_list: 'red, yellow') + create(:alchemy_element, :with_contents, tag_list: "red, yellow") end it "should not create contents from scratch" do expect(subject.contents.count).to eq(element.contents.count) end - context 'with differences' do + context "with differences" do let(:new_page) { create(:alchemy_page) } - subject(:copy) { Element.copy(element, {page_id: new_page.id}) } + subject(:copy) { Element.copy(element, { page_id: new_page.id }) } it "should create a new record with all attributes of source except given differences" do expect(copy.page_id).to eq(new_page.id) @@ -144,27 +144,27 @@ module Alchemy expect(subject.tag_list).to eq(element.tag_list) end - context 'with nested elements' do + context "with nested elements" do let(:element) do create(:alchemy_element, :with_contents, :with_nestable_elements, { - tag_list: 'red, yellow', - page: create(:alchemy_page) + tag_list: "red, yellow", + page: create(:alchemy_page), }) end before do - element.nested_elements << create(:alchemy_element, name: 'slide') + element.nested_elements << create(:alchemy_element, name: "slide") end it "should copy nested elements" do expect(subject.nested_elements).to_not be_empty end - context 'copy to new page' do + context "copy to new page" do let(:new_page) { create(:alchemy_page) } subject(:new_element) do - Element.copy(element, {page_id: new_page.id}) + Element.copy(element, { page_id: new_page.id }) end it "should set page id to new page's id" do @@ -176,13 +176,13 @@ module Alchemy end end - describe '.definitions' do + describe ".definitions" do it "should allow erb generated elements" do - expect(Element.definitions.collect { |el| el['name'] }).to include('erb_element') + expect(Element.definitions.collect { |el| el["name"] }).to include("erb_element") end context "with a YAML file including a symbol" do - let(:yaml) { '- name: :symbol' } + let(:yaml) { "- name: :symbol" } before do expect(File).to receive(:exist?).and_return(true) @@ -195,7 +195,7 @@ module Alchemy end context "with a YAML file including a Date" do - let(:yaml) { '- default: 2017-12-24' } + let(:yaml) { "- default: 2017-12-24" } before do expect(File).to receive(:exist?).and_return(true) @@ -237,59 +237,59 @@ module Alchemy end end - describe '.display_name_for' do + describe ".display_name_for" do it "should return the translation for the given name" do - expect(Alchemy).to receive(:t).with('subheadline', scope: "element_names", default: 'Subheadline').and_return('Überschrift') - expect(Element.display_name_for('subheadline')).to eq('Überschrift') + expect(Alchemy).to receive(:t).with("subheadline", scope: "element_names", default: "Subheadline").and_return("Überschrift") + expect(Element.display_name_for("subheadline")).to eq("Überschrift") end it "should return the humanized name if no translation found" do - expect(Element.display_name_for('not_existing_one')).to eq('Not existing one') + expect(Element.display_name_for("not_existing_one")).to eq("Not existing one") end end - describe '.excluded' do + describe ".excluded" do it "should return all elements but excluded ones" do - create(:alchemy_element, name: 'article') - create(:alchemy_element, name: 'article') - excluded = create(:alchemy_element, name: 'claim') - expect(Element.excluded(['claim'])).not_to include(excluded) + create(:alchemy_element, name: "article") + create(:alchemy_element, name: "article") + excluded = create(:alchemy_element, name: "claim") + expect(Element.excluded(["claim"])).not_to include(excluded) end end - describe '.named' do + describe ".named" do it "should return all elements by name" do - element_1 = create(:alchemy_element, name: 'article') - element_2 = create(:alchemy_element, name: 'headline') - elements = Element.named(['article']) + element_1 = create(:alchemy_element, name: "article") + element_2 = create(:alchemy_element, name: "headline") + elements = Element.named(["article"]) expect(elements).to include(element_1) expect(elements).to_not include(element_2) end end - describe '.fixed' do + describe ".fixed" do let!(:fixed_element) { create(:alchemy_element, :fixed) } let!(:element) { create(:alchemy_element) } it "should return all elements that are fixed" do expect(Element.fixed).to match_array([ - fixed_element + fixed_element, ]) end end - describe '.unfixed' do + describe ".unfixed" do let!(:fixed_element) { create(:alchemy_element, :fixed) } let!(:element) { create(:alchemy_element) } it "should return all elements that are not fixed" do expect(Element.unfixed).to match_array([ - element + element, ]) end end - describe '.published' do + describe ".published" do it "should return all public elements" do element_1 = create(:alchemy_element, public: true) element_2 = create(:alchemy_element, public: false) @@ -299,7 +299,7 @@ module Alchemy end end - describe '.folded' do + describe ".folded" do it "returns all folded elements" do element_1 = create(:alchemy_element, folded: true) element_2 = create(:alchemy_element, folded: false) @@ -309,7 +309,7 @@ module Alchemy end end - describe '.expanded' do + describe ".expanded" do it "returns all expanded elements" do element_1 = create(:alchemy_element, folded: false) element_2 = create(:alchemy_element, folded: true) @@ -319,7 +319,7 @@ module Alchemy end end - describe '.not_nested' do + describe ".not_nested" do subject { Element.not_nested } let!(:element_1) { create(:alchemy_element) } @@ -330,10 +330,10 @@ module Alchemy end end - context 'trash' do + context "trash" do let(:element) { create(:alchemy_element) } - describe '.not_trashed' do + describe ".not_trashed" do before { element } it "should return a collection of not trashed elements" do @@ -350,11 +350,11 @@ module Alchemy end end - describe '.all_from_clipboard_for_page' do + describe ".all_from_clipboard_for_page" do let(:element_1) { build_stubbed(:alchemy_element) } - let(:element_2) { build_stubbed(:alchemy_element, name: 'news') } - let(:page) { build_stubbed(:alchemy_page, :public) } - let(:clipboard) { [{'id' => element_1.id.to_s}, {'id' => element_2.id.to_s}] } + let(:element_2) { build_stubbed(:alchemy_element, name: "news") } + let(:page) { build_stubbed(:alchemy_page, :public) } + let(:clipboard) { [{ "id" => element_1.id.to_s }, { "id" => element_2.id.to_s }] } before do allow(Element).to receive(:all_from_clipboard).and_return([element_1, element_2]) @@ -381,61 +381,44 @@ module Alchemy # InstanceMethods - describe '#all_contents_by_type' do + describe "#all_contents_by_type" do let(:element) { create(:alchemy_element, :with_contents) } let(:expected_contents) { element.contents.essence_texts } context "with namespaced essence type" do - subject { element.all_contents_by_type('Alchemy::EssenceText') } + subject { element.all_contents_by_type("Alchemy::EssenceText") } it { is_expected.not_to be_empty } - it('should return the correct list of essences') { is_expected.to eq(expected_contents) } + it("should return the correct list of essences") { is_expected.to eq(expected_contents) } end context "without namespaced essence type" do - subject { element.all_contents_by_type('EssenceText') } + subject { element.all_contents_by_type("EssenceText") } it { is_expected.not_to be_empty } - it('should return the correct list of essences') { is_expected.to eq(expected_contents) } - end - end - - describe '#contents' do - let(:element) { create(:alchemy_element) } - let!(:content1) { create(:alchemy_content, element: element) } - let!(:content2) { create(:alchemy_content, element: element) } - - subject { element.contents } - - before do - content1.update_column(:position, 2) - content2.update_column(:position, 1) - end - - it 'are ordered by position' do - is_expected.to eq([content2, content1]) + it("should return the correct list of essences") { is_expected.to eq(expected_contents) } end end - describe '#content_by_type' do + describe "#content_by_type" do before(:each) do - @element = create(:alchemy_element, name: 'headline') + @element = create(:alchemy_element, name: "headline") @content = @element.contents.first end context "with namespaced essence type" do it "should return content by passing a essence type" do - expect(@element.content_by_type('Alchemy::EssenceText')).to eq(@content) + expect(@element.content_by_type("Alchemy::EssenceText")).to eq(@content) end end context "without namespaced essence type" do it "should return content by passing a essence type" do - expect(@element.content_by_type('EssenceText')).to eq(@content) + expect(@element.content_by_type("EssenceText")).to eq(@content) end end end - describe '#display_name' do - let(:element) { Element.new(name: 'article') } + describe "#display_name" do + let(:element) { Element.new(name: "article") } it "should call .display_name_for" do expect(Element).to receive(:display_name_for).with(element.name) @@ -443,55 +426,56 @@ module Alchemy end end - describe '#essence_errors' do - let(:element) { Element.new(name: 'article') } - let(:content) { Content.new(name: 'headline') } - let(:essence) { EssenceText.new(body: '') } + describe "#essence_errors" do + let(:element) { Element.new(name: "article") } + let(:content) { Content.new(name: "headline") } + let(:essence) { EssenceText.new(body: "") } before do allow(element).to receive(:contents) { [content] } allow(content).to receive(:essence) { essence } allow(content).to receive(:essence_validation_failed?) { true } - allow(essence).to receive(:validation_errors) { 'Cannot be blank' } + allow(essence).to receive(:validation_errors) { "Cannot be blank" } end it "returns hash with essence errors" do - expect(element.essence_errors).to eq({'headline' => 'Cannot be blank'}) + expect(element.essence_errors).to eq({ "headline" => "Cannot be blank" }) end end - describe '#essence_error_messages' do - let(:element) { Element.new(name: 'article') } + describe "#essence_error_messages" do + let(:element) { Element.new(name: "article") } it "should return the translation with the translated content label" do expect(Alchemy).to receive(:t) - .with('content_names.content', default: 'Content') - .and_return('Content') + .with("content_names.content", default: "Content") + .and_return("Content") expect(Alchemy).to receive(:t) - .with('content', scope: "content_names.article", default: 'Content') - .and_return('Contenido') + .with("content", scope: "content_names.article", default: "Content") + .and_return("Contenido") expect(Alchemy).to receive(:t) - .with('article.content.invalid', { - scope: "content_validations", - default: [:"fields.content.invalid", :"errors.invalid"], - field: "Contenido"}) + .with("article.content.invalid", { + scope: "content_validations", + default: [:"fields.content.invalid", :"errors.invalid"], + field: "Contenido", + }) expect(element).to receive(:essence_errors) - .and_return({'content' => [:invalid]}) + .and_return({ "content" => [:invalid] }) element.essence_error_messages end end - describe '#display_name_with_preview_text' do - let(:element) { build_stubbed(:alchemy_element, name: 'Foo') } + describe "#display_name_with_preview_text" do + let(:element) { build_stubbed(:alchemy_element, name: "Foo") } it "returns a string with display name and preview text" do - allow(element).to receive(:preview_text).and_return('Fula') + allow(element).to receive(:preview_text).and_return("Fula") expect(element.display_name_with_preview_text).to eq("Foo: Fula") end end - describe '#dom_id' do + describe "#dom_id" do let(:element) { build_stubbed(:alchemy_element) } it "returns an string from element name and id" do @@ -499,21 +483,21 @@ module Alchemy end end - describe '#preview_text' do + describe "#preview_text" do let(:element) { build_stubbed(:alchemy_element) } let(:content) do - mock_model(Content, preview_text: 'Content 1', preview_content?: false) + mock_model(Content, preview_text: "Content 1", preview_content?: false) end let(:content_2) do - mock_model(Content, preview_text: 'Content 2', preview_content?: false) + mock_model(Content, preview_text: "Content 2", preview_content?: false) end let(:contents) { [] } let(:preview_content) do - mock_model(Content, preview_text: 'Preview Content', preview_content?: true) + mock_model(Content, preview_text: "Preview Content", preview_content?: true) end before do @@ -544,13 +528,13 @@ module Alchemy end end - context 'with nested elements' do + context "with nested elements" do let(:element) do build_stubbed(:alchemy_element, :with_nestable_elements) end let(:nested_element) do - build_stubbed(:alchemy_element, name: 'slide') + build_stubbed(:alchemy_element, name: "slide") end before do @@ -558,24 +542,24 @@ module Alchemy allow(element).to receive(:all_nested_elements) { [nested_element] } end - context 'when parent element has contents' do + context "when parent element has contents" do before do allow(element).to receive(:contents) { [content] } end - it 'returns the preview text from the parent element' do + it "returns the preview text from the parent element" do expect(content).to receive(:preview_text) expect(element.preview_text) end end - context 'when parent element has no contents but nestable element has' do + context "when parent element has no contents but nestable element has" do before do allow(element).to receive(:contents) { [] } allow(nested_element).to receive(:contents) { [content_2] } end - it 'returns the preview text from the first nested element' do + it "returns the preview text from the first nested element" do expect(content_2).to receive(:preview_text) expect(element.preview_text) end @@ -583,56 +567,56 @@ module Alchemy end end - context 'previous and next elements.' do + context "previous and next elements." do let(:page) { create(:alchemy_page, :language_root) } before(:each) do - @element1 = create(:alchemy_element, page: page, name: 'headline') + @element1 = create(:alchemy_element, page: page, name: "headline") @element2 = create(:alchemy_element, page: page) - @element3 = create(:alchemy_element, page: page, name: 'text') + @element3 = create(:alchemy_element, page: page, name: "text") end - describe '#prev' do + describe "#prev" do it "should return previous element on same page" do expect(@element3.prev).to eq(@element2) end context "with name as parameter" do it "should return previous of this kind" do - expect(@element3.prev('headline')).to eq(@element1) + expect(@element3.prev("headline")).to eq(@element1) end end end - describe '#next' do + describe "#next" do it "should return next element on same page" do expect(@element2.next).to eq(@element3) end context "with name as parameter" do it "should return next of this kind" do - expect(@element1.next('text')).to eq(@element3) + expect(@element1.next("text")).to eq(@element3) end end end end - context 'retrieving contents, essences and ingredients' do - let(:element) { create(:alchemy_element, :with_contents, name: 'news') } + context "retrieving contents, essences and ingredients" do + let(:element) { create(:alchemy_element, :with_contents, name: "news") } it "should return an ingredient by name" do - expect(element.ingredient('news_headline')).to eq(EssenceText.first.ingredient) + expect(element.ingredient("news_headline")).to eq(EssenceText.first.ingredient) end it "should return the content for rss title" do - expect(element.content_for_rss_title).to eq(element.contents.find_by_name('news_headline')) + expect(element.content_for_rss_title).to eq(element.contents.find_by_name("news_headline")) end it "should return the content for rss descdefinitionription" do - expect(element.content_for_rss_description).to eq(element.contents.find_by_name('body')) + expect(element.content_for_rss_description).to eq(element.contents.find_by_name("body")) end - context 'if no content is defined as rss title' do + context "if no content is defined as rss title" do before { expect(element).to receive(:content_definitions).and_return([]) } it "should return nil" do @@ -640,7 +624,7 @@ module Alchemy end end - context 'if no content is defined as rss description' do + context "if no content is defined as rss description" do before { expect(element).to receive(:content_definitions).and_return([]) } it "should return nil" do @@ -649,11 +633,11 @@ module Alchemy end end - describe '#update_contents' do + describe "#update_contents" do subject { element.update_contents(params) } - let(:page) { build_stubbed(:alchemy_page) } - let(:element) { build_stubbed(:alchemy_element, page: page) } + let(:page) { build_stubbed(:alchemy_page) } + let(:element) { build_stubbed(:alchemy_element, page: page) } let(:content1) { double(:content, id: 1) } let(:content2) { double(:content, id: 2) } @@ -665,23 +649,23 @@ module Alchemy end context "with valid attributes hash" do - let(:params) { {content1.id.to_s => {body: 'Title'}} } + let(:params) { { content1.id.to_s => { body: "Title" } } } - context 'when certain content is not part of the attributes hash (cause it was not filled by the user)' do + context "when certain content is not part of the attributes hash (cause it was not filled by the user)" do before do allow(element).to receive(:contents).and_return([content1, content2]) end - it 'does not try to update that content' do - expect(content1).to receive(:update_essence).with({body: 'Title'}).and_return(true) + it "does not try to update that content" do + expect(content1).to receive(:update_essence).with({ body: "Title" }).and_return(true) expect(content2).to_not receive(:update_essence) subject end end - context 'with passing validations' do + context "with passing validations" do before do - expect(content1).to receive(:update_essence).with({body: 'Title'}).and_return(true) + expect(content1).to receive(:update_essence).with({ body: "Title" }).and_return(true) end it { is_expected.to be_truthy } @@ -692,9 +676,9 @@ module Alchemy end end - context 'with failing validations' do + context "with failing validations" do it "adds error and returns false" do - expect(content1).to receive(:update_essence).with({body: 'Title'}).and_return(false) + expect(content1).to receive(:update_essence).with({ body: "Title" }).and_return(false) is_expected.to be_falsey expect(element.errors).not_to be_empty end @@ -702,7 +686,7 @@ module Alchemy end end - describe '.after_update' do + describe ".after_update" do let(:element) { create(:alchemy_element, page: page) } let(:page) do @@ -715,7 +699,7 @@ module Alchemy expect { element.save }.to change { page.updated_at } end - context 'with touchable pages' do + context "with touchable pages" do let(:touchable_page) do create(:alchemy_page).tap do |page| page.update_column(:updated_at, 3.hours.ago) @@ -729,14 +713,14 @@ module Alchemy end end - describe '#taggable?' do + describe "#taggable?" do let(:element) { build(:alchemy_element) } context "definition has 'taggable' key with true value" do it "should return true" do expect(element).to receive(:definition).and_return({ - 'name' => 'article', - 'taggable' => true + "name" => "article", + "taggable" => true, }) expect(element.taggable?).to be_truthy end @@ -745,8 +729,8 @@ module Alchemy context "definition has 'taggable' key with foo value" do it "should return false" do expect(element).to receive(:definition).and_return({ - 'name' => 'article', - 'taggable' => 'foo' + "name" => "article", + "taggable" => "foo", }) expect(element.taggable?).to be_falsey end @@ -755,14 +739,14 @@ module Alchemy context "definition has no 'taggable' key" do it "should return false" do expect(element).to receive(:definition).and_return({ - 'name' => 'article' + "name" => "article", }) expect(element.taggable?).to be_falsey end end end - describe '#compact?' do + describe "#compact?" do subject { element.compact? } let(:element) { build(:alchemy_element) } @@ -772,22 +756,22 @@ module Alchemy end context "definition has 'compact' key with true value" do - let(:definition) { {'compact' => true} } + let(:definition) { { "compact" => true } } it { is_expected.to be(true) } end context "definition has 'compact' key with foo value" do - let(:definition) { {'compact' => 'foo'} } + let(:definition) { { "compact" => "foo" } } it { is_expected.to be(false) } end context "definition has no 'compact' key" do - let(:definition) { {'name' => 'article'} } + let(:definition) { { "name" => "article" } } it { is_expected.to be(false) } end end - describe '#trash!' do + describe "#trash!" do let(:element) { create(:alchemy_element) } let(:trashed_element) do @@ -800,7 +784,7 @@ module Alchemy it { is_expected.not_to be_public } it { is_expected.to be_folded } - describe '#position' do + describe "#position" do subject { super().position } it { is_expected.to be_nil } end @@ -826,11 +810,11 @@ module Alchemy describe "#to_partial_path" do it do - expect(Element.new(name: 'article').to_partial_path).to eq('alchemy/elements/article') + expect(Element.new(name: "article").to_partial_path).to eq("alchemy/elements/article") end end - describe '#cache_key' do + describe "#cache_key" do let(:page) { stub_model(Page, published_at: Time.current - 1.week) } let(:element) { stub_model(Element, page: page, updated_at: Time.current) } @@ -862,28 +846,28 @@ module Alchemy subject { element.nestable_elements } - context 'with nestable_elements defined' do + context "with nestable_elements defined" do before do allow(element).to receive(:definition) do { - 'nestable_elements' => %w(news article) + "nestable_elements" => %w(news article), } end end - it 'returns an array containing all available nested element names' do + it "returns an array containing all available nested element names" do is_expected.to eq %w(news article) end end - context 'without nestable_elements defined' do + context "without nestable_elements defined" do before do allow(element).to receive(:definition) do {} end end - it 'returns an empty array' do + it "returns an empty array" do is_expected.to eq [] end end @@ -896,26 +880,26 @@ module Alchemy let!(:element) { create(:alchemy_element, page: page) } let!(:nested_element) { create(:alchemy_element, parent_element: element, page: page) } - it 'returns nested elements' do + it "returns nested elements" do expect(subject).to eq([nested_element]) end - context 'with hidden nested elements' do + context "with hidden nested elements" do let!(:hidden_nested_element) do create(:alchemy_element, parent_element: element, page: page, public: false) end - it 'includes them' do + it "includes them" do expect(subject).to include(hidden_nested_element) end end - context 'with trashed nested elements' do + context "with trashed nested elements" do let!(:trashed_nested_element) do create(:alchemy_element, parent_element: element, page: page).tap(&:trash!) end - it 'does not include them' do + it "does not include them" do expect(subject).to_not include(trashed_nested_element) end end @@ -924,86 +908,86 @@ module Alchemy describe "#nested_elements" do subject { element.nested_elements } - context 'with nestable_elements defined' do + context "with nestable_elements defined" do let!(:page) { create(:alchemy_page) } let!(:element) { create(:alchemy_element, page: page) } let!(:nested_element) { create(:alchemy_element, parent_element: element, page: page) } - it 'returns nested elements' do + it "returns nested elements" do expect(subject).to eq([nested_element]) end - context 'with hidden nested elements' do + context "with hidden nested elements" do let!(:hidden_nested_element) do create(:alchemy_element, parent_element: element, page: page, public: false) end - it 'does not include them' do + it "does not include them" do expect(subject).to eq([nested_element]) end end - context 'with trashed nested elements' do + context "with trashed nested elements" do let!(:hidden_trashed_element) do create(:alchemy_element, parent_element: element, page: page).tap(&:trash!) end - it 'does not include them' do + it "does not include them" do expect(subject).to eq([nested_element]) end end end end - describe '#richtext_contents_ids' do + describe "#richtext_contents_ids" do subject { element.richtext_contents_ids } - let(:element) { create(:alchemy_element, :with_contents, name: 'text') } + let(:element) { create(:alchemy_element, :with_contents, name: "text") } it { is_expected.to eq(element.content_ids) } - context 'for element with nested elements' do + context "for element with nested elements" do let!(:element) do - create(:alchemy_element, :with_contents, name: 'text') + create(:alchemy_element, :with_contents, name: "text") end let!(:nested_element_1) do create(:alchemy_element, :with_contents, { - name: 'text', + name: "text", parent_element: element, - folded: false + folded: false, }) end let!(:nested_element_2) do create(:alchemy_element, :with_contents, { - name: 'text', + name: "text", parent_element: nested_element_1, - folded: false + folded: false, }) end let!(:folded_nested_element_3) do create(:alchemy_element, :with_contents, { - name: 'text', + name: "text", parent_element: nested_element_1, - folded: true + folded: true, }) end - it 'includes all richtext contents from all expanded descendent elements' do + it "includes all richtext contents from all expanded descendent elements" do is_expected.to eq( element.content_ids + nested_element_1.content_ids + - nested_element_2.content_ids + nested_element_2.content_ids, ) end end end - context 'with parent element' do + context "with parent element" do let!(:parent_element) { create(:alchemy_element, :with_nestable_elements) } - let!(:element) { create(:alchemy_element, name: 'slide', parent_element: parent_element) } + let!(:element) { create(:alchemy_element, name: "slide", parent_element: parent_element) } it "touches parent after update" do parent_element.update_column(:updated_at, 3.days.ago) diff --git a/spec/models/alchemy/element_to_page_spec.rb b/spec/models/alchemy/element_to_page_spec.rb index 9c7ca323d5..8f2113194b 100644 --- a/spec/models/alchemy/element_to_page_spec.rb +++ b/spec/models/alchemy/element_to_page_spec.rb @@ -1,14 +1,14 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe ElementToPage do # ClassMethods - describe '.table_name' do + describe ".table_name" do it "should return table name" do - expect(ElementToPage.table_name).to eq('alchemy_elements_alchemy_pages') + expect(ElementToPage.table_name).to eq("alchemy_elements_alchemy_pages") end end end diff --git a/spec/models/alchemy/essence_boolean_spec.rb b/spec/models/alchemy/essence_boolean_spec.rb index d401844c61..239796e59f 100644 --- a/spec/models/alchemy/essence_boolean_spec.rb +++ b/spec/models/alchemy/essence_boolean_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe EssenceBoolean do diff --git a/spec/models/alchemy/essence_date_spec.rb b/spec/models/alchemy/essence_date_spec.rb index 75c6e36f0e..7aaa8eb442 100644 --- a/spec/models/alchemy/essence_date_spec.rb +++ b/spec/models/alchemy/essence_date_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe EssenceDate do @@ -11,7 +11,7 @@ module Alchemy let(:ingredient_value) { Time.current.iso8601 } end - describe '#preview_text' do + describe "#preview_text" do subject { essence.preview_text } context "if no date set" do diff --git a/spec/models/alchemy/essence_file_spec.rb b/spec/models/alchemy/essence_file_spec.rb index 4b55bb47f9..5066d9c70b 100644 --- a/spec/models/alchemy/essence_file_spec.rb +++ b/spec/models/alchemy/essence_file_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe EssenceFile do @@ -12,21 +12,21 @@ module Alchemy let(:ingredient_value) { attachment } end - describe '#attachment_url' do + describe "#attachment_url" do subject { essence.attachment_url } it "returns the download attachment url." do is_expected.to match(/\/attachment\/#{attachment.id}\/download\/#{attachment.urlname}\.#{attachment.suffix}/) end - context 'without attachment assigned' do + context "without attachment assigned" do let(:attachment) { nil } it { is_expected.to be_nil } end end - describe '#preview_text' do + describe "#preview_text" do it "returns the attachment's name as preview text" do expect(essence.preview_text).to eq(attachment.name) end @@ -34,7 +34,7 @@ module Alchemy context "with no attachment assigned" do it "returns empty string" do essence.attachment = nil - expect(essence.preview_text).to eq('') + expect(essence.preview_text).to eq("") end end end diff --git a/spec/models/alchemy/essence_html_spec.rb b/spec/models/alchemy/essence_html_spec.rb index e5c659acda..fd4b0c7494 100644 --- a/spec/models/alchemy/essence_html_spec.rb +++ b/spec/models/alchemy/essence_html_spec.rb @@ -1,19 +1,19 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe EssenceHtml do - let(:essence) { EssenceHtml.new(source: '

      hello!

      ') } + let(:essence) { EssenceHtml.new(source: "

      hello!

      ") } it_behaves_like "an essence" do let(:essence) { EssenceHtml.new } - let(:ingredient_value) { '

      hello!

      ' } + let(:ingredient_value) { "

      hello!

      " } end - describe '#preview_text' do + describe "#preview_text" do it "should return html escaped source code" do - expect(essence.preview_text).to eq('<p>hello!</p>') + expect(essence.preview_text).to eq("<p>hello!</p>") end end end diff --git a/spec/models/alchemy/essence_link_spec.rb b/spec/models/alchemy/essence_link_spec.rb index 088d020f02..3bc8c40ea3 100644 --- a/spec/models/alchemy/essence_link_spec.rb +++ b/spec/models/alchemy/essence_link_spec.rb @@ -1,12 +1,12 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe EssenceLink do it_behaves_like "an essence" do let(:essence) { EssenceLink.new } - let(:ingredient_value) { 'http://alchemy-cms.com' } + let(:ingredient_value) { "http://alchemy-cms.com" } end end end diff --git a/spec/models/alchemy/essence_node_spec.rb b/spec/models/alchemy/essence_node_spec.rb new file mode 100644 index 0000000000..162c3d3785 --- /dev/null +++ b/spec/models/alchemy/essence_node_spec.rb @@ -0,0 +1,23 @@ +# frozen_string_literal: true + +require "rails_helper" + +RSpec.describe Alchemy::EssenceNode, type: :model do + it { is_expected.to belong_to(:ingredient_association).optional.class_name("Alchemy::Node") } + + describe "#ingredient" do + let(:node) { build(:alchemy_node) } + + subject { described_class.new(node: node).ingredient } + + it { is_expected.to eq(node) } + end + + describe "#preview_text" do + let(:node) { build(:alchemy_node) } + + subject { described_class.new(node: node).preview_text } + + it { is_expected.to eq(node.name) } + end +end diff --git a/spec/models/alchemy/essence_page_spec.rb b/spec/models/alchemy/essence_page_spec.rb index 0606e2a88c..8df624f7d7 100644 --- a/spec/models/alchemy/essence_page_spec.rb +++ b/spec/models/alchemy/essence_page_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" RSpec.describe Alchemy::EssencePage, type: :model do let(:essence) { build(:alchemy_essence_page) } @@ -10,52 +10,12 @@ let(:ingredient_value) { page } end - describe 'eager loading' do + describe "eager loading" do let!(:essence_pages) { create_list(:alchemy_essence_page, 2) } - it 'eager loads pages' do + it "eager loads pages" do essences = described_class.all.includes(:ingredient_association) expect(essences[0].association(:ingredient_association)).to be_loaded end end - - describe 'ingredient=' do - subject(:ingredient) { essence.page } - - context 'when String value is only a number' do - let(:value) { '101' } - - before do - essence.ingredient = value - end - - it 'sets page to an page instance with that id' do - is_expected.to be_a(Alchemy::Page) - expect(ingredient.id).to eq(101) - end - end - - context 'when value is an Alchemy Page' do - let(:value) { page } - - before do - essence.ingredient = value - end - - it 'sets page to an page instance with that id' do - is_expected.to be_a(Alchemy::Page) - expect(ingredient).to eq(page) - end - end - - context 'when value is not only a number' do - let(:value) { 'page1' } - - it do - expect { - essence.ingredient = value - }.to raise_error(ActiveRecord::AssociationTypeMismatch) - end - end - end end diff --git a/spec/models/alchemy/essence_picture_spec.rb b/spec/models/alchemy/essence_picture_spec.rb index 204a16c116..a3fdafa5b6 100644 --- a/spec/models/alchemy/essence_picture_spec.rb +++ b/spec/models/alchemy/essence_picture_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe EssencePicture do @@ -9,10 +9,10 @@ module Alchemy let(:ingredient_value) { Picture.new } end - describe 'eager loading' do + describe "eager loading" do let!(:essence_pictures) { create_list(:alchemy_essence_picture, 2) } - it 'eager loads pictures' do + it "eager loads pictures" do essences = described_class.all.includes(:ingredient_association) expect(essences[0].association(:ingredient_association)).to be_loaded end @@ -23,14 +23,14 @@ module Alchemy end it "should not store negative values for crop values" do - essence = EssencePicture.new(crop_from: '-1x100', crop_size: '-20x30') + essence = EssencePicture.new(crop_from: "-1x100", crop_size: "-20x30") essence.save! expect(essence.crop_from).to eq("0x100") expect(essence.crop_size).to eq("0x30") end it "should not store float values for crop values" do - essence = EssencePicture.new(crop_from: '0.05x104.5', crop_size: '99.5x203.4') + essence = EssencePicture.new(crop_from: "0.05x104.5", crop_size: "99.5x203.4") essence.save! expect(essence.crop_from).to eq("0x105") expect(essence.crop_size).to eq("100x203") @@ -49,70 +49,70 @@ module Alchemy expect(essence.caption).to eq("hello
      kitty") end - describe '#picture_url' do + describe "#picture_url" do subject(:picture_url) { essence.picture_url(options) } let(:options) { {} } let(:picture) { create(:alchemy_picture) } let(:essence) { create(:alchemy_essence_picture, :with_content, picture: picture) } - context 'with no format in the options' do + context "with no format in the options" do it "includes the image's default render format." do expect(picture_url).to match(/\.png/) end end - context 'with format in the options' do - let(:options) { {format: 'gif'} } + context "with format in the options" do + let(:options) { {format: "gif"} } it "takes this as format." do expect(picture_url).to match(/\.gif/) end end - context 'when crop sizes are present' do + context "when crop sizes are present" do before do - expect(essence).to receive(:crop_size).and_return('200x200') - expect(essence).to receive(:crop_from).and_return('10x10') + expect(essence).to receive(:crop_size).and_return("200x200") + expect(essence).to receive(:crop_from).and_return("10x10") end it "passes these crop sizes to the picture's url method." do expect(picture).to receive(:url).with( - hash_including(crop_from: '10x10', crop_size: '200x200') + hash_including(crop_from: "10x10", crop_size: "200x200"), ) picture_url end - context 'but with crop sizes in the options' do + context "but with crop sizes in the options" do let(:options) do - {crop_from: '30x30', crop_size: '75x75'} + {crop_from: "30x30", crop_size: "75x75"} end it "passes these crop sizes instead." do expect(picture).to receive(:url).with( - hash_including(crop_from: '30x30', crop_size: '75x75') + hash_including(crop_from: "30x30", crop_size: "75x75"), ) picture_url end end end - context 'with other options' do - let(:options) { {foo: 'baz'} } + context "with other options" do + let(:options) { {foo: "baz"} } - it 'adds them to the url' do + it "adds them to the url" do expect(picture_url).to match /\?foo=baz/ end end - context 'without picture assigned' do + context "without picture assigned" do let(:picture) { nil } it { is_expected.to be_nil } end end - describe '#picture_url_options' do + describe "#picture_url_options" do subject(:picture_url_options) { essence.picture_url_options } let(:picture) { build_stubbed(:alchemy_picture) } @@ -121,27 +121,27 @@ module Alchemy it { is_expected.to be_a(HashWithIndifferentAccess) } it "includes the pictures default render format." do - expect(picture).to receive(:default_render_format) { 'img' } - expect(picture_url_options[:format]).to eq('img') + expect(picture).to receive(:default_render_format) { "img" } + expect(picture_url_options[:format]).to eq("img") end - context 'with crop sizes present' do + context "with crop sizes present" do before do - expect(essence).to receive(:crop_size) { '200x200' } - expect(essence).to receive(:crop_from) { '10x10' } + expect(essence).to receive(:crop_size) { "200x200" } + expect(essence).to receive(:crop_from) { "10x10" } end it "includes these crop sizes.", :aggregate_failures do - expect(picture_url_options[:crop_from]).to eq '10x10' - expect(picture_url_options[:crop_size]).to eq '200x200' + expect(picture_url_options[:crop_from]).to eq "10x10" + expect(picture_url_options[:crop_size]).to eq "200x200" end end # Regression spec for issue #1279 - context 'with crop sizes being empty strings' do + context "with crop sizes being empty strings" do before do - expect(essence).to receive(:crop_size) { '' } - expect(essence).to receive(:crop_from) { '' } + expect(essence).to receive(:crop_size) { "" } + expect(essence).to receive(:crop_from) { "" } end it "does not include these crop sizes.", :aggregate_failures do @@ -150,24 +150,24 @@ module Alchemy end end - context 'with content having size setting' do + context "with content having size setting" do before do - expect(essence.content).to receive(:settings) { {size: '30x70'} } + expect(essence.content).to receive(:settings) { {size: "30x70"} } end it "includes this size." do - expect(picture_url_options[:size]).to eq '30x70' + expect(picture_url_options[:size]).to eq "30x70" end end - context 'without picture assigned' do + context "without picture assigned" do let(:picture) { nil } it { is_expected.to be_a(Hash) } end end - describe '#thumbnail_url' do + describe "#thumbnail_url" do subject(:thumbnail_url) { essence.thumbnail_url } let(:settings) do @@ -200,61 +200,61 @@ module Alchemy thumbnail_url end - context 'when crop sizes are present' do + context "when crop sizes are present" do before do - allow(essence).to receive(:crop_size).and_return('200x200') - allow(essence).to receive(:crop_from).and_return('10x10') + allow(essence).to receive(:crop_size).and_return("200x200") + allow(essence).to receive(:crop_from).and_return("10x10") end it "passes these crop sizes to the picture's url method." do expect(picture).to receive(:url).with( - hash_including(crop_from: '10x10', crop_size: '200x200', crop: true) + hash_including(crop_from: "10x10", crop_size: "200x200", crop: true), ) thumbnail_url end end - context 'when no crop sizes are present' do + context "when no crop sizes are present" do it "it does not pass crop sizes to the picture's url method and disables cropping." do expect(picture).to receive(:url).with( - hash_including(crop_from: nil, crop_size: nil, crop: false) + hash_including(crop_from: nil, crop_size: nil, crop: false), ) thumbnail_url end - context 'when crop is explicitely enabled in the settings' do + context "when crop is explicitely enabled in the settings" do let(:settings) do { crop: true } end it "it enables cropping." do expect(picture).to receive(:url).with( - hash_including(crop: true) + hash_including(crop: true), ) thumbnail_url end end end - context 'without picture assigned' do + context "without picture assigned" do let(:picture) { nil } it { is_expected.to be_nil } end end - describe '#cropping_mask' do + describe "#cropping_mask" do subject { essence.cropping_mask } - context 'with crop values given' do - let(:essence) { build_stubbed(:alchemy_essence_picture, crop_from: '0x0', crop_size: '100x100') } + context "with crop values given" do + let(:essence) { build_stubbed(:alchemy_essence_picture, crop_from: "0x0", crop_size: "100x100") } it "returns a hash containing cropping coordinates" do is_expected.to eq({x1: 0, y1: 0, x2: 100, y2: 100}) end end - context 'with no crop values given' do + context "with no crop values given" do let(:essence) { build_stubbed(:alchemy_essence_picture) } it { is_expected.to be_nil } @@ -350,27 +350,27 @@ module Alchemy it "should return the pictures name as preview text" do allow(essence).to receive(:picture).and_return(picture) - expect(essence.preview_text).to eq('Cute Cat Kittens') + expect(essence.preview_text).to eq("Cute Cat Kittens") end context "with no picture assigned" do it "returns empty string" do - expect(essence.preview_text).to eq('') + expect(essence.preview_text).to eq("") end end end - describe '#serialized_ingredient' do + describe "#serialized_ingredient" do let(:content) do Content.new end let(:picture) do mock_model Picture, - name: 'Cute Cat Kittens', - urlname: 'cute-cat-kittens', - security_token: 'kljhgfd', - default_render_format: 'jpg' + name: "Cute Cat Kittens", + urlname: "cute-cat-kittens", + security_token: "kljhgfd", + default_render_format: "jpg" end let(:essence) do @@ -382,11 +382,11 @@ module Alchemy essence.serialized_ingredient end - context 'with image settings set as content settings' do + context "with image settings set as content settings" do let(:settings) do { - size: '150x150', - format: 'png' + size: "150x150", + format: "png", } end diff --git a/spec/models/alchemy/essence_picture_view_spec.rb b/spec/models/alchemy/essence_picture_view_spec.rb index 4cd33d8b5a..cfc56a5715 100644 --- a/spec/models/alchemy/essence_picture_view_spec.rb +++ b/spec/models/alchemy/essence_picture_view_spec.rb @@ -1,40 +1,40 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" describe Alchemy::EssencePictureView, type: :model do include Capybara::RSpecMatchers let(:image) do - File.new(File.expand_path('../../fixtures/image.png', __dir__)) + File.new(File.expand_path("../../fixtures/image.png", __dir__)) end let(:picture) do stub_model Alchemy::Picture, - image_file_format: 'png', + image_file_format: "png", image_file: image end let(:essence_picture) do stub_model Alchemy::EssencePicture, picture: picture, - caption: 'This is a cute cat' + caption: "This is a cute cat" end let(:content) do stub_model Alchemy::Content, - name: 'image', - essence_type: 'EssencePicture', + name: "image", + essence_type: "EssencePicture", essence: essence_picture end - let(:picture_url) { '/pictures/1/image.png' } + let(:picture_url) { "/pictures/1/image.png" } before do allow(picture).to receive(:url) { picture_url } end - describe 'DEFAULT_OPTIONS' do + describe "DEFAULT_OPTIONS" do it do expect(Alchemy::EssencePictureView::DEFAULT_OPTIONS). to be_a(HashWithIndifferentAccess) @@ -55,12 +55,12 @@ end it "should enclose the image in a
      element" do - expect(view).to have_selector('figure img') + expect(view).to have_selector("figure img") end it "should show the caption" do - expect(view).to have_selector('figure figcaption') - expect(view).to have_content('This is a cute cat') + expect(view).to have_selector("figure figcaption") + expect(view).to have_content("This is a cute cat") end it "does not pass default options to picture url" do @@ -74,12 +74,12 @@ end it "should not enclose the image in a
      element" do - expect(view).to_not have_selector('figure img') + expect(view).to_not have_selector("figure img") end it "should not show the caption" do - expect(view).to_not have_selector('figure figcaption') - expect(view).to_not have_content('This is a cute cat') + expect(view).to_not have_selector("figure figcaption") + expect(view).to_not have_content("This is a cute cat") end end @@ -89,57 +89,57 @@ end it "should not enclose the image in a
      element" do - expect(view).to_not have_selector('figure img') + expect(view).to_not have_selector("figure img") end it "should not show the caption" do - expect(view).to_not have_selector('figure figcaption') - expect(view).to_not have_content('This is a cute cat') + expect(view).to_not have_selector("figure figcaption") + expect(view).to_not have_content("This is a cute cat") end - context 'but enabled in the options hash' do + context "but enabled in the options hash" do let(:options) { {show_caption: true} } it "should enclose the image in a
      element" do - expect(view).to have_selector('figure img') + expect(view).to have_selector("figure img") end it "should show the caption" do - expect(view).to have_selector('figure figcaption') - expect(view).to have_content('This is a cute cat') + expect(view).to have_selector("figure figcaption") + expect(view).to have_content("This is a cute cat") end end end context "and essence with css class" do before do - essence_picture.css_class = 'left' + essence_picture.css_class = "left" end it "should have the class on the
      element" do - expect(view).to have_selector('figure.left img') + expect(view).to have_selector("figure.left img") end it "should not have the class on the element" do - expect(view).not_to have_selector('figure img.left') + expect(view).not_to have_selector("figure img.left") end end context "and css class in the html_options" do before do - html_options[:class] = 'right' + html_options[:class] = "right" end it "should have the class from the html_options on the
      element" do - expect(view).to have_selector('figure.right img') + expect(view).to have_selector("figure.right img") end it "should not have the class from the essence on the
      element" do - expect(view).not_to have_selector('figure.left img') + expect(view).not_to have_selector("figure.left img") end it "should not have the class from the html_options on the element" do - expect(view).not_to have_selector('figure img.right') + expect(view).not_to have_selector("figure img.right") end end end @@ -150,7 +150,7 @@ end subject(:view) do - essence_picture.link = '/home' + essence_picture.link = "/home" Alchemy::EssencePictureView.new(content, options).render end @@ -164,7 +164,7 @@ end it "should not enclose the image in a link tag" do - expect(view).not_to have_selector('a img') + expect(view).not_to have_selector("a img") end end end @@ -199,7 +199,7 @@ [] end - it 'does not pass srcset option to picture_url' do + it "does not pass srcset option to picture_url" do expect(essence_picture).to receive(:picture_url).with({}) { picture_url } view end @@ -209,9 +209,9 @@ %w(1024x768 800x) end - it 'adds srcset attribute including image url and width for each size' do - url1 = essence_picture.picture_url(size: '1024x768') - url2 = essence_picture.picture_url(size: '800x') + it "adds srcset attribute including image url and width for each size" do + url1 = essence_picture.picture_url(size: "1024x768") + url2 = essence_picture.picture_url(size: "800x") expect(view).to have_selector("img[srcset=\"#{url1} 1024w, #{url2} 800w\"]") end @@ -222,9 +222,9 @@ %w(x768 x600) end - it 'adds srcset attribute including image url and height for each size' do - url1 = essence_picture.picture_url(size: 'x768') - url2 = essence_picture.picture_url(size: 'x600') + it "adds srcset attribute including image url and height for each size" do + url1 = essence_picture.picture_url(size: "x768") + url2 = essence_picture.picture_url(size: "x600") expect(view).to have_selector("img[srcset=\"#{url1} 768h, #{url2} 600h\"]") end @@ -236,8 +236,8 @@ Alchemy::EssencePictureView.new(content).render end - it 'image tag has no srcset attribute' do - expect(view).not_to have_selector('img[srcset]') + it "image tag has no srcset attribute" do + expect(view).not_to have_selector("img[srcset]") end end @@ -254,17 +254,17 @@ let(:sizes) do [ - '(max-width: 1023px) 100vh', - '(min-width: 1024px) 33.333vh' + "(max-width: 1023px) 100vh", + "(min-width: 1024px) 33.333vh", ] end - it 'does not pass sizes option to picture_url' do + it "does not pass sizes option to picture_url" do expect(essence_picture).to receive(:picture_url).with({}) { picture_url } view end - it 'adds sizes attribute for each size' do + it "adds sizes attribute for each size" do expect(view).to have_selector("img[sizes=\"#{sizes[0]}, #{sizes[1]}\"]") end end @@ -274,8 +274,8 @@ Alchemy::EssencePictureView.new(content).render end - it 'image tag has no sizes attribute' do - expect(view).not_to have_selector('img[sizes]') + it "image tag has no sizes attribute" do + expect(view).not_to have_selector("img[sizes]") end end end diff --git a/spec/models/alchemy/essence_richtext_spec.rb b/spec/models/alchemy/essence_richtext_spec.rb index e59c9c0bf9..f60fbb43b1 100644 --- a/spec/models/alchemy/essence_richtext_spec.rb +++ b/spec/models/alchemy/essence_richtext_spec.rb @@ -1,16 +1,16 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe EssenceRichtext do let(:essence) do - EssenceRichtext.new(body: '

      Hello!

      Welcome to Peters Petshop.

      ') + EssenceRichtext.new(body: "

      Hello!

      Welcome to Peters Petshop.

      ") end it_behaves_like "an essence" do let(:essence) { EssenceRichtext.new } - let(:ingredient_value) { '

      Hello!

      Welcome to Peters Petshop.

      ' } + let(:ingredient_value) { "

      Hello!

      Welcome to Peters Petshop.

      " } end it "should save a HTML tag free version of body column" do @@ -18,7 +18,7 @@ module Alchemy expect(essence.stripped_body).to eq("Hello!Welcome to Peters Petshop.") end - it 'has tinymce enabled' do + it "has tinymce enabled" do expect(essence.has_tinymce?).to eq(true) end end diff --git a/spec/models/alchemy/essence_select_spec.rb b/spec/models/alchemy/essence_select_spec.rb index 8b66c013eb..7a2e404b69 100644 --- a/spec/models/alchemy/essence_select_spec.rb +++ b/spec/models/alchemy/essence_select_spec.rb @@ -1,12 +1,12 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe EssenceSelect do it_behaves_like "an essence" do let(:essence) { EssenceSelect.new } - let(:ingredient_value) { 'select value' } + let(:ingredient_value) { "select value" } end end end diff --git a/spec/models/alchemy/essence_text_spec.rb b/spec/models/alchemy/essence_text_spec.rb index 12bf061256..d770e4020b 100644 --- a/spec/models/alchemy/essence_text_spec.rb +++ b/spec/models/alchemy/essence_text_spec.rb @@ -1,18 +1,18 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe EssenceText do let(:essence) { EssenceText.new } - let(:ingredient_value) { 'Lorem ipsum' } + let(:ingredient_value) { "Lorem ipsum" } it_behaves_like "an essence" do let(:essence) { EssenceText.new } - let(:ingredient_value) { 'Lorem ipsum' } + let(:ingredient_value) { "Lorem ipsum" } end - describe '#preview_text' do + describe "#preview_text" do before do ingredient_column = essence.ingredient_column essence.send("#{ingredient_column}=", ingredient_value) @@ -30,23 +30,23 @@ module Alchemy context "with another preview_text_column defined" do before do - allow(essence).to receive(:title).and_return('Title column') + allow(essence).to receive(:title).and_return("Title column") allow(essence).to receive(:preview_text_column).and_return(:title) end it "should use this column as preview text method" do - expect(essence.preview_text).to eq('Title column') + expect(essence.preview_text).to eq("Title column") end end end - describe '#open_link_in_new_window?' do + describe "#open_link_in_new_window?" do let(:essence) { EssenceText.new } subject { essence.open_link_in_new_window? } - context 'essence responds to link_taget' do + context "essence responds to link_taget" do context 'if link_target attribute is set to "blank"' do - before { essence.link_target = 'blank' } + before { essence.link_target = "blank" } it "should return true" do expect(subject).to eq(true) @@ -61,47 +61,47 @@ module Alchemy end end - describe 'validations' do - describe 'format' do - context 'given a regex string' do + describe "validations" do + describe "format" do + context "given a regex string" do before do - allow(essence).to receive(:definition).and_return({'validate' => [{'format' => /\Ahttps:\/\/[\S]+/}]}) + allow(essence).to receive(:definition).and_return({"validate" => [{"format" => /\Ahttps:\/\/[\S]+/}]}) end - context 'when ingredient string does not match the given regex' do - before { essence.update(essence.ingredient_column.to_sym => 'http://alchemy-cms.com') } + context "when ingredient string does not match the given regex" do + before { essence.update(essence.ingredient_column.to_sym => "http://alchemy-cms.com") } - it 'should not be valid' do + it "should not be valid" do expect(essence).to_not be_valid end end - context 'when ingredient string matches the given regex' do - before { essence.update(essence.ingredient_column.to_sym => 'https://alchemy-cms.com') } + context "when ingredient string matches the given regex" do + before { essence.update(essence.ingredient_column.to_sym => "https://alchemy-cms.com") } - it 'should be valid' do + it "should be valid" do expect(essence).to be_valid end end end - context 'given a key from the config`s format_matcher list' do + context "given a key from the config`s format_matcher list" do before do - allow(essence).to receive(:definition).and_return({'validate' => [{'format' => 'email'}]}) + allow(essence).to receive(:definition).and_return({"validate" => [{"format" => "email"}]}) end - context 'when ingredient string does not match the given format matcher' do + context "when ingredient string does not match the given format matcher" do before { essence.update(essence.ingredient_column.to_sym => ingredient_value) } - it 'should not be valid' do + it "should not be valid" do expect(essence).to_not be_valid end end - context 'when ingredient string matches the given format matcher' do - before { essence.update(essence.ingredient_column.to_sym => 'email@email.com') } + context "when ingredient string matches the given format matcher" do + before { essence.update(essence.ingredient_column.to_sym => "email@email.com") } - it 'should be valid' do + it "should be valid" do expect(essence).to be_valid end end diff --git a/spec/models/alchemy/folded_page_spec.rb b/spec/models/alchemy/folded_page_spec.rb index 41c8caacd1..49ebef16fd 100644 --- a/spec/models/alchemy/folded_page_spec.rb +++ b/spec/models/alchemy/folded_page_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy class NonArDummyUser; end diff --git a/spec/models/alchemy/language_spec.rb b/spec/models/alchemy/language_spec.rb index 04c9dc4490..40c2d8b945 100644 --- a/spec/models/alchemy/language_spec.rb +++ b/spec/models/alchemy/language_spec.rb @@ -1,50 +1,53 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Language do + it { is_expected.to have_many(:nodes) } + it { is_expected.to have_one(:root_page) } + let(:default_language) { create(:alchemy_language) } let(:language) { create(:alchemy_language, :klingon) } let(:page) { create(:alchemy_page, language: language) } - it 'is valid with uppercase country code' do + it "is valid with uppercase country code" do language = Alchemy::Language.new( - country_code: 'AT', - language_code: 'de', - name: 'Österreich', - frontpage_name: 'Start', - page_layout: 'index', - site: build(:alchemy_site) + country_code: "AT", + language_code: "de", + name: "Österreich", + frontpage_name: "Start", + page_layout: "index", + site: build(:alchemy_site), ) expect(language).to be_valid end it "should return a label for code" do - expect(language.label(:code)).to eq('kl') + expect(language.label(:code)).to eq("kl") end it "should return a label for name" do - expect(language.label(:name)).to eq('Klingon') + expect(language.label(:name)).to eq("Klingon") end context "with language_code and empty country_code" do it "#code should return language locale only" do - language.country_code = '' - expect(language.code).to eq('kl') + language.country_code = "" + expect(language.code).to eq("kl") end context "adding a value for country code" do it "#code should return a joined locale" do - language.country_code = 'cr' - expect(language.code).to eq('kl-cr') + language.country_code = "cr" + expect(language.code).to eq("kl-cr") end it "should update all associated Pages with self.code as value for Page#language_code" do page = create(:alchemy_page, language: language) - language.country_code = 'cr' + language.country_code = "cr" language.save - page.reload; expect(page.language_code).to eq('kl-cr') + page.reload; expect(page.language_code).to eq("kl-cr") end end end @@ -52,8 +55,8 @@ module Alchemy context "with country_code and_language_code" do context "removing the country_code" do it "should update all associated Pages´s language_code with Language#code" do - language = create(:alchemy_language, country_code: 'kl') - language.country_code = '' + language = create(:alchemy_language, country_code: "kl") + language.country_code = "" language.save page.reload; expect(page.language_code).to eq("kl") end @@ -92,13 +95,13 @@ module Alchemy end end - describe '.default' do + describe ".default" do let!(:site_1) do - create(:alchemy_site, host: 'site-one.com') + create(:alchemy_site, host: "site-one.com") end let!(:site_2) do - create(:alchemy_site, host: 'site-two.com') + create(:alchemy_site, host: "site-two.com") end let!(:default_language) do @@ -109,13 +112,13 @@ module Alchemy Language.default end - it 'returns the default language of current site' do + it "returns the default language of current site" do expect(Site).to receive(:current) { site_2 } is_expected.to eq(default_language) end end - describe '.find_by_code' do + describe ".find_by_code" do subject do Language.find_by_code(code) end @@ -142,7 +145,7 @@ module Alchemy let!(:default_site) { create(:alchemy_site, :default) } let!(:current_site) do - create(:alchemy_site, host: 'other.com') + create(:alchemy_site, host: "other.com") end let!(:other_language) do @@ -159,11 +162,11 @@ module Alchemy end end - describe 'validations' do + describe "validations" do let(:language) { Language.new(default: true, public: false) } - describe 'publicity_of_default_language' do - context 'if language is not published' do + describe "publicity_of_default_language" do + context "if language is not published" do it "should add an error to the object" do expect(language.valid?).to eq(false) expect(language.errors.messages).to have_key(:public) @@ -171,8 +174,8 @@ module Alchemy end end - describe 'presence_of_default_language' do - context 'if no default language would exist anymore' do + describe "presence_of_default_language" do + context "if no default language would exist anymore" do before do allow(Language).to receive(:default).and_return(language) allow(language).to receive(:default_changed?).and_return(true) @@ -185,7 +188,7 @@ module Alchemy end end - describe 'before' do + describe "before" do subject do language.valid? language.locale @@ -197,43 +200,43 @@ module Alchemy end end - context 'when locale is already set' do + context "when locale is already set" do let(:language) do - build(:alchemy_language, language_code: 'de', locale: 'de') + build(:alchemy_language, language_code: "de", locale: "de") end - it 'does not set the locale again' do + it "does not set the locale again" do expect(language).to_not receive(:set_locale) end end - context 'when code is an available locale' do + context "when code is an available locale" do let(:language) do - build(:alchemy_language, language_code: 'de', country_code: 'at') + build(:alchemy_language, language_code: "de", country_code: "at") end - it 'sets the locale to code' do - is_expected.to eq('de-at') + it "sets the locale to code" do + is_expected.to eq("de-at") end end - context 'when code is not is an available locale, but language_code is' do + context "when code is not is an available locale, but language_code is" do let(:language) do - build(:alchemy_language, language_code: 'de', country_code: 'ch') + build(:alchemy_language, language_code: "de", country_code: "ch") end - it 'sets the locale to language code' do - is_expected.to eq('de') + it "sets the locale to language code" do + is_expected.to eq("de") end end context "when language_code is an available locale" do let(:language) do - build(:alchemy_language, language_code: 'en') + build(:alchemy_language, language_code: "en") end - it 'sets the locale to language_code' do - is_expected.to eq('en') + it "sets the locale to language_code" do + is_expected.to eq("en") end end @@ -242,13 +245,13 @@ module Alchemy end end - describe 'presence_of_locale_file' do + describe "presence_of_locale_file" do context "when locale file is missing for selected language code" do let(:language) do - build(:alchemy_language, language_code: 'jp') + build(:alchemy_language, language_code: "jp") end - it 'adds errors to locale attribute' do + it "adds errors to locale attribute" do expect(language).to_not be_valid expect(language.errors).to have_key(:locale) end @@ -259,7 +262,7 @@ module Alchemy build(:alchemy_language, :klingon) end - it 'adds no errors to locale attribute' do + it "adds no errors to locale attribute" do expect(language).to be_valid expect(language.errors).to_not have_key(:locale) end @@ -267,9 +270,9 @@ module Alchemy end end - describe '#matching_locales' do + describe "#matching_locales" do let(:language) do - build(:alchemy_language, language_code: 'de') + build(:alchemy_language, language_code: "de") end subject do @@ -277,40 +280,40 @@ module Alchemy end before do - expect(::I18n).to receive(:available_locales) do + expect(::I18n).to receive(:available_locales).twice do [:de, :'de-at', :'en-uk'] end end - it 'returns locales matching the language code' do + it "returns locales matching the language code" do is_expected.to eq [:de, :'de-at'] end - context 'when language code is not is an available locale' do + context "when language code is not is an available locale" do let(:language) do - build(:alchemy_language, language_code: 'jp') + build(:alchemy_language, language_code: "jp") end it { is_expected.to eq [] } end end - describe '#destroy' do + describe "#destroy" do let(:language) { create(:alchemy_language) } subject { language.destroy } - context 'without pages' do - it 'works' do + context "without pages" do + it "works" do subject expect(language.errors[:pages]).to be_empty end end - context 'with pages' do + context "with pages" do let!(:page) { create(:alchemy_page, language: language) } - it 'must not work' do + it "must not work" do subject expect(language.errors[:pages]).to_not be_empty end diff --git a/spec/models/alchemy/legacy_page_url_spec.rb b/spec/models/alchemy/legacy_page_url_spec.rb index 7cff5c84f6..793db0fc54 100644 --- a/spec/models/alchemy/legacy_page_url_spec.rb +++ b/spec/models/alchemy/legacy_page_url_spec.rb @@ -1,23 +1,23 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" describe Alchemy::LegacyPageUrl do let(:page) { build_stubbed(:alchemy_page) } let(:page_url_with_parameters) do - Alchemy::LegacyPageUrl.new(urlname: 'index.php?id=2', page: page) + Alchemy::LegacyPageUrl.new(urlname: "index.php?id=2", page: page) end let(:valid_page_url) do - Alchemy::LegacyPageUrl.new(urlname: 'my/0-work+is-nice_stuff', page: page) + Alchemy::LegacyPageUrl.new(urlname: "my/0-work+is-nice_stuff", page: page) end - it 'is only valid with correct urlname format' do + it "is only valid with correct urlname format" do expect(valid_page_url).to be_valid end - it 'is also valid with get parameters in urlname' do + it "is also valid with get parameters in urlname" do expect(page_url_with_parameters).to be_valid end end diff --git a/spec/models/alchemy/message_spec.rb b/spec/models/alchemy/message_spec.rb index d1bb1b78bc..078289ea46 100644 --- a/spec/models/alchemy/message_spec.rb +++ b/spec/models/alchemy/message_spec.rb @@ -1,15 +1,15 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy - Config.get(:mailer)['fields'].push('email_of_my_boss') - Config.get(:mailer)['validate_fields'].push('email_of_my_boss') + Config.get(:mailer)["fields"].push("email_of_my_boss") + Config.get(:mailer)["validate_fields"].push("email_of_my_boss") describe Message do let(:message) { Message.new } - describe '.config' do + describe ".config" do it "should return the mailer config" do expect(Config).to receive(:get).with(:mailer) Message.config @@ -17,7 +17,7 @@ module Alchemy end it "has attributes writers and getters for all fields defined in mailer config" do - Config.get(:mailer)['fields'].each do |field| + Config.get(:mailer)["fields"].each do |field| expect(message).to respond_to(field) expect(message).to respond_to("#{field}=") end @@ -26,16 +26,16 @@ module Alchemy context "validation of" do context "all fields defined in mailer config" do it "adds errors on that fields" do - Config.get(:mailer)['validate_fields'].each do |field| + Config.get(:mailer)["validate_fields"].each do |field| expect(message).to_not be_valid expect(message.errors[field].size).to eq(1) end end end - context 'field containing email in its name' do + context "field containing email in its name" do context "when field has a value" do - before { message.email_of_my_boss = 'wrong email format' } + before { message.email_of_my_boss = "wrong email format" } it "adds error notice (is invalid) to the field" do expect(message).to_not be_valid @@ -44,7 +44,7 @@ module Alchemy end context "when field is blank" do - before { message.email_of_my_boss = '' } + before { message.email_of_my_boss = "" } it "adds error notice (can't be blank) to the field" do expect(message).to_not be_valid diff --git a/spec/models/alchemy/node_spec.rb b/spec/models/alchemy/node_spec.rb index 1cbdc3b938..c74bc6aeb0 100644 --- a/spec/models/alchemy/node_spec.rb +++ b/spec/models/alchemy/node_spec.rb @@ -1,24 +1,27 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Node do + it { is_expected.to have_many(:essence_nodes) } + it { is_expected.to respond_to(:menu_type) } + it "is only valid with language and name given" do expect(Node.new).to be_invalid expect(build(:alchemy_node)).to be_valid end - describe '.language_root_nodes' do - context 'with no current language present' do + describe ".language_root_nodes" do + context "with no current language present" do before { expect(Language).to receive(:current) { nil } } it "raises error if no current language is set" do - expect { Node.language_root_nodes }.to raise_error('No language found') + expect { Node.language_root_nodes }.to raise_error("No language found") end end - context 'with current language present' do + context "with current language present" do let!(:root_node) { create(:alchemy_node) } let!(:child_node) { create(:alchemy_node, parent_id: root_node.id) } @@ -29,34 +32,34 @@ module Alchemy end end - describe '.available_menu_names' do + describe ".available_menu_names" do subject { described_class.available_menu_names } - it { is_expected.to contain_exactly('main_menu', 'footer_menu') } + it { is_expected.to contain_exactly("main_menu", "footer_menu") } end - describe '#url' do - it 'is valid with leading slash' do - expect(build(:alchemy_node, url: '/something')).to be_valid + describe "#url" do + it "is valid with leading slash" do + expect(build(:alchemy_node, url: "/something")).to be_valid end - it 'is invalid without leading slash' do - expect(build(:alchemy_node, url: 'something')).to be_invalid + it "is invalid without leading slash" do + expect(build(:alchemy_node, url: "something")).to be_invalid end - it 'is valid with leading protocol scheme' do - expect(build(:alchemy_node, url: 'i2+ts-z.app:widget.io')).to be_valid + it "is valid with leading protocol scheme" do + expect(build(:alchemy_node, url: "i2+ts-z.app:widget.io")).to be_valid end - context 'with page attached' do + context "with page attached" do let(:node) { create(:alchemy_node, :with_page) } it "returns the url from page" do expect(node.url).to eq("/#{node.page.urlname}") end - context 'and with url set' do - let(:node) { build(:alchemy_node, :with_page, url: 'http://google.com') } + context "and with url set" do + let(:node) { build(:alchemy_node, :with_page, url: "http://google.com") } it "still returns the url from the page" do expect(node.url).to eq("/#{node.page.urlname}") @@ -64,14 +67,14 @@ module Alchemy end end - context 'without page attached' do - let(:node) { build(:alchemy_node, url: 'http://google.com') } + context "without page attached" do + let(:node) { build(:alchemy_node, url: "http://google.com") } it "returns the url from url attribute" do - expect(node.url).to eq('http://google.com') + expect(node.url).to eq("http://google.com") end - context 'and without url set' do + context "and without url set" do let(:node) { build(:alchemy_node) } it do @@ -81,45 +84,69 @@ module Alchemy end end - describe '#name' do - context 'with page attached' do - let(:node) { build_stubbed(:alchemy_node, :with_page) } + describe "#name" do + subject { node.name } + + let(:parent) { build_stubbed(:alchemy_node) } + context "with page attached" do + let(:node) { build_stubbed(:alchemy_node, :with_page, parent: parent) } it "returns the name from page" do expect(node.name).to eq(node.page.name) end - context 'but with name set' do - let(:node) { build_stubbed(:alchemy_node, :with_page, name: 'Google') } + context "but with name set" do + let(:node) { build_stubbed(:alchemy_node, :with_page, name: "Google", parent: parent) } it "still returns the name from name attribute" do - expect(node.name).to eq('Google') + expect(node.name).to eq("Google") end end end - context 'without page attached' do - let(:node) { build_stubbed(:alchemy_node, name: 'Google') } + context "without page attached" do + let(:node) { build_stubbed(:alchemy_node, name: "Google") } it "returns the name from name attribute" do - expect(node.name).to eq('Google') + expect(node.name).to eq("Google") end end end - describe '#to_partial_path' do - let(:node) { build(:alchemy_node, name: 'Main Menu') } + describe "#to_partial_path" do + let(:node) { build(:alchemy_node, name: "Main Menu") } - it 'returns the path to the menu wrapper partial' do - expect(node.to_partial_path).to eq('alchemy/menus/main_menu/wrapper') + it "returns the path to the menu wrapper partial" do + expect(node.to_partial_path).to eq("alchemy/menus/main_menu/node") end end + end - describe '#view_folder_name' do - let(:node) { build(:alchemy_node, name: 'Main Menu') } + describe "#destroy" do + context "if there are essence nodes present" do + let(:node) { create(:alchemy_node) } + let(:page) { create(:alchemy_page, :layoutpage, page_layout: :footer) } + let(:element) { create(:alchemy_element, name: "menu", page: page) } + let(:content) { create(:alchemy_content, name: "menu", element: element) } + + before do + node.essence_nodes.create(content: content) + end - it 'returns the path to the menu view folder' do - expect(node.view_folder_name).to eq('alchemy/menus/main_menu') + it "does not destroy the node but adds an error" do + node.destroy + expect(node).not_to be_destroyed + expect(node.errors.full_messages).to eq(["This menu item is in use inside an Alchemy element on the following pages: #{page.name}."]) + end + + context "if there are essence nodes present on a child node" do + let!(:parent_node) { create(:alchemy_node, children: [node]) } + + it "does not destroy the node and children either but adds an error" do + parent_node.reload.destroy + expect(parent_node).not_to be_destroyed + expect(parent_node.errors.full_messages).to eq(["This menu item is in use inside an Alchemy element on the following pages: #{page.name}."]) + end end end end diff --git a/spec/models/alchemy/page/fixed_attributes_spec.rb b/spec/models/alchemy/page/fixed_attributes_spec.rb index 6f4d4bb29f..6685a648bc 100644 --- a/spec/models/alchemy/page/fixed_attributes_spec.rb +++ b/spec/models/alchemy/page/fixed_attributes_spec.rb @@ -1,59 +1,59 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" RSpec.describe Alchemy::Page::FixedAttributes do let(:page) { Alchemy::Page.new } let(:definition_with_fixed_attributes) do { - 'name' => 'foo', - 'fixed_attributes' => { - name: 'Home' - } + "name" => "foo", + "fixed_attributes" => { + name: "Home", + }, } end let(:definition_without_fixed_attributes) do { - 'name' => 'foo' + "name" => "foo", } end - describe '#all' do - it 'is an alias to attributes' do + describe "#all" do + it "is an alias to attributes" do described_class.new(page).attributes == described_class.new(page).all end end - describe '#attributes' do + describe "#attributes" do subject(:attributes) do described_class.new(page).attributes end - it 'returns empty hash' do + it "returns empty hash" do expect(attributes).to eq({}) end - context 'with page having fixed_attributes defined' do + context "with page having fixed_attributes defined" do before do allow(page).to receive(:definition) do definition_with_fixed_attributes end end - it 'returns fixed attributes from page definition' do - expect(attributes).to eq({name: 'Home'}) + it "returns fixed attributes from page definition" do + expect(attributes).to eq({name: "Home"}) end end end - describe '#any?' do + describe "#any?" do subject(:any?) do described_class.new(page).any? end - context 'when fixed attributes are defined' do + context "when fixed attributes are defined" do before do allow(page).to receive(:definition) do definition_with_fixed_attributes @@ -63,7 +63,7 @@ it { is_expected.to eq(true) } end - context 'when fixed attributes are not defined' do + context "when fixed attributes are not defined" do before do allow(page).to receive(:definition) do definition_without_fixed_attributes @@ -73,29 +73,29 @@ it { is_expected.to eq(false) } end - it 'has a `present?` alias' do + it "has a `present?` alias" do described_class.new(page).any? == described_class.new(page).present? end end - describe '#fixed?' do + describe "#fixed?" do subject(:fixed?) do described_class.new(page).fixed?(name) end - context 'with nil given as name' do + context "with nil given as name" do let(:name) { nil } it { is_expected.to eq(false) } end - context 'with name not defined as fixed attribute' do - let(:name) { 'lol' } + context "with name not defined as fixed attribute" do + let(:name) { "lol" } it { is_expected.to eq(false) } end - context 'with name defined as fixed attribute' do + context "with name defined as fixed attribute" do let(:name) { :name } before do @@ -108,24 +108,24 @@ end end - describe '#[]' do + describe "#[]" do subject(:fetch) do described_class.new(page)[name] end - context 'with nil given as name' do + context "with nil given as name" do let(:name) { nil } it { is_expected.to be(nil) } end - context 'with name not defined as fixed attribute' do - let(:name) { 'lol' } + context "with name not defined as fixed attribute" do + let(:name) { "lol" } it { is_expected.to be(nil) } end - context 'with name defined as fixed attribute' do + context "with name defined as fixed attribute" do let(:name) { :name } before do @@ -134,8 +134,8 @@ end end - it 'returns the value' do - is_expected.to eq('Home') + it "returns the value" do + is_expected.to eq("Home") end end end diff --git a/spec/models/alchemy/page/url_path_spec.rb b/spec/models/alchemy/page/url_path_spec.rb new file mode 100644 index 0000000000..7e1e1fdf0d --- /dev/null +++ b/spec/models/alchemy/page/url_path_spec.rb @@ -0,0 +1,68 @@ +# frozen_string_literal: true + +require "rails_helper" + +RSpec.describe Alchemy::Page::UrlPath do + subject(:url) { described_class.new(page).call } + + let(:site) { create(:alchemy_site) } + + context "on a single language site" do + context "for the language root page" do + let(:page) { create(:alchemy_page, :language_root) } + + it { is_expected.to eq("/") } + end + + context "for a regular page" do + let(:page) { create(:alchemy_page) } + + it { is_expected.to eq("/#{page.urlname}") } + end + end + + context "on a multi language site" do + let!(:default_language) { create(:alchemy_language, site: site) } + let!(:language) { create(:alchemy_language, :klingon, site: site) } + + context "for the language root page" do + context "and page having the default language" do + let(:page) do + create(:alchemy_page, :language_root, language: default_language) + end + + it { is_expected.to eq("/") } + end + + context "and page having a non-default language" do + let(:page) do + create(:alchemy_page, :language_root, language: language) + end + + it do + is_expected.to eq("/#{page.language_code}") + end + end + end + + context "for a regular page" do + context "and page having the default language" do + let(:page) do + create(:alchemy_page, language: default_language) + end + + it { is_expected.to eq("/#{page.urlname}") } + end + + context "and page having a non-default language" do + let(:page) do + create(:alchemy_page, language: language) + end + + it do + is_expected.to eq("/#{page.language_code}/#{page.urlname}") + end + end + end + end +end diff --git a/spec/models/alchemy/page_spec.rb b/spec/models/alchemy/page_spec.rb index 49c9b0d8e1..4bae635e31 100644 --- a/spec/models/alchemy/page_spec.rb +++ b/spec/models/alchemy/page_spec.rb @@ -1,26 +1,25 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Page do - let(:rootpage) { Page.root } - let(:language) { create(:alchemy_language, :english, default: true) } - let(:klingon) { create(:alchemy_language, :klingon) } + let(:language) { create(:alchemy_language, :german, default: true) } + let(:klingon) { create(:alchemy_language, :klingon) } let(:language_root) { create(:alchemy_page, :language_root) } - let(:page) { mock_model(Page, page_layout: 'foo') } - let(:public_page) { create(:alchemy_page, :public) } - let(:news_page) { create(:alchemy_page, :public, page_layout: 'news', autogenerate_elements: true) } + let(:page) { mock_model(Page, page_layout: "foo") } + let(:public_page) { create(:alchemy_page, :public) } + let(:news_page) { create(:alchemy_page, :public, page_layout: "news", autogenerate_elements: true) } it { is_expected.to have_one(:site) } # Validations - context 'validations' do + context "validations" do context "Creating a normal content page" do - let(:contentpage) { build(:alchemy_page) } - let(:with_same_urlname) { create(:alchemy_page, urlname: "existing_twice") } - let(:global_with_same_urlname) { create(:alchemy_page, urlname: "existing_twice", layoutpage: true) } + let(:contentpage) { build(:alchemy_page) } + let(:with_same_urlname) { create(:alchemy_page, urlname: "existing_twice") } + let(:global_with_same_urlname) { create(:alchemy_page, :layoutpage, urlname: "existing_twice") } context "when its urlname exists as global page" do before { global_with_same_urlname } @@ -31,79 +30,53 @@ module Alchemy end end - it "should validate the page_layout" do - contentpage.page_layout = nil - expect(contentpage).not_to be_valid - contentpage.valid? - expect(contentpage.errors[:page_layout].size).to eq(1) - end - - it "should validate the parent_id" do - contentpage.parent_id = nil - expect(contentpage).not_to be_valid - contentpage.valid? - expect(contentpage.errors[:parent_id].size).to eq(1) - end - - context 'with page having same urlname' do + context "with page having same urlname" do before { with_same_urlname } it "should not be valid" do - contentpage.urlname = 'existing_twice' + contentpage.urlname = "existing_twice" expect(contentpage).not_to be_valid end - end - context "with url_nesting set to true" do - let(:other_parent) { create(:alchemy_page, parent_id: Page.root.id, visible: true) } - - before do - stub_alchemy_config(:url_nesting, true) - with_same_urlname - end - - it "should only validate urlname dependent of parent" do - contentpage.urlname = 'existing_twice' - contentpage.parent_id = other_parent.id - expect(contentpage).to be_valid - end + context "with another parent" do + let(:other_parent) { create(:alchemy_page) } - it "should validate urlname dependent of parent" do - contentpage.urlname = 'existing_twice' - expect(contentpage).not_to be_valid + it "should be valid" do + contentpage.urlname = "existing_twice" + contentpage.parent = other_parent + expect(contentpage).to be_valid + end end end end - context "creating the rootpage without parent_id and page_layout" do - let(:rootpage) { build(:alchemy_page, parent_id: nil, page_layout: nil, name: 'Rootpage') } + context "a page not being a language_root and without parent" do + let(:page) { build(:alchemy_page, parent: nil, layoutpage: false) } - before do - Page.delete_all - end + it { expect(page).to_not be_valid } + end - it "should be valid" do - expect(rootpage).to be_valid - end + context "a page being a language_root and without parent" do + let(:page) { build(:alchemy_page, parent: nil, layoutpage: true) } + + it { expect(page).to be_valid } end - context "saving a systempage" do - let(:systempage) { build(:alchemy_page, :system) } + context "a page without page_layout" do + let(:page) { build(:alchemy_page, page_layout: nil) } - it "should not validate the page_layout" do - expect(systempage).to be_valid - end + it { expect(page).to_not be_valid } end end # Callbacks - context 'callbacks' do + context "callbacks" do let(:page) do - create(:alchemy_page, name: 'My Testpage', language: language, parent_id: language_root.id) + create(:alchemy_page, name: "My Testpage", language: language, parent: language_root) end - context 'before_save' do + context "before_save" do it "should not set the title automatically if the name changed but title is not blank" do page.name = "My Renaming Test" page.save; page.reload @@ -117,29 +90,29 @@ module Alchemy end end - context 'after_update' do + context "after_update" do context "urlname has changed" do it "should store legacy url" do - page.urlname = 'new-urlname' + page.urlname = "new-urlname" page.save! expect(page.legacy_urls).not_to be_empty - expect(page.legacy_urls.first.urlname).to eq('my-testpage') + expect(page.legacy_urls.first.urlname).to eq("my-testpage") end it "should not store legacy url twice for same urlname" do - page.urlname = 'new-urlname' + page.urlname = "new-urlname" page.save! - page.urlname = 'my-testpage' + page.urlname = "my-testpage" page.save! - page.urlname = 'another-urlname' + page.urlname = "another-urlname" page.save! - expect(page.legacy_urls.select { |u| u.urlname == 'my-testpage' }.size).to eq(1) + expect(page.legacy_urls.select { |u| u.urlname == "my-testpage" }.size).to eq(1) end end context "urlname has not changed" do it "should not store a legacy url" do - page.urlname = 'my-testpage' + page.urlname = "my-testpage" page.save! expect(page.legacy_urls).to be_empty end @@ -187,15 +160,15 @@ module Alchemy end end - context 'after_move' do - let(:parent_1) { create(:alchemy_page, name: 'Parent 1', visible: true) } - let(:parent_2) { create(:alchemy_page, name: 'Parent 2', visible: true) } - let(:page) { create(:alchemy_page, parent_id: parent_1.id, name: 'Page', visible: true) } + context "after_move" do + let(:parent_1) { create(:alchemy_page, name: "Parent 1") } + let(:parent_2) { create(:alchemy_page, name: "Parent 2") } + let(:page) { create(:alchemy_page, parent: parent_1, name: "Page") } it "updates the urlname" do - expect(page.urlname).to eq('parent-1/page') + expect(page.urlname).to eq("parent-1/page") page.move_to_child_of parent_2 - expect(page.urlname).to eq('parent-2/page') + expect(page.urlname).to eq("parent-2/page") end end @@ -214,21 +187,21 @@ module Alchemy expect(page.elements).not_to be_empty end - context 'with elements already on the page' do + context "with elements already on the page" do before do - page.elements << create(:alchemy_element, name: 'header') + page.elements << create(:alchemy_element, name: "header") end it "does not autogenerate" do page.save! - expect(page.elements.select { |e| e.name == 'header' }.length).to eq(1) + expect(page.elements.select { |e| e.name == "header" }.length).to eq(1) end end context "with children getting restricted set to true" do before do page.save - @child1 = create(:alchemy_page, name: 'Child 1', parent_id: page.id) + @child1 = create(:alchemy_page, name: "Child 1", parent: page) page.reload page.restricted = true page.save @@ -240,15 +213,16 @@ module Alchemy end end - context "with restricted parent gets created" do + context "with restricted parent" do + let(:new_page) { create(:alchemy_page, name: "New Page", parent: page) } + before do page.save - page.parent.update!(restricted: true) - @new_page = create(:alchemy_page, name: 'New Page', parent_id: page.id) + page.update!(restricted: true) end - it "is also be restricted" do - expect(@new_page.restricted?).to be_truthy + it "child is also restricted" do + expect(new_page.restricted?).to be_truthy end end @@ -264,39 +238,27 @@ module Alchemy end end - context "Creating a systempage" do - let!(:page) { create(:alchemy_page, :system) } - - it "does not get the language code from language" do - expect(page.language_code).to be_nil - end - - it "does not autogenerate the elements" do - expect(page.elements).to be_empty - end - end - context "after changing the page layout" do - let(:news_element) { news_page.elements.find_by(name: 'news') } + let(:news_element) { news_page.elements.find_by(name: "news") } it "all elements not allowed on this page should be trashed" do expect(news_page.trashed_elements).to be_empty - news_page.update(page_layout: 'standard') + news_page.update(page_layout: "standard") trashed = news_page.trashed_elements.pluck(:name) - expect(trashed).to eq(['news']) - expect(trashed).to_not include('article', 'header') + expect(trashed).to eq(["news"]) + expect(trashed).to_not include("article", "header") end it "should autogenerate elements" do - news_page.update(page_layout: 'contact') - expect(news_page.elements.pluck(:name)).to include('contactform') + news_page.update(page_layout: "contact") + expect(news_page.elements.pluck(:name)).to include("contactform") end end - context 'destruction' do + context "destruction" do let!(:page) { create(:alchemy_page, autogenerate_elements: true) } - it 'destroys elements along with itself' do + it "destroys elements along with itself" do expect { page.destroy! }.to change(Alchemy::Element, :count).from(3).to(0) end end @@ -304,14 +266,14 @@ module Alchemy # ClassMethods (a-z) - describe '.all_from_clipboard_for_select' do + describe ".all_from_clipboard_for_select" do context "with clipboard holding pages having non unique page layout" do it "should return the pages" do page_1 = create(:alchemy_page, language: language) - page_2 = create(:alchemy_page, language: language, name: 'Another page') + page_2 = create(:alchemy_page, language: language, name: "Another page") clipboard = [ - {'id' => page_1.id.to_s, 'action' => 'copy'}, - {'id' => page_2.id.to_s, 'action' => 'copy'} + { "id" => page_1.id.to_s, "action" => "copy" }, + { "id" => page_2.id.to_s, "action" => "copy" }, ] expect(Page.all_from_clipboard_for_select(clipboard, language.id)).to include(page_1, page_2) end @@ -319,9 +281,9 @@ module Alchemy context "with clipboard holding a page having unique page layout" do it "should not return any pages" do - page_1 = create(:alchemy_page, language: language, page_layout: 'contact') + page_1 = create(:alchemy_page, language: language, page_layout: "contact") clipboard = [ - {'id' => page_1.id.to_s, 'action' => 'copy'} + { "id" => page_1.id.to_s, "action" => "copy" }, ] expect(Page.all_from_clipboard_for_select(clipboard, language.id)).to eq([]) end @@ -329,32 +291,34 @@ module Alchemy context "with clipboard holding two pages. One having a unique page layout." do it "should return one page" do - page_1 = create(:alchemy_page, language: language, page_layout: 'standard') - page_2 = create(:alchemy_page, name: 'Another page', language: language, page_layout: 'contact') + page_1 = create(:alchemy_page, language: language, page_layout: "standard") + page_2 = create(:alchemy_page, name: "Another page", language: language, page_layout: "contact") clipboard = [ - {'id' => page_1.id.to_s, 'action' => 'copy'}, - {'id' => page_2.id.to_s, 'action' => 'copy'} + { "id" => page_1.id.to_s, "action" => "copy" }, + { "id" => page_2.id.to_s, "action" => "copy" }, ] expect(Page.all_from_clipboard_for_select(clipboard, language.id)).to eq([page_1]) end end end - describe '.locked' do - it "should return 1 page that is blocked by a user at the moment" do - create(:alchemy_page, :public, :locked, name: 'First Public Child', parent_id: language_root.id, language: language) - expect(Page.locked.size).to eq(1) + describe ".locked" do + let!(:locked_page) { create(:alchemy_page, :locked) } + + subject { Page.locked } + + it "returns pages that are locked by a user" do + is_expected.to include(locked_page) end end - describe '.locked_by' do + describe ".locked_by" do let(:user) { double(:user, id: 1, class: DummyUser) } before do create(:alchemy_page, :public, :locked, locked_by: 53) # This page must not be part of the collection - allow(user.class) - .to receive(:primary_key) - .and_return('id') + allow(user.class).to receive(:primary_key) + .and_return("id") end it "should return the correct page collection blocked by a certain user" do @@ -362,13 +326,12 @@ module Alchemy expect(Page.locked_by(user).pluck(:id)).to eq([page.id]) end - context 'with user class having a different primary key' do + context "with user class having a different primary key" do let(:user) { double(:user, user_id: 123, class: DummyUser) } before do - allow(user.class) - .to receive(:primary_key) - .and_return('user_id') + allow(user.class).to receive(:primary_key) + .and_return("user_id") end it "should return the correct page collection blocked by a certain user" do @@ -378,77 +341,45 @@ module Alchemy end end - describe '.ancestors_for' do - let(:lang_root) { Page.language_root_for(Language.default.id) } - let(:parent) { create(:alchemy_page, :public) } - let(:page) { create(:alchemy_page, :public, parent_id: parent.id) } - - it "returns an array of all parents including self" do - expect(Page.ancestors_for(page)).to eq([lang_root, parent, page]) - end - - it "does not include the root page" do - expect(Page.ancestors_for(page)).not_to include(Page.root) - end - - context "with current page nil" do - it "should return an empty array" do - expect(Page.ancestors_for(nil)).to eq([]) - end - end - end - - describe '.contentpages' do - let!(:layoutroot) do - Page.find_or_create_layout_root_for(klingon.id) - end - + describe ".contentpages" do let!(:layoutpage) do - create :alchemy_page, :public, { - name: 'layoutpage', - layoutpage: true, - parent_id: layoutroot.id, - language: klingon + create :alchemy_page, :layoutpage, { + name: "layoutpage", + language: klingon, } end let!(:klingon_lang_root) do create :alchemy_page, :language_root, { - name: 'klingon_lang_root', - layoutpage: nil, - language: klingon + name: "klingon_lang_root", + language: klingon, } end let!(:contentpage) do - create :alchemy_page, :public, { - name: 'contentpage', - parent_id: language_root.id, - language: language + create :alchemy_page, { + name: "contentpage", + parent: language_root, } end + subject { Page.contentpages } + it "returns a collection of contentpages" do - expect(Page.contentpages.to_a).to include( + is_expected.to include( language_root, klingon_lang_root, - contentpage + contentpage, ) end - it "does not contain pages with attribute :layoutpage set to true" do - expect(Page.contentpages.to_a.select { |p| p.layoutpage == true }).to be_empty - end - - it "contains pages with attribute :layoutpage set to nil" do - expect(Page.contentpages.to_a.select do |page| - page.layoutpage.nil? - end).to include(klingon_lang_root) + it "does not contain layout pages" do + is_expected.to_not include(layoutpage) end end - describe '.copy' do - let(:page) { create(:alchemy_page, name: 'Source') } + describe ".copy" do + let(:page) { create(:alchemy_page, name: "Source") } subject { Page.copy(page) } @@ -456,16 +387,8 @@ module Alchemy expect(subject.name).to eq("#{page.name} (Copy)") end - context 'a visible page' do - let(:page) { create(:alchemy_page, name: 'Source', visible: true) } - - it "the copy should not be visible" do - expect(subject.visible).to be(false) - end - end - - context 'a public page' do - let(:page) { create(:alchemy_page, :public, name: 'Source', public_until: Time.current) } + context "a public page" do + let(:page) { create(:alchemy_page, :public, name: "Source", public_until: Time.current) } it "the copy should not be public" do expect(subject.public_on).to be(nil) @@ -473,9 +396,9 @@ module Alchemy end end - context 'a locked page' do + context "a locked page" do let(:page) do - create(:alchemy_page, :public, :locked, name: 'Source') + create(:alchemy_page, :public, :locked, name: "Source") end it "the copy should not be locked" do @@ -486,7 +409,7 @@ module Alchemy context "page with tags" do before do - page.tag_list = 'red, yellow' + page.tag_list = "red, yellow" page.save! end @@ -529,9 +452,9 @@ module Alchemy before do page = create(:alchemy_page) allow(page).to receive(:definition).and_return({ - 'name' => 'standard', - 'elements' => ['headline'], - 'autogenerate' => ['headline'] + "name" => "standard", + "elements" => ["headline"], + "autogenerate" => ["headline"], }) end @@ -541,149 +464,121 @@ module Alchemy end context "with different page name given" do - subject { Page.copy(page, {name: 'Different name'}) } + subject { Page.copy(page, { name: "Different name" }) } it "should take this name" do - expect(subject.name).to eq('Different name') + expect(subject.name).to eq("Different name") end end end - describe '.create' do + describe ".create" do context "before/after filter" do it "should automatically set the title from its name" do - page = create(:alchemy_page, name: 'My Testpage', language: language, parent_id: language_root.id) - expect(page.title).to eq('My Testpage') + page = create(:alchemy_page, name: "My Testpage", language: language, parent: language_root) + expect(page.title).to eq("My Testpage") end it "should get a webfriendly urlname" do - page = create(:alchemy_page, name: 'klingon$&stößel ', language: language, parent_id: language_root.id) - expect(page.urlname).to eq('klingon-stoessel') + page = create(:alchemy_page, name: "klingon$&stößel ", language: language, parent: language_root) + expect(page.urlname).to eq("klingon-stoessel") end context "with no name set" do it "should not set a urlname" do - page = Page.create(name: '', language: language, parent_id: language_root.id) + page = Page.create(name: "", language: language, parent: language_root) expect(page.urlname).to be_blank end end it "should generate a three letter urlname from two letter name" do - page = create(:alchemy_page, name: 'Au', language: language, parent_id: language_root.id) - expect(page.urlname).to eq('-au') + page = create(:alchemy_page, name: "Au", language: language, parent: language_root) + expect(page.urlname).to eq("-au") end it "should generate a three letter urlname from two letter name with umlaut" do - page = create(:alchemy_page, name: 'Aü', language: language, parent_id: language_root.id) - expect(page.urlname).to eq('aue') + page = create(:alchemy_page, name: "Aü", language: language, parent: language_root) + expect(page.urlname).to eq("aue") end it "should generate a three letter urlname from one letter name" do - page = create(:alchemy_page, name: 'A', language: language, parent_id: language_root.id) - expect(page.urlname).to eq('--a') + page = create(:alchemy_page, name: "A", language: language, parent: language_root) + expect(page.urlname).to eq("--a") end it "should add a user stamper" do - page = create(:alchemy_page, name: 'A', language: language, parent_id: language_root.id) - expect(page.class.stamper_class.to_s).to eq('DummyUser') + page = create(:alchemy_page, name: "A", language: language, parent: language_root) + expect(page.class.stamper_class.to_s).to eq("DummyUser") end - context "with language given" do - it "does not set the language from parent" do - expect_any_instance_of(Page).not_to receive(:set_language_from_parent_or_default) - Page.create!(name: 'A', parent_id: language_root.id, page_layout: 'standard', language: language) - end - end + context "with language already given" do + let(:page) { create(:alchemy_page, parent: language_root, language: language_root.language) } - context "with no language given" do - it "sets the language from parent" do - expect_any_instance_of(Page).to receive(:set_language_from_parent_or_default) - Page.create!(name: 'A', parent_id: language_root.id, page_layout: 'standard') + it "does not set the language again" do + expect(page).not_to receive(:set_language) + page end end - end - end - describe '.find_or_create_layout_root_for' do - subject { Page.find_or_create_layout_root_for(language.id) } - - let!(:root_page) { create(:alchemy_page, :root) } - let(:language) { create(:alchemy_language, name: 'English') } + context "with no language given" do + context "with parent given" do + let!(:page) { create(:alchemy_page, parent: language_root, language: nil) } - context 'if no layout root page for given language id is present' do - it "creates one" do - expect { - subject - }.to change { Page.count }.by(1) - end - end + it "sets the language from parent" do + expect(page.language).to eq(language_root.language) + end + end - context 'if layout root page for given language id is present' do - let!(:page) do - create :alchemy_page, - layoutpage: true, - parent_id: root_page.id, - language_id: language.id - end + context "with no parent given" do + let!(:current_language) { create(:alchemy_language, default: true) } + let!(:page) { create(:alchemy_page, language: nil) } - it "returns layout root page" do - is_expected.to eq(page) + it "sets the current language" do + expect(page.language).to eq(current_language) + end + end end end end - describe '.language_roots' do + describe ".language_roots" do + let!(:language_root) { create(:alchemy_page, :language_root) } + it "should return 1 language_root" do - create(:alchemy_page, :public, name: 'First Public Child', parent_id: language_root.id, language: language) - expect(Page.language_roots.size).to eq(1) + expect(Page.language_roots.to_a).to eq([language_root]) end end - describe '.layoutpages' do - it "should return 1 layoutpage" do - create(:alchemy_page, :public, layoutpage: true, name: 'Layoutpage', parent_id: rootpage.id, language: language) - expect(Page.layoutpages.size).to eq(1) + describe ".layoutpages" do + let!(:layoutpage) { create(:alchemy_page, :layoutpage) } + + it "should return layoutpages" do + expect(Page.layoutpages.to_a).to eq([layoutpage]) end end - describe '.not_locked' do + describe ".not_locked" do + let!(:not_locked) { create(:alchemy_page, :language_root) } + it "should return pages that are not blocked by a user at the moment" do - create(:alchemy_page, :public, :locked, name: 'First Public Child', parent_id: language_root.id, language: language) - create(:alchemy_page, :public, name: 'Second Public Child', parent_id: language_root.id, language: language) - expect(Page.not_locked.size).to eq(3) + expect(Page.not_locked.to_a).to eq([not_locked]) end end - describe '.not_restricted' do - it "should return 2 accessible pages" do - create(:alchemy_page, :public, name: 'First Public Child', restricted: true, parent_id: language_root.id, language: language) - expect(Page.not_restricted.size).to eq(2) + describe ".not_restricted" do + let!(:not_restricted) { create(:alchemy_page, :language_root) } + + it "should return accessible pages" do + expect(Page.not_restricted.to_a).to eq([not_restricted]) end end - describe '.published' do + describe ".published" do subject(:published) { Page.published } - let!(:public_one) do - create :alchemy_page, :public, - name: 'First Public Child', - parent_id: language_root.id, - language: language - end - - let!(:public_two) do - create :alchemy_page, :public, - name: 'Second Public Child', - parent_id: language_root.id, - language: language - end - - let!(:non_public_page) do - create :alchemy_page, - name: 'Non Public Child', - parent_id: language_root.id, - language: language - end + let!(:public_one) { create(:alchemy_page, :public) } + let!(:public_two) { create(:alchemy_page, :public) } + let!(:non_public_page) { create(:alchemy_page) } it "returns public available pages" do expect(published).to include(public_one) @@ -692,125 +587,98 @@ module Alchemy end end - describe '.public_language_roots' do - it "should return pages that public language roots" do - create(:alchemy_page, :public, name: 'First Public Child', parent_id: language_root.id, language: language) - expect(Page.public_language_roots.size).to eq(1) - end - end + describe ".public_language_roots" do + let!(:public_language_root) { create(:alchemy_page, :public, :language_root) } - describe '.restricted' do - it "should return 1 restricted page" do - create(:alchemy_page, :public, name: 'First Public Child', restricted: true, parent_id: language_root.id, language: language) - expect(Page.restricted.size).to eq(1) + it "should return pages that public language roots" do + expect(Page.public_language_roots.to_a).to eq([public_language_root]) end end - describe '.root' do - context 'when root page is present' do - let!(:root_page) { Page.root } - - it 'returns root page' do - expect(Page.root).to eq(root_page) - end - end - - context 'when no root page is present yet' do - before do - Page.delete_all - end - - it "creates and returns root page" do - expect { - Page.root - }.to change { Page.count }.by(1) - end - end - end + describe ".restricted" do + let!(:restricted) { create(:alchemy_page, :restricted) } - describe '.visible' do - it "should return 1 visible page" do - create(:alchemy_page, :public, name: 'First Public Child', visible: true, parent_id: language_root.id, language: language) - expect(Page.visible.size).to eq(1) + it "should return restricted pages" do + expect(Page.restricted.to_a).to eq([restricted]) end end # InstanceMethods (a-z) - describe '#available_element_definitions' do + describe "#available_element_definitions" do subject { page.available_element_definitions } let(:page) { create(:alchemy_page, :public) } it "returns all element definitions of available elements" do expect(subject).to be_an(Array) - expect(subject.collect { |e| e['name'] }).to include('header') + expect(subject.collect { |e| e["name"] }).to include("header") end context "with unique elements already on page" do let!(:element) { create(:alchemy_element, :unique, page: page) } it "does not return unique element definitions" do - expect(subject.collect { |e| e['name'] }).to include('article') - expect(subject.collect { |e| e['name'] }).not_to include('header') + expect(subject.collect { |e| e["name"] }).to include("article") + expect(subject.collect { |e| e["name"] }).not_to include("header") end end - context 'limited amount' do - let(:page) { create(:alchemy_page, page_layout: 'columns') } + context "limited amount" do + let(:page) { create(:alchemy_page, page_layout: "columns") } let!(:unique_element) do - create(:alchemy_element, :unique, name: 'unique_headline', page: page) + create(:alchemy_element, :unique, name: "unique_headline", page: page) end - let!(:element_1) { create(:alchemy_element, name: 'column_headline', page: page) } - let!(:element_2) { create(:alchemy_element, name: 'column_headline', page: page) } - let!(:element_3) { create(:alchemy_element, name: 'column_headline', page: page) } + let!(:element_1) { create(:alchemy_element, name: "column_headline", page: page) } + let!(:element_2) { create(:alchemy_element, name: "column_headline", page: page) } + let!(:element_3) { create(:alchemy_element, name: "column_headline", page: page) } before do allow(Element).to receive(:definitions).and_return([ { - 'name' => 'column_headline', - 'amount' => 3, - 'contents' => [{'name' => 'headline', 'type' => 'EssenceText'}] + "name" => "column_headline", + "amount" => 3, + "contents" => [{ "name" => "headline", "type" => "EssenceText" }], }, { - 'name' => 'unique_headline', - 'unique' => true, - 'amount' => 3, - 'contents' => [{'name' => 'headline', 'type' => 'EssenceText'}] - } + "name" => "unique_headline", + "unique" => true, + "amount" => 3, + "contents" => [{ "name" => "headline", "type" => "EssenceText" }], + }, ]) allow(PageLayout).to receive(:get).and_return({ - 'name' => 'columns', - 'elements' => ['column_headline', 'unique_headline'], - 'autogenerate' => ['unique_headline', 'column_headline', 'column_headline', 'column_headline'] + "name" => "columns", + "elements" => ["column_headline", "unique_headline"], + "autogenerate" => ["unique_headline", "column_headline", "column_headline", "column_headline"], }) end it "should be readable" do - element = page.element_definitions_by_name('column_headline').first - expect(element['amount']).to be 3 + element = page.element_definitions_by_name("column_headline").first + expect(element["amount"]).to be 3 end it "should limit elements" do - expect(subject.collect { |e| e['name'] }).not_to include('column_headline') + expect(subject.collect { |e| e["name"] }).not_to include("column_headline") end it "should be ignored if unique" do - expect(subject.collect { |e| e['name'] }).not_to include('unique_headline') + expect(subject.collect { |e| e["name"] }).not_to include("unique_headline") end end end - describe '#available_elements_within_current_scope' do - let(:page) { create(:alchemy_page, page_layout: 'columns') } + describe "#available_elements_within_current_scope" do + let(:page) { create(:alchemy_page, page_layout: "columns") } let(:nestable_element) { create(:alchemy_element, :with_nestable_elements) } let(:currently_available_elements) { page.available_elements_within_current_scope(nestable_element) } context "When unique element is already nested" do before do - nestable_element.nested_elements << create(:alchemy_element, name: 'slide', unique: true, page: page) + nestable_element.nested_elements << create(:alchemy_element, name: "slide", unique: true, page: page) page.elements << nestable_element end @@ -821,12 +689,12 @@ module Alchemy context "When unique element has not be nested" do it "returns available elements" do - expect(currently_available_elements.collect { |e| e['name'] }).to include('slide') + expect(currently_available_elements.collect { |e| e["name"] }).to include("slide") end end end - describe '#available_element_names' do + describe "#available_element_names" do let(:page) { build_stubbed(:alchemy_page) } it "returns all names of elements that could be placed on current page" do @@ -834,7 +702,7 @@ module Alchemy end end - describe '#cache_key' do + describe "#cache_key" do let(:page) do stub_model(Page, updated_at: Time.current, published_at: Time.current - 1.week) end @@ -868,44 +736,44 @@ module Alchemy element_3.move_to_top end - it 'returns a ordered active record collection of elements on that page' do + it "returns a ordered active record collection of elements on that page" do expect(page.all_elements).to eq([element_3, element_1, element_2]) end - context 'with nestable elements' do + context "with nestable elements" do let!(:nestable_element) do create(:alchemy_element, page: page) end let!(:nested_element) do - create(:alchemy_element, name: 'slide', parent_element: nestable_element, page: page) + create(:alchemy_element, name: "slide", parent_element: nestable_element, page: page) end - it 'contains nested elements of an element' do + it "contains nested elements of an element" do expect(page.all_elements).to include(nested_element) end end - context 'with trashed elements' do + context "with trashed elements" do let(:trashed_element) { create(:alchemy_element, page: page).tap(&:trash!) } - it 'contains trashed elements' do + it "contains trashed elements" do expect(page.all_elements).to include(trashed_element) end end - context 'with hidden elements' do + context "with hidden elements" do let(:hidden_element) { create(:alchemy_element, page: page, public: false) } - it 'contains hidden elements' do + it "contains hidden elements" do expect(page.all_elements).to include(hidden_element) end end - context 'with fixed elements' do + context "with fixed elements" do let(:fixed_element) { create(:alchemy_element, page: page, fixed: true) } - it 'contains hidden elements' do + it "contains hidden elements" do expect(page.all_elements).to include(fixed_element) end end @@ -921,40 +789,40 @@ module Alchemy element_3.move_to_top end - it 'returns a ordered active record collection of elements on that page' do + it "returns a ordered active record collection of elements on that page" do expect(page.elements).to eq([element_3, element_1, element_2]) end - context 'with nestable elements' do + context "with nestable elements" do let(:nestable_element) { create(:alchemy_element, :with_nestable_elements) } before do - nestable_element.nested_elements << create(:alchemy_element, name: 'slide') + nestable_element.nested_elements << create(:alchemy_element, name: "slide") page.elements << nestable_element end - it 'does not contain nested elements of an element' do + it "does not contain nested elements of an element" do expect(nestable_element.nested_elements).to_not be_empty expect(page.elements).to_not include(nestable_element.nested_elements.first) end end - context 'with trashed elements' do + context "with trashed elements" do let(:trashed_element) { create(:alchemy_element, page: page) } before do trashed_element.trash! end - it 'does not contain trashed elements' do + it "does not contain trashed elements" do expect(page.elements).to_not include(trashed_element) end end - context 'with hidden elements' do + context "with hidden elements" do let(:hidden_element) { create(:alchemy_element, page: page, public: false) } - it 'does not contain hidden elements' do + it "does not contain hidden elements" do expect(page.elements).to_not include(hidden_element) end end @@ -970,74 +838,74 @@ module Alchemy element_3.move_to_top end - it 'returns a ordered active record collection of fixed elements on that page' do + it "returns a ordered active record collection of fixed elements on that page" do expect(page.fixed_elements).to eq([element_3, element_1, element_2]) end - context 'with trashed fixed elements' do + context "with trashed fixed elements" do let(:trashed_element) { create(:alchemy_element, page: page, fixed: true) } before do trashed_element.trash! end - it 'does not contain trashed fixed elements' do + it "does not contain trashed fixed elements" do expect(page.fixed_elements).to_not include(trashed_element) end end - context 'with hidden fixed elements' do + context "with hidden fixed elements" do let(:hidden_element) { create(:alchemy_element, page: page, fixed: true, public: false) } - it 'does not contain hidden fixed elements' do + it "does not contain hidden fixed elements" do expect(page.fixed_elements).to_not include(hidden_element) end end end - describe '#element_definitions' do + describe "#element_definitions" do let(:page) { build_stubbed(:alchemy_page) } subject { page.element_definitions } - before { expect(Element).to receive(:definitions).and_return([{'name' => 'article'}, {'name' => 'header'}]) } + before { expect(Element).to receive(:definitions).and_return([{ "name" => "article" }, { "name" => "header" }]) } it "returns all element definitions that could be placed on current page" do - is_expected.to include({'name' => 'article'}) - is_expected.to include({'name' => 'header'}) + is_expected.to include({ "name" => "article" }) + is_expected.to include({ "name" => "header" }) end end - describe '#descendent_element_definitions' do - let(:page) { build_stubbed(:alchemy_page, page_layout: 'standard') } + describe "#descendent_element_definitions" do + let(:page) { build_stubbed(:alchemy_page, page_layout: "standard") } subject(:descendent_element_definitions) { page.descendent_element_definitions } it "returns all element definitions including the nestable element definitions" do - is_expected.to include(Alchemy::Element.definition_by_name('slider')) - is_expected.to include(Alchemy::Element.definition_by_name('slide')) + is_expected.to include(Alchemy::Element.definition_by_name("slider")) + is_expected.to include(Alchemy::Element.definition_by_name("slide")) end - context 'with nestable element being defined on multiple elements' do + context "with nestable element being defined on multiple elements" do before do expect(page).to receive(:element_definition_names) do %w(slider gallery) end expect(Element).to receive(:definitions).at_least(:once) do [ - {'name' => 'slider', 'nestable_elements' => %w(slide)}, - {'name' => 'gallery', 'nestable_elements' => %w(slide)}, - {'name' => 'slide'} + { "name" => "slider", "nestable_elements" => %w(slide) }, + { "name" => "gallery", "nestable_elements" => %w(slide) }, + { "name" => "slide" }, ] end end - it 'only includes the definition once' do - slide_definitions = descendent_element_definitions.select { |d| d['name'] == 'slide' } + it "only includes the definition once" do + slide_definitions = descendent_element_definitions.select { |d| d["name"] == "slide" } expect(slide_definitions.length).to eq(1) end end end - describe '#element_definitions_by_name' do + describe "#element_definitions_by_name" do let(:page) { build_stubbed(:alchemy_page, :public) } context "with no name given" do @@ -1049,7 +917,7 @@ module Alchemy context "with 'all' passed as name" do it "returns all element definitions" do expect(Element).to receive(:definitions) - page.element_definitions_by_name('all') + page.element_definitions_by_name("all") end end @@ -1061,7 +929,7 @@ module Alchemy end end - describe '#element_definition_names' do + describe "#element_definition_names" do let(:page) { build_stubbed(:alchemy_page, :public) } subject { page.element_definition_names } @@ -1072,7 +940,7 @@ module Alchemy context "with elements assigned in page definition" do let(:page_definition) do - {'elements' => %w(article)} + { "elements" => %w(article) } end it "returns an array of the page's element names" do @@ -1087,12 +955,12 @@ module Alchemy end end - describe '#feed_elements' do - let(:news_element) { create(:alchemy_element, name: 'news', public: false, page: news_page) } + describe "#feed_elements" do + let(:news_element) { create(:alchemy_element, name: "news", public: false, page: news_page) } it "should return all published rss feed elements" do expect(news_page.feed_elements).not_to be_empty - expect(news_page.feed_elements).to eq(Element.where(name: 'news').available.to_a) + expect(news_page.feed_elements).to eq(Element.where(name: "news").available.to_a) end it "should not return unpublished rss feed elements" do @@ -1106,44 +974,44 @@ module Alchemy end end - describe '#find_elements' do + describe "#find_elements" do subject { page.find_elements(options) } let(:page) { build(:alchemy_page) } let(:options) { {} } let(:finder) { instance_double(Alchemy::ElementsFinder) } - it 'passes self and all options to elements finder' do + it "passes self and all options to elements finder" do expect(Alchemy::ElementsFinder).to receive(:new).with(options) { finder } expect(finder).to receive(:elements).with(page: page) subject end - context 'with a custom finder given in options' do + context "with a custom finder given in options" do let(:options) do { finder: CustomNewsElementsFinder.new } end - it 'uses that to load elements to render' do - expect(subject.map(&:name)).to eq(['news']) + it "uses that to load elements to render" do + expect(subject.map(&:name)).to eq(["news"]) end end end - describe '#first_public_child' do + describe "#first_public_child" do before do create :alchemy_page, name: "First child", language: language, - parent_id: language_root.id + parent: language_root end context "with existing public child" do let!(:first_public_child) do create :alchemy_page, :public, - name: "First public child", - language: language, - parent_id: language_root.id + name: "First public child", + language: language, + parent: language_root end it "should return first_public_child" do @@ -1156,10 +1024,10 @@ module Alchemy end end - context 'folding' do + context "folding" do let(:user) { create(:alchemy_dummy_user) } - describe '#fold!' do + describe "#fold!" do context "with folded status set to true" do it "should create a folded page for user" do public_page.fold!(user.id, true) @@ -1168,19 +1036,17 @@ module Alchemy end end - describe '#folded?' do + describe "#folded?" do let(:page) { Page.new } - context 'with user is a active record model' do + context "with user is a active record model" do before do allow(Alchemy.user_class).to receive(:'<').and_return(true) end - context 'if page is folded' do + context "if page is folded" do before do - expect(page) - .to receive(:folded_pages) - .and_return double(where: double(any?: true)) + expect(page).to receive(:folded_pages).and_return double(where: double(any?: true)) end it "should return true" do @@ -1188,7 +1054,7 @@ module Alchemy end end - context 'if page is not folded' do + context "if page is not folded" do it "should return false" do expect(page.folded?(101_093)).to eq(false) end @@ -1197,7 +1063,7 @@ module Alchemy end end - describe '#get_language_root' do + describe "#get_language_root" do before { language_root } subject { public_page.get_language_root } @@ -1206,9 +1072,9 @@ module Alchemy end end - describe '#definition' do - context 'if the page layout could not be found in the definition file' do - let(:page) { build_stubbed(:alchemy_page, page_layout: 'notexisting') } + describe "#definition" do + context "if the page layout could not be found in the definition file" do + let(:page) { build_stubbed(:alchemy_page, page_layout: "notexisting") } it "it loggs a warning." do expect(Alchemy::Logger).to receive(:warn) @@ -1222,18 +1088,14 @@ module Alchemy context "for a language root page" do it "it returns the page layout definition as hash." do - expect(language_root.definition['name']).to eq('index') - end - - it "it returns an empty hash for root page." do - expect(rootpage.definition).to eq({}) + expect(language_root.definition["name"]).to eq("index") end end end - describe '#lock_to!' do + describe "#lock_to!" do let(:page) { create(:alchemy_page) } - let(:user) { mock_model('DummyUser') } + let(:user) { mock_model("DummyUser") } it "sets locked_at timestamp" do page.lock_to!(user) @@ -1253,21 +1115,21 @@ module Alchemy end end - describe '#copy_and_paste' do + describe "#copy_and_paste" do let(:source) { build_stubbed(:alchemy_page) } let(:new_parent) { build_stubbed(:alchemy_page) } let(:page_name) { "Pagename (pasted)" } - let(:copied_page) { mock_model('Page') } + let(:copied_page) { mock_model("Page") } subject { Page.copy_and_paste(source, new_parent, page_name) } it "should copy the source page with the given name to the new parent" do expect(Page).to receive(:copy).with(source, { - parent_id: new_parent.id, - language: new_parent.language, - name: page_name, - title: page_name - }) + parent_id: new_parent.id, + language: new_parent.language, + name: page_name, + title: page_name, + }) subject end @@ -1279,17 +1141,17 @@ module Alchemy context "if source page has children" do it "should also copy and paste the children" do allow(Page).to receive(:copy).and_return(copied_page) - allow(source).to receive(:children).and_return([mock_model('Page')]) + allow(source).to receive(:children).and_return([mock_model("Page")]) expect(source).to receive(:copy_children_to).with(copied_page) subject end end end - context 'previous and next.' do - let(:center_page) { create(:alchemy_page, :public, name: 'Center Page') } - let(:next_page) { create(:alchemy_page, :public, name: 'Next Page') } - let(:non_public_page) { create(:alchemy_page, name: 'Not public Page') } + context "previous and next." do + let(:center_page) { create(:alchemy_page, :public, name: "Center Page") } + let(:next_page) { create(:alchemy_page, :public, name: "Next Page") } + let(:non_public_page) { create(:alchemy_page, name: "Not public Page") } let(:restricted_page) { create(:alchemy_page, :restricted, :public) } before do @@ -1300,7 +1162,7 @@ module Alchemy next_page end - describe '#previous' do + describe "#previous" do it "should return the previous page on the same level" do expect(center_page.previous).to eq(public_page) expect(next_page.previous).to eq(center_page) @@ -1341,7 +1203,7 @@ module Alchemy end end - describe '#next' do + describe "#next" do it "should return the next page on the same level" do expect(center_page.next).to eq(next_page) end @@ -1354,25 +1216,25 @@ module Alchemy end end - describe '#editable_by?' do + describe "#editable_by?" do subject { page.editable_by?(user) } - let(:user) { mock_model('DummyUser') } + let(:user) { mock_model("DummyUser") } let(:page) { create(:alchemy_page) } context "template defines one alchemy role" do before do - allow(page).to receive(:definition).and_return({"editable_by" => ["freelancer"]}) + allow(page).to receive(:definition).and_return({ "editable_by" => ["freelancer"] }) end - context 'user has matching alchemy role' do + context "user has matching alchemy role" do before do allow(user).to receive(:alchemy_roles).at_least(:once) { ["freelancer"] } end it { is_expected.to be(true) } end - context 'user has a different alchemy role' do + context "user has a different alchemy role" do before do allow(user).to receive(:alchemy_roles).at_least(:once) { ["editor"] } end @@ -1383,17 +1245,17 @@ module Alchemy context "template defines multiple alchemy roles" do before do - allow(page).to receive(:definition).and_return({"editable_by" => ["freelancer", "admin"]}) + allow(page).to receive(:definition).and_return({ "editable_by" => ["freelancer", "admin"] }) end - context 'user has matching alchemy role' do + context "user has matching alchemy role" do before do allow(user).to receive(:alchemy_roles).at_least(:once) { ["freelancer", "member"] } end it { is_expected.to be(true) } end - context 'user has a different alchemy role' do + context "user has a different alchemy role" do before do allow(user).to receive(:alchemy_roles).at_least(:once) { ["editor", "leader"] } end @@ -1407,7 +1269,7 @@ module Alchemy allow(page).to receive(:definition).and_return({}) end - context 'user has matching alchemy role' do + context "user has matching alchemy role" do before do allow(user).to receive(:alchemy_roles).at_least(:once) { ["freelancer", "member"] } end @@ -1417,55 +1279,55 @@ module Alchemy end end - describe '#public_on' do + describe "#public_on" do subject(:public_on) { page.public_on } - context 'when is fixed attribute' do + context "when is fixed attribute" do let(:page) do - create(:alchemy_page, page_layout: 'readonly') + create(:alchemy_page, page_layout: "readonly") end - it 'returns the fixed value' do + it "returns the fixed value" do is_expected.to eq(nil) end end - context 'when is not fixed attribute' do + context "when is not fixed attribute" do let(:page) do - create(:alchemy_page, page_layout: 'standard', public_on: '2016-11-01') + create(:alchemy_page, page_layout: "standard", public_on: "2016-11-01") end - it 'returns value' do - is_expected.to eq('2016-11-01'.to_time(:utc)) + it "returns value" do + is_expected.to eq("2016-11-01".to_time(:utc)) end end end - describe '#public_until' do + describe "#public_until" do subject(:public_until) { page.public_until } - context 'when is fixed attribute' do + context "when is fixed attribute" do let(:page) do - create(:alchemy_page, page_layout: 'readonly') + create(:alchemy_page, page_layout: "readonly") end - it 'returns the fixed value' do + it "returns the fixed value" do is_expected.to eq(nil) end end - context 'when is not fixed attribute' do + context "when is not fixed attribute" do let(:page) do - create(:alchemy_page, page_layout: 'standard', public_until: '2016-11-01') + create(:alchemy_page, page_layout: "standard", public_until: "2016-11-01") end - it 'returns value' do - is_expected.to eq('2016-11-01'.to_time(:utc)) + it "returns value" do + is_expected.to eq("2016-11-01".to_time(:utc)) end end end - describe '#public?' do + describe "#public?" do subject { page.public? } context "when public_on is not set" do @@ -1513,17 +1375,16 @@ module Alchemy end end - describe '#publish!' do + describe "#publish!" do let(:current_time) { Time.current.change(usec: 0) } let(:page) do create(:alchemy_page, - public_on: public_on, - public_until: public_until, - published_at: published_at - ) + public_on: public_on, + public_until: public_until, + published_at: published_at) end let(:published_at) { nil } - let(:public_on) { nil } + let(:public_on) { nil } let(:public_until) { nil } before do @@ -1534,19 +1395,19 @@ module Alchemy context "with unpublished page" do it "sets public_on and published_at", aggregate_failures: true do expect(page.published_at).to eq(current_time) - expect(page.public_on).to eq(current_time) + expect(page.public_on).to eq(current_time) expect(page.public_until).to eq(nil) end end context "with already published page" do - let(:past_time) { current_time - 3.weeks } + let(:past_time) { current_time - 3.weeks } let(:published_at) { past_time } - let(:public_on) { past_time } + let(:public_on) { past_time } it "only sets published_at", aggregate_failures: true do expect(page.published_at).to eq(current_time) - expect(page.public_on).to eq(public_on) + expect(page.public_on).to eq(public_on) expect(page.public_until).to eq(nil) end @@ -1564,28 +1425,28 @@ module Alchemy it "resets public_on and sets published_at", aggregate_failures: true do expect(page.published_at).to eq(current_time) - expect(page.public_on).to eq(current_time) + expect(page.public_on).to eq(current_time) expect(page.public_until).to eq(nil) end end context "with not anymore published page" do - let(:past_time) { current_time - 3.weeks } + let(:past_time) { current_time - 3.weeks } let(:published_at) { past_time } - let(:public_on) { past_time } + let(:public_on) { past_time } let(:public_until) { past_time + 1.week } it "resets public_on and published_at and sets public_until to nil", aggregate_failures: true do expect(page.published_at).to eq(current_time) - expect(page.public_on).to eq(public_on) + expect(page.public_on).to eq(public_on) expect(page.public_until).to eq(nil) end end end - describe '#set_language_from_parent_or_default' do - let(:default_language) { mock_model('Language', code: 'es') } + describe "#set_language" do + let(:default_language) { mock_model("Language", code: "es") } let(:page) { Page.new } before { allow(page).to receive(:parent).and_return(parent) } @@ -1593,38 +1454,38 @@ module Alchemy subject { page } context "parent has a language" do - let(:parent) { mock_model('Page', language: default_language, language_id: default_language.id, language_code: default_language.code) } + let(:parent) { mock_model("Page", language: default_language, language_id: default_language.id, language_code: default_language.code) } before do - page.send(:set_language_from_parent_or_default) + page.send(:set_language) end - describe '#language_id' do + describe "#language_id" do subject { super().language_id } it { is_expected.to eq(parent.language_id) } end end context "parent has no language" do - let(:parent) { mock_model('Page', language: nil, language_id: nil, language_code: nil) } + let(:parent) { mock_model("Page", language: nil, language_id: nil, language_code: nil) } before do allow(Language).to receive(:default).and_return(default_language) - page.send(:set_language_from_parent_or_default) + page.send(:set_language) end - describe '#language_id' do + describe "#language_id" do subject { super().language_id } it { is_expected.to eq(default_language.id) } end end end - describe '#taggable?' do + describe "#taggable?" do context "definition has 'taggable' key with true value" do it "should return true" do page = build(:alchemy_page) - allow(page).to receive(:definition).and_return({'name' => 'standard', 'taggable' => true}) + allow(page).to receive(:definition).and_return({ "name" => "standard", "taggable" => true }) expect(page.taggable?).to be_truthy end end @@ -1632,7 +1493,7 @@ module Alchemy context "definition has 'taggable' key with foo value" do it "should return false" do page = build(:alchemy_page) - allow(page).to receive(:definition).and_return({'name' => 'standard', 'taggable' => 'foo'}) + allow(page).to receive(:definition).and_return({ "name" => "standard", "taggable" => "foo" }) expect(page.taggable?).to be_falsey end end @@ -1640,13 +1501,13 @@ module Alchemy context "definition has no 'taggable' key" do it "should return false" do page = build(:alchemy_page) - allow(page).to receive(:definition).and_return({'name' => 'standard'}) + allow(page).to receive(:definition).and_return({ "name" => "standard" }) expect(page.taggable?).to be_falsey end end end - describe '#unlock!' do + describe "#unlock!" do let(:page) { create(:alchemy_page, :locked) } before do @@ -1676,202 +1537,123 @@ module Alchemy end end - context 'urlname updating' do - let(:parentparent) { create(:alchemy_page, name: 'parentparent', visible: true) } - let(:parent) { create(:alchemy_page, parent_id: parentparent.id, name: 'parent', visible: true) } - let(:page) { create(:alchemy_page, parent_id: parent.id, name: 'page', visible: true) } - let(:invisible) { create(:alchemy_page, parent_id: page.id, name: 'invisible', visible: false) } - let(:contact) { create(:alchemy_page, parent_id: invisible.id, name: 'contact', visible: true) } + context "urlname updating" do + let(:parentparent) { create(:alchemy_page, name: "parentparent") } + let(:parent) { create(:alchemy_page, parent: parentparent, name: "parent") } + let(:page) { create(:alchemy_page, parent: parent, name: "page") } let(:language_root) { parentparent.parent } - context "with activated url_nesting" do - before do - stub_alchemy_config(:url_nesting, true) - end - - it "should store all parents urlnames delimited by slash" do - expect(page.urlname).to eq('parentparent/parent/page') - end - - it "should not include the root page" do - Page.root.update_column(:urlname, 'root') - language_root.update(urlname: 'new-urlname') - expect(language_root.urlname).not_to match(/root/) - end - - it "should not include the language root page" do - expect(page.urlname).not_to match(/startseite/) - end - - it "should not include invisible pages" do - expect(contact.urlname).not_to match(/invisible/) - end - - context "with an invisible parent" do - before { parent.update_attribute(:visible, false) } - - it "does not change if set_urlname is called" do - expect { page.send(:set_urlname) }.not_to change { page.urlname } - end - - it "does not change if update_urlname! is called" do - expect { page.update_urlname! }.not_to change { page.urlname } - end - end - - context "after changing page's urlname" do - it "updates urlnames of descendants" do - page - parentparent.urlname = 'new-urlname' - parentparent.save! - page.reload - expect(page.urlname).to eq('new-urlname/parent/page') - end - - it "should create a legacy url" do - allow(page).to receive(:slug).and_return('foo') - page.update_urlname! - expect(page.legacy_urls).not_to be_empty - expect(page.legacy_urls.pluck(:urlname)).to include('parentparent/parent/page') - end - end + it "should store all parents urlnames delimited by slash" do + expect(page.urlname).to eq("parentparent/parent/page") + end - context "after updating my visibility" do - it "should update urlnames of descendants" do - page - parentparent.visible = false - parentparent.save! - page.reload - expect(page.urlname).to eq('parent/page') - end - end + it "should not include the language root page" do + expect(page.urlname).not_to match(/startseite/) end - context "with disabled url_nesting" do - before do - stub_alchemy_config(:url_nesting, false) + context "after changing page's urlname" do + it "updates urlnames of descendants" do + page + parentparent.urlname = "new-urlname" + parentparent.save! + page.reload + expect(page.urlname).to eq("new-urlname/parent/page") end - it "should only store my urlname" do - expect(page.urlname).to eq('page') + it "should create a legacy url" do + allow(page).to receive(:slug).and_return("foo") + page.update_urlname! + expect(page.legacy_urls).not_to be_empty + expect(page.legacy_urls.pluck(:urlname)).to include("parentparent/parent/page") end end end describe "#update_node!" do let(:original_url) { "sample-url" } - let(:page) { create(:alchemy_page, language: language, parent_id: language_root.id, urlname: original_url, restricted: false) } + let(:page) { create(:alchemy_page, language: language, parent: language_root, urlname: original_url, restricted: false) } let(:node) { TreeNode.new(10, 11, 12, 13, "another-url", true) } - context "when nesting is enabled" do - before do - stub_alchemy_config(:url_nesting, true) - end - - it "should update all attributes" do - page.update_node!(node) - page.reload - expect(page.lft).to eq(node.left) - expect(page.rgt).to eq(node.right) - expect(page.parent_id).to eq(node.parent) - expect(page.depth).to eq(node.depth) - expect(page.urlname).to eq(node.url) - expect(page.restricted).to eq(node.restricted) - end - - context "when url is the same" do - let(:node) { TreeNode.new(10, 11, 12, 13, original_url, true) } - - it "should not create a legacy url" do - page.update_node!(node) - page.reload - expect(page.legacy_urls.size).to eq(0) - end - end - - context "when url is not the same" do - it "should create a legacy url" do - page.update_node!(node) - page.reload - expect(page.legacy_urls.size).to eq(1) - end - end + it "should update all attributes" do + page.update_node!(node) + page.reload + expect(page.lft).to eq(node.left) + expect(page.rgt).to eq(node.right) + expect(page.parent_id).to eq(node.parent) + expect(page.depth).to eq(node.depth) + expect(page.urlname).to eq(node.url) + expect(page.restricted).to eq(node.restricted) end - context "when nesting is disabled" do - before do - stub_alchemy_config(:url_nesting, false) - end + context "when url is the same" do + let(:node) { TreeNode.new(10, 11, 12, 13, original_url, true) } - it "should update all attributes except url" do + it "should not create a legacy url" do page.update_node!(node) page.reload - expect(page.lft).to eq(node.left) - expect(page.rgt).to eq(node.right) - expect(page.parent_id).to eq(node.parent) - expect(page.depth).to eq(node.depth) - expect(page.urlname).to eq(original_url) - expect(page.restricted).to eq(node.restricted) + expect(page.legacy_urls.size).to eq(0) end + end - it "should not create a legacy url" do + context "when url is not the same" do + it "should create a legacy url" do page.update_node!(node) page.reload - expect(page.legacy_urls.size).to eq(0) + expect(page.legacy_urls.size).to eq(1) end end end - describe '#cache_page?' do + describe "#cache_page?" do let(:page) { Page.new(page_layout: "news") } subject { page.cache_page? } before { Rails.application.config.action_controller.perform_caching = true } after { Rails.application.config.action_controller.perform_caching = false } - it 'returns true when everthing is alright' do + it "returns true when everthing is alright" do expect(subject).to be true end - it 'returns false when the Rails app does not perform caching' do + it "returns false when the Rails app does not perform caching" do Rails.application.config.action_controller.perform_caching = false expect(subject).to be false end - it 'returns false when caching is deactivated in the Alchemy config' do + it "returns false when caching is deactivated in the Alchemy config" do stub_alchemy_config(:cache_pages, false) expect(subject).to be false end - it 'returns false when the page layout is set to cache = false' do - page_layout = PageLayout.get('news') - page_layout['cache'] = false - allow(PageLayout).to receive(:get).with('news').and_return(page_layout) + it "returns false when the page layout is set to cache = false" do + page_layout = PageLayout.get("news") + page_layout["cache"] = false + allow(PageLayout).to receive(:get).with("news").and_return(page_layout) expect(subject).to be false end - it 'returns false when the page layout is set to searchresults = true' do - page_layout = PageLayout.get('news') - page_layout['searchresults'] = true - allow(PageLayout).to receive(:get).with('news').and_return(page_layout) + it "returns false when the page layout is set to searchresults = true" do + page_layout = PageLayout.get("news") + page_layout["searchresults"] = true + allow(PageLayout).to receive(:get).with("news").and_return(page_layout) expect(subject).to be false end end - describe '#slug' do + describe "#slug" do context "with parents path saved in urlname" do - let(:page) { build(:alchemy_page, urlname: 'root/parent/my-name') } + let(:page) { build(:alchemy_page, urlname: "root/parent/my-name") } it "should return the last part of the urlname" do - expect(page.slug).to eq('my-name') + expect(page.slug).to eq("my-name") end end context "with single urlname" do - let(:page) { build(:alchemy_page, urlname: 'my-name') } + let(:page) { build(:alchemy_page, urlname: "my-name") } it "should return the last part of the urlname" do - expect(page.slug).to eq('my-name') + expect(page.slug).to eq("my-name") end end @@ -1884,40 +1666,36 @@ module Alchemy end end - context 'page status methods' do + context "page status methods" do let(:page) do - build(:alchemy_page, :public, visible: true, restricted: false) + build(:alchemy_page, :public, restricted: false) end - describe '#status' do + describe "#status" do it "returns a combined status hash" do - expect(page.status).to eq({public: true, visible: true, restricted: false, locked: false}) + expect(page.status).to eq({ public: true, restricted: false, locked: false }) end end - describe '#status_title' do + describe "#status_title" do it "returns a translated status string for public status" do - expect(page.status_title(:public)).to eq('Page is published.') - end - - it "returns a translated status string for visible status" do - expect(page.status_title(:visible)).to eq('Page is visible in navigation.') + expect(page.status_title(:public)).to eq("Page is published.") end it "returns a translated status string for locked status" do - expect(page.status_title(:locked)).to eq('') + expect(page.status_title(:locked)).to eq("") end it "returns a translated status string for restricted status" do - expect(page.status_title(:restricted)).to eq('Page is not restricted.') + expect(page.status_title(:restricted)).to eq("Page is not restricted.") end end end - describe 'page editor methods' do + describe "page editor methods" do let(:user) { create(:alchemy_dummy_user, :as_editor) } - describe '#creator' do + describe "#creator" do let(:page) { Page.new(creator: user) } subject(:creator) { page.creator } @@ -1925,13 +1703,13 @@ module Alchemy is_expected.to eq(user) end - it 'uses the primary key defined on user class' do + it "uses the primary key defined on user class" do expect(Alchemy.user_class).to receive(:primary_key).at_least(:once) { :id } subject end end - describe '#updater' do + describe "#updater" do let(:page) { Page.new(updater: user) } subject(:updater) { page.updater } @@ -1939,13 +1717,13 @@ module Alchemy is_expected.to eq(user) end - it 'uses the primary key defined on user class' do + it "uses the primary key defined on user class" do expect(Alchemy.user_class).to receive(:primary_key).at_least(:once) { :id } subject end end - describe '#locker' do + describe "#locker" do let(:page) { Page.new(locker: user) } subject(:locker) { page.locker } @@ -1953,96 +1731,96 @@ module Alchemy is_expected.to eq(user) end - it 'uses the primary key defined on user class' do + it "uses the primary key defined on user class" do expect(Alchemy.user_class).to receive(:primary_key).at_least(:once) { :id } subject end end - context 'with user class having a name accessor' do - let(:user) { build(:alchemy_dummy_user, name: 'Paul Page') } + context "with user class having a name accessor" do + let(:user) { build(:alchemy_dummy_user, name: "Paul Page") } - describe '#creator_name' do + describe "#creator_name" do let(:page) { Page.new(creator: user) } it "returns the name of the creator" do - expect(page.creator_name).to eq('Paul Page') + expect(page.creator_name).to eq("Paul Page") end end - describe '#updater_name' do + describe "#updater_name" do let(:page) { Page.new(updater: user) } it "returns the name of the updater" do - expect(page.updater_name).to eq('Paul Page') + expect(page.updater_name).to eq("Paul Page") end end - describe '#locker_name' do + describe "#locker_name" do let(:page) { Page.new(locker: user) } it "returns the name of the current page editor" do - expect(page.locker_name).to eq('Paul Page') + expect(page.locker_name).to eq("Paul Page") end end end - context 'with user class returning nil for name' do + context "with user class returning nil for name" do let(:user) { Alchemy.user_class.new } - describe '#creator_name' do + describe "#creator_name" do let(:page) { Page.new(creator: user) } it "returns unknown" do - expect(page.creator_name).to eq('unknown') + expect(page.creator_name).to eq("unknown") end end - describe '#updater_name' do + describe "#updater_name" do let(:page) { Page.new(updater: user) } it "returns unknown" do - expect(page.updater_name).to eq('unknown') + expect(page.updater_name).to eq("unknown") end end - describe '#locker_name' do + describe "#locker_name" do let(:page) { Page.new(locker: user) } it "returns unknown" do - expect(page.locker_name).to eq('unknown') + expect(page.locker_name).to eq("unknown") end end end - context 'with user class not responding to name' do + context "with user class not responding to name" do let(:user) { Alchemy.user_class.new } before do expect(user).to receive(:respond_to?).with(:name) { false } end - describe '#creator_name' do + describe "#creator_name" do let(:page) { Page.new(creator: user) } it "returns unknown" do - expect(page.creator_name).to eq('unknown') + expect(page.creator_name).to eq("unknown") end end - describe '#updater_name' do + describe "#updater_name" do let(:page) { Page.new(updater: user) } it "returns unknown" do - expect(page.updater_name).to eq('unknown') + expect(page.updater_name).to eq("unknown") end end - describe '#locker_name' do + describe "#locker_name" do let(:page) { Page.new(locker: user) } it "returns unknown" do - expect(page.locker_name).to eq('unknown') + expect(page.locker_name).to eq("unknown") end end end @@ -2052,27 +1830,27 @@ module Alchemy let(:subject) { Page.new } end - describe '#layout_partial_name' do - let(:page) { Page.new(page_layout: 'Standard Page') } + describe "#layout_partial_name" do + let(:page) { Page.new(page_layout: "Standard Page") } it "returns a partial renderer compatible name" do - expect(page.layout_partial_name).to eq('standard_page') + expect(page.layout_partial_name).to eq("standard_page") end end - describe '#published_at' do - context 'with published_at date set' do + describe "#published_at" do + context "with published_at date set" do let(:published_at) { 3.days.ago } - let(:page) { build_stubbed(:alchemy_page, published_at: published_at) } + let(:page) { build_stubbed(:alchemy_page, published_at: published_at) } it "returns the published_at value from database" do expect(page.published_at).to be_within(1.second).of(published_at) end end - context 'with published_at is nil' do + context "with published_at is nil" do let(:updated_at) { 3.days.ago } - let(:page) { build_stubbed(:alchemy_page, published_at: nil, updated_at: updated_at) } + let(:page) { build_stubbed(:alchemy_page, published_at: nil, updated_at: updated_at) } it "returns the updated_at value" do expect(page.published_at).to be_within(1.second).of(updated_at) @@ -2085,31 +1863,31 @@ module Alchemy let!(:expanded_element) do create :alchemy_element, :with_contents, - name: 'article', + name: "article", page: page, folded: false end let!(:folded_element) do create :alchemy_element, :with_contents, - name: 'article', + name: "article", page: page, folded: true end subject(:richtext_contents_ids) { page.richtext_contents_ids } - it 'returns content ids for all expanded elements that have tinymce enabled' do + it "returns content ids for all expanded elements that have tinymce enabled" do expanded_rtf_contents = expanded_element.contents.essence_richtexts expect(richtext_contents_ids).to eq(expanded_rtf_contents.pluck(:id)) folded_rtf_content = folded_element.contents.essence_richtexts.first expect(richtext_contents_ids).to_not include(folded_rtf_content.id) end - context 'with nested elements' do + context "with nested elements" do let!(:nested_expanded_element) do create :alchemy_element, :with_contents, - name: 'article', + name: "article", page: page, parent_element: expanded_element, folded: false @@ -2117,17 +1895,16 @@ module Alchemy let!(:nested_folded_element) do create :alchemy_element, :with_contents, - name: 'article', + name: "article", page: page, parent_element: folded_element, folded: true end - it 'returns content ids for all expanded nested elements that have tinymce enabled' do + it "returns content ids for all expanded nested elements that have tinymce enabled" do expanded_rtf_contents = expanded_element.contents.essence_richtexts nested_expanded_rtf_contents = nested_expanded_element.contents.essence_richtexts - rtf_content_ids = expanded_rtf_contents.pluck(:id) + - nested_expanded_rtf_contents.pluck(:id) + rtf_content_ids = expanded_rtf_contents.pluck(:id) + nested_expanded_rtf_contents.pluck(:id) expect(richtext_contents_ids.sort).to eq(rtf_content_ids) nested_folded_rtf_content = nested_folded_element.contents.essence_richtexts.first @@ -2137,92 +1914,53 @@ module Alchemy end end - describe '#fixed_attributes' do + describe "#fixed_attributes" do let(:page) { Alchemy::Page.new } - it 'holds an instance of FixedAttributes' do + it "holds an instance of FixedAttributes" do expect(page.fixed_attributes).to be_a(Alchemy::Page::FixedAttributes) end end - describe '#attribute_fixed?' do + describe "#attribute_fixed?" do let(:page) { Alchemy::Page.new } - it 'delegates to instance of FixedAttributes' do - expect_any_instance_of(Alchemy::Page::FixedAttributes).to receive(:fixed?).with('yolo') - page.attribute_fixed?('yolo') + it "delegates to instance of FixedAttributes" do + expect_any_instance_of(Alchemy::Page::FixedAttributes).to receive(:fixed?).with("yolo") + page.attribute_fixed?("yolo") end end - describe '#set_fixed_attributes' do - context 'when fixed attributes are defined' do - let(:page) { create(:alchemy_page, page_layout: 'readonly') } + describe "#set_fixed_attributes" do + context "when fixed attributes are defined" do + let(:page) { create(:alchemy_page, page_layout: "readonly") } - it 'sets them before each save' do + it "sets them before each save" do expect { - page.update(name: 'Foo') + page.update(name: "Foo") }.to_not change { page.name } end end end - describe '#attach_to_menu!' do - let(:page) { create(:alchemy_page) } - - context 'if menu_id is set' do - let(:root_node) { create(:alchemy_node) } - - before do - page.menu_id = root_node.id - end - - context 'and no nodes are present yet' do - it 'attaches to menu' do - expect { page.save }.to change { page.nodes.count }.from(0).to(1) - end - end - - context 'and nodes are already present' do - let!(:page_node) { create(:alchemy_node, page: page) } - - it 'does not attach to menu' do - expect { page.save }.not_to change { page.nodes.count } - end - end - end - - context 'if menu_id is not set' do - it 'does not attach to menu' do - expect { page.save }.not_to change { page.nodes.count } - end - end - - context 'if menu_id is empty' do - it 'does not raise error' do - page.menu_id = "" - expect { page.save }.not_to raise_error - end - end - end - - describe '#nodes' do + describe "#nodes" do let(:page) { create(:alchemy_page) } let(:node) { create(:alchemy_node, page: page, updated_at: 1.hour.ago) } - it 'returns all nodes the page is attached to' do + it "returns all nodes the page is attached to" do expect(page.nodes).to include(node) end - describe 'after page updates' do - it 'touches all nodes' do + describe "after page updates" do + it "touches all nodes" do expect { - page.update(name: 'foo') + page.update(name: "foo") }.to change { node.reload.updated_at } end end end - describe '#menus' do + describe "#menus" do let(:page) { create(:alchemy_page) } let(:root_node) { create(:alchemy_node) } @@ -2230,7 +1968,7 @@ module Alchemy create(:alchemy_node, page: page, parent: root_node) end - it 'returns all root nodes the page is attached to' do + it "returns all root nodes the page is attached to" do expect(page.menus).to include(root_node) end end diff --git a/spec/models/alchemy/picture_spec.rb b/spec/models/alchemy/picture_spec.rb index 1d3988a248..d5b5bd62c6 100644 --- a/spec/models/alchemy/picture_spec.rb +++ b/spec/models/alchemy/picture_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Picture do @@ -9,7 +9,7 @@ module Alchemy end let :image_file do - File.new(File.expand_path('../../fixtures/image.png', __dir__)) + File.new(File.expand_path("../../fixtures/image.png", __dir__)) end let(:picture) { Picture.new } @@ -25,86 +25,86 @@ module Alchemy end it "is valid with capitalized image file extension" do - image_file = File.new(File.expand_path('../../fixtures/image2.PNG', __dir__)) + image_file = File.new(File.expand_path("../../fixtures/image2.PNG", __dir__)) picture = Picture.new(image_file: image_file) expect(picture).to be_valid end it "is valid with jpeg image file extension" do - image_file = File.new(File.expand_path('../../fixtures/image3.jpeg', __dir__)) + image_file = File.new(File.expand_path("../../fixtures/image3.jpeg", __dir__)) picture = Picture.new(image_file: image_file) expect(picture).to be_valid end - context 'with enabled preprocess_image_resize config option' do + context "with enabled preprocess_image_resize config option" do let(:image_file) do - File.new(File.expand_path('../../fixtures/80x60.png', __dir__)) + File.new(File.expand_path("../../fixtures/80x60.png", __dir__)) end - context 'with > geometry string' do + context "with > geometry string" do before do allow(Config).to receive(:get) do |arg| if arg == :preprocess_image_resize - '10x10>' + "10x10>" end end end it "it resizes the image after upload" do picture = Picture.new(image_file: image_file) - expect(picture.image_file.data[0x10..0x18].unpack('NN')).to eq([10, 8]) + expect(picture.image_file.data[0x10..0x18].unpack("NN")).to eq([10, 8]) end end - context 'without > geometry string' do + context "without > geometry string" do before do allow(Config).to receive(:get) do |arg| if arg == :preprocess_image_resize - '10x10' + "10x10" end end end it "it resizes the image after upload" do picture = Picture.new(image_file: image_file) - expect(picture.image_file.data[0x10..0x18].unpack('NN')).to eq([10, 8]) + expect(picture.image_file.data[0x10..0x18].unpack("NN")).to eq([10, 8]) end end end - describe '#suffix' do + describe "#suffix" do it "should return the suffix of original filename" do - pic = stub_model(Picture, image_file_name: 'kitten.JPG') - allow(pic).to receive(:image_file).and_return(OpenStruct.new({ext: 'jpg'})) + pic = stub_model(Picture, image_file_name: "kitten.JPG") + allow(pic).to receive(:image_file).and_return(OpenStruct.new({ ext: "jpg" })) expect(pic.suffix).to eq("jpg") end context "image has no suffix" do it "should return empty string" do - pic = stub_model(Picture, image_file_name: 'kitten') - allow(pic).to receive(:image_file).and_return(OpenStruct.new({ext: ''})) + pic = stub_model(Picture, image_file_name: "kitten") + allow(pic).to receive(:image_file).and_return(OpenStruct.new({ ext: "" })) expect(pic.suffix).to eq("") end end end - describe '#humanized_name' do + describe "#humanized_name" do it "should return a humanized version of original filename" do - pic = stub_model(Picture, image_file_name: 'cute_kitten.JPG') - allow(pic).to receive(:image_file).and_return(OpenStruct.new({ext: 'jpg'})) + pic = stub_model(Picture, image_file_name: "cute_kitten.JPG") + allow(pic).to receive(:image_file).and_return(OpenStruct.new({ ext: "jpg" })) expect(pic.humanized_name).to eq("cute kitten") end it "should not remove incidents of suffix from filename" do - pic = stub_model(Picture, image_file_name: 'cute_kitten_mo.jpgi.JPG') - allow(pic).to receive(:image_file).and_return(OpenStruct.new({ext: 'jpg'})) + pic = stub_model(Picture, image_file_name: "cute_kitten_mo.jpgi.JPG") + allow(pic).to receive(:image_file).and_return(OpenStruct.new({ ext: "jpg" })) expect(pic.humanized_name).to eq("cute kitten mo.jpgi") expect(pic.humanized_name).not_to eq("cute kitten moi") end context "image has no suffix" do it "should return humanized name" do - pic = stub_model(Picture, image_file_name: 'cute_kitten') + pic = stub_model(Picture, image_file_name: "cute_kitten") allow(pic).to receive(:suffix).and_return("") expect(pic.humanized_name).to eq("cute kitten") end @@ -119,7 +119,7 @@ module Alchemy let(:query) { double(result: pictures) } let(:per_page) { nil } - it 'orders the result by name' do + it "orders the result by name" do expect(pictures).to receive(:order).with(:name) search_by end @@ -148,66 +148,66 @@ module Alchemy context "when params[:filter] is set" do let(:params) do - ActionController::Parameters.new(filter: 'recent') + ActionController::Parameters.new(filter: "recent") end it "filters the pictures collection by the given filter string" do expect(pictures).to \ - receive(:filtered_by).with(params['filter']).and_call_original + receive(:filtered_by).with(params["filter"]).and_call_original search_by end end context "when params[:tagged_with] is set" do let(:params) do - ActionController::Parameters.new(tagged_with: 'kitten') + ActionController::Parameters.new(tagged_with: "kitten") end it "filters the records by tags" do expect(pictures).to \ - receive(:tagged_with).with(params['tagged_with']).and_call_original + receive(:tagged_with).with(params["tagged_with"]).and_call_original search_by end end end - describe '.filtered_by' do + describe ".filtered_by" do let(:picture) { build_stubbed(:alchemy_picture) } context "with 'recent' as argument" do - it 'should call the .recent scope' do + it "should call the .recent scope" do expect(Picture).to receive(:recent).and_return(picture) - expect(Picture.filtered_by('recent')).to eq(picture) + expect(Picture.filtered_by("recent")).to eq(picture) end end context "with 'last_upload' as argument" do - it 'should call the .last_upload scope' do + it "should call the .last_upload scope" do expect(Picture).to receive(:last_upload).and_return(picture) - expect(Picture.filtered_by('last_upload')).to eq(picture) + expect(Picture.filtered_by("last_upload")).to eq(picture) end end context "with 'without_tag' as argument" do - it 'should call the .without_tag scope' do + it "should call the .without_tag scope" do expect(Picture).to receive(:without_tag).and_return(picture) - expect(Picture.filtered_by('without_tag')).to eq(picture) + expect(Picture.filtered_by("without_tag")).to eq(picture) end end context "with no argument" do - it 'should return the scoped collection' do + it "should return the scoped collection" do expect(Picture).to receive(:all).and_return(picture) - expect(Picture.filtered_by('')).to eq(picture) + expect(Picture.filtered_by("")).to eq(picture) end end end - describe '.last_upload' do + describe ".last_upload" do it "should return all pictures that have the same upload-hash as the most recent picture" do - other_upload = Picture.create!(image_file: image_file, upload_hash: '456') - same_upload = Picture.create!(image_file: image_file, upload_hash: '123') - most_recent = Picture.create!(image_file: image_file, upload_hash: '123') + other_upload = Picture.create!(image_file: image_file, upload_hash: "456") + same_upload = Picture.create!(image_file: image_file, upload_hash: "123") + most_recent = Picture.create!(image_file: image_file, upload_hash: "123") expect(Picture.last_upload).to include(most_recent) expect(Picture.last_upload).to include(same_upload) @@ -217,7 +217,7 @@ module Alchemy end end - describe '.recent' do + describe ".recent" do before do now = Time.current @recent = Picture.create!(image_file: image_file) @@ -235,7 +235,7 @@ module Alchemy end end - describe '#destroy' do + describe "#destroy" do context "a picture that is assigned in an essence" do let(:essence_picture) { EssencePicture.create } let(:picture) { create :alchemy_picture } @@ -253,46 +253,46 @@ module Alchemy describe "#image_file_dimensions" do it "should return the width and height in the format of '1024x768'" do picture.image_file = image_file - expect(picture.image_file_dimensions).to eq('1x1') + expect(picture.image_file_dimensions).to eq("1x1") end end - describe '#update_name_and_tag_list!' do + describe "#update_name_and_tag_list!" do let(:picture) { Picture.new(image_file: image_file) } before { allow(picture).to receive(:save!).and_return(true) } it "updates tag_list" do - expect(picture).to receive(:tag_list=).with('Foo') - picture.update_name_and_tag_list!({pictures_tag_list: 'Foo'}) + expect(picture).to receive(:tag_list=).with("Foo") + picture.update_name_and_tag_list!({ pictures_tag_list: "Foo" }) end - context 'name is present' do + context "name is present" do it "updates name" do - expect(picture).to receive(:name=).with('Foo') - picture.update_name_and_tag_list!({pictures_name: 'Foo'}) + expect(picture).to receive(:name=).with("Foo") + picture.update_name_and_tag_list!({ pictures_name: "Foo" }) end end - context 'name is not present' do + context "name is not present" do it "does not update name" do - expect(picture).not_to receive(:name=).with('Foo') - picture.update_name_and_tag_list!({pictures_name: ''}) + expect(picture).not_to receive(:name=).with("Foo") + picture.update_name_and_tag_list!({ pictures_name: "" }) end end end - describe '#urlname' do + describe "#urlname" do subject { picture.urlname } - let(:picture) { build_stubbed(:alchemy_picture, name: 'Cute kittens.jpg') } + let(:picture) { build_stubbed(:alchemy_picture, name: "Cute kittens.jpg") } it "returns a uri escaped name" do - is_expected.to eq('Cute+kittens') + is_expected.to eq("Cute+kittens") end - context 'with blank name' do - let(:picture) { build_stubbed(:alchemy_picture, name: '') } + context "with blank name" do + let(:picture) { build_stubbed(:alchemy_picture, name: "") } it "returns generic name" do is_expected.to eq("image_#{picture.id}") @@ -300,10 +300,10 @@ module Alchemy end end - describe '#to_jq_upload' do + describe "#to_jq_upload" do subject { picture.to_jq_upload } - let(:picture) { build_stubbed(:alchemy_picture, image_file_name: 'cute-kittens.jpg', image_file_size: 1024) } + let(:picture) { build_stubbed(:alchemy_picture, image_file_name: "cute-kittens.jpg", image_file_size: 1024) } it "returns a hash containing data for jquery fileuploader" do is_expected.to be_an_instance_of(Hash) @@ -311,50 +311,54 @@ module Alchemy is_expected.to include(size: picture.image_file_size) end - context 'with error' do + context "with error" do let(:picture) { build_stubbed(:alchemy_picture) } before do - expect(picture).to receive(:errors).and_return({image_file: %w(stupid_cats)}) + expect(picture).to receive(:errors).and_return({ image_file: %w(stupid_cats) }) end it "returns hash with error message" do is_expected.to be_an_instance_of(Hash) - is_expected.to include(error: 'stupid_cats') + is_expected.to include(error: "stupid_cats") end end end - describe '#restricted?' do + describe "#restricted?" do subject { picture.restricted? } let(:picture) { build_stubbed(:alchemy_picture) } - context 'is assigned on pages' do - context 'that are all restricted' do + context "is assigned on pages" do + context "that are all restricted" do before do - expect(picture).to receive(:pages).at_least(:once).and_return double( - not_restricted: double(blank?: true), - any?: true - ) + expect(picture).to receive(:pages).at_least(:once) do + double( + not_restricted: double(blank?: true), + any?: true, + ) + end end it { is_expected.to be_truthy } end - context 'that are not all restricted' do + context "that are not all restricted" do before do - expect(picture).to receive(:pages).at_least(:once).and_return double( - not_restricted: double(blank?: false), - any?: true - ) + expect(picture).to receive(:pages).at_least(:once) do + double( + not_restricted: double(blank?: false), + any?: true, + ) + end end it { is_expected.to be_falsey } end end - context 'is not assigned on any page' do + context "is not assigned on any page" do before do expect(picture).to receive(:pages).and_return double(any?: false) end @@ -363,9 +367,9 @@ module Alchemy end end - context 'navigating records' do - let!(:picture1) { create(:alchemy_picture, name: 'abc') } - let!(:picture2) { create(:alchemy_picture, name: 'def') } + context "navigating records" do + let!(:picture1) { create(:alchemy_picture, name: "abc") } + let!(:picture2) { create(:alchemy_picture, name: "def") } describe "#previous" do subject { picture2.previous } @@ -384,53 +388,53 @@ module Alchemy end end - describe '#default_render_format' do + describe "#default_render_format" do let(:picture) do - Picture.new(image_file_format: 'png') + Picture.new(image_file_format: "png") end subject { picture.default_render_format } context "when `image_output_format` is configured to `original`" do before do - stub_alchemy_config(:image_output_format, 'original') + stub_alchemy_config(:image_output_format, "original") end it "returns the image file format" do - is_expected.to eq('png') + is_expected.to eq("png") end end context "when `image_output_format` is configured to an image format" do before do - stub_alchemy_config(:image_output_format, 'jpg') + stub_alchemy_config(:image_output_format, "jpg") end context "and the format is a convertible format" do it "returns the configured file format." do - is_expected.to eq('jpg') + is_expected.to eq("jpg") end end context "but the format is not a convertible format" do before do - allow(picture).to receive(:image_file_format) { 'svg' } + allow(picture).to receive(:image_file_format) { "svg" } end it "returns the original file format." do - is_expected.to eq('svg') + is_expected.to eq("svg") end end end end - describe 'after update' do - context 'assigned to contents' do + describe "after update" do + context "assigned to contents" do let(:picture) { create(:alchemy_picture) } let(:content) do create(:alchemy_content, :essence_picture).tap do |content| - content.update_column(:updated_at, 3.hours.ago) + content.element.update_column(:updated_at, 3.hours.ago) end end @@ -438,8 +442,8 @@ module Alchemy content.essence.update(picture: picture) end - it 'touches contents' do - expect { picture.save }.to change { content.reload.updated_at } + it "touches elements" do + expect { picture.save }.to change { picture.elements.reload.first.updated_at } end end end diff --git a/spec/models/alchemy/picture_url_spec.rb b/spec/models/alchemy/picture_url_spec.rb index 015836b001..0347a22d62 100644 --- a/spec/models/alchemy/picture_url_spec.rb +++ b/spec/models/alchemy/picture_url_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe "Picture::Url" do @@ -8,14 +8,14 @@ module Alchemy # Helper to dedoce a hashed dragonfly job def decode_dragon_fly_job(url) - job = url.split('/')[2] + job = url.split("/")[2] Dragonfly::Serializer.json_b64_decode(job) end let(:image) do fixture_file_upload( - File.expand_path('../../fixtures/500x500.png', __dir__), - 'image/png' + File.expand_path("../../fixtures/500x500.png", __dir__), + "image/png", ) end @@ -28,7 +28,7 @@ def decode_dragon_fly_job(url) let(:options) { Hash.new } - it 'includes the name and render format' do + it "includes the name and render format" do expect(url).to match /\/#{picture.name}\.#{picture.default_render_format}/ end @@ -37,7 +37,7 @@ def decode_dragon_fly_job(url) expect(picture).to receive(:image_file) { nil } end - it 'returns nil' do + it "returns nil" do expect(url).to be_nil end @@ -49,10 +49,10 @@ def decode_dragon_fly_job(url) context "when a size is passed in" do let(:options) do - {size: '120x160'} + {size: "120x160"} end - it 'resizes the image without upsampling it' do + it "resizes the image without upsampling it" do job = decode_dragon_fly_job(url) expect(job[1]).to include("120x160>") end @@ -60,8 +60,8 @@ def decode_dragon_fly_job(url) context "but upsample set to true" do let(:options) do { - size: '1600x1200', - upsample: true + size: "1600x1200", + upsample: true, } end @@ -74,8 +74,8 @@ def decode_dragon_fly_job(url) context "and crop is set to true" do let(:options) do { - size: '160x120', - crop: true + size: "160x120", + crop: true, } end @@ -89,10 +89,10 @@ def decode_dragon_fly_job(url) context "and crop_from and crop_size is passed in" do let(:options) do { - crop_size: '123x44', - crop_from: '0x0', - size: '160x120', - crop: true + crop_size: "123x44", + crop_from: "0x0", + size: "160x120", + crop: true, } end @@ -160,8 +160,8 @@ def decode_dragon_fly_job(url) context "and crop is set to false" do let(:options) do { - size: '160x120', - crop: false + size: "160x120", + crop: false, } end @@ -173,10 +173,10 @@ def decode_dragon_fly_job(url) context "and crop_from and crop_size is passed in" do let(:options) do { - crop_size: '123x44', - crop_from: '0x0', - size: '160x120', - crop: false + crop_size: "123x44", + crop_from: "0x0", + size: "160x120", + crop: false, } end @@ -189,7 +189,7 @@ def decode_dragon_fly_job(url) context "with no height given" do let(:options) do - {size: '40'} + {size: "40"} end it "resizes the image inferring the height" do @@ -200,7 +200,7 @@ def decode_dragon_fly_job(url) context "with no width given" do let(:options) do - {size: 'x30'} + {size: "x30"} end it "resizes the image inferring the width" do @@ -211,7 +211,7 @@ def decode_dragon_fly_job(url) end context "when no size is passed in" do - it 'does not resize the image' do + it "does not resize the image" do # only the fetch step should be present expect(decode_dragon_fly_job(url).size).to eq(1) end @@ -219,10 +219,10 @@ def decode_dragon_fly_job(url) context "when a different format is requested" do let(:options) do - {format: 'gif'} + {format: "gif"} end - it 'converts the format' do + it "converts the format" do job = decode_dragon_fly_job(url) expect(job[1]).to include("encode", "gif") end @@ -230,30 +230,30 @@ def decode_dragon_fly_job(url) context "but image has not a convertible format (svg)" do let(:image) do fixture_file_upload( - File.expand_path('../../fixtures/icon.svg', __dir__), - 'image/svg+xml' + File.expand_path("../../fixtures/icon.svg", __dir__), + "image/svg+xml", ) end - it 'does not convert the picture format' do + it "does not convert the picture format" do # only the fetch step should be present expect(decode_dragon_fly_job(url).size).to eq(1) end end - context 'for an animated gif' do + context "for an animated gif" do let(:options) do - {format: 'png'} + {format: "png"} end let(:image) do fixture_file_upload( - File.expand_path('../../fixtures/animated.gif', __dir__), - 'image/gif' + File.expand_path("../../fixtures/animated.gif", __dir__), + "image/gif", ) end - it 'flattens the image.' do + it "flattens the image." do job = decode_dragon_fly_job(url) expect(job[1]).to include("-flatten") end @@ -262,7 +262,7 @@ def decode_dragon_fly_job(url) context "requesting a not allowed format" do let(:options) do - {format: 'zip'} + {format: "zip"} end it "returns nil" do @@ -277,20 +277,20 @@ def decode_dragon_fly_job(url) context "when jpg format is requested" do let(:options) do - {format: 'jpg'} + {format: "jpg"} end - it 'sets the default quality' do + it "sets the default quality" do job = decode_dragon_fly_job(url) expect(job[1]).to include("-quality 85") end context "and quality is passed" do let(:options) do - {format: 'jpg', quality: '30'} + {format: "jpg", quality: "30"} end - it 'sets the quality' do + it "sets the quality" do job = decode_dragon_fly_job(url) expect(job[1]).to include("-quality 30") end diff --git a/spec/models/alchemy/site_spec.rb b/spec/models/alchemy/site_spec.rb index a87c066d8d..3e3e29dfbc 100644 --- a/spec/models/alchemy/site_spec.rb +++ b/spec/models/alchemy/site_spec.rb @@ -1,24 +1,24 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Site do let(:site) { create(:alchemy_site) } - describe 'new instances' do - subject { build(:alchemy_site, host: 'bla.com') } + describe "new instances" do + subject { build(:alchemy_site, host: "bla.com") } - it 'should start out with no languages' do + it "should start out with no languages" do expect(subject.languages).to be_empty end - context 'when being saved' do - context 'when it already has a language' do + context "when being saved" do + context "when it already has a language" do let(:language) { build(:alchemy_language, site: nil) } before { subject.languages << language } - it 'should not create any additional languages' do + it "should not create any additional languages" do expect(subject.languages).to eq([language]) expect { subject.save! }. @@ -28,10 +28,10 @@ module Alchemy end end - describe '.default' do + describe ".default" do subject { Site.default } - context 'when no default site is present' do + context "when no default site is present" do before do Site.delete_all end @@ -39,56 +39,56 @@ module Alchemy it { is_expected.to be nil } end - context 'when default site is present' do - it 'returns it' do + context "when default site is present" do + it "returns it" do is_expected.to eq(Site.default) end end end - describe '.find_for_host' do + describe ".find_for_host" do # No need to create a default site, as it has already been added through the seeds. # But let's add some more: # let(:default_site) { Site.default } - let!(:magiclabs_site) { create(:alchemy_site, host: 'www.magiclabs.de', aliases: 'magiclabs.de magiclabs.com www.magiclabs.com') } + let!(:magiclabs_site) { create(:alchemy_site, host: "www.magiclabs.de", aliases: "magiclabs.de magiclabs.com www.magiclabs.com") } subject { Site.find_for_host(host) } context "when the request doesn't match anything" do - let(:host) { 'oogabooga.com' } + let(:host) { "oogabooga.com" } it { is_expected.to eq(default_site) } end context "when the request matches a site's host field" do - let(:host) { 'www.magiclabs.de' } + let(:host) { "www.magiclabs.de" } it { is_expected.to eq(magiclabs_site) } end context "when the request matches one of the site's aliases" do - let(:host) { 'magiclabs.com' } + let(:host) { "magiclabs.com" } it { is_expected.to eq(magiclabs_site) } end context "when the request matches the site's first alias" do - let(:host) { 'magiclabs.de' } + let(:host) { "magiclabs.de" } it { is_expected.to eq(magiclabs_site) } end context "when the request matches the site's last alias" do - let(:host) { 'www.magiclabs.com' } + let(:host) { "www.magiclabs.com" } it { is_expected.to eq(magiclabs_site) } end context "when the request host matches only part of a site's aliases" do - let(:host) { 'labs.com' } + let(:host) { "labs.com" } it { is_expected.to eq(default_site) } end end - describe '.current' do - context 'when set to nil' do - let!(:site) { create(:alchemy_site, host: 'example.com') } + describe ".current" do + context "when set to nil" do + let!(:site) { create(:alchemy_site, host: "example.com") } before do Site.current = nil @@ -101,14 +101,14 @@ module Alchemy end end - describe '.definitions' do + describe ".definitions" do # To prevent memoization across specs before { Site.instance_variable_set("@definitions", nil) } subject { Site.definitions } context "with file present" do - let(:definitions) { [{'name' => 'lala'}] } + let(:definitions) { [{"name" => "lala"}] } before { expect(YAML).to receive(:load_file).and_return(definitions) } it { is_expected.to eq(definitions) } end @@ -123,50 +123,50 @@ module Alchemy end end - describe '#current?' do + describe "#current?" do let!(:default_site) { create(:alchemy_site, :default) } let!(:another_site) do - create(:alchemy_site, name: 'Another Site', host: 'another.com') + create(:alchemy_site, name: "Another Site", host: "another.com") end subject { default_site.current? } - context 'when Site.current is set to the same site' do + context "when Site.current is set to the same site" do before { Site.current = default_site } it { is_expected.to be(true) } end - context 'when Site.current is set to nil' do + context "when Site.current is set to nil" do before { Site.current = nil } it { is_expected.to be(true) } end - context 'when Site.current is set to a different site' do + context "when Site.current is set to a different site" do before { Site.current = another_site } it { is_expected.to be(false) } end end - describe '#to_partial_path' do - let(:site) { Site.new(name: 'My custom site') } + describe "#to_partial_path" do + let(:site) { Site.new(name: "My custom site") } it "returns the path to partial" do expect(site.to_partial_path).to eq("alchemy/site_layouts/my_custom_site") end end - describe '#partial_name' do - let(:site) { Site.new(name: 'My custom site') } + describe "#partial_name" do + let(:site) { Site.new(name: "My custom site") } it "returns the name for layout partial" do expect(site.partial_name).to eq("my_custom_site") end end - describe '#definition' do - let(:site) { Site.new(name: 'My custom site') } - let(:definitions) { [{'name' => 'my_custom_site', 'page_layouts' => %w(standard)}] } + describe "#definition" do + let(:site) { Site.new(name: "My custom site") } + let(:definitions) { [{"name" => "my_custom_site", "page_layouts" => %w(standard)}] } it "returns layout definition from site_layouts.yml file" do allow(Site).to receive(:definitions).and_return(definitions) @@ -174,42 +174,42 @@ module Alchemy end end - describe '#default_language' do + describe "#default_language" do let!(:default_language) do create(:alchemy_language, default: true, site: site) end let!(:other_language) do - create(:alchemy_language, :english, default: false, site: site) + create(:alchemy_language, :german, default: false, site: site) end subject(:site_default_language) do site.default_language end - it 'returns the default language of site', :aggregate_failures do + it "returns the default language of site", :aggregate_failures do expect(site.languages.count).to eq(2) expect(site_default_language).to eq(default_language) expect(site_default_language).to_not eq(other_language) end end - describe '#destroy' do + describe "#destroy" do let(:site) { create(:alchemy_site) } subject { site.destroy } - context 'without languages' do - it 'works' do + context "without languages" do + it "works" do subject expect(site.errors[:languages]).to be_empty end end - context 'with languages' do + context "with languages" do let!(:language) { create(:alchemy_language, site: site) } - it 'must not work' do + it "must not work" do subject expect(site.errors[:languages]).to_not be_empty end diff --git a/spec/models/alchemy/tag_spec.rb b/spec/models/alchemy/tag_spec.rb index 8660b91a70..34f3784074 100644 --- a/spec/models/alchemy/tag_spec.rb +++ b/spec/models/alchemy/tag_spec.rb @@ -1,30 +1,30 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Tag do - describe '.replace' do + describe ".replace" do let(:picture) { Picture.new } let(:element) { Element.new } - let(:tag) { Tag.new(name: 'red') } - let(:new_tag) { Tag.new(name: 'green') } + let(:tag) { Tag.new(name: "red") } + let(:new_tag) { Tag.new(name: "green") } before do - allow(picture).to receive(:tag_list).and_return(['red']) - allow(element).to receive(:tag_list).and_return(['red']) + allow(picture).to receive(:tag_list).and_return(["red"]) + allow(element).to receive(:tag_list).and_return(["red"]) allow(picture).to receive(:save).and_return(true) allow(element).to receive(:save).and_return(true) allow(tag).to receive(:taggings).and_return([ mock_model(Gutentag::Tagging, taggable: picture), - mock_model(Gutentag::Tagging, taggable: element) + mock_model(Gutentag::Tagging, taggable: element), ]) end it "should replace given tag with new one on all models tagged with tag" do Tag.replace(tag, new_tag) - expect(picture.tag_list).to eq(['green']) - expect(element.tag_list).to eq(['green']) + expect(picture.tag_list).to eq(["green"]) + expect(element.tag_list).to eq(["green"]) end end end diff --git a/spec/models/dummy_model_spec.rb b/spec/models/dummy_model_spec.rb index 53ebf9435d..b495b4913c 100644 --- a/spec/models/dummy_model_spec.rb +++ b/spec/models/dummy_model_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -describe 'A User-defined Essence' do +describe "A User-defined Essence" do describe DummyModel do it_behaves_like "an essence" do let(:essence) { DummyModel.new } diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 20d558b3ed..7aa12f3f82 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -1,33 +1,33 @@ # frozen_string_literal: true -require_relative './spec_helper' +require_relative "./spec_helper" # Configure Rails Environment ENV["RAILS_ENV"] = "test" -require_relative('dummy/config/environment.rb') - -require 'capybara/rails' -require 'capybara-screenshot/rspec' -require 'rails-controller-testing' -require 'rspec-activemodel-mocks' -require 'rspec/rails' -require 'webdrivers/chromedriver' -require 'shoulda-matchers' - -require 'alchemy/seeder' -require 'alchemy/test_support/config_stubbing' -require 'alchemy/test_support/essence_shared_examples' -require 'alchemy/test_support/integration_helpers' -require 'alchemy/test_support/factories' -require 'alchemy/test_support/shared_contexts' -require 'alchemy/test_support/shared_uploader_examples' - -require_relative 'factories' +require_relative("dummy/config/environment.rb") + +require "capybara/rails" +require "capybara-screenshot/rspec" +require "rails-controller-testing" +require "rspec-activemodel-mocks" +require "rspec/rails" +require "webdrivers/chromedriver" +require "shoulda-matchers" + +require "alchemy/seeder" +require "alchemy/test_support/config_stubbing" +require "alchemy/test_support/essence_shared_examples" +require "alchemy/test_support/integration_helpers" +require "alchemy/test_support/factories" +require "alchemy/test_support/shared_contexts" +require "alchemy/test_support/shared_uploader_examples" + +require_relative "factories" require_relative "support/hint_examples.rb" require_relative "support/transformation_examples.rb" require_relative "support/capybara_helpers.rb" -require_relative 'support/custom_news_elements_finder' +require_relative "support/custom_news_elements_finder" ActionMailer::Base.delivery_method = :test ActionMailer::Base.perform_deliveries = true @@ -46,11 +46,11 @@ Capybara.register_driver :selenium_chrome_headless do |app| Capybara::Selenium::Driver.load_selenium browser_options = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts| - opts.args << '--headless' - opts.args << '--disable-gpu' if Gem.win_platform? + opts.args << "--headless" + opts.args << "--disable-gpu" if Gem.win_platform? # Workaround https://bugs.chromium.org/p/chromedriver/issues/detail?id=2650&q=load&sort=-id&colspec=ID%20Status%20Pri%20Owner%20Summary - opts.args << '--disable-site-isolation-trials' - opts.args << '--window-size=1280,800' + opts.args << "--disable-site-isolation-trials" + opts.args << "--window-size=1280,800" end Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options) end diff --git a/spec/requests/alchemy/admin/contents_controller_spec.rb b/spec/requests/alchemy/admin/contents_controller_spec.rb index dd02b716c5..7086dbda2b 100644 --- a/spec/requests/alchemy/admin/contents_controller_spec.rb +++ b/spec/requests/alchemy/admin/contents_controller_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Admin::ContentsController do @@ -8,13 +8,13 @@ module Alchemy authorize_user(:as_admin) end - context 'with element_id parameter' do - describe '#create' do - let(:element) { create(:alchemy_element, name: 'headline') } + context "with element_id parameter" do + describe "#create" do + let(:element) { create(:alchemy_element, name: "headline") } it "creates a content from name" do expect { - post admin_contents_path(content: {element_id: element.id, name: 'headline'}, format: :js) + post admin_contents_path(content: {element_id: element.id, name: "headline"}, format: :js) }.to change { Alchemy::Content.count }.by(1) end end diff --git a/spec/requests/alchemy/admin/pages_controller_spec.rb b/spec/requests/alchemy/admin/pages_controller_spec.rb index 4bd7321562..0caea6bed5 100644 --- a/spec/requests/alchemy/admin/pages_controller_spec.rb +++ b/spec/requests/alchemy/admin/pages_controller_spec.rb @@ -1,35 +1,35 @@ # frozen_string_literal: true -require 'ostruct' -require 'rails_helper' +require "ostruct" +require "rails_helper" module Alchemy describe Admin::PagesController do let(:site) { create(:alchemy_site, host: "*") } - context 'a guest' do - it 'can not access page tree' do + context "a guest" do + it "can not access page tree" do get admin_pages_path expect(request).to redirect_to(Alchemy.login_path) end end - context 'a member' do + context "a member" do before { authorize_user(build(:alchemy_dummy_user)) } - it 'can not access page tree' do + it "can not access page tree" do get admin_pages_path expect(request).to redirect_to(root_path) end end - context 'with logged in editor user' do + context "with logged in editor user" do let(:user) { build(:alchemy_dummy_user, :as_editor) } before { authorize_user(user) } - describe '#index' do - context 'with existing language root page' do + describe "#index" do + context "with existing language root page" do let!(:language_root) { create(:alchemy_page, :language_root) } it "assigns @page_root variable" do @@ -38,17 +38,17 @@ module Alchemy end end - context 'without current language present' do + context "without current language present" do it "it redirects to the languages admin" do get admin_pages_path expect(response).to redirect_to(alchemy.admin_languages_path) end end - context 'with current language present' do + context "with current language present" do let!(:language) { create(:alchemy_language, site: site) } - context 'without language root page' do + context "without language root page" do before do expect_any_instance_of(Language).to receive(:root_page).and_return(nil) end @@ -60,11 +60,11 @@ module Alchemy context "with multiple sites" do let!(:site_1_language_2) do - create(:alchemy_language, code: 'fr') + create(:alchemy_language, code: "fr") end let!(:site_2) do - create(:alchemy_site, host: 'another-one.com') + create(:alchemy_site, host: "another-one.com") end let(:site_2_language) do @@ -86,54 +86,60 @@ module Alchemy end end - describe '#tree' do - let(:user) { create(:alchemy_dummy_user, :as_editor) } - let(:page_1) { create(:alchemy_page, visible: true, name: 'one') } - let(:page_2) { create(:alchemy_page, visible: true, name: 'two', parent_id: page_1.id) } - let(:page_3) { create(:alchemy_page, visible: true, name: 'three', parent_id: page_2.id) } + describe "#tree" do + let(:user) { create(:alchemy_dummy_user, :as_editor) } + let(:page_1) { create(:alchemy_page, name: "one") } + let(:page_2) { create(:alchemy_page, name: "two", parent_id: page_1.id) } + let(:page_3) { create(:alchemy_page, name: "three", parent_id: page_2.id) } let!(:pages) { [page_1, page_2, page_3] } subject :get_tree do - get tree_admin_pages_path(id: page_1.id, full: 'true') + get tree_admin_pages_path(id: page_1.id, full: "true") end - it 'returns a tree as JSON' do + it "returns a tree as JSON" do get_tree expect(response.status).to eq(200) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) - expect(result).to have_key('pages') - expect(result['pages'].count).to eq(1) + expect(result).to have_key("pages") + expect(result["pages"].count).to eq(1) - page = result['pages'].first + page = result["pages"].first - expect(page).to have_key('id') - expect(page['id']).to eq(page_1.id) - expect(page).to have_key('name') - expect(page['name']).to eq(page_1.name) - expect(page).to have_key('children') - expect(page['children'].count).to eq(1) + expect(page).to have_key("id") + expect(page["id"]).to eq(page_1.id) + expect(page).to have_key("name") + expect(page["name"]).to eq(page_1.name) + expect(page).to have_key("children") + expect(page["children"].count).to eq(1) + expect(page).to have_key("url_path") + expect(page["url_path"]).to eq(page_1.url_path) - page = page['children'].first + page = page["children"].first - expect(page).to have_key('id') - expect(page['id']).to eq(page_2.id) - expect(page).to have_key('name') - expect(page['name']).to eq(page_2.name) - expect(page).to have_key('children') - expect(page['children'].count).to eq(1) + expect(page).to have_key("id") + expect(page["id"]).to eq(page_2.id) + expect(page).to have_key("name") + expect(page["name"]).to eq(page_2.name) + expect(page).to have_key("children") + expect(page["children"].count).to eq(1) + expect(page).to have_key("url_path") + expect(page["url_path"]).to eq(page_2.url_path) - page = page['children'].first + page = page["children"].first - expect(page).to have_key('id') - expect(page['id']).to eq(page_3.id) - expect(page).to have_key('name') - expect(page['name']).to eq(page_3.name) - expect(page).to have_key('children') - expect(page['children'].count).to eq(0) + expect(page).to have_key("id") + expect(page["id"]).to eq(page_3.id) + expect(page).to have_key("name") + expect(page["name"]).to eq(page_3.name) + expect(page).to have_key("children") + expect(page["children"].count).to eq(0) + expect(page).to have_key("url_path") + expect(page["url_path"]).to eq(page_3.url_path) end context "when branch is folded" do @@ -141,16 +147,16 @@ module Alchemy page_2.fold!(user.id, true) end - it 'does not return a branch that is folded' do - get tree_admin_pages_path(id: page_1.id, full: 'false') + it "does not return a branch that is folded" do + get tree_admin_pages_path(id: page_1.id, full: "false") expect(response.status).to eq(200) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) - page = result['pages'].first['children'].first + page = result["pages"].first["children"].first - expect(page['children'].count).to eq(0) + expect(page["children"].count).to eq(0) end end @@ -159,20 +165,20 @@ module Alchemy page_1.lock_to!(user) end - it 'includes locked_notice if page is locked' do + it "includes locked_notice if page is locked" do get_tree expect(response.status).to eq(200) - expect(response.media_type).to eq('application/json') + expect(response.media_type).to eq("application/json") result = JSON.parse(response.body) - expect(result).to have_key('pages') - expect(result['pages'].count).to eq(1) + expect(result).to have_key("pages") + expect(result["pages"].count).to eq(1) - page = result['pages'].first - expect(page).to have_key('locked_notice') - expect(page['locked_notice']).to match(/#{user.name}/) + page = result["pages"].first + expect(page).to have_key("locked_notice") + expect(page["locked_notice"]).to match(/#{user.name}/) end end end @@ -195,15 +201,13 @@ module Alchemy end let(:layout_page_1) do - create :alchemy_page, - layoutpage: true, + create :alchemy_page, :layoutpage, name: "layout_page 1", published_at: Time.current - 5.days end let(:layout_page_2) do - create :alchemy_page, - layoutpage: true, + create :alchemy_page, :layoutpage, name: "layout_page 2", published_at: Time.current - 8.days end @@ -238,23 +242,23 @@ module Alchemy end end - describe '#new' do - context 'if no language is present' do - it 'redirects to the language admin' do + describe "#new" do + context "if no language is present" do + it "redirects to the language admin" do get new_admin_page_path expect(response).to redirect_to(admin_languages_path) end end - context 'with current language present' do + context "with current language present" do let!(:language) { create(:alchemy_language) } context "pages in clipboard" do - let(:page) { mock_model(Alchemy::Page, name: 'Foobar') } + let(:page) { mock_model(Alchemy::Page, name: "Foobar") } before do - allow_any_instance_of(described_class).to receive(:get_clipboard).with('pages') do - [{'id' => page.id.to_s, 'action' => 'copy'}] + allow_any_instance_of(described_class).to receive(:get_clipboard).with("pages") do + [{ "id" => page.id.to_s, "action" => "copy" }] end end @@ -266,8 +270,8 @@ module Alchemy end end - describe '#show' do - let(:language) { create(:alchemy_language, locale: 'nl') } + describe "#show" do + let(:language) { create(:alchemy_language, locale: "nl") } let!(:page) { create(:alchemy_page, language: language) } it "should assign @preview_mode with true" do @@ -287,30 +291,30 @@ module Alchemy it "renders the application layout" do get admin_page_path(page) - expect(response).to render_template(layout: 'application') + expect(response).to render_template(layout: "application") end - context 'when layout is set to custom' do + context "when layout is set to custom" do before do allow(Alchemy::Config).to receive(:get) do |arg| - arg == :admin_page_preview_layout ? 'custom' : Alchemy::Config.parameter(arg) + arg == :admin_page_preview_layout ? "custom" : Alchemy::Config.parameter(arg) end end it "it renders custom layout instead" do get admin_page_path(page) - expect(response).to render_template(layout: 'custom') + expect(response).to render_template(layout: "custom") end end end - describe '#order' do - let(:page_1) { create(:alchemy_page, visible: true) } - let(:page_2) { create(:alchemy_page, visible: true) } - let(:page_3) { create(:alchemy_page, visible: true) } - let(:page_item_1) { {id: page_1.id, slug: page_1.slug, restricted: false, visible: page_1.visible?, children: [page_item_2]} } - let(:page_item_2) { {id: page_2.id, slug: page_2.slug, restricted: false, visible: page_2.visible?, children: [page_item_3]} } - let(:page_item_3) { {id: page_3.id, slug: page_3.slug, restricted: false, visible: page_3.visible? } } + describe "#order" do + let(:page_1) { create(:alchemy_page) } + let(:page_2) { create(:alchemy_page) } + let(:page_3) { create(:alchemy_page) } + let(:page_item_1) { { id: page_1.id, slug: page_1.slug, restricted: false, children: [page_item_2] } } + let(:page_item_2) { { id: page_2.id, slug: page_2.slug, restricted: false, children: [page_item_3] } } + let(:page_item_3) { { id: page_3.id, slug: page_3.slug, restricted: false } } let(:set_of_pages) { [page_item_1] } it "stores the new order" do @@ -319,90 +323,65 @@ module Alchemy expect(page_1.descendants).to eq([page_2, page_3]) end - context 'with url nesting enabled' do - before do - stub_alchemy_config(:url_nesting, true) - end + it "updates the pages urlnames" do + post order_admin_pages_path(set: set_of_pages.to_json), xhr: true + [page_1, page_2, page_3].map(&:reload) + expect(page_1.urlname).to eq(page_1.slug.to_s) + expect(page_2.urlname).to eq("#{page_1.slug}/#{page_2.slug}") + expect(page_3.urlname).to eq("#{page_1.slug}/#{page_2.slug}/#{page_3.slug}") + end - it "updates the pages urlnames" do - post order_admin_pages_path(set: set_of_pages.to_json), xhr: true - [page_1, page_2, page_3].map(&:reload) - expect(page_1.urlname).to eq(page_1.slug.to_s) - expect(page_2.urlname).to eq("#{page_1.slug}/#{page_2.slug}") - expect(page_3.urlname).to eq("#{page_1.slug}/#{page_2.slug}/#{page_3.slug}") + context "with restricted page in tree" do + let(:page_2) { create(:alchemy_page, restricted: true) } + let(:page_item_2) do + { + id: page_2.id, + slug: page_2.slug, + children: [page_item_3], + restricted: true, + } end - context 'with invisible page in tree' do - let(:page_item_2) do - { - id: page_2.id, - slug: page_2.slug, - children: [page_item_3], - visible: false - } - end - - it "does not use this pages slug in urlnames of descendants" do - post order_admin_pages_path(set: set_of_pages.to_json), xhr: true - [page_1, page_2, page_3].map(&:reload) - expect(page_1.urlname).to eq(page_1.slug.to_s) - expect(page_2.urlname).to eq("#{page_1.slug}/#{page_2.slug}") - expect(page_3.urlname).to eq("#{page_1.slug}/#{page_3.slug}") - end + it "updates restricted status of descendants" do + post order_admin_pages_path(set: set_of_pages.to_json), xhr: true + page_3.reload + expect(page_3.restricted).to be_truthy end + end - context 'with restricted page in tree' do - let(:page_2) { create(:alchemy_page, restricted: true) } - let(:page_item_2) do - { - id: page_2.id, - slug: page_2.slug, - children: [page_item_3], - restricted: true - } - end - - it "updates restricted status of descendants" do - post order_admin_pages_path(set: set_of_pages.to_json), xhr: true - page_3.reload - expect(page_3.restricted).to be_truthy - end + context "with page having number as slug" do + let(:page_item_2) do + { + id: page_2.id, + slug: 42, + children: [page_item_3], + } end - context 'with page having number as slug' do - let(:page_item_2) do - { - id: page_2.id, - slug: 42, - children: [page_item_3] - } - end - - it "does not raise error" do - expect { - post order_admin_pages_path(set: set_of_pages.to_json), xhr: true - }.not_to raise_error - end - - it "still generates the correct urlname on page_3" do + it "does not raise error" do + expect { post order_admin_pages_path(set: set_of_pages.to_json), xhr: true - [page_1, page_2, page_3].map(&:reload) - expect(page_3.urlname).to eq("#{page_1.slug}/#{page_2.slug}/#{page_3.slug}") - end + }.not_to raise_error end - it "creates legacy urls" do + it "still generates the correct urlname on page_3" do post order_admin_pages_path(set: set_of_pages.to_json), xhr: true - [page_2, page_3].map(&:reload) - expect(page_2.legacy_urls.size).to eq(1) - expect(page_3.legacy_urls.size).to eq(1) + [page_1, page_2, page_3].map(&:reload) + expect(page_3.urlname).to eq("#{page_1.slug}/#{page_2.slug}/#{page_3.slug}") end end + + it "creates legacy urls" do + post order_admin_pages_path(set: set_of_pages.to_json), xhr: true + [page_2, page_3].map(&:reload) + expect(page_2.legacy_urls.size).to eq(1) + expect(page_3.legacy_urls.size).to eq(1) + end end describe "#configure" do context "with page having nested urlname" do - let(:page) { create(:alchemy_page, name: 'Foobar', urlname: 'foobar') } + let(:page) { create(:alchemy_page, name: "Foobar", urlname: "foobar") } it "should always show the slug" do get configure_admin_page_path(page), xhr: true @@ -411,7 +390,7 @@ module Alchemy end end - describe '#create' do + describe "#create" do subject { post admin_pages_path(page: page_params) } let(:parent) { create(:alchemy_page) } @@ -419,8 +398,9 @@ module Alchemy let(:page_params) do { parent_id: parent.id, - name: 'new Page', - page_layout: 'standard' + name: "new Page", + page_layout: "standard", + language_id: parent.language_id, } end @@ -438,7 +418,7 @@ module Alchemy let(:page_params) do { parent_id: parent.id, - name: 'new Page' + name: "new Page", } end @@ -460,7 +440,7 @@ module Alchemy let(:page_params) do { parent_id: parent.id, - name: 'new Page' + name: "new Page", } end @@ -470,13 +450,13 @@ module Alchemy end end - context 'if page is scoped' do - context 'user role does not match' do + context "if page is scoped" do + context "user role does not match" do before do allow_any_instance_of(Page).to receive(:editable_by?).with(user).and_return(false) end - it 'redirects to admin pages path' do + it "redirects to admin pages path" do post admin_pages_path(page: page_params) expect(response).to redirect_to(admin_pages_path) end @@ -488,38 +468,35 @@ module Alchemy let(:page_in_clipboard) { create(:alchemy_page) } it "should call Page#copy_and_paste" do - expect(Page).to receive(:copy_and_paste). - with(page_in_clipboard, parent, page_params[:name]) + expect(Page).to receive(:copy_and_paste).with( + page_in_clipboard, + parent, + page_params[:name], + ) post admin_pages_path( page: page_params, - paste_from_clipboard: page_in_clipboard.id + paste_from_clipboard: page_in_clipboard.id, ), xhr: true end end end - describe '#copy_language_tree' do - let(:params) { {languages: {new_lang_id: '2', old_lang_id: '1'}} } + describe "#copy_language_tree" do + let(:params) { { languages: { new_lang_id: "2", old_lang_id: "1" } } } let(:language_root_to_copy_from) { build_stubbed(:alchemy_page, :language_root) } - let(:copy_of_language_root) { build_stubbed(:alchemy_page, :language_root) } - let(:root_page) { mock_model('Page') } + let(:copy_of_language_root) { build_stubbed(:alchemy_page, :language_root) } + let(:root_page) { mock_model("Page") } before do allow(Page).to receive(:copy).and_return(copy_of_language_root) - allow(Page).to receive(:root).and_return(root_page) allow(Page).to receive(:language_root_for).and_return(language_root_to_copy_from) allow_any_instance_of(Page).to receive(:move_to_child_of) allow_any_instance_of(Page).to receive(:copy_children_to) - allow(Language).to receive(:current).and_return(mock_model('Language', locale: 'de', code: 'de')) + allow(Language).to receive(:current).and_return(mock_model("Language", locale: "de", code: "de")) end it "should copy the language root page over to the other language" do - expect(Page).to receive(:copy).with(language_root_to_copy_from, {language_id: '2', language_code: 'de'}) - post copy_language_tree_admin_pages_path(params) - end - - it "should move the newly created language-root-page below the absolute root page" do - expect(copy_of_language_root).to receive(:move_to_child_of).with(root_page) + expect(Page).to receive(:copy).with(language_root_to_copy_from, { language_id: "2", language_code: "de" }) post copy_language_tree_admin_pages_path(params) end @@ -540,59 +517,59 @@ module Alchemy end end - describe '#edit' do - let!(:page) { create(:alchemy_page) } + describe "#edit" do + let!(:page) { create(:alchemy_page) } let!(:other_user) { create(:alchemy_dummy_user, :as_author) } - context 'if page is locked by another user' do + context "if page is locked by another user" do before { page.lock_to!(other_user) } - context 'that is signed in' do + context "that is signed in" do before do expect_any_instance_of(DummyUser).to receive(:logged_in?).and_return(true) end - it 'redirects to sitemap' do + it "redirects to sitemap" do get edit_admin_page_path(page) expect(response).to redirect_to(admin_pages_path) end end - context 'that is not signed in' do + context "that is not signed in" do before do expect_any_instance_of(DummyUser).to receive(:logged_in?).and_return(false) end - it 'renders the edit view' do + it "renders the edit view" do get edit_admin_page_path(page) expect(response).to render_template(:edit) end end end - context 'if page is locked by myself' do + context "if page is locked by myself" do before do expect_any_instance_of(Page).to receive(:locker).at_least(:once) { user } expect(user).to receive(:logged_in?).and_return(true) end - it 'renders the edit view' do + it "renders the edit view" do get edit_admin_page_path(page) expect(response).to render_template(:edit) end - it 'does not lock the page again' do + it "does not lock the page again" do expect_any_instance_of(Alchemy::Page).to_not receive(:lock_to!) get edit_admin_page_path(page) end end - context 'if page is not locked' do + context "if page is not locked" do before do expect_any_instance_of(Page).to receive(:locker).at_least(:once) { nil } end - it 'renders the edit view' do + it "renders the edit view" do get edit_admin_page_path(page) expect(response).to render_template(:edit) end @@ -603,25 +580,25 @@ module Alchemy end end - context 'if page is scoped' do - context 'to a single role' do - context 'user role matches' do + context "if page is scoped" do + context "to a single role" do + context "user role matches" do before do expect_any_instance_of(Page).to receive(:editable_by?).at_least(:once) { true } end - it 'renders the edit view' do + it "renders the edit view" do get edit_admin_page_path(page) expect(response).to render_template(:edit) end end - context 'user role does not match' do + context "user role does not match" do before do expect_any_instance_of(Page).to receive(:editable_by?).at_least(:once) { false } end - it 'redirects to admin dashboard' do + it "redirects to admin dashboard" do get edit_admin_page_path(page) expect(response).to redirect_to(admin_dashboard_path) end @@ -630,12 +607,12 @@ module Alchemy end end - describe '#destroy' do - let(:clipboard) { [{'id' => page.id.to_s}] } + describe "#destroy" do + let(:clipboard) { [{ "id" => page.id.to_s }] } let(:page) { create(:alchemy_page, :public) } before do - allow_any_instance_of(described_class).to receive(:get_clipboard).with('pages') do + allow_any_instance_of(described_class).to receive(:get_clipboard).with("pages") do clipboard end end @@ -646,7 +623,7 @@ module Alchemy end end - describe '#publish' do + describe "#publish" do let(:page) { create(:alchemy_page, published_at: 3.days.ago) } it "should publish the page" do @@ -656,12 +633,12 @@ module Alchemy end end - describe '#visit' do + describe "#visit" do subject do post visit_admin_page_path(page) end - let(:page) { create(:alchemy_page, urlname: 'home', site: site) } + let(:page) { create(:alchemy_page, urlname: "home", site: site) } context "when the pages site is a catch-all" do let(:site) { create(:alchemy_site, host: "*") } @@ -680,7 +657,7 @@ module Alchemy end end - describe '#fold' do + describe "#fold" do let(:page) { create(:alchemy_page) } before do @@ -707,10 +684,10 @@ module Alchemy end end - describe '#unlock' do + describe "#unlock" do subject { post unlock_admin_page_path(page), xhr: true } - let(:page) { create(:alchemy_page, name: 'Best practices') } + let(:page) { create(:alchemy_page, name: "Best practices") } before do allow(Page).to receive(:find).with(page.id.to_s).and_return(page) @@ -723,18 +700,18 @@ module Alchemy is_expected.to eq(200) end - context 'requesting for html format' do + context "requesting for html format" do subject { post unlock_admin_page_path(page) } it "should redirect to admin_pages_path" do is_expected.to redirect_to(admin_pages_path) end - context 'if passing :redirect_to through params' do - subject { post unlock_admin_page_path(page, redirect_to: 'this/path') } + context "if passing :redirect_to through params" do + subject { post unlock_admin_page_path(page, redirect_to: "this/path") } it "should redirect to the given path" do - is_expected.to redirect_to('this/path') + is_expected.to redirect_to("this/path") end end end diff --git a/spec/requests/alchemy/admin/resources_requests_spec.rb b/spec/requests/alchemy/admin/resources_requests_spec.rb index 765816d6d1..94d3224a27 100644 --- a/spec/requests/alchemy/admin/resources_requests_spec.rb +++ b/spec/requests/alchemy/admin/resources_requests_spec.rb @@ -1,28 +1,28 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -RSpec.describe 'Resource requests' do - describe 'csv export' do - it 'returns valid csv file' do - get '/admin/events.csv' - expect(response.media_type).to eq('text/csv') - expect(response.body).to include(';') +RSpec.describe "Resource requests" do + describe "csv export" do + it "returns valid csv file" do + get "/admin/events.csv" + expect(response.media_type).to eq("text/csv") + expect(response.body).to include(";") end - it 'includes id column' do + it "includes id column" do event = create(:event) - get '/admin/events.csv' + get "/admin/events.csv" csv = CSV.parse(response.body, col_sep: ";") - expect(csv[0][0]).to eq('Id') + expect(csv[0][0]).to eq("Id") expect(csv[1][0]).to eq(event.id.to_s) end - it 'body does not truncate long text columns' do - create(:event, description: '*' * 51) - get '/admin/events.csv' + it "body does not truncate long text columns" do + create(:event, description: "*" * 51) + get "/admin/events.csv" csv = CSV.parse(response.body, col_sep: ";") - expect(csv[1][7]).to_not include('...') + expect(csv[1][7]).to_not include("...") end end end diff --git a/spec/requests/alchemy/admin/site_requests_spec.rb b/spec/requests/alchemy/admin/site_requests_spec.rb index fb7c5dc2b4..2cd5abcf1c 100644 --- a/spec/requests/alchemy/admin/site_requests_spec.rb +++ b/spec/requests/alchemy/admin/site_requests_spec.rb @@ -1,18 +1,18 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -RSpec.describe 'Admin site requests' do +RSpec.describe "Admin site requests" do before do authorize_user(:as_admin) end - context 'a site with host' do - let!(:site) { create(:alchemy_site, :public, host: 'alchemy-cms.com') } + context "a site with host" do + let!(:site) { create(:alchemy_site, :public, host: "alchemy-cms.com") } let(:another_site) { Alchemy::Site.default } - context 'in params' do - it 'loads dashboard of another site by id and stores it in the session' do + context "in params" do + it "loads dashboard of another site by id and stores it in the session" do get "http://#{site.host}/admin/dashboard?site_id=#{another_site.id}" expect(assigns(:current_alchemy_site).id).to eq(another_site.id) diff --git a/spec/requests/alchemy/api/nodes_controller_spec.rb b/spec/requests/alchemy/api/nodes_controller_spec.rb index 2f2b6d19fd..f89407edb9 100644 --- a/spec/requests/alchemy/api/nodes_controller_spec.rb +++ b/spec/requests/alchemy/api/nodes_controller_spec.rb @@ -1,57 +1,118 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy describe Api::NodesController do - describe '#move' do - let!(:root_node) { create(:alchemy_node, name: 'main_menu') } + describe "#index" do + context "without a Language present" do + let(:result) { JSON.parse(response.body) } + + it "returns JSON" do + get alchemy.api_nodes_path(params: {format: :json}) + expect(result["data"]).to eq([]) + end + end + + context "with nodes present" do + let!(:node) { create(:alchemy_node, name: "lol") } + let!(:node2) { create(:alchemy_node, name: "yup") } + let(:result) { JSON.parse(response.body) } + + it "returns JSON" do + get alchemy.api_nodes_path(params: {format: :json}) + expect(response.status).to eq(200) + expect(response.media_type).to eq("application/json") + expect(result).to have_key("data") + end + + it "returns all nodes" do + get alchemy.api_nodes_path(params: {format: :json}) + + expect(result["data"].size).to eq(2) + end + + it "includes meta data" do + get alchemy.api_nodes_path(params: {format: :json}) + + expect(result["data"].size).to eq(2) + expect(result["meta"]["page"]).to eq(1) + expect(result["meta"]["per_page"]).to eq(2) + expect(result["meta"]["total_count"]).to eq(2) + end + + context "with page param given" do + before do + expect(Kaminari.config).to receive(:default_per_page).at_least(:once) { 1 } + end + + it "returns paginated result" do + get alchemy.api_nodes_path(params: {format: :json, page: 2}) + + expect(result["data"].size).to eq(1) + expect(result["meta"]["page"]).to eq(2) + expect(result["meta"]["per_page"]).to eq(1) + expect(result["meta"]["total_count"]).to eq(2) + end + end + + context "with ransack query param given" do + it "returns filtered result" do + get alchemy.api_nodes_path(params: {format: :json, filter: {name_eq: "yup"}}) + + expect(result["data"].size).to eq(1) + end + end + end + end + + describe "#move" do + let!(:root_node) { create(:alchemy_node, name: "main_menu") } let!(:page_node) { create(:alchemy_node, :with_page, parent: root_node) } let!(:page_node_2) { create(:alchemy_node, :with_page, parent: root_node) } let!(:url_node) { create(:alchemy_node, :with_url, parent: root_node) } - context 'with authorized access' do + context "with authorized access" do before do authorize_user(:as_admin) end - it 'returns JSON and moves the node' do + it "returns JSON and moves the node" do expect(page_node.children).to be_empty expect(url_node.lft).to eq(6) patch alchemy.move_api_node_path(url_node, format: :json), params: { target_parent_id: page_node.id, - new_position: 0 + new_position: 0, } expect(response.status).to eq(200) response_json = JSON.parse(response.body) - expect(response_json['parent_id']).to eq(page_node.id) + expect(response_json["parent_id"]).to eq(page_node.id) expect(page_node.children).to include(url_node) end end - context 'with unauthorized access' do + context "with unauthorized access" do before do authorize_user end - it 'returns an unauthorized error' do + it "returns an unauthorized error" do patch alchemy.move_api_node_path(url_node, format: :json), params: { target_parent_id: page_node.id, - new_position: 0 + new_position: 0, } expect(response).to be_forbidden response_json = JSON.parse(response.body) - expect(response_json['error']).to eq('Not authorized') + expect(response_json["error"]).to eq("Not authorized") end end end - - describe '#toggle_folded' do - context 'with expanded node' do + describe "#toggle_folded" do + context "with expanded node" do let(:node) { create(:alchemy_node, folded: false) } - context 'with authorized access' do + context "with authorized access" do before do authorize_user(:as_admin) end @@ -63,7 +124,7 @@ module Alchemy end end - context 'with unauthorized access' do + context "with unauthorized access" do before do authorize_user end @@ -75,12 +136,12 @@ module Alchemy expect(response).to be_forbidden response_json = JSON.parse(response.body) - expect(response_json['error']).to eq('Not authorized') + expect(response_json["error"]).to eq("Not authorized") end end end - context 'with folded node' do + context "with folded node" do let(:node) { create(:alchemy_node, folded: true) } before do @@ -93,7 +154,7 @@ module Alchemy }.to change { node.reload.folded }.to(false) end - context 'with node having children' do + context "with node having children" do before do create(:alchemy_node, parent: node) end @@ -102,7 +163,7 @@ module Alchemy patch alchemy.toggle_folded_api_node_path(node) expect(response).to be_successful response_json = JSON.parse(response.body) - expect(response_json['id']).to eq(node.id) + expect(response_json["id"]).to eq(node.id) end end end diff --git a/spec/requests/alchemy/legacy_page_redirecting_spec.rb b/spec/requests/alchemy/legacy_page_redirecting_spec.rb index cfd0f264c3..468db2d41f 100644 --- a/spec/requests/alchemy/legacy_page_redirecting_spec.rb +++ b/spec/requests/alchemy/legacy_page_redirecting_spec.rb @@ -1,36 +1,36 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -RSpec.describe 'Redirecting to legacy page urls' do +RSpec.describe "Redirecting to legacy page urls" do let(:page) do - create(:alchemy_page, :public, name: 'New page name') + create(:alchemy_page, :public, name: "New page name") end let(:second_page) do - create(:alchemy_page, :public, name: 'Second Page') + create(:alchemy_page, :public, name: "Second Page") end let(:legacy_page) do - create(:alchemy_page, :public, name: 'Legacy Url') + create(:alchemy_page, :public, name: "Legacy Url") end let!(:legacy_url) do - Alchemy::LegacyPageUrl.create(urlname: 'legacy-url', page: page) + Alchemy::LegacyPageUrl.create(urlname: "legacy-url", page: page) end let(:legacy_url2) do - Alchemy::LegacyPageUrl.create(urlname: 'legacy-url', page: second_page) + Alchemy::LegacyPageUrl.create(urlname: "legacy-url", page: second_page) end let(:legacy_url4) do Alchemy::LegacyPageUrl.create( - urlname: 'index.php?option=com_content&view=article&id=48&Itemid=69', - page: second_page + urlname: "index.php?option=com_content&view=article&id=48&Itemid=69", + page: second_page, ) end - context 'if url has an unknown format & get parameters' do + context "if url has an unknown format & get parameters" do it "redirects permanently to page that belongs to legacy page url" do get "/#{legacy_url4.urlname}" expect(response.status).to eq(301) @@ -54,9 +54,9 @@ expect(response).to redirect_to("/#{second_page.urlname}") end - context 'if the url has get parameters' do + context "if the url has get parameters" do let(:legacy_url3) do - Alchemy::LegacyPageUrl.create(urlname: 'index.php?id=2', page: second_page) + Alchemy::LegacyPageUrl.create(urlname: "index.php?id=2", page: second_page) end it "redirects" do @@ -65,9 +65,9 @@ end end - context 'when the url has nested urlname' do + context "when the url has nested urlname" do let(:legacy_url5) do - Alchemy::LegacyPageUrl.create(urlname: 'nested/legacy/url', page: second_page) + Alchemy::LegacyPageUrl.create(urlname: "nested/legacy/url", page: second_page) end it "redirects" do diff --git a/spec/requests/alchemy/page_request_caching_spec.rb b/spec/requests/alchemy/page_request_caching_spec.rb index e18682ce21..07c4b41b2e 100644 --- a/spec/requests/alchemy/page_request_caching_spec.rb +++ b/spec/requests/alchemy/page_request_caching_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -RSpec.describe 'Page request caching' do +RSpec.describe "Page request caching" do let!(:page) { create(:alchemy_page, :public) } context "when caching is disabled in app" do @@ -12,8 +12,8 @@ it "sets no-cache header" do get "/#{page.urlname}" - expect(response.headers).to have_key('Cache-Control') - expect(response.headers['Cache-Control']).to eq('no-cache') + expect(response.headers).to have_key("Cache-Control") + expect(response.headers["Cache-Control"]).to eq("no-cache") end end @@ -39,8 +39,8 @@ it "sets public cache control header" do get "/#{page.urlname}" - expect(response.headers).to have_key('Cache-Control') - expect(response.headers['Cache-Control']).to eq('public, must-revalidate') + expect(response.headers).to have_key("Cache-Control") + expect(response.headers["Cache-Control"]).to eq("public, must-revalidate") end end @@ -56,8 +56,8 @@ it "sets max-age cache control header" do get "/#{page.urlname}" - expect(response.headers).to have_key('Cache-Control') - expect(response.headers['Cache-Control']).to \ + expect(response.headers).to have_key("Cache-Control") + expect(response.headers["Cache-Control"]).to \ eq("max-age=#{expiration_time.to_i}, public, must-revalidate") end end @@ -70,20 +70,20 @@ it "sets private cache control header" do get "/#{page.urlname}" - expect(response.headers).to have_key('Cache-Control') - expect(response.headers['Cache-Control']).to eq('private, must-revalidate') + expect(response.headers).to have_key("Cache-Control") + expect(response.headers["Cache-Control"]).to eq("private, must-revalidate") end end it "sets etag header" do get "/#{page.urlname}" - expect(response.headers).to have_key('ETag') + expect(response.headers).to have_key("ETag") end it "sets last-modified header" do get "/#{page.urlname}" - expect(response.headers).to have_key('Last-Modified') - expect(response.headers['Last-Modified']).to eq(page.published_at.httpdate) + expect(response.headers).to have_key("Last-Modified") + expect(response.headers["Last-Modified"]).to eq(page.published_at.httpdate) end end @@ -94,13 +94,13 @@ it "sets no-cache header" do get "/#{page.urlname}" - expect(response.headers).to have_key('Cache-Control') - expect(response.headers['Cache-Control']).to eq('no-cache') + expect(response.headers).to have_key("Cache-Control") + expect(response.headers["Cache-Control"]).to eq("no-cache") end it "does not set last-modified header" do get "/#{page.urlname}" - expect(response.headers).to_not have_key('Last-Modified') + expect(response.headers).to_not have_key("Last-Modified") end end @@ -113,13 +113,13 @@ it "sets no-cache header" do get "/#{page.urlname}" - expect(response.headers).to have_key('Cache-Control') - expect(response.headers['Cache-Control']).to eq('no-cache') + expect(response.headers).to have_key("Cache-Control") + expect(response.headers["Cache-Control"]).to eq("no-cache") end it "does not set last-modified header" do get "/#{page.urlname}" - expect(response.headers).to_not have_key('Last-Modified') + expect(response.headers).to_not have_key("Last-Modified") end end diff --git a/spec/requests/alchemy/site_requests_spec.rb b/spec/requests/alchemy/site_requests_spec.rb index 88a277c6e7..50ff0d7704 100644 --- a/spec/requests/alchemy/site_requests_spec.rb +++ b/spec/requests/alchemy/site_requests_spec.rb @@ -1,10 +1,10 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -RSpec.describe 'Site requests' do - context 'a site with host' do - let!(:site) { create(:alchemy_site, :public, host: 'alchemy-cms.com') } +RSpec.describe "Site requests" do + context "a site with host" do + let!(:site) { create(:alchemy_site, :public, host: "alchemy-cms.com") } let(:language) { create(:alchemy_language, site: site) } let(:page) do @@ -13,7 +13,7 @@ create(:alchemy_page, :public, parent: root) end - it 'loads this site by host' do + it "loads this site by host" do get "http://#{site.host}/#{page.urlname}" expect(assigns(:current_alchemy_site).host).to eq(site.host) end diff --git a/spec/requests/alchemy/sitemap_spec.rb b/spec/requests/alchemy/sitemap_spec.rb index 0482c3a206..44f02fd394 100644 --- a/spec/requests/alchemy/sitemap_spec.rb +++ b/spec/requests/alchemy/sitemap_spec.rb @@ -1,56 +1,56 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -RSpec.describe 'Requests for PagesController#sitemap' do +RSpec.describe "Requests for PagesController#sitemap" do let!(:page) { create(:alchemy_page, :public, sitemap: true) } - it 'renders valid xml sitemap' do - get '/sitemap.xml' - expect(response.media_type).to eq('application/xml') + it "renders valid xml sitemap" do + get "/sitemap.xml" + expect(response.media_type).to eq("application/xml") xml_doc = Nokogiri::XML(response.body) - expect(xml_doc.namespaces).to have_key('xmlns') - expect(xml_doc.namespaces['xmlns']).to eq('http://www.sitemaps.org/schemas/sitemap/0.9') - expect(xml_doc.css('urlset url loc').length).to eq(2) + expect(xml_doc.namespaces).to have_key("xmlns") + expect(xml_doc.namespaces["xmlns"]).to eq("http://www.sitemaps.org/schemas/sitemap/0.9") + expect(xml_doc.css("urlset url loc").length).to eq(2) end - it 'lastmod dates are ISO 8601 timestamps' do - get '/sitemap.xml' - expect(response.media_type).to eq('application/xml') + it "lastmod dates are ISO 8601 timestamps" do + get "/sitemap.xml" + expect(response.media_type).to eq("application/xml") xml_doc = Nokogiri::XML(response.body) - xml_doc.css('urlset url lastmod').each do |timestamps| + xml_doc.css("urlset url lastmod").each do |timestamps| expect(timestamps.text).to match(/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z/) end end - context 'in multi language mode' do + context "in multi language mode" do let!(:root) { page.parent } let!(:pages) { [root, page] } before do - allow_any_instance_of(Alchemy::BaseController).to receive('prefix_locale?') { true } + allow_any_instance_of(Alchemy::BaseController).to receive("prefix_locale?") { true } end - it 'links in sitemap has locale code included' do - get '/sitemap.xml' + it "links in sitemap has locale code included" do + get "/sitemap.xml" xml_doc = Nokogiri::XML(response.body) - xml_doc.css('urlset url').each_with_index do |node, i| + xml_doc.css("urlset url").each_with_index do |node, i| page = pages[i] - expect(node.css('loc').text).to match(/\/#{page.language_code}\//) + expect(node.css("loc").text).to match(/\/#{page.language_code}\//) end end - context 'if the default locale is the page locale' do + context "if the default locale is the page locale" do before do - allow_any_instance_of(Alchemy::BaseController).to receive('prefix_locale?') { false } + allow_any_instance_of(Alchemy::BaseController).to receive("prefix_locale?") { false } end - it 'links in sitemap has no locale code included' do - get '/sitemap.xml' + it "links in sitemap has no locale code included" do + get "/sitemap.xml" xml_doc = Nokogiri::XML(response.body) - xml_doc.css('urlset url').each_with_index do |node, i| + xml_doc.css("urlset url").each_with_index do |node, i| page = pages[i] - expect(node.css('loc').text).to_not match(/\/#{page.language_code}\//) + expect(node.css("loc").text).to_not match(/\/#{page.language_code}\//) end end end diff --git a/spec/routing/api_routing_spec.rb b/spec/routing/api_routing_spec.rb index 3052e57b41..29ade92dfd 100644 --- a/spec/routing/api_routing_spec.rb +++ b/spec/routing/api_routing_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -describe 'The API routes' do +describe "The API routes" do routes { Alchemy::Engine.routes } describe "for pages" do @@ -10,16 +10,16 @@ expect({get: "/api/pages.json"}).to route_to( controller: "alchemy/api/pages", action: "index", - format: "json" + format: "json", ) end - context 'with missing format' do + context "with missing format" do it "defaults to json." do expect({get: "/api/pages"}).to route_to( controller: "alchemy/api/pages", action: "index", - format: "json" + format: "json", ) end end @@ -29,7 +29,7 @@ controller: "alchemy/api/pages", action: "show", urlname: "a-page", - format: "json" + format: "json", ) end @@ -38,37 +38,37 @@ controller: "alchemy/api/pages", action: "show", urlname: "nested/a-page", - format: "json" + format: "json", ) end - context 'with admin namespace' do + context "with admin namespace" do it "routes to api pages controller." do expect({get: "/api/admin/pages/8"}).to route_to( controller: "alchemy/api/pages", action: "show", id: "8", - format: "json" + format: "json", ) end end end - describe 'for elements' do + describe "for elements" do it "has route to show all elements." do expect({get: "/api/elements.json"}).to route_to( controller: "alchemy/api/elements", action: "index", - format: "json" + format: "json", ) end - context 'with missing format' do + context "with missing format" do it "defaults to json." do expect({get: "/api/elements"}).to route_to( controller: "alchemy/api/elements", action: "index", - format: "json" + format: "json", ) end end @@ -78,7 +78,7 @@ controller: "alchemy/api/elements", action: "index", page_id: "1", - format: "json" + format: "json", ) end @@ -88,7 +88,7 @@ action: "index", page_id: "1", named: "article", - format: "json" + format: "json", ) end @@ -97,26 +97,26 @@ controller: "alchemy/api/elements", action: "show", id: "1", - format: "json" + format: "json", ) end end - describe 'for contents' do + describe "for contents" do it "has route to show all contents." do expect({get: "/api/contents.json"}).to route_to( controller: "alchemy/api/contents", action: "index", - format: "json" + format: "json", ) end - context 'with missing format' do + context "with missing format" do it "defaults to json." do expect({get: "/api/contents"}).to route_to( controller: "alchemy/api/contents", action: "index", - format: "json" + format: "json", ) end end @@ -126,7 +126,7 @@ controller: "alchemy/api/contents", action: "index", element_id: "1", - format: "json" + format: "json", ) end @@ -136,7 +136,7 @@ action: "show", element_id: "1", name: "headline", - format: "json" + format: "json", ) end @@ -145,7 +145,7 @@ controller: "alchemy/api/contents", action: "show", id: "1", - format: "json" + format: "json", ) end end diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb index 42e59163b8..d95fb41249 100644 --- a/spec/routing/routing_spec.rb +++ b/spec/routing/routing_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" describe "The Routing" do routes { Alchemy::Engine.routes } @@ -8,32 +8,32 @@ describe "root url" do it "routes to pages_controller#index" do expect({ - get: "/" + get: "/", }).to route_to( controller: "alchemy/pages", - action: "index" + action: "index", ) end - context 'with locale parameter' do - it 'routes to pages_controller#index' do + context "with locale parameter" do + it "routes to pages_controller#index" do expect({ - get: '/en' + get: "/en", }).to route_to( - controller: 'alchemy/pages', - action: 'index', - locale: 'en' + controller: "alchemy/pages", + action: "index", + locale: "en", ) end - context 'that contains uppercase country code' do - it 'routes to pages_controller#index' do + context "that contains uppercase country code" do + it "routes to pages_controller#index" do expect({ - get: '/en-UK' + get: "/en-UK", }).to route_to( - controller: 'alchemy/pages', - action: 'index', - locale: 'en-UK' + controller: "alchemy/pages", + action: "index", + locale: "en-UK", ) end end @@ -43,13 +43,13 @@ context "for downloads" do it "should have a named route" do expect({ - get: "/attachment/32/download/Presseveranstaltung.pdf" + get: "/attachment/32/download/Presseveranstaltung.pdf", }).to route_to( controller: "alchemy/attachments", action: "download", id: "32", name: "Presseveranstaltung", - format: "pdf" + format: "pdf", ) end end @@ -58,23 +58,23 @@ context "one level deep nested" do it "should route to pages show" do expect({ - get: "/products/my-product" + get: "/products/my-product", }).to route_to( controller: "alchemy/pages", action: "show", - urlname: "products/my-product" + urlname: "products/my-product", ) end context "and language" do it "should route to pages show" do expect({ - get: "/de/products/my-product" + get: "/de/products/my-product", }).to route_to( controller: "alchemy/pages", action: "show", urlname: "products/my-product", - locale: "de" + locale: "de", ) end end @@ -83,23 +83,23 @@ context "two levels deep nested" do it "should route to pages show" do expect({ - get: "/catalog/products/my-product" + get: "/catalog/products/my-product", }).to route_to( controller: "alchemy/pages", action: "show", - urlname: "catalog/products/my-product" + urlname: "catalog/products/my-product", ) end context "and language" do it "should route to pages show" do expect({ - get: "/de/catalog/products/my-product" + get: "/de/catalog/products/my-product", }).to route_to( controller: "alchemy/pages", action: "show", urlname: "catalog/products/my-product", - locale: "de" + locale: "de", ) end end @@ -108,23 +108,23 @@ context "with a blog date url" do it "should route to pages show" do expect({ - get: "/2011/12/08/my-post" + get: "/2011/12/08/my-post", }).to route_to( controller: "alchemy/pages", action: "show", - urlname: "2011/12/08/my-post" + urlname: "2011/12/08/my-post", ) end context "and language" do it "should route to pages show" do expect({ - get: "/de/2011/12/08/my-post" + get: "/de/2011/12/08/my-post", }).to route_to( controller: "alchemy/pages", action: "show", urlname: "2011/12/08/my-post", - locale: "de" + locale: "de", ) end end @@ -134,7 +134,7 @@ describe "image format requests" do it "should not be handled by alchemy/pages controller" do expect({ - get: "/products/my-product.jpg" + get: "/products/my-product.jpg", }).not_to be_routable end end @@ -142,12 +142,12 @@ describe "rss feed requests" do it "should be handled by alchemy/pages controller" do expect({ - get: "/news.rss" + get: "/news.rss", }).to route_to( controller: "alchemy/pages", action: "show", urlname: "news", - format: "rss" + format: "rss", ) end end @@ -155,22 +155,22 @@ describe "unknown formats" do it "should be handled by alchemy/pages controller" do expect({ - get: "/index.php?id=234" + get: "/index.php?id=234", }).to route_to( controller: "alchemy/pages", action: "show", urlname: "index", format: "php", - id: "234" + id: "234", ) expect({ - get: "/action.do" + get: "/action.do", }).to route_to( controller: "alchemy/pages", action: "show", urlname: "action", - format: "do" + format: "do", ) end end @@ -178,7 +178,7 @@ describe "Rails info requests" do it "should not be handled by alchemy/pages controller" do expect({ - get: "/rails/info/routes" + get: "/rails/info/routes", }).not_to be_routable end end @@ -187,20 +187,20 @@ context "default" do it "should route to admin dashboard" do expect({ - get: "/admin/dashboard" + get: "/admin/dashboard", }).to route_to( controller: "alchemy/admin/dashboard", - action: "index" + action: "index", ) end it "should route to page preview" do expect({ - get: "/admin/pages/3/preview" + get: "/admin/pages/3/preview", }).to route_to( controller: "alchemy/admin/pages", action: "preview", - id: "3" + id: "3", ) end end @@ -214,22 +214,22 @@ it "should route to admin dashboard" do expect({ - get: "http://hidden.example.org/backend/dashboard" + get: "http://hidden.example.org/backend/dashboard", }).to route_to( controller: "alchemy/admin/dashboard", action: "index", - subdomain: "hidden" + subdomain: "hidden", ) end it "should route to page preview" do expect({ - get: "http://hidden.example.org/backend/pages/3/preview" + get: "http://hidden.example.org/backend/pages/3/preview", }).to route_to( controller: "alchemy/admin/pages", action: "preview", id: "3", - subdomain: "hidden" + subdomain: "hidden", ) end diff --git a/spec/serializers/alchemy/element_serializer_spec.rb b/spec/serializers/alchemy/element_serializer_spec.rb index ac7964a76e..ad067f8fe3 100644 --- a/spec/serializers/alchemy/element_serializer_spec.rb +++ b/spec/serializers/alchemy/element_serializer_spec.rb @@ -1,27 +1,27 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" RSpec.describe Alchemy::ElementSerializer do subject { described_class.new(element).to_json } let(:element) { build_stubbed(:alchemy_element) } - it 'includes all attributes' do + it "includes all attributes" do json = JSON.parse(subject) expect(json).to eq( - 'content_ids' => [], - 'created_at' => element.created_at.strftime('%FT%T.%LZ'), - 'display_name' => element.display_name_with_preview_text, - 'dom_id' => element.dom_id, - 'id' => element.id, - 'ingredients' => [], - 'name' => element.name, - 'nested_elements' => [], - 'page_id' => element.page_id, - 'position' => nil, - 'tag_list' => [], - 'updated_at' => element.updated_at.strftime('%FT%T.%LZ') + "content_ids" => [], + "created_at" => element.created_at.strftime("%FT%T.%LZ"), + "display_name" => element.display_name_with_preview_text, + "dom_id" => element.dom_id, + "id" => element.id, + "ingredients" => [], + "name" => element.name, + "nested_elements" => [], + "page_id" => element.page_id, + "position" => nil, + "tag_list" => [], + "updated_at" => element.updated_at.strftime("%FT%T.%LZ"), ) end end diff --git a/spec/serializers/alchemy/node_serializer_spec.rb b/spec/serializers/alchemy/node_serializer_spec.rb index 5c6365056d..517ed69fcb 100644 --- a/spec/serializers/alchemy/node_serializer_spec.rb +++ b/spec/serializers/alchemy/node_serializer_spec.rb @@ -1,21 +1,22 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" RSpec.describe Alchemy::NodeSerializer do subject { described_class.new(node).to_json } let(:node) { build_stubbed(:alchemy_node) } - it 'includes all attributes' do + it "includes all attributes" do json = JSON.parse(subject) expect(json).to eq( - 'id' => node.id, - 'lft' => node.lft, - 'rgt' => node.rgt, - 'parent_id' => node.parent_id, - 'name' => node.name, - 'url' => node.url + "id" => node.id, + "lft" => node.lft, + "rgt" => node.rgt, + "parent_id" => node.parent_id, + "name" => node.name, + "url" => node.url, + "ancestors" => [], ) end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 40956ae7ae..adf213972a 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,17 +1,17 @@ # frozen_string_literal: true -require 'simplecov' -if ENV['TRAVIS'] - require 'codeclimate-test-reporter' +require "simplecov" +if ENV["TRAVIS"] + require "codeclimate-test-reporter" end -SimpleCov.start 'rails' do +SimpleCov.start "rails" do add_filter "/lib/alchemy/upgrader" add_filter "/lib/alchemy/version" add_filter "/lib/rails" end -require 'rspec/core' -require 'webmock' +require "rspec/core" +require "webmock" RSpec.configure do |config| config.raise_errors_for_deprecations! diff --git a/spec/support/capybara_helpers.rb b/spec/support/capybara_helpers.rb index b0adf88d39..f43b7d9cae 100644 --- a/spec/support/capybara_helpers.rb +++ b/spec/support/capybara_helpers.rb @@ -6,10 +6,10 @@ def select2(value, options) label = find_label_by_text(options[:from]) within label.first(:xpath, ".//..") do - options[:from] = "##{find('.select2-container')['id']}" + options[:from] = "##{find(".select2-container")["id"]}" end - find(options[:from]).find('a').click + find(options[:from]).find("a").click within_entire_page do page.find("div.select2-result-label", @@ -21,34 +21,34 @@ def select2_search(value, options) label = find_label_by_text(options[:from]) within label.first(:xpath, ".//..") do - options[:from] = "##{find('.select2-container')['id']}" + options[:from] = "##{find(".select2-container")["id"]}" end find("#{options[:from]}:not(.select2-container-disabled):not(.select2-offscreen)").click within_entire_page do find("input.select2-input.select2-focused").set(value) - expect(page).to have_selector('.select2-result-label', visible: true) + expect(page).to have_selector(".select2-result-label", visible: true) find("div.select2-result-label", text: /#{Regexp.escape(value)}/i, match: :prefer_exact).click - expect(page).not_to have_selector('.select2-result-label') + expect(page).not_to have_selector(".select2-result-label") end end def click_button_with_label(label) - label = find('label', text: label) + label = find("label", text: label) within label.first(:xpath, ".//..") do - first('button').click + first("button").click end end private def within_entire_page(&block) - within(:xpath, '//body', &block) + within(:xpath, "//body", &block) end def find_label_by_text(text) - find 'label:not(.select2-offscreen)', + find "label:not(.select2-offscreen)", text: /#{Regexp.escape(text)}/i, match: :one end diff --git a/spec/support/custom_news_elements_finder.rb b/spec/support/custom_news_elements_finder.rb index 1c32d5f170..f883f5260c 100644 --- a/spec/support/custom_news_elements_finder.rb +++ b/spec/support/custom_news_elements_finder.rb @@ -2,6 +2,6 @@ class CustomNewsElementsFinder def elements(*) - [Alchemy::Element.new(name: 'news', id: 1001)] + [Alchemy::Element.new(name: "news", id: 1001)] end end diff --git a/spec/support/hint_examples.rb b/spec/support/hint_examples.rb index 48485abe19..031638d3bd 100644 --- a/spec/support/hint_examples.rb +++ b/spec/support/hint_examples.rb @@ -1,28 +1,28 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy shared_examples_for "having a hint" do - describe '#hint' do - context 'with hint as text' do + describe "#hint" do + context "with hint as text" do before do - expect(subject).to receive(:definition).and_return({'hint' => 'The hint'}) + expect(subject).to receive(:definition).and_return({"hint" => "The hint"}) end it "returns the hint" do - expect(subject.hint).to eq('The hint') + expect(subject.hint).to eq("The hint") end end - context 'with hint set to true' do + context "with hint set to true" do before do - expect(subject).to receive(:definition).and_return({'hint' => true}) - expect(Alchemy).to receive(:t).and_return('The hint') + expect(subject).to receive(:definition).and_return({"hint" => true}) + expect(Alchemy).to receive(:t).and_return("The hint") end it "returns the hint from translation" do - expect(subject.hint).to eq('The hint') + expect(subject.hint).to eq("The hint") end end end diff --git a/spec/support/transformation_examples.rb b/spec/support/transformation_examples.rb index 93db5725ab..e97bad838d 100644 --- a/spec/support/transformation_examples.rb +++ b/spec/support/transformation_examples.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy shared_examples_for "has image transformations" do @@ -10,7 +10,7 @@ module Alchemy allow(picture).to receive(:image_file_width) { 400 } allow(picture).to receive(:image_file_height) { 300 } - expect(picture.thumbnail_size).to eq('160x120') + expect(picture.thumbnail_size).to eq("160x120") end end @@ -19,35 +19,35 @@ module Alchemy allow(picture).to receive(:image_file_width) { 300 } allow(picture).to receive(:image_file_height) { 400 } - expect(picture.thumbnail_size).to eq('90x120') + expect(picture.thumbnail_size).to eq("90x120") end end context "picture has crop_size of 400x300" do it "scales to 400x300 if that is the size of the cropped image" do allow(picture).to receive(:crop_size) { "400x300" } - expect(picture.thumbnail_size).to eq('160x120') + expect(picture.thumbnail_size).to eq("160x120") end end context "picture has crop_size of 0x0" do it "returns default thumbnail size" do allow(picture).to receive(:crop_size) { "0x0" } - expect(picture.thumbnail_size).to eq('160x120') + expect(picture.thumbnail_size).to eq("160x120") end end end - describe '#landscape_format?' do + describe "#landscape_format?" do subject { picture.landscape_format? } - context 'image has landscape format' do + context "image has landscape format" do before { allow(picture).to receive(:image_file).and_return double(landscape?: true) } it { is_expected.to be_truthy } end - context 'image has portrait format' do + context "image has portrait format" do before { allow(picture).to receive(:image_file).and_return double(landscape?: false) } it { is_expected.to be_falsey } @@ -58,16 +58,16 @@ module Alchemy end end - describe '#portrait_format?' do + describe "#portrait_format?" do subject { picture.portrait_format? } - context 'image has portrait format' do + context "image has portrait format" do before { allow(picture).to receive(:image_file).and_return double(portrait?: true) } it { is_expected.to be_truthy } end - context 'image has landscape format' do + context "image has landscape format" do before { allow(picture).to receive(:image_file).and_return double(portrait?: false) } it { is_expected.to be_falsey } @@ -78,16 +78,16 @@ module Alchemy end end - describe '#square_format?' do + describe "#square_format?" do subject { picture.square_format? } - context 'image has square format' do + context "image has square format" do before { expect(picture).to receive(:image_file).and_return double(aspect_ratio: 1.0) } it { is_expected.to be_truthy } end - context 'image has rectangle format' do + context "image has rectangle format" do before { expect(picture).to receive(:image_file).and_return double(aspect_ratio: 8.0) } it { is_expected.to be_falsey } @@ -98,7 +98,7 @@ module Alchemy end end - describe '#default_mask' do + describe "#default_mask" do before do allow(picture).to receive(:image_file_width) { 200 } allow(picture).to receive(:image_file_height) { 100 } diff --git a/spec/views/admin/pictures/show_spec.rb b/spec/views/admin/pictures/show_spec.rb index 8fa8ba4eb5..c7d972b172 100644 --- a/spec/views/admin/pictures/show_spec.rb +++ b/spec/views/admin/pictures/show_spec.rb @@ -1,26 +1,26 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" describe "alchemy/admin/pictures/show.html.erb" do let(:image) do fixture_file_upload( - File.expand_path('../../../fixtures/animated.gif', __dir__), - 'image/gif' + File.expand_path("../../../fixtures/animated.gif", __dir__), + "image/gif", ) end let(:picture) do create(:alchemy_picture, { image_file: image, - name: 'animated', - image_file_name: 'animated.gif' + name: "animated", + image_file_name: "animated.gif", }) end before do allow(view).to receive(:admin_picture_path).and_return("/path") - allow(view).to receive(:render_message) {} + allow(view).to receive(:render_message) allow(view).to receive(:search_filter_params) { {} } view.extend Alchemy::Admin::FormHelper end diff --git a/spec/views/alchemy/admin/elements/element_view_spec.rb b/spec/views/alchemy/admin/elements/element_view_spec.rb index 6b439f25ee..43de124c62 100644 --- a/spec/views/alchemy/admin/elements/element_view_spec.rb +++ b/spec/views/alchemy/admin/elements/element_view_spec.rb @@ -1,16 +1,16 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -describe 'alchemy/admin/elements/_element' do +describe "alchemy/admin/elements/_element" do before do allow(element).to receive(:definition) { definition } end let(:definition) do { - name: 'with_message', - message: 'One nice message' + name: "with_message", + message: "One nice message", }.with_indifferent_access end @@ -19,18 +19,18 @@ rendered end - context 'with message given in element definition' do - let(:element) { create(:alchemy_element, name: 'with_message') } + context "with message given in element definition" do + let(:element) { create(:alchemy_element, name: "with_message") } it "renders the message" do is_expected.to have_css('.message:contains("One nice message")') end - context 'that contains HTML' do + context "that contains HTML" do let(:definition) do { - name: 'with_message', - message: '

      One nice message

      ' + name: "with_message", + message: "

      One nice message

      ", }.with_indifferent_access end @@ -40,13 +40,13 @@ end end - context 'with warning given in element definition' do - let(:element) { create(:alchemy_element, name: 'with_warning') } + context "with warning given in element definition" do + let(:element) { create(:alchemy_element, name: "with_warning") } let(:definition) do { - name: 'with_warning', - warning: 'One nice warning' + name: "with_warning", + warning: "One nice warning", }.with_indifferent_access end @@ -54,11 +54,11 @@ is_expected.to have_css('.warning:contains("One nice warning")') end - context 'that contains HTML' do + context "that contains HTML" do let(:definition) do { - name: 'with_warning', - warning: '

      One nice warning

      ' + name: "with_warning", + warning: "

      One nice warning

      ", }.with_indifferent_access end diff --git a/spec/views/alchemy/admin/partials/_main_navigation_entry.html.erb_spec.rb b/spec/views/alchemy/admin/partials/_main_navigation_entry.html.erb_spec.rb index 0e428b85d5..1414556b13 100644 --- a/spec/views/alchemy/admin/partials/_main_navigation_entry.html.erb_spec.rb +++ b/spec/views/alchemy/admin/partials/_main_navigation_entry.html.erb_spec.rb @@ -1,20 +1,20 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" describe "alchemy/admin/partials/_main_navigation_entry.html.erb" do let(:alchemy_module) do { - engine_name: 'alchemy', - name: 'what_a_name', + engine_name: "alchemy", + name: "what_a_name", navigation: { - controller: 'alchemy/admin/pages', - action: 'index', - name: 'Pages', - image: 'alchemy/alchemy-logo.svg', + controller: "alchemy/admin/pages", + action: "index", + name: "Pages", + image: "alchemy/alchemy-logo.svg", data: { turbolinks: false }, - sub_navigation: [] - } + sub_navigation: [], + }, }.with_indifferent_access end @@ -33,18 +33,18 @@ expect(rendered).to have_selector('div[data-turbolinks="false"]') end - context 'with no data attribute' do + context "with no data attribute" do let(:alchemy_module) do { - engine_name: 'alchemy', - name: 'what_a_name', + engine_name: "alchemy", + name: "what_a_name", navigation: { - controller: 'alchemy/admin/pages', - action: 'index', - name: 'Pages', - image: 'alchemy/alchemy-logo.svg', - sub_navigation: [] - } + controller: "alchemy/admin/pages", + action: "index", + name: "Pages", + image: "alchemy/alchemy-logo.svg", + sub_navigation: [], + }, }.with_indifferent_access end diff --git a/spec/views/essences/essence_boolean_editor_spec.rb b/spec/views/essences/essence_boolean_editor_spec.rb index a8eb7f3a5e..30df6d1b70 100644 --- a/spec/views/essences/essence_boolean_editor_spec.rb +++ b/spec/views/essences/essence_boolean_editor_spec.rb @@ -1,15 +1,15 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -describe 'alchemy/essences/_essence_boolean_editor' do - let(:element) { create(:alchemy_element, name: 'all_you_can_eat') } - let(:content) { Alchemy::Content.create(name: 'essence_boolean', type: 'EssenceBoolean', element: element) } +describe "alchemy/essences/_essence_boolean_editor" do + let(:element) { create(:alchemy_element, name: "all_you_can_eat") } + let(:content) { Alchemy::Content.create(name: "essence_boolean", type: "EssenceBoolean", element: element) } let(:content_definition) do { - name: 'essence_boolean', - type: 'EssenceBoolean' + name: "essence_boolean", + type: "EssenceBoolean", }.with_indifferent_access end @@ -17,12 +17,12 @@ expect(element).to receive(:content_definition_for) { content_definition } allow_any_instance_of(Alchemy::Content).to receive(:definition) { content_definition } allow(view).to receive(:render_content_name).and_return(content.name) - allow(view).to receive(:render_hint_for).and_return('') + allow(view).to receive(:render_hint_for).and_return("") end subject do render partial: "alchemy/essences/essence_boolean_editor", locals: { - essence_boolean_editor: Alchemy::ContentEditor.new(content) + essence_boolean_editor: Alchemy::ContentEditor.new(content), } rendered end @@ -31,12 +31,12 @@ is_expected.to have_selector('input[type="checkbox"]') end - context 'with default value given in content settings' do + context "with default value given in content settings" do let(:content_definition) do { - name: 'essence_boolean', - type: 'EssenceBoolean', - default: true + name: "essence_boolean", + type: "EssenceBoolean", + default: true, }.with_indifferent_access end diff --git a/spec/views/essences/essence_boolean_view_spec.rb b/spec/views/essences/essence_boolean_view_spec.rb index 320e7aefe6..1f69be058a 100644 --- a/spec/views/essences/essence_boolean_view_spec.rb +++ b/spec/views/essences/essence_boolean_view_spec.rb @@ -1,25 +1,25 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -describe 'alchemy/essences/_essence_boolean_view' do - context 'with true as ingredient' do +describe "alchemy/essences/_essence_boolean_view" do + context "with true as ingredient" do let(:content) { Alchemy::EssenceBoolean.new(ingredient: true) } - before { allow(Alchemy).to receive(:t).and_return('true') } + before { allow(Alchemy).to receive(:t).and_return("true") } it "renders true" do render content, content: content - expect(rendered).to have_content('true') + expect(rendered).to have_content("true") end end - context 'with false as ingredient' do + context "with false as ingredient" do let(:content) { Alchemy::EssenceBoolean.new(ingredient: false) } - before { allow(Alchemy).to receive(:t).and_return('false') } + before { allow(Alchemy).to receive(:t).and_return("false") } it "renders false" do render content, content: content - expect(rendered).to have_content('false') + expect(rendered).to have_content("false") end end end diff --git a/spec/views/essences/essence_date_editor_spec.rb b/spec/views/essences/essence_date_editor_spec.rb index aa1ca2b6a9..57eb2c64ab 100644 --- a/spec/views/essences/essence_date_editor_spec.rb +++ b/spec/views/essences/essence_date_editor_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -RSpec.describe 'alchemy/essences/_essence_date_editor' do +RSpec.describe "alchemy/essences/_essence_date_editor" do let(:content) { Alchemy::Content.new(essence: essence) } let(:essence) { Alchemy::EssenceDate.new } @@ -12,7 +12,7 @@ end it "renders a datepicker" do - render 'alchemy/essences/essence_date_editor', essence_date_editor: Alchemy::ContentEditor.new(content) + render "alchemy/essences/essence_date_editor", essence_date_editor: Alchemy::ContentEditor.new(content) expect(rendered).to have_css('input[type="text"][data-datepicker-type="date"].date') end end diff --git a/spec/views/essences/essence_date_view_spec.rb b/spec/views/essences/essence_date_view_spec.rb index 5bd4387366..ecba8b136b 100644 --- a/spec/views/essences/essence_date_view_spec.rb +++ b/spec/views/essences/essence_date_view_spec.rb @@ -1,9 +1,9 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -describe 'alchemy/essences/_essence_date_view' do - let(:essence) { Alchemy::EssenceDate.new(date: '2013-10-27 21:14:16 +0100'.to_datetime) } +describe "alchemy/essences/_essence_date_view" do + let(:essence) { Alchemy::EssenceDate.new(date: "2013-10-27 21:14:16 +0100".to_datetime) } let(:content) { Alchemy::Content.new(essence: essence) } let(:options) { {} } @@ -12,29 +12,29 @@ end context "with date value" do - context 'without date_format passed' do + context "without date_format passed" do it "translates the date value with default format" do render content, content: content - expect(rendered).to have_content('Sun, 27 Oct 2013 20:14:16 +0000') + expect(rendered).to have_content("Sun, 27 Oct 2013 20:14:16 +0000") end end - context 'with option date_format set to rfc822' do - let(:options) { {date_format: 'rfc822'} } + context "with option date_format set to rfc822" do + let(:options) { {date_format: "rfc822"} } it "renders the date rfc822 conform" do render content, content: content - expect(rendered).to have_content('Sun, 27 Oct 2013 20:14:16 +0000') + expect(rendered).to have_content("Sun, 27 Oct 2013 20:14:16 +0000") end end end - context 'with blank date value' do + context "with blank date value" do let(:essence) { Alchemy::EssenceDate.new(date: nil) } it "renders nothing" do render content, content: content - expect(rendered).to eq('') + expect(rendered).to eq("") end end end diff --git a/spec/views/essences/essence_file_editor_spec.rb b/spec/views/essences/essence_file_editor_spec.rb index 03b3604bf3..1abe478281 100644 --- a/spec/views/essences/essence_file_editor_spec.rb +++ b/spec/views/essences/essence_file_editor_spec.rb @@ -1,25 +1,25 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -describe 'alchemy/essences/_essence_file_editor' do +describe "alchemy/essences/_essence_file_editor" do let(:attachment) { build_stubbed(:alchemy_attachment) } let(:essence) { build_stubbed(:alchemy_essence_file, attachment: attachment) } let(:content) { build_stubbed(:alchemy_content, essence: essence) } subject do render partial: "alchemy/essences/essence_file_editor", locals: { - essence_file_editor: Alchemy::ContentEditor.new(content) + essence_file_editor: Alchemy::ContentEditor.new(content), } rendered end before do view.class.send :include, Alchemy::Admin::BaseHelper - allow(view).to receive(:content_label).and_return('') + allow(view).to receive(:content_label).and_return("") end - context 'with ingredient present' do + context "with ingredient present" do before do allow(content).to receive(:ingredient).and_return(attachment) end @@ -29,37 +29,37 @@ end it "renders a link to open the attachment library overlay" do - within '.essence_file_tools' do + within ".essence_file_tools" do is_expected.to have_selector("a[href='/admin/attachments?content_id=#{content.id}']") end end it "renders a link to edit the essence" do - within '.essence_file_tools' do + within ".essence_file_tools" do is_expected.to have_selector("a[href='/admin/essence_files/#{essence.id}/edit']") end end - context 'with content settings `only`' do + context "with content settings `only`" do it "renders a link to open the attachment library overlay with only pdfs" do - within '.essence_file_tools' do - expect(content).to receive(:settings).at_least(:once).and_return({only: 'pdf'}) + within ".essence_file_tools" do + expect(content).to receive(:settings).at_least(:once).and_return({only: "pdf"}) is_expected.to have_selector("a[href='/admin/attachments?content_id=#{content.id}&only=pdf']") end end end - context 'with content settings `except`' do + context "with content settings `except`" do it "renders a link to open the attachment library overlay without pdfs" do - within '.essence_file_tools' do - expect(content).to receive(:settings).at_least(:once).and_return({except: 'pdf'}) + within ".essence_file_tools" do + expect(content).to receive(:settings).at_least(:once).and_return({except: "pdf"}) is_expected.to have_selector("a[href='/admin/attachments?content_id=#{content.id}&except=pdf']") end end end end - context 'without ingredient present' do + context "without ingredient present" do before do allow(content).to receive(:ingredient).and_return(nil) end diff --git a/spec/views/essences/essence_file_view_spec.rb b/spec/views/essences/essence_file_view_spec.rb index 138c9e54db..3c46c31b5f 100644 --- a/spec/views/essences/essence_file_view_spec.rb +++ b/spec/views/essences/essence_file_view_spec.rb @@ -1,53 +1,53 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -describe 'alchemy/essences/_essence_file_view' do +describe "alchemy/essences/_essence_file_view" do let(:file) do - File.new(File.expand_path('../../fixtures/image with spaces.png', __dir__)) + File.new(File.expand_path("../../fixtures/image with spaces.png", __dir__)) end let(:attachment) do - build_stubbed(:alchemy_attachment, file: file, name: 'an image', file_name: 'image with spaces.png') + build_stubbed(:alchemy_attachment, file: file, name: "an image", file_name: "image with spaces.png") end let(:essence) { Alchemy::EssenceFile.new(attachment: attachment) } let(:content) { Alchemy::Content.new(essence: essence) } - context 'without attachment' do + context "without attachment" do let(:essence) { Alchemy::EssenceFile.new(attachment: nil) } it "renders nothing" do render content, content: content - expect(rendered).to eq('') + expect(rendered).to eq("") end end - context 'with attachment' do + context "with attachment" do it "renders a link to download the attachment" do render content, content: content expect(rendered).to have_selector( - "a[href='/attachment/#{attachment.id}/download/#{attachment.urlname}.#{attachment.suffix}']" + "a[href='/attachment/#{attachment.id}/download/#{attachment.urlname}.#{attachment.suffix}']", ) end - context 'with no link_text set' do + context "with no link_text set" do it "has this attachments name as link text" do render content, content: content expect(rendered).to have_selector("a:contains('#{attachment.name}')") end end - context 'with link_text set in the local options' do + context "with link_text set in the local options" do it "has this value as link text" do - render content, content: content, options: {link_text: 'Download this file'} + render content, content: content, options: {link_text: "Download this file"} expect(rendered).to have_selector("a:contains('Download this file')") end end - context 'with link_text set in the content settings' do + context "with link_text set in the content settings" do before do - allow(content).to receive(:settings) { {link_text: 'Download this file'} } + allow(content).to receive(:settings) { {link_text: "Download this file"} } end it "has this value as link text" do @@ -56,9 +56,9 @@ end end - context 'with link_text stored in the essence attribute' do + context "with link_text stored in the essence attribute" do before do - allow(essence).to receive(:link_text) { 'Download this file' } + allow(essence).to receive(:link_text) { "Download this file" } end it "has this value as link text" do @@ -67,9 +67,9 @@ end end - context 'with html_options given' do + context "with html_options given" do it "renders the linked ingredient with these options" do - render content, content: content, html_options: {title: 'Bar', class: 'blue'} + render content, content: content, html_options: {title: "Bar", class: "blue"} expect(rendered).to have_selector('a.blue[title="Bar"]') end end @@ -77,7 +77,7 @@ context "with css_class set" do before do - allow(essence).to receive(:css_class) { 'file-download' } + allow(essence).to receive(:css_class) { "file-download" } end it "has this class at the link" do diff --git a/spec/views/essences/essence_html_view_spec.rb b/spec/views/essences/essence_html_view_spec.rb index f510dfb409..3499809074 100644 --- a/spec/views/essences/essence_html_view_spec.rb +++ b/spec/views/essences/essence_html_view_spec.rb @@ -1,21 +1,21 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -describe 'alchemy/essences/_essence_html_view' do +describe "alchemy/essences/_essence_html_view" do let(:essence) { Alchemy::EssenceHtml.new(source: '') } let(:content) { Alchemy::Content.new(essence: essence) } - context 'without value' do + context "without value" do let(:essence) { Alchemy::EssenceHtml.new(source: nil) } it "renders nothing" do render content, content: content - expect(rendered).to eq('') + expect(rendered).to eq("") end end - context 'with value' do + context "with value" do it "renders the raw html source" do render content, content: content expect(rendered).to have_selector("script") diff --git a/spec/views/essences/essence_link_editor_spec.rb b/spec/views/essences/essence_link_editor_spec.rb index 840ca929ab..c01d97e5a0 100644 --- a/spec/views/essences/essence_link_editor_spec.rb +++ b/spec/views/essences/essence_link_editor_spec.rb @@ -1,9 +1,9 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -describe 'alchemy/essences/_essence_link_editor' do - let(:essence) { Alchemy::EssenceLink.new(link: 'http://alchemy-cms.com') } +describe "alchemy/essences/_essence_link_editor" do + let(:essence) { Alchemy::EssenceLink.new(link: "http://alchemy-cms.com") } let(:content) { Alchemy::Content.new(essence: essence) } let(:settings) { {} } @@ -11,7 +11,7 @@ view.class.send :include, Alchemy::Admin::BaseHelper allow(view).to receive(:content_label).and_return("1e Zahl") render partial: "alchemy/essences/essence_link_editor", locals: { - essence_link_editor: Alchemy::ContentEditor.new(content) + essence_link_editor: Alchemy::ContentEditor.new(content), } end diff --git a/spec/views/essences/essence_link_view_spec.rb b/spec/views/essences/essence_link_view_spec.rb index 6f191657ea..94fca8cfff 100644 --- a/spec/views/essences/essence_link_view_spec.rb +++ b/spec/views/essences/essence_link_view_spec.rb @@ -1,18 +1,18 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -describe 'alchemy/essences/_essence_link_view' do - let(:essence) { Alchemy::EssenceLink.new(link: 'http://google.com') } +describe "alchemy/essences/_essence_link_view" do + let(:essence) { Alchemy::EssenceLink.new(link: "http://google.com") } let(:content) { Alchemy::Content.new(essence: essence) } let(:options) { {} } - context 'without value' do + context "without value" do let(:essence) { Alchemy::EssenceLink.new(link: nil) } it "renders nothing" do render content, content: content, options: options, html_options: {} - expect(rendered).to eq('') + expect(rendered).to eq("") end end @@ -21,8 +21,8 @@ expect(rendered).to eq('http://google.com') end - context 'with text option' do - let(:options) { {text: 'Google'} } + context "with text option" do + let(:options) { {text: "Google"} } it "renders a link" do render content, content: content, options: options, html_options: {} @@ -30,9 +30,9 @@ end end - context 'with text setting on content definition' do + context "with text setting on content definition" do before do - allow(content).to receive(:settings).and_return({text: 'Yahoo'}) + allow(content).to receive(:settings).and_return({text: "Yahoo"}) end it "renders a link" do diff --git a/spec/views/essences/essence_page_editor_spec.rb b/spec/views/essences/essence_page_editor_spec.rb index f0b28621d1..5b992c5426 100644 --- a/spec/views/essences/essence_page_editor_spec.rb +++ b/spec/views/essences/essence_page_editor_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -RSpec.describe 'alchemy/essences/_essence_page_editor' do +RSpec.describe "alchemy/essences/_essence_page_editor" do let(:content) { Alchemy::Content.new(essence: essence) } let(:essence) { Alchemy::EssencePage.new } @@ -12,15 +12,15 @@ end subject do - render 'alchemy/essences/essence_page_editor', essence_page_editor: Alchemy::ContentEditor.new(content) + render "alchemy/essences/essence_page_editor", essence_page_editor: Alchemy::ContentEditor.new(content) rendered end it "renders a page input" do - is_expected.to have_css('input.alchemy_selectbox.full_width') + is_expected.to have_css("input.alchemy_selectbox.full_width") end - context 'with a page related to essence' do + context "with a page related to essence" do let(:page) { Alchemy::Page.new(id: 1) } let(:essence) { Alchemy::EssencePage.new(page_id: page.id) } diff --git a/spec/views/essences/essence_page_view_spec.rb b/spec/views/essences/essence_page_view_spec.rb index 03ba04b87e..bc8ddb98a3 100644 --- a/spec/views/essences/essence_page_view_spec.rb +++ b/spec/views/essences/essence_page_view_spec.rb @@ -1,22 +1,22 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -describe 'alchemy/essences/_essence_page_view' do - let(:page) { build(:alchemy_page, urlname: 'a-page') } +describe "alchemy/essences/_essence_page_view" do + let(:page) { build(:alchemy_page, urlname: "a-page") } let(:essence) { Alchemy::EssencePage.new(page: page) } let(:content) { Alchemy::Content.new(essence: essence) } - context 'without page' do + context "without page" do let(:essence) { Alchemy::EssencePage.new } it "renders nothing" do render content, content: content - expect(rendered).to eq('') + expect(rendered).to eq("") end end - context 'with page' do + context "with page" do it "renders a link to the page" do render content, content: content expect(rendered).to have_selector("a[href='/#{page.urlname}']") diff --git a/spec/views/essences/essence_picture_editor_spec.rb b/spec/views/essences/essence_picture_editor_spec.rb index 23d3b9dcc7..dfc6155ed1 100644 --- a/spec/views/essences/essence_picture_editor_spec.rb +++ b/spec/views/essences/essence_picture_editor_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" describe "essences/_essence_picture_editor" do let(:picture) { stub_model(Alchemy::Picture) } @@ -9,16 +9,16 @@ stub_model( Alchemy::EssencePicture, picture: picture, - caption: 'This is a cute cat' + caption: "This is a cute cat", ) end let(:content) do stub_model( Alchemy::Content, - name: 'image', - essence_type: 'EssencePicture', - essence: essence_picture + name: "image", + essence_type: "EssencePicture", + essence: essence_picture, ) end @@ -27,8 +27,8 @@ before do view.class.send(:include, Alchemy::Admin::BaseHelper) view.class.send(:include, Alchemy::Admin::EssencesHelper) - allow(view).to receive(:content_label).and_return('') - allow(view).to receive(:essence_picture_thumbnail).and_return('') + allow(view).to receive(:content_label).and_return("") + allow(view).to receive(:essence_picture_thumbnail).and_return("") end subject do @@ -39,7 +39,7 @@ end context "with settings[:deletable] being nil" do - it 'should not render a button to link and unlink the picture' do + it "should not render a button to link and unlink the picture" do is_expected.to have_selector("a .icon.fa-link") is_expected.to have_selector("a .icon.fa-unlink") end @@ -48,38 +48,38 @@ context "with settings[:deletable] being false" do let(:settings) do { - linkable: false + linkable: false, } end - it 'should not render a button to link and unlink the picture' do + it "should not render a button to link and unlink the picture" do is_expected.to_not have_selector("a .icon.fa-link") is_expected.to_not have_selector("a .icon.fa-unlink") end - it 'but renders the disabled link and unlink icons' do + it "but renders the disabled link and unlink icons" do is_expected.to have_selector(".icon.fa-link") is_expected.to have_selector(".icon.fa-unlink") end end - context 'with allow_image_cropping? true' do + context "with allow_image_cropping? true" do before do allow(essence_picture).to receive(:allow_image_cropping?) { true } end - it 'shows cropping link' do + it "shows cropping link" do is_expected.to have_selector('a[href*="crop"]') end end - context 'with allow_image_cropping? false' do + context "with allow_image_cropping? false" do before do allow(essence_picture).to receive(:allow_image_cropping?) { false } end - it 'shows disabled cropping link' do - is_expected.to have_selector('a.disabled .icon.fa-crop') + it "shows disabled cropping link" do + is_expected.to have_selector("a.disabled .icon.fa-crop") end end end diff --git a/spec/views/essences/essence_richtext_view_spec.rb b/spec/views/essences/essence_richtext_view_spec.rb index 94c03c7bf8..d838c52005 100644 --- a/spec/views/essences/essence_richtext_view_spec.rb +++ b/spec/views/essences/essence_richtext_view_spec.rb @@ -1,34 +1,34 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -describe 'alchemy/essences/_essence_richtext_view' do - let(:essence) { Alchemy::EssenceRichtext.new(body: '

      Lorem ipsum dolor sit amet

      consectetur adipiscing elit.

      ', stripped_body: 'Lorem ipsum dolor sit amet consectetur adipiscing elit.') } +describe "alchemy/essences/_essence_richtext_view" do + let(:essence) { Alchemy::EssenceRichtext.new(body: "

      Lorem ipsum dolor sit amet

      consectetur adipiscing elit.

      ", stripped_body: "Lorem ipsum dolor sit amet consectetur adipiscing elit.") } let(:content) { Alchemy::Content.new(essence: essence) } it "renders the html body" do render content, content: content - expect(rendered).to have_content('Lorem ipsum dolor sit amet consectetur adipiscing elit.') - expect(rendered).to have_selector('h1') + expect(rendered).to have_content("Lorem ipsum dolor sit amet consectetur adipiscing elit.") + expect(rendered).to have_selector("h1") end - context 'with options[:plain_text] true' do + context "with options[:plain_text] true" do it "renders the text body" do render content, content: content, options: {plain_text: true} - expect(rendered).to have_content('Lorem ipsum dolor sit amet consectetur adipiscing elit.') - expect(rendered).to_not have_selector('h1') + expect(rendered).to have_content("Lorem ipsum dolor sit amet consectetur adipiscing elit.") + expect(rendered).to_not have_selector("h1") end end - context 'with content.settings[:plain_text] true' do + context "with content.settings[:plain_text] true" do before do allow(content).to receive(:settings).and_return({plain_text: true}) end it "renders the text body" do render content.essence, content: content - expect(rendered).to have_content('Lorem ipsum dolor sit amet consectetur adipiscing elit.') - expect(rendered).to_not have_selector('h1') + expect(rendered).to have_content("Lorem ipsum dolor sit amet consectetur adipiscing elit.") + expect(rendered).to_not have_selector("h1") end end end diff --git a/spec/views/essences/essence_select_editor_spec.rb b/spec/views/essences/essence_select_editor_spec.rb index 5ecff83b15..f6f83f65af 100644 --- a/spec/views/essences/essence_select_editor_spec.rb +++ b/spec/views/essences/essence_select_editor_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -RSpec.describe 'alchemy/essences/_essence_select_editor' do +RSpec.describe "alchemy/essences/_essence_select_editor" do let(:content) { Alchemy::Content.new(essence: essence) } let(:essence) { Alchemy::EssenceSelect.new } @@ -12,27 +12,27 @@ end subject do - render 'alchemy/essences/essence_select_editor', essence_select_editor: Alchemy::ContentEditor.new(content) + render "alchemy/essences/essence_select_editor", essence_select_editor: Alchemy::ContentEditor.new(content) rendered end - context 'if no select values are set' do - it 'renders a warning' do - is_expected.to have_css('.warning') + context "if no select values are set" do + it "renders a warning" do + is_expected.to have_css(".warning") end end - context 'if select values are set' do + context "if select values are set" do before do expect(content).to receive(:settings).at_least(:once) do { - select_values: %w(red blue yellow) + select_values: %w(red blue yellow), } end end it "renders a select box" do - is_expected.to have_css('select.alchemy_selectbox') + is_expected.to have_css("select.alchemy_selectbox") end end end diff --git a/spec/views/essences/essence_select_view_spec.rb b/spec/views/essences/essence_select_view_spec.rb index 64bad44ea5..5e260f7bc7 100644 --- a/spec/views/essences/essence_select_view_spec.rb +++ b/spec/views/essences/essence_select_view_spec.rb @@ -1,13 +1,13 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -describe 'alchemy/essences/_essence_select_view' do +describe "alchemy/essences/_essence_select_view" do let(:content) { Alchemy::Content.new(essence: essence) } - let(:essence) { Alchemy::EssenceSelect.new(ingredient: 'blue') } + let(:essence) { Alchemy::EssenceSelect.new(ingredient: "blue") } it "renders the ingredient" do render content, content: content - expect(rendered).to have_content('blue') + expect(rendered).to have_content("blue") end end diff --git a/spec/views/essences/essence_text_editor_spec.rb b/spec/views/essences/essence_text_editor_spec.rb index 6365dfa281..f976929760 100644 --- a/spec/views/essences/essence_text_editor_spec.rb +++ b/spec/views/essences/essence_text_editor_spec.rb @@ -1,9 +1,9 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -describe 'alchemy/essences/_essence_text_editor' do - let(:essence) { Alchemy::EssenceText.new(body: '1234') } +describe "alchemy/essences/_essence_text_editor" do + let(:essence) { Alchemy::EssenceText.new(body: "1234") } let(:content) { Alchemy::Content.new(essence: essence) } let(:settings) { {} } @@ -12,20 +12,20 @@ allow(view).to receive(:content_label).and_return("1e Zahl") allow(content).to receive(:settings) { settings } render partial: "alchemy/essences/essence_text_editor", locals: { - essence_text_editor: Alchemy::ContentEditor.new(content) + essence_text_editor: Alchemy::ContentEditor.new(content), } end - context 'with no input type set' do + context "with no input type set" do it "renders an input field of type number" do expect(rendered).to have_selector('input[type="text"]') end end - context 'with a different input type set' do + context "with a different input type set" do let(:settings) do { - input_type: "number" + input_type: "number", } end @@ -34,10 +34,10 @@ end end - context 'with settings linkable set to true' do + context "with settings linkable set to true" do let(:settings) do { - linkable: true + linkable: true, } end diff --git a/spec/views/essences/essence_text_view_spec.rb b/spec/views/essences/essence_text_view_spec.rb index 06048182ef..b3df308bbd 100644 --- a/spec/views/essences/essence_text_view_spec.rb +++ b/spec/views/essences/essence_text_view_spec.rb @@ -1,52 +1,52 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" -describe 'alchemy/essences/_essence_text_view' do - let(:essence) { Alchemy::EssenceText.new(body: 'Hello World') } +describe "alchemy/essences/_essence_text_view" do + let(:essence) { Alchemy::EssenceText.new(body: "Hello World") } let(:content) { Alchemy::Content.new(essence: essence) } - context 'with blank link value' do + context "with blank link value" do it "only renders the ingredient" do render content, content: content - expect(rendered).to have_content('Hello World') - expect(rendered).to_not have_selector('a') + expect(rendered).to have_content("Hello World") + expect(rendered).to_not have_selector("a") end end - context 'with a link set' do - let(:essence) { Alchemy::EssenceText.new(body: 'Hello World', link: 'http://google.com', link_title: 'Foo', link_target: 'blank') } + context "with a link set" do + let(:essence) { Alchemy::EssenceText.new(body: "Hello World", link: "http://google.com", link_title: "Foo", link_target: "blank") } it "renders the linked ingredient" do render content, content: content - expect(rendered).to have_content('Hello World') + expect(rendered).to have_content("Hello World") expect(rendered).to have_selector('a[title="Foo"][target="_blank"][data-link-target="blank"][href="http://google.com"]') end - context 'with html_options given' do + context "with html_options given" do it "renders the linked with these options" do - render content, content: content, html_options: {title: 'Bar', class: 'blue'} + render content, content: content, html_options: {title: "Bar", class: "blue"} expect(rendered).to have_selector('a.blue[title="Bar"][target="_blank"][data-link-target="blank"]') end end - context 'but with options disable_link set to true' do + context "but with options disable_link set to true" do it "only renders the ingredient" do render content, content: content, options: {disable_link: true} - expect(rendered).to have_content('Hello World') - expect(rendered).to_not have_selector('a') + expect(rendered).to have_content("Hello World") + expect(rendered).to_not have_selector("a") end end - context 'but with content settings disable_link set to true' do + context "but with content settings disable_link set to true" do before do allow(content).to receive(:settings).and_return({disable_link: true}) end it "only renders the ingredient" do render content.essence, content: content - expect(rendered).to have_content('Hello World') - expect(rendered).to_not have_selector('a') + expect(rendered).to have_content("Hello World") + expect(rendered).to_not have_selector("a") end end end diff --git a/spec/views/pages/meta_data_spec.rb b/spec/views/pages/meta_data_spec.rb index 7aa1937521..67aa23d9fd 100644 --- a/spec/views/pages/meta_data_spec.rb +++ b/spec/views/pages/meta_data_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -require 'rails_helper' +require "rails_helper" module Alchemy - describe 'alchemy/pages/_meta_data' do + describe "alchemy/pages/_meta_data" do let!(:language) { create(:alchemy_language, code: :en) } let(:root_page) { Page.new } let(:page) { Page.new(language_code: "en", title: "Road Runner", urlname: "roadrunner") } @@ -15,11 +15,11 @@ module Alchemy end context "when current page is set" do - before { view.instance_variable_set('@page', page) } + before { view.instance_variable_set("@page", page) } describe "meta keywords" do context "are set" do - before { allow(page).to receive_messages(meta_keywords: 'cartoon, road runner') } + before { allow(page).to receive_messages(meta_keywords: "cartoon, road runner") } it "renders the keywords in the correct meta tag" do is_expected.to match /meta name="keywords" content="cartoon, road runner" lang="en"/ @@ -47,7 +47,7 @@ module Alchemy describe "meta description" do context "is set" do - before { allow(page).to receive_messages(meta_description: 'road runner goes meep meep') } + before { allow(page).to receive_messages(meta_description: "road runner goes meep meep") } it "renders the description in the correct meta tag" do is_expected.to match /meta name="description" content="road runner goes meep meep"/ diff --git a/vendor/assets/fonts/fa-regular-400.eot b/vendor/assets/fonts/fa-regular-400.eot index dbc06a4a3397b3b20c5109b616e725d473d047f7..38cf2517a4da71a05f8e83723cdffce45ebc3319 100644 GIT binary patch delta 183 zcmccC!*s2OX@U*Qf~gb2COV{W8ZziH7yzNg#I@$^#$b--M1R}K8jQlsE35)1+cCy4 zOGt)Ip3CUVVtqqTZt^=uS$S_Jp0Ej17sT`1d}ZKfVgP|#^SU&kwEku-CZkGLuwj!E xs}-4z^$aF&s0!mXW-w+zwod?R9|ME2v7w%UfyHF~8flQ~&Av7NIJuEb1OT!OFKhq+ delta 183 zcmccC!*s2OX@U*QpE<1=6CF}G4H)zo%o$7>j3=%&XEy?J3>h>h`rA&{U=(K7nlf{; z9b*i$`0V`2a~XYEjBlE2On%2GEAMsSNJi_NKk@uFUm3WW7(n1w{B|EG9lTkK$*7VQ zY}n+)YDH!vJ;TWxs=|1U8H^c_?Gu37$G~80Y@lauYCKuLMjE7gvv18mPHrR<0YA$! A*#H0l diff --git a/vendor/assets/fonts/fa-regular-400.svg b/vendor/assets/fonts/fa-regular-400.svg index 273a984113..48634a9ab4 100644 --- a/vendor/assets/fonts/fa-regular-400.svg +++ b/vendor/assets/fonts/fa-regular-400.svg @@ -1,12 +1,12 @@ -Created by FontForge 20190801 at Tue Feb 4 18:05:39 2020 +Created by FontForge 20190801 at Mon Mar 23 10:45:51 2020 By Robert Madole Copyright (c) Font Awesome diff --git a/vendor/assets/fonts/fa-regular-400.ttf b/vendor/assets/fonts/fa-regular-400.ttf index 4b6fdef613a07bf2ca1300d33281ef4483a7d9e2..abe99e20c38a23e95295917d6a5cdb49a8489eb8 100644 GIT binary patch delta 214 zcmZ3}#k8i2NrZusfq{XSp@D&!A;8To#J6vSRp3OC7-k8{u!+UK4%RpHgS@2fJ`1FL1wWMD8hHqSEmR;9W&(KKEaI#&E#^iOCdc4LA#ta5PS#t(c2II;5s?7DkY8f;c7>tb# r^vq3-6*S!P^GXyP%TtTw#uKvf#jbtAH2C6y# diff --git a/vendor/assets/fonts/fa-regular-400.woff b/vendor/assets/fonts/fa-regular-400.woff index f17953a79f9bbcf310e3b94da4d50d25575e74b3..24de566a5c97289a86ce0c238a195da0d3251263 100644 GIT binary patch delta 646 zcmV;10(t$Qg8`s}0gx2~O9Bj$7$pO!I#H28bORU}R*|<{2@(JR1zS7VE*_H{0VE4~ zT^dkY9{@^_2EVgQ0iic5X5tB(Fm*vZzs*+$ZYBm0xHYd!14`@vfAfDQQ#<2HAeVyy zEDZo^Yz=<17db5ge?e~3Koo}mvC~#ssv3SKi4_|y^ zUcz&y%e)NF`NX`6n!Cunh86b_^Ex{23+4^dyl37d%~$L~Bf}YTBD0)bu`2Y4&My0tL}*Lq#N}#_#y(CkL_~Y| zy@(8DFIP(Lss70@qQgJ5)BS(*YSO8P0BsumE1jF67qmV9dP24732X~Kw(VQL+~t(U zoYsj|bgl1sga#FB2cGY5%leGvsmhB)r(HS8(Krt>e`^p4CXkU}=m^6m+V1J(SqS6XJ_L>Hof;S6`cJ=<_GLD*34Zvr|1y1gm;6K>z>% delta 646 zcmV;10(t$Qg8`s}0gx2~O2EXC7$pNLl$nu0bORTgZ;`iL2@?PS1zR)OHz<=F0VE6f z?LJUC7ywG52II3!0iic5I&dVTbtXaz+Qe>K>XxK8g7)M^g2sy`%QCbZ zx;vZQfd<~dyFP*s;K8E@Z@z*LVT=!8;uq?^qAX6E1T|NVCdz+Lei0^{Eu zbeILoc+Ko!4j-6Z+!ro$31#t$c?K2nnRynsoqNm+c;LKYe_q6f^PPDax7-%<3g+Br z%&RE7Z<*If^M!exG(X5)l;&ym&~{R=ppKt1J6OUyW*3j}k-3D9s4&mqi8yDTMN@oZ zUcd{d%e)BB`NX`8iaXD|f+hDc^C~*-OXfAwyk}k~%~$L~BgGjqMCfAx1Bog^)M)O} zSz>o~FoHr(f9sfL?CSI^i~0j2t6@#{bYkSrNaZ@Fv#b6j;oFiKak1K?v5ylB5zrof zFCu-}%aoFPs(&&J=U8R%g)KW?=Un%_)|S`0nNV$dn$*HJ)o9zdeznUf zjTx;YtLR$aiwHF;)^2*+ep^^@sagN$We~@Vde-fd7Sp+WU7yZ{K{qNIl zDS9gk9bl7+Nh+pkE)t~nUi~T~sq@fUOFCCp5zy+8W<&d$bjPGIln46*B}eLDGncW> zjZAe~7|JNriOiLeL2@XK*2Ck-kh-|ChOBaWEe(2(IAJiA(6jb2$&E?#ZliHTxq@*n gFVykh6Mo{$KI#9ypVwcT8|d>V*NOSHvr|1y1ej(%V*mgE diff --git a/vendor/assets/fonts/fa-regular-400.woff2 b/vendor/assets/fonts/fa-regular-400.woff2 index 1f796c7505e74e7fa3dfd66be1e6faf0a6934f8e..7e0118e526eb53511cb57e7cfaf515784fee4345 100644 GIT binary patch delta 13395 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 delta 2801 zcmY+GeO#608OMLub&i7E_d}$hWT2-;`4S-tzAUJGe?`T#M5BNN#R4HbDVBAt$fzj6 zL&6p@Dk>{JMnN4`tdXHoX;Gtwjhd-VR#di8vBk2Vtv|Ns^ZB0px!!))bwB6r-t&U3 z?K44RzEj{^tq7Xxb{|dprebFLuz18_I;J9F&u2P)$P`+WD?VN3n^;*3?LP@1YQfxj z^D)tNgmydaG0Rs@nlk6EYw7?=qn)`fKdbP(r5AkxgmnRS--fKsg=fyd#r#&rgE!=D zTYq2C6T5)edZ@oMHzzB5)H4OA80#U^a_Ml-85%^raN04s`QBn*!4d7HqXjr;bY8)_ zEcdn`3q+UD_T*<37rH0NO2%ifz_TeUKWFT|2{F(%FEHei!h+4->2~KX=z%(5(s>YO zE^cf8Ch4d<Z}M5Qcus>yC}FrN?B0L zvS8FURS#by(&j%s;&T6_@DKe#5pnEtMMQ?ket*r#B>&No@4J2&7~*dnHHm@VQ5oV} z>s;k5b5fke&O&F3GtRl#xyXreE_5z%JkD5Wj1%odIp;g0oCqh}8Q~0f!kkdYIK%9q z{oMB26ZRAPv3<|JZ98nc-EZ6MYxWiUd)s1PwlCV}?LOOJpR>=}r|grq-acU;vvs!C z?zR>7L0f9?wIx2g-EOm6?H22`H`>*@TTHqk*Rl5cGWaBe1(|b63nXg*azhE}gRJA49Zx8f!+1^) zWIda0@IrE<2#44R(gwLPnXt)Cv~S8LCn0&P$!mq=Z-;D}0Vzl!^^n3C(gnGB6{IN4 z$Cq5fg3Ws&-g3w-X`~afh4)*VA;p}$m;-HN-ZmEAnhm)v9>4WTPhg8)-s^^ks$Zr}UzfC60eIy%F!}~`$KrPqb z#Sq4Qb%~I=F396MNI&F>5=gz9q(h#h@2NJ((-hy^4tZuK>4iL72YId%(!eLxFbLV_ zfjrNeMhd^cVO}Inv7`gi+zNTA1@dw>BoIYP`1?ltm3YXj;e7vJrO`^UKQQsNL~8WRyqm}OzcY<=LEhu~ei$i+{E3BK6#QTY*$eqFl?*`sTn*`FyqiKt z+5G4r7cy-;6pF?84}Xh$HXTdb zQw_Z!3_iV}1$tp6^jG{RyC@8LaV&Hk2O8H49nU5cnS2RFV#7%%^wMT%9OIKxNDnlg z4JWg1@=55FxzGgWC6qxE^GH2(8aFg;5IQ3j`s-j)4!w*dxyhgpdU-PR3Km^C6FRdU zIy)OWrvo~-4myv`=2L9JcId)B=%PmGVhS(eKufxyOVgmsqR265Y9e$6MOV~7uj2j6 zNYVhkIvsiqS?z(Q(VxZ*uVvoa9_Y2ccxXCBuL~oE(Cb-ry%(C%49#RwW-Bx+mvlmJ zsD!SICj-#zUT6-7UC$xc_d_>u$XwQKOoj5-P;X>TUMw`9Y+_CU>kBz_VF&c)YG@Jj zim2_|%olGO*-QGMw=_bx#FN8h5W2MmTFfU>Oo46O<*hTxY3OYw(Cv|gL)^~z9d2?~ zFcG?g_dD{ScT=;38uyezcQSTwEa6&8&HEU?KLrW;0GpMC6DB^`3w@{yx~m&no=Rv} za90&=(B0z+ZGY$8$KwLW<7DN+z=5qYv^EeJsowIysi)Pgfu!d&a&(pJp!Nomj_WM_ z@7b>E&XYRUH6?Cx)v*(r>Lefm|91k6`}qWj2|z+ZeBAV@37+xu3pRN@v$p1JF38XE zY{@Cwys==@WuB>Vlc^HO`AjcVITR>8rFHJnXmQPR&37$uEp#n%Ep{z&rMQ;5mSMMR zd0=**9+yyj?4ISG?Vf|-?z!%HRa3swlYv!V>$?$wX+vD8!vbZYt}R2WLLyuf1G6Js rkIT3qZ&B99yqqGQoOlV(mHP8BiibgrBxfy`>tNNUNLRG^pYz;L2Yk?L diff --git a/vendor/assets/fonts/fa-solid-900.svg b/vendor/assets/fonts/fa-solid-900.svg index 6933b2b52b..7742838b44 100644 --- a/vendor/assets/fonts/fa-solid-900.svg +++ b/vendor/assets/fonts/fa-solid-900.svg @@ -1,12 +1,12 @@ -Created by FontForge 20190801 at Tue Feb 4 18:05:39 2020 +Created by FontForge 20190801 at Mon Mar 23 10:45:51 2020 By Robert Madole Copyright (c) Font Awesome @@ -23,7 +23,7 @@ Copyright (c) Font Awesome bbox="-0.983398 -64.9834 640.104 448.427" underline-thickness="25" underline-position="-50" - unicode-range="U+0020-F941" + unicode-range="U+0020-F976" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vendor/assets/fonts/fa-solid-900.ttf b/vendor/assets/fonts/fa-solid-900.ttf index 9dd8c7fd781711897b57043c79015cecb8e810ad..5b979039ab28aaae305074541fe39258753ba624 100644 GIT binary patch delta 11174 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 delta 2766 zcmX|@4P4dL8OMLmbFYe=^EVPuR8VY`FCn6kx}?&4S5yp2Gzv&iG!(*{VVReV49gU` z6t>7%k*V=97Sv_M8W|dy7ByzW1Ex?e{$AzMkHrw&)GqL;tw5OBa@C9?{&BsL7Y1+-SM=wvFJax{Fo2mdwrJb>6V`lz{ zrI()vg4zIkbY14={EHW-80#R@a&of0 zneI6Q2T?GDj;NfCp2ED-+C{qoxMXB*-kMDJ)|B z#~hsy1#R*G1Fp=^+w7TcckYEAuL35I=s%n+ZfgE+R&YxCB?;fdD9eD4)BP)cS=FCh zCesI<=+AV$>AO}Ucj0gcmayOeO9F79?(R!hi8T4%A9{`N(%=t$UkAsqOJqp8$T8pc(3!qh zL*IA(*gL>iHf%BjCx@krceQhav&>0!7CQ@_sm?g(3g>bs%DK!L>qI(ZoY78%6Yh+1 zhC887h!gA#b%LBBj&TOtK6}n~*|YXj`-y$ezHM7}&QF`+M79U$!sW7wl16 zW1qK2>_Pjit+vnD-`XmBz?Rv4_7PiRAGF0@yUlL3ciAo0V>j6KHpi~BYi+i@&8FL1 zY?@tVSK1`I+%C0q?Dh5+|ACDZ!l6pvDHDqZ#>47X;NE#u_QwZ0j49JRTQVY4k zl5LRW5=crAse;_t2f3*nvXb>HKjXKf60(Z=s~B5Nt<}`HxsbF&Zei`MyWy2|7G%sN z4Uo)U$Zf@>8?uILRxF`VHsjeHkhN^K&I8E_CmdouNE2j30%4QeY2ThjIw85N$!&ye z+y>b+1Cp0Wsv-GNqz!UM3Zx*2U;Kg`!h+3*Af8glovEZ1vW5G*>LG=kypRKJW!_d6 z-kk-xCl<2JP1yY2e8R!E=R&-Z!~-b`Aq|lGsIeoOR739P`alL`XB4S|JXlP;J&=;m zAiF63P!i-}HrP#}N5~$Ya!(0l?`}vb*L^{x98zXUE5t{CIU7A1M!F%7HA5;YA^Yc& zddTCokl!Q_=01@HspS4i4sd|$Q&EI*Z&f^`stxjV5$SKh?1H9%g@g80KpF@Mx( zzY+_1HH7c~t27!Z_6H`u7Edlf{z$ut0_k&0wWK$RWswNu(F@=lzg&#@i|M5u1P12l<%szqCU-Y9OD)Lq2sAivP71@_8xb%q+-R z=AJzT>Fj`f(E#}}74lUG@zUAFU>Db~J&<$FknRM?H=OueHoedS`EEbt@A;$$@((ua z;R(NI<9~KRdILx<O^S!Epy-N9=ndQ_hmjiSjcL%E$jV4)D*dTE@M`9*?ttFxjfJLB^p+r! z551K|w|b!I_0S9!Wi&!Fb4V-nwsPp2Skep4>Vjr-*tHyTZ4Y!EhsxG&0u-cQY9YCNzTx|6X7qY2j%YVKnEp+v;# z!)&%YgfQ`uF6f>%=-zf{X%eBmkEhz#1T7m+X!~04Z=U3Do+QZ&{m*TYfd~ALhpMO4 z|JFfut3Tq1hK;QFqFKBA5ufX99WWI!m{Kw3OAQ?onVgrqK5NodF;k|-OhLt-GdiN; zsk3^u6U&_GxC(KI#Q0zQ7tiX*pr30o0f>u>jhTK`T*ZV=9pz%Ne?g~Srt+qL!)ZCm^M_ra57-B~MFa+D`mxR!tK%o8;{4$#P9~=uKm;V^de*%H|pMHKoz%6XO%>NsD zf`ID#gMc+^k`3xcS(+J{f`FR8{+Gk{pV+Y|)b}m_g8&dv3&#JzpZ`P(Ap%8iY3KT1 zp@rgqo7@2bK}u^@1V^=XFfjrFwfQd(4*x%v12K^nU}xm%2mzNgj3I)t7RX>G&O?0JLnMI9hbLmvl6zj0d*UlOuE#xzs&pE9Yx}uCMcHHQ2G

      =EAo<{lG+g7gYc0XIW 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 UwcQNt)wOi2tj+%cpV9y$0OV0XJ^%m! delta 77037 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 diff --git a/vendor/assets/fonts/fa-solid-900.woff2 b/vendor/assets/fonts/fa-solid-900.woff2 index ba7507b18d866705904ec0b95a710ed931754660..978a681a10ff0478581436eaca5c5695c97445d4 100644 GIT binary patch literal 79444 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

      wQH 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 literal 76120 zcmV((K;XZ3Pew8T0RR910V!Aj4FCWD0`&X<0Vw9D+k^gTi95Vg1F5Y zPXlt>0Q$>~;)vh6U>uupJD0F|FN+myn^rUE4&X?7vt0K7|NsAQN)|)5|AXBGfM-s1 zZmBLattv&K(53G;Axe}WDVJ)JHqxX@t3d|YO2}~(s+93A1CEgHd!c(NhhrWhFjXp? zx^&v9Qnp@Z2_fhOyeT?T5m23j3eo-I;R@;FGEGw{+Z$YSTME zjAkY#5$EpJ#*}pH+(DnNibBQUh0us^ntH^e|9AQh`mR475B9ppy%2qZr&p7gq9YN7 z&U7B|ILj(W^_-UTvgnFmm~f!q1cDx9<1u2oe`UGoV8vpsR=@qx-(3Pi z15X)&t*z;j9D*}D(OlWVUs=(9@(rIv z5^dhp8zirR4yF83ArU%@WY_=yynpve3L(Fq5~qM>0A^k5+%L`ksLCtEdy`LhO664w z)4|S6IXFaf`yUlQax-s?iXk=oh&DDWZ|3Z`Ddn(oSov0im1hMytbBWzqxvk|@9q7f zt#JZ4*(#zV%8}y$EesEzw|AR;un7-vpc9xSfu;#%X`nU4aK-TO^EoyCrF5s8JTwGa z4j2+12pEbGxR5p*>Wm-v!D3@=t?fPcSXQ8583O}JLrpRaw)F`A@BaV+fEKP*Pzy4dZ0ULwC=)nf9`zxZh0V9=- z+7MAvz}!rR1&RR{7zN&eg@GPu-^rbx(WrN)rx(VBamkRK&RNE__3;HqnpmsN&?2Ri zDV-?(?`!VonEC%Yt1oC3Ts$~@0$5*yiYgCZIW%eXEPq2zUkxP z|BucoTmeUb$<&4Vz&vyE2;U_?9|S5}D?XEY?pSTD;)%hUix2ZAc|a$IYI34hfD~`3tzNOB z-}GoZ<8Q+vtcR6H%1*8A|5CN@tIpe1&E#8E3=Xe*NHN(~2S+)+m;u6SZY1ON<76$o z*Z^B#W`_b8WXUsTKv1yTmaRaMoo#ov4GP8(=%=b$|^Vbo_w@ zAIR~|xVlNv?zYnX5)t&ILnzO}IiuvcaXBN$!c3?_sPv&x2o!(-12`CRXJdx{6~An* zYym_}WS2Oo_f%5Tl)h&fOW$@xf=$HK;Y=OBY_|OWuj&QEoSdP1UiMnsg<>nlA0g9{ zNG^B&OV#R1NTQo|TW)!BlqaRLTOG$6VmR#)KU5W~e*FTg3I(!I1W5n{B@m=U0E9#k zqy-c}xlkl!2%>C?R`<$s&#bKW&dRc9o@`G*ASeb=W-w*ZvU(Kk2_dS}JdY=JdwM6w z(}sBJ;~w|Cr#;>CaS!M9|GA%he;j}R{lr=oST^8v#wj}1sN+%E!gHOC;ltN{l0uae z(tq9!lw}xv2*pQK*v+Z^RHzDu&Ho2SS>WE$ zqNIY!6mg6e72S{e@#p-1akRZ-YZ(Rwk>x620vRXC3Dp1hf6Uqc(bZ&IC$8Z~qDXB5 z1JmxEV%|T*&5X&5Z_lhu5#3lR)RHECxl2H0IO$DE8j9{R$eiCF3iXXytAPqK1c5qH zQP>GdNW!Rh|9`L~y7m6tKIn&k+}tyh946n794+2bda!eC5<#QrL%%}&V*Jcxtxva5 z_cuB&{`q~!HqPgDe0SriCV_s9(`d7bcdo(*GlJu!PSHTbF}B=$3=#Y-bs8nhcBl>i z*OCFh)srTfns{nPR#)HX8M9aK+#@J7GBzTt3=z9mg4sCvuZ!Nb$r$M-J) z1VNy&1S*Te7pwF}o4eQW_|(Gk*5&=%$IpY&()#}KSlPsQ8?eqX3C<2+mktqx=PXGi#ATc;Rkz8f6IXD9_jzppHR0gxHl~!Nd z+_#s>V&&}m>)+(;!ok(s*RSE(2Js zYdWW7S<|dKW`9PZDWSk_N1)N0ogQl+9u=FB+Y5-b$dJc&7H6UzNYLoc?QwyOPsoQ- zEL0}5#r5WjOrpsV8&fYRh0kj&yq2WJtcgFKr5({1v%-W&sWx(Pc@6}~nI&!c0P$Yy z=@437kWc{?Aeuy)6!^(b={V&3D6Oe=HM#YC2)cRpQE&kA^b${rShjTCR#E0*d zUq8IFK3pw4vg=P&cGlUMz0<=ZNaSH>22!Qbij#}5gkD=gn^)k4Qup{dkahNBvYuth zlu`S5e|>(qzh2IV-DWwPjtBi-w~$YhIQVmSyIywN&3d(5%%+p!px^5T1Fs(U+hsnR z4!f;lA)iZ!f`Na3dg`(JP91yKszo-_iT(NaaC336ScqiwLi_M=*$(@?M*hcjKAVh(gMP2uYSgR6TsD(T#G>KA#}98Wy6}R{ ztCqK(e%j(ivuDkiHf7{^G#vE0op!6)sF!(`CQ(46(3XGubsD)yNX26yz@HzR)nd}A zRSLOGBoy$u92O3Xgn$9AY!ibh{s_uFa!dAj2e|fCKWMBL_E%e8+9sGC}m}mEYWT;tE7aF zAANjre9Qk;f%!9q=Xts9k~+do>J-0u>(9`8k_W=xR(=09xJmMP+< zBdU}iyGjLQ-Zlt;qjde&7t0F%;HPrmR>k}YRDNVH?ImKG;ckI@7}J1g?bj&LYB0fm zTD=C5^lpH)3a~PGm2*jT(Cm;Dn_4~P+Prdx^y!S9A1v5~d;3RNAvfik54s)F?EcfY z6kdgEnj@pt%ArpR{S(6qfhdF-F-+tz#emBy8yNHvWej9RA7#-JLMK7>z+|YOCiX^O z?Bz3=2OHAp*_@KO8BELxkEA5nx)r*SrhLM5$hZVILK!;?ZRJ+9PrGi$v{(v$kDtT` zPhnLssGu}+Ldzn6NVHs8aGp8ujM>)o_IRbjdx8D}t@DoZ9Wp2;n zG;dfn#xl}SJw=AD>(xzc={Frjva2X#tr|+TJ%F0#sMR#?73=t~Y1_iXfaVoiU)|Hb z0`m!^pGQdEY{ReItrp_4L({_DF$K>XJ0NNg=QI8MH<7T&K`w^r&duUE<% zkTtIO5?|q>IX?iQ14b8RzAbllf(udsXIyuJtsrt^z>pzTYg(@BwGQTf4rDEd$~N*1~9XaB1c%pppX3{@N@pa5{eed=GSsvn?nCq#J$o3ye=ZPyyw&N3Sc%|R`#7^AiA zD$u$XnjMgh(~bSkYFwd>Y+}cb9wsY>D&##WB>3#n(_mT6H8LXM{*5`hcC1_U?Lt@= z;s*vXKBy`S&k#tAeg8B*H6QV)RQhHWdL)xpXmP~@euxz=9nRYoPB>$)HAyZXG{U8i z!WaerPyx`XC4_IDxjH>qEjHYwo6|9CJ`0!hg%7ve?_88pm+k`0Mm3nU2uDkmj=(eW zh2j7ahy`$D+rFYOU#jjH*yfN{R<=P7m2mHXs2;0Fb1%!~V|lv7E=LYC?z@8*I9`JR z5r!kWhnr?8LeRwl6T93~df>$d0q!^lAto%8M* zz$u}@pJ5)vh0yyBrBt@2>$+{k{Yt>Yvbz8?6S(DUB4ASkj-ZmjNpgh!GRr154Bu%0 z;2IZ*qbO8KwmZlukcV-KpUs%(xCTQ7p@?i%;ZcB?%p1TUQr8wup6NT43O#@VBw+I; zSo>u8*oryB0{)_Hy3?c*b!^X;n2{VB3P|inE)RofB|>RT_!cnXC~C@!Iafscpqvt? znD0$PhZ+#~tymNufOxyZ=PO!Z(`>$WSg$v;7ohmI{t7C++@gdOqXL=|7Sjd?Aj2H< zNOM5~-~{4u1&;72;Na>5Tm&Rpk4G~>jAYq(gex#zn`68QH>W1N7{RD)Z5wZgn`n)5 zXfLD*Mgt`tAg3C#47rHP19EZh!aLL!BJ0l}_v$NU8C%(A))wV6t2mWb86000^G|%o z93+fRa*fodfP^Lth?h;_HHxGZDS92p*E^B`A_Lgw2oRv`Y}Oh>vYDS9|8-Ks29H$_ z^tN3a)^mX=;Ny1+nA+X^B;lJERCQwZ4H=rw zY>OYDZZ?|}HTB5pcy-3UgHn($O(pK?FQgXI>V<2#7`uOm@2`HniC*5?3o26HZiM+dO`jsM=I&+jnF z6>S+VTXwnZk^+W9H!tmv8H`jWFwBm{zUiR_Xl|Ky1i%LrC7s~&GQP}*f!IwaS#c2% zvEghBmhkq*Pt&~1ws?l8~Pp^5tAo@%x ztMD5c1d)?DKlT0L4zqlsCYm&)a^9jeC`&UOdMEuT@91VTqmHmqd9LtsQ496x=h!;# z4t}*<;S>K9a8rTVt`l~=VT6u=m8#XCs?VosLQA?%$tMYV6ImbdMJMq<6p%>kh`7wE{^eHB!q*neNgG{nB9)Y=EI&{mf{#>8r*L1-DYGk z{7-4wXA)Kr`6Pu9LsIG&?NcdBg<1|V6k-9z(Zvxio{C2uL|ri|7H#9WG~Y_lJT4lEHdurm^)%v#8ZmZh0X}d#F zyV4%hs_gov=swgp)}uS0z%KKEhLcQ@M4K@Y-Z>5iJe8Kl<_|OwKEg$>+z@qydzLg2 zGfV;GeT4cJMH$2V+yfPoY2X80c?$}UP!O1^j>McLSj_ZkANE-rv_Sf6%cx!~suXkD zt2&|she}#orn)doOVxN8V;xUHOREt+I4Ajd>9{8NqNp$~RY&W>j$cw@B4_5umH7A~ zva#wZ-4tKX0?M7rM9q8jBEaa%ftr43j;)c=9K$pPWY;}foHlvWh(?|#Za`T;fwutm8GZUgTl`W zB&e3>;ma$Cn@vke`#OSD8`cS4mF+_DUY$j#6^n0*wwNI*<6wv77}8E@;Sy{Upw&)a zB-&`7%~LXoj1azU0%Az>u_@7W2UXe!oP~)9$nEVr8jqz)Aj-`b$rv5z`Zo5&aHf@b z`*P>3m39u57t~BAILOlYjm*z2&>c<6?R-g1C8CW6s4V@j)hQ#eBQvH}ZKD|ry7PMZ zw4Mhe>Numl0VX~MC8>s70ZhG(#1H#WW_k>BQgnlCnyv5J$>cU7j&Ff)IW}kIyuKhN zqdZ#!o_yLCP#p|uU>}ubkMmcvZU zqBPZ$OV6=6ht4VmduCX<$kR9DLH;6%MVwBd#(kkT3 zQCpl!#STb_&OaqMS}AnomjbN|Wj3;Hcx4plk5(9*2H6yJY$|+ubzwS(4Og~_vfVPyR#-u_1m_3yG-`!M|YKuo{)OCJr=tSyF!H0f2s_J z>RsB5IEra*;OIlKV?FUU=Xynw&vDP#we0Q zTIn+28zo_KnDl#-#~x~|K*yDFosNCk@=TY+7}K>JB&jk0N~P-xAy5MYN(L%d#*{p3 zDrrg(-wH2X`w=TuRwY15vMa`5C_N)1oy{ZKL%?YnyXYm?D9q>ITej={Ze|D)eCLgN z^2okvn_(Hr@0x$|9;5D56Fh@S2`O%-Zw{lbd9Gb>?eMrGFP z7lOgbAkT7jr`Ix@B94#*S%X;Sl4N5br10Jf5T}su`J#WfXt;?vg#zrQ=wC^zdaFl? zI=}%yB@o*Yn{m+V`(%ab>-+2^Xioe9obEmeW%+hJju-2^@JS0P-MaHpjO=-0_*Q5} zEl~RpYnQ(F`R@QL-v6Z1siJ7>x)uliLpHV>?JGi;*LB&kl+d`mqeZG<quyAW8gC`MG>?|A0AyPdVg0`oRQ;HqNV}$&}CR?rWp*10uV^U!^1Z4jjst-?v;6t z%Ag|}gzye{f5(9s)5QR0W(HSYH#7kC_E}$-v+P8_XAQN^I7loI+fTu;US3tedPsjh zR|d1@*6qccb{s489HoZ<@PLYErEGl#f~adcuoVes-W@VmDZ!R zA5*}32Vrv5E%CrChfJ`iQ)4S{ye~T}-oICvGq$E;toZ&*A>pHWvafsG!JLwKP{Xi1 z{6PFk@OOx3_8LiHBR}WZ*;W#C2KNy&?XDRMLnoiqqps`xfUQvOyGQGiZD4{DX9BX%NKwNPk_4jX_)2gWSoCWX5sdFx=ShqS9I##6r;O zhgaVkP~DoK=IZYUW5Ext!KciXIcZXX_gPnv(5R&>NxfREHnh6PNF#bmMpRgPVj?N* zOaW_ZNFi0kZ`uNWdlrI1d5^mHyOQboK(p~EGy`6Co*YlgbL9m*AI_Sh^cDR_Do!)g z-@>r%=MoFh%LViYkD2I3Kp=RmcRmO_zyc$r`2bZOGW*#LB8m{u0@|U(aCG_5YWgHE za3z9@`;X4$k$NGlJFtYzpSs}OE(7oZBNnqWl2``lYhD&456G9?d#ky^on>Xr&1BEX znMkRi$${;Y%EdTT4dwY}E?1h!<;M$oXBLZH)sk*{V)uk4{Z%x|nMzNQZDj4jsI632 zH+JuoOUvs!_ZDx4JY(UFd-IFx;bY8HuUn~rLt^e5hnu+mnUnEv0ckejiV4Ee-JSIo z16eC?Wv19=IuYN>2m?~9_WwHhr*FRd!D)@!nE)D$s_jw7+#Tn>%K!A@@(O32Jy={l zWN6ZL+Hs&*I#eAdF390>G#-LN5w1rArcvVA{rw=9uU)?$JL|J&H?D!aJ6;jEx^m-2 zTC=}=dHtq91wGe=FHATs>lZ4ssKi=Yb&=nb$njiBAe;K$jZLe(aEdUD?6=WkJVOGg zMA%r3^(*R#P!mxFj@g7UFNRW&mI78yhFO)Juc=j_nUIdtkU6o{>b{K?t#Hsa96GgI z0C(HJ-5dbj@i1i+(PL&734?NPV>VwH+%vqQC>kwC0q0aaxmbL9rfd2W*`YbV|A4+HXX125M2 zuv*C%R)moWF{4Fml_s`4QsHMiwv{bzvE6;dK;i}u@{5_vO?wKMdqrTn8O>KkXZCxh zs;^Djz0x>W$?T+#L8FuM&P?_WZ~J3J*wB5zEO$y@dg?nlQBQ_Nd|~nciny1-7}z3+ zkku`jztAhG=Q#YZpo7=>SUX4+A{RErR7DG>Fl*j4bLxL&s-g=q7gm~vF|k||G!xs% z7)$hN>Pwjagc;}4vW*tzSu+pO^g(0QJWQ5VqS!7I|6GzY@jUrB`IW7%#9k?m(~>nd zYhpF+tEMrKKp88K{C%ejT{;bECFbWN49}pghBJ&%bOambv1XMd6p}u|N%YZ0YQ=R|lc5Q6TRB24m zM0o!779$CVSyc1LI7i?36$(S9lAQ(cm9AIHcFh;ot+>K3fciiRes;jEDwk6tSiMoL zSY=u=D!>3;*#u>e&5Pn>$=$zbPpzB^(1Xw`wDsjBK5sdNbK%3xJ5c<#Eh5eSwT zK*_4|kc|*7C*3TWkR*l;49|o`)vf^iCvHbS3#31MAV{CbmKyuCZ^$q`ql}Fx04p22 z#uX4J_WAoxF1_1Zxlt3yLJU&LfH@&2ca@AsI_v&#tR@KMP^0W0k$a)R%W3AJsra_* zHP(2ZOwymY&@Kt~DOVZ~#I{s`YCM7rsDwP>v?LrMg248Od`Wimq}WvqAO$>n(kw59 zv~PpELl2V#$TJOesQPWBiemXO}_t5wlJAJ&_>H9u)Si|1v?-9l_D7xM8+3mN9`& zuzl1|gD2{dU)ICuc8+T7Yb{u6f!_R5&}b4QAOucqnBSp4p;843JvV`jd;BXiD_t5L z(8QUX(jMDaA&~t()zIr?Pk1ada6{5Pz`_AEuW?eA@tvOLs&_w2=^C6%gpC>ON9tYk zMcm(0F5MrIV2WUZ`e~Z@8S;ySFNd9eRD4X9LwT&u%3JL;g6qySq5F`8lg}6`tp)It z-IM&N3k393fURKHB%>D5;gxsm+MO0R-QR%$iP0i{^P^{;bcHuZh{`w-wsLJHO(PP! zIn^EZhvg&>_tWFXal3N&V0kIk|Ahpm8^MfQYC=q9fD}L*8%+q3SA^|ZkV|h4n5aek z%7xFQO;Q)j(x#=!)csp&f}OTB983FBJ9H+r)Bd=bi{Xq8%(Y9FC$!TeVVSH8L=btm zZtm@%v`OX%(Syv5j@x(2Z?kx^E|n`JFN`i#D1 zP*#H&GLoV0N;KngT!A$8_aKZB$_rYamVzILtre&mMk9CVBkdBwxs)!AVKHcyt#AGluF~np&kY`KwnTU3@>qseD z9EoGOpOyf@T`F#xzRclDv)|IFjk9OJ2&+?itRJ!DqXDeP2XI5@JSms>(HN1L3kE!D zGy>`xiMgh3kA%M*z_iO*eL6d2Y+ZFFR&i(EmK)^i$wO z(}4a%R((?clzvTE7lvlZ?BSb3FfS%1f`+@IRgZp}4R~0q)!wT^ zICMk5&0trGO3^PI*Y4^1mGc+v?UTCtv3B>kp8uitsHELHp_M<<$zNNL>!sEs(`wV8y_K2zVdSL@ocRcd!(9Zp!Xq>=&A?%!>Ul9lN(|MDA;ST8lF?tT>Gb&ax z_U)P}^Ta?su~%{e-+olp99!kyd1>+Y%dhUe>x4NgL2hnu``m~@tI@Djj4F6N}f)`J8A zvipMjd5AvW{MaOum^HnVoqK|c26(DK= z_N*{AD1%r?3%BE~h@P>j=d|IpKpr)tHhYCl6vQ3JflE9mATLsJXd=5;an3Bt7O z7g#XPZ6{l23rLcD4kev`48=RkF~R+IXQ@zl9l;$mgP%l@&;g5ME!-jy;{%ZwdJ zYg*Nn`;*A<;#g-B9U z5fVSY(<)a>*C_oAK%SgOG2w8*353t&=~|8i(@ zp8-q?;%U|S36iCZm<_LWPdp>=#vnTATieU0Lpmm!cQgrVS`z5z1IB7neizO*9sk6L zZMR~K>^>|C3i-`<_N?3eiP5?ivapd7 zJyv+Y@SRDpE7luI`p+?u3AS-%_3%_kR@;X&%;j6R{!2pcE>r{~PwkQ%}ss<%VIY*=c^*h~{agZvwIQk+NYg zXT(?jjJ$JasMTLL*W0X`*5lz+7Z>Rx~ua<$+xz?+h=U2Jf*vNhK>y$@>4&3T9 zI|J7;cFsY{$cR|Hg)H}a69t_Yg<6S#6byH}dX`v{U4R*5`OZZQR>2AV7vZ>AUdf8i z8Wj-L6`uhTy-xsjN}#nF%>!k8_uwK(*o%?mwe6)33`KI>UbE9tGDzAt6DTtUhHvrd zJsN77>fEHXLQ~A-s6>GMj`I}`vnjHr5Z^8k)2QHU4XDML2+mK4?ZB=0(1hE)Z|iL^ zYY2mJ#yL;Yz>K1zyPr+Bd^l4ZN-rV{jhR4MA6j4GrC_E@?1TB6+6u~(P}i6L3=Uu{ z&At_gTTd(i5D(b2ZBw4IdXFxy8mGS@DFd<{-@EsKfS|g8ajRqge2{F?$wK<@{{19o z0Bf-nYjx%3V>(&KWbI37FSNqjjBdJ4gB+9xizP*VZ?If&a5Z{0N!qA~$J_Z0i5afs za)HsQVdBxkK>TtGaoNcK=)}Edcs>INK&W8Psp{0;DVU|DVvz~Ps=srwJK7oJ+&Nn_ z<6tSFjr%mqiYqWI889jL^MfdsfL~cr@vXze`g_x(O{tBjk7QzlfaoA?4xFNoNi0A~ zP={!n@}NxI<5ABs!(l3d$R3e~l3=-H6DmjO^7NN9AI59SPxK2S&zqk1Wt1$oO@b5< z*YT?{;)_%RAlr2L;F!cNW@-;Z_{)a5+~&RH+JouU2=+r*{)+0ZU*EpFk$0k@Qg|(W zc>UG^>HEFLu@Ybi$_08tg~F%mLQpMuz18a`bv@DGC;W_362Ek0jP4%PDa6YfTx$ZD zqin&slYkx{r*a*qCx?%&9tz_SyC6y?7K4ra*@?boA5B;OK2RBU4b>47%r@4xiAa^% z)zBvIS7HKLill;Rb!AvjuJYldx-g^$GWHAbs87Hs8dBE}8~YXqTZUCgEclA0!}DT} z7xMHEv3LF!A}QUr_3As~g_}nUgp@O@6m&ELz@T zkW?#&)^cjlgY0u3l=CA7RNwhNvQM?jl_p4ipvUs$E;-Z_poY!|lu@h6J;AYa2z3=+ zJ+TjuqCnRrW#OdS;%W~ycbLfT6`$8{938S5gwrmgMGRAAPs8$7W&F1Y2AX~nt9>C<7^rmi#L;P`&5=Bg& zNd6Hcm?Nx8ru@pRIo`CpsoU&KBMc-Wkp2iPN<8*Q4nq)jro1YZN_Dbasp+r57xl>( zrSep@M$46%N|jY>)1`9C9J28T0Zv3+2i%~0FnD6Td zYzCj&gE$l-dVV>DR0N?0r#z~wIQr%hu7)%cZNIP1j_(LiBPUrfBkF)KKhy3To13e;eQP~w zeHl;4D&-Z~FTAETBL_YzvIDiw<#>jM5>}4pVa|K5S{Rk)F_vSV{CkZ-U_^nnIgX|C zvJ|F`o1W2O2{yiCQuYo`0R5i$7xmNc|C?GlipEjgg`|_|IoCHxQcQqm@;ar@rN8ve z&e;iwgAXkaF^Jx6Rdig`_t7)NS8VaD?dg-2)@D;=s?&!1l?zfLJw=~E6RHY$V!#tg z`}qL}N2v%H-{uyHu?!e{QZSr^?rWFXn?ozViZA|4>P-f|2erSQFGg&8gM;Kx` z(9ZU%C1NW_kLc#J&%TF$pfPzNNp5$SS0f#j9<7reG1j`_(|;UC3M(p=DYcM{HKQ+1 zMfjN|p_VM%T$lt%^5`12GH~t%c{|puXgG-y?ZL5e!x%jtSucXKi;s*EmDm|kT`DZY zqbkyd3v$SBP^i_W9$g9wZ~-!m&+X`Ec(2p!jumv@_fd zbH7~a)yE-Bx!t>p8es(}Loc;(FKXKJlhdPbFyZHUt8Z9&)Q{nBF|}7(JVF=5Wtu+Q zc&?6oH(gfeSx5g}CT{l%Q|Q|yPHHRkX>`Rv+EG5bu-zXDJlh)3)5grs{MvFBI^59C zSLs}_*pVZT08c(jA`gXqNit)KNyUYZceuXx=5{aS!$fhS*L4yTB{1#w+owpTo$nR( zVu}!D#SCo+?Gnz3ZIwnHNBS8da**BTj*_e~Ech5ijaz9Ucw$=xagLChdvajq!oJm+ zYA{5CVl^)S>DEe@3E6YREq!(*S{pHC~J}(ZB?KfIpg9RXZxg{R`Dox|B9f%pjYBWj6b<74F3T<$e8% zIjjXPCB}~Oo8{x=T=}4I(&Mp2#tmQfGiQWMCTshcA$ zmN2r5#?_X)-*mFgPIJ?>bv6CU8G5xDGBA?oh;XHZv9J#OcQSy3kJl8hc~&ajj5pkd z>r#lgmEVIp{ZS4H)N5F(ZTA@LR!iHx_ZAJLpePylgwsJ({hdm6Z@~ zO9JAinRB#={lx(kcK$LMJ&L+&!Cp18pWl4I@Q_?40PiSb$X9MjgOh>!3zRFVd_4<` z`M@0(%65YGwVTAUFuN~*JnPumjTb*`BXvsZjrMHzbPIajwuslJB(6%rcO{n&8AldK zD`?uK#|g^E<&b4u`WDbtiA#=DZ8;RDja_^eWiQD5zKZL{tGvM|X<0Sf6fohyLIJ=?7+B%_l+^ zD1>NfC#zsI7O zLTt)B^p6C5CMOiT)xO+g9Ec)jGr&mWRj@l(7rSW>O0FDc_@SOkx|OyebPkUe@H}H&gct5V97Q_E zVBZBHN$khVV+qh&2v|cTWNC;ZAWhpv>1<5IFatJntjtR^ol+L_VMxnl zK}BrLNz)F8eVU0AC^oBeJ-ZrZkHB;AlgzMz1w0{|Oy=T}*ix;q#h2tbKu>MceZxB< z_KFJP$+#xKnep(+G2P}xrkBzr(IE~GLq8g=2~A0{QezrBWGTx5leKykWyyir{Jt3W zFCLXR4TL)8kqc04QKo`D-o7q0LsD3QD(TAi+!G+exoEj9i>u%^@Hg;HKQB^PtgI_R zF=1*qra`m~Ps8lj5h;A8R`~Q!AChx8Om3a$hnf;>dC9))PRF|%q?DfM@RL`LYAGJi zb*A{;MGj#M3I>P}p6`A1k$*u0%YiW~gJe<_354}&9;apqz2{`z>S7GnA)?LbKmnQ+ z#-iv!LRj3v(+y_|7Zpz7p}FBhzX)?P+B8Xq{jj01sS@=~GR7ynSak$S0t1xIwGiXURN=VwBD9Fw z&}^o3hMWp0@kq!5=5M#4lsPm3c{ZY2;c9?a}N}GMdRq@;0+me)oh$1RJH4OBG^I!=Nt! zEG|{W$iv|i^J0rIyJWQ4G#>*5e*}!6X*5HthSBmG^NTc25D=!-S}1U@;w<UwE7+F>{q?Gpr$Uc~4&Ti}rE5R0%ubLIw-r-80oE^o!(w{(3o; z3&&|S&Z7u_jMa*}T$!Q=cr%x>PIYrp|MnCaN8ec6@QWt{FbWTtMyc3cdb^h!xTT(-&PBD&3_+&5UO8h5ItV>y(RX4tt8}J3Xdpc)%NJ6^;i{E^Dxdr;CJ_K}?d zfcH!~+DeblF>dnUv(K?!^P$4!*Y(#GXt$}2bI~311v~rP%qo>cphi7cRa0wZkvysJsGS{?VPy*9NVgVpK ziXUU9v$qQib?7LZmi(BH$DdZkFQ*J1)o`Ylu5j{)DdubA-S@;LsVP8LS#bDwTqHdG zWYz3CND4-nko1z+aH06cRGx_k1mi2s=9#4Ou`H;&ywBW+Um;-Tc7JLcMF#*%8y|0D z;`$zH`>g1=A~ixsmUeJPUu%{D-LB{um5@U^p-35E?9s#dF)E-u(KGJ01=*PFd3>yt zj6KjdcZ_yqVN#a%)}((@+v8Ui{8`vCflPr>tR3&$L>IsRKqzj;rjFu?H*vb&VK{@t zW?J~!ZK#9XImA{}A>6>!qD<0CTVQ$=8#1U2&`vggJaz6PwV7*(Ig3xtD*ZZ+PA)ym zYT3B3zCG@B1O3FN;wqYh$D$m^qD%6cQ$N{&6~u$8CLslQQ7OzXFohUc!2L8toFZLh z5;I8X@pN8#I-4Xx#NbVi=UeFel(_{k)vZ3Mq`u>T=uSfHbU83E2zF9e)r}NHKDhnP zBNTli%t-OjB6FGlP4c+jFuV>_YCfPkwpwxb5pA%@NvT3csP9kc1T%-m!vIw3w#a+~ zu+3SA*$?$w3qDf0G!9%TrrG@8&q`n`nk~h?gh`n^OwQ=Mu32^TDV3oR9=QI8AyBH* z!0;`7o3-n6vs7pNz-NN8!(qx8eG`wn?X9H+5h1GrTPb~ny2LT;ThDOV^AS=jAAp%7 z7?}B6dO{T^cpTTVyvb<`tVB1+X(!1TLFUCWOFf>T^`O{lbp&IAh!ZRh5xjg()rnPV7@d3~|4KU*Y+mF9+9Rg{+9~ZHT;7u%ot|wJPHrzDKNX z4sBZo`G;-RaAeD#*boqy{Gp|lnG}L>M(rfGwm_f1(Ot5ww|`x zrDKWJ3|kd005qfZy{%azS6`x-izq45o7Kup+YfVYtc2m+cjKK#Z$jJF=~nN$@-qih z#6BlptvsYz&q=Q41dG2hsg05+MB(eiH!$^#!al)Y@)w(!k9QdsjOmZ;Rxk*zYkCElZDbj!AoZO^i zBOB?nY%{9%k`0!z_v#yGCdTDeXS>(SjX;(U_H0%?%}YnR)@s{&nJUK?J<(ZbqQ-j~ za;`SPf945K)>qB5ADCB8h+lb)#naMQz4Y-#lC}9b{Y`k>n`S@!#P^}8VLaB|rg6pO z%*Xc>U}?X6smHRj@tpArKjdfS7E2F)&NA9&sF@QZ2rGpgQQ?U0SgJ zEj_}={UP#04R~fVItc*7fTB7q-vM7ufMxte(K;|RY>;7sCT*S=l_SjiW4uvtfM`6z zD4<`V`VtIzkB}Ek0tRD}8l^EGgepyJ=B?*cwZzQG2Su=5og@ify-YU}_ppmGR2E

      _ZUKmAWoX*-|Zw1??L4>IUe(RZT;>Bk_j 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 Us_rf<`hN8uMrLIs2ndM(0UlSfz5oCK diff --git a/vendor/assets/javascripts/sortable/Sortable.min.js b/vendor/assets/javascripts/sortable/Sortable.min.js deleted file mode 100644 index eba0614973..0000000000 --- a/vendor/assets/javascripts/sortable/Sortable.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! Sortable 1.10.2 - MIT | git://github.com/SortableJS/Sortable.git */ -!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t=t||self).Sortable=e()}(this,function(){"use strict";function o(t){return(o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function a(){return(a=Object.assign||function(t){for(var e=1;e"===e[0]&&(e=e.substring(1)),t)try{if(t.matches)return t.matches(e);if(t.msMatchesSelector)return t.msMatchesSelector(e);if(t.webkitMatchesSelector)return t.webkitMatchesSelector(e)}catch(t){return!1}return!1}}function P(t,e,n,o){if(t){n=n||document;do{if(null!=e&&(">"===e[0]?t.parentNode===n&&h(t,e):h(t,e))||o&&t===n)return t;if(t===n)break}while(t=(i=t).host&&i!==document&&i.host.nodeType?i.host:i.parentNode)}var i;return null}var f,p=/\s+/g;function k(t,e,n){if(t&&e)if(t.classList)t.classList[n?"add":"remove"](e);else{var o=(" "+t.className+" ").replace(p," ").replace(" "+e+" "," ");t.className=(o+(n?" "+e:"")).replace(p," ")}}function R(t,e,n){var o=t&&t.style;if(o){if(void 0===n)return document.defaultView&&document.defaultView.getComputedStyle?n=document.defaultView.getComputedStyle(t,""):t.currentStyle&&(n=t.currentStyle),void 0===e?n:n[e];e in o||-1!==e.indexOf("webkit")||(e="-webkit-"+e),o[e]=n+("string"==typeof n?"":"px")}}function v(t,e){var n="";if("string"==typeof t)n=t;else do{var o=R(t,"transform");o&&"none"!==o&&(n=o+" "+n)}while(!e&&(t=t.parentNode));var i=window.DOMMatrix||window.WebKitCSSMatrix||window.CSSMatrix||window.MSCSSMatrix;return i&&new i(n)}function g(t,e,n){if(t){var o=t.getElementsByTagName(e),i=0,r=o.length;if(n)for(;i=e.left-n&&r<=e.right+n,i=a>=e.top-n&&a<=e.bottom+n;return n&&o&&i?l=t:void 0}}),l}((t=t.touches?t.touches[0]:t).clientX,t.clientY);if(e){var n={};for(var o in t)t.hasOwnProperty(o)&&(n[o]=t[o]);n.target=n.rootEl=e,n.preventDefault=void 0,n.stopPropagation=void 0,e[j]._onDragOver(n)}}}function kt(t){z&&z.parentNode[j]._isOutsideThisEl(t.target)}function Rt(t,e){if(!t||!t.nodeType||1!==t.nodeType)throw"Sortable: `el` must be an HTMLElement, not ".concat({}.toString.call(t));this.el=t,this.options=e=a({},e),t[j]=this;var n={group:null,sort:!0,disabled:!1,store:null,handle:null,draggable:/^[uo]l$/i.test(t.nodeName)?">li":">*",swapThreshold:1,invertSwap:!1,invertedSwapThreshold:null,removeCloneOnHide:!0,direction:function(){return Ot(t,this.options)},ghostClass:"sortable-ghost",chosenClass:"sortable-chosen",dragClass:"sortable-drag",ignore:"a, img",filter:null,preventOnFilter:!0,animation:0,easing:null,setData:function(t,e){t.setData("Text",e.textContent)},dropBubble:!1,dragoverBubble:!1,dataIdAttr:"data-id",delay:0,delayOnTouchOnly:!1,touchStartThreshold:(Number.parseInt?Number:window).parseInt(window.devicePixelRatio,10)||1,forceFallback:!1,fallbackClass:"sortable-fallback",fallbackOnBody:!1,fallbackTolerance:0,fallbackOffset:{x:0,y:0},supportPointer:!1!==Rt.supportPointer&&"PointerEvent"in window,emptyInsertThreshold:5};for(var o in O.initializePlugins(this,t,n),n)o in e||(e[o]=n[o]);for(var i in At(e),this)"_"===i.charAt(0)&&"function"==typeof this[i]&&(this[i]=this[i].bind(this));this.nativeDraggable=!e.forceFallback&&xt,this.nativeDraggable&&(this.options.touchStartThreshold=1),e.supportPointer?u(t,"pointerdown",this._onTapStart):(u(t,"mousedown",this._onTapStart),u(t,"touchstart",this._onTapStart)),this.nativeDraggable&&(u(t,"dragover",this),u(t,"dragenter",this)),bt.push(this.el),e.store&&e.store.get&&this.sort(e.store.get(this)||[]),a(this,T())}function Xt(t,e,n,o,i,r,a,l){var s,c,u=t[j],d=u.options.onMove;return!window.CustomEvent||w||E?(s=document.createEvent("Event")).initEvent("move",!0,!0):s=new CustomEvent("move",{bubbles:!0,cancelable:!0}),s.to=e,s.from=t,s.dragged=n,s.draggedRect=o,s.related=i||e,s.relatedRect=r||X(e),s.willInsertAfter=l,s.originalEvent=a,t.dispatchEvent(s),d&&(c=d.call(u,s,a)),c}function Yt(t){t.draggable=!1}function Bt(){Dt=!1}function Ft(t){for(var e=t.tagName+t.className+t.src+t.href+t.textContent,n=e.length,o=0;n--;)o+=e.charCodeAt(n);return o.toString(36)}function Ht(t){return setTimeout(t,0)}function Lt(t){return clearTimeout(t)}Rt.prototype={constructor:Rt,_isOutsideThisEl:function(t){this.el.contains(t)||t===this.el||(ht=null)},_getDirection:function(t,e){return"function"==typeof this.options.direction?this.options.direction.call(this,t,e,z):this.options.direction},_onTapStart:function(e){if(e.cancelable){var n=this,o=this.el,t=this.options,i=t.preventOnFilter,r=e.type,a=e.touches&&e.touches[0]||e.pointerType&&"touch"===e.pointerType&&e,l=(a||e).target,s=e.target.shadowRoot&&(e.path&&e.path[0]||e.composedPath&&e.composedPath()[0])||l,c=t.filter;if(function(t){St.length=0;var e=t.getElementsByTagName("input"),n=e.length;for(;n--;){var o=e[n];o.checked&&St.push(o)}}(o),!z&&!(/mousedown|pointerdown/.test(r)&&0!==e.button||t.disabled||s.isContentEditable||(l=P(l,t.draggable,o,!1))&&l.animated||Z===l)){if(J=F(l),et=F(l,t.draggable),"function"==typeof c){if(c.call(this,e,l,this))return W({sortable:n,rootEl:s,name:"filter",targetEl:l,toEl:o,fromEl:o}),K("filter",n,{evt:e}),void(i&&e.cancelable&&e.preventDefault())}else if(c&&(c=c.split(",").some(function(t){if(t=P(s,t.trim(),o,!1))return W({sortable:n,rootEl:t,name:"filter",targetEl:l,fromEl:o,toEl:o}),K("filter",n,{evt:e}),!0})))return void(i&&e.cancelable&&e.preventDefault());t.handle&&!P(s,t.handle,o,!1)||this._prepareDragStart(e,a,l)}}},_prepareDragStart:function(t,e,n){var o,i=this,r=i.el,a=i.options,l=r.ownerDocument;if(n&&!z&&n.parentNode===r){var s=X(n);if(q=r,G=(z=n).parentNode,V=z.nextSibling,Z=n,ot=a.group,rt={target:Rt.dragged=z,clientX:(e||t).clientX,clientY:(e||t).clientY},ct=rt.clientX-s.left,ut=rt.clientY-s.top,this._lastX=(e||t).clientX,this._lastY=(e||t).clientY,z.style["will-change"]="all",o=function(){K("delayEnded",i,{evt:t}),Rt.eventCanceled?i._onDrop():(i._disableDelayedDragEvents(),!c&&i.nativeDraggable&&(z.draggable=!0),i._triggerDragStart(t,e),W({sortable:i,name:"choose",originalEvent:t}),k(z,a.chosenClass,!0))},a.ignore.split(",").forEach(function(t){g(z,t.trim(),Yt)}),u(l,"dragover",Pt),u(l,"mousemove",Pt),u(l,"touchmove",Pt),u(l,"mouseup",i._onDrop),u(l,"touchend",i._onDrop),u(l,"touchcancel",i._onDrop),c&&this.nativeDraggable&&(this.options.touchStartThreshold=4,z.draggable=!0),K("delayStart",this,{evt:t}),!a.delay||a.delayOnTouchOnly&&!e||this.nativeDraggable&&(E||w))o();else{if(Rt.eventCanceled)return void this._onDrop();u(l,"mouseup",i._disableDelayedDrag),u(l,"touchend",i._disableDelayedDrag),u(l,"touchcancel",i._disableDelayedDrag),u(l,"mousemove",i._delayedDragTouchMoveHandler),u(l,"touchmove",i._delayedDragTouchMoveHandler),a.supportPointer&&u(l,"pointermove",i._delayedDragTouchMoveHandler),i._dragStartTimer=setTimeout(o,a.delay)}}},_delayedDragTouchMoveHandler:function(t){var e=t.touches?t.touches[0]:t;Math.max(Math.abs(e.clientX-this._lastX),Math.abs(e.clientY-this._lastY))>=Math.floor(this.options.touchStartThreshold/(this.nativeDraggable&&window.devicePixelRatio||1))&&this._disableDelayedDrag()},_disableDelayedDrag:function(){z&&Yt(z),clearTimeout(this._dragStartTimer),this._disableDelayedDragEvents()},_disableDelayedDragEvents:function(){var t=this.el.ownerDocument;d(t,"mouseup",this._disableDelayedDrag),d(t,"touchend",this._disableDelayedDrag),d(t,"touchcancel",this._disableDelayedDrag),d(t,"mousemove",this._delayedDragTouchMoveHandler),d(t,"touchmove",this._delayedDragTouchMoveHandler),d(t,"pointermove",this._delayedDragTouchMoveHandler)},_triggerDragStart:function(t,e){e=e||"touch"==t.pointerType&&t,!this.nativeDraggable||e?this.options.supportPointer?u(document,"pointermove",this._onTouchMove):u(document,e?"touchmove":"mousemove",this._onTouchMove):(u(z,"dragend",this),u(q,"dragstart",this._onDragStart));try{document.selection?Ht(function(){document.selection.empty()}):window.getSelection().removeAllRanges()}catch(t){}},_dragStarted:function(t,e){if(vt=!1,q&&z){K("dragStarted",this,{evt:e}),this.nativeDraggable&&u(document,"dragover",kt);var n=this.options;t||k(z,n.dragClass,!1),k(z,n.ghostClass,!0),Rt.active=this,t&&this._appendGhost(),W({sortable:this,name:"start",originalEvent:e})}else this._nulling()},_emulateDragOver:function(){if(at){this._lastX=at.clientX,this._lastY=at.clientY,Nt();for(var t=document.elementFromPoint(at.clientX,at.clientY),e=t;t&&t.shadowRoot&&(t=t.shadowRoot.elementFromPoint(at.clientX,at.clientY))!==e;)e=t;if(z.parentNode[j]._isOutsideThisEl(t),e)do{if(e[j]){if(e[j]._onDragOver({clientX:at.clientX,clientY:at.clientY,target:t,rootEl:e})&&!this.options.dragoverBubble)break}t=e}while(e=e.parentNode);It()}},_onTouchMove:function(t){if(rt){var e=this.options,n=e.fallbackTolerance,o=e.fallbackOffset,i=t.touches?t.touches[0]:t,r=U&&v(U,!0),a=U&&r&&r.a,l=U&&r&&r.d,s=Ct&>&&b(gt),c=(i.clientX-rt.clientX+o.x)/(a||1)+(s?s[0]-Et[0]:0)/(a||1),u=(i.clientY-rt.clientY+o.y)/(l||1)+(s?s[1]-Et[1]:0)/(l||1);if(!Rt.active&&!vt){if(n&&Math.max(Math.abs(i.clientX-this._lastX),Math.abs(i.clientY-this._lastY))o.right+10||t.clientX<=o.right&&t.clientY>o.bottom&&t.clientX>=o.left:t.clientX>o.right&&t.clientY>o.top||t.clientX<=o.right&&t.clientY>o.bottom+10}(n,a,this)&&!g.animated){if(g===z)return A(!1);if(g&&l===n.target&&(s=g),s&&(i=X(s)),!1!==Xt(q,l,z,o,s,i,n,!!s))return O(),l.appendChild(z),G=l,N(),A(!0)}else if(s.parentNode===l){i=X(s);var v,m,b,y=z.parentNode!==l,w=!function(t,e,n){var o=n?t.left:t.top,i=n?t.right:t.bottom,r=n?t.width:t.height,a=n?e.left:e.top,l=n?e.right:e.bottom,s=n?e.width:e.height;return o===a||i===l||o+r/2===a+s/2}(z.animated&&z.toRect||o,s.animated&&s.toRect||i,a),E=a?"top":"left",D=Y(s,"top","top")||Y(z,"top","top"),S=D?D.scrollTop:void 0;if(ht!==s&&(m=i[E],yt=!1,wt=!w&&e.invertSwap||y),0!==(v=function(t,e,n,o,i,r,a,l){var s=o?t.clientY:t.clientX,c=o?n.height:n.width,u=o?n.top:n.left,d=o?n.bottom:n.right,h=!1;if(!a)if(l&&pt