Version 2.0.0.

Author: okeuday

.travis.yml

@@ -1,8 +1,9 @@
 language: erlang
 otp_release:
-  - 22.1
-  - 21.3
-  - 20.3
+  - 23.0.1
+  - 22.3.4
+  - 21.3.8.1
+  - 20.3.8.5
   - 19.3
 before_script:
   - rebar get-deps

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2009-2019 Michael Truog <mjtruog at protonmail dot com>
+Copyright (c) 2009-2020 Michael Truog <mjtruog at protonmail dot com>
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

doc/cloudi_http_cowboy1_handler.html

@@ -12,9 +12,9 @@
 <h1>Module cloudi_http_cowboy1_handler</h1>
 <ul class="index"><li><a href="#description">Description</a></li><li><a href="#index">Function Index</a></li><li><a href="#functions">Function Details</a></li></ul>
    <h3><a name="Cowboy_CloudI_HTTP_Handler">Cowboy CloudI HTTP Handler</a></h3>.
-<p>Copyright © 2012-2018 Michael Truog</p>
+<p>Copyright © 2012-2020 Michael Truog</p>
 
-<p><b>Version:</b> 1.7.5 Nov 28 2019 14:47:13
+<p><b>Version:</b> 1.8.1 Jun 3 2020 20:11:50
   ------------------------------------------------------------------------</p>
 <p><b>Authors:</b> Michael Truog (<a href="mailto:mjtruog at protonmail dot com"><tt>mjtruog at protonmail dot com</tt></a>).</p>
 

doc/cloudi_service_http_cowboy1.html

@@ -12,17 +12,17 @@
 <h1>Module cloudi_service_http_cowboy1</h1>
 <ul class="index"><li><a href="#description">Description</a></li><li><a href="#index">Function Index</a></li><li><a href="#functions">Function Details</a></li></ul>
    <h3><a name="CloudI_HTTP_Integration">CloudI HTTP Integration</a></h3>
-   Uses the cowboy Erlang HTTP Server.
+   Uses the cowboy1 Erlang HTTP Server.
 <p>Copyright © 2012-2019 Michael Truog</p>
 
-<p><b>Version:</b> 1.8.0 Nov 28 2019 14:47:13
+<p><b>Version:</b> 1.8.0 Jun 3 2020 20:11:50
   ------------------------------------------------------------------------</p>
 <p><b>Behaviours:</b> <a href="deps/cloudi_core/doc/cloudi_service.html"><tt>cloudi_service</tt></a>.</p>
 <p><b>Authors:</b> Michael Truog (<a href="mailto:mjtruog at protonmail dot com"><tt>mjtruog at protonmail dot com</tt></a>).</p>
 
 <h2><a name="description">Description</a></h2>
    <h3><a name="CloudI_HTTP_Integration">CloudI HTTP Integration</a></h3>
-   Uses the cowboy Erlang HTTP Server.
+   Uses the cowboy1 Erlang HTTP Server.
 <h2><a name="index">Function Index</a></h2>
 <table width="100%" border="1" cellspacing="0" cellpadding="2" summary="function index"><tr><td valign="top"><a href="#close-1">close/1</a></td><td>
   <h4><a name="Close_a_cowboy1_websocket_connection.">Close a cowboy1 websocket connection.</a></h4>

mix.exs

