foundry 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b28681a81e233360028348be15505ab62d698a9c
-  data.tar.gz: 060e3a8c45400254f9fb8e926b75683f82a4fed9
+  metadata.gz: 0d2491a84ca38fbb4654e718bc97107610a1d8aa
+  data.tar.gz: 6d1e0e431a2b7f03c2d41753ba5eb334fb12551a
 SHA512:
-  metadata.gz: 52e33f3b602ff5a8dd9fdc6728a8898e42d3572bc4c147f4755cab966d4ceece89ce46639619302677882028620084aaf60c93cebf92e8490515fdfb8fb13a7d
-  data.tar.gz: 3bf3b2b64289087f2abd06816434e51590fd59add1fb82b0aee96522d1a5571d58a0496fc993d420e97b78191219324bd183a78b55e62a0de7bf4a50f508e8fe
+  metadata.gz: b7df5b0ae04f808fbf30c3f5072bd37100c2dd4a47ab033d68bc4bd6b1aeea2cb5dd95be88e3418ccdc0a73b02c19610e09d80816daa38637a213fdc2009d49f
+  data.tar.gz: 8982aa92e9096317c24b982709b3f9145262e3db2069bc8cee7977d49d50a0709de5c81d7c1629ae129d9d5d557663abf97ec5a7c91ddff6cc7a5a739d4d9370

data/.travis.yml

@@ -14,5 +14,7 @@ rvm:
   - 2.1.1
   - 2.1.2
   - 2.1.3
+  - 2.1.4
+  - 2.1.5
   - jruby-19mode
   - rbx-2

data/TODO

@@ -1 +1 @@
-* Add support for other source-file types (JSON? XML (::shiver::)?)
+* Add support for additional source-file types (e.g XML)

data/foundry.gemspec

@@ -22,9 +22,11 @@ Gem::Specification.new do |gem|
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_development_dependency 'bundler', '~> 1.6'
+  gem.add_dependency('json', '~> 1.8')
+
+  gem.add_development_dependency 'bundler', '~> 1.0'
   gem.add_development_dependency 'pry', '~> 0.10'
-  gem.add_development_dependency 'rake', '~> 10.3'
-  gem.add_development_dependency 'rspec', '~> 3.0'
+  gem.add_development_dependency 'rake', '~> 10.4'
+  gem.add_development_dependency 'rspec', '~> 3.1'
   gem.add_development_dependency 'webmock', '~> 1.20'
 end

data/lib/foundry.rb

@@ -1,13 +1,7 @@
-require 'erb'
-require 'net/http'
-require 'openssl'
-require 'ostruct'
-require 'uri'
-require 'yaml'
-
-require 'foundry/refinements/hash'
+require 'foundry/parsers'
+require 'foundry/refinements'
+require 'foundry/sources'
+require 'foundry/template_engines'
+require 'foundry/version'
 
 require 'foundry/configurator'
-require 'foundry/sources/file'
-require 'foundry/sources/uri'
-require 'foundry/version'

data/lib/foundry/configurator.rb

@@ -1,24 +1,27 @@
+require 'ostruct'
+
 module Foundry
   class Configurator
     def self.configure(opts)
-      Configurator.new.configure(opts)
+      new.configure(opts)
     end
 
     def configure(opts)
       with_opts(opts) do
-        transmorgs = transmorgify(opts.fetch(:relative_path))
-        merged = mergify(transmorgs)
-        structify(merged)
+        relative_path = opts.fetch(:relative_path)
+        structify(mergify(transmorgify(relative_path)))
       end
     end
 
     private
 
-    attr_reader :opts
+    DEFAULT_OPTS = {
+      :parser_type => Foundry::Parsers::YAML,
+      :source_type => Foundry::Sources::URI,
+      :template_engine_type => Foundry::TemplateEngines::ERB
+    }
 
