mutaconf 0.0.7 → 0.1.0

data/.ruby-version

@@ -1 +1 @@
-2.0.0
+1.9.3

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.1.0

data/lib/mutaconf.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 module Mutaconf
-  VERSION = '0.0.7'
+  VERSION = '0.1.0'
 
   def self.dsl *args
     DSL.new *args

data/lib/mutaconf/dsl.rb

@@ -2,12 +2,45 @@
 module Mutaconf
 
   class DSL
-    attr_accessor :keys, :target, :lenient
+    attr_accessor :lenient
 
     def initialize options = {}
-      @keys ||= options[:keys] || [] # TODO: spec pre-set keys in parent class
-      @target = Target.new options[:target]
+
+      @attr_targets = {}
+      @proxy_targets = {}
       @lenient = options[:lenient] if options.key?(:lenient)
+
+      if options[:attrs]
+        options[:attrs].each_pair do |target,attrs|
+          if !!attrs == attrs
+            @attr_targets.default = Target.new target
+          else
+            [ attrs ].flatten.each do |attr|
+              if !!attr == attr
+                @attr_targets.default = Target.new target
+              else
+                @attr_targets[attr] = Target.new target
+              end
+            end
+          end
+        end
+      end
+
+      if options[:proxy]
+        options[:proxy].each_pair do |target,attrs|
+          if !!attrs == attrs
+            @proxy_targets.default = target
+          else
+            [ attrs ].flatten.each do |attr|
+              if !!attr == attr
+                @proxy_targets.default = target
+              else
+                @proxy_targets[attr] = target
+              end
+            end
+          end
+        end
+      end
     end
 
     def configure source = nil, options = {}, &block
@@ -22,16 +55,13 @@ module Mutaconf
 
       instance_exec self, &block if block
 
-      @target.object
+      self
     end
 
     private
 
     def configure_from_hash h, options = {}
-      h.each_pair do |k,v|
-        raise KeyError, k unless @keys.empty? or @keys.include?(k.to_sym) or @lenient
-        @target.set k, v if @keys.empty? or @keys.include?(k.to_sym)
-      end
+      h.each_pair{ |attr,value| send attr, value }
     end
 
     def configure_from_file f, options = {}
@@ -41,20 +71,29 @@ module Mutaconf
     end
 
     def configure_from_object o, options = {}
-      @keys.each{ |key| @target.set key, o.send(key.to_sym) if o.respond_to? key.to_sym }
+      @attr_targets.each_pair do |attr,target|
+        send attr, o.send(attr.to_sym) if o.respond_to? attr.to_sym
+      end
+    end
+
+    def has? attr, method
+      @attr_targets.default or @attr_targets.key?(attr) or @proxy_targets.default or @proxy_targets.key?(method)
+    end
+
+    def set attr, value
+
     end
 
     def method_missing name, *args, &block
 
       m = name.to_s.match(/\A(\w+)\=?\Z/)
 
-      # TODO: fail if property is not in @keys
-      key = m[1]
-      if key
-        raise KeyError, key unless @target.has?(key) or @lenient
-        return @target.get key if args.empty?
-        raise KeyError, key unless @keys.empty? or @keys.include?(key.to_sym) or @lenient
-        @target.set key, args.first if @keys.empty? or @keys.include?(key.to_sym)
+      attr, method = m[1].to_sym, m[0].to_sym
+      if attr
+        raise KeyError, attr unless has?(attr, method) or @lenient
+        return @attr_targets[attr].get attr if args.empty?
+        @attr_targets[attr].set attr, args.first if @attr_targets.default or @attr_targets.key?(attr)
+        @proxy_targets[attr].send *(args.unshift method) if @proxy_targets.default or @proxy_targets.key?(attr)
       else
         super
       end

data/mutaconf.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mutaconf"
-  s.version = "0.0.7"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["AlphaHydrae"]
-  s.date = "2013-04-14"
+  s.date = "2013-04-29"
   s.description = "Create simple DSLs and read configuration from hashes or objects."
   s.email = "hydrae.alpha@gmail.com"
   s.extra_rdoc_files = [
@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".rspec",
-    ".ruby-gemset",
     ".ruby-version",
     ".screenrc",
     "Gemfile",
@@ -37,6 +36,7 @@ Gem::Specification.new do |s|
     "spec/extract_spec.rb",
     "spec/fixtures/eval.rb",
     "spec/helper.rb",
+    "spec/proxy_spec.rb",
     "spec/source_spec.rb",
     "spec/subclass_spec.rb",
     "spec/target_spec.rb",
@@ -45,11 +45,11 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/AlphaHydrae/mutaconf"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.3"
+  s.rubygems_version = "1.8.25"
   s.summary = "Configuration utilities."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 4
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<bundler>, [">= 0"])

