a9n 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d25e665f63827ffa8e6e813bec78b80736dbc6e321659465b7758c70eb7a93d5
-  data.tar.gz: '0587ac992772835f359d251375a8565606c812f63796a87b91c978b4bfc7b99f'
+  metadata.gz: 4ee6b81b16b79243d8124f9cc0565dfb4e2da7814c49a1b0fdf564e1db54ba1d
+  data.tar.gz: 0f09a8578098ca8d894b5dc5fa51030e009dbe175b0ac1d42e1b43d078bb4e0f
 SHA512:
-  metadata.gz: cd9dd712d5e296798537ee5ded3647a11907645da77b0495154e3ff194af381ad45961d3d1c3b269987f78650c3dc1ee8ac24f35f5ad99742801580f528a4d6b
-  data.tar.gz: 65f3792eaadc7d9d4cd846992b5669dcedb8924cf6eb7e84c8889ce1925392a621e40974407044385c12afb3a754f1bb61c765b4acf9eea3c14c13350508c354
+  metadata.gz: 324a28691a19dfd3455c55525221c17629e88036adbfad6f819f165e336647d4022c4cf6a1db71546595519447fbab3a94fd343d6faf1911bd710df57f206f45
+  data.tar.gz: 27ae7fc1b29f3714049a37ee55173dd658cb553435c70cdc12de7e118d6b1e9485e74766a4dacf7f63307d7df1a5cf6765f487bcc884918cd83fcb881ad5792e

data/Rakefile

@@ -1,10 +1,13 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new
+
 desc 'Run all specs'
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = './spec/**/*_spec.rb'
   t.rspec_opts = ['--profile', '--color']
 end
 
-task default: :spec
+task default: [:spec, :rubocop]

data/lib/a9n.rb

@@ -45,7 +45,7 @@ module A9n
     end
 
     def root
-      @root ||= app_root || root_from_bundle_env || fail(RootNotSetError)
+      @root ||= app_root || root_from_bundle_env || raise(RootNotSetError)
     end
 
     def app_root
@@ -54,8 +54,11 @@ module A9n
 
     def root_from_bundle_env
       return nil unless ENV['BUNDLE_GEMFILE']
+
       dir = File.dirname(ENV['BUNDLE_GEMFILE'])
+
       return nil unless File.directory?(dir)
+
       Pathname.new(dir)
     end
 
@@ -84,7 +87,7 @@ module A9n
     def default_files
       files  = Dir[root.join("config/{#{A9n::Scope::ROOT_NAMES.join(',')}}.#{EXTENSION_LIST}").to_s]
       files += Dir[root.join("config/a9n/*.#{EXTENSION_LIST}")]
-      files.map { |f| f.sub(/.example$/, '') }.uniq
+      files.map { |f| f.sub(/.example$/, '') }.uniq.sort
     end
 
     def load(*files)

data/lib/a9n/ext/string_inquirer.rb

@@ -1,4 +1,4 @@
-# https://github.com/rails/rails/edit/master/activesupport/lib/active_support/string_inquirer.rb
+# Based on https://github.com/rails/rails/blob/master/activesupport/lib/active_support/string_inquirer.rb
 module A9n
   class StringInquirer < String
     private

data/lib/a9n/loader.rb

@@ -2,7 +2,8 @@ module A9n
   class Loader
     attr_reader :scope, :env, :local_file, :example_file, :struct
 
-    COMMON_SCOPE = 'defaults'.freeze
+    COMMON_NAMESPACE = 'defaults'.freeze
+    KNOWN_NAMESPACES = [COMMON_NAMESPACE, 'development', 'test', 'staging', 'production'].freeze
 
     def initialize(file_path, scope, env)
       @scope = scope
@@ -31,16 +32,24 @@ module A9n
 
         yml = YAML.load(ERB.new(File.read(file_path)).result)
 
-        common_scope = prepare_yml_scope(yml, scope, COMMON_SCOPE)
-        env_scope    = prepare_yml_scope(yml, scope, env)
+        if no_known_namespaces?(yml)
+          prepare_hash(yml, scope).freeze
+        else
+          common_namespace = prepare_hash(yml[COMMON_NAMESPACE], scope)
+          env_namespace    = prepare_hash(yml[env], scope)
 
-        A9n::Hash.merge(common_scope, env_scope).freeze
+          A9n::Hash.merge(common_namespace, env_namespace).freeze
+        end
       end
 
-      def prepare_yml_scope(yml, scope, env)
-        return nil unless yml[env].is_a?(::Hash)
+      def prepare_hash(data, scope)
+        return nil unless data.is_a?(::Hash)
 
-        A9n::Hash.deep_prepare(yml[env], scope).freeze
+        A9n::Hash.deep_prepare(data, scope).freeze
+      end
+
+      def no_known_namespaces?(yml)
+        (yml.keys & KNOWN_NAMESPACES).empty?
       end
     end
 

data/lib/a9n/version.rb

@@ -1,3 +1,3 @@
 module A9n
-  VERSION = '0.9.1'.freeze
+  VERSION = '0.10.0'.freeze
 end

data/spec/integration/a9n_spec.rb

@@ -130,4 +130,21 @@ RSpec.describe A9n do
       expect(subject.fetch(:mailer)).to eq(subject.mailer)
     end
   end
+
+  context 'extra config file without known namspaces' do
+    before do
+      expect(subject.emails).to be_kind_of(A9n::Struct)
+    end
+
+    it do
+      expect(subject.emails.knapo).to eq('knapo@a9n.local')
+      expect(subject.emails.admin).to eq('admin@a9n.local')
+      expect { subject.emails.foo }.to raise_error(A9n::NoSuchConfigurationVariableError)
+    end
+
+    it do
+      expect(subject.emails.fetch(:knapo)).to eq('knapo@a9n.local')
+      expect(subject.emails.fetch(:admin)).to eq('admin@a9n.local')
+    end
+  end
 end

data/spec/unit/a9n_spec.rb

@@ -127,17 +127,7 @@ RSpec.describe A9n do
 
     context 'when app is not set' do
       it do
-        expect(subject.root).to eq(nil)
-      end
-
-      context 'when setting a custom path when is falsy' do
-        before do
-          subject.root ||= '/home/knapo/workspace/a9n'
-        end
-
-        it do
-          expect(subject.root).to eq(Pathname.new('/home/knapo/workspace/a9n'))
-        end
+        expect(subject.root).to eq(A9n.root_from_bundle_env)
       end
 
       context 'when setting a custom path' do

data/test_app/config/a9n/emails.yml

@@ -0,0 +1,2 @@
+knapo: "knapo@a9n.local"
+admin: "admin@a9n.local"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: a9n
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Krzysztof Knapik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
@@ -136,6 +136,7 @@ files:
 - test_app/config/a9n.yml.example
 - test_app/config/a9n/aws.yml
 - test_app/config/a9n/cloud.yml.erb
+- test_app/config/a9n/emails.yml
 - test_app/config/a9n/mailer.yml.example
 - test_app/config/no_defaults.yml
 homepage: https://github.com/knapo/a9n