foundry 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d2491a84ca38fbb4654e718bc97107610a1d8aa
-  data.tar.gz: 6d1e0e431a2b7f03c2d41753ba5eb334fb12551a
+  metadata.gz: 8c5e26aee10f8b0f8ce70041ac8f58bc3d15053c
+  data.tar.gz: 69cc9a43621f3d13eb8a95993574fd942bcf7378
 SHA512:
-  metadata.gz: b7df5b0ae04f808fbf30c3f5072bd37100c2dd4a47ab033d68bc4bd6b1aeea2cb5dd95be88e3418ccdc0a73b02c19610e09d80816daa38637a213fdc2009d49f
-  data.tar.gz: 8982aa92e9096317c24b982709b3f9145262e3db2069bc8cee7977d49d50a0709de5c81d7c1629ae129d9d5d557663abf97ec5a7c91ddff6cc7a5a739d4d9370
+  metadata.gz: c2d80f91e70408abd0676c7fa09152712d4243c4589fe25f1daa8a3d7b3f88d552e254f3cb65acbee31354488cd9ef2644b5e8c03ad68168941ea53ade1161ec
+  data.tar.gz: 6e3cb8321089f61f99d830ba0305bea7ede7c966e9c59137ea6b0e7248286acac7dd49921fe44812657d9f8c5917f520e453c93a9e79aac4c877cc097070ba16

data/.travis.yml

@@ -1,20 +1,8 @@
 language: ruby
 
-matrix:
-  allow_failures:
-    - rvm: jruby-19mode
-    - rvm: rbx-2
-
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
   - 2.0.0
-  - 2.1.0
-  - 2.1.1
-  - 2.1.2
-  - 2.1.3
-  - 2.1.4
-  - 2.1.5
-  - jruby-19mode
-  - rbx-2
+  - 2.1.9
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0

data/README.md

