cupcakinator 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef9ce571b53c125b293184143541e24ec299eadd
-  data.tar.gz: 6d108263870627cbdd02e5ae943112a907cf3997
+  metadata.gz: 3745cec57b86dfd91a0e85eb8969710e59ab49b1
+  data.tar.gz: 320afa16a00e277cbfb3a3e23c657643a7c8fb53
 SHA512:
-  metadata.gz: baf0a1919f69fb660b916cc70f719129f2131cb86bb249404fb51082c7110e7d1b49dd4ab190eb20d5d439f8bce3ba8684cdf7faee5a72dad462caf9c7bf2e54
-  data.tar.gz: 916184623bb21a1186488ee94408fe18ae53643e1d5dc545b63908d99cc319957168070656f17c1ff9718c8c6931a6eb1701f6cccf8c1dcd6833d42bd0a659cd
+  metadata.gz: e625ed3d61e05765f104ce598fc128b71742d8a6241236f8ee090098221ed4abc942b77797ac4cae2fc0169e2d3dc72b29d5cfee71e334b361dc0d2ba8f9151c
+  data.tar.gz: ad29ae6175a559e31a58a2eb80251e237b8b528461cfe35961cb3f68ddde7fe2243d3ccd2a079212b1a49047a4828e206f1d98558f03eb710d4d9de115844503

data/lib/cupcakinator/base.rb

@@ -28,7 +28,8 @@ module Cupcakinator
     # @option options.last [Hash] :file The configuration filename
     # @option options.last [Hash] :method The method used to access the configuration options
     # @option options.last [Hash] :root_key A key in the top level of the config file that will become the base
-    # @example  Default usage - Foo will load ./config/config.yml into a method named 'config'
+    # @option options.last [Hash] :allow_missing Allows the config file to be missing, config will return empty Hash
+    # @example  Default usage - Foo will load ./config/config.yml into a method named 'config' and raise on missing
     #   class Foo
     #     include cupcakinator
     #     cupcakinate
@@ -67,6 +68,15 @@ module Cupcakinator
     #   >> puts Foo.new.config
     #   { :foo => 'bar' }
     #
+    # @example with no config file
+    #
+    #   class Foo
+    #     include cupcakinator
+    #     cupcakinate dir: Rails.root.join('config'), file: 'foo_config.yml', allow_missing: true
+    #   end
+    #   >> puts Foo.config
+    #   {}
+    #
     def cupcakinate(*options)
       if !options.empty?
         default_options = _cupcakinator_options
@@ -101,7 +111,11 @@ module Cupcakinator
         @cupcakinator_config = Cupcakinator::Config.new(yaml_config)
       end
     rescue Errno::ENOENT
-      raise Cupcakinator::ConfigFileNotFoundError.new(filename, _cupcakinator_options)
+      if (_cupcakinator_options.allow_missing rescue false)
+        @cupcakinator_config = Cupcakinator::Config.new({})
+      else
+        raise Cupcakinator::ConfigFileNotFoundError.new(filename, _cupcakinator_options)
+      end
     rescue Psych::SyntaxError => e
       raise Cupcakinator::ConfigFileInvalidError.new(filename, e.message)
     end

data/lib/cupcakinator/config.rb

@@ -7,12 +7,16 @@ module Cupcakinator
   # method
   # dir
   # file
+  # root_key
+  # allow_missing
   class Config < Hash
     include Hashie::Extensions::MethodAccess
     include Hashie::Extensions::Coercion
 
     coerce_value Hash, Config
 
+    # @param [Hash] h
+    # @return Cupcakinator::Config
     def initialize(h={})
       super
       h.each_pair do |k,v|
@@ -20,6 +24,22 @@ module Cupcakinator
       end
     end
 
+
+    # @return [Hash] returns uncoerced Hash
+    def to_h
+      convert_config_to_hash(self.dup)
+    end
+
+
+    private
+
+
+    def convert_config_to_hash(c)
+      h = Hash.new
+      c.each_pair{ |key, value| Config === value ? h[key] = convert_config_to_hash(value) : h[key] = value }
+      h
+    end
+
   end
 
 end

data/lib/cupcakinator/version.rb

@@ -1,3 +1,3 @@
 module Cupcakinator
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/spec/cupcakinator/base_spec.rb

@@ -84,6 +84,42 @@ describe Cupcakinator::Base do
       expect{ CupcakinatorBaseSpecNoExist.load_cupcakinator_config }.to raise_error(Cupcakinator::ConfigFileNotFoundError)
     end
 
+    it 'should raise ConfigFileNotFoundError if config file is not found and allow_missing is true' do
+      class CupcakinatorBaseSpecNoExist
+        include Cupcakinator
+
+        cupcakinate file: 'no_exist.yml', allow_missing: false
+      end
+      YAML.stub(:load_file).with('./no_exist.yml').and_raise(Errno::ENOENT)
+      YAML.stub(:load_file).with(anything).and_call_original
+
+      expect{ CupcakinatorBaseSpecNoExist.load_cupcakinator_config }.to raise_error(Cupcakinator::ConfigFileNotFoundError)
+    end
+
+    it 'should not raise ConfigFileNotFoundError if config file is not found and allow_missing is true' do
+      class CupcakinatorBaseSpecNoExist
+        include Cupcakinator
+
+        cupcakinate file: 'no_exist.yml', allow_missing: true
+      end
+      YAML.stub(:load_file).with('./no_exist.yml').and_raise(Errno::ENOENT)
+      YAML.stub(:load_file).with(anything).and_call_original
+
+      expect{ CupcakinatorBaseSpecNoExist.load_cupcakinator_config }.to_not raise_error(Cupcakinator::ConfigFileNotFoundError)
+    end
+
+    it 'should return empty Config if config file is not found and allow_missing is true' do
+      class CupcakinatorBaseSpecNoExist
+        include Cupcakinator
+
+        cupcakinate file: 'no_exist.yml', allow_missing: true
+      end
+      YAML.stub(:load_file).with('./no_exist.yml').and_raise(Errno::ENOENT)
+      YAML.stub(:load_file).with(anything).and_call_original
+
+      expect(CupcakinatorBaseSpecNoExist.config.to_h).to eq({})
+    end
+
     it 'should raise ConfigFileInvalidError if config file is not found' do
       dummy = double.as_null_object
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cupcakinator
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Bryan Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie