merlin 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 693debc958ce4d513f5fa407075ac12802629b28
-  data.tar.gz: 00cb8ab9c9f0c830879ed55fe666ce8bcd676485
+  metadata.gz: 99927c4f7e68a4548d647701587c43a5869099fb
+  data.tar.gz: 46b5e74154e04298fb3ca5fa3d5c7469d194a3c6
 SHA512:
-  metadata.gz: 6f4503fff50adc805680414d95883093859a5e99b6ea2a32bd3d17f757022513a50f488b192b9bfe149b442610e57fafb0d867be5c8797484b898dbf06719ff3
-  data.tar.gz: 35a383d3bd9463a9961daedbb04abfe711b885da9a907b8f7727401244cf9ceb0ea28761765520bd69c2fad85103f7533524898f46bb481003c3400ede7d056d
+  metadata.gz: 36d5e2084216c8b0ed0adcdc656067259a6a3164d12218dda52f043a3000895d5e4e2344ddb7e98acf3df97d633ddd529d7841007a9ae27ec4570429725216d8
+  data.tar.gz: 971ea3ab0c191be4fc9332d47b9354774746654caa6202db63f6bca251e59285ddd120785c797d8d6b1b5b1bd032ebfdf690f96e85d363b0aee8d89ce900d4e7

data/lib/merlin.rb

@@ -2,23 +2,36 @@ require "merlin/configuration"
 require "merlin/version"
 
 module Merlin
+  def self.__configuration__
+    Merlin::Configuration.new(config_path, env, logger)
+  end
   
   def self.method_missing(*args, &block)
-    logger = @logger || Logger.new(STDOUT)
-    raise "Missing configuration path -> Merlin.config_path = '...'" unless @config_path
-    raise "Missing environment -> Merlin.env = :production" unless @env
-    Merlin::Configuration.new(@config_path, @env, logger).send(*args, &block)
+    raise "Environment not set" unless env
+    __configuration__.send(*args, &block)
   end
 
   def self.config_path=(path)
     @config_path = path  
   end
 
+  def self.config_path
+    @config_path ||= "config/merlin.yml"
+  end
+
   def self.env=(env)
     @env = env
   end
 
+  def self.env
+    @env ||= ENV["RAILS_ENV"]
+  end
+
   def self.logger=(logger)
     @logger = logger
   end
+  
+  def self.logger
+    @logger ||= Logger.new(STDOUT)
+  end
 end

data/lib/merlin/version.rb

@@ -1,3 +1,3 @@
 module Merlin
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: merlin
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Artur Roszczyk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday