remove dbg, fix tests, use in-memory kv, bump to version 0.3.1

magnetised · magnetised · commit 2993f552b522 · 2025-03-06T10:51:34.000-08:00
diff --git a/lib/phoenix/sync/application.ex b/lib/phoenix/sync/application.ex
@@ -7,7 +7,7 @@ defmodule Phoenix.Sync.Application do
 
   @impl true
   def start(_type, _args) do
-    case children() |> dbg do
+    case children() do
       {:ok, children} ->
         Supervisor.start_link(children, strategy: :one_for_one, name: Phoenix.Sync.Supervisor)
 
@@ -106,7 +106,7 @@ defmodule Phoenix.Sync.Application do
   def plug_opts(opts) when is_list(opts) do
     {adapter, env} = adapter_env(opts)
 
-    apply(adapter, :plug_opts, [env, opts]) |> dbg
+    apply(adapter, :plug_opts, [env, opts])
   end
 
   @doc false
diff --git a/lib/phoenix/sync/electric.ex b/lib/phoenix/sync/electric.ex
@@ -319,6 +319,10 @@ defmodule Phoenix.Sync.Electric do
       {Electric.ShapeCache.InMemoryStorage,
        table_base_name: :"electric-storage#{opts[:stack_id]}", stack_id: opts[:stack_id]}
     )
+    |> Keyword.put_new(
+      :persistent_kv,
+      {Electric.PersistentKV.Memory, :new!, []}
+    )
     |> Keyword.put_new(:send_cache_headers?, false)
   end
 
diff --git a/mix.exs b/mix.exs
@@ -2,7 +2,7 @@ defmodule Phoenix.Sync.MixProject do
   use Mix.Project
 
   # Remember to update the README when you change the version
-  @version "0.3.0"
+  @version "0.3.1"
 
   def project do
     [
diff --git a/test/phoenix/sync/application_test.exs b/test/phoenix/sync/application_test.exs
@@ -63,11 +63,15 @@ defmodule Phoenix.Sync.ApplicationTest do
 
       validate_repo_connection_opts!(opts)
 
+      # assert %{
+      #          storage: {Electric.ShapeCache.FileStorage, [storage_dir: "/tmp/" <> storage_dir]},
+      #          persistent_kv: %Electric.PersistentKV.Filesystem{
+      #            root: "/tmp/" <> storage_dir
+      #          }
+      #        } = Map.new(opts)
       assert %{
-               storage: {Electric.ShapeCache.FileStorage, [storage_dir: "/tmp/" <> storage_dir]},
-               persistent_kv: %Electric.PersistentKV.Filesystem{
-                 root: "/tmp/" <> storage_dir
-               }
+               storage: {Electric.ShapeCache.InMemoryStorage, _},
+               persistent_kv: %Electric.PersistentKV.Memory{}
              } = Map.new(opts)
     end
 
@@ -95,9 +99,14 @@ defmodule Phoenix.Sync.ApplicationTest do
       validate_repo_connection_opts!(opts)
 
       assert %{
-               storage: {Electric.ShapeCache.FileStorage, [storage_dir: "/something"]},
-               persistent_kv: %Electric.PersistentKV.Filesystem{root: "/something"}
+               storage: {Electric.ShapeCache.InMemoryStorage, _},
+               persistent_kv: %Electric.PersistentKV.Memory{}
              } = Map.new(opts)
+
+      # assert %{
+      #          storage: {Electric.ShapeCache.FileStorage, [storage_dir: "/something"]},
+      #          persistent_kv: %Electric.PersistentKV.Filesystem{root: "/something"}
+      #        } = Map.new(opts)
     end
 
     test "embedded mode test env" do
@@ -195,9 +204,13 @@ defmodule Phoenix.Sync.ApplicationTest do
 
       api = App.plug_opts(config)
 
+      # assert %Electric.Shapes.Api{
+      #          storage: {Electric.ShapeCache.FileStorage, %{base_path: "/something" <> _}},
+      #          persistent_kv: %Electric.PersistentKV.Filesystem{root: "/something"}
+      #        } = api
       assert %Electric.Shapes.Api{
-               storage: {Electric.ShapeCache.FileStorage, %{base_path: "/something" <> _}},
-               persistent_kv: %Electric.PersistentKV.Filesystem{root: "/something"}
+               storage: {Electric.ShapeCache.InMemoryStorage, _},
+               persistent_kv: %Electric.PersistentKV.Memory{}
              } = api
     end
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ defmodule Phoenix.Sync.MixProject do`
`2`	`2`	`use Mix.Project`
`3`	`3`
`4`	`4`	`# Remember to update the README when you change the version`
`5`		`- @version "0.3.0"`
	`5`	`+ @version "0.3.1"`
`6`	`6`
`7`	`7`	`def project do`
`8`	`8`	`[`