anyway_config 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19177bb68f7f250550ee553fb36c41f33fe181b7
-  data.tar.gz: f6fa6a2cb3f29c3434a0c8f660c97adc74a3f6d1
+  metadata.gz: 458041a187fa4057159e72a80b71b2f5c2110b18
+  data.tar.gz: e96284b36eea6da6390ea0ebf2e029f7ebda186c
 SHA512:
-  metadata.gz: e1b58e60a43d24867f9a6e81a4ea032ac94b373592638b150001aa8e105e51dea2289bc84acd2edece19a1956f369c1ec522b62adcd81600b0001a8190e5a936
-  data.tar.gz: 164ea5df4fe0444e6f3e64df243c7602c2c0dbaf5615442c19246e20f75bedf3ba0a662028831eb11852f726109aa3e1fd5546570e3cee0889f3282551c1a8c7
+  metadata.gz: 4b677bda47bc679d8d50b80a930904f13678ffb36533fc9ccbc05f1e5dd39d549173995abd532dc47b7a70958fe7f381e423a6b77524a0fbcec69ebaa649c481
+  data.tar.gz: a9ca0a93fbfc54679a06665a0b67ce9b9fa8be644a62c81be196c392cf511d01a4e3a54eaf68ea07de7591eb5e3bace8acb6a221761225e191c64c243c329047

data/README.md

@@ -15,7 +15,7 @@ Configure your gemspec
 ```ruby
 Gem::Specification.new do |s|
   ...
-  s.add_dependancy 'anyway_config', "~>0.1"
+  s.add_dependancy 'anyway_config', "~>0.4"
   ...
 end
 ```
