lib/voltos.rb in voltos-0.2.0 vs lib/voltos.rb in voltos-0.2.1

@@ -8,11 +8,11 @@
     attr_accessor :configuration
   end
 
   def self.configure
     self.configuration ||= Configuration.new
-    yield(configuration)
+    yield(configuration) if block_given?
   end
 
   def self.load
     json_str = Curl.get("#{Voltos.configuration.api_url}/credentials") do |http|
       http.headers["Authorization"] = "Token token=#{Voltos.configuration.api_key}"
@@ -56,13 +56,22 @@
     attr_accessor :status
     attr_accessor :message
 
     def initialize
       @api_url = ENV["VOLTOS_API_URL"] || "https://voltos.online/v1"
-      @api_key = ENV["VOLTOS_API_KEY"]
+      @api_key = ENV["VOLTOS_KEY"]
     end
   end
 end
 
-if ENV["VOLTOS_API_KEY"]
+begin
+  if Rails
+    require 'voltos/rails'
+  end
+rescue NameError
+  # Rails not loaded
+end
+
+Voltos.configure
+if ENV["VOLTOS_KEY"]
   Voltos.load
 end