data/spec/block_spec.rb

@@ -4,7 +4,7 @@ describe Mutaconf::DSL do
 
   let(:target){ {} }
   let(:dsl){ Mutaconf::DSL.new options }
-  let(:options){ { target: target } }
+  let(:options){ { attrs: { target => true } } }
 
   it "should configure properties with instance evaluation" do
     result = dsl.configure do
@@ -12,7 +12,7 @@ describe Mutaconf::DSL do
       c 'd'
     end
     expected = { a: 'b', c: 'd' }
-    result.should be(target)
+    result.should be(dsl)
     target.should == expected
   end
 
@@ -23,13 +23,13 @@ describe Mutaconf::DSL do
       config.i = 'j'
     end
     expected = { e: 'f', g: 'h', i: 'j' }
-    result.should be(target)
+    result.should be(dsl)
     target.should == expected
   end
 
   context "with restricted keys" do
 
-    let(:options){ { target: target, keys: [ :a ] } }
+    let(:options){ { attrs: { target => [ :a ] } } }
 
     it "should raise a key error for a unknown key with instance evaluation" do
       lambda{ dsl.configure{ b 'c' } }.should raise_error(Mutaconf::KeyError, /'b'/)
@@ -42,7 +42,7 @@ describe Mutaconf::DSL do
 
   context "with restricted keys in lenient mode" do
 
-    let(:options){ { target: target, keys: [ :a, :e ], lenient: true } }
+    let(:options){ { attrs: { target => [ :a, :e ] }, lenient: true } }
 
     it "should configure restricted properties with instance evaluation" do
       result = dsl.configure do
@@ -52,7 +52,7 @@ describe Mutaconf::DSL do
         g 'h'
       end
       expected = { a: 'b', e: 'f' }
-      result.should be(target)
+      result.should be(dsl)
       target.should == expected
     end
 
@@ -64,7 +64,7 @@ describe Mutaconf::DSL do
         config.g = 'h'
       end
       expected = { a: 'b', e: 'f' }
-      result.should be(target)
+      result.should be(dsl)
       target.should == expected
     end
   end

data/spec/proxy_spec.rb

@@ -0,0 +1,70 @@
+require 'helper'
+
+describe 'DSL proxies' do
+
+  let(:target){ OpenStruct.new }
+  let(:dsl){ Mutaconf::DSL.new options }
+  let(:options){ { proxy: { target => true } } }
+
+  it "should proxy method calls with instance evaluation" do
+    target.should_receive(:a).with('b')
+    target.should_receive(:c=).with('d')
+    result = dsl.configure do
+      a 'b'
+      self.c = 'd'
+    end
+    result.should be(dsl)
+  end
+
+  it "should proxy method calls with a configuration object" do
+    target.should_receive(:a=).with('b')
+    target.should_receive(:c=).with('d')
+    result = dsl.configure do |config|
+      config.a = 'b'
+      config.c = 'd'
+    end
+    result.should be(dsl)
+  end
+
+  context "with restricted keys" do
+
+    let(:options){ { proxy: { target => [ :a ] } } }
+
+    it "should raise a key error for a unknown key with instance evaluation" do
+      lambda{ dsl.configure{ b 'c' } }.should raise_error(Mutaconf::KeyError, /'b'/)
+    end
+
+    it "should raise a key error for an unknown key with a configuration object" do
+      lambda{ dsl.configure{ |config| config.b = 'c' } }.should raise_error(Mutaconf::KeyError, /'b'/)
+    end
+  end
+
+  context "with restricted keys in lenient mode" do
+
+    let(:options){ { proxy: { target => [ :a, :e ] }, lenient: true } }
+
+    it "should configure restricted properties with instance evaluation" do
+      target.should_receive(:a).with('b')
+      target.should_receive(:e).with('f')
+      result = dsl.configure do
+        a 'b'
+        c 'd'
+        e 'f'
+        g 'h'
+      end
+      result.should be(dsl)
+    end
+
+    it "should configure restricted properties with a configuration object" do
+      target.should_receive(:a=).with('b')
+      target.should_receive(:e=).with('f')
+      result = dsl.configure do |config|
+        config.a = 'b'
+        config.c = 'd'
+        config.e = 'f'
+        config.g = 'h'
+      end
+      result.should be(dsl)
+    end
+  end
+end

