def_dsl 0.0.2 → 0.0.3

data/lib/def_dsl/version.rb

@@ -1,3 +1,3 @@
 module DefDsl
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/def_dsl.rb

@@ -13,8 +13,10 @@ require "def_dsl/version"
 module DefDsl
 
 
-  def def_dsl const
-    define_dsl! self, [[const.name.to_s.underscore(self), const]]
+  def def_dsl *const
+    const.each do |const|
+      define_dsl! self, [[const.name.to_s.underscore(self), const]]
+    end
   end
   alias define_dsl def_dsl  
 
@@ -32,16 +34,18 @@ module DefDsl
       who.send :include, So
       define_dsl! const if const.is_a? Class
 
+      meth = const.instance_eval { @dsl } || mini
+
       who.class_eval do
-        define_method(mini) do |*a,&b|
-          so mini,*a,&b
+        define_method(meth) do |*a,&b|
+          so [mini,meth],*a,&b
         end
       end
 
       # const.send :include, So if const.is_a? Module # or even class
       # who.send :include, So if who.is_a? Module # or even class
       if who.class == Module
-        who.send :module_function, mini
+        who.send :module_function, meth
         who.send :module_function, :so
         who.send :module_function, :so1
         who.send :module_function, :so2
@@ -50,10 +54,18 @@ module DefDsl
   end 
 
   module So
+    def feed_block &block
+      instance_eval &block
+    end
+
     def so klass_name=nil,*a,&b
       return @so if klass_name.nil?
 
-      klass_name = klass_name.to_sym
+      klass_name, label = if klass_name.is_a? Array
+                            klass_name.map &:to_sym
+                          else
+                            [klass_name.to_sym, klass_name.to_sym]
+                          end
 
       if self.class == Module
         klass = self.const_get(klass_name.to_s.camelize)
@@ -62,8 +74,9 @@ module DefDsl
       end
 
       obj = klass.new(*a) #,&b)
-      obj.instance_eval &b if b
-      (@so ||= {}).tap { |h| h[klass_name] = h[klass_name] ? [h[klass_name], obj].flatten(1) : obj }
+      # obj.instance_eval &b if b
+      obj.feed_block &b if b
+      (@so ||= {}).tap { |h| h[label] = h[label] ? [h[label], obj].flatten(1) : obj }
     end
     def so1(name)
       value = @so[name]

data/spec/exmaple_spec.rb

@@ -32,6 +32,7 @@ describe [DefDsl,DefDSL].join' or ' do
     end
   end
 
+
   example 'usage inside object' do
     class My
 
@@ -42,8 +43,7 @@ describe [DefDsl,DefDSL].join' or ' do
       end
 
       extend DefDSL
-      def_dsl Dir
-      def_dsl File      
+      def_dsl Dir, File
 
       def initialize
         file 'root.txt'
@@ -65,4 +65,76 @@ describe [DefDsl,DefDSL].join' or ' do
     end
     My.new
   end
+
+
+  example 'explicit dsl method name definition' do
+    module My
+      # nice looking recursive dsl definition
+      class AFile < Struct.new :name; @dsl = :file end
+      class ADir < Struct.new :name
+        @dsl = :dir
+        ADir = ADir
+        AFile = AFile
+      end
+
+      extend DefDSL
+      def_dsl ADir, AFile
+
+      file 'root.txt'
+      dir 'dir' do
+        dir 'inner' do
+          dir 'empty'
+          file 'any'
+        end
+      end
+
+      so.should == {file: so1(:file), dir: so1(:dir)}
+
+      so1(:file).name.should == 'root.txt'
+      so1(:dir).name.should == 'dir'
+      (inner = so1(:dir).send(:so1,:dir)).name.should == 'inner'
+      inner.send(:so2,:dir).map(&:name).should == ['empty']
+      inner.send(:so2,:file).map(&:name).should == ['any']
+    end
+  end
+
+
+  example 'redefine feed_block' do
+    module My
+      # nice looking recursive dsl definition
+      class File < Struct.new :name
+        def feed_block &block
+          @block = block
+        end
+      end
+      class Dir < Struct.new :name
+        Dir = Dir
+        File = File
+      end
+
+      extend DefDSL
+      def_dsl Dir, File
+
+      file 'root.txt' do
+        this.block.should_be just stored.in_ivar
+      end
+      dir 'dir' do
+        dir 'inner' do
+          dir 'empty'
+          file 'any'
+        end
+      end
+
+      so.should == {file: so1(:file), dir: so1(:dir)}
+
+      so1(:file).name.should == 'root.txt'
+      so1(:dir).name.should == 'dir'
+      (inner = so1(:dir).send(:so1,:dir)).name.should == 'inner'
+      inner.send(:so2,:dir).map(&:name).should == ['empty']
+      inner.send(:so2,:file).map(&:name).should == ['any']
+
+      so1(:file).instance_eval { @block }.nil?.should == false
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: def_dsl
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3030536010394505708
+      hash: -3785499367159931257
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3030536010394505708
+      hash: -3785499367159931257
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25