cuke_fig 0.0.2 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODM2OTFmNjk2ZTU4NTgxZWVmODQ5NDVkODdlOGM0YTM4ZTc5NzBiYQ==
+    YTViNjVkNDA5ODI1MzJlMTU2ZWNkYjc4NTY3M2UzMDJjZmJjZWJlNg==
   data.tar.gz: !binary |-
-    MTgwN2I4YzFjNWMzNGIyYjk2YmJjNmMwNTQ1MjYzMTQwZjk3OWI5Nw==
+    YWRhOGI5YWU5YTEzZDQ1OWRkMjg1ZmE1ZjNlY2YwZWE2MTZjYTQ2Ng==
 SHA512:
   metadata.gz: !binary |-
-    MGYyN2JhY2M3MDQyYWYyZjgyNTNkNzc4NWY1ZTI2MGFjNzVlODJhM2UzYmJh
-    ZDdmZmM4YWIwNmFkOTU2OWRmOTg4MTNmYTBlNmRjYTQ1MTcxZTExMDNjZjAz
-    Y2M2MjIxZGFjN2NmZTlkMGE2ZmEzNDEwNzY5MWMyMzcyYWEzNjI=
+    MWVkZTE0NDE4NzRlN2FhZjQwNjUzY2ZmZjkyZjM1YjQwN2NjYjI3MDg1NTg2
+    NWNiNjBjMjhhNzcxYzNhNzdmN2NmYjA4MzFjZTEwMDUxZWMzMjkwYmQ1NTg0
+    OGE5NDAxZmVkNGE2MDJkYjAyZTYwZTIyMjQ1Yjk2MGUwZDgwNzU=
   data.tar.gz: !binary |-
-    NzVlYmNiZDkxZWZkMTA5MzU0NWI5ZGIyOTUzZWI1ZGNiMzI1ZTJkYjNkZTA2
-    YzlhYThhOWJmMmYyYWNiOWVhYzUxNTRiZTFjOTU0ZGU4ZWZiYjEwYmM0YmRk
-    YjJlNmYwNTBhZmYxM2NmZmUzNjE2N2FhZjA4ZTYxMTVlODEyYTE=
+    ODVmYTg0NzcyYTRhYjViNzBiN2E4ZmUzYTAyNDMzMGUwZjRiODdhNzlmMGJm
+    YzhhYzQzNzU1YjNjMzhhMThlZDAyMTc4ZDk1NjhhNmE2ZTc5ODZjYmQ2MzQy
+    YmVjNzBlOGRiMDc3MzY0ZTdhNzIyNGJkZmQ5NGEwYWE1MWY1ZmU=

data/lib/cuke_fig.rb

@@ -1,48 +1,49 @@
+require "yaml"
+require "ostruct"
 
-module CukeFig
-  class Config
-    attr_reader :global_config, :methods
+class Object
+  def to_openstruct
+    self
+  end
+end
 
-    def self.get
-      @global_config ||= Config.new
-    end
+class Array
+  def to_openstruct
+    map{ |el| el.to_openstruct }
+  end
+end
 
-    def initialize
-      @methods ||= []
-    end
+class Hash
+  def to_openstruct
+    mapped = {}
+    each{ |key,value| mapped[key] = value.to_openstruct }
+    OpenStruct.new(mapped)
+  end
+end
 
-    def clear
-      @global_config = Config.new
-    end
+module YAML
+  def self.load_openstruct(source)
+    self.load(source).to_openstruct
+  end
+end
 
-    def load(conf_files)
-      conf_files = [conf_files] unless conf_files.is_a? Array
-      conf_files.each do |conf|
-        attr_name = File.basename(conf, '.yml').gsub('-', '_')
-        attr_value = YAML.load_file conf
-        set attr_name, attr_value
-      end
-    end
+class CukeFig < OpenStruct
+  def config
+    self
+  end
 
-    def set(attr_name, attr_value)
-      var_name = ('@' + attr_name.to_s).to_sym
-      if instance_variable_defined?(var_name) && attr_value.is_a?(Hash)
-        # Get and merge. Keep merging if hash values are hashes
-        merger = proc { |_key, v1, v2| v1.is_a?(Hash) && v2.is_a?(Hash) ? v1.merge(v2, &merger) : (v2.nil? ? v1 : v2) }
-        instance_variable_get(var_name).merge! attr_value, &merger
-      else
-        # Create
-        instance_variable_set(var_name, attr_value)
-        singleton_class.class_eval { attr_reader attr_name }
-        @methods << attr_name.to_s
-      end
-    end
+  def setup(common, environment: nil, env_configs: nil, override: nil)
+    env_config = env_configs[environment] unless env_configs.nil? || environment.nil?
+    config_files = expand_config_files common, env_config: env_config, override: override
+    load(config_files)
   end
 
-  def config
-    Config.get
+  def method_missing(mid, *args)
+    @global_config.send(mid, *args)
   end
 
+  private
+
   def expand_config_files(common, env_config: nil, override: nil)
     expanded = []
     expanded.concat Dir.glob(File.join(Dir.pwd, common)) unless common.nil?
@@ -51,20 +52,15 @@ module CukeFig
     expanded
   end
 
-  def setup(common, environment: nil, env_configs: nil, override: nil)
-    config.clear
-    env_config = env_configs[environment] unless env_configs.nil? || environment.nil?
-    config_files = expand_config_files common, env_config: env_config, override: override
-    config.set(:env, environment)
-    config.load(config_files)
-    config.methods.each do |method|
-      define_method method do |*args, &block|
-        config.send method, *args, &block
-      end
+  def load(conf_files)
+    conf_files = [conf_files] unless conf_files.is_a? Array
+    conf_hash = Hash.new
+    conf_files.each do |conf|
+      new_hash = { File.basename(conf, '.yml').gsub('-', '_').to_sym => YAML.load_file(conf) }
+      conf_hash.merge!(new_hash)
     end
+    @global_config = conf_hash.to_openstruct
   end
-
-  extend(CukeFig)
 end
 
-World(CukeFig)
+World{ CukeFig.new }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cuke_fig
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.2
 platform: ruby
 authors:
 - Anders Åslund