has_configuration 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6871b976889ba1ea377fbbf55f82fb08403a6f62cdbe9fff33a91e7926488e3
-  data.tar.gz: 17211a4e0791bab7b86da28954df9566edf5d02fdf7a711540211a3a608af1eb
+  metadata.gz: 434cfdd0e94cbe7c1a355fbe98c4ba7ed644a531f788312005274a5dd4329fd8
+  data.tar.gz: d5fc4f5af682a4269a891b78d288a4c8215e5955d9e054868cf52ca2176a82db
 SHA512:
-  metadata.gz: 206e30a3690d3ae732be32455725da21f26d175df81cc5d42259ae3b41223d7b59a2ad01d455ad016a262d4bc08bf7e23a531cd6371b573453a360cd457259e1
-  data.tar.gz: 1dad8056157f26e4462ee98176361b68ce5e994a6e5afbb9e8e5c6983c8dd00962b6e4a2684f0c0dfe3bb8fd972be20d7b9f4ab6f1a104f4e440bf074339fa72
+  metadata.gz: 6c3fc02339bb8477a1c87a221978f20075ed7bc58eb29ff7303cf170a766be94ed40f2b3be7897d4d688df19d002e211ca495d10ce98ffe63957098419d1fb18
+  data.tar.gz: 2fd3655341039fa4d68848864c09d09077275bdde19b1aea54e68029e9106802ef8ebd0f96f53a38108ab656f8ebe05ca37e6d32c50a36104631bdd2c4d53b0e

data/lib/has_configuration/configuration.rb

@@ -31,12 +31,16 @@ module HasConfiguration #:nodoc:
     end
 
     def load_file
-      @raw = YAML.safe_load(
-        ERB.new(raw_file(filename)).result,
-        [],  # whitelist_classes
-        [],  # whitelist_symbols
-        true # allow aliases
-      )
+      @raw = if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6.0')
+               YAML.safe_load(ERB.new(raw_file(filename)).result, aliases: true)
+             else
+               YAML.safe_load(
+                 ERB.new(raw_file(filename)).result,
+                 [],  # whitelist_classes
+                 [],  # whitelist_symbols
+                 true # allow aliases
+               )
+             end
     end
 
     def init_hash
@@ -65,7 +69,7 @@ module HasConfiguration #:nodoc:
     end
 
     def environment
-      return @options[:env] if @options.keys.include?(:env)
+      return @options[:env] if @options.key?(:env)
       return Rails.env.to_s if defined?(Rails)
     end
 

data/lib/has_configuration.rb

@@ -71,7 +71,7 @@ module HasConfiguration #:nodoc:
     #
     def has_configuration(options = {})
       @configuration = Configuration.new(self, options)
-      include Getter # rubocop:disable Style/MixinUsage
+      include Getter
     end
 
     # Adds getters for the configuration

data/lib/version.rb

@@ -2,7 +2,7 @@ module HasConfiguration #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    BUILD = 0
+    BUILD = 1
 
     STRING = [MAJOR, MINOR, BUILD].join('.')
   end

data/spec/lib/has_configuration/configuration_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe HasConfiguration::Configuration do
   let(:klass) { Class }
 
   before do
