Apply formatter (#58)

Author: doomspork

lib/mix/tasks/phoenix.gen.html.slime.ex

@@ -37,34 +37,43 @@ defmodule Mix.Tasks.Phoenix.Gen.Html.Slime do
     default_opts = Application.get_env(:phoenix, :generators, [])
     opts = Keyword.merge(default_opts, opts)
 
-    attrs   = Mix.Phoenix.Schema.attrs(attrs)
+    attrs = Mix.Phoenix.Schema.attrs(attrs)
     binding = Mix.Phoenix.inflect(singular)
-    path    = binding[:path]
-    route   = String.split(path, "/") |> Enum.drop(-1) |> Kernel.++([plural]) |> Enum.join("/")
-    binding = binding ++ [plural: plural, route: route, attrs: attrs,
-                          binary_id: opts[:binary_id],
-                          sample_id: sample_id(opts),
-                          inputs: inputs(attrs), params: Mix.Phoenix.Schema.params(attrs),
-                          template_singular: String.replace(binding[:singular], "_", " "),
-                          template_plural: String.replace(plural, "_", " ")]
+    path = binding[:path]
+    route = String.split(path, "/") |> Enum.drop(-1) |> Kernel.++([plural]) |> Enum.join("/")
+
+    binding =
+      binding ++
+        [
+          plural: plural,
+          route: route,
+          attrs: attrs,
+          binary_id: opts[:binary_id],
+          sample_id: sample_id(opts),
+          inputs: inputs(attrs),
+          params: Mix.Phoenix.Schema.params(attrs),
+          template_singular: String.replace(binding[:singular], "_", " "),
+          template_plural: String.replace(plural, "_", " ")
+        ]
 
     Mix.Phoenix.check_module_name_availability!(binding[:module] <> "Controller")
     Mix.Phoenix.check_module_name_availability!(binding[:module] <> "View")
 
-    Mix.Phoenix.copy_from paths(), "priv/templates/phoenix.gen.html", binding, [
-      {:eex, "controller.ex",       "web/controllers/#{path}_controller.ex"},
-      {:eex, "view.ex",             "web/views/#{path}_view.ex"},
-      {:eex, "controller_test.exs", "test/controllers/#{path}_controller_test.exs"},
-    ]
-
-    extension = PhoenixSlime.ConfiguredExtension.file_extension
-    Mix.Phoenix.copy_from slime_paths(), "priv/templates/phoenix.gen.html.slime", binding, [
-      {:eex, "edit.html.eex",       "web/templates/#{path}/edit.html.#{extension}"},
-      {:eex, "form.html.eex",       "web/templates/#{path}/form.html.#{extension}"},
-      {:eex, "index.html.eex",      "web/templates/#{path}/index.html.#{extension}"},
-      {:eex, "new.html.eex",        "web/templates/#{path}/new.html.#{extension}"},
-      {:eex, "show.html.eex",       "web/templates/#{path}/show.html.#{extension}"},
-    ]
+    Mix.Phoenix.copy_from(paths(), "priv/templates/phoenix.gen.html", binding, [
+      {:eex, "controller.ex", "web/controllers/#{path}_controller.ex"},
+      {:eex, "view.ex", "web/views/#{path}_view.ex"},
+      {:eex, "controller_test.exs", "test/controllers/#{path}_controller_test.exs"}
+    ])
+
+    extension = PhoenixSlime.ConfiguredExtension.file_extension()
+
+    Mix.Phoenix.copy_from(slime_paths(), "priv/templates/phoenix.gen.html.slime", binding, [
+      {:eex, "edit.html.eex", "web/templates/#{path}/edit.html.#{extension}"},
+      {:eex, "form.html.eex", "web/templates/#{path}/form.html.#{extension}"},
+      {:eex, "index.html.eex", "web/templates/#{path}/index.html.#{extension}"},
+      {:eex, "new.html.eex", "web/templates/#{path}/new.html.#{extension}"},
+      {:eex, "show.html.eex", "web/templates/#{path}/show.html.#{extension}"}
+    ])
 
     instructions = """
 
@@ -74,9 +83,9 @@ defmodule Mix.Tasks.Phoenix.Gen.Html.Slime do
     """
 
     if opts[:model] != false do
-      Mix.Task.run "phoenix.gen.model", ["--instructions", instructions|args]
+      Mix.Task.run("phoenix.gen.model", ["--instructions", instructions | args])
     else
-      Mix.shell.info instructions
+      Mix.shell().info(instructions)
     end
   end
 
@@ -92,8 +101,12 @@ defmodule Mix.Tasks.Phoenix.Gen.Html.Slime do
     cond do
       String.contains?(plural, ":") ->
         raise_with_help()
+
       plural != Phoenix.Naming.underscore(plural) ->
-        Mix.raise "Expected the second argument, #{inspect plural}, to be all lowercase using snake_case convention"
+        Mix.raise(
+          "Expected the second argument, #{inspect(plural)}, to be all lowercase using snake_case convention"
+        )
+
       true ->
         args
     end
@@ -104,41 +117,54 @@ defmodule Mix.Tasks.Phoenix.Gen.Html.Slime do
   end
 
   defp raise_with_help do
-    Mix.raise """
+    Mix.raise("""
     mix phoenix_slime.gen.html expects both singular and plural names
     of the generated resource followed by any number of attributes:
 
         mix phoenix_slime.gen.html User users name:string
-    """
+    """)
   end
 
   defp inputs(attrs) do
-    Enum.map attrs, fn
+    Enum.map(attrs, fn
       {_, {:array, _}} ->
         {nil, nil, nil}
+
       {_, {:references, _}} ->
         {nil, nil, nil}
-      {key, :integer}    ->
+
+      {key, :integer} ->
         {label(key), ~s(= number_input f, #{inspect(key)}, class: "form-control"), error(key)}
-      {key, :float}      ->
-        {label(key), ~s(= number_input f, #{inspect(key)}, step: "any", class: "form-control"), error(key)}
-      {key, :decimal}    ->
-        {label(key), ~s(= number_input f, #{inspect(key)}, step: "any", class: "form-control"), error(key)}
-      {key, :boolean}    ->
+
+      {key, :float} ->
+        {label(key), ~s(= number_input f, #{inspect(key)}, step: "any", class: "form-control"),
+         error(key)}
+
+      {key, :decimal} ->
+        {label(key), ~s(= number_input f, #{inspect(key)}, step: "any", class: "form-control"),
+         error(key)}
+
+      {key, :boolean} ->
         {label(key), ~s(= checkbox f, #{inspect(key)}, class: "form-control"), error(key)}
-      {key, :text}       ->
+
+      {key, :text} ->
         {label(key), ~s(= textarea f, #{inspect(key)}, class: "form-control"), error(key)}
-      {key, :date}       ->
+
+      {key, :date} ->
         {label(key), ~s(= date_select f, #{inspect(key)}, class: "form-control"), error(key)}
-      {key, :time}       ->
+
+      {key, :time} ->
         {label(key), ~s(= time_select f, #{inspect(key)}, class: "form-control"), error(key)}
-      {key, :utc_datetime}   ->
+
+      {key, :utc_datetime} ->
         {label(key), ~s(= datetime_select f, #{inspect(key)}, class: "form-control"), error(key)}
-      {key, :naive_datetime}   ->
+
+      {key, :naive_datetime} ->
         {label(key), ~s(= datetime_select f, #{inspect(key)}, class: "form-control"), error(key)}
-      {key, _}           ->
+
+      {key, _} ->
         {label(key), ~s(= text_input f, #{inspect(key)}, class: "form-control"), error(key)}
-    end
+    end)
   end
 
   defp label(key) do

lib/mix/tasks/phoenix.gen.layout.slime.ex

@@ -10,19 +10,20 @@ defmodule Mix.Tasks.Phoenix.Gen.Layout.Slime do
 
   """
   def run(_args) do
-
     binding = [application_module: "ApplicationName"]
 
-    extension = PhoenixSlime.ConfiguredExtension.file_extension
-    Mix.Phoenix.copy_from slime_paths(), "priv/templates/phoenix.gen.layout.slime", binding, [
-      {:eex, "app.html.eex",       "web/templates/layout/app.html.#{extension}"}
-    ]
+    extension = PhoenixSlime.ConfiguredExtension.file_extension()
+
+    Mix.Phoenix.copy_from(slime_paths(), "priv/templates/phoenix.gen.layout.slime", binding, [
+      {:eex, "app.html.eex", "web/templates/layout/app.html.#{extension}"}
+    ])
 
     instructions = """
 
     A new web/templates/layout/app.html.#{extension} file was generated.
     """
-    Mix.shell.info instructions
+
+    Mix.shell().info(instructions)
   end
 
   defp slime_paths do

lib/mix/tasks/phx.gen.html.slime.ex

@@ -105,9 +105,10 @@ defmodule Mix.Tasks.Phx.Gen.Html.Slime do
 
   @doc false
   def run(args) do
-    if Mix.Project.umbrella? do
-      Mix.raise "mix phx.gen.html.slime can only be run inside an application directory"
+    if Mix.Project.umbrella?() do
+      Mix.raise("mix phx.gen.html.slime can only be run inside an application directory")
     end
+
     {context, schema} = Gen.Context.build(args)
     binding = [context: context, schema: schema, inputs: inputs(schema)]
     paths = [".", :phoenix_slime, :phoenix]
@@ -125,9 +126,11 @@ defmodule Mix.Tasks.Phx.Gen.Html.Slime do
     |> Kernel.++(context_files(context))
     |> Mix.Phoenix.prompt_for_conflicts()
   end
+
   defp context_files(%Context{generate?: true} = context) do
     Gen.Context.files_to_be_generated(context)
   end
+
   defp context_files(%Context{generate?: false}) do
     []
   end
@@ -136,10 +139,10 @@ defmodule Mix.Tasks.Phx.Gen.Html.Slime do
   def files_to_be_generated(context) do
     to_gen = Mix.Tasks.Phx.Gen.Html.files_to_be_generated(context)
 
-    extension = PhoenixSlime.ConfiguredExtension.file_extension
+    extension = PhoenixSlime.ConfiguredExtension.file_extension()
 
-    Enum.map(to_gen, fn
-      {type, name, path} -> {type, name, String.replace_suffix(path, "eex", extension)}
+    Enum.map(to_gen, fn {type, name, path} ->
+      {type, name, String.replace_suffix(path, "eex", extension)}
     end)
   end
 
@@ -155,32 +158,44 @@ defmodule Mix.Tasks.Phx.Gen.Html.Slime do
     Enum.map(attrs, fn
       {_, {:array, _}} ->
         {nil, nil, nil}
+
       {_, {:references, _}} ->
         {nil, nil, nil}
-      {key, :integer}    ->
+
+      {key, :integer} ->
         {label(key), ~s(= number_input f, #{inspect(key)}, class: "form-control"), error(key)}
-      {key, :float}      ->
-        {label(key), ~s(= number_input f, #{inspect(key)}, step: "any", class: "form-control"), error(key)}
-      {key, :decimal}    ->
-        {label(key), ~s(= number_input f, #{inspect(key)}, step: "any", class: "form-control"), error(key)}
-      {key, :boolean}    ->
+
+      {key, :float} ->
+        {label(key), ~s(= number_input f, #{inspect(key)}, step: "any", class: "form-control"),
+         error(key)}
+
+      {key, :decimal} ->
+        {label(key), ~s(= number_input f, #{inspect(key)}, step: "any", class: "form-control"),
+         error(key)}
+
+      {key, :boolean} ->
         {label(key), ~s(= checkbox f, #{inspect(key)}, class: "form-control"), error(key)}
-      {key, :text}       ->
+
+      {key, :text} ->
         {label(key), ~s(= textarea f, #{inspect(key)}, class: "form-control"), error(key)}
-      {key, :date}       ->
+
+      {key, :date} ->
         {label(key), ~s(= date_select f, #{inspect(key)}, class: "form-control"), error(key)}
-      {key, :time}       ->
+
+      {key, :time} ->
         {label(key), ~s(= time_select f, #{inspect(key)}, class: "form-control"), error(key)}
-      {key, :utc_datetime}   ->
+
+      {key, :utc_datetime} ->
         {label(key), ~s(= datetime_select f, #{inspect(key)}, class: "form-control"), error(key)}
-      {key, :naive_datetime}   ->
+
+      {key, :naive_datetime} ->
         {label(key), ~s(= datetime_select f, #{inspect(key)}, class: "form-control"), error(key)}
-      {key, _}           ->
+
+      {key, _} ->
         {label(key), ~s(= text_input f, #{inspect(key)}, class: "form-control"), error(key)}
     end)
   end
 
-
   defp label(key) do
     ~s(= label f, #{inspect(key)}, class: "control-label")
   end

lib/mix/tasks/phx.gen.layout.slime.ex

@@ -14,7 +14,8 @@ defmodule Mix.Tasks.Phx.Gen.Layout.Slime do
     web_prefix = Mix.Phoenix.web_path(context_app)
     binding = [application_module: Mix.Phoenix.base()]
 
-    extension = PhoenixSlime.ConfiguredExtension.file_extension
+    extension = PhoenixSlime.ConfiguredExtension.file_extension()
+
     Mix.Phoenix.copy_from(slime_paths(), "priv/templates/phoenix.gen.layout.slime", binding, [
       {:eex, "app.html.eex", "#{web_prefix}/templates/layout/app.html.#{extension}"}
     ])
@@ -23,7 +24,8 @@ defmodule Mix.Tasks.Phx.Gen.Layout.Slime do
 
     A new #{web_prefix}/templates/layout/app.html.#{extension} file was generated.
     """
-    Mix.shell.info instructions
+
+    Mix.shell().info(instructions)
   end
 
   defp slime_paths do

lib/phoenix_slime/engine.ex

@@ -12,7 +12,7 @@ defmodule PhoenixSlime.Engine do
 
   defp read!(file_path) do
     file_path
-    |> File.read!
-    |> Slime.Renderer.precompile
+    |> File.read!()
+    |> Slime.Renderer.precompile()
   end
 end

mix.exs

@@ -7,9 +7,7 @@ defmodule PhoenixSlime.Mixfile do
     [
       app: :phoenix_slime,
       deps: deps(),
-      description: """
-      Phoenix Template Engine for Slim-like templates
-      """,
+      description: "Phoenix Template Engine for Slim-like templates",
       elixir: "~> 1.4",
       package: package(),
       version: @version]