Merge b94422b into 140ed86

codeforamerica · Jan 31, 2015 · fc4c7d3 · fc4c7d3
2 parents 140ed86 + b94422b
commit fc4c7d3
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 0 deletions.
diff --git a/.env b/.env
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,6 @@
 /log/*
 !/log/.keep
 /tmp
+
+my.env
+
diff --git a/Gemfile b/Gemfile
@@ -13,6 +13,8 @@ gem 'pg'
 gem 'rails_12factor'
 gem 'rails_admin'
 gem 'validates_formatting_of'
+gem 'forecast_io'
+
 
 platforms :ruby_18 do
   gem 'fastercsv'
@@ -29,6 +31,7 @@ end
 
 group :development, :test do
   gem 'pry'
+  gem 'dotenv-rails'
 end
 
 group :production do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -67,17 +67,27 @@ GEM
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
     docile (1.1.5)
+    dotenv (1.0.2)
+    dotenv-rails (1.0.2)
+      dotenv (= 1.0.2)
     erubis (2.7.0)
     execjs (2.2.2)
+    faraday (0.9.1)
+      multipart-post (>= 1.2, < 3)
     fastercsv (1.5.5)
     font-awesome-rails (4.3.0.0)
       railties (>= 3.2, < 5.0)
+    forecast_io (2.0.0)
+      faraday
+      hashie
+      multi_json
     geokit (1.9.0)
       multi_json (>= 1.3.2)
     globalid (0.3.0)
       activesupport (>= 4.1.0)
     haml (4.0.6)
       tilt
+    hashie (3.3.2)
     hike (1.2.3)
     http_accept_language (2.0.5)
     i18n (0.7.0)
@@ -100,6 +110,7 @@ GEM
     mini_portile (0.6.2)
     minitest (5.5.1)
     multi_json (1.10.1)
+    multipart-post (2.0.0)
     nested_form (0.3.2)
     netrc (0.10.2)
     nokogiri (1.6.6.2)
@@ -232,7 +243,9 @@ DEPENDENCIES
   arel
   coveralls
   devise
+  dotenv-rails
   fastercsv
+  forecast_io
   geokit
   haml
   http_accept_language

diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -1,3 +1,6 @@
+require 'dotenv'
+Dotenv.load '.env','my.env'
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

diff --git a/config/environments/test.rb b/config/environments/test.rb
@@ -1,3 +1,6 @@
+require 'dotenv'
+Dotenv.load '.env','my.env'
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

diff --git a/config/initializers/forecast_io.rb b/config/initializers/forecast_io.rb
@@ -0,0 +1,3 @@
+ForecastIO.configure do |configuration|
+  configuration.api_key = ENV['FORECAST_IO_API_KEY']
+end
diff --git a/my-template.env b/my-template.env
@@ -0,0 +1,7 @@
+# Template for my.env file
+
+# Rename this file to .env, and set the envirionment variables to your specific values.
+# This file will be ignored by Git, once renamed.
+
+
+FORECAST_IO_API_KEY="Get a key from https://developer.forecast.io/"