Merge branch 'master' into fits-format

Author: SimonDanisch

.gitattributes

@@ -0,0 +1 @@
+test/files/minimal_ascii.rda eol=lf

.travis.yml

@@ -4,6 +4,7 @@ os:
   - osx
 julia:
   - 0.5
+  - 0.6
   - nightly
 notifications:
   email: false

README.md

@@ -93,18 +93,6 @@ Users are encouraged to contribute these definitions to the
 `registry.jl` file of this package, so that information about file
 formats exists in a centralized location.
 
-Handling MIME outputs is similar, except that one also provides the
-type of the object to be written:
-```jl
-mimewritable(::MIME"image/png", img::AbstractArray) = ndims(img) == 2
-add_mime(MIME("image/png"), AbstractArray, :ImageMagick)
-```
-
-In cases where the type is defined in Base julia, such declarations
-can by included in FileIO's `registry` file.  In contrast, when the
-type is defined in a package, that package should call them. Note that
-`add_mime` should be called from the package's `__init__` function.
-
 ## Implementing loaders/savers
 
 In your package, write code like the following:
@@ -144,19 +132,6 @@ automatically even if the code inside the `do` scope throws an error.)
 Conversely, `load(::Stream)` and `save(::Stream)` should not close the
 input stream.
 
-For MIME output, you would implement a method like this:
-```jl
-function Base.writemime(s::Stream{format"ImageMagick"}, ::MIME"image/png", x)
-    io = stream(s)
-    # Do the stuff needed to create the output
-end
-```
-
-It's perfectly acceptable to also create a `Base.writemime(s::IO,
-::MIME"image/png", x)` method.  Such methods will generally take
-precedence over FileIO's generic fallback `writemime` function, and
-therefore in some cases might improve performance.
-
 ## Help
 
 You can get an API overview by typing `?FileIO` at the REPL prompt.

REQUIRE

@@ -1,2 +1,2 @@
 julia 0.5
-Compat 0.17.0
+Compat 0.27.0

appveyor.yml

@@ -1,18 +1,21 @@
 environment:
   matrix:
-  - JULIAVERSION: "julialang/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
-  - JULIAVERSION: "julialang/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
-  - JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"
-  - JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
+  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
+  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
 
 branches:
   only:
     - master
     - /release-.*/
 install:
+  - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
 # Download most recent Julia Windows binary
   - ps: (new-object net.webclient).DownloadFile(
-        $("http://s3.amazonaws.com/"+$env:JULIAVERSION),
+        $env:JULIA_URL,
         "C:\projects\julia-binary.exe")
 # Run installer silently, output to C:\projects\julia
   - C:\projects\julia-binary.exe /S /D=C:\projects\julia

docs/make_docs.jl

@@ -1,5 +1,4 @@
-using FileIO, Compat
-import Compat.String
+using FileIO
 import FileIO: LOAD, SAVE, OSX, OS
 const fs = open(Pkg.dir("FileIO", "docs", "registry.md"), "w")
 
@@ -44,7 +43,7 @@ function add_format{Sym}(::Type{DataFormat{Sym}}, magic, extension, io_libs...)
 end
 
 
-function add_format{sym}(fmt::Type{DataFormat{sym}}, magic::@compat(Union{Tuple,AbstractVector,String}), extension)
+function add_format{sym}(fmt::Type{DataFormat{sym}}, magic::Union{Tuple,AbstractVector,String}, extension)
     println(sym)
 end
 

src/FileIO.jl

@@ -3,7 +3,6 @@ __precompile__()
 module FileIO
 
 using Compat
-using Compat.String
 
 export DataFormat,
        File,
@@ -13,7 +12,6 @@ export DataFormat,
        add_format,
        del_format,
        add_loader,
-       add_mime,
        add_saver,
        filename,
        file_extension,
@@ -31,6 +29,7 @@ import Base.showerror
 include("query.jl")
 include("error_handling.jl")
 include("loadsave.jl")
+include("mimesave.jl")
 include("registry.jl")
 
 """

src/error_handling.jl

@@ -4,8 +4,8 @@ be given the chance to recover from the error.  Reports the library name and an
 LoaderError("ImageMagick", "Foo not available")
 """
 immutable LoaderError <: Exception
-    library::Compat.UTF8String
-    msg::Compat.UTF8String
+    library::String
+    msg::String
 end
 Base.showerror(io::IO, e::LoaderError) = println(io, e.library, " load error: ",
                                                  e.msg, "\n  Will try next loader.")
@@ -16,8 +16,8 @@ be given the chance to recover from the error.  Reports the library name and an
 WriterError("ImageMagick", "Foo not available")
 """
 immutable WriterError <: Exception
-    library::Compat.UTF8String
-    msg::Compat.UTF8String
+    library::String
+    msg::String
 end
 Base.showerror(io::IO, e::WriterError) = println(
     io, e.library, " writer error: ",
@@ -29,7 +29,7 @@ Base.showerror(io::IO, e::WriterError) = println(
 """
 immutable NotInstalledError <: Exception
     library::Symbol
-    message::Compat.UTF8String
+    message::String
 end
 Base.showerror(io::IO, e::NotInstalledError) = println(io, e.library, " is not installed.")
 
@@ -60,7 +60,7 @@ Handles a list of thrown errors after no IO library was found working
 function handle_exceptions(exceptions::Vector, action)
     # first show all errors when there are more then one
     multiple = length(exceptions) > 1
-    println(STDERR, "Error$(multiple?"s" : "") encountered while $action.")
+    println(STDERR, "Error$(multiple ? "s" : "") encountered while $action.")
     if multiple
         println("All errors:")
         for (err, file) in exceptions

src/loadsave.jl

@@ -2,24 +2,31 @@ const sym2loader = Dict{Symbol,Vector{Symbol}}()
 const sym2saver  = Dict{Symbol,Vector{Symbol}}()
 
 function is_installed(pkg::Symbol)
-    isdefined(pkg) && isa(@compat(getfield(Main, pkg)), Module) && return true # is a module defined in Main scope
+    isdefined(Main, pkg) && isa(getfield(Main, pkg), Module) && return true # is a module defined in Main scope
     path = Base.find_in_path(string(pkg)) # hacky way to determine if a Package is installed
     path == nothing && return false
     return isfile(path)
 end
 
 function checked_import(pkg::Symbol)
-    !is_installed(pkg)      && throw(NotInstalledError(pkg, ""))
-    !isdefined(Main, pkg)   && eval(Main, Expr(:import, pkg))
-    return @compat(getfield(Main, pkg))
+    isdefined(Main, pkg) && return getfield(Main, pkg)
+    isdefined(FileIO, pkg) && return getfield(FileIO, pkg)
+    !is_installed(pkg) && throw(NotInstalledError(pkg, ""))
+    !isdefined(Main, pkg) && eval(Main, Expr(:import, pkg))
+    return getfield(Main, pkg)
 end
 
 
 for (applicable_, add_, dict_) in (
         (:applicable_loaders, :add_loader, :sym2loader),
         (:applicable_savers,  :add_saver,  :sym2saver))
     @eval begin
-        $applicable_{sym}(::@compat(Union{Type{DataFormat{sym}}, Formatted{DataFormat{sym}}})) = get($dict_, sym, [:FileIO]) # if no loader is declared, fallback to FileIO
+        function $applicable_{sym}(::Union{Type{DataFormat{sym}}, Formatted{DataFormat{sym}}})
+            if haskey($dict_, sym)
+                return $dict_[sym]
+            end
+            error("No $($applicable_) found for $(sym)")
+        end
         function $add_{sym}(::Type{DataFormat{sym}}, pkg::Symbol)
             list = get($dict_, sym, Symbol[])
             $dict_[sym] = push!(list, pkg)
@@ -42,7 +49,7 @@ the magic bytes are essential.
 - `load(File(format"PNG",filename))` specifies the format directly, and bypasses inference.
 - `load(f; options...)` passes keyword arguments on to the loader.
 """
-load(s::@compat(Union{AbstractString,IO}), args...; options...) =
+load(s::Union{AbstractString,IO}, args...; options...) =
     load(query(s), args...; options...)
 
 """
@@ -51,9 +58,13 @@ trying to infer the format from `filename`.
 - `save(Stream(format"PNG",io), data...)` specifies the format directly, and bypasses inference.
 - `save(f, data...; options...)` passes keyword arguments on to the saver.
 """
-save(s::@compat(Union{AbstractString,IO}), data...; options...) =
+save(s::Union{AbstractString,IO}, data...; options...) =
     save(query(s), data...; options...)
 
+function save(s::Union{AbstractString,IO}; options...)
+    data -> save(s, data; options...)
+end
+
 # Forced format
 function save{sym}(df::Type{DataFormat{sym}}, f::AbstractString, data...; options...)
     libraries = applicable_savers(df)

src/mimesave.jl

@@ -0,0 +1,45 @@
+module MimeWriter
+
+using ..FileIO: File, @format_str
+
+function save(file::File{format"PNG"}, data)
+    if mimewritable("image/png", data)
+        open(file.filename, "w") do s
+            show(IOContext(s, :full_fidelity=>true), "image/png", data)
+        end
+    else
+        throw(ArgumentError("Argument does not support conversion to png."))
+    end
+end
+
+function save(file::File{format"SVG"}, data)
+    if mimewritable("image/svg+xml", data)
+        open(file.filename, "w") do s
+            show(IOContext(s, :full_fidelity=>true), "image/svg+xml", data)
+        end
+    else
+        throw(ArgumentError("Argument does not support conversion to svg."))
+    end
+end
+
+function save(file::File{format"PDF"}, data)
+    if mimewritable("application/pdf", data)
+        open(file.filename, "w") do s
+            show(IOContext(s, :full_fidelity=>true), "application/pdf", data)
+        end
+    else
+        throw(ArgumentError("Argument does not support conversion to pdf."))
+    end
+end
+
+function save(file::File{format"EPS"}, data)
+    if mimewritable("application/eps", data)
+        open(file.filename, "w") do s
+            show(IOContext(s, :full_fidelity=>true), "application/eps", data)
+        end
+    else
+        throw(ArgumentError("Argument does not support conversion to eps."))
+    end
+end
+
+end