a9n 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21f8c63dec2204f125358ccde13f47b549fcb504
-  data.tar.gz: 812f362075f3155c1f91d1514b1fb04e61a9be05
+  metadata.gz: 14a5336e3c89478cdefd0df4a7c71dd78e809b10
+  data.tar.gz: 5ddb8cbb02e172e3bd26e43c2397ae0d49581a9a
 SHA512:
-  metadata.gz: 847e440280de1c18814527281935fd658674e7b90bee168b445c57903d0fd14c83bf29c74cc38211998615eda96f4510fc377e0e40ce63279549db5d7d4508f4
-  data.tar.gz: 38630688d8e2ab8ba68ca5b3341cd8d802a92c0f194aa582d6f5d023f5f68432177adb3cb2287e8823122b534e77673f109852a8b76002c8fdd08afc9362cd94
+  metadata.gz: 84e86886b37e5c7f785f6c9e9b0221aa05c9b0feced8f7992328d9bc475ff4842272d6011ef98cedb7153b289a40f63390e278d8a17ebde5647e71eccf3614b2
+  data.tar.gz: 4995758ee232692f671f8f944865712ff169bdb4ac0c166a0fe6ce0eebd95295f35909a6d35189dca44b5913c139565f58531309c8cf7ca37633a61f3c98a097

data/.travis.yml

@@ -1,10 +1,6 @@
 language: ruby
 rvm:
-  - "1.8.7"
   - "1.9.3"
   - "2.0.0"
-  - jruby-18mode # JRuby in 1.8 mode
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
+  - jruby-19mode
   - rbx-19mode
-  - ree

data/Gemfile

@@ -2,5 +2,5 @@ source 'https://rubygems.org'
 
 gemspec
 gem 'rake'
-gem 'rspec'
-gem 'coveralls', :require => false
+gem 'rspec', '~> 2.14.0.rc1'
+gem 'coveralls', require: false

data/README.md

@@ -10,7 +10,7 @@
 [codeclimate]: https://codeclimate.com/github/knapo/a9n
 [coveralls]: https://coveralls.io/r/knapo/a9n
 
-Simple tool for managing ruby/rails application configurations. Supports Rails 2.x, 3.x, 4.x.
+Simple tool for managing extra configuration in ruby/rails apps. Supports Rails 2.x, 3.x, 4.x and Ruby 1.9, 2.0. For Ruby 1.8 use version < 1.0
 
 ## Installation
 

data/Rakefile

@@ -8,4 +8,4 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = ['--profile', '--color']
 end
 
-task :default => :spec
+task default: :spec

data/lib/a9n.rb

@@ -18,7 +18,7 @@ module A9n
     end
 
     def env
-      @env ||= local_app_env || ENV['RAILS_ENV'] || ENV['RACK_ENV'] || ENV['APP_ENV']
+      @env ||= local_app_env || get_env_var('RAILS_ENV') || get_env_var('RACK_ENV') || get_env_var('APP_ENV')
     end
 
     def local_app_env
@@ -82,6 +82,14 @@ module A9n
       config.send(name, *args)
     end
 
+    def get_rails
+      defined?(Rails) ? Rails : nil
+    end
+
+    def get_env_var(name)
+      ENV[name] 
+    end
+    
     private
 
     def verify!(base, local)
@@ -90,9 +98,5 @@ module A9n
         raise MissingConfigurationVariables.new("Following variables are missing in your configuration file: #{missing_keys.join(',')}")
       end
     end
-
-    def get_rails
-      defined?(Rails) ? Rails : nil
-    end
   end
 end

data/lib/a9n/struct.rb

@@ -11,11 +11,7 @@ module A9n
     end
 
     def method_missing(name, *args)
-      unless @table.key?(name.to_sym)
-        raise NoSuchConfigurationVariable.new(name)
-      end
-
-      return @table[name.to_sym]
+      raise NoSuchConfigurationVariable.new(name)
     end
   end
 end

data/lib/a9n/version.rb

@@ -1,3 +1,3 @@
 module A9n
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/a9n_spec.rb

@@ -4,7 +4,7 @@ describe A9n do
   describe '.local_app' do
     context 'when rails not found' do
       before {
-        described_class.should_receive(:get_rails).and_return(nil)
+        expect(described_class).to receive(:get_rails).and_return(nil)
       }
       specify {
         described_class.local_app.should be_nil
@@ -12,7 +12,7 @@ describe A9n do
     end
     
     context 'when custom non-rails app is being used' do
-      let(:local_app) { stub(:env => 'test', :root => '/apps/a9n') }
+      let(:local_app) { double(:env => 'test', :root => '/apps/a9n') }
       before { described_class.local_app = local_app }
 
       specify { described_class.local_app.should == local_app }
@@ -22,7 +22,7 @@ describe A9n do
   end
 
   describe '.root' do
-    let(:local_app) { stub(:env => 'test', :root => '/apps/a9n') }
+    let(:local_app) { double(:env => 'test', :root => '/apps/a9n') }
     before { described_class.local_app = local_app }
 
     context 'with custom path' do
@@ -57,9 +57,9 @@ describe A9n do
 
     context 'when no configuration file exists' do
       before do
-        described_class.should_receive(:load_yml).with('config/configuration.yml.example').and_return(nil)
-        described_class.should_receive(:load_yml).with('config/configuration.yml').and_return(nil)
-        described_class.should_receive(:verify!).never
+        expect(described_class).to receive(:load_yml).with('config/configuration.yml.example').and_return(nil)
+        expect(described_class).to receive(:load_yml).with('config/configuration.yml').and_return(nil)
+        expect(described_class).to receive(:verify!).never
       end
       it 'raises expection'  do
         lambda {
@@ -70,13 +70,14 @@ describe A9n do
     
     context 'when base configuration file exists' do
       before do
-        described_class.should_receive(:load_yml).with('config/configuration.yml.example').and_return(base_sample_config)
-        described_class.should_receive(:load_yml).with('config/configuration.yml').and_return(nil)
-        described_class.should_receive(:verify!).never
+        expect(described_class).to receive(:load_yml).with('config/configuration.yml.example').and_return(base_sample_config)
+        expect(described_class).to receive(:load_yml).with('config/configuration.yml').and_return(nil)
+        expect(described_class).to receive(:verify!).never
         described_class.load
       end
       
       its(:app_url) { should_not be_nil }
+      its(:app_url) { should == subject.fetch(:app_url) }
       specify {
         expect { subject.app_host }.to raise_error(described_class::NoSuchConfigurationVariable)
       }
@@ -84,9 +85,9 @@ describe A9n do
 
     context 'when local configuration file exists' do
       before do
-        described_class.should_receive(:load_yml).with('config/configuration.yml.example').and_return(nil)
-        described_class.should_receive(:load_yml).with('config/configuration.yml').and_return(local_sample_config)
-        described_class.should_receive(:verify!).never
+        expect(described_class).to receive(:load_yml).with('config/configuration.yml.example').and_return(nil)
+        expect(described_class).to receive(:load_yml).with('config/configuration.yml').and_return(local_sample_config)
+        expect(described_class).to receive(:verify!).never
         described_class.load
       end
       
@@ -99,8 +100,8 @@ describe A9n do
     context 'when both local and base configuration file exists' do
       context 'with same data' do
         before do
-          described_class.should_receive(:load_yml).with('config/configuration.yml.example').and_return(base_sample_config)
-          described_class.should_receive(:load_yml).with('config/configuration.yml').and_return(base_sample_config)
+          expect(described_class).to receive(:load_yml).with('config/configuration.yml.example').and_return(base_sample_config)
+          expect(described_class).to receive(:load_yml).with('config/configuration.yml').and_return(base_sample_config)
           described_class.load
         end
         
@@ -112,8 +113,8 @@ describe A9n do
 
       context 'with different data' do
         before do
-          described_class.should_receive(:load_yml).with('config/configuration.yml.example').and_return(base_sample_config)
-          described_class.should_receive(:load_yml).with('config/configuration.yml').and_return(local_sample_config)
+          expect(described_class).to receive(:load_yml).with('config/configuration.yml.example').and_return(base_sample_config)
+          expect(described_class).to receive(:load_yml).with('config/configuration.yml').and_return(local_sample_config)
         end
         it 'raises expection'  do
           expect {
@@ -129,11 +130,11 @@ describe A9n do
     subject {  described_class.load_yml(file_path) }
 
     before do
-      described_class.should_receive(:root).at_least(:once).and_return(root)
+      expect(described_class).to receive(:root).at_least(:once).and_return(root)
     end
 
     context 'when file not exists' do
-      before { described_class.should_receive(:env).never }
+      before { expect(described_class).to receive(:env).never }
       let(:file_path) { 'file_not_existing_in_universe.yml' }
       
       it 'returns nil' do
@@ -145,7 +146,7 @@ describe A9n do
       let(:file_path) { 'fixtures/configuration.yml'}
       before { 
         ENV['DWARF'] = 'erbized dwarf'
-        described_class.should_receive(:env).twice.and_return(env) 
+        expect(described_class).to receive(:env).twice.and_return(env) 
       }
 
       context 'and has data' do
@@ -178,4 +179,51 @@ describe A9n do
       end
     end
   end
+
+  describe '.env' do
+    before {
+      described_class.instance_variable_set(:@env, nil)
+    }
+
+    context 'local_app_env is set' do
+      before { 
+        expect(described_class).to receive(:local_app).and_return(double(:env => 'dwarf_env')).exactly(3).times
+        expect(described_class).to receive(:get_env_var).never
+      }
+      its(:env) { should == 'dwarf_env' }
+    end
+
+    context "when APP_ENV is set" do    
+      before { 
+        expect(described_class).to receive(:local_app_env).and_return(nil)
+        expect(described_class).to receive(:get_env_var).with('RAILS_ENV').and_return(nil)
+        expect(described_class).to receive(:get_env_var).with('RACK_ENV').and_return(nil)
+        expect(described_class).to receive(:get_env_var).with('APP_ENV').and_return('dwarf_env')
+      }
+      its(:env) { should == 'dwarf_env' }
+    end
+  end
+
+  describe '.get_env_var' do
+    before { ENV['DWARF'] = 'little dwarf' }
+    it { described_class.get_env_var('DWARF').should == 'little dwarf'}
+    it { described_class.get_env_var('IS_DWARF').should be_nil}
+  end
+
+  describe '.get_rails' do
+    context 'when defined' do
+      before {
+        Object.const_set(:Rails, Module.new)
+      }
+      after {
+        Object.send(:remove_const, :Rails)
+      }
+      it {
+        described_class.get_rails.should be_kind_of(Module) 
+      }
+    end
+    context 'when not defined' do
+      it { described_class.get_rails.should be_nil }
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,11 +1,19 @@
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start do
+  add_filter '/spec/'
+end
+
 require 'rubygems'
 require 'bundler/setup'
 
 require 'a9n'
 
-require 'coveralls'
-Coveralls.wear!
-
 RSpec.configure do |config|
   config.order = "random"
   config.color_enabled = true

data/spec/struct_spec.rb

@@ -11,6 +11,8 @@ describe A9n::Struct do
       })
   }
 
+  its(:keys) { should == [:non_empty_dwarf, :nil_dwarf, :false_dwarf, :true_dwarf, :hash_dwarf] }
+
   it 'gets non-empty value' do
     subject.non_empty_dwarf.should == 'dwarf'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: a9n
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Krzysztof Knapik