diff --git a/config/config.exs b/config/config.exs index 136603b..3178df9 100644 --- a/config/config.exs +++ b/config/config.exs @@ -1,6 +1,6 @@ # This file is responsible for configuring your application # and its dependencies with the aid of the Mix.Config module. -use Mix.Config +import Config # This configuration is loaded before any dependency and is restricted # to this project. If another project depends on this project, this diff --git a/mix.exs b/mix.exs index 532df8a..e7dcc60 100644 --- a/mix.exs +++ b/mix.exs @@ -29,7 +29,7 @@ defmodule ScrivenerHtml.Mixfile do # Type `mix help compile.app` for more information def application do [ - applications: [:logger] + extra_applications: [:logger] ] end @@ -47,9 +47,9 @@ defmodule ScrivenerHtml.Mixfile do # Type `mix help deps` for more examples and options defp deps do [ - {:scrivener, "~> 1.2 or ~> 2.0"}, - {:phoenix_html, "~> 2.2 or ~> 3.0"}, - {:phoenix, "~> 1.0 and < 1.7.0", optional: true}, + {:scrivener, "~> 2.7"}, + {:phoenix_html, "~> 3.0"}, + {:phoenix, "~> 1.7", optional: true}, {:plug, "~> 1.1"}, {:ex_doc, "~> 0.19", only: :dev}, {:earmark, "~> 1.1", only: :dev} diff --git a/mix.lock b/mix.lock index 8d56849..d7395f4 100644 --- a/mix.lock +++ b/mix.lock @@ -1,20 +1,27 @@ %{ + "castore": {:hex, :castore, "1.0.4", "ff4d0fb2e6411c0479b1d965a814ea6d00e51eb2f58697446e9c41a97d940b28", [:mix], [], "hexpm", "9418c1b8144e11656f0be99943db4caf04612e3eaecefb5dae9a2a87565584f8"}, "decimal": {:hex, :decimal, "1.1.2", "79a769d4657b2d537b51ef3c02d29ab7141d2b486b516c109642d453ee08e00c", [:mix], []}, - "earmark": {:hex, :earmark, "1.3.1", "73812f447f7a42358d3ba79283cfa3075a7580a3a2ed457616d6517ac3738cb9", [:mix], [], "hexpm", "000aaeff08919e95e7aea13e4af7b2b9734577b3e6a7c50ee31ee88cab6ec4fb"}, + "earmark": {:hex, :earmark, "1.4.46", "8c7287bd3137e99d26ae4643e5b7ef2129a260e3dcf41f251750cb4563c8fb81", [:mix], [], "hexpm", "798d86db3d79964e759ddc0c077d5eb254968ed426399fbf5a62de2b5ff8910a"}, + "earmark_parser": {:hex, :earmark_parser, "1.4.38", "b42252eddf63bda05554ba8be93a1262dc0920c721f1aaf989f5de0f73a2e367", [:mix], [], "hexpm", "2cd0907795aaef0c7e8442e376633c5b3bd6edc8dbbdc539b22f095501c1cdb6"}, "ecto": {:hex, :ecto, "1.1.8", "0f0348e678fa5a450c266d69816808f97fbd82ade32cf88d4b09bbe8f8c27545", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, optional: false]}, {:mariaex, "~> 0.5.0 or ~> 0.6.0", [hex: :mariaex, optional: true]}, {:poison, "~> 1.0 or ~> 2.0", [hex: :poison, optional: true]}, {:poolboy, "~> 1.4", [hex: :poolboy, optional: false]}, {:postgrex, "~> 0.11.0", [hex: :postgrex, optional: true]}, {:sbroker, "~> 0.7", [hex: :sbroker, optional: true]}]}, - "ex_doc": {:hex, :ex_doc, "0.19.3", "3c7b0f02851f5fc13b040e8e925051452e41248f685e40250d7e40b07b9f8c10", [:mix], [{:earmark, "~> 1.2", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.10", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm", "0e11d67e662142fc3945b0ee410c73c8c956717fbeae4ad954b418747c734973"}, - "makeup": {:hex, :makeup, "0.8.0", "9cf32aea71c7fe0a4b2e9246c2c4978f9070257e5c9ce6d4a28ec450a839b55f", [:mix], [{:nimble_parsec, "~> 0.5.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "5fbc8e549aa9afeea2847c0769e3970537ed302f93a23ac612602e805d9d1e7f"}, - "makeup_elixir": {:hex, :makeup_elixir, "0.13.0", "be7a477997dcac2e48a9d695ec730b2d22418292675c75aa2d34ba0909dcdeda", [:mix], [{:makeup, "~> 0.8", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "adf0218695e22caeda2820eaba703fa46c91820d53813a2223413da3ef4ba515"}, + "ex_doc": {:hex, :ex_doc, "0.30.9", "d691453495c47434c0f2052b08dd91cc32bc4e1a218f86884563448ee2502dd2", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "d7aaaf21e95dc5cddabf89063327e96867d00013963eadf2c6ad135506a8bc10"}, + "makeup": {:hex, :makeup, "1.1.1", "fa0bc768698053b2b3869fa8a62616501ff9d11a562f3ce39580d60860c3a55e", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "5dc62fbdd0de44de194898b6710692490be74baa02d9d108bc29f007783b0b48"}, + "makeup_elixir": {:hex, :makeup_elixir, "0.16.1", "cc9e3ca312f1cfeccc572b37a09980287e243648108384b97ff2b76e505c3555", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "e127a341ad1b209bd80f7bd1620a15693a9908ed780c3b763bccf7d200c767c6"}, + "makeup_erlang": {:hex, :makeup_erlang, "0.1.2", "ad87296a092a46e03b7e9b0be7631ddcf64c790fa68a9ef5323b6cbb36affc72", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "f3f5a1ca93ce6e092d92b6d9c049bcda58a3b617a8d888f8e7231c85630e8108"}, "meck": {:hex, :meck, "0.8.4", "59ca1cd971372aa223138efcf9b29475bde299e1953046a0c727184790ab1520", [:rebar, :make], []}, - "mime": {:hex, :mime, "1.3.0", "5e8d45a39e95c650900d03f897fbf99ae04f60ab1daa4a34c7a20a5151b7a5fe", [:mix], [], "hexpm", "5e839994289d60326aa86020c4fbd9c6938af188ecddab2579f07b66cd665328"}, - "nimble_parsec": {:hex, :nimble_parsec, "0.5.0", "90e2eca3d0266e5c53f8fbe0079694740b9c91b6747f2b7e3c5d21966bba8300", [:mix], [], "hexpm", "5c040b8469c1ff1b10093d3186e2e10dbe483cd73d79ec017993fb3985b8a9b3"}, + "mime": {:hex, :mime, "2.0.5", "dc34c8efd439abe6ae0343edbb8556f4d63f178594894720607772a041b04b02", [:mix], [], "hexpm", "da0d64a365c45bc9935cc5c8a7fc5e49a0e0f9932a761c55d6c52b142780a05c"}, + "nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"}, "pavlov": {:git, "https://github.com/sproutapp/pavlov.git", "7f3c0d7c75c8c2875e21b495511a291194bfc85a", []}, - "phoenix": {:hex, :phoenix, "1.4.0", "56fe9a809e0e735f3e3b9b31c1b749d4b436e466d8da627b8d82f90eaae714d2", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}], "hexpm", "22da8f659cf13d3ba73b767f66b8c389113ddf0ef7b94225cc84e94b85eac90e"}, - "phoenix_html": {:hex, :phoenix_html, "2.9.3", "1b5a2122cbf743aa242f54dced8a4f1cc778b8bd304f4b4c0043a6250c58e258", [:mix], [{:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "f090e3a75de4efd72ae2b9b016909fe673512ef04e6b72d7bf039031a64d4a52"}, - "phoenix_pubsub": {:hex, :phoenix_pubsub, "1.1.1", "6668d787e602981f24f17a5fbb69cc98f8ab085114ebfac6cc36e10a90c8e93c", [:mix], [], "hexpm", "a3d890aaa3156d51056179dcaaadaf32b844f71656bb27c58756f2b97875c36c"}, - "plug": {:hex, :plug, "1.7.1", "8516d565fb84a6a8b2ca722e74e2cd25ca0fc9d64f364ec9dbec09d33eb78ccd", [:mix], [{:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}], "hexpm", "daa5fee4209c12c3c48b05a96cf88c320b627c9575f987554dcdc1fdcdf2c15e"}, - "plug_crypto": {:hex, :plug_crypto, "1.0.0", "18e49317d3fa343f24620ed22795ec29d4a5e602d52d1513ccea0b07d8ea7d4d", [:mix], [], "hexpm", "73c1682f0e414cfb5d9b95c8e8cd6ffcfdae699e3b05e1db744e58b7be857759"}, + "phoenix": {:hex, :phoenix, "1.7.10", "02189140a61b2ce85bb633a9b6fd02dff705a5f1596869547aeb2b2b95edd729", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "cf784932e010fd736d656d7fead6a584a4498efefe5b8227e9f383bf15bb79d0"}, + "phoenix_html": {:hex, :phoenix_html, "3.3.3", "380b8fb45912b5638d2f1d925a3771b4516b9a78587249cabe394e0a5d579dc9", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "923ebe6fec6e2e3b3e569dfbdc6560de932cd54b000ada0208b5f45024bdd76c"}, + "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.3", "3168d78ba41835aecad272d5e8cd51aa87a7ac9eb836eabc42f6e57538e3731d", [:mix], [], "hexpm", "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"}, + "phoenix_template": {:hex, :phoenix_template, "1.0.3", "32de561eefcefa951aead30a1f94f1b5f0379bc9e340bb5c667f65f1edfa4326", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "16f4b6588a4152f3cc057b9d0c0ba7e82ee23afa65543da535313ad8d25d8e2c"}, + "plug": {:hex, :plug, "1.15.2", "94cf1fa375526f30ff8770837cb804798e0045fd97185f0bb9e5fcd858c792a3", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "02731fa0c2dcb03d8d21a1d941bdbbe99c2946c0db098eee31008e04c6283615"}, + "plug_crypto": {:hex, :plug_crypto, "2.0.0", "77515cc10af06645abbfb5e6ad7a3e9714f805ae118fa1a70205f80d2d70fe73", [:mix], [], "hexpm", "53695bae57cc4e54566d993eb01074e4d894b65a3766f1c43e2c61a1b0f45ea9"}, "poison": {:hex, :poison, "2.2.0", "4763b69a8a77bd77d26f477d196428b741261a761257ff1cf92753a0d4d24a63", [:mix], [], "hexpm"}, "poolboy": {:hex, :poolboy, "1.5.1", "6b46163901cfd0a1b43d692657ed9d7e599853b3b21b95ae5ae0a777cf9b6ca8", [:rebar], []}, - "scrivener": {:hex, :scrivener, "2.2.1", "5a84cdfc042e3c318a03f965d8197b8294676a8fff7c4a29e482a90c467ebf19", [:mix], [], "hexpm", "a9cc85e580925b13cdb5265cead4594ddb3cc7fb23eea8843c219827165f6c4f"}, + "scrivener": {:hex, :scrivener, "2.7.2", "1d913c965ec352650a7f864ad7fd8d80462f76a32f33d57d1e48bc5e9d40aba2", [:mix], [], "hexpm", "7866a0ec4d40274efbee1db8bead13a995ea4926ecd8203345af8f90d2b620d9"}, + "telemetry": {:hex, :telemetry, "1.2.1", "68fdfe8d8f05a8428483a97d7aab2f268aaff24b49e0f599faa091f1d4e7f61c", [:rebar3], [], "hexpm", "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"}, + "websock": {:hex, :websock, "0.5.3", "2f69a6ebe810328555b6fe5c831a851f485e303a7c8ce6c5f675abeb20ebdadc", [:mix], [], "hexpm", "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"}, + "websock_adapter": {:hex, :websock_adapter, "0.5.5", "9dfeee8269b27e958a65b3e235b7e447769f66b5b5925385f5a569269164a210", [:mix], [{:bandit, ">= 0.6.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "4b977ba4a01918acbf77045ff88de7f6972c2a009213c515a445c48f224ffce9"}, } diff --git a/test/scrivener/html/seo_test.exs b/test/scrivener/html/seo_test.exs index b5cbad7..4043579 100644 --- a/test/scrivener/html/seo_test.exs +++ b/test/scrivener/html/seo_test.exs @@ -1,39 +1,38 @@ defmodule Scrivener.HTML.SEOTest do use ExUnit.Case import Scrivener.HTML.SEO - alias Scrivener.Page doctest Scrivener.HTML.SEO describe "#rel" do test "on the first page - page 2" do - assert rel(%Page{total_pages: 10, page_number: 1}, 2) == "next" + assert rel(%Scrivener.Page{total_pages: 10, page_number: 1}, 2) == "next" end test "on the first page - page 5" do - assert rel(%Page{total_pages: 10, page_number: 1}, 5) == "canonical" + assert rel(%Scrivener.Page{total_pages: 10, page_number: 1}, 5) == "canonical" end test "on the third page - page 4" do - assert rel(%Page{total_pages: 10, page_number: 3}, 4) == "next" + assert rel(%Scrivener.Page{total_pages: 10, page_number: 3}, 4) == "next" end test "on the third page - page 2" do - assert rel(%Page{total_pages: 10, page_number: 3}, 2) == "prev" + assert rel(%Scrivener.Page{total_pages: 10, page_number: 3}, 2) == "prev" end test "on the last page - page 9" do - assert rel(%Page{total_pages: 10, page_number: 10}, 9) == "prev" + assert rel(%Scrivener.Page{total_pages: 10, page_number: 10}, 9) == "prev" end end describe "#header_links" do test "on the first page" do - assert header_links(%Page{total_pages: 10, page_number: 1}) == + assert header_links(%Scrivener.Page{total_pages: 10, page_number: 1}) == {:safe, [ 60, "link", - [[32, "href", 61, 34, "?page=2", 34], [32, "rel", 61, 34, "next", 34]], + [32, "href", 61, 34, "?page=2", 34, 32, "rel", 61, 34, "next", 34], 62, [], 60, @@ -44,12 +43,12 @@ defmodule Scrivener.HTML.SEOTest do end test "on the last page" do - assert header_links(%Page{total_pages: 10, page_number: 10}) == + assert header_links(%Scrivener.Page{total_pages: 10, page_number: 10}) == {:safe, [ 60, "link", - [[32, "href", 61, 34, "?page=9", 34], [32, "rel", 61, 34, "prev", 34]], + [32, "href", 61, 34, "?page=9", 34, 32, "rel", 61, 34, "prev", 34], 62, [], 60, @@ -60,33 +59,35 @@ defmodule Scrivener.HTML.SEOTest do end test "on a middle page" do - assert header_links(%Page{total_pages: 10, page_number: 5}) == - {:safe, - [ - [ - 60, - "link", - [[32, "href", 61, 34, "?page=4", 34], [32, "rel", 61, 34, "prev", 34]], - 62, - [], - 60, - 47, - "link", - 62 - ], - "\n", - [ - 60, - "link", - [[32, "href", 61, 34, "?page=6", 34], [32, "rel", 61, 34, "next", 34]], - 62, - [], - 60, - 47, - "link", - 62 - ] - ]} + assert header_links(%Scrivener.Page{total_pages: 10, page_number: 5}) == + { + :safe, + [ + [ + 60, + "link", + [32, "href", 61, 34, "?page=4", 34, 32, "rel", 61, 34, "prev", 34], + 62, + [], + 60, + 47, + "link", + 62 + ], + "\n", + [ + 60, + "link", + [32, "href", 61, 34, "?page=6", 34, 32, "rel", 61, 34, "next", 34], + 62, + [], + 60, + 47, + "link", + 62 + ] + ] + } end end end diff --git a/test/scrivener/html_test.exs b/test/scrivener/html_test.exs index 480c910..86b3ec3 100644 --- a/test/scrivener/html_test.exs +++ b/test/scrivener/html_test.exs @@ -3,8 +3,8 @@ defmodule Scrivener.HTMLTest do alias Scrivener.HTML doctest Scrivener.HTML + import Phoenix.ConnTest import Scrivener.Support.HTML - alias Scrivener.Page setup do Application.put_env(:scrivener_html, :view_style, :bootstrap) @@ -162,7 +162,10 @@ defmodule Scrivener.HTMLTest do test "does not include ellipsis on first page" do assert pages(1..6) == - links_with_opts([total_pages: 8, page_number: 1], first: true, ellipsis: "…") + links_with_opts([total_pages: 8, page_number: 1], + first: true, + ellipsis: "…" + ) end test "uses ellipsis only beyond of first page" do @@ -216,14 +219,15 @@ defmodule Scrivener.HTMLTest do test "accepts a paginator and options (same as defaults)" do assert {:safe, _html} = - HTML.pagination_links(%Page{total_pages: 10, page_number: 5}, + HTML.pagination_links(%Scrivener.Page{total_pages: 10, page_number: 5}, view_style: :bootstrap, path: &MyApp.Router.Helpers.post_path/3 ) end test "supplies defaults" do - assert {:safe, _html} = HTML.pagination_links(%Page{total_pages: 10, page_number: 5}) + assert {:safe, _html} = + HTML.pagination_links(%Scrivener.Page{total_pages: 10, page_number: 5}) end test "uses application config" do @@ -232,13 +236,13 @@ defmodule Scrivener.HTMLTest do assert_raise RuntimeError, "Scrivener.HTML: View style :another_style is not a valid view style. Please use one of [:bootstrap, :semantic, :foundation, :bootstrap_v4, :materialize, :bulma]", fn -> - HTML.pagination_links(%Page{total_pages: 10, page_number: 5}) + HTML.pagination_links(%Scrivener.Page{total_pages: 10, page_number: 5}) end end test "allows options in any order" do assert {:safe, _html} = - HTML.pagination_links(%Page{total_pages: 10, page_number: 5}, + HTML.pagination_links(%Scrivener.Page{total_pages: 10, page_number: 5}, view_style: :bootstrap, path: &MyApp.Router.Helpers.post_path/3 ) @@ -246,13 +250,15 @@ defmodule Scrivener.HTMLTest do test "errors for unsupported view styles" do assert_raise RuntimeError, fn -> - HTML.pagination_links(%Page{total_pages: 10, page_number: 5}, view_style: :unknown) + HTML.pagination_links(%Scrivener.Page{total_pages: 10, page_number: 5}, + view_style: :unknown + ) end end test "accepts an override action" do html = - HTML.pagination_links(%Page{total_pages: 10, page_number: 5}, + HTML.pagination_links(%Scrivener.Page{total_pages: 10, page_number: 5}, view_style: :bootstrap, action: :edit, path: &MyApp.Router.Helpers.post_path/3 @@ -262,12 +268,16 @@ defmodule Scrivener.HTMLTest do end test "accepts an override page param name" do - html = HTML.pagination_links(%Page{total_pages: 3, page_number: 3}, page_param: :custom_pp) + html = + HTML.pagination_links(%Scrivener.Page{total_pages: 3, page_number: 3}, + page_param: :custom_pp + ) + assert Phoenix.HTML.safe_to_string(html) =~ ~r(custom_pp=2) end test "allows unicode" do - html = HTML.pagination_links(%Page{total_pages: 2, page_number: 2}, previous: "«") + html = HTML.pagination_links(%Scrivener.Page{total_pages: 2, page_number: 2}, previous: "«") assert Phoenix.HTML.safe_to_string(html) == """ @@ -278,7 +288,7 @@ defmodule Scrivener.HTMLTest do test "allows using raw" do html = - HTML.pagination_links(%Page{total_pages: 2, page_number: 2}, + HTML.pagination_links(%Scrivener.Page{total_pages: 2, page_number: 2}, previous: Phoenix.HTML.raw("←") ) @@ -290,13 +300,15 @@ defmodule Scrivener.HTMLTest do end test "accept nested keyword list for additionnal params" do - html = HTML.pagination_links(%Page{total_pages: 2, page_number: 2}, q: [name: "joe"]) + html = + HTML.pagination_links(%Scrivener.Page{total_pages: 2, page_number: 2}, q: [name: "joe"]) + assert Phoenix.HTML.safe_to_string(html) =~ ~r(q\[name\]=joe) end test "hide single page result from option" do html = - HTML.pagination_links(%Page{total_pages: 1, page_number: 1}, + HTML.pagination_links(%Scrivener.Page{total_pages: 1, page_number: 1}, q: [name: "joe"], hide_single: true ) @@ -306,7 +318,7 @@ defmodule Scrivener.HTMLTest do test "show pagination when there are multiple pages" do html = - HTML.pagination_links(%Page{total_pages: 2, page_number: 1}, + HTML.pagination_links(%Scrivener.Page{total_pages: 2, page_number: 1}, q: [name: "joe"], hide_single: true ) @@ -318,45 +330,47 @@ defmodule Scrivener.HTMLTest do describe "Phoenix conn()" do test "handles no entries" do - use Phoenix.ConnTest + import Phoenix.ConnTest Application.put_env(:scrivener_html, :view_style, :bootstrap) Application.put_env(:scrivener_html, :routes_helper, MyApp.Router.Helpers) - assert {:safe, - [ - 60, - "nav", - [], - 62, - [ - 60, - "ul", - [[32, "class", 61, 34, "pagination", 34]], - 62, - [ - [ - 60, - "li", - [[32, "class", 61, 34, "active", 34]], - 62, - [60, "a", [[32, "class", 61, 34, "", 34]], 62, "1", 60, 47, "a", 62], - 60, - 47, - "li", - 62 - ] - ], - 60, - 47, - "ul", - 62 - ], - 60, - 47, - "nav", - 62 - ]} = - HTML.pagination_links(build_conn(), %Page{ + assert { + :safe, + [ + 60, + "nav", + [], + 62, + [ + 60, + "ul", + [" class=\"", "pagination", 34], + 62, + [ + [ + 60, + "li", + [" class=\"", "active", 34], + 62, + [60, "a", [" class=\"", [], 34], 62, "1", 60, 47, "a", 62], + 60, + 47, + "li", + 62 + ] + ], + 60, + 47, + "ul", + 62 + ], + 60, + 47, + "nav", + 62 + ] + } = + HTML.pagination_links(build_conn(), %Scrivener.Page{ entries: [], page_number: 1, page_size: 10, @@ -366,13 +380,13 @@ defmodule Scrivener.HTMLTest do end test "allows other url parameters" do - use Phoenix.ConnTest + import Phoenix.ConnTest Application.put_env(:scrivener_html, :view_style, :bootstrap) Application.put_env(:scrivener_html, :routes_helper, MyApp.Router.Helpers) assert HTML.pagination_links( build_conn(), - %Page{ + %Scrivener.Page{ entries: [%{__struct__: Post, some: :object}], page_number: 1, page_size: 10, @@ -387,16 +401,16 @@ defmodule Scrivener.HTMLTest do end describe "View Styles" do - use Phoenix.ConnTest + import Phoenix.ConnTest test "renders Semantic UI styling" do assert {:safe, [ 60, "div", - [[32, "class", 61, 34, "ui pagination menu", 34]], + [" class=\"", "ui pagination menu", 34], 62, - [[60, "a", [[32, "class", 61, 34, "active item", 34]], 62, "1", 60, 47, "a", 62]], + [[60, "a", [" class=\"", "active item", 34], 62, "1", 60, 47, "a", 62]], 60, 47, "div", @@ -404,7 +418,7 @@ defmodule Scrivener.HTMLTest do ]} = HTML.pagination_links( build_conn(), - %Page{ + %Scrivener.Page{ entries: [], page_number: 1, page_size: 10, @@ -416,65 +430,67 @@ defmodule Scrivener.HTMLTest do end test "renders Foundation for Sites 6.x styling" do - assert {:safe, - [ - 60, - "ul", - [[32, "class", 61, 34, "pagination", 34], [32, "role", 61, 34, "pagination", 34]], - 62, - [ - [ - 60, - "li", - [[32, "class", 61, 34, "current", 34]], - 62, - [60, "span", [[32, "class", 61, 34, "", 34]], 62, "1", 60, 47, "span", 62], - 60, - 47, - "li", - 62 - ], - [ - 60, - "li", - [[32, "class", 61, 34, "", 34]], - 62, - [60, "span", [[32, "class", 61, 34, "", 34]], 62, "2", 60, 47, "span", 62], - 60, - 47, - "li", - 62 - ], - [ - 60, - "li", - [[32, "class", 61, 34, "", 34]], - 62, - [ - 60, - "span", - [[32, "class", 61, 34, "", 34]], - 62, - ">>", - 60, - 47, - "span", - 62 - ], - 60, - 47, - "li", - 62 - ] - ], - 60, - 47, - "ul", - 62 - ]} = + assert { + :safe, + [ + 60, + "ul", + [" class=\"", "pagination", 34, 32, "role", 61, 34, "pagination", 34], + 62, + [ + [ + 60, + "li", + [" class=\"", "current", 34], + 62, + [60, "span", [" class=\"", [], 34], 62, "1", 60, 47, "span", 62], + 60, + 47, + "li", + 62 + ], + [ + 60, + "li", + [" class=\"", [], 34], + 62, + [60, "span", [" class=\"", [], 34], 62, "2", 60, 47, "span", 62], + 60, + 47, + "li", + 62 + ], + [ + 60, + "li", + [" class=\"", [], 34], + 62, + [ + 60, + "span", + [" class=\"", [], 34], + 62, + [[[] | ">"] | ">"], + 60, + 47, + "span", + 62 + ], + 60, + 47, + "li", + 62 + ] + ], + 60, + 47, + "ul", + 62 + ] + } = HTML.pagination_links( build_conn(), - %Page{ + %Scrivener.Page{ entries: [], page_number: 1, page_size: 10, @@ -486,174 +502,176 @@ defmodule Scrivener.HTMLTest do end test "renders Foundation for Sites 6.x styling with ellipsis" do - assert {:safe, - [ - 60, - "ul", - [[32, "class", 61, 34, "pagination", 34], [32, "role", 61, 34, "pagination", 34]], - 62, - [ - [ - 60, - "li", - [[32, "class", 61, 34, "", 34]], - 62, - [ - 60, - "span", - [[32, "class", 61, 34, "", 34]], - 62, - "<<", - 60, - 47, - "span", - 62 - ], - 60, - 47, - "li", - 62 - ], - [ - 60, - "li", - [[32, "class", 61, 34, "", 34]], - 62, - [60, "span", [[32, "class", 61, 34, "", 34]], 62, "1", 60, 47, "span", 62], - 60, - 47, - "li", - 62 - ], - [ - 60, - "li", - [[32, "class", 61, 34, "", 34]], - 62, - [60, "span", [[32, "class", 61, 34, "", 34]], 62, "2", 60, 47, "span", 62], - 60, - 47, - "li", - 62 - ], - [ - 60, - "li", - [[32, "class", 61, 34, "current", 34]], - 62, - [60, "span", [[32, "class", 61, 34, "", 34]], 62, "3", 60, 47, "span", 62], - 60, - 47, - "li", - 62 - ], - [ - 60, - "li", - [[32, "class", 61, 34, "", 34]], - 62, - [60, "span", [[32, "class", 61, 34, "", 34]], 62, "4", 60, 47, "span", 62], - 60, - 47, - "li", - 62 - ], - [ - 60, - "li", - [[32, "class", 61, 34, "", 34]], - 62, - [60, "span", [[32, "class", 61, 34, "", 34]], 62, "5", 60, 47, "span", 62], - 60, - 47, - "li", - 62 - ], - [ - 60, - "li", - [[32, "class", 61, 34, "", 34]], - 62, - [60, "span", [[32, "class", 61, 34, "", 34]], 62, "6", 60, 47, "span", 62], - 60, - 47, - "li", - 62 - ], - [ - 60, - "li", - [[32, "class", 61, 34, "", 34]], - 62, - [60, "span", [[32, "class", 61, 34, "", 34]], 62, "7", 60, 47, "span", 62], - 60, - 47, - "li", - 62 - ], - [ - 60, - "li", - [[32, "class", 61, 34, "", 34]], - 62, - [60, "span", [[32, "class", 61, 34, "", 34]], 62, "8", 60, 47, "span", 62], - 60, - 47, - "li", - 62 - ], - [ - 60, - "li", - [[32, "class", 61, 34, "ellipsis", 34]], - 62, - [60, "span", [[32, "class", 61, 34, "", 34]], 62, "", 60, 47, "span", 62], - 60, - 47, - "li", - 62 - ], - [ - 60, - "li", - [[32, "class", 61, 34, "", 34]], - 62, - [60, "span", [[32, "class", 61, 34, "", 34]], 62, "10", 60, 47, "span", 62], - 60, - 47, - "li", - 62 - ], - [ - 60, - "li", - [[32, "class", 61, 34, "", 34]], - 62, - [ - 60, - "span", - [[32, "class", 61, 34, "", 34]], - 62, - ">>", - 60, - 47, - "span", - 62 - ], - 60, - 47, - "li", - 62 - ] - ], - 60, - 47, - "ul", - 62 - ]} == + assert { + :safe, + [ + 60, + "ul", + [" class=\"", "pagination", 34, 32, "role", 61, 34, "pagination", 34], + 62, + [ + [ + 60, + "li", + [" class=\"", [], 34], + 62, + [ + 60, + "span", + [" class=\"", [], 34], + 62, + [[[] | "<"] | "<"], + 60, + 47, + "span", + 62 + ], + 60, + 47, + "li", + 62 + ], + [ + 60, + "li", + [" class=\"", [], 34], + 62, + [60, "span", [" class=\"", [], 34], 62, "1", 60, 47, "span", 62], + 60, + 47, + "li", + 62 + ], + [ + 60, + "li", + [" class=\"", [], 34], + 62, + [60, "span", [" class=\"", [], 34], 62, "2", 60, 47, "span", 62], + 60, + 47, + "li", + 62 + ], + [ + 60, + "li", + [" class=\"", "current", 34], + 62, + [60, "span", [" class=\"", [], 34], 62, "3", 60, 47, "span", 62], + 60, + 47, + "li", + 62 + ], + [ + 60, + "li", + [" class=\"", [], 34], + 62, + [60, "span", [" class=\"", [], 34], 62, "4", 60, 47, "span", 62], + 60, + 47, + "li", + 62 + ], + [ + 60, + "li", + [" class=\"", [], 34], + 62, + [60, "span", [" class=\"", [], 34], 62, "5", 60, 47, "span", 62], + 60, + 47, + "li", + 62 + ], + [ + 60, + "li", + [" class=\"", [], 34], + 62, + [60, "span", [" class=\"", [], 34], 62, "6", 60, 47, "span", 62], + 60, + 47, + "li", + 62 + ], + [ + 60, + "li", + [" class=\"", [], 34], + 62, + [60, "span", [" class=\"", [], 34], 62, "7", 60, 47, "span", 62], + 60, + 47, + "li", + 62 + ], + [ + 60, + "li", + [" class=\"", [], 34], + 62, + [60, "span", [" class=\"", [], 34], 62, "8", 60, 47, "span", 62], + 60, + 47, + "li", + 62 + ], + [ + 60, + "li", + [" class=\"", "ellipsis", 34], + 62, + [60, "span", [" class=\"", [], 34], 62, [], 60, 47, "span", 62], + 60, + 47, + "li", + 62 + ], + [ + 60, + "li", + [" class=\"", [], 34], + 62, + [60, "span", [" class=\"", [], 34], 62, "10", 60, 47, "span", 62], + 60, + 47, + "li", + 62 + ], + [ + 60, + "li", + [" class=\"", [], 34], + 62, + [ + 60, + "span", + [" class=\"", [], 34], + 62, + [[[] | ">"] | ">"], + 60, + 47, + "span", + 62 + ], + 60, + 47, + "li", + 62 + ] + ], + 60, + 47, + "ul", + 62 + ] + } == HTML.pagination_links( build_conn(), - %Page{ + %Scrivener.Page{ entries: [], page_number: 3, page_size: 10, @@ -666,53 +684,45 @@ defmodule Scrivener.HTMLTest do end test "renders bootstrap v4 styling" do - assert {:safe, - [ - 60, - "nav", - [[32, "aria-label", 61, 34, "Page navigation", 34]], - 62, - [ - 60, - "ul", - [[32, "class", 61, 34, "pagination", 34]], - 62, - [ - [ - 60, - "li", - [[32, "class", 61, 34, "active page-item", 34]], - 62, - [ - 60, - "a", - [[32, "class", 61, 34, "page-link", 34]], - 62, - "1", - 60, - 47, - "a", - 62 - ], - 60, - 47, - "li", - 62 - ] - ], - 60, - 47, - "ul", - 62 - ], - 60, - 47, - "nav", - 62 - ]} = + assert { + :safe, + [ + 60, + "nav", + [32, "aria-label", 61, 34, "Page navigation", 34], + 62, + [ + 60, + "ul", + [" class=\"", "pagination", 34], + 62, + [ + [ + 60, + "li", + [" class=\"", "active page-item", 34], + 62, + [60, "a", [" class=\"", "page-link", 34], 62, "1", 60, 47, "a", 62], + 60, + 47, + "li", + 62 + ] + ], + 60, + 47, + "ul", + 62 + ], + 60, + 47, + "nav", + 62 + ] + } = HTML.pagination_links( build_conn(), - %Page{ + %Scrivener.Page{ entries: [], page_number: 1, page_size: 10, @@ -724,55 +734,67 @@ defmodule Scrivener.HTMLTest do end test "renders materialize css styling" do - assert {:safe, - [ - 60, - "ul", - [[32, "class", 61, 34, "pagination", 34]], - 62, - [ - [ - 60, - "li", - [[32, "class", 61, 34, "active", 34]], - 62, - [60, "a", [[32, "class", 61, 34, "", 34]], 62, "1", 60, 47, "a", 62], - 60, - 47, - "li", - 62 - ], - [ - 60, - "li", - [[32, "class", 61, 34, "waves-effect", 34]], - 62, - [60, "a", [[32, "class", 61, 34, "", 34]], 62, "2", 60, 47, "a", 62], - 60, - 47, - "li", - 62 - ], - [ - 60, - "li", - [[32, "class", 61, 34, "waves-effect", 34]], - 62, - [60, "a", [[32, "class", 61, 34, "", 34]], 62, ">>", 60, 47, "a", 62], - 60, - 47, - "li", - 62 - ] - ], - 60, - 47, - "ul", - 62 - ]} = + assert { + :safe, + [ + 60, + "ul", + [" class=\"", "pagination", 34], + 62, + [ + [ + 60, + "li", + [" class=\"", "active", 34], + 62, + [60, "a", [" class=\"", [], 34], 62, "1", 60, 47, "a", 62], + 60, + 47, + "li", + 62 + ], + [ + 60, + "li", + [" class=\"", "waves-effect", 34], + 62, + [60, "a", [" class=\"", [], 34], 62, "2", 60, 47, "a", 62], + 60, + 47, + "li", + 62 + ], + [ + 60, + "li", + [" class=\"", "waves-effect", 34], + 62, + [ + 60, + "a", + [" class=\"", [], 34], + 62, + [[[] | ">"] | ">"], + 60, + 47, + "a", + 62 + ], + 60, + 47, + "li", + 62 + ] + ], + 60, + 47, + "ul", + 62 + ] + } = HTML.pagination_links( build_conn(), - %Page{ + %Scrivener.Page{ entries: [], page_number: 1, page_size: 10, @@ -784,95 +806,87 @@ defmodule Scrivener.HTMLTest do end test "renders bulma css styling" do - assert {:safe, - [ - 60, - "nav", - [[32, "class", 61, 34, "pagination is-centered", 34]], - 62, - [ - 60, - "ul", - [[32, "class", 61, 34, "pagination-list", 34]], - 62, - [ - [ - 60, - "li", - [[32, "class", 61, 34, "", 34]], - 62, - [ - 60, - "a", - [[32, "class", 61, 34, "pagination-link is-current", 34]], - 62, - "1", - 60, - 47, - "a", - 62 - ], - 60, - 47, - "li", - 62 - ], - [ - 60, - "li", - [[32, "class", 61, 34, "", 34]], - 62, - [ - 60, - "a", - [[32, "class", 61, 34, "pagination-link", 34]], - 62, - "2", - 60, - 47, - "a", - 62 - ], - 60, - 47, - "li", - 62 - ], - [ - 60, - "li", - [[32, "class", 61, 34, "", 34]], - 62, - [ - 60, - "a", - [[32, "class", 61, 34, "pagination-link", 34]], - 62, - ">>", - 60, - 47, - "a", - 62 - ], - 60, - 47, - "li", - 62 - ] - ], - 60, - 47, - "ul", - 62 - ], - 60, - 47, - "nav", - 62 - ]} = + assert { + :safe, + [ + 60, + "nav", + [" class=\"", "pagination is-centered", 34], + 62, + [ + 60, + "ul", + [" class=\"", "pagination-list", 34], + 62, + [ + [ + 60, + "li", + [" class=\"", [], 34], + 62, + [ + 60, + "a", + [" class=\"", "pagination-link is-current", 34], + 62, + "1", + 60, + 47, + "a", + 62 + ], + 60, + 47, + "li", + 62 + ], + [ + 60, + "li", + [" class=\"", [], 34], + 62, + [60, "a", [" class=\"", "pagination-link", 34], 62, "2", 60, 47, "a", 62], + 60, + 47, + "li", + 62 + ], + [ + 60, + "li", + [" class=\"", [], 34], + 62, + [ + 60, + "a", + [" class=\"", "pagination-link", 34], + 62, + [[[] | ">"] | ">"], + 60, + 47, + "a", + 62 + ], + 60, + 47, + "li", + 62 + ] + ], + 60, + 47, + "ul", + 62 + ], + 60, + 47, + "nav", + 62 + ] + } = HTML.pagination_links( build_conn(), - %Page{ + %Scrivener.Page{ entries: [], page_number: 1, page_size: 10,