data/spec/source_spec.rb

@@ -5,25 +5,25 @@ describe Mutaconf::DSL do
 
   let(:target){ {} }
   let(:dsl){ Mutaconf::DSL.new options }
-  let(:options){ { target: target } }
+  let(:options){ { attrs: { target => true } } }
 
   it "should configure properties from a hash source" do
     result = dsl.configure a: 'b', c: 'd'
     expected = { a: 'b', c: 'd' }
-    result.should be(target)
+    result.should be(dsl)
     target.should == expected
   end
 
   it "should configure properties from a file with instance evaluation" do
     result = dsl.configure fixture(:eval)
     expected = { a: 'b', c: 'd', e: 'f', g: 'h' }
-    result.should be(target)
+    result.should be(dsl)
     target.should == expected
   end
 
   context "with restricted keys" do
 
-    let(:options){ { target: target, keys: [ :a ] } }
+    let(:options){ { attrs: { target => [ :a ] } } }
 
     it "should raise a key error for an unknown key from a hash source" do
       lambda{ dsl.configure b: 'c' }.should raise_error(Mutaconf::KeyError, /'b'/)
@@ -36,26 +36,26 @@ describe Mutaconf::DSL do
 
   context "with restricted keys in lenient mode" do
 
-    let(:options){ { target: target, keys: [ :a, :e ], lenient: true } }
+    let(:options){ { attrs: { target => [ :a, :e ] }, lenient: true } }
 
     it "should configure restricted properties from a hash source" do
       result = dsl.configure a: 'b', c: 'd', e: 'f', g: 'h'
       expected = { a: 'b', e: 'f' }
-      result.should be(target)
+      result.should be(dsl)
       target.should == expected
     end
 
     it "should configure restricted properties from an object" do
       result = dsl.configure OpenStruct.new(a: 'b', c: 'd', e: 'f', g: 'h')
       expected = { a: 'b', e: 'f' }
-      result.should be(target)
+      result.should be(dsl)
       target.should == expected
     end
 
     it "should configure restricted properties from a file with instance evaluation" do
       result = dsl.configure fixture(:eval)
       expected = { a: 'b', e: 'f' }
-      result.should be(target)
+      result.should be(dsl)
       target.should == expected
     end
   end

data/spec/subclass_spec.rb

@@ -16,7 +16,7 @@ describe Mutaconf::DSL do
   end
 
   let(:target){ {} }
-  let(:dsl){ CustomDSL.new target: target }
+  let(:dsl){ CustomDSL.new attrs: { target => true } }
 
   it "should work when subclassed" do
     result = dsl.configure do
@@ -25,7 +25,7 @@ describe Mutaconf::DSL do
       increase 5
     end
     expected = { a: 'b', c: 'd' }
-    result.should be(target)
+    result.should be(dsl)
     target.should == expected
     dsl.value.should == 5
   end

metadata

@@ -1,125 +1,142 @@
 --- !ruby/object:Gem::Specification
 name: mutaconf
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
+  prerelease: 
 platform: ruby
 authors:
 - AlphaHydrae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-14 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gemcutter
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-version
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Create simple DSLs and read configuration from hashes or objects.
@@ -131,7 +148,6 @@ extra_rdoc_files:
 - README.md
 files:
 - .rspec
-- .ruby-gemset
 - .ruby-version
 - .screenrc
 - Gemfile
@@ -150,6 +166,7 @@ files:
 - spec/extract_spec.rb
 - spec/fixtures/eval.rb
 - spec/helper.rb
+- spec/proxy_spec.rb
 - spec/source_spec.rb
 - spec/subclass_spec.rb
 - spec/target_spec.rb
@@ -157,25 +174,26 @@ files:
 homepage: http://github.com/AlphaHydrae/mutaconf
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Configuration utilities.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 43e6c84852a4d8d8c4f54d087be1f63e0c146a92
-  data.tar.gz: 38435cb0e55d1124753e6c7130c34417005b856e
-SHA512:
-  metadata.gz: 79216c2b4f5bef4127d3bcb7bfde2a976e6e57b3fc241d778a1afdaeeba705d1288fa06d50d9aaf7f19a83e590ab3a2e419444ed6bd0e48504e400b75a25abfa
-  data.tar.gz: 19d3897186467a70ca13b64005f5745c384ecbff7fc39eb2890ca26499c83358c4e8ae89bb5f63a4311dd12e6f29fc52450639b0ef4c063befe881688451d6b4

data/.ruby-gemset

@@ -1 +0,0 @@
-mutaconf