qor_dsl 0.2.0 → 0.2.1

data/README.md

@@ -30,7 +30,7 @@ Qor Dsl - DSL made easy!
       include Qor::Dsl
       default_configs [ENV['BUNDLE_GEMFILE'], 'Gemfile']
 
-      node :source
+      node :source, :default_value => 'http://rubygems.org'
       node :gem
 
       node :group do

data/example/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+#source 'http://rubygems.org'
 
 gem 'rails', '3.2.8'
 gem 'unicorn'

data/example/gemfile.rb

@@ -6,7 +6,7 @@ class Gemfile
   include Qor::Dsl
   default_configs [ENV['BUNDLE_GEMFILE'], File.join(File.dirname(__FILE__), 'Gemfile')]
 
-  node :source
+  node :source, :default_value => 'http://rubygems.org'
   node :gem
 
   node :group do
@@ -18,6 +18,9 @@ class Gemfile
   end
 end
 
+# Default Value
+Gemfile.first(:source)
+
 # Methods for query
 Gemfile.first(:gem)
 Gemfile.first(:gem, 'unicorn')

data/lib/qor_dsl/node.rb

@@ -1,29 +1,43 @@
 module Qor
   module Dsl
     class Node
-      attr_accessor :name, :config, :parent, :children, :data, :options, :block, :all_nodes
+      attr_accessor :name, :config, :parent, :children, :data, :options, :block, :all_nodes, :dummy
 
       def initialize(name=nil, options={})
         self.name   = name
         self.add_config(options[:config] || Qor::Dsl::Config.new('ROOT', self))
+        self.dummy = options[:dummy]
       end
 
+      ## Node Config
       def config_name
         config.__name
       end
 
-      def inspect_name
-        "{#{config_name}: #{name || 'nil'}}"
+      def config_options
+        config.__options || {} rescue {}
       end
 
-      def root?
-        root == self
+      def child_config(type)
+        config.__children[type] || nil
+      end
+
+      def child_config_options(type)
+        child_config(type).__options || {} rescue {}
+      end
+
+      def dummy?
+        dummy
       end
 
       def is_node?(cname=nil, sname=nil)
         (cname.nil? || (config_name.to_s == cname.to_s)) && (sname.nil? || (name.to_s == sname.to_s))
       end
 
+      def root?
+        root == self
+      end
+
       def root
         parent ? parent.root : self
       end
@@ -36,11 +50,17 @@ module Qor
         return @options if @options.is_a?(Hash)
         return data[-1] if data.is_a?(Array) && data[-1].is_a?(Hash)
         return data if data.is_a?(Hash)
+        return config_options[:default_options] || {} if dummy?
         {}
       end
 
       def value
-        (config.__children.size > 0 || block.nil?) ? (options[:value] || name) : block.call
+        ((config.__children.size > 0 || block.nil?) ? (options[:value] || name) : block.call) ||
+          (dummy? ? config_options[:default_value] : nil)
+      end
+
+      def block
+        @block || (dummy? ? config_options[:default_block] : nil)
       end
 
       def add_config(config)
@@ -58,10 +78,6 @@ module Qor
         @children
       end
 
-      def config_options_for_child(type)
-        config.__children[type].__options || {} rescue {}
-      end
-
       def add_child(child)
         child.parent = self
         children << child
@@ -76,13 +92,16 @@ module Qor
       end
 
       def find(type=nil, name=nil, nodes=children, &block)
-        selected_children = nodes.select do |child|
+        results = nodes.select do |child|
           child.is_node?(type, name) && (block.nil? ? true : block.call(child))
         end
 
-        return selected_children[0] if !name.nil? && selected_children.length == 1
-        return parent.find(type, name) if (selected_children.length == 0) && config_options_for_child(type)[:inherit]
-        selected_children
+        results = parent.find(type, name, &block) if results.length == 0 && child_config_options(type)[:inherit]
+        results = process_find_results(results, type)
+
+        return results[0] if !name.nil? && results.is_a?(Array) && results.length == 1
+
+        results
       end
 
       def first(type=nil, name=nil, &block)
@@ -90,6 +109,11 @@ module Qor
         selected_children.is_a?(Array) ? selected_children[0] : selected_children
       end
 
+      ## Inspect
+      def inspect_name
+        "{#{config_name}: #{name || 'nil'}}"
+      end
+
       def to_s
         obj_options = {
           'name' => name,
@@ -101,6 +125,15 @@ module Qor
         }
         Qor::Dsl.inspect_object(self, obj_options)
       end
+
+      private
+      def process_find_results(results, type)
+        if results.length == 0 &&
+          %w(default_options default_value default_block).any? {|x| child_config_options(type)[x.to_sym] }
+          results = [Node.new(nil, :config => child_config(type), :dummy => true)]
+        end
+        results
+      end
     end
   end
 end

data/qor_dsl.gemspec

@@ -11,5 +11,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "qor_dsl"
   gem.require_paths = ["lib"]
-  gem.version       = "0.2.0"
+  gem.version       = "0.2.1"
 end

data/test/configure.rb

@@ -18,6 +18,8 @@ module Layout
     end
 
     node :layout do
+      node :description, :default_value => "TODO"
+      node :description_block, :default_block => proc {|x| 'FIXME' }
       node :gadgets
     end
 

data/test/layout_test.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'configure')
 
 describe Layout do
   def many_times
-    threads = 100.times.map do |t|
+    threads = 20.times.map do |t|
       Thread.new do
         yield
       end
@@ -103,4 +103,13 @@ describe Layout do
       lambda { Layout::Configuration.load("non_existing_file.rb", :force => true) }.must_raise Qor::Dsl::ConfigurationNotFound
     end
   end
+
+  it "default value should works" do
+    many_times do
+      Layout::Configuration.load('test/layout.rb', :force => true)
+      Layout::Configuration.first(:layout).first(:description).value.must_equal 'TODO'
+      Layout::Configuration.first(:layout).first(:description_block).value.must_equal 'FIXME'
+      refute_nil Layout::Configuration.first(:layout).first(:description_block).block
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qor_dsl
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -48,7 +48,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3416388606378692493
+      hash: 2719584306054087370
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -57,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3416388606378692493
+      hash: 2719584306054087370
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24