complex_config 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2aef957d9266badac65636ce774d6bc8d222d7e
-  data.tar.gz: ad3aa4f8783e6aa8128323cdfdd0107bd564694a
+  metadata.gz: d74e24dc69a917bf0f1e11a3d8a93238c11de4be
+  data.tar.gz: d4c8f847392f993b03097ce58c3ea9d96ac8e5c7
 SHA512:
-  metadata.gz: 98d267628da2ba8177601e939821be6cd2c137e677654288138863b2e8025127bad30160d1e1ee6595285fc257fabcc8c7540c19689e4439f84d59ec3d871d84
-  data.tar.gz: 18460dbc5a63408eeeea56c43b93827eaca6bab6a020617a018908ce769c78c29deb787bfc8051d2c8f1726b2d2e83d50d26c8fe3f38af47a128691a06f2e9f8
+  metadata.gz: a9412892436dd53c2fa3d2570825b64acc947bb1c78b583b99e61e84747b4fb88077e1704c1f06c0a02eb112112cff911a90de5e7d456015365004a93a08445d
+  data.tar.gz: 0a56013a9ea6a9afcb7aa194f689bf3ae7a05d1d6972e64837506a472f78a8217fab40ee8a6a084b30b0bcc337d30aad2b4262b651816fac59a8e1a68f30543e

data/README.md

@@ -143,6 +143,12 @@ Here is the `ComplexConfig::Plugins::MONEY` plugin for example:
     end
 
 ## Changes
+
+* 2016-07-15 Release 0.7.0
+  * Slim down `ComplexConfig::Settings` interface to avoid clashes with methods
+    mixed into `Object` class or `Enumerable#instance_methods`
+* 2016-07-15 Release 0.6.0
+  * Depend on mize gem for caching.
 * 2016-06-23 Release 0.5.2
   * Resolve index access via the plugin code path, so foo.bar and foo[:bar]
     have the same result for a plugin key.

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/complex_config.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: complex_config 0.6.0 ruby lib
+# stub: complex_config 0.7.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "complex_config"
-  s.version = "0.6.0"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Florian Frank"]
-  s.date = "2016-07-15"
+  s.date = "2016-07-18"
   s.description = "This library allows you to access configuration files via a simple interface"
   s.email = "flori@ping.de"
   s.extra_rdoc_files = ["README.md", "lib/complex_config.rb", "lib/complex_config/config.rb", "lib/complex_config/errors.rb", "lib/complex_config/plugins.rb", "lib/complex_config/plugins/enable.rb", "lib/complex_config/plugins/money.rb", "lib/complex_config/plugins/uri.rb", "lib/complex_config/provider.rb", "lib/complex_config/proxy.rb", "lib/complex_config/railtie.rb", "lib/complex_config/rude.rb", "lib/complex_config/settings.rb", "lib/complex_config/shortcuts.rb", "lib/complex_config/version.rb"]

data/lib/complex_config.rb

@@ -10,5 +10,3 @@ require 'complex_config/settings'
 require 'complex_config/config'
 require 'complex_config/provider'
 defined? Rails and require 'complex_config/railtie'
-
-

data/lib/complex_config/plugins/uri.rb

@@ -2,7 +2,8 @@ require 'uri'
 
 module ComplexConfig::Plugins
   URI = -> id do
-    if url = id.to_s.sub(/uri\z/, 'url') and url = ask_and_send(url)
+    url = id.to_s
+    if url.sub!(/uri\z/, 'url') and url = ask_and_send(url)
       ::URI.parse(url)
     else
       skip

data/lib/complex_config/settings.rb

@@ -2,12 +2,37 @@ require 'json'
 require 'tins/xt/ask_and_send'
 require 'tins/thread_local'
 
-class ComplexConfig::Settings < JSON::GenericObject
-  def self.[](*a)
-    from_hash(*a)
-  end
+class ComplexConfig::Settings < BasicObject
+  include ::Kernel
+  include ::Tins::AskAndSend
 
   class << self
+    def [](*a)
+      from_hash(*a)
+    end
+
+    def from_hash(object)
+      case
+      when object.respond_to?(:to_hash)
+        result = new
+        object.to_hash.each do |key, value|
+          result[key] = from_hash(value)
+        end
+        result
+      when object.respond_to?(:to_ary)
+        object.to_ary.map { |a| from_hash(a) }
+      else
+        object
+      end
+    end
+
+    def build(name, hash)
+      name.nil? or self.name_prefix = name.to_sym
+      from_hash(hash)
+    ensure
+      self.name_prefix = nil
+    end
+
     extend Tins::ThreadLocal
 
     thread_local :name_prefix
@@ -15,34 +40,39 @@ class ComplexConfig::Settings < JSON::GenericObject
 
   attr_accessor :name_prefix
 
-  def self.build(name, hash)
-    name.nil? or self.name_prefix = name.to_sym
-    self[hash]
-  ensure
-    self.name_prefix = nil
+  def initialize(hash = nil)
+    self.name_prefix = self.class.name_prefix
+    @table = {}
+    if hash
+      hash.each_pair do |k, v|
+        k = k.to_sym
+        @table[k] = v
+      end
+    end
   end
 
-  def initialize(*)
-    self.name_prefix = self.class.name_prefix
+  def initialize_copy(orig)
     super
+    @table = @table.dup
+    self
   end
 
   def attribute_set?(name)
-    table.key?(name.to_sym)
+    @table.key?(name.to_sym)
   end
 
   def attribute_names
-    table.keys
+    @table.keys
   end
 
   def attribute_values
-    table.values
+    @table.values
   end
 
   def to_h
     table_enumerator.each_with_object({}) do |(k, v), h|
       h[k] =
-        if Array === v
+        if ::Array === v
           v.to_ary.map { |x| (x.ask_and_send(:to_h) rescue x) || x }
         elsif v.respond_to?(:to_h)
           v.ask_and_send(:to_h) rescue v
@@ -52,6 +82,10 @@ class ComplexConfig::Settings < JSON::GenericObject
     end
   end
 
+  def size
+    each.count
+  end
+
   def to_s(pair_sep: ' = ', path_sep: ?.)
     pathes(path_sep: path_sep).inject('') do |result, (path, value)|
       result << "#{path}#{pair_sep}#{value.inspect}\n"
@@ -62,17 +96,17 @@ class ComplexConfig::Settings < JSON::GenericObject
     hash.each do |key, value|
       path = prefix.empty? ? key.to_s : "#{prefix}#{path_sep}#{key}"
       case value
-      when ComplexConfig::Settings
+      when ::ComplexConfig::Settings
         pathes(
           value,
           path_sep: path_sep,
           prefix:   path,
           result:   result
         )
-      when Array
+      when ::Array
         value.each_with_index do |v, i|
           sub_path = path + "[#{i}]"
-          if ComplexConfig::Settings === v
+          if ::ComplexConfig::Settings === v
             pathes(
               v,
               path_sep: path_sep,
@@ -90,12 +124,16 @@ class ComplexConfig::Settings < JSON::GenericObject
     result
   end
 
+  alias inspect to_s
 
-  def to_ary(*a, &b)
-    table_enumerator.__send__(:to_a, *a, &b)
+  def pretty_print(q)
+    q.text inspect
   end
 
-  alias inspect to_s
+  def freeze
+    @table.freeze
+    super
+  end
 
   def deep_freeze
     table_enumerator.each do |_, v|
@@ -104,26 +142,34 @@ class ComplexConfig::Settings < JSON::GenericObject
     freeze
   end
 
-  alias index []
-
   def [](name)
     if !attribute_set?(name) and
-      value = ComplexConfig::Provider.apply_plugins(self, name)
+      value = ::ComplexConfig::Provider.apply_plugins(self, name)
     then
       value
     else
-      index(name)
+      @table[name.to_sym]
     end
   end
 
+  def []=(name, value)
+    @table[name.to_sym] = value
+  end
+
+  def each(&block)
+    table_enumerator.each(&block)
+  end
+
   private
 
+  attr_reader :table
+
   def table_enumerator
-    table.enum_for(:each)
+    @table.enum_for(:each)
   end
 
   def respond_to_missing?(id, include_private = false)
-    id =~ /\?\z/ || super
+    id =~ /\?\z/ || attribute_set?(id)
   end
 
   def skip
@@ -135,20 +181,18 @@ class ComplexConfig::Settings < JSON::GenericObject
     when id =~ /\?\z/
       begin
         public_send $`.to_sym, *a, &b
-      rescue ComplexConfig::AttributeMissing
+      rescue ::ComplexConfig::AttributeMissing
         nil
       end
     when id =~ /=\z/
-      super
-    when value = ComplexConfig::Provider.apply_plugins(self, id)
+      @table[$`.to_sym] = a.first
+    when value = ::ComplexConfig::Provider.apply_plugins(self, id)
       value
     else
       if attribute_set?(id)
-        super
-      elsif table.respond_to?(id)
-        table.__send__(id, *a, &b)
+        @table[id]
       else
-        raise ComplexConfig::AttributeMissing, "no attribute named #{id.inspect}"
+        raise ::ComplexConfig::AttributeMissing, "no attribute named #{id.inspect}"
       end
     end
   end

data/lib/complex_config/version.rb

@@ -1,6 +1,6 @@
 module ComplexConfig
   # ComplexConfig version
-  VERSION         = '0.6.0'
+  VERSION         = '0.7.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/spec/complex_config/provider_spec.rb

@@ -11,7 +11,13 @@ RSpec.describe ComplexConfig::Provider do
 
   context 'plugin' do
     let :plugin do
-      -> id { __send__ id }
+      -> id {
+        if id == :evaluate_plugin
+          :evaluated
+        else
+          skip
+        end
+      }
     end
 
     let :setting do
@@ -28,8 +34,8 @@ RSpec.describe ComplexConfig::Provider do
 
     it 'can apply plugins' do
       provider.add_plugin plugin
-      expect(setting).to receive(:foo).and_return :bar
-      expect(provider.apply_plugins(setting, :foo)).to eq :bar
+      allow(setting).to receive(:skip).and_throw :skip
+      expect(provider.apply_plugins(setting, :evaluate_plugin)).to eq :evaluated
     end
   end
 

data/spec/complex_config/settings_spec.rb

@@ -17,6 +17,40 @@ RSpec.describe ComplexConfig::Settings do
     ]
   end
 
+  it 'can be initialized with a hash' do
+    s = ComplexConfig::Settings.new(foo: 'bar')
+    expect(s.foo).to eq 'bar'
+  end
+
+  it 'can be duped and changed' do
+    s = ComplexConfig::Settings.new(foo: 'bar')
+    t = s.dup
+    expect(s.foo).to eq 'bar'
+    t.foo = 'baz'
+    expect(s.foo).to eq 'bar'
+    expect(t.foo).to eq 'baz'
+  end
+
+  it 'can set its attributes' do
+    expect {
+      settings.blub = 'blub'
+    }.to change {
+      settings.blub?
+    }.from(nil).to('blub')
+  end
+
+  it 'has a size' do
+    expect(settings.size).to eq 1
+  end
+
+  it 'can set its attributes via index method' do
+    expect {
+      settings['blub'] = 'blub'
+    }.to change {
+      settings.blub?
+    }.from(nil).to('blub')
+  end
+
   it "can return an attribute's value" do
     expect(settings.foo.bar.baz).to eq true
   end
@@ -64,9 +98,10 @@ ary[2] = 3
 EOT
   end
 
-  it 'can be array like (first level only), so puts still works' do
-    expect(settings).to respond_to :to_ary
-    expect(settings.to_ary).to eq [[:foo, settings.foo]]
+  it 'can be pretty printed' do
+    q = double
+    expect(q).to receive(:text).with("foo.bar.baz = true\nfoo.qux = \"quux\"\n")
+    settings.pretty_print(q)
   end
 
   it 'raises exception if expected attribute is missing' do
@@ -89,9 +124,4 @@ EOT
     settings = ComplexConfig::Settings[zip: 'a string']
     expect(settings.zip).to eq 'a string'
   end
-
-  it 'zips the hash if zip was not set' do
-    settings = ComplexConfig::Settings[not_zip: 'a string']
-    expect(settings.zip([1])).to eq [ [ [ :not_zip, 'a string' ], 1 ] ]
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: complex_config
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar