global 0.2.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff7ffaa8d2e0f5e244d2a8afbe0d8e938cea9244
-  data.tar.gz: 8153165733bd12e6c4673c39abdbb16b706a7fc6
+  metadata.gz: 5ada6d5fbc1aaf1b03e1e5db9200c33f2e22108e
+  data.tar.gz: bd7c8bc34931654e6bd89fb6d2cf6fd4c7e7d123
 SHA512:
-  metadata.gz: efa24df45cb25c916773f4ff7c1dcc0621421016f567a54af18f77bae41a9242e9dd9a5f5bf942db4db8e133f0b17d971fed83de28fd787cf301859d035b5d61
-  data.tar.gz: 01156ae25535c3d559da859c6717feb59c07510291e23306920e722d35bf3c8c112b789c61d633ec7dc1d019f9ee36380c9889c56b1c7a5e990a2b79930363ff
+  metadata.gz: 6209994c37c074286978e2b34e5d81fc0b93818fc75fb682cb0750de13ac2656926cbde9639507e3d0f9049469b9789b853d3a61bedbdfdf528849db242165f8
+  data.tar.gz: b5c74f586b5dd5db6c1826e355ba159ecd6e05b316071c212acf4ac3d9801a776742c5a0693b1ca1a9cdd9fa1ab69bb03be33d4d66fdd59f78b35c19498d7180

data/.rubocop.yml

@@ -0,0 +1,91 @@
+Layout/EmptyLinesAroundBlockBody:
+  Enabled: false
+
+Layout/SpaceInsideBlockBraces:
+  Enabled: true
+  EnforcedStyle: space
+  EnforcedStyleForEmptyBraces: no_space
+  SpaceBeforeBlockParameters: true
+
+Layout/SpaceBeforeBlockBraces:
+  Enabled: true
+  EnforcedStyle: space
+  EnforcedStyleForEmptyBraces: space
+
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: true
+  EnforcedStyle: compact
+  EnforcedStyleForEmptyBraces: no_space
+
+Layout/EmptyLinesAroundClassBody:
+  Enabled: true
+  EnforcedStyle: empty_lines_except_namespace
+
+Layout/EmptyLinesAroundModuleBody:
+  Enabled: true
+  EnforcedStyle: empty_lines_except_namespace
+
+Layout/MultilineMethodCallIndentation:
+  Enabled: true
+  EnforcedStyle: indented
+
+Layout/AlignHash:
+  Enabled: true
+  EnforcedLastArgumentHashStyle: always_ignore
+
+Style/RaiseArgs:
+  EnforcedStyle: compact
+
+Style/YodaCondition:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: true
+  EnforcedStyle: always
+
+Style/RegexpLiteral:
+  Enabled: true
+  EnforcedStyle: slashes
+  AllowInnerSlashes: false
+
+Layout/IndentHash:
+  EnforcedStyle: consistent
+
+Style/Documentation:
+  Enabled: false
+
+Style/SafeNavigation:
+  Enabled: true
+  Whitelist:
+    - present?
+    - blank?
+    - presence
+
+Lint/AmbiguousBlockAssociation:
+  Exclude:
+    - 'spec/**/*'
+
+Naming/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
+
+Metrics/LineLength:
+  Max: 120
+  Exclude:
+    - 'spec/**/*'
+
+Metrics/AbcSize:
+  Max: 22
+  Exclude:
+    - 'spec/**/*'
+
+Style/ModuleFunction:
+  EnforcedStyle: extend_self

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.5.1

data/.travis.yml

@@ -4,12 +4,10 @@ cache:
   bundler: true
 
 rvm:
-  - 2.0
-  - 2.1
   - 2.2
-  - 2.3.3
-  - 2.4.2
-  - 2.5.0
+  - 2.3
+  - 2.4
+  - 2.5
   - jruby-19mode
   - ruby-head
   - jruby-head

data/Gemfile

@@ -1,9 +1,6 @@
-source "http://rubygems.org"
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in global.gemspec
 gemspec
-
-if RUBY_VERSION < "2.2.2"
-  # activesupport 5+ requires MRI 2.2.2+
-  gem "activesupport", "< 5.0.0"
-end

data/README.md

@@ -124,6 +124,39 @@ Nested options can then be accessed as follows:
 => "development value"
 ```
 
+### Environment files
+
+Config file `global/aws.yml` with:
+```yml
+:default:
+  activated: false
+
+staging:
+  activated: true
+  api_key: 'nothing'
+
+```
+
+And file `global/aws.production.yml` with:
+```yml
+:activated: true
+:api_key: 'some api key'
+:api_secret: 'some secret'
+
+```
+
+Provide such configuration on `Global.environment = 'production'` environment:
+
+```ruby
+> Global.aws.activated
+=> true
+> Global.aws.api_key
+=> 'some api key'
+> Global.aws.api_secret
+=> 'some secret'
+```
+
+**Warning**: files with dot(s) in name will be skipped by Global (except this env files).
 
 ### ERB support
 
@@ -162,7 +195,7 @@ Global.configure do |config|
   config.only = ["LIST_OF_FILES_TO_INCLUDE_ON_FRONT_END"] # default []
 end
 ```
-By default all files are excluded due to security reasons. Don't include files which contain protected information like api keys or credentials. 
+By default all files are excluded due to security reasons. Don't include files which contain protected information like api keys or credentials.
 
 Require global file in `application.js`:
 
@@ -184,7 +217,7 @@ If your application has `admin` and `application` namespace:
 
 # app/assets/javascripts/admin.js.coffee
 #= require admin/global
-``` 
+```
 
 ```erb
 # app/assets/javascripts/application/global.js.erb
@@ -213,7 +246,7 @@ Global.hosts.web
 => "localhost"
 ```
 
-And in production: 
+And in production:
 
 ``` js
 Global.hosts.web
@@ -233,4 +266,3 @@ Global.hosts.web
 ## Copyright
 
 Copyright (c) Railsware LLC. See LICENSE.txt for further details.
-

data/Rakefile

@@ -1,11 +1,19 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'bundler'
 
 Bundler.require
 
 require 'rspec/core/rake_task'
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new(:rubocop) do |task|
+  task.options = ['-D'] # Display cop name
+  task.fail_on_error = true
+end
 
-task :default => :spec
+desc 'Run all tests'
+task default: %i[rubocop spec]

data/global.gemspec

@@ -1,33 +1,36 @@
-$:.push File.expand_path("../lib", __FILE__)
-require "global/version"
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+require 'global/version'
 
 Gem::Specification.new do |s|
-  s.name = "global"
+  s.name = 'global'
   s.version = Global::VERSION
-  s.authors = ["Railsware LLC"]
-  s.email = "contact@railsware.com"
+  s.authors = ['Railsware LLC']
+  s.email = 'contact@railsware.com'
 
-  s.rubyforge_project = "global"
+  s.rubyforge_project = 'global'
 
-  s.description = "Simple way to load your configs from yaml"
-  s.summary = "Simple way to load your configs from yaml"
+  s.description = 'Simple way to load your configs from yaml'
+  s.summary = 'Simple way to load your configs from yaml'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
 
-  s.homepage = "https://github.com/railsware/global"
-  s.licenses = ["MIT"]
+  s.homepage = 'https://github.com/railsware/global'
+  s.licenses = ['MIT']
 
-  s.add_development_dependency "rspec",     ">= 3.0"
-  s.add_development_dependency "simplecov", "~> 0.7.1"
-  s.add_development_dependency "rake",      "~> 10.1.0"
+  s.add_development_dependency 'rake',      '~> 12.3.1'
+  s.add_development_dependency 'rspec',     '>= 3.0'
+  s.add_development_dependency 'rubocop',   '~> 0.57'
+  s.add_development_dependency 'simplecov', '~> 0.16.1'
   if defined?(JRUBY_VERSION)
-    s.add_development_dependency "therubyrhino", ">= 0"
+    s.add_development_dependency 'therubyrhino', '>= 0'
   else
-    s.add_development_dependency "therubyracer", ">= 0"
+    s.add_development_dependency 'therubyracer', '>= 0'
   end
 
-  s.add_runtime_dependency "activesupport", ">= 2.0"
+  s.add_runtime_dependency 'activesupport', '>= 2.0'
 end

data/lib/global.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'yaml'
 
 require 'active_support/core_ext/hash/indifferent_access'
@@ -10,5 +11,7 @@ require 'global/engine' if defined?(Rails)
 require 'global/version'
 
 module Global
+
   extend Base
+
 end

data/lib/global/base.rb

@@ -1,10 +1,14 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'erb'
 require 'json'
 
 module Global
   module Base
+
+    FILE_ENV_SPLIT = '.'
+    YAML_EXT = '.yml'
+
     extend self
 
     attr_writer :environment, :config_directory, :namespace, :except, :only
@@ -23,11 +27,11 @@ module Global
     end
 
     def environment
-      @environment || raise("environment should be defined")
+      @environment || raise('environment should be defined')
     end
 
     def config_directory
-      @config_directory || raise("config_directory should be defined")
+      @config_directory || raise('config_directory should be defined')
     end
 
     def namespace
@@ -60,34 +64,51 @@ module Global
     def load_from_file(dir, env)
       config = {}
 
-      if File.exists?(file = "#{dir}.yml")
-        configurations = YAML::load(ERB.new(IO.read(file)).result)
-        config = configurations[:default] || configurations["default"] || {}
-        config.deep_merge!(configurations[env] || {})
+      if File.exist?(file = "#{dir}#{YAML_EXT}")
+        configurations = load_yml_file(file)
+        config = get_config_by_key(configurations, 'default')
+        config.deep_merge!(get_config_by_key(configurations, env))
+        if File.exist?(env_file = "#{dir}#{FILE_ENV_SPLIT}#{env}#{YAML_EXT}")
+          config.deep_merge!(load_yml_file(env_file) || {})
+        end
       end
 
       config
     end
 
+    def get_config_by_key(config, key)
+      config[key.to_sym] || config[key.to_s] || {}
+    end
+
+    def load_yml_file(file)
+      YAML.safe_load(
+        ERB.new(IO.read(file)).result,
+        [Date, Time, DateTime, Symbol], [], true
+      )
+    end
+
     def load_from_directory(dir, env)
       config = {}
 
       if File.directory?(dir)
         Dir["#{dir}/*"].each do |entry|
-          namespace = entry.gsub(/^#{dir}\/?/, '').gsub(/\.yml$/, '')
-          config.deep_merge!(namespace => load_configuration(entry.gsub(/\.yml$/, ''), env))
+          namespace = File.basename(entry, YAML_EXT)
+          next if namespace.include? FILE_ENV_SPLIT # skip files with dot(s) in name
+          file_with_path = File.join(File.dirname(entry), File.basename(entry, YAML_EXT))
+          config.deep_merge!(namespace => load_configuration(file_with_path, env))
         end
       end
 
       config
     end
-    
-    def respond_to_missing?(method, include_private=false)
+
+    def respond_to_missing?(method, include_private = false)
       configuration.key?(method) || super
     end
 
     def method_missing(method, *args, &block)
       configuration.key?(method) ? configuration[method] : super
     end
+
   end
 end

data/lib/global/configuration.rb

@@ -1,15 +1,17 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'forwardable'
 
 module Global
   class Configuration
+
     extend Forwardable
 
     attr_reader :hash
 
-    def_delegators :hash, :key?, :has_key?, :include?, :member?, :[], :[]=, :to_hash, :to_json, :inspect
-
+    def_delegators :hash, :key?, :has_key?, :include?,
+                   :member?, :[], :[]=, :to_hash, :to_json,
+                   :inspect, :fetch
 
     def initialize(hash)
       @hash = hash.respond_to?(:with_indifferent_access) ? hash.with_indifferent_access : hash
@@ -17,28 +19,23 @@ module Global
 
     def filter(options = {})
       keys = filtered_keys_list(options)
-      hash.select{|key, _| keys.include?(key)}
+      hash.select { |key, _| keys.include?(key) }
     end
 
     private
 
     def filtered_keys_list(options)
-      if options[:except].is_a?(Array)
-        return hash.keys - options[:except].map(&:to_s)
-      end
-
-      if options[:only].is_a?(Array)
-        return hash.keys & options[:only].map(&:to_s)
-      end
+      return hash.keys - options[:except].map(&:to_s) if options[:except].is_a?(Array)
+      return hash.keys & options[:only].map(&:to_s) if options[:only].is_a?(Array)
 
       return hash.keys if options[:only] == :all
       return [] if options[:except] == :all
-      return []
+      []
     end
 
     protected
 
-    def respond_to_missing?(method_name, include_private=false)
+    def respond_to_missing?(method_name, include_private = false)
       method = normalize_key_by_method(method_name)
       key?(method) || super
     end
@@ -47,7 +44,7 @@ module Global
       method = normalize_key_by_method(method)
       if key?(method)
         value = hash[method]
-        value.kind_of?(Hash) ? Global::Configuration.new(value) : value
+        value.is_a?(Hash) ? Global::Configuration.new(value) : value
       else
         super
       end
@@ -57,6 +54,5 @@ module Global
       '?' == method.to_s[-1] ? method.to_s[0..-2] : method
     end
 
-
   end
 end

data/lib/global/engine.rb

@@ -1,21 +1,24 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 module Global
+
   class SprocketsExtension
+
     GLOBAL_JS_ASSET = 'global-js'
 
-    def initialize(filename, &block)
+    def initialize(filename)
       @filename = filename
-      @source   = block.call
+      @source   = yield
     end
 
-    def render(context, empty_hash_wtf)
+    def render(context, _empty_hash_wtf)
       self.class.run(@filename, @source, context)
     end
 
-    def self.run(filename, source, context)
+    def self.run(_filename, source, context)
       if GLOBAL_JS_ASSET == context.logical_path
         configs = Dir.glob("#{Global.config_directory}#{File::SEPARATOR}*.yml")
-        configs.map{ |config| context.depend_on(config) }
+        configs.map { |config| context.depend_on(config) }
       end
       source
     end
@@ -28,51 +31,54 @@ module Global
       result = run(filename, source, context)
       context.metadata.merge(data: result)
     end
-  end
 
+  end
 
   class Engine < ::Rails::Engine
+
     require 'sprockets/version'
     v2                = Gem::Dependency.new('', ' ~> 2')
     vgte3             = Gem::Dependency.new('', ' >= 3')
     sprockets_version = Gem::Version.new(::Sprockets::VERSION).release
     initializer_args  = case sprockets_version
-                          when -> (v) { v2.match?('', v) }
-                            { after: "sprockets.environment" }
-                          when -> (v) { vgte3.match?('', v) }
-                            { after: :engines_blank_point, before: :finisher_hook }
-                          else
-                            raise StandardError, "Sprockets version #{sprockets_version} is not supported"
+                        when ->(v) { v2.match?('', v) }
+                          { after: 'sprockets.environment' }
+                        when ->(v) { vgte3.match?('', v) }
+                          { after: :engines_blank_point, before: :finisher_hook }
+                        else
+                          raise StandardError.new("Sprockets version #{sprockets_version} is not supported")
                         end
 
     is_running_rails = defined?(Rails) && Rails.respond_to?(:version)
-    is_running_rails_32 = is_running_rails && Rails.version.match(/3\.2/)
+    is_running_rails32 = is_running_rails && Rails.version.match(/3\.2/)
 
     initializer 'global-js.dependent_on_configs', initializer_args do
       case sprockets_version
-        when  -> (v) { v2.match?('', v) },
-              -> (v) { vgte3.match?('', v) }
+      when ->(v) { v2.match?('', v) },
+              ->(v) { vgte3.match?('', v) }
 
         # It seems rails 3.2 is not working if
         # `Rails.application.config.assets.configure` is used for
         # registering preprocessor
-        if is_running_rails_32
+        if is_running_rails32
           Rails.application.assets.register_preprocessor(
-            "application/javascript",
+            'application/javascript',
             SprocketsExtension
           )
         elsif Rails.application.config.respond_to?(:assets)
           # Other rails version, assumed newer
           Rails.application.config.assets.configure do |config|
             config.register_preprocessor(
-              "application/javascript",
+              'application/javascript',
               SprocketsExtension
             )
           end
         end
       else
-        raise StandardError, "Sprockets version #{sprockets_version} is not supported"
+        raise StandardError.new("Sprockets version #{sprockets_version} is not supported")
       end
     end
+
   end
+
 end

data/lib/global/version.rb

@@ -1,5 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Global
-  VERSION = "0.2.2"
+
+  VERSION = '1.0.0'
+
 end

data/spec/files/aws.test.yml

@@ -0,0 +1,3 @@
+---
+:api_key: 'some api key'
+:api_secret: 'some secret'

data/spec/files/aws.yml

@@ -0,0 +1,6 @@
+:default:
+  activated: false
+
+test:
+  activated: true
+  api_key: 'nothing'

data/spec/global/configuration_spec.rb

@@ -1,149 +1,151 @@
-require "spec_helper"
+# frozen_string_literal: true
+
+require 'spec_helper'
 
 RSpec.describe Global::Configuration do
-  let(:hash){ { "key" => "value", "nested" => { "key" => "value" } } }
-  let(:configuration){ described_class.new hash }
+  let(:hash) { { 'key' => 'value', 'nested' => { 'key' => 'value' }} }
+  let(:configuration) { described_class.new hash }
 
-  describe "#hash" do
-    subject{ configuration.hash }
+  describe '#hash' do
+    subject { configuration.hash }
 
-    it{ is_expected.to eq(hash) }
+    it { is_expected.to eq(hash) }
   end
 
-  describe "#to_hash" do
-    subject{ configuration.to_hash }
+  describe '#to_hash' do
+    subject { configuration.to_hash }
 
-    it{ is_expected.to eq(hash) }
+    it { is_expected.to eq(hash) }
   end
 
-  describe "key?" do
-    subject{ configuration.key?(:key) }
+  describe 'key?' do
+    subject { configuration.key?(:key) }
 
-    it{ is_expected.to be_truthy }
+    it { is_expected.to be_truthy }
   end
 
-  describe "has_key?" do
-    subject{ configuration.has_key?(:key) }
+  describe 'has_key?' do
+    subject { configuration.key?(:key) }
 
-    it{ is_expected.to be_truthy }
+    it { is_expected.to be_truthy }
   end
 
-  describe "include?" do
-    subject{ configuration.include?(:key) }
+  describe 'include?' do
+    subject { configuration.include?(:key) }
 
-    it{ is_expected.to be_truthy }
+    it { is_expected.to be_truthy }
   end
 
-  describe "member?" do
-    subject{ configuration.member?(:key) }
+  describe 'member?' do
+    subject { configuration.member?(:key) }
 
-    it{ is_expected.to be_truthy }
+    it { is_expected.to be_truthy }
   end
 
-  describe "#[]" do
-    subject{ configuration[:key] }
+  describe '#[]' do
+    subject { configuration[:key] }
 
-    it{ is_expected.to eq("value") }
+    it { is_expected.to eq('value') }
   end
 
-  describe "#[]=" do
-    subject{ configuration[:new_key] }
+  describe '#[]=' do
+    subject { configuration[:new_key] }
 
-    before{ configuration[:new_key] = "new_value" }
+    before { configuration[:new_key] = 'new_value' }
 
-    it{ is_expected.to eq("new_value") }
+    it { is_expected.to eq('new_value') }
   end
 
-  describe "#inspect" do
-    subject{ configuration.inspect }
+  describe '#inspect' do
+    subject { configuration.inspect }
 
-    it{ is_expected.to eq(hash.inspect) }
+    it { is_expected.to eq(hash.inspect) }
   end
 
-  describe "#filter" do
-    subject{ configuration.filter(filter_options) }
+  describe '#filter' do
+    subject { configuration.filter(filter_options) }
 
-    context "when include all" do
-      let(:filter_options){ { only: :all } }
+    context 'when include all' do
+      let(:filter_options) { { only: :all } }
 
-      it{ should == {"key"=>"value", "nested"=>{"key"=>"value"}} }
+      it { should == { 'key' => 'value', 'nested' => { 'key' => 'value' }} }
     end
 
-    context "when except all" do
-      let(:filter_options){ { except: :all } }
+    context 'when except all' do
+      let(:filter_options) { { except: :all } }
 
-      it{ should == {} }
+      it { should == {} }
     end
 
-    context "when except present" do
-      let(:filter_options){ { except: %w(key) } }
+    context 'when except present' do
+      let(:filter_options) { { except: %w[key] } }
 
-      it{ should == {"nested"=>{"key"=>"value"}} }
+      it { should == { 'nested' => { 'key' => 'value' }} }
     end
 
-    context "when include present" do
-      let(:filter_options){ { only: %w(key) } }
+    context 'when include present' do
+      let(:filter_options) { { only: %w[key] } }
 
-      it{ should == {"key"=>"value"} }
+      it { should == { 'key' => 'value' } }
     end
 
-    context "when empty options" do
-      let(:filter_options){ {} }
+    context 'when empty options' do
+      let(:filter_options) { {} }
 
-      it{ should == {} }
+      it { should == {} }
     end
   end
 
-  describe "#method_missing" do
-    context "when key exist" do
-      subject{ configuration.key }
+  describe '#method_missing' do
+    context 'when key exist' do
+      subject { configuration.key }
 
-      it{ is_expected.to eq("value") }
+      it { is_expected.to eq('value') }
     end
 
-    context "when key does not exist" do
-      subject{ configuration.some_key }
+    context 'when key does not exist' do
+      subject { configuration.some_key }
 
-      it{ expect { subject }.to raise_error(NoMethodError) }
+      it { expect { subject }.to raise_error(NoMethodError) }
     end
 
-    context "with nested hash" do
-      subject{ configuration.nested.key }
+    context 'with nested hash' do
+      subject { configuration.nested.key }
 
-      it{ is_expected.to eq("value") }
+      it { is_expected.to eq('value') }
     end
   end
 
-  describe "#respond_to_missing?" do
-    context "when key exist" do
-      subject{ configuration.respond_to?(:key) }
+  describe '#respond_to_missing?' do
+    context 'when key exist' do
+      subject { configuration.respond_to?(:key) }
 
-      it{ is_expected.to eq(true) }
+      it { is_expected.to eq(true) }
     end
 
-    context "when key does not exist" do
-      subject{ configuration.respond_to?(:some_key) }
+    context 'when key does not exist' do
+      subject { configuration.respond_to?(:some_key) }
 
-      it{ is_expected.to eq(false) }
+      it { is_expected.to eq(false) }
     end
 
-    context "with nested hash" do
-      subject{ configuration.nested.respond_to?(:key) }
+    context 'with nested hash' do
+      subject { configuration.nested.respond_to?(:key) }
 
-      it{ is_expected.to eq(true) }
+      it { is_expected.to eq(true) }
     end
 
-    context "when call it by method" do
-      subject{ configuration.method(:key).call }
+    context 'when call it by method' do
+      subject { configuration.method(:key).call }
 
-      it{ is_expected.to eq("value") }
+      it { is_expected.to eq('value') }
     end
 
-    context "when call it by method, which not exist" do
+    context 'when call it by method, which not exist' do
       it 'raise error' do
-        expect{ configuration.method(:some_key) }.to raise_error(NameError)
+        expect { configuration.method(:some_key) }.to raise_error(NameError)
       end
     end
   end
 
-end
+end

data/spec/global/global_js_spec.rb

@@ -1,13 +1,15 @@
-require "spec_helper"
+# frozen_string_literal: true
 
-RSpec.describe Global, "generate js in Rails"  do
+require 'spec_helper'
+
+RSpec.describe Global, 'generate js in Rails' do
   before do
-    evaljs("var window = this;", true)
-    jscontext[:log] = lambda {|context, value| puts value.inspect}
+    evaljs('var window = this;', true)
+    jscontext[:log] = ->(_context, value) { puts value.inspect }
 
     described_class.configure do |config|
-      config.environment = "test"
-      config.config_directory = File.join(Dir.pwd, "spec/files")
+      config.environment = 'test'
+      config.config_directory = File.join(Dir.pwd, 'spec/files')
     end
 
   end
@@ -22,20 +24,20 @@ RSpec.describe Global, "generate js in Rails"  do
       evaljs(described_class.generate_js)
     end
 
-    it "should generate valid global config" do
-      expect(evaljs("Global.rspec_config.default_value")).to eq('default value')
+    it 'should generate valid global config' do
+      expect(evaljs('Global.rspec_config.default_value')).to eq('default value')
     end
 
-    it "should generate valid global config for array" do
-      expect(evaljs("Global.nested_config.some_array_value.length")).to eq(3)
+    it 'should generate valid global config for array' do
+      expect(evaljs('Global.nested_config.some_array_value.length')).to eq(3)
     end
 
-    it "should generate valid global config for array, first element" do
-      expect(evaljs("Global.nested_config.some_array_value[0]")).to eq("First")
+    it 'should generate valid global config for array, first element' do
+      expect(evaljs('Global.nested_config.some_array_value[0]')).to eq('First')
     end
 
-    it "should generate valid global config for array, last element" do
-      expect(evaljs("Global.nested_config.some_array_value[2]")).to eq("Third")
+    it 'should generate valid global config for array, last element' do
+      expect(evaljs('Global.nested_config.some_array_value[2]')).to eq('Third')
     end
 
   end
@@ -50,8 +52,8 @@ RSpec.describe Global, "generate js in Rails"  do
       evaljs(described_class.generate_js)
     end
 
-    it "should generate valid global config" do
-      expect(evaljs("CustomGlobal.rspec_config.default_value")).to eq('default value')
+    it 'should generate valid global config' do
+      expect(evaljs('CustomGlobal.rspec_config.default_value')).to eq('default value')
     end
 
   end
@@ -61,8 +63,8 @@ RSpec.describe Global, "generate js in Rails"  do
       evaljs(described_class.generate_js(namespace: 'CustomGlobalNamespace', only: :all))
     end
 
-    it "should generate valid global config" do
-      expect(evaljs("CustomGlobalNamespace.rspec_config.default_value")).to eq('default value')
+    it 'should generate valid global config' do
+      expect(evaljs('CustomGlobalNamespace.rspec_config.default_value')).to eq('default value')
     end
 
   end
@@ -78,12 +80,12 @@ RSpec.describe Global, "generate js in Rails"  do
       evaljs(described_class.generate_js)
     end
 
-    it "should generate visible global config" do
-      expect(evaljs("Global.bool_config.works")).to eq(true)
+    it 'should generate visible global config' do
+      expect(evaljs('Global.bool_config.works')).to eq(true)
     end
 
-    it "should have not some keys in js" do
-      expect(evaljs("Global.nested_config")).to be_nil
+    it 'should have not some keys in js' do
+      expect(evaljs('Global.nested_config')).to be_nil
     end
 
   end
@@ -98,16 +100,16 @@ RSpec.describe Global, "generate js in Rails"  do
       evaljs(described_class.generate_js)
     end
 
-    it "should generate visible global config with bool_config" do
-      expect(evaljs("Global.bool_config.works")).to eq(true)
+    it 'should generate visible global config with bool_config' do
+      expect(evaljs('Global.bool_config.works')).to eq(true)
     end
 
-    it "should generate visible global config with rspec_config" do
-      expect(evaljs("Global.rspec_config.default_value")).to eq('default value')
+    it 'should generate visible global config with rspec_config' do
+      expect(evaljs('Global.rspec_config.default_value')).to eq('default value')
     end
 
-    it "should have not some keys in js" do
-      expect(evaljs("Global.nested_config")).to be_nil
+    it 'should have not some keys in js' do
+      expect(evaljs('Global.nested_config')).to be_nil
     end
 
   end

data/spec/global_spec.rb

@@ -1,130 +1,143 @@
-require "spec_helper"
+# frozen_string_literal: true
+
+require 'spec_helper'
 
 RSpec.describe Global do
 
   before(:each) do
     described_class.configure do |config|
-      config.environment = "test"
-      config.config_directory = File.join(Dir.pwd, "spec/files")
+      config.environment = 'test'
+      config.config_directory = File.join(Dir.pwd, 'spec/files')
     end
   end
 
-  describe ".environment" do
-    subject{ described_class.environment }
+  describe '.environment' do
+    subject { described_class.environment }
 
-    it{ is_expected.to eq("test") }
+    it { is_expected.to eq('test') }
 
-    context "when undefined" do
-      before{ described_class.environment = nil }
+    context 'when undefined' do
+      before { described_class.environment = nil }
 
-      it{ expect{ subject }.to raise_error("environment should be defined") }
+      it { expect { subject }.to raise_error('environment should be defined') }
     end
   end
 
-  describe ".config_directory" do
-    subject{ described_class.config_directory }
+  describe '.config_directory' do
+    subject { described_class.config_directory }
 
-    it{ is_expected.to eq(File.join(Dir.pwd, "spec/files"))}
+    it { is_expected.to eq(File.join(Dir.pwd, 'spec/files')) }
 
-    context "when undefined" do
-      before{ described_class.config_directory = nil }
+    context 'when undefined' do
+      before { described_class.config_directory = nil }
 
-      it{ expect{ subject }.to raise_error("config_directory should be defined") }
+      it { expect { subject }.to raise_error('config_directory should be defined') }
     end
   end
 
-  describe ".configuration" do
-    subject{ described_class.configuration }
+  describe '.configuration' do
+    subject { described_class.configuration }
 
-    it{ is_expected.to be_instance_of(Global::Configuration) }
+    it { is_expected.to be_instance_of(Global::Configuration) }
 
-    context "when load from directory" do
+    context 'when load from directory' do
       describe '#rspec_config' do
         subject { super().rspec_config }
         describe '#to_hash' do
           subject { super().to_hash }
-          it { is_expected.to eq({"default_value"=>"default value", "test_value"=>"test value"}) }
+          it { is_expected.to eq('default_value' => 'default value', 'test_value' => 'test value') }
         end
       end
     end
 
-    context "when load from file" do
-      before{ described_class.config_directory = File.join(Dir.pwd, "spec/files/rspec_config") }
+    context 'when load from file' do
+      before { described_class.config_directory = File.join(Dir.pwd, 'spec/files/rspec_config') }
 
       describe '#rspec_config' do
         subject { super().rspec_config }
         describe '#to_hash' do
           subject { super().to_hash }
-          it { is_expected.to eq({"default_value"=>"default value", "test_value"=>"test value"}) }
+          it { is_expected.to eq('default_value' => 'default value', 'test_value' => 'test value') }
         end
       end
     end
 
-    context "when nested directories" do
-      it{ expect(subject.rspec["config"].to_hash).to eq({"default_value"=>"default nested value", "test_value"=>"test nested value"}) }
+    context 'when nested directories' do
+      it { expect(subject.rspec['config'].to_hash).to eq('default_value' => 'default nested value', 'test_value' => 'test nested value') }
+    end
+
+    context 'when boolean' do
+      it { expect(subject.bool_config.works).to eq(true) }
+      it { expect(subject.bool_config.works?).to eq(true) }
     end
 
-    context "when boolean" do
-      it{ expect(subject.bool_config.works).to eq(true) }
-      it{ expect(subject.bool_config.works?).to eq(true) }
+    context 'environment file' do
+      it { expect(subject.aws.activated).to eq(true) }
+      it { expect(subject.aws.api_key).to eq('some api key') }
+      it { expect(subject.aws.api_secret).to eq('some secret') }
+    end
+
+    context 'skip files with dots in name' do
+      it { expect(subject['aws.test']).to eq(nil) }
+      it { expect { subject.fetch('aws.test') }.to raise_error(KeyError, /key not found/) }
     end
   end
 
-  context ".reload!" do
-    subject{ described_class.reload! }
+  context '.reload!' do
+    subject { described_class.reload! }
 
     before do
       described_class.configuration
-      described_class.environment = "development"
+      described_class.environment = 'development'
     end
 
     after do
-      described_class.environment = "test"
+      described_class.environment = 'test'
       described_class.reload!
     end
 
-    it{ is_expected.to be_instance_of(Global::Configuration) }
+    it { is_expected.to be_instance_of(Global::Configuration) }
 
     describe '#rspec_config' do
       subject { super().rspec_config }
       describe '#to_hash' do
         subject { super().to_hash }
-        it { is_expected.to eq({"default_value"=>"default value", "test_value"=>"development value"}) }
+        it { is_expected.to eq('default_value' => 'default value', 'test_value' => 'development value') }
       end
     end
   end
-  
-  describe ".respond_to_missing?" do
-    context "when file exists" do
-      subject{ described_class.respond_to?(:rspec_config) }
 
-      it{ is_expected.to be_truthy }
+  describe '.respond_to_missing?' do
+    context 'when file exists' do
+      subject { described_class.respond_to?(:rspec_config) }
+
+      it { is_expected.to be_truthy }
     end
 
-    context "when file does not exist" do
-      subject{ described_class.respond_to?(:some_file) }
+    context 'when file does not exist' do
+      subject { described_class.respond_to?(:some_file) }
 
-      it{ is_expected.to be_falsey }
+      it { is_expected.to be_falsey }
     end
   end
 
-  describe ".method_missing" do
-    context "when file exists" do
-      subject{ described_class.rspec_config }
+  describe '.method_missing' do
+    context 'when file exists' do
+      subject { described_class.rspec_config }
 
-      it{ is_expected.to  be_kind_of(Global::Configuration) }
+      it { is_expected.to be_kind_of(Global::Configuration) }
     end
 
-    context "when file does not exist" do
-      subject{ described_class.some_file }
+    context 'when file does not exist' do
+      subject { described_class.some_file }
 
-      it{ expect{ subject }.to raise_error(NoMethodError) }
+      it { expect { subject }.to raise_error(NoMethodError) }
     end
 
-    context "when file with nested hash" do
-      subject{ described_class.nested_config }
+    context 'when file with nested hash' do
+      subject { described_class.nested_config }
 
-      it{ is_expected.to be_kind_of(Global::Configuration) }
+      it { is_expected.to be_kind_of(Global::Configuration) }
     end
 
   end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$:.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'global'
 require 'simplecov'
@@ -40,4 +40,4 @@ RSpec.configure do |config|
 
   config.order = 'random'
   config.include JavascriptHelper
-end
+end

data/spec/support/javascript_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if defined?(JRUBY_VERSION)
   require 'rhino'
   JS_LIB_CLASS = Rhino
@@ -7,6 +9,7 @@ else
 end
 
 module JavascriptHelper
+
   def evaljs(string, force = false)
     jscontext(force).eval(string)
   end
@@ -21,4 +24,4 @@ module JavascriptHelper
     end
   end
 
-end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: global
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Railsware LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-26 00:00:00.000000000 Z
+date: 2018-06-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 12.3.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 12.3.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -25,33 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.57'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.57'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: 0.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +102,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
@@ -101,6 +116,8 @@ files:
 - lib/global/configuration.rb
 - lib/global/engine.rb
 - lib/global/version.rb
+- spec/files/aws.test.yml
+- spec/files/aws.yml
 - spec/files/bool_config.yml
 - spec/files/nested_config.yml
 - spec/files/rspec/config.yml
@@ -135,6 +152,8 @@ signing_key:
 specification_version: 4
 summary: Simple way to load your configs from yaml
 test_files:
+- spec/files/aws.test.yml
+- spec/files/aws.yml
 - spec/files/bool_config.yml
 - spec/files/nested_config.yml
 - spec/files/rspec/config.yml