@@ -1,4 +1,4 @@
-# Foundry 
+# Foundry
 
 [![Build Status](https://secure.travis-ci.org/jzaleski/foundry.png?branch=master)](http://travis-ci.org/jzaleski/foundry)
 [![Dependency Status](https://gemnasium.com/jzaleski/foundry.png)](https://gemnasium.com/jzaleski/foundry)
@@ -11,8 +11,8 @@ This gem aims to keep it simple and fully decouple the two concerns.
 
 Features:
 
-* Can load YAML from a local-file
-* Can load YAML from a HTTP/HTTPS endpoint
+* Can load JSON or YAML from a local-file
+* Can load JSON or YAML from a HTTP/HTTPS endpoint
 * Supports Basic Authentication for HTTP{,S} endpoints
 * Supports ERB interpolation
 * Returns an easy to navigate object-graph
@@ -46,20 +46,19 @@ config = Foundry::Configurator.configure(
 Loading from a HTTP/HTTPS endpoint:
 
 ```ruby
+# defaults to a source-type of `Foundry::Sources::URI` and a parser-type of `Foundry::Parsers::YAML`
 config = Foundry::Configurator.configure(
   :root_path => 'http-or-https-root-url',
   :relative_path => 'relative-path-to-file',
-  :source_type => Foundry::Sources::URI
 )
 ```
 
-Loading from a HTTP/HTTPS endpoint using "Basic Authentication":
+Loading YAML from a HTTP/HTTPS endpoint using "Basic Authentication":
 
 ```ruby
 config = Foundry::Configurator.configure(
   :root_path => 'http-or-https-root-url',
   :relative_path => 'relative-path-to-file',
-  :source_type => Foundry::Sources::URI,
   :username => 'basic-auth-username',
   :password => 'basic-auth-password'
 )
@@ -95,9 +94,10 @@ Inheritance support:
 ```ruby
 # The examples below assume that there are two files available, relative to the
 # `root_path`, named "file1.yml" and "file2.yml" (and that "file2.yml" inherits
-# from "file1.yml").
+# from "file1.yml" -- it is immaterial at this point whether the file-format is
+# JSON or YAML).
 #
-# The file contents are as follows:
+# When using the YAML parser, the file contents would be as follows:
 #
 # === file1.yml ===
 #
@@ -110,12 +110,22 @@ Inheritance support:
 # value2: value
 # inherit: file1.yml
 #
+# When using the JSON parser, the file contents would be as follows:
+#
+# === file1.json ===
+#
+# { "value1": "value" }
+#
+# === file2.json ===
+#
+# { "inherit": "file1.json", "value2": "value" }
+#
 # It is also assumed that the files have already been loaded and processed by a
 # call to `Foundry::Configurator.configure` (into a variable named `config`).
 #
-# The result now contains values for both `value1` and `value2` and can be used
-# as follows (it is worth noting that the `inherit` key is removed during the
-# configuration process):
+# Regardless of parser-type the result now contains values for both `value1` and
+# `value2` and can be used as follows (it is worth noting that the `inherit` key
+# is removed during the configuration process):
 
 # Fetching `value1` and `value2` using dot-notation
 value1 = config.value1

data/foundry.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'foundry/version'
@@ -22,11 +23,11 @@ Gem::Specification.new do |gem|
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency('json', '~> 1.8')
+  gem.add_dependency('json', '~> 2.0')
 
   gem.add_development_dependency 'bundler', '~> 1.0'
   gem.add_development_dependency 'pry', '~> 0.10'
-  gem.add_development_dependency 'rake', '~> 10.4'
-  gem.add_development_dependency 'rspec', '~> 3.1'
-  gem.add_development_dependency 'webmock', '~> 1.20'
+  gem.add_development_dependency 'rake', '~> 12.0'
+  gem.add_development_dependency 'rspec', '~> 3.0'
+  gem.add_development_dependency 'webmock', '~> 3.0'
 end

data/lib/foundry/configurator.rb

@@ -1,5 +1,6 @@
 require 'ostruct'
 
+
 module Foundry
   class Configurator
     def self.configure(opts)
@@ -9,7 +10,9 @@ module Foundry
     def configure(opts)
       with_opts(opts) do
         relative_path = opts.fetch(:relative_path)
-        structify(mergify(transmorgify(relative_path)))
+        transmorg = transmorgify(relative_path)
+        merged = mergify(transmorg)
+        structify(merged)
       end
     end
 
@@ -18,7 +21,7 @@ module Foundry
     DEFAULT_OPTS = {
       :parser_type => Foundry::Parsers::YAML,
       :source_type => Foundry::Sources::URI,
-      :template_engine_type => Foundry::TemplateEngines::ERB
+      :template_engine_type => Foundry::TemplateEngines::ERB,
     }
 
     attr_reader :opts
@@ -63,20 +66,16 @@ module Foundry
       opts_value_or_default(:source_type)
     end
 
-    def structify(object)
-      case object
+    def structify(value)
+      case value
       when Array
-        object.map do |value|
-          structify(value)
-        end
+        value.map { |item| structify(item) }
       when Hash
-        OpenStruct.new.tap do |open_struct|
-          object.each do |key, value|
-            open_struct.send("#{key}=", structify(value))
-          end
+        OpenStruct.new.tap do |struct|
+          value.each { |item| struct.send("#{item[0]}=", structify(item[1])) }
         end
       else
-        object
+        value
       end
     end
 

data/lib/foundry/parsers/json.rb

@@ -1,5 +1,6 @@
 require 'json'
 
+
 module Foundry
   module Parsers
     class JSON

data/lib/foundry/parsers/yaml.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 
+
 module Foundry
   module Parsers
     class YAML

data/lib/foundry/sources/uri.rb

@@ -2,6 +2,7 @@ require 'net/http'
 require 'openssl'
 require 'uri'
 
+
 module Foundry
   module Sources
     class URI
@@ -17,7 +18,8 @@ module Foundry
           request.basic_auth(username, password)
         end
         response = client.request(request)
-        raise "Unknown configuration file: #{uri}" unless response.is_a?(Net::HTTPSuccess)
+        raise "Unknown configuration file: #{uri}" \
+          unless response.is_a?(Net::HTTPSuccess)
         response.body
       end
     end

data/lib/foundry/template_engines/erb.rb

@@ -1,5 +1,6 @@
 require 'erb'
 
+
 module Foundry
   module TemplateEngines
     class ERB

data/lib/foundry/version.rb

@@ -1,3 +1,3 @@
 module Foundry
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/spec/configurator_spec.rb

@@ -1,16 +1,13 @@
 require 'spec_helper'
 
 describe Foundry::Configurator do
-  REQUIRED_OPTS = [
-    :root_path,
-    :relative_path
-  ]
+  REQUIRED_OPTS = [:relative_path, :root_path]
 
   let(:opts) { REQUIRED_OPTS.reduce({}) { |memo, opt| memo[opt] = nil; memo } }
 
   REQUIRED_OPTS.each do |key|
     it %{must be passed a "#{key}"} do
-      expect { subject.configure(opts.without(key)) }.to raise_error
+      expect { subject.configure(opts.without(key)) }.to raise_error KeyError
     end
   end
 
@@ -26,7 +23,7 @@ describe Foundry::Configurator do
       with_parser do |parser|
         expect(source).to receive(:load)
         expect(parser).to receive(:parse).and_call_original
-        expect { subject.configure(opts) }.to raise_error
+        expect { subject.configure(opts) }.to raise_error ZeroDivision
       end
     end
   end
@@ -35,7 +32,7 @@ describe Foundry::Configurator do
     with_source do |source|
       expect(source).to receive(:load) { 'foo: <%= 1/0 %>' }
       expect(template_engine).to receive(:evaluate).and_call_original
-      expect { subject.configure(opts) }.to raise_error
+      expect { subject.configure(opts) }.to raise_error ZeroDivision
     end
   end
 

data/spec/parsers/json_spec.rb

@@ -6,6 +6,6 @@ describe Foundry::Parsers::JSON do
   end
 
   it 'will raise an error if the JSON is unparseable' do
-    expect { subject.parse(nil) }.to raise_error
+    expect { subject.parse(nil) }.to raise_error TypeError
   end
 end

data/spec/parsers/yaml_spec.rb

@@ -6,6 +6,6 @@ describe Foundry::Parsers::YAML do
   end
 
   it 'will raise an error if the YAML is unparseable' do
-    expect { subject.parse(nil) }.to raise_error
+    expect { subject.parse(nil) }.to raise_error TypeError
   end
 end

data/spec/sources/file_spec.rb

@@ -7,6 +7,6 @@ describe Foundry::Sources::File do
   end
 
   it 'will raise an error if the file does not exist' do
-    expect { subject.load('', '', {}) }.to raise_error
+    expect { subject.load('', '', {}) }.to raise_error Errno::EISDIR
   end
 end

data/spec/sources/uri_spec.rb

@@ -14,7 +14,6 @@ describe Foundry::Sources::URI do
   let(:https_response_body) { 'https_response_body' }
   let(:https_opts) { {} }
 
-  let(:basic_auth_uri) { "http://#{basic_auth_username}:#{basic_auth_password}@#{domain}/#{relative_path}" }
   let(:basic_auth_root_path) { http_root_path }
   let(:basic_auth_response_body) { 'basic_auth_response_body' }
   let(:basic_auth_username) { 'basic_auth_username' }
@@ -49,7 +48,7 @@ describe Foundry::Sources::URI do
   end
 
   it 'can load from a endpoint using basic-auth' do
-    stub_request(:get, basic_auth_uri).to_return(:body => basic_auth_response_body)
+    stub_request(:get, http_uri).to_return(:body => basic_auth_response_body)
 
     expect(
       subject.load(

data/spec/template_engines/erb_spec.rb

@@ -6,6 +6,6 @@ describe Foundry::TemplateEngines::ERB do
   end
 
   it 'will raise an error if evaluation of an ERB template fails' do
-    expect { subject.evaluate('<%= 1/0 %>') }.to raise_error
+    expect { subject.evaluate('<%= 1/0 %>') }.to raise_error ZeroDivisionError
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foundry
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Jonathan W. Zaleski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2017-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -58,42 +58,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.20'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.20'
+        version: '3.0'
 description: |2
     Let's face it, there are a number of problems when application/environment
     configuration logic is too tightly coupled with the configuration-data itself.
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: An application configuration gem that aims to keep it simple