foundry 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1223139fb3d6756ba4fa2e1d31345948af47760e
-  data.tar.gz: 7d51f944928e9b7991ba2fa15c9d4cf3e089478d
+SHA256:
+  metadata.gz: 32c2e6183d6b17e9968202223f0c6ced2fb3519eefe3fbac7f345bc2dacb59f1
+  data.tar.gz: 78db0b54f78f4ba2e8c851c5f8bcb2079b11e38b2e43f1f2a1899a0bf8453739
 SHA512:
-  metadata.gz: c609fc68fe2d354164126903190829106d7e8f1059d8cc5be91e44ffa579db97be42cf60d2d895c3322d14c20df7fce471879aaa653bc8bf8d4e895a913b4045
-  data.tar.gz: 34031526ce6bca9e3a406fe5d6667a704c782406c1ce7885af4776ecef5f6694036116428b1a69b15c7a7a1f80772db399e893db450cd8e5ffa30ba1dc27b1cd
+  metadata.gz: 65210d7d6ce90722a51561460ee375de0d4e4b08443aaa3d4e87584b6067bd5631cf549f214922fe48988b699b364faababcb2b0328a7ea40d3803d744e78443
+  data.tar.gz: c33f6c2ea16c068065fc25ed0aed92bfc402eff7ea882946be5d29b91b6d407ce5ddc1d06b98f26ce1686ac5a1bb8d16ceada1939a8ce5273503e28e6afd2f63

data/.travis.yml

@@ -1,7 +1,10 @@
 language: ruby
 
+sudo: false
+
 rvm:
-  - 2.1.9
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.1.10
+  - 2.2.9
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0

data/Gemfile

@@ -1,2 +1,7 @@
 source 'https://rubygems.org'
+
+group :development do
+  gem 'json', '~> 2.1'
+end
+
 gemspec

data/README.md

@@ -11,8 +11,8 @@ This gem aims to keep it simple and fully decouple the two concerns.
 
 Features:
 
-* Can load JSON or YAML from a local-file
-* Can load JSON or YAML from a HTTP/HTTPS endpoint
+* Can load JSON, XML or YAML from a local-file
+* Can load JSON, XML or YAML from a HTTP/HTTPS endpoint
 * Supports Basic Authentication for HTTP{,S} endpoints
 * Supports ERB interpolation
 * Returns an easy to navigate object-graph
@@ -95,7 +95,27 @@ Inheritance support:
 # 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" -- it is immaterial at this point whether the file-format is
-# JSON or YAML).
+# JSON, XML or YAML).
+#
+# When using the JSON parser, the file contents would be as follows:
+#
+# === file1.json ===
+#
+# { "value1": "value" }
+#
+# === file2.json ===
+#
+# { "inherit": "file1.json", "value2": "value" }
+#
+# When using the XML parser, the file contents would be as follows:
+#
+# === file1.xml ===
+#
+# <config><value1>value</value1></config>
+#
+# === file2.json ===
+#
+# <config inherit="file1.xml"><value2>value</value2></config>
 #
 # When using the YAML parser, the file contents would be as follows:
 #
@@ -110,15 +130,6 @@ 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`).

data/TODO

@@ -1 +1 @@
-* Add support for additional source-file types (e.g XML)
+63b761d7-11d7-11e8-9f1a-8c85909b0be6	00000000-0000-0000-0000-000000000000	jzaleski	jzaleski	1518647742	1518647742	a	Add support for additional source-file types (e.g XML)

data/foundry.gemspec

@@ -25,11 +25,8 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.1.0'
 
-  gem.add_dependency('json', '~> 2.1')
-
-  gem.add_development_dependency 'bundler', '~> 1.4'
-  gem.add_development_dependency 'pry', '~> 0.10'
-  gem.add_development_dependency 'rake', '~> 12.0'
-  gem.add_development_dependency 'rspec', '~> 3.6'
-  gem.add_development_dependency 'webmock', '~> 3.0'
+  gem.add_development_dependency 'pry', '~> 0.11'
+  gem.add_development_dependency 'rake', '~> 12.3'
+  gem.add_development_dependency 'rspec', '~> 3.7'
+  gem.add_development_dependency 'webmock', '~> 3.3'
 end

data/lib/foundry/parsers/json.rb

@@ -1,11 +1,12 @@
-require 'json'
+safe_require('json')
 
-
-module Foundry
-  module Parsers
-    class JSON
-      def parse(str)
-        ::JSON.parse(str)
+if defined?(JSON)
+  module Foundry
+    module Parsers
+      class JSON
+        def parse(str)
+          ::JSON.parse(str)
+        end
       end
     end
   end

data/lib/foundry/parsers/xml.rb

@@ -0,0 +1,20 @@
+safe_require('rexml/document')
+
+if defined?(REXML::Document)
+  module Foundry
+    module Parsers
+      class XML
+        def parse(str)
+          raise TypeError if str.nil?
+          root_node = REXML::Document.new(str).first
+          raise ArgumentError unless root_node.name == 'config'
+          result = {}
+          root_node.children.each { |node| result[node.name] = node.text }
+          inherit = root_node.attributes['inherit']
+          result['inherit'] = inherit unless inherit.nil?
+          result
+        end
+      end
+    end
+  end
+end

data/lib/foundry/parsers/yaml.rb

@@ -1,11 +1,12 @@
-require 'yaml'
+safe_require('yaml')
 
-
-module Foundry
-  module Parsers
-    class YAML
-      def parse(str)
-        ::YAML.load(str)
+if defined?(YAML)
+  module Foundry
+    module Parsers
+      class YAML
+        def parse(str)
+          ::YAML.load(str)
+        end
       end
     end
   end

data/lib/foundry/parsers.rb

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

data/lib/foundry/template_engines/erb.rb

@@ -1,11 +1,12 @@
-require 'erb'
+safe_require('erb')
 
-
-module Foundry
-  module TemplateEngines
-    class ERB
-      def evaluate(str)
-        ::ERB.new(str).result
+if defined?(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.6.0'
+  VERSION = '0.6.1'
 end

data/lib/foundry.rb

@@ -1,3 +1,9 @@
+def safe_require(name)
+  require name
+rescue LoadError
+  false
+end
+
 require 'foundry/parsers'
 require 'foundry/refinements'
 require 'foundry/sources'

data/spec/parsers/xml_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Foundry::Parsers::XML do
+  it 'can parse XML' do
+    expect(subject.parse('<config><foo>bar</foo></config>')).to \
+      eq({ 'foo' => 'bar' })
+  end
+
+  it 'will raise an error if the XML is not in the correct format' do
+    expect { subject.parse('<foo>bar</foo>') }.to raise_error ArgumentError
+  end
+
+  it 'will raise an error if the XML is unparseable' do
+    expect { subject.parse(nil) }.to raise_error TypeError
+  end
+end

metadata

@@ -1,99 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: foundry
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Jonathan W. Zaleski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
 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.
@@ -116,6 +88,7 @@ files:
 - lib/foundry/configurator.rb
 - lib/foundry/parsers.rb
 - lib/foundry/parsers/json.rb
+- lib/foundry/parsers/xml.rb
 - lib/foundry/parsers/yaml.rb
 - lib/foundry/refinements.rb
 - lib/foundry/refinements/hash.rb
@@ -127,6 +100,7 @@ files:
 - lib/foundry/version.rb
 - spec/configurator_spec.rb
 - spec/parsers/json_spec.rb
+- spec/parsers/xml_spec.rb
 - spec/parsers/yaml_spec.rb
 - spec/refinements/hash_spec.rb
 - spec/sources/file_spec.rb
@@ -153,13 +127,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.3
 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/xml_spec.rb
 - spec/parsers/yaml_spec.rb
 - spec/refinements/hash_spec.rb
 - spec/sources/file_spec.rb