Move schemas to lib/tilex

hashrocket · Oct 24, 2022 · 54bae62 · 54bae62
1 parent 4212768
commit 54bae62
Show file tree

Hide file tree

Showing 42 changed files with 104 additions and 86 deletions.
diff --git a/.iex.exs b/.iex.exs
@@ -1,9 +1,9 @@
 import_file_if_available("~/.iex.exs")
 
-alias Tilex.Channel
-alias Tilex.Developer
+alias Tilex.Blog.Channel
+alias Tilex.Blog.Developer
 alias Tilex.Liking
-alias Tilex.Post
+alias Tilex.Blog.Post
 alias Tilex.Rep
 
 # Allow developer to reload IEx session with `R.reload!`.

diff --git a/lib/mix/tasks/ecto.twiki.ex b/lib/mix/tasks/ecto.twiki.ex
@@ -1,8 +1,10 @@
 defmodule Mix.Tasks.Ecto.Twiki do
   use Mix.Task
 
-  alias Ecto.{Migrator}
-  alias Mix.{Ecto, Project, EctoSQL}
+  alias Ecto.Migrator
+  alias Mix.Ecto
+  alias Mix.Project
+  alias Mix.EctoSQL
 
   @shortdoc "Ecto Migration: Up, Down, Up"
 

diff --git a/lib/tilex/auth/guardian.ex b/lib/tilex/auth/guardian.ex
@@ -1,7 +1,8 @@
 defmodule Tilex.Auth.Guardian do
   use Guardian, otp_app: :tilex
 
-  alias Tilex.{Developer, Repo}
+  alias Tilex.Blog.Developer
+  alias Tilex.Repo
 
   def subject_for_token(%Developer{} = developer, _claims), do: {:ok, "Developer:#{developer.id}"}
   def subject_for_token(_resource, _claims), do: {:error, "Unknown resource type"}

diff --git a/lib/tilex_web/models/channel.ex → lib/tilex/blog/channel.ex b/lib/tilex_web/models/channel.ex → lib/tilex/blog/channel.ex
@@ -1,9 +1,11 @@
-defmodule Tilex.Channel do
-  use TilexWeb, :schema
+defmodule Tilex.Blog.Channel do
+  use Ecto.Schema
+  import Ecto.Changeset
+  import Ecto.Query
 
   @type t :: module
 
-  alias Tilex.Post
+  alias Tilex.Blog.Post
 
   schema "channels" do
     field(:name, :string)

diff --git a/lib/tilex_web/models/developer.ex → lib/tilex/blog/developer.ex b/lib/tilex_web/models/developer.ex → lib/tilex/blog/developer.ex
@@ -1,9 +1,11 @@
-defmodule Tilex.Developer do
-  use TilexWeb, :schema
+defmodule Tilex.Blog.Developer do
+  use Ecto.Schema
+  import Ecto.Changeset
 
   @type t :: module
 
-  alias Tilex.{Developer, Post}
+  alias Tilex.Blog.Developer
+  alias Tilex.Blog.Post
 
   schema "developers" do
     field(:email, :string)

diff --git a/lib/tilex_web/models/post.ex → lib/tilex/blog/post.ex b/lib/tilex_web/models/post.ex → lib/tilex/blog/post.ex
@@ -1,9 +1,12 @@
-defmodule Tilex.Post do
-  use TilexWeb, :schema
+defmodule Tilex.Blog.Post do
+  use Ecto.Schema
+  import Ecto.Changeset
 
   @type t :: module
 
-  alias Tilex.{Developer, Channel, Post}
+  alias Tilex.Blog.Developer
+  alias Tilex.Blog.Channel
+  alias Tilex.Blog.Post
 
   @body_max_words 200
   def body_max_words, do: @body_max_words

diff --git a/lib/tilex_web/models/request.ex → lib/tilex/blog/request.ex b/lib/tilex_web/models/request.ex → lib/tilex/blog/request.ex
@@ -1,5 +1,5 @@
-defmodule Tilex.Request do
-  use TilexWeb, :schema
+defmodule Tilex.Blog.Request do
+  use Ecto.Schema
 
   @type t :: module
 

diff --git a/lib/tilex/liking.ex b/lib/tilex/liking.ex
@@ -1,5 +1,7 @@
 defmodule Tilex.Liking do
-  alias Tilex.{Notifications, Post, Repo}
+  alias Tilex.Notifications
+  alias Tilex.Blog.Post
+  alias Tilex.Repo
 
   def like(slug) do
     post = Repo.get_by!(Post, slug: slug)

diff --git a/lib/tilex/notifications/notifications.ex b/lib/tilex/notifications/notifications.ex
@@ -2,7 +2,7 @@ defmodule Tilex.Notifications do
   use GenServer
 
   alias Ecto.Changeset
-  alias Tilex.Post
+  alias Tilex.Blog.Post
   alias Tilex.Repo
   alias TilexWeb.Endpoint
   alias TilexWeb.Router.Helpers, as: Routes

diff --git a/lib/tilex/notifications/notifiers/notifier.ex b/lib/tilex/notifications/notifiers/notifier.ex
@@ -23,7 +23,9 @@ defmodule Tilex.Notifications.Notifier do
   Tilex.Notifications.NotifiersSupervisor.children/1
   """
 
-  alias Tilex.{Post, Developer, Channel}
+  alias Tilex.Blog.Post
+  alias Tilex.Blog.Developer
+  alias Tilex.Blog.Channel
 
   @callback handle_post_created(Post.t(), Developer.t(), Channel.t(), url :: String.t()) :: any
   @callback handle_post_liked(Post.t(), Developer.t(), url :: String.t()) :: any

diff --git a/lib/tilex/notifications/notifiers/slack.ex b/lib/tilex/notifications/notifiers/slack.ex
@@ -1,7 +1,7 @@
 defmodule Tilex.Notifications.Notifiers.Slack do
   use Tilex.Notifications.Notifier
 
-  alias Tilex.Post
+  alias Tilex.Blog.Post
 
   @emoji ~w(
     :tada:

diff --git a/lib/tilex/notifications/notifiers/twitter.ex b/lib/tilex/notifications/notifiers/twitter.ex
@@ -1,5 +1,5 @@
 defmodule Tilex.Notifications.Notifiers.Twitter do
-  alias Tilex.Developer
+  alias Tilex.Blog.Developer
 
   use Tilex.Notifications.Notifier
 

diff --git a/lib/tilex/posts.ex b/lib/tilex/posts.ex
@@ -2,7 +2,10 @@ defmodule Tilex.Posts do
   import Ecto.Query
 
   alias Ecto.Adapters.SQL
-  alias Tilex.{Channel, Developer, Post, Repo}
+  alias Tilex.Blog.Channel
+  alias Tilex.Blog.Developer
+  alias Tilex.Blog.Post
+  alias Tilex.Repo
 
   def all(page) do
     page

diff --git a/lib/tilex/stats.ex b/lib/tilex/stats.ex
@@ -4,7 +4,7 @@ defmodule Tilex.Stats do
 
   alias Ecto.Adapters.SQL
   alias Tilex.Repo
-  alias Tilex.Channel
+  alias Tilex.Blog.Channel
 
   def developer(%{start_date: start_date, end_date: end_date}) do
     start_time = Timex.to_datetime(start_date)

diff --git a/lib/tilex/tracking.ex b/lib/tilex/tracking.ex
@@ -1,6 +1,6 @@
 defmodule Tilex.Tracking do
   alias Tilex.Repo
-  alias Tilex.Request
+  alias Tilex.Blog.Request
   alias TilexWeb.Endpoint
 
   import Ecto.Query, only: [from: 2, subquery: 1]
@@ -36,7 +36,7 @@ defmodule Tilex.Tracking do
     query =
       from(
         req in subquery(requests),
-        join: post in Tilex.Post,
+        join: post in Tilex.Blog.Post,
         on: [slug: req.url_slug],
         order_by: [desc: req.view_count],
         limit: 10,

diff --git a/lib/tilex_web.ex b/lib/tilex_web.ex
@@ -88,14 +88,6 @@ defmodule TilexWeb do
     end
   end
 
-  def schema do
-    quote do
-      use Ecto.Schema
-      import Ecto.Changeset
-      import Ecto.Query
-    end
-  end
-
   defp view_helpers do
     quote do
       # Use all HTML functionality (forms, tags, etc)

diff --git a/lib/tilex_web/channels/user_socket.ex b/lib/tilex_web/channels/user_socket.ex
@@ -2,7 +2,7 @@ defmodule TilexWeb.UserSocket do
   use Phoenix.Socket
 
   ## Channels
-  channel("post:search", Tilex.PostChannel)
+  channel("post:search", Tilex.Blog.PostChannel)
   channel("text_converter", Tilex.TextConverterChannel)
 
   # Socket params are passed from the client and can

diff --git a/lib/tilex_web/controllers/api/developer_post_controller.ex b/lib/tilex_web/controllers/api/developer_post_controller.ex
@@ -4,7 +4,7 @@ defmodule TilexWeb.Api.DeveloperPostController do
   """
 
   use TilexWeb, :controller
