Skip to content

Commit

Permalink
assets fixes; webchannels improvements; deps update
Browse files Browse the repository at this point in the history
  • Loading branch information
Adrian Salceanu committed Jul 19, 2019
1 parent 4741bdc commit b4d14a4
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 15 deletions.
12 changes: 9 additions & 3 deletions Manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@ deps = ["Markdown"]
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"

[[JSON]]
deps = ["Dates", "Distributed", "Mmap", "Sockets", "Test", "Unicode"]
git-tree-sha1 = "1f7a25b53ec67f5e9422f1f551ee216503f4a0fa"
deps = ["Dates", "Mmap", "Parsers", "Unicode"]
git-tree-sha1 = "b34d7cef7b337321e97d22242c3c2b91f476748e"
uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
version = "0.20.0"
version = "0.21.0"

[[JuliaInterpreter]]
deps = ["CodeTracking", "InteractiveUtils", "Random", "UUIDs"]
Expand Down Expand Up @@ -162,6 +162,12 @@ git-tree-sha1 = "c4c13474d23c60d20a67b217f1d7f22a40edf8f1"
uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
version = "1.1.0"

[[Parsers]]
deps = ["Dates", "Test"]
git-tree-sha1 = "db2b35dedab3c0e46dc15996d170af07a5ab91c9"
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
version = "0.3.6"

[[Pkg]]
deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "Genie"
uuid = "c43c736e-a2d1-11e8-161f-af95117fbd1e"
authors = ["Adrian Salceanu <[email protected]>"]
version = "0.9.7"
version = "0.9.8"

[deps]
ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
Expand Down
2 changes: 1 addition & 1 deletion src/Configuration.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Core genie configuration / settings functionality.
"""
module Configuration

const GENIE_VERSION = v"0.9.7"
const GENIE_VERSION = v"0.9.8"

using Genie, YAML

Expand Down
2 changes: 1 addition & 1 deletion src/FileTemplates.jl
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function newchannel(channel_name::String) :: String
"""
module $(channel_name)Channel
using Genie.WebChannels, Genie.Router
using Genie.WebChannels, Genie.Router, Genie.Helpers
function subscribe()
Expand Down
16 changes: 7 additions & 9 deletions src/WebChannels.jl
Original file line number Diff line number Diff line change
Expand Up @@ -257,19 +257,17 @@ function message(channel::ChannelName, msg::String, payload::Union{Dict,Nothing}
end


"""
Send message `msg` to `client`.
"""
function message(client::ChannelClient, msg::String) :: Int
write(client.client, msg)
end


"""
Writes `msg` to web socket for `client`.
"""
function message(ws::HTTP.WebSockets.WebSocket, msg::String) :: Int
write(ws, msg)
end
function message(client::ClientId, msg::String) :: Int
write(CLIENTS[client].client, msg)
message(CLIENTS[client].client, msg)
end
function message(client::ChannelClient, msg::String) :: Int
message(client.client, msg)
end

end

2 comments on commit b4d14a4

@essenciary
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/2140

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if Julia TagBot is installed, or can be done manually through the github interface, or via:

git tag -a v0.9.8 -m "<description of version>" b4d14a4d5fcdc5426874b91fe2369a361120b866
git push origin v0.9.8

Please sign in to comment.