Polish Iconify JSON handling

Author: dannote

README.md

@@ -11,8 +11,7 @@ Add `iconify` to your list of dependencies in `mix.exs`:
 ```elixir
 def deps do
   [
-    {:iconify, "~> 0.1.0"},
-    {:req, "~> 0.5"}  # Optional, for fetching icons
+    {:iconify, "~> 0.2.0"}
   ]
 end
 ```
@@ -52,7 +51,7 @@ svg = Iconify.to_svg(icon, class: "w-6 h-6", id: "user-icon")
 
 ### Fetching from Iconify
 
-If you have `req` installed, you can fetch icons directly:
+Iconify includes its HTTP dependency, so you can fetch icons directly:
 
 ```elixir
 # Fetch entire icon set from NPM

lib/iconify.ex

@@ -29,7 +29,7 @@ defmodule Iconify do
 
   """
 
-  alias Iconify.{Icon, Svg}
+  alias Iconify.{Icon, SVG}
 
   @doc """
   Renders an icon as an SVG string.
@@ -54,7 +54,7 @@ defmodule Iconify do
   """
   @spec to_svg(Icon.t(), keyword()) :: String.t()
   def to_svg(%Icon{} = icon, opts \\ []) do
-    Svg.render(icon, opts)
+    SVG.render(icon, opts)
   end
 
   @doc """

lib/iconify/fetcher.ex

@@ -2,8 +2,6 @@ defmodule Iconify.Fetcher do
   @moduledoc """
   Fetches icon data from Iconify sources.
 
-  Requires the `req` dependency to be installed.
-
   ## Sources
 
     * **NPM** - Fetches complete icon sets from `@iconify-json/{prefix}` packages
@@ -37,8 +35,6 @@ defmodule Iconify.Fetcher do
   """
   @spec fetch_set(String.t()) :: {:ok, Set.t()} | {:error, term()}
   def fetch_set(prefix) when is_binary(prefix) do
-    ensure_req!()
-
     with {:ok, tarball_url} <- get_tarball_url(prefix),
          {:ok, json} <- download_and_extract_icons(tarball_url) do
       Set.parse(json)
@@ -59,29 +55,12 @@ defmodule Iconify.Fetcher do
   @spec fetch_icons(String.t(), [String.t()]) ::
           {:ok, %{String.t() => Icon.t()}} | {:error, term()}
   def fetch_icons(prefix, names) when is_binary(prefix) and is_list(names) do
-    ensure_req!()
-
     icons_param = Enum.join(names, ",")
     url = "#{@iconify_api}/#{prefix}.json?icons=#{icons_param}"
 
-    with {:ok, data} <- req_get_json(url) do
-      default_width = data["width"] || 24
-      default_height = data["height"] || 24
-
-      defaults = [
-        width: default_width,
-        height: default_height,
-        left: data["left"] || 0,
-        top: data["top"] || 0
-      ]
-
-      icons =
-        data
-        |> Map.get("icons", %{})
-        |> Map.new(fn {name, icon_data} ->
-          {name, Icon.new(name, icon_data, defaults)}
-        end)
-
+    with {:ok, json} <- req_get_body(url),
+         {:ok, set} <- Set.parse(json) do
+      icons = Map.new(names, fn name -> {name, Set.get!(set, name)} end)
       {:ok, icons}
     end
   end
@@ -127,7 +106,7 @@ defmodule Iconify.Fetcher do
   end
 
   defp download_and_extract_icons(tarball_url) do
-    with {:ok, body} <- req_get_binary(tarball_url) do
+    with {:ok, body} <- req_get_body(tarball_url) do
       extract_icons_json(body)
     end
   end
@@ -145,34 +124,18 @@ defmodule Iconify.Fetcher do
     end
   end
 
-  defp req_get_json(url) do
-    case Req.get(url) do
-      {:ok, %{status: 200, body: body}} when is_map(body) -> {:ok, body}
-      {:ok, %{status: 200, body: body}} when is_binary(body) -> Jason.decode(body)
-      {:ok, %{status: 404}} -> {:error, :not_found}
-      {:ok, %{status: status}} -> {:error, {:http_error, status}}
-      {:error, reason} -> {:error, reason}
+  defp req_get_json(url, opts \\ []) do
+    with {:ok, body} <- req_get_body(url) do
+      Jason.decode(body, opts)
     end
   end
 
-  defp req_get_binary(url) do
+  defp req_get_body(url) do
     case Req.get(url, decode_body: false) do
       {:ok, %{status: 200, body: body}} -> {:ok, body}
       {:ok, %{status: 404}} -> {:error, :not_found}
       {:ok, %{status: status}} -> {:error, {:http_error, status}}
       {:error, reason} -> {:error, reason}
     end
   end
-
-  defp ensure_req! do
-    unless Code.ensure_loaded?(Req) do
-      raise """
-      The :req dependency is required for fetching icons.
-
-      Add it to your mix.exs:
-
-          {:req, "~> 0.5"}
-      """
-    end
-  end
 end

lib/iconify/icon.ex

@@ -1,67 +1,38 @@
 defmodule Iconify.Icon do
   @moduledoc """
-  Represents a single icon from an Iconify icon set.
-
-  ## Fields
-
-    * `:name` - Icon name (e.g., "user", "home")
-    * `:body` - SVG content without the `<svg>` wrapper
-    * `:width` - Icon width (default: 24)
-    * `:height` - Icon height (default: 24)
-    * `:left` - Left position of viewBox (default: 0)
-    * `:top` - Top position of viewBox (default: 0)
-
+  Represents a single normalized Iconify icon.
   """
 
+  @derive Jason.Encoder
   @type t :: %__MODULE__{
           name: String.t(),
           body: String.t(),
           width: pos_integer(),
           height: pos_integer(),
           left: integer(),
-          top: integer()
+          top: integer(),
+          rotate: integer(),
+          h_flip: boolean(),
+          v_flip: boolean(),
+          hidden: boolean()
         }
 
   @enforce_keys [:name, :body]
   defstruct [
     :name,
     :body,
-    width: 24,
-    height: 24,
+    width: 16,
+    height: 16,
     left: 0,
-    top: 0
+    top: 0,
+    rotate: 0,
+    h_flip: false,
+    v_flip: false,
+    hidden: false
   ]
 
-  @doc """
-  Creates an Icon struct from a map (typically parsed from IconifyJSON).
-
-  ## Examples
-
-      iex> Iconify.Icon.new("user", %{"body" => "<path/>", "width" => 24, "height" => 24})
-      %Iconify.Icon{name: "user", body: "<path/>", width: 24, height: 24, left: 0, top: 0}
-
-  """
-  @spec new(String.t(), map(), keyword()) :: t()
-  def new(name, data, defaults \\ []) when is_binary(name) and is_map(data) do
-    %__MODULE__{
-      name: name,
-      body: Map.fetch!(data, "body"),
-      width: data["width"] || defaults[:width] || 24,
-      height: data["height"] || defaults[:height] || 24,
-      left: data["left"] || defaults[:left] || 0,
-      top: data["top"] || defaults[:top] || 0
-    }
-  end
-
   @doc """
   Returns the viewBox string for this icon.
-
-  ## Examples
-
-      iex> icon = %Iconify.Icon{name: "test", body: "", width: 24, height: 24, left: 0, top: 0}
-      iex> Iconify.Icon.viewbox(icon)
-      "0 0 24 24"
-
   """
   @spec viewbox(t()) :: String.t()
   def viewbox(%__MODULE__{left: left, top: top, width: width, height: height}) do