-  alias Tilex.{Posts}
+  alias Tilex.Posts
 
   @doc """
   This function allows external requesters to retrieve a developer's three most

diff --git a/lib/tilex_web/controllers/api/post_controller.ex b/lib/tilex_web/controllers/api/post_controller.ex
@@ -5,7 +5,7 @@ defmodule TilexWeb.Api.PostController do
 
   use TilexWeb, :controller
   use Tilex.Pageable
-  alias Tilex.{Posts}
+  alias Tilex.Posts
 
   @doc """
   This functions allows external requesters to retrieve the feed of til in json format

diff --git a/lib/tilex_web/controllers/auth_controller.ex b/lib/tilex_web/controllers/auth_controller.ex
@@ -2,7 +2,7 @@ defmodule TilexWeb.AuthController do
   use TilexWeb, :controller
   plug(Ueberauth)
 
-  alias Tilex.Developer
+  alias Tilex.Blog.Developer
   alias Tilex.Repo
   alias Tilex.Auth
 

diff --git a/lib/tilex_web/controllers/developer_controller.ex b/lib/tilex_web/controllers/developer_controller.ex
@@ -1,7 +1,10 @@
 defmodule TilexWeb.DeveloperController do
   use TilexWeb, :controller
 
-  alias Tilex.{Developer, Posts, Repo, Auth}
+  alias Tilex.Blog.Developer
+  alias Tilex.Posts
+  alias Tilex.Repo
+  alias Tilex.Auth
 
   def show(conn, %{"name" => username} = params) do
     page =