-    allow_any_instance_of(
+    allow_any_instance_of( # rubocop:disable RSpec/AnyInstance
       Configuration
     ).to receive(:raw_file).and_return(File.read(fixture))
   end
@@ -18,8 +18,8 @@ RSpec.describe HasConfiguration::Configuration do
       let(:file) { '/RAILS_ROOT/config/class.yml' }
 
       it 'loads default file' do
-        expect_any_instance_of(Configuration).to receive(:raw_file).with(file)
-        HasConfiguration::Configuration.new(klass)
+        configuration = described_class.new(klass)
+        expect(configuration).to have_received(:raw_file).with(file)
       end
     end
 
@@ -27,8 +27,8 @@ RSpec.describe HasConfiguration::Configuration do
       let(:file) { 'foo/bar.yml' }
 
       it 'loads provided file' do
-        expect_any_instance_of(Configuration).to receive(:raw_file).with(file)
-        HasConfiguration::Configuration.new(klass, file: file)
+        configuration = described_class.new(klass, file: file)
+        expect(configuration).to have_received(:raw_file).with(file)
       end
     end
   end
@@ -36,32 +36,31 @@ RSpec.describe HasConfiguration::Configuration do
   context 'when initialized' do
     let(:environment) { nil }
 
-    context 'environment' do
-      let(:fixture) { 'spec/fixtures/class.yml' }
+    context 'without env option' do
+      subject(:hash) { described_class.new(klass).to_h }
 
-      context 'without env option' do
-        subject(:hash) { HasConfiguration::Configuration.new(klass).to_h }
+      let(:fixture) { 'spec/fixtures/class.yml' }
 
-        it 'return the expected hash' do
-          expect(hash).to eq('env' => 'test')
-        end
+      it 'return the expected hash' do
+        expect(hash).to eq('env' => 'test')
       end
+    end
 
-      context 'with env option' do
-        let(:environment) { 'production' }
+    context 'with env option' do
+      subject(:hash) { described_class.new(klass, env: environment).to_h }
 
-        subject(:hash) { HasConfiguration::Configuration.new(klass, env: environment).to_h }
+      let(:environment) { 'production' }
+      let(:fixture) { 'spec/fixtures/class.yml' }
 
-        it 'return the expected hash' do
-          expect(hash).to eq('env' => environment)
-        end
+      it 'return the expected hash' do
+        expect(hash).to eq('env' => environment)
       end
     end
 
-    context 'yaml defaults' do
-      let(:fixture) { 'spec/fixtures/with_defaults.yml' }
+    context 'with yaml defaults' do
+      subject(:hash) { described_class.new(klass).to_h }
 
-      subject(:hash) { HasConfiguration::Configuration.new(klass).to_h }
+      let(:fixture) { 'spec/fixtures/with_defaults.yml' }
 
       it 'return the expected hash' do
         expect(hash).to eq('default' => 'default', 'env' => 'test')
@@ -69,9 +68,9 @@ RSpec.describe HasConfiguration::Configuration do
     end
 
     context 'with erb' do
-      let(:fixture) { 'spec/fixtures/with_erb.yml' }
+      subject(:hash) { described_class.new(klass).to_h }
 
-      subject(:hash) { HasConfiguration::Configuration.new(klass).to_h }
+      let(:fixture) { 'spec/fixtures/with_erb.yml' }
 
       it 'return the expected hash' do
         expect(hash).to eq('erb' => Rails.env)
@@ -82,27 +81,30 @@ RSpec.describe HasConfiguration::Configuration do
   describe '#to_h' do
     let(:fixture) { 'spec/fixtures/with_nested_attributes.yml' }
 
-    context '#to_h' do
-      subject { HasConfiguration::Configuration.new(klass).to_h }
-      it { should be_a(HashWithIndifferentAccess) }
+    context 'without arguments' do
+      subject { described_class.new(klass).to_h }
+
+      it { is_expected.to be_a(HashWithIndifferentAccess) }
     end
 
-    context '#to_h(:stringify)' do
-      subject { HasConfiguration::Configuration.new(klass).to_h(:stringify) }
-      it { should eq('env' => 'test', 'nested' => { 'foo' => 'bar', 'baz' => true }) }
+    context 'with :stringify' do
+      subject { described_class.new(klass).to_h(:stringify) }
+
+      it { is_expected.to eq('env' => 'test', 'nested' => { 'foo' => 'bar', 'baz' => true }) }
     end
 
-    context '#to_h(:symbolized)' do
-      subject { HasConfiguration::Configuration.new(klass).to_h(:symbolized) }
-      it { should eq(env: 'test', nested: { foo: 'bar', baz: true }) }
+    context 'with :symbolized' do
+      subject { described_class.new(klass).to_h(:symbolized) }
+
+      it { is_expected.to eq(env: 'test', nested: { foo: 'bar', baz: true }) }
     end
   end
 
   describe 'struct methods' do
-    let(:configuration) { HasConfiguration::Configuration.new(klass) }
+    let(:configuration) { described_class.new(klass) }
     let(:fixture) { 'spec/fixtures/with_nested_attributes.yml' }
 
-    it 'is structified' do
+    it 'supports multiple getter variants' do # rubocop:disable RSpec/MultipleExpectations
       expect(configuration.to_h[:env]).to eql('test')
       expect(configuration.env).to eql('test')
 

data/spec/lib/has_configuration_spec.rb

@@ -1,29 +1,27 @@
 RSpec.describe HasConfiguration do
   context 'when declared' do
-    before(:all) do
-      Dummy = Class.new do
-        require 'has_configuration'
-        has_configuration file: 'spec/fixtures/class.yml'
-      end
+    Dummy = Class.new do
+      require 'has_configuration'
+      has_configuration file: 'spec/fixtures/class.yml'
     end
 
-    context 'the class' do
+    context 'with a class' do
       subject(:dummy) { Dummy }
 
-      it { should respond_to(:configuration) }
+      it { is_expected.to respond_to(:configuration) }
 
       it 'returns a configuration' do
-        expect(dummy.configuration).to be
+        expect(dummy.configuration).to be_present
       end
     end
 
-    context 'an instance' do
+    context 'with an instance' do
       subject(:dummy) { Dummy.new }
 
-      it { should respond_to(:configuration) }
+      it { is_expected.to respond_to(:configuration) }
 
       it 'returns a configuration' do
-        expect(dummy.configuration).to be
+        expect(dummy.configuration).to be_present
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_configuration
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Martin Spickermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-26 00:00:00.000000000 Z
+date: 2019-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |2
       Loads configuration setting from a yml file and adds a configuation method
       to class and instances
@@ -120,8 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Simple configuration handling