lib/cupcakinator/base.rb in cupcakinator-0.0.4 vs lib/cupcakinator/base.rb in cupcakinator-1.0.0

@@ -4,13 +4,11 @@
 
   module Base
 
 
     def self.included(other)
-      raise "deprecated: don't include Cupcakinator::Base directly"
-      #puts "included (via Base) in #{other}"
-      #other.extend ClassMethods
+      raise I18n.t('error.deprecation.include_base')
     end
 
 
     def self.extend_object(other)
       class_eval <<-ENDOFCLASSDEF
@@ -73,18 +71,23 @@
     end
 
 
     def _cupcakinator_config
       if @cupcakinator_config.nil?
-        filename = File.join(_cupcakinator_options[:dir], _cupcakinator_options[:file])
-        yaml_config = YAML.load_file(filename)
-        @cupcakinator_config = Cupcakinator::Config.new(yaml_config)
+        load_cupcakinator_config
       end
       @cupcakinator_config
+    end
+
+
+    def load_cupcakinator_config
+      filename = File.join(_cupcakinator_options[:dir], _cupcakinator_options[:file])
+      yaml_config = YAML.load_file(filename)
+      @cupcakinator_config = Cupcakinator::Config.new(yaml_config)
     rescue Errno::ENOENT
-      raise Cupcakinator::ConfigFileNotFoundError.new("Can't find Cupcakinator configured config file #{filename}\nCupcakinator options:\n#{_cupcakinator_options}")
+      raise Cupcakinator::ConfigFileNotFoundError.new(filename, _cupcakinator_options)
     rescue Psych::SyntaxError => e
-      raise Cupcakinator::ConfigFileInvalidError.new("Cupcakinator configure config file #{filename} invalid\nOriginal error: #{e.message}")
+      raise Cupcakinator::ConfigFileInvalidError.new(filename, e.message)
     end
 
 
     def method_missing(original_method, *args)
       if original_method.to_s == _cupcakinator_options[:method].to_s
\ No newline at end of file