Create cid

.travis.yml

@@ -0,0 +1,7 @@
+language: elixir
+elixir:
+  - 1.8
+env:
+  - MIX_ENV=test
+script:
+  - mix test

lib/cid.ex

@@ -1,38 +1,87 @@
 defmodule Cid do
   @moduledoc """
-  Returns a SHA512 transformed to Base64, remove ambiguous chars then sub-string
+  Provides a way for a user to turn a String, Map or Struct into a CID that
+  is identical to one what will be returned from IPFS if the same data is
+  added.
+
+  Currently only produces a default v1 CID.
+  Currently only uses the "raw" codec
+  Data provided must be under 256Kb in order for the CID to match the one
+  returned by IPFS
   """
 
   @doc """
-  make/2 create a SHA512 hash from the given input and return the require length
-  note: we remove "ambiguous" characters so _humans_ can type the hash without
-  getting "confused" this might not be required, but is to match the original
-  "Hits" implementation.
+  Returns a CID that identical to one returned by IPFS if given the same data.
+  Can take a String, Map or Struct as an argument.
 
-  ## Parameters
+  ## Examples
 
-  - input: String the string to be hashed.
-  - length: Number the length of string required
+    iex> Cid.cid("hello")
+    "zb2rhcc1wJn2GHDLT2YkmPq5b69cXc2xfRZZmyufbjFUfBkxr"
 
-  Returns String hash of desired length.
+    iex> Cid.cid(%{key: "value"})
+    "zb2rhkN6szWhAmBFjjP8RSczv2YVNLnG1tz1Q7FyfEp8LssNZ"
   """
-  def make(input) when is_map(input) do
-    input |> stringify_map_values |> make
+  def cid(value) do
+    value
+    |> create_multihash()
+    |> create_cid()
+  end
+
+  # if create_multihash is called with a struct, the struct is converted into a
+  # map and then create_multihash is called again
+  defp create_multihash(%_{} = struct) do
+    struct
+    |> Map.from_struct()
+    |> create_multihash()
   end
 
-  def make(input, length \\ 32) do
-    hash1 = :crypto.hash(:sha512, input)
-    {:ok, <<_multihash_code, _length, hash2::binary>>} = Multihash.encode(:sha2_512, hash1)
+  # if create_multihash is called with a map the map is converted into a JSON
+  # string and then create_multihash is called again
+  defp create_multihash(map) when is_map(map) do
+    map
+    |> Jason.encode!()
+    |> create_multihash()
+  end
+
+  # if create_multihash is called with a string, the string has a new line added
+  # to the end (as that's what IPFS appears to be doing based on tests), then
+  # the string is converted into a multihash
+  defp create_multihash(str) when is_binary(str) do
+    str = add_new_line(str)
+    digest = :crypto.hash(:sha256, str)
+    {:ok, multihash} = Multihash.encode(:sha2_256, digest)
 
-    hash2
-    |> Base.encode64()
-    |> String.replace(~r/[Il0oO=\/\+]/, "", global: true)
-    |> String.slice(0..(length - 1))
+    multihash
   end
 
-  def stringify_map_values(input_map) do
-    Enum.sort(Map.keys(input_map)) # sort map keys for consistent ordering
-    |> Enum.map(fn (x) -> Map.get(input_map, x) end)
-    |> Enum.join("")
+  # if create_multihash is called something that is not a string, map or struct
+  # then it returns an error.
+  defp create_multihash(_), do: {:error, "invalid data type"}
+
+  # if an error is passed in return error message
+  defp create_cid({:error, msg}), do: msg
+
+  # takes a multihash and retuns a CID
+  defp create_cid(multihash) when is_binary(multihash) do
+    multihash
+    |> create_cid_suffix()
+    |> B58.encode58()
+    |> add_multibase_prefix()
+  end
+
+  # takes a multihash and returns the suffix
+  # currently version is hardcoded to 1
+  # and multicodec-packed-content-type is hardcoded to "raw" ("U" == <<85>>)
+  # <version><multicodec-packed-content-type><multihash>
+  defp create_cid_suffix(multihash), do: <<1>> <> "U" <> multihash
+
+  # adds the multibase prefix to the suffix (<version><mc><mh>)
+  defp add_multibase_prefix(suffix), do: "z" <> suffix
+
+  # adds new line to the end of string. (exists because all tests with ipfs
+  # appeared to do the same thing.)
+  defp add_new_line(str) do
+    str <> "\n"
   end
 end

