figly 1.0.0.beta.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 414f612efa27e5aa6f362061fec77f55958b85da
-  data.tar.gz: 8ed5ca2a49ff04497a2f0fb07b2ead2d760d1e02
+  metadata.gz: 42364b75b7532c60705dbac8b6ef845d5c050fd1
+  data.tar.gz: 967175d1098a36cb2667ef092b3c5e9af0f681cf
 SHA512:
-  metadata.gz: 8744a5d0c0e1e11a188ca326eb19672ff54f5c26e3165e11173022c3b7a992e73ad41be1d504dc12e50356a9f33d2198999e70e61103c511ac6a81e196ac6815
-  data.tar.gz: 1ed7f7a1b1aa67326ce4f585e5041158c3aace92ea7dd4b03531792dbd2ba941f3d073c55ddff10242b33e85f687de1be282f8e88fbaf52f8b8b380e8007a9ae
+  metadata.gz: 55611aa6fd7c901dae7cb0d521840b7587f2273f1f14877cb225737a07d40a09cf7cc4f28a077182c18c41ba85f4100cf172cce29bfb543c9661b7ba42a82254
+  data.tar.gz: 40a0f3233a2544f8b95a3cc5a22560ddc96c46ce85c0609b021de7f3aa48d69eb3b0dffc43292aa5e067f1ae98420c0e9863aa9e80ba525699b00e58933109c0

data/figly.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Figly::VERSION
   spec.authors       = ["Ryan Canty"]
   spec.email         = ["jrcanty@gmail.com"]
-  spec.summary       = %q{A tiny gem that allows you to access config settings from YAML}
+  spec.summary       = %q{A tiny gem that allows you to access config settings from YAML, TOML, or JSON}
   spec.description   = %q{If you ever wanted to access a config Hash using the dot operator, this is the gem for you.}
   spec.homepage      = ""
   spec.license       = "MIT"
@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(spec)/})
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "toml"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "pry"

data/lib/figly.rb

@@ -1,13 +1,27 @@
 require "figly/version"
 require "figly/settings"
-module Figly
-  @@path = nil unless defined? @@path
 
+module Figly
   def self.setup(path)
-    @@path = path
+    raise "File does not exist: #{path}" unless File.exists?(path)
+    ext = File.extname(path)
+    @@data = case ext
+    when '.toml'
+      require 'toml'
+      TOML.load_file(path)
+    when '.yml'
+      require 'yaml'
+      YAML.load_file(path)
+    when '.json'
+      require 'json'
+      JSON.parse(File.read(path))
+    else
+      raise "Unsupported file extension (#{ext})"
+    end
+    @@data
   end
 
-  def self.path
-    @@path
+  def self.data
+    @@data
   end
 end

data/lib/figly/settings.rb

@@ -1,4 +1,3 @@
-require 'yaml'
 module Figly
   module Settings
     module SettingsHash
@@ -12,13 +11,10 @@ module Figly
       end
     end
 
-    def self.settings_hash
-      YAML.load_file(Figly.path)
-    end
-
     def self.method_missing(meth, *args, &block)
-      if self.settings_hash.has_key? meth.to_s
-        val = settings_hash[meth.to_s]
+      data = Figly.data
+      if data.has_key? meth.to_s
+        val = data[meth.to_s]
         if val.instance_of?(Hash)
           val.extend(SettingsHash)
         elsif val.instance_of? Array

data/lib/figly/version.rb

@@ -1,3 +1,3 @@
 module Figly
-  VERSION = "1.0.0.beta.0"
+  VERSION = "1.0.1"
 end

data/spec/figly_spec.rb

@@ -1,37 +1,51 @@
 require 'spec_helper'
 
 describe Figly do
-  before do
-    Figly.setup(config_file)
-  end
+  context 'YAML' do
+    before do
+      Figly.setup(config_file)
+    end
 
-  it 'should set path properly' do
-    expect(Figly.path).to include('config.yml')
-  end
-  
-  it 'should correctly access and integer on the top level' do
-    expect(Figly::Settings.some_key).to eq(234)
-  end
+    it 'should correctly access and integer on the top level' do
+      expect(Figly::Settings.some_key).to eq(234)
+    end
 