-    def erbify(str)
-      ERB.new(str).result
-    end
+    attr_reader :opts
 
     def loadify(relative_path)
       source.load(
@@ -32,8 +35,20 @@ module Foundry
       transmorgs.reduce({}) { |memo, transmorg| memo.deep_merge(transmorg) }
     end
 
+    def opts_value_or_default(key)
+      opts.fetch(key, DEFAULT_OPTS.fetch(key))
+    end
+
+    def parser
+      parser_type.new
+    end
+
+    def parser_type
+      opts_value_or_default(:parser_type)
+    end
+
     def parsify(str)
-      YAML.load(str) || {}
+      parser.parse(str) || {}
     end
 
     def root_path
@@ -45,7 +60,7 @@ module Foundry
     end
 
     def source_type
-      opts.fetch(:source_type)
+      opts_value_or_default(:source_type)
     end
 
     def structify(object)
@@ -65,10 +80,22 @@ module Foundry
       end
     end
 
+    def template_engine
+      template_engine_type.new
+    end
+
+    def template_engine_type
+      opts_value_or_default(:template_engine_type)
+    end
+
+    def templatify(str)
+      template_engine.evaluate(str)
+    end
+
     def transmorgify(relative_path)
-      parsed = parsify(erbify(loadify(relative_path)))
-      inherit = parsed.delete('inherit')
-      Array(inherit && transmorgify(inherit)) << parsed
+      parsed = parsify(templatify(loadify(relative_path)))
+      next_relative_path = parsed.delete('inherit')
+      Array(next_relative_path && transmorgify(next_relative_path)) << parsed
     end
 
     def with_opts(opts)

data/lib/foundry/parsers.rb

@@ -0,0 +1,2 @@
+require 'foundry/parsers/json'
+require 'foundry/parsers/yaml'

data/lib/foundry/parsers/json.rb

@@ -0,0 +1,11 @@
+require 'json'
+
+module Foundry
+  module Parsers
+    class JSON
+      def parse(str)
+        ::JSON.parse(str)
+      end
+    end
+  end
+end

data/lib/foundry/parsers/yaml.rb

@@ -0,0 +1,11 @@
+require 'yaml'
+
+module Foundry
+  module Parsers
+    class YAML
+      def parse(str)
+        ::YAML.load(str)
+      end
+    end
+  end
+end

data/lib/foundry/refinements.rb

@@ -0,0 +1 @@
+require 'foundry/refinements/hash'

data/lib/foundry/sources.rb

@@ -0,0 +1,2 @@
+require 'foundry/sources/file'
+require 'foundry/sources/uri'

data/lib/foundry/sources/uri.rb

@@ -1,3 +1,7 @@
+require 'net/http'
+require 'openssl'
+require 'uri'
+
 module Foundry
   module Sources
     class URI

data/lib/foundry/template_engines.rb

@@ -0,0 +1 @@
+require 'foundry/template_engines/erb'

data/lib/foundry/template_engines/erb.rb

@@ -0,0 +1,11 @@
+require 'erb'
+
+module Foundry
+  module TemplateEngines
+    class ERB
+      def evaluate(str)
+        ::ERB.new(str).result
+      end
+    end
+  end
+end

data/lib/foundry/version.rb

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

data/spec/configurator_spec.rb

@@ -3,11 +3,9 @@ require 'spec_helper'
 describe Foundry::Configurator do
   REQUIRED_OPTS = [
     :root_path,
-    :relative_path,
-    :source_type,
+    :relative_path
   ]
 
-  subject { Foundry::Configurator.new }
   let(:opts) { REQUIRED_OPTS.reduce({}) { |memo, opt| memo[opt] = nil; memo } }
 
   REQUIRED_OPTS.each do |key|
@@ -23,21 +21,25 @@ describe Foundry::Configurator do
     end
   end
 
-  it 'will fail-fast if the YAML is invalid' do
+  it 'will fail-fast if the parser raises an error' do
     with_source do |source|
-      expect(source).to receive(:load)
-      expect { subject.configure(opts) }.to raise_error
+      with_parser do |parser|
+        expect(source).to receive(:load)
+        expect(parser).to receive(:parse).and_call_original
+        expect { subject.configure(opts) }.to raise_error
+      end
     end
   end
 
-  it 'will fail-fast if the ERB raises an error' do
+  it 'will fail-fast if the template-engine raises an error' 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
     end
   end
 
-  it 'can parse YAML/ERB' do
+  it 'can load, parse and evaluate then return a valid result' do
     with_source do |source|
       expect(source).to receive(:load) { <<-YAML
         erb: <%= 1 * 2 * 3 %>
@@ -79,17 +81,31 @@ describe Foundry::Configurator do
 
   private
 
-  def default_opts
-    {
-      :exactly => :once,
-      :type => Foundry::Sources::File,
-    }
+  def with_defaults_merged(opts={})
+    opts.merge({ :exactly => :once })
+  end
+
+  def with_parser(opts={})
+    with_defaults_merged(opts) do |merged_opts|
+      parser = merged_opts[:parser_type].new
+      expect(subject).to receive(:parser).exactly(opts[:exactly]) { parser }
+      yield parser
+    end
   end
 
   def with_source(opts={})
-    merged_opts = default_opts.merge(opts)
-    source = merged_opts[:type].new
-    expect(subject).to receive(:source).exactly(merged_opts[:exactly]) { source }
-    yield source
+    with_defaults_merged(opts) do |merged_opts|
+      source = merged_opts[:source_type].new
+      expect(subject).to receive(:source).exactly(opts[:exactly]) { source }
+      yield source
+    end
+  end
+
+  def with_template_engine(opts={})
+    with_defaults_merged(opts) do |merged_opts|
+      template_engine = merged_opts[:template_engine_type].new
+      expect(subject).to receive(:template_engine).exactly(opts[:exactly]) { template_engine }
+      yield template_engine
+    end
   end
 end

data/spec/parsers/json_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Foundry::Parsers::JSON do
+  it 'can parse JSON' do
+    expect(subject.parse('{ "foo": "bar" }')).to eq({ 'foo' => 'bar' })
+  end
+
+  it 'will raise an error if the JSON is unparseable' do
+    expect { subject.parse(nil) }.to raise_error
+  end
+end

data/spec/parsers/yaml_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Foundry::Parsers::YAML do
+  it 'can parse YAML' do
+    expect(subject.parse('foo: bar')).to eq({ 'foo' => 'bar' })
+  end
+
+  it 'will raise an error if the YAML is unparseable' do
+    expect { subject.parse(nil) }.to raise_error
+  end
+end

data/spec/refinements/hash_spec.rb

@@ -9,6 +9,7 @@ describe Hash do
       :D => nil,
     }
   end
+
   let(:keys) do
     [
       :A,

data/spec/sources/file_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe Foundry::Sources::File do
-  subject { Foundry::Sources::File.new }
-
   it 'can load a file' do
     expect(File).to receive(:read)
     subject.load('', '', {})

data/spec/sources/uri_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Foundry::Sources::URI do
-  subject { Foundry::Sources::URI.new }
   let(:domain) { 'foo.bar.com' }
   let(:relative_path) { 'config.yml' }
 

data/spec/template_engines/erb_spec.rb

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

metadata

@@ -1,83 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: foundry
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jonathan W. Zaleski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.20'
 description: |2
@@ -90,8 +104,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -100,15 +114,25 @@ files:
 - foundry.gemspec
 - lib/foundry.rb
 - lib/foundry/configurator.rb
+- lib/foundry/parsers.rb
+- lib/foundry/parsers/json.rb
+- lib/foundry/parsers/yaml.rb
+- lib/foundry/refinements.rb
 - lib/foundry/refinements/hash.rb
+- lib/foundry/sources.rb
 - lib/foundry/sources/file.rb
 - lib/foundry/sources/uri.rb
+- lib/foundry/template_engines.rb
+- lib/foundry/template_engines/erb.rb
 - lib/foundry/version.rb
 - spec/configurator_spec.rb
+- spec/parsers/json_spec.rb
+- spec/parsers/yaml_spec.rb
 - spec/refinements/hash_spec.rb
 - spec/sources/file_spec.rb
 - spec/sources/uri_spec.rb
 - spec/spec_helper.rb
+- spec/template_engines/erb_spec.rb
 homepage: https://github.com/jzaleski/foundry
 licenses:
 - MIT
@@ -119,23 +143,26 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: An application configuration gem that aims to keep it simple
 test_files:
 - spec/configurator_spec.rb
+- spec/parsers/json_spec.rb
+- spec/parsers/yaml_spec.rb
 - spec/refinements/hash_spec.rb
 - spec/sources/file_spec.rb
 - spec/sources/uri_spec.rb
 - spec/spec_helper.rb
+- spec/template_engines/erb_spec.rb