@@ -6,7 +6,7 @@ defmodule CloudIServiceHttpCowboy do
 
   def project do
     [app: :cloudi_service_http_cowboy1,
-     version: "1.8.0",
+     version: "2.0.0",
      language: :erlang,
      erlc_options: [
        :debug_info,
@@ -30,7 +30,7 @@ defmodule CloudIServiceHttpCowboy do
 
   defp deps do
     [{:cowboy, "~> 1.1.2"},
-     {:cloudi_core, "~> 1.8.0"}]
+     {:cloudi_core, "~> 2.0.0"}]
   end
 
   defp description do

rebar.config

@@ -4,22 +4,23 @@
 {deps,
  [{cloudi_core, ".*",
    {git, "https://github.com/CloudI/cloudi_core.git",
-    {branch, "master"}}},
+    {tag, "v2.0.0"}}},
   {cowboy, ".*",
    {git, "https://github.com/ninenines/cowboy.git",
     {tag, "1.1.2"}}},
   {uuid, ".*",
    {git, "https://github.com/okeuday/uuid.git",
-    {branch, "master"}}},
+    {tag, "v2.0.0"}}},
   {trie, ".*",
    {git, "https://github.com/okeuday/trie.git",
-    {branch, "master"}}}]}.
+    {tag, "v2.0.0"}}}]}.
 
 {erl_opts,
  [debug_info,
   warnings_as_errors,
   strict_validation,
   warn_bif_clash,
+  nowarn_removed,
   nowarn_deprecated_function,
   warn_export_all,
   warn_export_vars,

src/cloudi_http_cowboy1_handler.erl

@@ -36,18 +36,18 @@
 -module(cloudi_http_cowboy1_handler).
 -author('mjtruog at protonmail dot com').
 
-%-behaviour(cowboy_http_handler).
-%-behaviour(cowboy_websocket_handler).
+%-behaviour(cowboy1_http_handler).
+%-behaviour(cowboy1_websocket_handler).
 
 %% external interface
 
-%% cowboy_http_handler callbacks
+%% cowboy1_http_handler callbacks
 -export([init/3,
          handle/2,
          info/3,
          terminate/3]).
 
-%% cowboy_websocket_handler callbacks
+%% cowboy1_websocket_handler callbacks
 -export([websocket_init/3,
          websocket_handle/3,
          websocket_info/3,
@@ -77,7 +77,7 @@
             :: undefined | #{cloudi:trans_id() := reference()},
         queued
             :: undefined |
-               cloudi_x_pqueue4:cloudi_x_pqueue4(
+               pqueue4:pqueue4(
                    cloudi:message_service_request())
     }).
 
@@ -86,7 +86,7 @@
 %%%------------------------------------------------------------------------
 
 %%%------------------------------------------------------------------------
-%%% Callback functions from cowboy_http_handler
+%%% Callback functions from cowboy1_http_handler
 %%%------------------------------------------------------------------------
 
 init(_Transport, Req0,
@@ -403,7 +403,7 @@ websocket_init(_Transport, Req0,
     end,
     Queued = if
         WebSocketProtocol =:= undefined ->
-            cloudi_x_pqueue4:new();
+            pqueue4:new();
         true ->
             undefined
     end,
@@ -412,7 +412,7 @@ websocket_init(_Transport, Req0,
             % initiate an asynchronous close if the websocket must be unique
             OldConnectionMonitors = if
                 WebSocketNameUnique =:= true ->
-                    case cloudi_x_cpg:get_members(Scope, NameWebSocket,
+                    case cpg:get_members(Scope, NameWebSocket,
                                                   infinity) of
                         {ok, _, OldConnections} ->
                             lists:map(fun(OldConnection) ->
@@ -427,7 +427,7 @@ websocket_init(_Transport, Req0,
             end,
             % service requests are only received if they relate to
             % the service's prefix
-            ok = cloudi_x_cpg:join(Scope, NameWebSocket, self(), infinity),
+            ok = cpg:join(Scope, NameWebSocket, self(), infinity),
             % block on the websocket close if the connection must be unique
             if
                 WebSocketNameUnique =:= true ->
@@ -722,7 +722,7 @@ websocket_info({Type, _, _, _, Request,
                  erlang:send_after(Timeout, self(),
                      {'cloudi_service_recv_timeout', Priority, TransId}),
                  RecvTimeouts),
-             queued = cloudi_x_pqueue4:in(T, Priority, Queue)}
+             queued = pqueue4:in(T, Priority, Queue)}
          }};
 
 websocket_info({Type, Name, _, _, _,
@@ -751,7 +751,7 @@ websocket_info({'cloudi_service_recv_timeout', Priority, TransId}, Req,
                                  } = WebSocketState
                              } = State) ->
     F = fun({_, {_, _, _, _, _, _, _, Id, _}}) -> Id == TransId end,
-    {_, NewQueue} = cloudi_x_pqueue4:remove_unique(F, Priority, Queue),
+    {_, NewQueue} = pqueue4:remove_unique(F, Priority, Queue),
     {ok, Req,
      State#cowboy1_state{
          websocket_state = WebSocketState#websocket_state{
@@ -1428,7 +1428,7 @@ websocket_subscriptions([], _, _) ->
 websocket_subscriptions([F | Functions], Parameters, Scope) ->
     case F(Parameters) of
         {ok, NameWebSocket} ->
-            ok = cloudi_x_cpg:join(Scope, NameWebSocket, self(), infinity);
+            ok = cpg:join(Scope, NameWebSocket, self(), infinity);
         {error, _} ->
             ok
     end,
@@ -1491,7 +1491,7 @@ websocket_process_queue(Req,
                                 response_pending = false,
                                 recv_timeouts = RecvTimeouts,
                                 queued = Queue} = WebSocketState} = State) ->
-    case cloudi_x_pqueue4:out(Queue) of
+    case pqueue4:out(Queue) of
         {empty, NewQueue} ->
             {ok, Req,
              State#cowboy1_state{websocket_state =

src/cloudi_http_cowboy1_handler.hrl

@@ -27,7 +27,7 @@
 %%%
 %%%------------------------------------------------------------------------
 
-%% cowboy handler state
+%% cowboy1 handler state
 -record(cowboy1_state,
     {
         dispatcher :: cloudi_service:dispatcher(),

src/cloudi_service_http_cowboy1.app.src

@@ -3,7 +3,7 @@
 
 {application, cloudi_service_http_cowboy1, 
   [{description, "cowboy1 HTTP CloudI Service"},
-   {vsn, "1.8.0"},
+   {vsn, "2.0.0"},
    {modules, [
         cloudi_http_cowboy1_handler,
         cloudi_service_http_cowboy1

src/cloudi_service_http_cowboy1.erl

@@ -4,7 +4,7 @@
 %%%------------------------------------------------------------------------
 %%% @doc
 %%% ==CloudI HTTP Integration==
-%%% Uses the cowboy Erlang HTTP Server.
+%%% Uses the cowboy1 Erlang HTTP Server.
 %%% @end
 %%%
 %%% MIT License