Fix cloudex configuration

config/config.exs

@@ -53,6 +53,12 @@ config :code_corps,
 config :segment,
   write_key: System.get_env("SEGMENT_WRITE_KEY")
 
+config :code_corps, :cloudex, Cloudex
+config :cloudex,
+  api_key: System.get_env("CLOUDEX_API_KEY"),
+  secret: System.get_env("CLOUDEX_SECRET"),
+  cloud_name: System.get_env("CLOUDEX_CLOUD_NAME")
+
 # Configures random icon color generator
 config :code_corps, :icon_color_generator, CodeCorps.RandomIconColor.Generator
 

config/dev.exs

@@ -62,11 +62,10 @@ config :code_corps, CodeCorps.Mailer,
 config :code_corps,
   postmark_receipt_template: "123"
 
-# If the dev environment has no CLOUDEX_API_KEY set, we want the app to still run,
-# with cloudex in test API mode
+# If the dev environment has no CLOUDEX_API_KEY set, we want the app
+# to still run, with cloudex in test API mode
 if System.get_env("CLOUDEX_API_KEY") == nil do
-  config :cloudex, :cloudinary_api, Cloudex.CloudinaryApi.Test
-  config :cloudex, api_key: "test_key", secret: "test_secret", cloud_name: "test_cloud_name"
-
   IO.puts("NOTE: No Cloudex configuration found. Cloudex is runnning in test mode.")
+  config :code_corps, :cloudex, CloudexTest
+  config :cloudex, api_key: "test_key", secret: "test_secret", cloud_name: "test_cloud_name"
 end

config/test.exs

@@ -50,5 +50,5 @@ config :code_corps, CodeCorps.Mailer,
 config :code_corps,
   postmark_receipt_template: "123"
 
-config :cloudex, :cloudinary_api, Cloudex.CloudinaryApi.Test
+config :code_corps, :cloudex, CloudexTest
 config :cloudex, api_key: "test_key", secret: "test_secret", cloud_name: "test_cloud_name"

lib/code_corps/helpers/cloudex_test.ex → lib/code_corps/cloudex/cloudex_test.ex

