funfig 0.0.4 → 0.0.5

data/lib/funfig/group.rb

@@ -23,7 +23,7 @@ module Funfig
     def update(hash)
       if hash.respond_to?(:each)
         hash.each{|k, v|
-          k = k.gsub('-', '_')
+          k = k.to_s.gsub('-', '_')
           self.send("#{k}=", v)
         }
       end
@@ -65,6 +65,24 @@ module Funfig
       h
     end
 
+    # Imitate aget
+    def [](k)
+      if self.class._params[k.to_sym]
+        send(k)
+      else
+        raise "Attempt to get not existed param #{_sub_name(k)}"
+      end
+    end
+
+    # Imitate aset
+    def []=(k, v)
+      if self.class._params[k.to_sym]
+        send("#{k}=", v)
+      else
+        raise "Attempt to set not existed param #{_sub_name(k)}"
+      end
+    end
+
     def inspect
       "<#{self.class.name} #{each.map{|k,v| "#{k}=#{v.inspect}"}.join(' ')}>"
     end
@@ -87,6 +105,10 @@ module Funfig
       self.class._path
     end
 
+    def method_missing(name, *args)
+      raise "Not existed param #{_sub_name(name.to_s.sub(/=$/,''))}"
+    end
+
     def self._params
       @params ||= {}
     end
@@ -133,7 +155,7 @@ module Funfig
 
       define_method(name) do |*args, &block|
         instance_variable_get(vname) ||
-          instance_variable_set(vname, klass.new(self))
+          instance_variable_set(vname, self.class._params[name].new(self))
       end
 
       define_method("#{name}=") do |hash|
@@ -158,14 +180,16 @@ module Funfig
       vname = :"@#{name}"
       name = name.to_sym
 
-      block ||= proc{
-        begin
-          value.dup
-        rescue TypeError
-          block = proc { value }
-          value
-        end
-      }
+      unless block || value == NOT_SET
+        block = proc{
+          begin
+            value.dup
+          rescue TypeError
+            block = proc { value }
+            value
+          end
+        }
+      end
 
       define_method(name) do |*args|
         if instance_variable_defined?(vname)
@@ -179,6 +203,8 @@ module Funfig
         end
       end
 
+      alias_method :"#{name}?", name
+
       define_method("#{name}=") do |v|
         _._cache_clear!
         instance_variable_set(vname, v)
@@ -201,5 +227,31 @@ module Funfig
       new.class_exec &block  if block_given?
       new
     end
+
+    def self.drained
+      klone = clone
+      for par, val in _params
+        if val.is_a?(Class) && Group > val
+          klone._params[par] = val.drained
+        else
+          klone.param(par)
+        end
+      end
+      klone
+    end
+
+    def self.as_root
+      params = _params
+      new_root = Funfig.new do
+        for par, val in params
+          if val.is_a?(Class) && Group > val
+            _params[par] = val.drained
+            group(par){ }
+          else
+            param(par)
+          end
+        end
+      end
+    end
   end
 end

data/lib/funfig/version.rb

@@ -1,3 +1,3 @@
 module Funfig
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: funfig
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2012-06-15 00:00:00.000000000 Z
 dependencies: []
 description: Defines configuration schema with calculable defaults
 email: