nenv 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 206715ae7f773db5e3f4f38a3883e452d9663023
-  data.tar.gz: 8222926939dc0d449a98b13d394a997c2910663b
+  metadata.gz: e171d19f1dd8bef695d51433259491ef6c8dc3d9
+  data.tar.gz: 7d483ec2cc9dbe6e73e71ffbdbba9bf04b7453d8
 SHA512:
-  metadata.gz: 765ddaad9d2a4ecb29150945fd016c9314d79e472dd49032b47cda912f47c166faa7710d43eaf46feab31586e3b09e982392ffa9708b65eace8cae231316b5a2
-  data.tar.gz: d014fd2ca1203dc5c1a9537de121d7603e06a42912626abd3eb7d6c33258916ff1e5c377aa0f7f6d746441abfa069e16de017331f12ec57eeeeb54d8fc29e5be
+  metadata.gz: 71c964c3183680d92cc5ffbc5473a19eecf97b65bb62e3780a986d0fbc45974b6700acb8c43eea1f652a41c2d41b5cafa410918efd3bc55741da827550d8b02c
+  data.tar.gz: df1f9900dbaec9e6ca93254537b79847acbd3b7857d12ddf8aea6ddc6d9d313e1f747b734de7334747a1aad40a28dda040c1c604760772dbf873240409303970

data/lib/nenv/environment.rb

@@ -22,12 +22,8 @@ module Nenv
       @namespace = (namespace ? namespace.upcase : nil)
     end
 
-    def self.create_method(meth, &block)
-      _create_env_method(self, meth, &block)
-    end
-
     def create_method(meth, &block)
-      self.class._create_env_method(class << self; self; end, meth, &block)
+      self.class._create_env_accessor(singleton_class, meth, &block)
     end
 
     private
@@ -36,23 +32,50 @@ module Nenv
       meth.to_s[/^([^=?]*)[=?]?$/, 1].upcase
     end
 
-    def self._create_env_method(instance, meth, &block)
-      _fail_if_exists(instance, meth)
+    def _namespaced_sanitize(meth)
+      [@namespace, _sanitize(meth)].compact.join('_')
+    end
 
-      instance.send(:define_method, meth) do |*args|
-        env_name = [@namespace, _sanitize(meth)].compact.join('_')
+    class << self
+      def create_method(meth, &block)
+        _create_env_accessor(self, meth, &block)
+      end
 
-        if args.size == 1
-          raw_value = args.first
-          ENV[env_name] = Dumper.new.dump(raw_value, &block)
+      def _create_env_accessor(klass, meth, &block)
+        _fail_if_accessor_exists(klass, meth)
+
+        if meth.to_s.end_with? '='
+          _create_env_writer(klass, meth, &block)
         else
-          Loader.new(meth).load(ENV[env_name], &block)
+          _create_env_reader(klass, meth, &block)
         end
       end
-    end
 
-    def self._fail_if_exists(instance, meth)
-      fail(AlreadyExistsError, meth) if instance.instance_methods.include?(meth)
+      private
+
+      def _create_env_writer(klass, meth, &block)
+        env_name = nil
+        dumper = nil
+        klass.send(:define_method, meth) do |raw_value|
+          env_name ||= _namespaced_sanitize(meth)
+          dumper ||= Dumper.setup(&block)
+          ENV[env_name] = dumper.(raw_value)
+        end
+      end
+
+      def _create_env_reader(klass, meth, &block)
+        env_name = nil
+        loader = nil
+        klass.send(:define_method, meth) do
+          env_name ||= _namespaced_sanitize(meth)
+          loader ||= Loader.setup(meth, &block)
+          loader.(ENV[env_name])
+        end
+      end
+
+      def _fail_if_accessor_exists(klass, meth)
+        fail(AlreadyExistsError, meth) if klass.method_defined?(meth)
+      end
     end
   end
 end

data/lib/nenv/environment/dumper.rb

@@ -1,9 +1,14 @@
 module Nenv
   class Environment
-    class Dumper
-      def dump(raw_value, &callback)
-        return callback.call(raw_value) if callback
-        raw_value.nil? ? nil : raw_value.to_s
+    module Dumper
+      require 'nenv/environment/dumper/default'
+
+      def self.setup(&callback)
+        if callback
+          callback
+        else
+          Default
+        end
       end
     end
   end

data/lib/nenv/environment/dumper/default.rb

@@ -0,0 +1,9 @@
+module Nenv
+  class Environment
+    module Dumper::Default
+      def self.call(raw_value)
+        raw_value.nil? ? nil : raw_value.to_s
+      end
+    end
+  end
+end

data/lib/nenv/environment/loader.rb

@@ -1,27 +1,18 @@
 module Nenv
   class Environment
-    class Loader
-      def initialize(meth)
-        @bool = meth.to_s.end_with?('?')
-      end
-
-      def load(raw_value, &callback)
-        return callback.call(raw_value) if callback
-        @bool ? _to_bool(raw_value) : raw_value
-      end
-
-      private
+    module Loader
+      require 'nenv/environment/loader/predicate'
+      require 'nenv/environment/loader/default'
 
-      def _to_bool(raw_value)
-        case raw_value
-        when nil
-          nil
-        when ''
-          fail ArgumentError, "Can't convert empty string into Bool"
-        when '0', 'false', 'n', 'no', 'NO', 'FALSE'
-          false
+      def self.setup(meth, &callback)
+        if callback
+          callback
         else
-          true
+          if meth.to_s.end_with? '?'
+            Predicate
+          else
+            Default
+          end
         end
       end
     end

data/lib/nenv/environment/loader/default.rb

@@ -0,0 +1,9 @@
+module Nenv
+  class Environment
+    module Loader::Default
+      def self.call(raw_value)
+        raw_value
+      end
+    end
+  end
+end

data/lib/nenv/environment/loader/predicate.rb

@@ -0,0 +1,18 @@
+module Nenv
+  class Environment
+    module Loader::Predicate
+      def self.call(raw_value)
+        case raw_value
+        when nil
+          nil
+        when ''
+          fail ArgumentError, "Can't convert empty string into Bool"
+        when '0', 'false', 'n', 'no', 'NO', 'FALSE'
+          false
+        else
+          true
+        end
+      end
+    end
+  end
+end

data/lib/nenv/version.rb

@@ -1,3 +1,3 @@
 module Nenv
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nenv
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Cezary Baginski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,7 +68,10 @@ files:
 - lib/nenv/builder.rb
 - lib/nenv/environment.rb
 - lib/nenv/environment/dumper.rb
+- lib/nenv/environment/dumper/default.rb
 - lib/nenv/environment/loader.rb
+- lib/nenv/environment/loader/default.rb
+- lib/nenv/environment/loader/predicate.rb
 - lib/nenv/version.rb
 - nenv.gemspec
 homepage: https://github.com/e2/nenv
@@ -91,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Convenience wrapper for Ruby's ENV