confo-config 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e18009a32d37da15b10c87cff286b37be9ff6a2e
-  data.tar.gz: 0e2ad064b148ef7237ec98722afebb703dd8b2bb
+  metadata.gz: 710b4899fb2c7ff8bb1fe82afdb2ecc5dae2e3ed
+  data.tar.gz: 85ee34a5653d81be7fa89834d770e4778081581e
 SHA512:
-  metadata.gz: f759fb4b9277b5f78c559cda2e270d97d2741827f2536e3cb40578d97f902eda3eaceac0906bcef6cc0b898fda0fdf1f0f105712d5fcd1570342d67eb453c548
-  data.tar.gz: d05dbef7d09242b374b5872202349dd315c7899302554e08dd143db3c30b55a5f26f7446d50e588df09bf43aebb69be38425ac63648a44debfec0f8e7cc475ae
+  metadata.gz: 9415241fcf386be99983cfa849bc4e1ef8549fddae646e560262c78bcaf3d643cf6b49abaf8a6abd2188cf52a0e8e828bdb15e3861da04f3ac4b5138f0fa9920
+  data.tar.gz: 37e68f2e2893d3503b5bfc0d380bdbda569b4199ead0a783c0c1b07eded895de10f9d1a879a3cc2c323f5ef615c97ffea6a8cbb7c501946defcee2295939d4b2

data/confo.gemspec

@@ -1,19 +1,20 @@
+# encoding: utf-8
 require File.expand_path('../lib/confo/version', __FILE__)
 
-Gem::Specification.new do |spec|
-  spec.name          = 'confo-config'
-  spec.version       = Confo::VERSION
-  spec.authors       = ['Yaroslav Konoplov']
-  spec.email         = ['yaroslav@inbox.com']
-  spec.summary       = 'Little configuration framework'
-  spec.description   = 'Little configuration framework'
-  spec.homepage      = 'http://github.com/yivo/confo-config'
-  spec.license       = 'MIT'
+Gem::Specification.new do |s|
+  s.name            = 'confo-config'
+  s.version         = Confo::VERSION
+  s.authors         = ['Yaroslav Konoplov']
+  s.email           = ['yaroslav@inbox.com']
+  s.summary         = 'Little configuration framework'
+  s.description     = 'Little configuration framework'
+  s.homepage        = 'http://github.com/yivo/confo-config'
+  s.license         = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
+  s.executables     = `git ls-files -z -- bin/*`.split("\x0").map{ |f| File.basename(f) }
+  s.files           = `git ls-files -z`.split("\x0")
+  s.test_files      = `git ls-files -z -- {test,spec,features}/*`.split("\x0")
+  s.require_paths   = ['lib']
 
-  spec.add_dependency 'activesupport', '~> 4.0' # 4.0 <= version < 5.0
-end
+  s.add_dependency 'activesupport', '>= 3.2.0'
+end

data/lib/confo.rb

@@ -22,12 +22,12 @@ module Confo
     end
 
     def convert_to_hash(value)
-      if value.is_a?(Hash)
+      if value.respond_to?(:to_hash)
         value.to_hash
       elsif value.is_a?(Array)
         value.map { |e| convert_to_hash(e) }
       else
-        value.respond_to?(:to_hash) ? value.to_hash : value
+        value
       end
     end
 

data/lib/confo/collection.rb

@@ -2,10 +2,10 @@ module Confo
   class Collection
     include Enumerable
 
-    attr_reader :behaviour_options
+    attr_reader :settings
 
-    def initialize(behaviour_options = {}, &block)
-      @behaviour_options = behaviour_options
+    def initialize(settings = {}, &block)
+      @settings = settings
       configure(&block) if block
     end
 
@@ -14,19 +14,22 @@ module Confo
       config    = storage[id]
       config  ||= begin
         config_class  = Confo.call(self, :config_class, id, construct_options)
+        check_config_class!(config_class)
         config        = Confo.call(self, :construct_config, config_class, id, construct_options)
         storage[id]   = config
         config.set(:name, id)
         config
       end
 
-      config.set(options)       if options
+      config.set(options)       if options && config.kind_of?(Config)
       config.configure(&block)  if block
       config
     end
 
     def get(id)
+      id = convert_id(id)
       define(id)
+      storage[id]
     end
 
     def set(id, config)
@@ -49,23 +52,52 @@ module Confo
     end
 
     def to_a
-      storage.values
+      storage.each_with_object([]) do |(id, instance), memo|
+        memo << (instance.respond_to?(:to_hash) ? instance.to_hash : instance)
+      end
     end
 
     def to_hash
-      storage.reduce({}) do |memo, (id, instance)|
+      storage.each_with_object({}) do |(id, instance), memo|
         memo[id] = Confo.convert_to_hash(instance)
-        memo
       end
     end
 
-    protected
+    def method_missing(name, *args, &block)
+      if args.empty? && name =~ /^(\w+)\?$/
+        exists?($1)
+      else
+        super
+      end
+    end
+
+    def with_new_settings(new_settings)
+      self.class.new(settings.merge(new_settings)).tap do |new_obj|
+        if storage = @storage
+          storage.each { |k, v| new_obj.set(k, v.with_new_settings(new_settings) ) }
+        end
+      end
+    end
+
+    def dup(config_settings = {})
+      self.class.new(settings.merge(config_settings)).tap do |new_obj|
+        if storage = @storage
+          new_obj.instance_variable_set(:@storage, storage)
+        end
+      end
+    end
+
+    def deep_dup(config_settings = {})
+      with_new_settings(config_settings)
+    end
+
+  protected
 
     def config_class(config_id, config_options)
       config_options.try(:[], :class_name).try(:safe_constantize) || Config
     end
 
-    def construct_config(config_class)
+    def construct_config(config_class, config_id, construct_options)
       config_class.new
     end
 
@@ -74,7 +106,11 @@ module Confo
     end
 
     def convert_id(id)
-      id.to_sym
+      id.kind_of?(Symbol) ? id : id.to_sym
+    end
+
+    def check_config_class!(config_class)
+      raise 'Forbidden config class!' unless (config_class <= Config or config_class <= Collection)
     end
   end
 end

data/lib/confo/concerns/options_manager.rb

@@ -6,12 +6,20 @@ module Confo
 
       # Define option accessors.
       def option_accessor(*names)
+
+        # TODO Save list of option names
         names.each do |name|
           define_option_functional_accessor(name)
           define_option_writer(name)
         end
       end
 
+      # TODO Implement
+      def readonly_option(*names)
+
+      end
+
+    protected
       def define_option_functional_accessor(name)
         define_method("#{name}") do |*args|
           if args.size > 0
@@ -47,12 +55,13 @@ module Confo
     # Alias for +get+.
     alias [] get
 
-    protected
+  protected
 
     # Method to get an option.
     # If there is an option accessor defined then it will be used.
     # In other cases +raw_get+ will be used.
     def public_get(option)
+      # TODO Prevent subconfigs here
       respond_to?(option) ? send(option) : raw_get(option)
     end
 
@@ -60,11 +69,11 @@ module Confo
     # If value is callable without arguments
     # it will be called and result will be returned.
     def raw_get(option)
-      value = storage[option]
+      value = options_storage[option]
       Confo.callable_without_arguments?(value) ? value.call : value
     end
 
-    public
+  public
 
     # Sets option:
     #   obj.set(:option, 'value')
@@ -82,22 +91,23 @@ module Confo
     # Alias for +set+.
     alias []= set
 
-    protected
+  protected
 
     # Method to set an option.
     # If there is an option accessor defined then it will be used.
     # In other cases +raw_set+ will be used.
     def public_set(option, value)
+      # TODO Prevent subconfigs here
       method = "#{option}="
       respond_to?(method) ? send(method, value) : raw_set(option, value)
     end
 
     # Internal method to set option.
     def raw_set(option, value)
-      storage[option] = value
+      options_storage[option] = value
     end
 
-    public
+  public
 
     # Sets option only if it is not set yet:
     #   obj.set_at_first(:option, 1)
@@ -129,7 +139,7 @@ module Confo
         set(arg, rest_args.first) unless set?(arg)
         true
       else
-        storage.has_key?(arg)
+        options_storage.has_key?(arg)
       end
     end
 
@@ -142,43 +152,38 @@ module Confo
 
     # Unsets option.
     def unset(option)
-      storage.delete(option)
+      options_storage.delete(option)
       self
     end
 
     # Returns option names as array of symbols.
     def keys
-      storage.reduce([]) do |memo, k, v|
+      options_storage.each_with_object([]) do |(k, v), memo|
         memo << k.to_sym
-        memo
       end
     end
 
     # Returns option values as array.
     def values
-      storage.values
+      options_storage.each_with_object([]) do |(k, v), memo|
+        memo << get(k)
+      end
     end
 
     # Returns all options at once.
     #   obj.options => { option: 'value' }
     def options
-      options = storage.dup
-      options.each { |k, v| options[k] = get(k) }
-      options
+      options_storage.each_with_object({}) do |(k, v), memo|
+        memo[k.to_sym] = get(k)
+      end
     end
 
-    protected
-
-    def storage
-      @storage ||= OptionsStorage.new
+  protected
+    def options_storage
+      @options_storage ||= OptionsStorage.new
     end
   end
 
