Merge pull request #156 from juanvico/juanvico/fix_torch_generator

Fix slime generator

Author: cpjolicoeur

README.md

@@ -40,14 +40,14 @@ plug(
 ```
 config :torch,
   otp_app: :my_app_name,
-  template_format: "eex" || "slim"
+  template_format: "eex" || "slime"
 ```
 
 4. Run `mix torch.install`
 
-**NOTE:** You can also choose to use `slim` templates, but you will need to
-first [install Phoenix Slim](https://github.com/slime-lang/phoenix_slime) and
-then update your configuration to specify `template_format: "slim"`.
+**NOTE:** You can also choose to use `slime` templates, but you will need to
+first [install Phoenix Slime](https://github.com/slime-lang/phoenix_slime) and
+then update your configuration to specify `template_format: "slime"`.
 
 Now you're ready to start generating your admin! :tada:
 
@@ -100,9 +100,9 @@ You will want to update it to include your new navigation link:
 
 There may be times when you are adding Torch into an already existing system
 where your application already contains the modules and controllers and you just
-want to use the Torch admin interface.  Since the `torch.gen` mix tasks are just
+want to use the Torch admin interface. Since the `torch.gen` mix tasks are just
 wrappers around the existing `phx.gen` tasks, you can use most of the same
-flags.  To add an admin interface for `Posts` in the previous example, where the
+flags. To add an admin interface for `Posts` in the previous example, where the
 model and controller modules already exist, use the following command:
 
 ```bash
@@ -180,14 +180,14 @@ own stylesheet with the specific overrides.
 
 ## Internationalization
 
-Torch comes with `.po` files for `en`, `ru` and `es` locales.  If you are using
+Torch comes with `.po` files for `en`, `ru` and `es` locales. If you are using
 torch and can provide us with translation files for other languages, please
-submit a Pull Request with the translation file.  We'd love to add as many
+submit a Pull Request with the translation file. We'd love to add as many
 translations as possible.
 
 If you wish to add your own customized translations, you can configure Torch to
-use your own custom `MessagesBackend` and adding it in your Torch configuration 
-settings in `config.exs`. You can find the all messages that can be customized 
+use your own custom `MessagesBackend` and adding it in your Torch configuration
+settings in `config.exs`. You can find the all messages that can be customized
 in the default [i18n/backend.ex](lib/torch/i18n/backend.ex) file.
 
 If you are customizing a backend for a "standard" spoken language, please submit
@@ -214,5 +214,5 @@ end
 config :torch,
   otp_app: :my_app_name,
   i18n_backend: MyApp.CustomMessagesBackend
-  template_format: "eex" || "slim"
+  template_format: "eex" || "slime"
 ```

assets/css/theme/components/_table.sass

@@ -81,4 +81,4 @@ section#torch-table
         max-width: 30px
 
       button
-        @extend %red-button
+        @extend %red-button

lib/mix/tasks/torch.gen.html.ex

@@ -27,7 +27,11 @@ defmodule Mix.Tasks.Torch.Gen.Html do
     Enum.each(@commands, &Mix.Torch.inject_templates(&1, format))
 
     # Run the Phoenix generator
-    Mix.Task.run("phx.gen.html", args)
+    if format == "slime" do
+      Mix.Task.run("phx.gen.html.slime", args)
+    else
+      Mix.Task.run("phx.gen.html", args)
+    end
 
     # Remove the injected templates from priv/ so they will not
     # affect future Phoenix generator commands

lib/mix/tasks/torch.install.ex

@@ -17,7 +17,7 @@ defmodule Mix.Tasks.Torch.Install do
 
   Also accepts `--format` and `--app` options:
 
-      mix torch.install --format slim --app my_app
+      mix torch.install --format slime --app my_app
   """
 
   def run(args) do

lib/mix/torch.ex

@@ -6,7 +6,7 @@ defmodule Mix.Torch do
   def parse_config!(task, args) do
     {opts, _, _} = OptionParser.parse(args, switches: [format: :string, app: :string])
 
-    format = opts[:format] || Config.template_format()
+    format = convert_format(opts[:format] || Config.template_format())
     otp_app = opts[:app] || Config.otp_app()
 
     unless otp_app do
@@ -22,18 +22,18 @@ defmodule Mix.Torch do
       """)
     end
 
-    unless format in ["eex", "slim"] do
+    unless format in ["eex", "slime"] do
       Mix.raise("""
       Template format is invalid: #{inspect(format)}. Either configure it as
       shown below or pass it via the `--format` option.
 
           config :torch,
-            template_format: :slim
+            template_format: :slime
 
           # Alternatively
-          mix #{task} --format slim
+          mix #{task} --format slime
 
-      Supported formats: eex, slim
+      Supported formats: eex, slime
       """)
     end
 
@@ -53,13 +53,15 @@ defmodule Mix.Torch do
 
   def inject_templates("phx.gen.html", format) do
     copy_from("priv/templates/#{format}/phx.gen.html", [
+      {"edit.html.eex", "priv/templates/phx.gen.html/edit.html.eex"},
+      {"form.html.eex", "priv/templates/phx.gen.html/form.html.eex"},
+      {"index.html.eex", "priv/templates/phx.gen.html/index.html.eex"},
+      {"new.html.eex", "priv/templates/phx.gen.html/new.html.eex"},
+      {"show.html.eex", "priv/templates/phx.gen.html/show.html.eex"},
+    ])
+    copy_from("priv/templates/common/phx.gen.html", [
       {"controller_test.exs", "priv/templates/phx.gen.html/controller_test.exs"},
       {"controller.ex", "priv/templates/phx.gen.html/controller.ex"},
-      {"edit.html.#{format}", "priv/templates/phx.gen.html/edit.html.#{format}"},
-      {"form.html.#{format}", "priv/templates/phx.gen.html/form.html.#{format}"},
-      {"index.html.#{format}", "priv/templates/phx.gen.html/index.html.#{format}"},
-      {"new.html.#{format}", "priv/templates/phx.gen.html/new.html.#{format}"},
-      {"show.html.#{format}", "priv/templates/phx.gen.html/show.html.#{format}"},
       {"view.ex", "priv/templates/phx.gen.html/view.ex"}
     ])
   end
@@ -85,4 +87,7 @@ defmodule Mix.Torch do
   def remove_templates(template_dir) do
     File.rm_rf("priv/templates/#{template_dir}/")
   end
+
+  defp convert_format("slim"), do: "slime"
+  defp convert_format(format), do: format
 end

priv/templates/eex/phx.gen.html/controller.ex renamed to priv/templates/common/phx.gen.html/controller.ex

@@ -0,0 +1,25 @@
+html
+  head
+    title Admin
+    / Uncomment to just use the bare bones torch styles rather than the theme
+    /link rel="stylesheet" href="#{Routes.static_path(@conn, "/torch/base.css")}"
+    link rel="stylesheet" href="#{Routes.static_path(@conn, "/torch/theme.css")}"
+
+  body class="#{Torch.PageView.body_classes(@conn)}"
+    header
+      section id="torch-account-info"
+        div class="torch-container"
+          a href="/" user@example.com
+          a href="/" Logout
+
+      section id="torch-nav"
+        div class="torch-container"
+          div class="torch-logo"
+            a href="/"
+              h3 Torch
+          nav class="torch-nav"
+            / nav links here
+
+    = Torch.FlashView.render("_flash_messages.html", assigns)
+    = @inner_content
+    script src="#{Routes.static_path(@conn, "/torch/torch.js")}"