Skip to content

Commit

Permalink
Merge pull request nirvana#15 from HashNuke/elixir-update
Browse files Browse the repository at this point in the history
Update to elixir 1.0.2
  • Loading branch information
n1rvana committed Nov 11, 2014
2 parents e89ff14 + e4fe65a commit 3f8528b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
4 changes: 2 additions & 2 deletions lib/transcoder.ex
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ defmodule Couchie.Transcoder do
do: do_encode_value(flag ^^^ @str_flag, value)

def do_encode_value(flag, value) when (flag &&& @json_flag) === @json_flag,
do: do_encode_value(flag ^^^ @json_flag, JSON.encode!(value))
do: do_encode_value(flag ^^^ @json_flag, Poison.encode!(value))

def do_encode_value(flag, value) when (flag &&& @raw_flag) === @raw_flag,
do: do_encode_value(flag ^^^ @raw_flag, :erlang.term_to_binary(value))
Expand All @@ -29,7 +29,7 @@ defmodule Couchie.Transcoder do
do: decode_value(flag ^^^ @raw_flag, :erlang.binary_to_term(value))

def decode_value(flag, value) when (@json_flag &&& flag) === @json_flag,
do: decode_value(flag ^^^ @json_flag, JSON.decode!(value, keys: :atoms))
do: decode_value(flag ^^^ @json_flag, Poison.decode!(value, keys: :atoms))

def decode_value(flag, value) when (@str_flag &&& flag) === @str_flag,
do: decode_value(flag ^^^ @str_flag, value)
Expand Down
8 changes: 4 additions & 4 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@ defmodule Couchie.Mixfile do
@doc "Project Details"
def project do
[ app: :couchie,
elixir: "~> 0.15.0",
elixir: "~> 1.0.2",
version: "0.0.6",
deps: deps ]
end

def application do
[
applications: [:cberl] #, :ibrowse
]
applications: [:cberl]
]
end

# Returns the list of dependencies in the format:
# {:erlmc, "0.1", git: "https://github.com/n1rvana/erlmc.git"}
defp deps do
[
{:cberl, github: "chitika/cberl"}, #chitika is authoritative source
{:jazz, github: "meh/jazz"}
{:poison, ">= 1.2.0"}
]
end
end
4 changes: 0 additions & 4 deletions mix.lock

This file was deleted.

0 comments on commit 3f8528b

Please sign in to comment.