-  class OptionsStorage < Hash
-    def to_hash
-      new_hash = {}
-      each { |k, v| new_hash[k.kind_of?(String) ? k.to_sym : k] = Confo.convert_to_hash(v) }
-      Hash.new(default).merge!(new_hash)
-    end
+  class OptionsStorage < ActiveSupport::HashWithIndifferentAccess
   end
 end

data/lib/confo/concerns/subconfigs_manager.rb

@@ -59,7 +59,7 @@ module Confo
       subconfig_instances.exists?(subconfig_name)
     end
 
-    protected
+  protected
 
     def subconfig_instances
       @subconfig_instances ||= Collection.new
@@ -67,6 +67,8 @@ module Confo
 
     def subconfig_internal(subconfig_name, options = nil, overrides = nil, &block)
       unless subconfig_exists?(subconfig_name)
+
+        # TODO Bugfix
         subconfig_options   = self.class.subconfigs_options[subconfig_name].try(:dup) || {}
         subconfig_options.merge!(overrides) if overrides
 
@@ -88,7 +90,7 @@ module Confo
 
     def subconfig_class(subconfig_name, subconfig_options)
       if class_name = subconfig_options[:class_name]
-        class_name.to_s.camelize
+        class_name.camelize
       else
         guess_subconfig_class_name(subconfig_name)
       end.safe_constantize || subconfig_options.fetch(:fallback_class_name, 'Confo::Config').constantize

data/lib/confo/config.rb

@@ -5,14 +5,42 @@ module Confo
     include OptionsManager
     include SubconfigsManager
 
-    attr_reader :behaviour_options
+    attr_reader :settings
 
-    def initialize(behaviour_options = {}, &block)
-      @behaviour_options = behaviour_options
+    def initialize(settings = {}, &block)
+      @settings = settings
       preconfigure
       configure(&block) if block
     end
 
+    def with_new_settings(new_settings)
+      self.class.new(settings.merge(new_settings)).tap do |new_config|
+        if var = @options_storage
+          new_config.instance_variable_set(:@options_storage, var.deep_dup)
+        end
+
+        if var = @subconfig_instances
+          new_config.instance_variable_set(:@subconfig_instances, var.with_new_settings(new_settings))
+        end
+      end
+    end
+
+    def dup(config_settings = {})
+      self.class.new(settings.merge(config_settings)).tap do |new_config|
+        if var = @options_storage
+          new_config.instance_variable_set(:@options_storage, var)
+        end
+
+        if var = @subconfig_instances
+          new_config.instance_variable_set(:@subconfig_instances, var)
+        end
+      end
+    end
+
+    def deep_dup(config_settings = {})
+      with_new_settings(config_settings)
+    end
+
     def configure(*args, &block)
       case args.size
 
@@ -58,39 +86,49 @@ module Confo
             # Wants to configure subconfig:
             #   object.description {  }
             subconfig(name, &block)
-          else
 
+          # Wants to access boolean option:
+          #   object.property?
+          elsif name =~ /^(\w+)\?$/
+            !!get($1)
+
+          else
             # Wants one of the following:
             #   - access subconfig
             #   - access option
-            subconfig_exists?(name) ? subconfig(name) : option(normalize_option(name))
+            subconfig_exists?(name) ? subconfig(name) : option(strip_assignment(name))
           end
 
         when 1
           arg = args.first
 
+          # Wants to test option value:
+          #   object.property?(:value) => options[:property] == :value
+          if name =~ /^(\w+)\?$/
+            get($1) == arg
+
           # Wants to access collection:
           #   object.properties :id {  }
-          if (arg.is_a?(String) || arg.is_a?(Symbol)) && subconfig_exists?(name)
+          elsif (arg.is_a?(String) || arg.is_a?(Symbol)) && subconfig_exists?(name)
             subconfig(name.to_s.pluralize, arg, &block)
-          else
 
+          else
             # Wants to access option:
             #   object.cache = :none
             #   object.cache :none
-            option(normalize_option(name), arg)
+            option(strip_assignment(name), arg)
           end
 
         else
-          option(normalize_option(name), *args)
+          option(strip_assignment(name), *args)
       end
     end
 
     def to_hash
-      {}.merge!(options.to_hash).merge!(subconfigs.to_hash)
+      options.merge!(subconfigs).to_hash
     end
 
-    protected
+  protected
 
     def preconfigure
       preconfigurator_class = lookup_preconfigurator_class
@@ -114,7 +152,7 @@ module Confo
       "#{configurable_component_name}Preconfigurator"
     end
 
-    def normalize_option(name)
+    def strip_assignment(name)
       name.to_s.sub(/=+\Z/, '').to_sym
     end
   end

data/lib/confo/version.rb

@@ -1,3 +1,3 @@
 module Confo
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: confo-config
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Yaroslav Konoplov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.2.0
 description: Little configuration framework
 email:
 - yaroslav@inbox.com