jzimmek-easy_dsl 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/easy_dsl.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{easy_dsl}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan Zimmek"]
-  s.date = %q{2009-08-12}
+  s.date = %q{2009-09-17}
   s.email = %q{jan.zimmek@web.de}
   s.extra_rdoc_files = [
     "LICENSE",

data/lib/easy_dsl/container.rb

@@ -1,5 +1,6 @@
 require 'active_support'
 require 'base64'
+require 'guid'
 require 'easy_dsl/attribute'
 
 module EasyDsl
@@ -10,7 +11,7 @@ module EasyDsl
     attr_reader   :attributes
     attr_reader   :children
 
-    def initialize(name, container)
+    def initialize(container, name)
       @name = name
       @container = container
       @attributes = {}
@@ -125,7 +126,7 @@ module EasyDsl
         }
         
         @nested.values.each do |nested_clazz|
-          nested = nested_clazz.new("default", self)
+          nested = nested_clazz.new(self, "default")
           nested.selfdoc(doc)
         end
         
@@ -145,8 +146,11 @@ module EasyDsl
         instance_variable_get("@all_#{nested_name}")
       end
       
-      self.class.send(:define_method, nested_name) do |obj_name, &block|
-        obj = clazz.new(obj_name, self)
+      # self.class.send(:define_method, nested_name) do |obj_name=nil, &block|
+      self.class.send(:define_method, nested_name) do |*args, &block|
+        obj_name = args.length > 0 ? args[0] : Guid.new.to_s
+        
+        obj = clazz.new(self, obj_name)
         instance_variable_get("@all_#{nested_name}")[obj_name] = obj
 
         @children << obj

data/test/easy_dsl/test/apache.rb

@@ -5,7 +5,7 @@ module EasyDsl
   module Test
     class Apache < EasyDsl::Container
       def initialize(name)
-        super(name, nil)
+        super(nil, name)
 
         attribute :webmaster_email,   :inheritable => true,   :required => true, :filter => Proc.new{|value|value.strip}
         attribute :port,              :inheritable => true,   :required => true

data/test/easy_dsl/test/rewrite.rb

@@ -3,7 +3,7 @@ require 'easy_dsl/container'
 module EasyDsl
   module Test
     class Rewrite < EasyDsl::Container
-      def initialize(name, container)
+      def initialize(container, name)
         super
         attribute :target,  :required => true
       end

data/test/easy_dsl/test/virtual_host.rb

@@ -4,7 +4,7 @@ require 'easy_dsl/test/rewrite'
 module EasyDsl
   module Test
     class VirtualHost < EasyDsl::Container
-      def initialize(name, container)
+      def initialize(container, name)
         super
         attribute :document_root, :inheritable => false, :required => true
         attribute :webmaster_email

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jzimmek-easy_dsl
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jan Zimmek
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-12 00:00:00 -07:00
+date: 2009-09-17 00:00:00 -07:00
 default_executable: 
 dependencies: []