@@ -72,7 +72,7 @@ You can use `clear` and `reload` functions on your config (which do exactly what
 In your Gemfile
 
 ```ruby
-require 'anyway_config', "~>0.2"
+require 'anyway_config', "~>0.4"
 ```
 
 In your code
@@ -106,9 +106,29 @@ Environmental variables for your config should start with your module name (or c
 
 For example, if your module is called "MyCoolGem" then your env var "MYCOOLGEM_PASSWORD" is used as `config.password`.
 
+Environment variables are type-casted (case-insensitive). 
+Examples:
+- "True", "T" and "yes" to `true`;
+- "False", "f" and "no" to `false`;
+- "nil" and "null" to `nil` (do you really need it?);
+- "123" to 123 and "3.14" to 3.14.
+
 *Anyway Config* supports nested (_hashed_) environmental variables. Just separate keys with double-underscore.
 For example, "MYCOOLGEM_OPTIONS__VERBOSE" is transformed to `config.options.verbose`.
 
+Array values are also supported:
+
+```ruby
+# Suppose ENV["MYCOOLGEM_IDS"] = '1,2,3'
+config.ids #=> [1,2,3]
+```
+
+If you want to provide text-like env variable which contain commas then wrap it into quotes:
+
+```ruby
+MYCOOLGEM="Nif-Nif, Naf-Naf and Nouf-Nouf"
+```
+
 ## Using without Rails
 
 AnywayConfig can be used without Rails too. 

data/lib/anyway/config.rb

@@ -26,7 +26,7 @@ module Anyway
 
       private
         def extract_name
-          self.name[/^(\w+)/].underscore
+          name[/^(\w+)/].underscore
         end
     end
 
@@ -43,7 +43,7 @@ module Anyway
 
     def clear
       self.class.config_attributes.each do |attr|
-        self.send("#{attr}=", nil)
+        send("#{attr}=", nil)
       end
       self
     end
@@ -51,7 +51,7 @@ module Anyway
     def load
       config = load_from_sources self.class.defaults.deep_dup
       config.each do |key, val| 
-        self.send("#{key}=",val)
+        set_value(key, val)
       end
     end
 
@@ -73,5 +73,13 @@ module Anyway
       config.deep_merge! (Anyway.env.send(@config_name) || {})
       config
     end
+
+    private
+
+    # safe way to assing config value
+    # checks that key exists in config
+    def set_value(key, val)
+      send("#{key}=", val) if self.class.config_attributes.include?(key.to_sym)
+    end    
   end
 end

data/lib/anyway/env.rb

@@ -1,5 +1,12 @@
 module Anyway
   class Env
+
+    # Regexp to detect array values
+    # Array value is a values that contains at least one comma
+    # and doesn't start/end with quote 
+
+    ARRAY_RXP = /\A[^'"].*\s*,\s*.*[^'"]\z/
+
     def initialize
       @data = {}
       load
@@ -28,7 +35,7 @@ module Anyway
         ENV.each_pair do |key, val|
           if config_key?(key)
             mod, path = extract_module_path(key)
-            set_by_path(get_hash(@data, mod), path, val)
+            set_by_path(get_hash(@data, mod), path, serialize_val(val))
           end
         end
       end
@@ -55,5 +62,26 @@ module Anyway
       def get_hash(from, name)
         (from[name] ||= {}.with_indifferent_access)
       end
+
+      def serialize_val(value)
+        case value
+        when ARRAY_RXP
+          value.split(/\s*,\s*/).map(&method(:serialize_val))
+        when /\A(true|t|yes|y)\z/i
+          true
+        when /\A(false|f|no|n)\z/i
+          false
+        when /\A(nil|null)\z/i
+          nil
+        when /\A\d+\z/
+          value.to_i
+        when /\A\d*\.\d+\z/
+          value.to_f
+        when /\A['"].*['"]\z/
+          value.gsub(/(\A['"]|['"]\z)/,'')
+        else
+          value
+        end
+      end
   end
 end

data/lib/anyway/version.rb

@@ -1,3 +1,3 @@
 module Anyway
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/config_spec.rb

@@ -48,7 +48,7 @@ describe Anyway::Config do
         ENV['COOL_PORT'] = '80'
         ENV['COOL_USER__NAME'] = 'john'
         Anyway.env.reload
-        expect(conf.port).to eq '80'
+        expect(conf.port).to eq 80
         expect(conf.user[:name]).to eq 'john'
       end
     end
@@ -73,7 +73,7 @@ describe Anyway::Config do
         ENV['COOL_USER__NAME'] = 'john'
         Anyway.env.reload
         conf.reload
-        expect(conf.port).to eq '80'
+        expect(conf.port).to eq 80
         expect(conf.user[:name]).to eq 'john'
       end
     end
@@ -86,7 +86,7 @@ describe Anyway::Config do
       ENV['MYAPP_NAME'] = 'my_app'
       Anyway.env.reload
       data = Anyway::Config.for(:my_app)
-      expect(data[:test]).to eq '1'
+      expect(data[:test]).to eq 1
       expect(data[:name]).to eq 'my_app'
       if Rails.application.respond_to?(:secrets)
         expect(data[:secret]).to eq 'my_secret' 

data/spec/dummy/config/secrets.yml

@@ -19,9 +19,11 @@ test:
     user:
       name: test
       password: test
+    bullshit: 'mooo'
   my_app:
     name: 'app'
     secret: 'my_secret'
+    elshit: 'UUU'
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.

data/spec/env_spec.rb

@@ -13,9 +13,20 @@ describe Anyway::Env do
   it "should load hash values" do
     ENV['TESTO_DATA__ID'] = '1'
     ENV['TESTO_DATA__META__NAME'] = 'meta'
-    ENV['TESTO_DATA__META__VAL'] = '2'
-    expect(env.testo[:data][:id]).to eq '1'
+    ENV['TESTO_DATA__META__VAL'] = 'true'
+    expect(env.testo[:data][:id]).to eq 1
     expect(env.testo[:data][:meta][:name]).to eq 'meta'
-    expect(env.testo[:data][:meta][:val]).to eq '2'
+    expect(env.testo[:data][:meta][:val]).to be_truthy
+  end
+
+  it "should load array values" do
+    ENV['TESTO_DATA__IDS'] = '1,2, 3'
+    ENV['TESTO_DATA__META__NAMES'] = 'meta, kotleta'
+    ENV['TESTO_DATA__META__SIZE'] = '2'
+    ENV['TESTO_DATA__TEXT'] = '"C\'mon, everybody"'
+    expect(env.testo[:data][:ids]).to include(1,2,3)
+    expect(env.testo[:data][:meta][:names]).to include('meta','kotleta')
+    expect(env.testo[:data][:meta][:size]).to eq 2
+    expect(env.testo[:data][:text]).to eq "C'mon, everybody"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anyway_config
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Vlad Dem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport