librato-rails 0.3.0 → 0.3.1

data/README.md

@@ -7,6 +7,8 @@ Report key statistics for your Rails app to [Librato Metrics](https://metrics.li
 
 **NOTE: This is currently in alpha development and is not yet officially supported**
 
+**IMPORTANT NOTE: If you are currently using a version prior to the rename to librato-rails, note that the env variable names for configuration and the name of the config files have changed. See the new names in configuration, below.**
+
 ## Installation
 
 In your `Gemfile` add:
@@ -22,8 +24,8 @@ If you don't have a Metrics account already, [sign up](https://metrics.librato.c
 Create a `config/librato.yml` like the following:
 
     production:
-      email: <your-email>
-      api_key: <your-api-key>
+      user: <your-email>
+      token: <your-api-key>
       
 OR provide `LIBRATO_METRICS_USER` and `LIBRATO_METRICS_TOKEN` environment variables. If both env variables and a config file are present, environment variables will take precendence.
 

data/lib/librato/rails/version.rb

@@ -1,5 +1,5 @@
 module Librato
   module Rails
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/lib/librato/rails.rb

@@ -19,15 +19,15 @@ module Librato
 
   module Rails
     extend SingleForwardable
-    CONFIG_SETTABLE = %w{api_key email flush_interval prefix source}
+    CONFIG_SETTABLE = %w{user token flush_interval prefix source}
     FORKING_SERVERS = [:unicorn, :passenger]
 
     mattr_accessor :config_file
     self.config_file = 'config/librato.yml'
 
     # config options
-    mattr_accessor :api_key
-    mattr_accessor :email
+    mattr_accessor :user
+    mattr_accessor :token
     mattr_accessor :flush_interval
     mattr_accessor :prefix
 
@@ -64,8 +64,8 @@ module Librato
             settable.each { |key| self.send("#{key}=", env_specific[key]) }
           end
         end
-        self.api_key = ENV['LIBRATO_METRICS_TOKEN'] if ENV['LIBRATO_METRICS_TOKEN']
-        self.email = ENV['LIBRATO_METRICS_USER'] if ENV['LIBRATO_METRICS_USER']
+        self.token = ENV['LIBRATO_METRICS_TOKEN'] if ENV['LIBRATO_METRICS_TOKEN']
+        self.user = ENV['LIBRATO_METRICS_USER'] if ENV['LIBRATO_METRICS_USER']
       end
 
       # check to see if we've forked into a process where a worker
@@ -181,7 +181,7 @@ module Librato
       def prepare_client
         check_config
         client = Librato::Metrics::Client.new
-        client.authenticate email, api_key
+        client.authenticate user, token
         client.api_endpoint = @api_endpoint if @api_endpoint
         client.custom_user_agent = user_agent
         client