Merge pull request #30 from woylie/update-meta

Update meta

.dialyzer_ignore.exs

@@ -1,6 +1,6 @@
 [
-  {"lib/flop/schema.ex:75:no_return Function filterable/1 has no local return."},
-  {"lib/flop/schema.ex:84:no_return Function sortable/1 has no local return."},
-  {"lib/flop/schema.ex:93:no_return Function default_limit/1 has no local return."},
-  {"lib/flop/schema.ex:102:no_return Function max_limit/1 has no local return."}
+  ~r/lib\/flop\/schema\.ex.*no_return Function filterable\/1 has no local return\./,
+  ~r/lib\/flop\/schema\.ex.*no_return Function sortable\/1 has no local return\./,
+  ~r/lib\/flop\/schema\.ex.*no_return Function default_limit\/1 has no local return\./,
+  ~r/lib\/flop\/schema\.ex.*no_return Function max_limit\/1 has no local return\./
 ]

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## [0.6.1] - 2020-06-17
+
+## Changed
+
+- Add Flop to Meta struct.
+
 ### Fixed
 
 - Type `Flop.Filter.op` didn't include all operators.

README.md

@@ -24,7 +24,7 @@ Add `flop` to your list of dependencies in `mix.exs`:
 ```elixir
 def deps do
   [
-    {:flop, "~> 0.6.0"}
+    {:flop, "~> 0.6.1"}
   ]
 end
 ```

lib/flop.ex

@@ -86,7 +86,7 @@ defmodule Flop do
   - `filters`: List of filters, see `t:Flop.Filter.t/0`.
   """
   @type t :: %__MODULE__{
-          filters: [Filter.t() | nil],
+          filters: [Filter.t()] | nil,
           limit: pos_integer | nil,
           offset: non_neg_integer | nil,
           order_by: [atom | String.t()] | nil,
@@ -257,6 +257,7 @@ defmodule Flop do
       %Flop.Meta{
         current_offset: 0,
         current_page: 1,
+        flop: %Flop{limit: 10},
         has_next_page?: false,
         has_previous_page?: false,
         next_offset: nil,
@@ -302,6 +303,7 @@ defmodule Flop do
     %Meta{
       current_offset: current_offset,
       current_page: current_page,
+      flop: flop,
       has_next_page?: has_next_page?,
       has_previous_page?: has_previous_page?,
       next_offset: next_offset,

lib/flop/meta.ex

@@ -9,6 +9,7 @@ defmodule Flop.Meta do
   @type t :: %__MODULE__{
           current_offset: non_neg_integer,
           current_page: pos_integer,
+          flop: Flop.t(),
           has_next_page?: boolean,
           has_previous_page?: boolean,
           next_offset: non_neg_integer | nil,
@@ -23,6 +24,7 @@ defmodule Flop.Meta do
   @enforce_keys [
     :current_offset,
     :current_page,
+    :flop,
     :has_next_page?,
     :has_previous_page?,
     :next_offset,
@@ -37,6 +39,7 @@ defmodule Flop.Meta do
   defstruct [
     :current_offset,
     :current_page,
+    :flop,
     :has_next_page?,
     :has_previous_page?,
     :next_offset,

mix.exs

@@ -4,7 +4,7 @@ defmodule Flop.MixProject do
   def project do
     [
       app: :flop,
-      version: "0.6.0",
+      version: "0.6.1",
       elixir: "~> 1.8",
       start_permanent: Mix.env() == :prod,
       elixirc_paths: elixirc_paths(Mix.env()),

test/flop_test.exs

@@ -374,6 +374,7 @@ defmodule FlopTest do
       assert Flop.meta(Pet, flop) == %Meta{
                current_offset: 4,
                current_page: 3,
+               flop: flop,
                has_next_page?: true,
                has_previous_page?: true,
                next_offset: 6,
@@ -399,6 +400,7 @@ defmodule FlopTest do
       assert Flop.meta(Pet, flop) == %Meta{
                current_offset: 4,
                current_page: 3,
+               flop: flop,
                has_next_page?: true,
                has_previous_page?: true,
                next_offset: 6,
@@ -420,6 +422,7 @@ defmodule FlopTest do
       assert Flop.meta(Pet, flop) == %Meta{
                current_offset: 0,
                current_page: 1,
+               flop: flop,
                has_next_page?: false,
                has_previous_page?: false,
                next_offset: nil,