@@ -1,4 +1,4 @@
-defmodule Cloudex.CloudinaryApi.Test do
+defmodule CloudexTest do
   @moduledoc """
   Testing stub for `Cloudex`,
 

lib/code_corps/helpers/cloudinary_url.ex → lib/code_corps/cloudex/cloudinary_url.ex

@@ -1,6 +1,6 @@
-defmodule CodeCorps.Helpers.CloudinaryUrl do
+defmodule CodeCorps.Cloudex.CloudinaryUrl do
 
-  @cloudex Application.get_env(:cloudex, :cloudinary_api)
+  @cloudex Application.get_env(:code_corps, :cloudex)
 
   def for(nil, _options, version, default_color, type) do
     "#{Application.get_env(:code_corps, :asset_host)}/icons/#{type}_default_#{version}_#{default_color}.png"

priv/repo/structure.sql

@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.1
--- Dumped by pg_dump version 9.5.1
+-- Dumped from database version 9.5.4
+-- Dumped by pg_dump version 9.5.4
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;

test/lib/code_corps/helpers/cloudinary_url_test.exs → test/lib/code_corps/cloudex/cloudinary_url_test.exs

@@ -1,15 +1,16 @@
-defmodule CodeCorps.Helpers.CloudinaryUrlTest do
+defmodule CodeCorps.Cloudex.CloudinaryUrlTest do
+  alias CodeCorps.Cloudex.CloudinaryUrl
   use ExUnit.Case, async: true
 
   test "calls Cloudex.Url.for with correct arguments" do
     expected_args = {:test_public_id, %{test_option: nil}}
-    args = CodeCorps.Helpers.CloudinaryUrl.for(:test_public_id, %{test_option: nil}, nil, nil, nil)
+    args = CloudinaryUrl.for(:test_public_id, %{test_option: nil}, nil, nil, nil)
     assert expected_args == args
   end
 
   test "returns correct url if called without public_id" do
     expected_url = "#{Application.get_env(:code_corps, :asset_host)}/icons/type1_default_version1_color1.png"
-    url = CodeCorps.Helpers.CloudinaryUrl.for(nil, %{}, "version1", "color1", "type1")
+    url = CloudinaryUrl.for(nil, %{}, "version1", "color1", "type1")
     assert expected_url == url
   end
 end

web/views/organization_view.ex

@@ -1,4 +1,5 @@
 defmodule CodeCorps.OrganizationView do
+  alias CodeCorps.Cloudex.CloudinaryUrl
   use CodeCorps.PreloadHelpers, default_preloads: [:slugged_route, :stripe_connect_account, :organization_memberships, :projects]
   use CodeCorps.Web, :view
   use JaSerializer.PhoenixView
@@ -15,10 +16,10 @@ defmodule CodeCorps.OrganizationView do
   has_many :projects, serializer: CodeCorps.ProjectView, identifiers: :always
 
   def icon_large_url(organization, _conn) do
-    CodeCorps.Helpers.CloudinaryUrl.for(organization.cloudinary_public_id, %{crop: "fill", height: 500, width: 500}, "large", organization.default_color, "organization")
+    CloudinaryUrl.for(organization.cloudinary_public_id, %{crop: "fill", height: 500, width: 500}, "large", organization.default_color, "organization")
   end
 
   def icon_thumb_url(organization, _conn) do
-    CodeCorps.Helpers.CloudinaryUrl.for(organization.cloudinary_public_id, %{crop: "fill", height: 100, width: 100}, "thumb", organization.default_color, "organization")
+    CloudinaryUrl.for(organization.cloudinary_public_id, %{crop: "fill", height: 100, width: 100}, "thumb", organization.default_color, "organization")
   end
 end

web/views/project_view.ex

@@ -1,4 +1,5 @@
 defmodule CodeCorps.ProjectView do
+  alias CodeCorps.Cloudex.CloudinaryUrl
   alias CodeCorps.StripeService.Validators.ProjectCanEnableDonations
 
   use CodeCorps.PreloadHelpers,
@@ -36,10 +37,10 @@ defmodule CodeCorps.ProjectView do
   end
 
   def icon_large_url(project, _conn) do
-    CodeCorps.Helpers.CloudinaryUrl.for(project.cloudinary_public_id, %{crop: "fill", height: 500, width: 500}, "large", project.default_color, "project")
+    CloudinaryUrl.for(project.cloudinary_public_id, %{crop: "fill", height: 500, width: 500}, "large", project.default_color, "project")
   end
 
   def icon_thumb_url(project, _conn) do
-    CodeCorps.Helpers.CloudinaryUrl.for(project.cloudinary_public_id, %{crop: "fill", height: 100, width: 100}, "thumb", project.default_color, "project")
+    CloudinaryUrl.for(project.cloudinary_public_id, %{crop: "fill", height: 100, width: 100}, "thumb", project.default_color, "project")
   end
 end

web/views/user_view.ex

@@ -1,4 +1,6 @@
 defmodule CodeCorps.UserView do
+  alias CodeCorps.Cloudex.CloudinaryUrl
+
   use CodeCorps.PreloadHelpers,
       default_preloads: [
         :slugged_route, :stripe_connect_subscriptions, :stripe_platform_card, :stripe_platform_customer,
@@ -23,11 +25,11 @@ defmodule CodeCorps.UserView do
   has_many :user_skills, serializer: CodeCorps.UserSkillView, identifiers: :always
 
   def photo_large_url(user, _conn) do
-    CodeCorps.Helpers.CloudinaryUrl.for(user.cloudinary_public_id, %{crop: "fill", height: 500, width: 500}, "large", user.default_color, "user")
+    CloudinaryUrl.for(user.cloudinary_public_id, %{crop: "fill", height: 500, width: 500}, "large", user.default_color, "user")
   end
 
   def photo_thumb_url(user, _conn) do
-    CodeCorps.Helpers.CloudinaryUrl.for(user.cloudinary_public_id, %{crop: "fill", height: 100, width: 100}, "thumb", user.default_color, "user")
+    CloudinaryUrl.for(user.cloudinary_public_id, %{crop: "fill", height: 100, width: 100}, "thumb", user.default_color, "user")
   end
 
   @doc """