Merge pull request #11 from JuliaComputing/jq/0.6-0.7compat

Updates for 0.6/0.7

Author: quinnj

.travis.yml

@@ -4,8 +4,8 @@ sudo: required
 os:
   - linux
 julia:
-  - 0.5
   - 0.6
+  - nightly
 services:
   - rabbitmq
 notifications:

REQUIRE

@@ -1,2 +1,2 @@
-julia 0.5
-Compat 0.17.0
+julia 0.6
+Compat 0.41.0

spec/gen.jl

@@ -116,7 +116,7 @@ function gen_spec(specfile)
             methidx = parse(Int, attribute(meth, "index"))
             methargs = Pair{Symbol,Type}[]
             methrespelem = find_element(meth, "response")
-            methresp = (methrespelem === nothing) ? :Void : Symbol(name2sym(attribute(methrespelem, "name")))
+            methresp = (methrespelem === nothing) ? :Nothing : Symbol(name2sym(attribute(methrespelem, "name")))
             println(methindent, methsep, "$methidx => MethodSpec($methidx, :$methname, :$methresp, Pair{Symbol,DataType}[")
             isempty(methsep) && (methsep = ", ")
 

src/AMQPClient.jl

@@ -6,18 +6,19 @@ using Compat
 using Base.I18n
 import Base: write, read, read!, close, convert, show, isopen
 
-# enable logging only during debugging
-#using Logging
-#function __init__()
-#    #Logging.configure(filename="AMQPClient.log", level=DEBUG)
-#    Logging.configure(level=DEBUG)
-#end
-#macro logmsg(s)
-#    quote
-#        debug("[", myid(), "-", "] ", $(esc(s)))
-#    end
-#end
-macro logmsg(s)
+if !isdefined(Base, Symbol("@debug"))
+# 0.6: enable logging only during debugging
+const DEBUG = false
+macro debug(s)
+    esc(:(DEBUG && println("[ Debug: ", $s)))
+end
+else
+    # 0.7: use builtin logging by enabling following statement
+    # Base.CoreLogging.global_logger(Base.CoreLogging.SimpleLogger(STDERR, Base.CoreLogging.Debug))
+end
+
+if !isdefined(Base, :popfirst!)
+    const popfirst! = shift!
 end
 
 # Client property info that gets sent to the server on connection startup

src/convert.jl

@@ -1,18 +1,18 @@
-convert{T<:Union{TAMQPShortStr,TAMQPLongStr}}(::Type{Any}, s::T) = convert(String, s)
-convert{T<:Union{TAMQPShortStr,TAMQPLongStr}}(::Type{String}, s::T) = String(convert(Array{UInt8,1}, s.data))
-convert{T<:Union{TAMQPShortStr,TAMQPLongStr}}(::Type{T}, s::AbstractString) = T(length(s), Vector{UInt8}(s))
+convert(::Type{Any}, s::T)            where {T<:Union{TAMQPShortStr,TAMQPLongStr,TAMQPByteArray}} = convert(String, s)
+convert(::Type{String}, s::T)         where {T<:Union{TAMQPShortStr,TAMQPLongStr,TAMQPByteArray}} = String(convert(Vector{UInt8}, s.data))
+convert(::Type{T}, s::AbstractString) where {T<:Union{TAMQPShortStr,TAMQPLongStr,TAMQPByteArray}} = T(length(s), Vector{UInt8}(s))
 convert(::Type{TAMQPLongStr}, d::Vector{UInt8}) = TAMQPLongStr(length(d), d)
+convert(::Type{TAMQPByteArray}, d::Vector{UInt8}) = TAMQPByteArray(length(d), d)
 
-convert{T}(::Type{TAMQPFieldValue{T}}, v::T) = TAMQPFieldValue{T}(FieldIndicatorMap[T], v)
+convert(::Type{TAMQPFieldValue{T}}, v::T) where {T} = TAMQPFieldValue{T}(FieldIndicatorMap[T], v)
 
-as_fval{T}(v::T) = convert(TAMQPFieldValue{T}, v)
+as_fval(v::T) where {T} = convert(TAMQPFieldValue{T}, v)
 as_fval(v::Dict{String,Any}) = convert(TAMQPFieldValue{TAMQPFieldTable}, convert(TAMQPFieldTable, v))
 as_fval(v::String) = convert(TAMQPFieldValue{TAMQPLongStr}, convert(TAMQPLongStr, v))
 
 convert(::Type{Any}, t::TAMQPFieldTable) = convert(Dict{Any,Any}, t)
-convert{K,V}(::Type{Dict{K,V}}, t::TAMQPFieldTable) = Dict{K,V}(f.name => f.val for f in t.data)
+convert(::Type{Dict{K,V}}, t::TAMQPFieldTable) where {K, V} = Dict{K,V}(f.name => f.val for f in t.data)
 function convert(::Type{TAMQPFieldTable}, d::Dict{String,Any})
-    #@logmsg("converting to TAMQPFieldTable")
     data = TAMQPFieldValuePair[]
     for (n,v) in d
         push!(data, TAMQPFieldValuePair(convert(TAMQPShortStr,n), as_fval(v)))
@@ -21,8 +21,8 @@ function convert(::Type{TAMQPFieldTable}, d::Dict{String,Any})
 end
 
 convert(::Type{Any}, t::TAMQPFieldArray) = convert(Vector, t)
-convert{T}(::Type{Vector{T}}, t::TAMQPFieldArray) = convert(Vector{T}, t.data)
+convert(::Type{Vector{T}}, t::TAMQPFieldArray) where {T} = convert(Vector{T}, t.data)
 
 convert(::Type{Bool}, b::TAMQPBit) = Bool(b.val & 0x1)
 convert(::Type{TAMQPBit}, b::Bool) = TAMQPBit(convert(UInt8, b))
-convert{T<:Integer}(::Type{TAMQPBit}, b::T) = convert(TAMQPBit, Bool(b))
+convert(::Type{TAMQPBit}, b::T) where {T<:Integer} = convert(TAMQPBit, Bool(b))

src/message.jl

@@ -1,4 +1,4 @@
-immutable PropertySpec
+struct PropertySpec
     name::Symbol
     typ::Type
     mask::UInt16
@@ -27,7 +27,7 @@ const PROPERTIES = Dict{Symbol, PropertySpec}(
 const SORTED_PROPERTY_NAMES = [:content_type, :content_encoding, :headers, :delivery_mode, :priority, :correlation_id, :reply_to, :expiration, :message_id, :timestamp, :message_type, :user_id, :app_id, :cluster_id]
 const SORTED_PROPERTIES = [PROPERTIES[k] for k in SORTED_PROPERTY_NAMES]
 
-type Message
+mutable struct Message
     data::Vector{UInt8}
     properties::Dict{Symbol,TAMQPField}