mix.exs

@@ -1,9 +1,9 @@
-defmodule Rid.MixProject do
+defmodule Cid.MixProject do
   use Mix.Project
 
   def project do
     [
-      app: :rid,
+      app: :cid,
       version: "0.1.0",
       elixir: "~> 1.7",
       start_permanent: Mix.env() == :prod,
@@ -21,7 +21,9 @@ defmodule Rid.MixProject do
   # Run "mix help deps" to learn about dependencies.
   defp deps do
     [
-      {:ex_multihash, "~> 2.0"}
+      {:ex_multihash, "~> 2.0"},
+      {:jason, "~> 1.1"},
+      {:basefiftyeight, "~> 0.1.0"} # Currenly building our own version of this here https://git.io/fhPaK. Can replace when it is ready
     ]
   end
 end

mix.lock

@@ -1,3 +1,5 @@
 %{
+  "basefiftyeight": {:hex, :basefiftyeight, "0.1.0", "3d48544743bf9aab7ab02aed803ac42af77acf268c7d8c71d4f39e7fa85ee8d3", [:mix], [], "hexpm"},
   "ex_multihash": {:hex, :ex_multihash, "2.0.0", "7fb36f842a2ec1c6bbba550f28fcd16d3c62981781b9466c9c1975c43d7db43c", [:mix], [], "hexpm"},
+  "jason": {:hex, :jason, "1.1.2", "b03dedea67a99223a2eaf9f1264ce37154564de899fd3d8b9a21b1a6fd64afe7", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm"},
 }

test/cid_test.exs

@@ -2,17 +2,24 @@ defmodule CidTest do
   use ExUnit.Case
   doctest Cid
 
-  test "Creates a deterministic Content ID from Elixir String" do
-    assert Cid.make("Elixir") == "NSqJspBr2u1F6z1DhcR2cnQAxLdQZBLk"
-  end
+  defstruct [:a]
 
-  test "Create a CID from a Map" do
-    map = %{cat: "Meow", dog: "Woof", fox: "What Does The Fox Say?"}
-    assert Cid.make(map) == "GdrVnsLSdxRphXgQgNsmq1FDyRXAySXT"
-  end
+  describe "Testing ex_cid function" do
 
-  test "Cid.make(\"hello world\")" do
-    assert Cid.make("hello world") == "MJ7MSJwS1utMxA9QyQLytNDtd5RGnx6m"
-  end
+    test "ExCid.cid returns the same CID as IPFS when given a string" do
+      assert "zb2rhkpbfTBtUV1ESqSScrUre8Hh77fhCKDLmX21rCo5xp8J9" == Cid.cid("Hello World")
+    end
 
+    test "ExCid.cid returns the same CID as IPFS when given a map" do
+      assert "zb2rhbYzyUJP6euwn89vAstfgG2Au9BSwkFGUJkbujWztZWjZ" == Cid.cid(%{a: "a"})
+    end
+
+    test "ExCid.cid returns the same CID as IPFS when given a struct" do
+      assert "zb2rhbYzyUJP6euwn89vAstfgG2Au9BSwkFGUJkbujWztZWjZ" == Cid.cid(%__MODULE__{a: "a"})
+    end
+
+    test "DwylCid.cid returns an error if given invalid data type" do
+      assert Cid.cid(2) == "invalid data type"
+    end
+  end
 end