diff --git a/lib/tilex_web/controllers/feed_controller.ex b/lib/tilex_web/controllers/feed_controller.ex
@@ -5,7 +5,7 @@ defmodule TilexWeb.FeedController do
     posts =
       Repo.all(
         from(
-          p in Tilex.Post,
+          p in Tilex.Blog.Post,
           order_by: [desc: p.inserted_at],
           preload: [:channel, :developer],
           limit: 25

diff --git a/lib/tilex_web/controllers/post_controller.ex b/lib/tilex_web/controllers/post_controller.ex
@@ -4,7 +4,11 @@ defmodule TilexWeb.PostController do
   import Ecto.Query
 
   alias Guardian.Plug
-  alias Tilex.{Channel, Notifications, Liking, Post, Posts}
+  alias Tilex.Blog.Channel
+  alias Tilex.Notifications
+  alias Tilex.Liking
+  alias Tilex.Blog.Post
+  alias Tilex.Posts
 
   plug(:load_channels when action in [:new, :create, :edit, :update])
   plug(:extract_slug when action in [:show, :edit, :update])

diff --git a/lib/tilex_web/controllers/sitemap_controller.ex b/lib/tilex_web/controllers/sitemap_controller.ex
@@ -3,7 +3,7 @@ defmodule TilexWeb.SitemapController do
 
   def index(conn, _) do
     conn
-    |> assign(:posts, Repo.all(Tilex.Post))
+    |> assign(:posts, Repo.all(Tilex.Blog.Post))
     |> put_layout(false)
     |> render("sitemap.xml")
   end

diff --git a/lib/tilex_web/controllers/test/auth_controller.ex b/lib/tilex_web/controllers/test/auth_controller.ex
@@ -1,7 +1,9 @@
 defmodule TilexWeb.Test.AuthController do
   use TilexWeb, :controller
 
-  alias Tilex.{Developer, Repo, Auth}
+  alias Tilex.Blog.Developer
+  alias Tilex.Repo
+  alias Tilex.Auth
 
   def index(conn, params) do
     developer = Repo.get_by!(Developer, id: params["id"])

diff --git a/lib/tilex_web/templates/post/form.html.eex b/lib/tilex_web/templates/post/form.html.eex
@@ -2,7 +2,7 @@
   <dl>
     <dt>
       <%= label f, :title %> <%= error_tag f, :title %>
-      <small class="character_limit" data-limit="<%= Tilex.Post.title_max_chars %>"></small>
+      <small class="character_limit" data-limit="<%= Tilex.Blog.Post.title_max_chars %>"></small>
     </dt>
     <dd>
       <%= text_input f, :title, placeholder: "Enter title..." %>
@@ -11,7 +11,7 @@
   <dl>
     <dt>
       <%= label f, :body %> <%= error_tag f, :body %>
-      <small class="word_limit" data-limit="<%= Tilex.Post.body_max_words %>"></small>
+      <small class="word_limit" data-limit="<%= Tilex.Blog.Post.body_max_words %>"></small>
     </dt>
     <dd>
       <%= textarea f, :body,

diff --git a/lib/tilex_web/templates/shared/post.html.eex b/lib/tilex_web/templates/shared/post.html.eex
@@ -10,7 +10,7 @@
         <a href='http://twitter.com/share'
            class='twitter-share-button'
            data-text= "Today I learned: <%= @post.title %>"
-           data-via= "<%= Tilex.Developer.twitter_handle(@post.developer) %>"
+           data-via= "<%= Tilex.Blog.Developer.twitter_handle(@post.developer) %>"
            data-hashtags= "<%= @post.channel.twitter_hashtag %>"
            data-url= "<%= Routes.post_url(@conn, :show, @post) %>">
           Tweet

diff --git a/lib/tilex_web/templates/stats/developer.html.eex b/lib/tilex_web/templates/stats/developer.html.eex
@@ -45,7 +45,7 @@
       <ul class="post_list">
         <%= for {post_title, post_likes, post_slug, channel_name, _score} <- @hottest_posts do %>
           <li>
-            <%= link(to: Routes.post_path(@conn, :show, %Tilex.Post{slug: post_slug, title: post_title})) do %>
+            <%= link(to: Routes.post_path(@conn, :show, %Tilex.Blog.Post{slug: post_slug, title: post_title})) do %>
               <b>
                 <%= post_title %>
               </b>
@@ -66,7 +66,7 @@
       <ul class="post_list">
         <%= for {post_title, post_likes, post_slug, channel_name} <- @most_liked_posts do %>
           <li>
-            <%= link(to: Routes.post_path(@conn, :show, %Tilex.Post{slug: post_slug, title: post_title})) do %>
+            <%= link(to: Routes.post_path(@conn, :show, %Tilex.Blog.Post{slug: post_slug, title: post_title})) do %>
               <b>
                 <%= post_title %>
               </b>

diff --git a/lib/tilex_web/templates/stats/index.html.eex b/lib/tilex_web/templates/stats/index.html.eex
@@ -22,7 +22,7 @@
       <ul class="post_list">
         <%= for {post_title, post_likes, post_slug, channel_name, _score} <- @hottest_posts do %>
           <li>
-            <%= link(to: Routes.post_path(@conn, :show, %Tilex.Post{slug: post_slug, title: post_title})) do %>
+            <%= link(to: Routes.post_path(@conn, :show, %Tilex.Blog.Post{slug: post_slug, title: post_title})) do %>
               <b>
                 <%= post_title %>
               </b>
@@ -43,7 +43,7 @@
       <ul class="post_list">
         <%= for {post_title, post_likes, post_slug, channel_name} <- @most_liked_posts do %>
           <li>
-            <%= link(to: Routes.post_path(@conn, :show, %Tilex.Post{slug: post_slug, title: post_title})) do %>
+            <%= link(to: Routes.post_path(@conn, :show, %Tilex.Blog.Post{slug: post_slug, title: post_title})) do %>
               <b>
                 <%= post_title %>
               </b>

diff --git a/lib/tilex_web/views/layout_view.ex b/lib/tilex_web/views/layout_view.ex
@@ -24,7 +24,7 @@ defmodule TilexWeb.LayoutView do
   def page_title(%{page_title: page_title}), do: page_title
   def page_title(_), do: Application.get_env(:tilex, :organization_name)
 
-  def twitter_image_url(%Tilex.Post{} = post) do
+  def twitter_image_url(%Tilex.Blog.Post{} = post) do
     channel_name = channel_name(post)
 
     case File.exists?("assets/static/assets/#{channel_name}_twitter_card.png") do
@@ -48,16 +48,16 @@ defmodule TilexWeb.LayoutView do
     end
   end
 
-  def twitter_title(%Tilex.Post{} = post) do
-    Tilex.Post.twitter_title(post)
+  def twitter_title(%Tilex.Blog.Post{} = post) do
+    Tilex.Blog.Post.twitter_title(post)
   end
 
   def twitter_title(_post) do
     "Today I Learned: a Hashrocket Project"
   end
 
-  def twitter_description(%Tilex.Post{} = post) do
-    markdown = Tilex.Post.twitter_description(post)
+  def twitter_description(%Tilex.Blog.Post{} = post) do
+    markdown = Tilex.Blog.Post.twitter_description(post)
 
     earmark_options = %Earmark.Options{pure_links: false}
 

diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exs
@@ -5,14 +5,14 @@
 # Inside the script, you can read and write to any of your
 # repositories directly:
 #
-#     Tilex.Repo.insert!(%Tilex.SomeModel{})
+#     Tilex.Repo.insert!(%Tilex.SomeSchema{})
 #
 # We recommend using the bang functions (`insert!`, `update!`
 # and so on) as they will fail if something goes wrong.
 
-alias Tilex.Channel
-alias Tilex.Developer
-alias Tilex.Post
+alias Tilex.Blog.Channel
+alias Tilex.Blog.Developer
+alias Tilex.Blog.Post
 alias Tilex.Repo
 
 Repo.delete_all(Post)