figly 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42364b75b7532c60705dbac8b6ef845d5c050fd1
-  data.tar.gz: 967175d1098a36cb2667ef092b3c5e9af0f681cf
+  metadata.gz: ca71726e5c151db9b95fbaac7d18642457640496
+  data.tar.gz: 8d4950a3615f85f555e7191def270af19dd03b58
 SHA512:
-  metadata.gz: 55611aa6fd7c901dae7cb0d521840b7587f2273f1f14877cb225737a07d40a09cf7cc4f28a077182c18c41ba85f4100cf172cce29bfb543c9661b7ba42a82254
-  data.tar.gz: 40a0f3233a2544f8b95a3cc5a22560ddc96c46ce85c0609b021de7f3aa48d69eb3b0dffc43292aa5e067f1ae98420c0e9863aa9e80ba525699b00e58933109c0
+  metadata.gz: bd31fed56870c2e2ee55291f99841ad8503847471d6c8488f5302dd46b827f2fc8cf3a9dac627b56647ba991f5b7943444f089d4626ce7c953d569f144aa73d3
+  data.tar.gz: 4d3e715cfc2c92d05b99fe92540222a010bc056838c74ee8a30ce49a66bff32d3f60699eacc0f242a50b7d54f4b7dcb7b16e8b562e261e37eaeea1b426af267d

data/lib/figly.rb

@@ -2,26 +2,66 @@ require "figly/version"
 require "figly/settings"
 
 module Figly
-  def self.setup(path)
+  class ParserError < StandardError; end
+  class UnsupportedError < StandardError; end
+
+  def self.load_file(path)
     raise "File does not exist: #{path}" unless File.exists?(path)
     ext = File.extname(path)
-    @@data = case ext
+    data = case ext
     when '.toml'
-      require 'toml'
-      TOML.load_file(path)
+      begin
+        require 'toml'
+        # HACK: TOML captures Parslet errors and puts them so they get swallowed
+        # here we redirect stdout to an IO buffer that we can read from and test
+        # that the value doesn't match an error
+        old_stdout = $stdout
+        $stdout = StringIO.new('','w')
+        d = TOML.load_file(path)
+        cap = $stdout.string
+        raise ParserError, cap if cap =~ /^Failed to match/
+        $stdout = old_stdout
+        d
+      rescue Exception => e
+        raise ParserError, e.message
+      end
     when '.yml'
-      require 'yaml'
-      YAML.load_file(path)
+      begin
+        require 'yaml'
+        YAML.load_file(path)
+      rescue Exception => e
+        raise ParserError, e.message
+      end
     when '.json'
-      require 'json'
-      JSON.parse(File.read(path))
+      begin
+        require 'json'
+        JSON.parse(File.read(path))
+      rescue Exception => e
+        raise ParserError, e.message
+      end
     else
-      raise "Unsupported file extension (#{ext})"
+      raise UnsupportedError, "Unsupported file extension (#{ext})"
+    end
+
+    # Here we merge config files if there are multiple load calls
+    if defined?(@@data) && !@@data.nil?
+      _deep_merge(@@data, data)
+    else
+      @@data = data
     end
-    @@data
+  end
+
+  ## Useful for testing
+  def self.clean
+    @@data = nil
   end
 
   def self.data
     @@data
   end
+
+  def self._deep_merge(first, second)
+    merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+    first.merge!(second, &merger)
+  end
 end

data/lib/figly/console.rb

@@ -4,5 +4,3 @@ Pry.config.prompt = lambda do |context, nesting, pry|
 end
 
 config = File.expand_path(File.join(__FILE__, '../../../spec/support/config.yml'))
-Figly.setup config
-

data/lib/figly/version.rb

@@ -1,3 +1,3 @@
 module Figly
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/figly_spec.rb

@@ -2,9 +2,8 @@ require 'spec_helper'
 
 describe Figly do
   context 'YAML' do
-    before do
-      Figly.setup(config_file)
-    end
+    before { Figly.load_file(config_file) }
+    after { Figly.clean }
 
     it 'should correctly access and integer on the top level' do
       expect(Figly::Settings.some_key).to eq(234)
@@ -32,20 +31,30 @@ describe Figly do
   end
 
   context 'TOML' do
-    before do
-      Figly.setup(config_file 'toml')
-    end
+    before { Figly.load_file(config_file 'toml') }
+    after { Figly.clean }
     it 'should parse and work for TOML' do
       expect(Figly::Settings.a.b).to eq({"c"=>{"d"=>"test"}})
     end
   end
 
   context 'JSON' do
-    before do
-      Figly.setup(config_file 'json')
-    end
+    before { Figly.load_file(config_file 'json') }
+    after { Figly.clean }
     it 'should parse and work with JSON' do
       expect(Figly::Settings.userId).to eq(1)
     end
   end
+
+  context 'multi files' do
+    before {
+      Figly.load_file(config_file 'json')
+      Figly.load_file(config_file 'toml')
+    }
+
+    it 'should have both sets of data merged' do
+      expect(Figly::Settings.userId).to eq(1)
+      expect(Figly::Settings.a.b.c).to eq({"d"=>"test"})
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: figly
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ryan Canty