-  it 'should correctly access an array' do
-    expect(Figly::Settings.hello).to eq([1,2,3])
-  end
+    it 'should correctly access an array' do
+      expect(Figly::Settings.hello).to eq([1,2,3])
+    end
 
-  it 'should correclty access a hash' do
-    expect(Figly::Settings.nest1).to eq({'nest2' => {'nest3' => 'Yay'} } )
-  end
+    it 'should correclty access a hash' do
+      expect(Figly::Settings.nest1).to eq({'nest2' => {'nest3' => 'Yay'} } )
+    end
 
-  it 'should correctly access a value nested in a hash' do
-    expect(Figly::Settings.nest1.nest2.nest3).to eq('Yay')
-  end
+    it 'should correctly access a value nested in a hash' do
+      expect(Figly::Settings.nest1.nest2.nest3).to eq('Yay')
+    end
+
+    it 'should correctly access a nestd hash within an array' do
+      expect(Figly::Settings.ary.first.nest1.nest2).to eq('Woot')
+    end
 
-  it 'should correctly access a nestd hash within an array' do
-    expect(Figly::Settings.ary.first.nest1.nest2).to eq('Woot')
+    it 'should return nil when accessing a key that doesnt exist' do
+      expect(Figly::Settings.blah).to eq(nil)
+    end
   end
 
-  it 'should return nil when accessing a key that doesnt exist' do
-    expect(Figly::Settings.blah).to eq(nil)
+  context 'TOML' do
+    before do
+      Figly.setup(config_file 'toml')
+    end
+    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
+    it 'should parse and work with JSON' do
+      expect(Figly::Settings.userId).to eq(1)
+    end
+  end
 end
-

data/spec/support/config.json

@@ -0,0 +1,6 @@
+{
+  "userId": 1,
+  "id": 1,
+  "title": "sunt aut facere repellat provident occaecati excepturi optio reprehenderit",
+  "body": "quia et suscipit suscipit recusandae consequuntur expedita et cum reprehenderit molestiae ut ut quas totam nostrum rerum est autem sunt rem eveniet architecto"
+}

data/spec/support/config.toml

@@ -0,0 +1,43 @@
+# Comment
+
+# Booleans
+true = true
+false = false
+
+[strings]
+# String
+string = "string\n\t\"string"
+empty = ""
+
+[ints]
+simple = 42
+negative = -42
+
+[floats]
+pi = 3.14159
+negative = -10.0
+
+[datetimes]
+# DateTime
+simple = 1979-05-27T07:32:00Z
+
+# Keygroups
+[a.b.c]
+d = "test"
+
+[e]
+f = "test"
+
+# Post line comment
+[comments]
+on = "a line" # with markup
+
+# Multi-line arrays
+[arrays]
+# Simple array
+simple = [1, 2, 3]
+
+# Nested array
+nested = [[1, 2], [3]]
+
+uneven = [1, 2, 3, 4, 5 ]

data/spec/support/test_env.rb

@@ -1,11 +1,10 @@
 module TestEnv
-  def config_file
-    File.join(root, 'spec/support/config.yml')
+  def config_file(ext = 'yml')
+    File.join(root, "spec/support/config.#{ext}")
   end
-  
+
   def root
     support = File.dirname __dir__
     File.expand_path(File.join(support, ".."))
   end
-
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: figly
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ryan Canty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: toml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +102,8 @@ files:
 - lib/figly/version.rb
 - spec/figly_spec.rb
 - spec/spec_helper.rb
+- spec/support/config.json
+- spec/support/config.toml
 - spec/support/config.yml
 - spec/support/test_env.rb
 homepage: ''
@@ -105,17 +121,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: A tiny gem that allows you to access config settings from YAML
+summary: A tiny gem that allows you to access config settings from YAML, TOML, or
+  JSON
 test_files:
 - spec/figly_spec.rb
 - spec/spec_helper.rb
+- spec/support/config.json
+- spec/support/config.toml
 - spec/support/config.yml
 - spec/support/test_env.rb